[Pkg-gnupg-commit] [gnupg2] 171/180: New upstream version 2.1.17

Daniel Kahn Gillmor dkg at fifthhorseman.net
Sat Dec 24 22:29:26 UTC 2016


This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit 881d5a5d4339c6e7ce1bd36411689440623bd758
Merge: 648ae6f ade3246
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Sat Dec 24 15:38:33 2016 -0500

    New upstream version 2.1.17

 AUTHORS                                            |    16 +-
 COPYING.other                                      |    60 +
 ChangeLog                                          |  1248 +-
 Makefile.am                                        |     3 +-
 NEWS                                               |    36 +
 README                                             |    15 +-
 VERSION                                            |     2 +-
 agent/agent.h                                      |     2 -
 agent/gpg-agent.c                                  |    28 +-
 autogen.rc                                         |     1 -
 build-aux/gitlog-to-changelog                      |     5 +-
 build-aux/speedo.mk                                |    67 +-
 build-aux/speedo/w32/inst.nsi                      |    17 +-
 build-aux/speedo/w32/pkg-copyright.txt             |    25 +
 common/argparse.c                                  |    20 +-
 common/homedir.c                                   |    81 +-
 common/iobuf.c                                     |    37 +-
 common/iobuf.h                                     |     8 +-
 common/miscellaneous.c                             |     2 +
 common/openpgp-oid.c                               |    16 +-
 common/sysutils.c                                  |    36 +-
 common/sysutils.h                                  |     2 +
 common/util.h                                      |    21 +-
 configure.ac                                       |   182 +-
 dirmngr/Makefile.am                                |    20 +-
 dirmngr/dirmngr.c                                  |    70 +-
 dirmngr/dirmngr.h                                  |     4 +
 dirmngr/dns-stuff.c                                |  1686 ++-
 dirmngr/dns-stuff.h                                |    28 +-
 dirmngr/dns.c                                      | 11246 +++++++++++++++++++
 dirmngr/dns.h                                      |  1365 +++
 dirmngr/http.c                                     |    88 +-
 dirmngr/ks-engine-hkp.c                            |    11 +-
 dirmngr/ldap-wrapper.c                             |     5 +-
 dirmngr/loadswdb.c                                 |     5 +-
 dirmngr/server.c                                   |    16 +-
 dirmngr/t-dns-stuff.c                              |    82 +-
 doc/DETAILS                                        |    75 +-
 doc/Makefile.am                                    |     5 +-
 doc/debugging.texi                                 |     3 +-
 doc/defsincdate                                    |     2 +-
 doc/dirmngr.texi                                   |    22 +-
 doc/examples/gpgconf.conf                          |     8 +-
 doc/examples/systemd-user/gpg-agent-browser.socket |    13 +
 doc/gpg.texi                                       |   380 +-
 doc/gpgsm.texi                                     |    10 +-
 doc/howto-create-a-server-cert.texi                |     2 +-
 doc/tools.texi                                     |     9 +
 g10/armor.c                                        |     3 +
 g10/call-agent.c                                   |     5 +-
 g10/cpr.c                                          |     2 +-
 g10/decrypt.c                                      |     9 +-
 g10/distsigkey.gpg                                 |   Bin 4114 -> 3452 bytes
 g10/export.c                                       |     6 +-
 g10/getkey.c                                       |     6 +-
 g10/gpg.c                                          |   141 +-
 g10/gpgv.c                                         |    18 +-
 g10/import.c                                       |    11 +-
 g10/keydb.c                                        |     6 +-
 g10/keydb.h                                        |     9 +-
 g10/keyedit.c                                      |   163 +-
 g10/keygen.c                                       |   551 +-
 g10/keylist.c                                      |     4 +-
 g10/keyserver.c                                    |     4 -
 g10/main.h                                         |     3 +
 g10/mainproc.c                                     |    17 +-
 g10/options.h                                      |     4 +-
 g10/packet.h                                       |     6 +-
 g10/parse-packet.c                                 |     6 +-
 g10/passphrase.c                                   |     2 +-
 g10/photoid.c                                      |     2 +-
 g10/pkclist.c                                      |     9 +-
 g10/plaintext.c                                    |    22 +-
 g10/revoke.c                                       |     3 +-
 g10/sign.c                                         |    34 +-
 g10/test-stubs.c                                   |    16 +-
 g10/tofu.c                                         |  1594 +--
 g10/tofu.h                                         |    10 +-
 g10/trust.c                                        |    63 +-
 g10/trustdb.c                                      |    41 +-
 g10/trustdb.h                                      |    11 +-
 po/ca.po                                           |  2418 ++--
 po/cs.po                                           |  2429 ++--
 po/da.po                                           |  2422 ++--
 po/de.po                                           |  2545 +++--
 po/el.po                                           |  2418 ++--
 po/en at boldquot.po                                  |  2422 ++--
 po/en at quot.po                                      |  2422 ++--
 po/eo.po                                           |  2417 ++--
 po/es.po                                           |  2433 ++--
 po/et.po                                           |  2418 ++--
 po/fi.po                                           |  2418 ++--
 po/fr.po                                           |  2422 ++--
 po/gl.po                                           |  2416 ++--
 po/gnupg2.pot                                      |  2352 ++--
 po/hu.po                                           |  2418 ++--
 po/id.po                                           |  2418 ++--
 po/it.po                                           |  2418 ++--
 po/ja.po                                           |  2658 ++---
 po/nb.po                                           |  2493 ++--
 po/pl.po                                           |  2429 ++--
 po/pt.po                                           |  2417 ++--
 po/ro.po                                           |  2416 ++--
 po/ru.po                                           |  2527 +++--
 po/sk.po                                           |  2418 ++--
 po/sv.po                                           |  2422 ++--
 po/tr.po                                           |  2424 ++--
 po/uk.po                                           |  2492 ++--
 po/zh_CN.po                                        |  2416 ++--
 po/zh_TW.po                                        |  2415 ++--
 scd/apdu.c                                         |     5 +-
 scd/app-openpgp.c                                  |    63 +-
 scd/scdaemon.c                                     |     6 +-
 scd/scdaemon.h                                     |     2 -
 sm/call-agent.c                                    |     3 +
 sm/decrypt.c                                       |     8 +-
 sm/gpgsm.c                                         |    54 +-
 tests/Makefile.am                                  |     2 +-
 tests/{migrations => gpgme}/Makefile.am            |    49 +-
 tests/gpgme/gpgme-defs.scm                         |   167 +
 tests/gpgme/run-tests.scm                          |    69 +
 tests/{openpgp => gpgme}/setup.scm                 |    17 +-
 tests/gpgme/wrap.scm                               |    60 +
 tests/gpgscm/ffi.scm                               |    35 -
 tests/gpgscm/init.scm                              |    85 +-
 tests/gpgscm/lib.scm                               |   116 +-
 tests/gpgscm/main.c                                |    21 +-
 tests/gpgscm/opdefines.h                           |    15 +-
 tests/gpgscm/repl.scm                              |     9 +-
 tests/gpgscm/scheme-private.h                      |    40 +
 tests/gpgscm/scheme.c                              |   731 +-
 tests/gpgscm/scheme.h                              |    21 +
 tests/gpgscm/tests.scm                             |   221 +-
 tests/migrations/Makefile.am                       |    33 +-
 tests/migrations/common.scm                        |    10 +-
 .../4gb-packet.scm => migrations/run-tests.scm}    |    20 +-
 .../4gb-packet.scm => migrations/setup.scm}        |    10 +-
 tests/openpgp/4gb-packet.scm                       |     2 +-
 tests/openpgp/Makefile.am                          |    44 +-
 tests/openpgp/clearsig.scm                         |     4 +-
 tests/openpgp/{encrypt-dsa.scm => compression.scm} |    20 +-
 tests/openpgp/conventional-mdc.scm                 |     2 +-
 tests/openpgp/conventional.scm                     |     2 +-
 tests/openpgp/{setup.scm => decrypt-multifile.scm} |    31 +-
 tests/openpgp/defs.scm                             |   103 +-
 tests/openpgp/delete-keys.scm                      |   103 +
 tests/openpgp/ecc.scm                              |     4 +-
 tests/openpgp/{4gb-packet.scm => enarmor.scm}      |    17 +-
 tests/openpgp/encrypt-dsa.scm                      |     2 +-
 .../{issue2015.scm => encrypt-multifile.scm}       |    26 +-
 tests/openpgp/encrypt.scm                          |     2 +-
 tests/openpgp/export.scm                           |     4 +-
 tests/openpgp/genkey1024.scm                       |     2 +-
 tests/openpgp/gpgtar.scm                           |     7 +-
 tests/openpgp/gpgv-forged-keyring.scm              |     2 +-
 ...t-dsa.scm => import-revocation-certificate.scm} |    37 +-
 tests/openpgp/import.scm                           |     2 +-
 tests/openpgp/issue2015.scm                        |     2 +-
 tests/openpgp/issue2346.scm                        |     2 +-
 tests/openpgp/issue2419.scm                        |     2 +-
 tests/openpgp/key-selection.scm                    |     2 +-
 tests/openpgp/mds.scm                              |     2 +-
 tests/openpgp/multisig.scm                         |     2 +-
 tests/openpgp/quick-key-manipulation.scm           |    89 +-
 tests/openpgp/run-tests.scm                        |   140 +-
 tests/openpgp/samplekeys/authenticate-only.pub.asc |    31 +
 tests/openpgp/samplekeys/authenticate-only.sec.asc |    60 +
 tests/openpgp/samplemsgs/clearsig-1-key-1.asc      |    17 +
 .../openpgp/samplemsgs/revoke-2D727CC768697734.asc |     8 +
 tests/openpgp/samplemsgs/signed-1-key-1.asc        |    15 +
 tests/openpgp/setup.scm                            |     2 +-
 tests/openpgp/signencrypt.scm                      |     2 +-
 tests/openpgp/sigs.scm                             |     2 +-
 tests/openpgp/ssh-export.scm                       |    52 +
 tests/openpgp/{ssh.scm => ssh-import.scm}          |     6 +-
 tests/openpgp/tofu-2183839A-1.txt                  |   Bin 191 -> 0 bytes
 tests/openpgp/tofu-BC15C85A-1.txt                  |     9 -
 tests/openpgp/tofu-EE37CF96-1.txt                  |     9 -
 tests/openpgp/tofu-keys-secret.asc                 |    95 -
 tests/openpgp/tofu-keys.asc                        |    47 -
 tests/openpgp/tofu.scm                             |   216 +-
 tests/openpgp/tofu/conflicting/1C005AF3-1.txt      |   Bin 0 -> 342 bytes
 tests/openpgp/tofu/conflicting/1C005AF3-2.txt      |   Bin 0 -> 338 bytes
 tests/openpgp/tofu/conflicting/1C005AF3-3.txt      |   Bin 0 -> 339 bytes
 tests/openpgp/tofu/conflicting/1C005AF3-4.txt      |   Bin 0 -> 338 bytes
 tests/openpgp/tofu/conflicting/1C005AF3-5.txt      |   Bin 0 -> 339 bytes
 tests/openpgp/tofu/conflicting/1C005AF3-secret.gpg |   Bin 0 -> 2537 bytes
 tests/openpgp/tofu/conflicting/1C005AF3.gpg        |   Bin 0 -> 1235 bytes
 tests/openpgp/tofu/conflicting/B662E42F-1.txt      |   Bin 0 -> 340 bytes
 tests/openpgp/tofu/conflicting/B662E42F-2.txt      |   Bin 0 -> 339 bytes
 tests/openpgp/tofu/conflicting/B662E42F-3.txt      |   Bin 0 -> 342 bytes
 tests/openpgp/tofu/conflicting/B662E42F-4.txt      |   Bin 0 -> 340 bytes
 tests/openpgp/tofu/conflicting/B662E42F-5.txt      |     1 +
 tests/openpgp/tofu/conflicting/B662E42F-secret.gpg |   Bin 0 -> 2537 bytes
 tests/openpgp/tofu/conflicting/B662E42F.gpg        |   Bin 0 -> 1235 bytes
 tests/openpgp/tofu/conflicting/BE04EB2B-1.txt      |   Bin 0 -> 340 bytes
 tests/openpgp/tofu/conflicting/BE04EB2B-2.txt      |   Bin 0 -> 342 bytes
 tests/openpgp/tofu/conflicting/BE04EB2B-3.txt      |   Bin 0 -> 340 bytes
 tests/openpgp/tofu/conflicting/BE04EB2B-4.txt      |   Bin 0 -> 342 bytes
 tests/openpgp/tofu/conflicting/BE04EB2B-5.txt      |   Bin 0 -> 340 bytes
 tests/openpgp/tofu/conflicting/BE04EB2B-secret.gpg |   Bin 0 -> 2537 bytes
 tests/openpgp/tofu/conflicting/BE04EB2B.gpg        |   Bin 0 -> 1235 bytes
 .../{encrypt-dsa.scm => verify-multifile.scm}      |    41 +-
 tests/openpgp/verify.scm                           |     6 +-
 tools/Makefile.am                                  |     4 +-
 tools/call-dirmngr.c                               |    52 +
 tools/call-dirmngr.h                               |     2 +
 tools/gpg-wks-client.c                             |   114 +
 tools/gpg-wks-server.c                             |   170 +-
 tools/gpg-wks.h                                    |     3 +
 tools/gpgconf-comp.c                               |   303 +-
 tools/gpgconf.c                                    |    17 +-
 tools/gpgconf.h                                    |     6 +-
 tools/mime-maker.c                                 |     7 +-
 tools/wks-util.c                                   |   242 +-
 215 files changed, 57629 insertions(+), 37038 deletions(-)

diff --cc ChangeLog
index 6114a5d,8bd68a6..a6f0a79
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,15674 -1,16 +1,16762 @@@
 -No more ChangeLog files
 -========================
++2016-12-20  Werner Koch  <wk at gnupg.org>
+ 
 -Do not modify any of the ChangeLog files in GnuPG.  Starting on
 -December 1st, 2011 we put change information only in the GIT commit
 -log, and generate a top-level ChangeLog file from logs at "make dist"
 -time.  As such, there are strict requirements on the form of the
 -commit log messages.  See doc/HACKING for details.  The old ChangeLog
 -files have all be renamed to ChangeLog-2011.
++	Release 2.1.17.
+ 
++	sm: Remove wrong example from gpgsm --help.
++	* sm/gpgsm.c (opts): Remove group 303.
+ 
++	dirmngr: New option --resolver-timeout.
++	* dirmngr/dns-stuff.c (DEFAULT_TIMEOUT): New.
++	(opt_timeout): New var.
++	(set_dns_timeout): New.
++	(libdns_res_open): Set the default timeout.
++	(libdns_res_wait): Use configurable timeout.
++	(resolve_name_libdns): Ditto.
+ 
 -Local Variables:
 -buffer-read-only: t
 -mode: text
 -End:
++	* dirmngr/dirmngr.c (oResolverTimeout): New const.
++	(opts): New option --resolver-timeout.
++	(parse_rereadable_options): Set that option.
++	(main) <aGPGConfList>: Add --nameserver and --resolver-timeout.
++	* tools/gpgconf-comp.c (gc_options_dirmngr): Add --resolver-timeout
++	and --nameserver.
++
++	* dirmngr/http.c (connect_server): Fix yesterday introduced bug in
++	error diagnostic.
++
++2016-12-19  Werner Koch  <wk at gnupg.org>
++
++	dirmngr: Fix problems with the getsrv function.
++	* dirmngr/dns-stuff.c (opt_debug, opt_verbose): New vars.
++	(set_dns_verbose): New func.
++	(libdns_switch_port_p): Add debug output.
++	(resolve_dns_name): Ditto.
++	(get_dns_cert): Ditto.
++	(get_dns_cname): Ditto.
++	(getsrv_libdns, getsrv_standard): Change SRVCOUNT to an unsigend int.
++	(getsrv): Rename to ...
++	((get_dns_srv): this.  Add arg R_COUNT and return an error.  Add debug
++	output.
++	* dirmngr/http.c: Adjust for chnaged getsrv().
++	* dirmngr/ks-engine-hkp.c (map_host): Ditto.
++	* dirmngr/t-dns-stuff.c (main): Ditto.  Call set_dns_verbose.
++	* dirmngr/dirmngr.c (parse_rereadable_options): Call set_dns_verbose.
++
++	build: Add target to sign the windows installer.
++	* build-aux/speedo.mk (w32-sign-installer): New.
++	(AUTHENTICODE_KEY): New.
++	(installer-from-source): Use cp instead of mv.  Factor code out to ...
++	(MKSWDB_commands): new macro.
++	(sign-installer): New.
++
++2016-12-19  Justus Winter  <justus at g10code.com>
++
++	tests: Use the common test framework for the migration tests.
++	* tests/migrations/Makefile.am (reqired_pgms): Add 'gpgscm'.
++	(TESTS_ENVIRONMENT): Populate.
++	(TESTS): Rename to 'XTESTS'.
++	(xcheck): New target.
++	(EXTRA_DIST): Add new files.
++	(CLEANFILES): Remove log files.
++	* tests/migrations/common.scm: Honor 'verbose', fix paths.
++	* tests/migrations/run-tests.scm: New file.
++	* tests/migrations/setup.scm: Likewise.
++
++	tests: Use sequential test runner if only one test is given.
++	* tests/openpgp/run-tests.scm: Use sequential test runner if only one
++	test is given.
++
++2016-12-19  Werner Koch  <wk at gnupg.org>
++
++	dirmngr,w32: Hack around a select problem.
++	* dirmngr/dns.c (FD_SETSIZE): Bump up to 1024.
++	(dns_poll): Return an error instead of hitting an assertion failure.
++
++2016-12-19  Neal H. Walfield  <neal at g10code.com>
++
++	test: Extend TOFU tests to also check the days with signatures.
++	* tests/openpgp/tofu.scm (GPGTIME): Define the "standard" base time.
++	(faketime): New function.
++	(days->seconds): Likewise.
++	(GPG): Use faketime.
++	(check-counts): Also check the number of expected days with signatures
++	and encryptions.  Update callers.  Extend tests.
++
++2016-12-19  Justus Winter  <justus at g10code.com>
++
++	tests: New test for --delete-[secret-]keys.
++	* tests/openpgp/Makefile.am (XTESTS): Add new test.
++	* tests/openpgp/defs.scm (keys): New variable.
++	(have-public-key?): New function.
++	(have-secret-key?): Likewise.
++	(have-secret-key-file?): Likewise.
++	* tests/openpgp/delete-keys.scm: New file.
++	* tests/openpgp/quick-key-manipulation.scm: Move the accessors to
++	'defs.scm'.
++
++	gpgscm: Change associativity of ::.
++	* tests/gpgscm/scheme.c (mk_atom): Change associativity of the ::
++	infix-operator.  This makes it possible to naturally express accessing
++	nested structures (e.g. a::b::c).
++
++	gpgscm: Display location when assertions fail.
++	* tests/gpgscm/lib.scm (assert): Use location information if
++	available.
++
++	gpgscm: Make exception handling more robust.
++	* tests/gpgscm/init.scm (throw'): Check that args is a list.
++
++2016-12-19  Andre Heinecke  <aheinecke at intevation.de>
++
++	speedo,w32: Use nsExec::ExecToLog to avoid popups.
++	* build-aux/speedo/w32/inst.nsi: Use ExecToLog instead of
++	ExecWait.
++
++2016-12-19  Werner Koch  <wk at gnupg.org>
++
++	Remove unused debug flags and add "dns" and "network".
++	* g10/options.h (DBG_CARD_IO_VALUE, DBG_CARD_IO): Remove.
++	* g10/gpg.c (debug_flags): Remove "cardio".
++	* agent/agent.h (DBG_COMMAND_VALUE, DBG_COMMAND): Remove.
++	* agent/gpg-agent.c (debug_flags): Remove "command".
++	* scd/scdaemon.h (DBG_COMMAND_VALUE, DBG_COMMAND): Remove.
++	* scd/scdaemon.c (debug_flags): Remove "command".
++	* dirmngr/dirmngr.h (DBG_DNS_VALUE, DBG_DNS): New.
++	(DBG_NETWORK_VALUE, DNG_NETWORK): New.
++	* dirmngr/dirmngr.c (debug_flags): Add "dns" and "network".
++
++2016-12-17  Werner Koch  <wk at gnupg.org>
++
++	dirmngr: Fix setup of libdns for W32.
++	* configure.ac (DNSLIB) {W32]: Add -liphlpapi.
++	* dirmngr/dns-stuff.c [W32]: Include iphlpapi.h and define
++	WIN32_LEAN_AND_MEAN.
++	(libdns_init) [W32]: Use GetNetworkParams to get the nameserver.
++	* dirmngr/t-dns-stuff.c (init_sockets): New.
++	(main): Call it.
++
++2016-12-16  Werner Koch  <wk at gnupg.org>
++
++	dirmngr: Auto-switch from Tor port to Torbrowser port.
++	* dirmngr/dns-stuff.c (libdns_tor_port): New var.
++	(set_dns_nameserver): Clear that var.
++	(libdns_init): Init var to the default port.
++	(libdns_switch_port_p): New func.
++	(resolve_dns_name): Use function to switch the port
++	(get_dns_cert): Ditto.
++	(getsrv): Ditto.
++	(get_dns_cname): Ditto.
++
++	dirmngr: Use one context for all libdns queries.
++	* dirmngr/dns-stuff.c (libdns_reinit_pending): New var.
++	(enable_recursive_resolver): Set var.
++	(set_dns_nameserver): Ditto.
++	(libdns_init): Avoid double initialization.
++	(libdns_deinit): New.
++	(reload_dns_stuff): New.
++	(libdns_res_open): Act upon LIBDNS_REINIT_PENDING.
++	* dirmngr/t-dns-stuff.c (main): Call reload_dns_stuff to release
++	memory.
++	* dirmngr/dirmngr.c (cleanup): Ditto.
++	(dirmngr_sighup_action): Call reload_dns_stuff to set
++	LIBDNS_REINIT_PENDING.
++
++	dirmngr: Pass Tor credentials to libdns.
++	* dirmngr/dns-stuff.c (tor_credentials): Replace by ...
++	(tor_socks_user, tor_socks_password): new vars.
++	(enable_dns_tormode): Set these new vars.
++	(libdns_res_open): Tell libdns the socks credentials.
++
++	dirmngr: Factor common libdns code out.
++	* dirmngr/dns-stuff.c (libdns_res_open): New.  Replace all libdns_init
++	and dns-res_open by a call to this func.
++	(libdns_res_submit): New wrapper.  Replace all dns_res_sumbit calls.
++	(libdns_res_wait): New function.
++	(resolve_name_libdns): Replace loop by libdns_res_wait.
++	(get_dns_cert_libdns): Ditto.
++	(getsrv_libdns): Ditto.
++
++	gpg,sm: A few more option for --gpgconf-list.
++	* g10/gpg.c (gpgconf_list): Add --compliance and
++	--default-new-key-algo.
++	(parse_compliance_option):
++	* sm/gpgsm.c (main) <gpgconf-list>: Add --enable-crl-checks.
++
++	gpgconf: New command --apply-profile.
++	* tools/gpgconf.c (aApplyProfile): New.
++	(opts): New command --apply-profile.
++	(main): Implement that command.
++	* tools/gpgconf-comp.c (option_check_validity): Add arg VERBATIM.
++	(change_options_program): Ditto.
++	(change_one_value): Ditto.
++	(gc_component_change_options): Ditto.
++	(gc_apply_profile): New.
++
++	gpgconf: Fix --apply-defaults.
++	* tools/gpgconf-comp.c: Skip pinentry also in process_all mode.
++
++2016-12-16  Justus Winter  <justus at g10code.com>
++
++	doc: Mention extra information in pinentry status lines.
++	* doc/DETAILS: Mention that 'PINENTRY_LAUNCHED may carry extra
++	information.
++
++	sm: Fix agent communication.
++	* sm/call-agent.c (gpgsm_agent_pksign): Fix passing the control handle
++	to the callback.
++	(gpgsm_scd_pksign): Likewise.
++	(gpgsm_agent_reaedkey): Likewise.
++
++2016-12-16  Neal H. Walfield  <neal at g10code.com>
++
++	doc: Fix manual.
++	* doc/gpg.texi: Remove comment about options being parsed in-order.
++	They aren't.
++
++	g10: Use total days, not total messages to compute TOFU validity.
++	* g10/tofu.c (write_stats_status): Use the number of days with
++	signatures / encryptions to compute the validity, not the total number
++	of signatures / encryptions.
++	(BASIC_TRUST_THRESHOLD): Adjust given the new semantics.
++	(FULL_TRUST_THRESHOLD): Likewise.
++
++	g10: Extend TOFU_STATS to emit <sign-days> and <encyrption-days>
++	* doc/DETAILS: Add SIGN-DAYS and ENCRYPT-DAYS to the TOFU_STATS status
++	line.
++	* g10/tofu.c (write_stats_status): Take additional parameters
++	signature_days and encryption_days.  Update callers.  Include them in
++	the tfs record and TOFU status lines.
++	(show_statistics): Compute the number of days on which we saw a
++	message signed by FINGERPRINT, and the number of days on which we
++	encrypted a message to it.
++
++2016-12-16  Justus Winter  <justus at g10code.com>
++
++	doc: Improve section on unattended key generation.
++	* doc/gpg.texi: Improve the subsection on unattended key generation by
++	suggesting the quick key manipulation interface as an alternative, and
++	by suggesting alternatives to '%pubring' and '%secring'.  Simplify
++	examples accordingly.
++
++	doc: Add documentation for programmatic use of GnuPG.
++	* doc/gpg.texi: New subsections on programmatic use of GnuPG,
++	ephemeral home directories, and the quick key manipulation interface.
++
++2016-12-16  Neal H. Walfield  <neal at g10code.com>
++
++	g10: On a TOFU conflict, write the conflicting keys to the status fd.
++	* g10/tofu.c (ask_about_binding): Emit all of the conflicting keys and
++	their statistics on the status fd.
++	(get_trust): Likewise, if we don't call ask_about_binding.
++	(show_statistics): Have the caller pass the policy as returned by
++	get_policy.  Add argument only_status_fd and don't emit any output on
++	stdout if it is set.  Update callers.
++
++	g10: Add missing space.
++	* g10/tofu.c (tofu_register_encryption): Add missing space.
++
++2016-12-15  Justus Winter  <justus at g10code.com>
++
++	g10: Avoid translating simple error messages.
++	* g10/gpg.c (main): Avoid translating arguments to 'wrong_args'.
++
++	g10: Rework the --quick-* interface.
++	* g10/gpg.c (opts): Rename options.
++	(main): Update errors.
++	* doc/gpg.texi: Update accordingly.
++
++	g10: Rename 'card-edit' to 'edit-card'.
++	* g10/gpg.c (opts): Rename option.
++	* g10/call-agent.c (agent_scd_learn): Update comment.
++	* doc/gpg.texi: Update accordingly.
++
++	g10: Spell out --desig-revoke.
++	* g10/gpg.c (opts): Rename option.
++	* doc/gpg.texi: Update accordingly.
++
++	g10: Shorten unreasonably long option.
++	* g10/gpg.c (opts): Rename 'generate-revocation-certificate' to
++	'generate-revocation'.
++	* doc/gpg.texi: Update accordingly.
++	* po: Update translations.
++
++	doc: Add aliases of all changed options.
++	* doc/gpg.texi: Add the old version of every option that was updated
++	with the last change set.
++	* doc/gpgsm.texi: Likewise.
++
++2016-12-15  Werner Koch  <wk at gnupg.org>
++
++	dirmngr: First patch to re-enable Tor support.
++	* dirmngr/dns-stuff.c (SOCKS_PORT, TOR_PORT, TOR_PORT2): New
++	constants.
++	(libdns_init): Start adding tor support.
++	(resolve_name_libdns): Pass socks hosts to dns_res_open.
++	(get_dns_cert_libdns): Ditto.
++	(getsrv_libdns): Ditto.
++	(get_dns_cname_libdns): Ditto.
++
++2016-12-15  Justus Winter  <justus at g10code.com>
++
++	build: Fix distcheck.
++	* tests/gpgme/Makefile.am (CLEANFILES): New variable, clean test logs.
++
++2016-12-14  Justus Winter  <justus at g10code.com>
++
++	tests: Reuse GPGME's tests.
++	* configure.ac (AC_CONFIG_FILES): Add new Makefile.
++	* tests/Makefile.am (SUBDIRS): Add new directory.
++	* tests/gpgme/Makefile.am: New file.
++	* tests/gpgme/gpgme-defs.scm: Likewise.
++	* tests/gpgme/run-tests.scm: Likewise.
++	* tests/gpgme/setup.scm: Likewise.
++	* tests/gpgme/wrap.scm: Likewise.
++
++	common: Support locating components in the build tree.
++	* common/homedir.c (gnupg_build_directory): New variable.
++	(gnupg_module_name_called): Likewise.
++	(gnupg_set_builddir): New function.
++	(gnupg_set_builddir_from_env): Likewise.
++	(gnupg_module_name): Support locating components in the build tree.
++	* common/util.h (gnupg_set_builddir): New prototype.
++	* tests/openpgp/defs.scm (tools): Drop 'gpg and 'gpg-agent.
++	(tool): Rename to 'tool-hardcoded.
++	(gpg-conf): New function, with accessors for the results.
++	(gpg-components): New variable.
++	(tool): New function.
++	* tools/gpgconf.c (enum cmd_and_opt_values): New key.
++	(opts): New option '--build-prefix'.
++	(main): Handle new option.
++
++	tests: Rework check for trust models.
++	* tests/openpgp/defs.scm (gpg-has-option?): New function.
++	(have-opt-always-trust): Use a simpler test for that option.  This way
++	that is less distracting when we run the tests with verbose=3.
++
++2016-12-14  Werner Koch  <wk at gnupg.org>
++
++	dirmngr: New configure option --disable-libdns.
++	* configure.ac: Add option --disable-libdns
++	(USE_LIBDNS): New ac_subst and am_conditional.
++	(USE_C99_CFLAGS): Set only if libdns is used.
++	* dirmngr/Makefile.am (dirmngr_SOURCES): Move dns.c and dns.h to ...
++	(dirmngr_SOURCES) [USE_LIBDNS0: here.
++	(t_common_src): Ditto.
++	* dirmngr/dirmngr.c (oRecursiveResolver): New constant.
++	(opts): New option "--recursive-resolver".
++	(parse_rereadable_options): Set option.
++	* dirmngr/t-dns-stuff.c (main): Add option --recursive-resolver.
++	* dirmngr/server.c (cmd_getinfo): Depend output of "dnsinfo" on the
++	new variables.
++	* dirmngr/dns-stuff.c: Include dns.h only if USE_DNSLIB is defined.
++	Also build and call dnslib functions only if USE_DNSLIB is defined.
++	(recursive_resolver): New var.
++	(enable_recursive_resolver): New func.
++	(recursive_resolver_p): New func.
++
++	dirmngr: Implement CERT record lookup via libdns.
++	* dirmngr/dns-stuff.c (get_dns_cert_libdns): New.
++	(get_dns_cert_standard): Fix URL malloc checking.
++
++	dirmngr: Implement CNAME and SRV record lookup via libdns.
++	* dirmngr/dns-stuff.c (dns_free): New macro.
++	(libdns): Move var to the top.
++	(libdns_error_to_gpg_error): Map error codes to the new gpg-error
++	codes.
++	(resolve_name_libdns): Restructure code.
++	(getsrv_libdns): New.
++	(get_dns_cname_libdns): New.
++
++	dirmngr: Fix bugs in the standard resolver code.
++	* dirmngr/dns-stuff.c: Include dirmngr-err.h to set the correct error
++	source.
++	(get_h_errno_as_gpg_error): New.
++	(get_dns_cert_libdns): Fix error code.
++	(getsrv_libdns): Add arg R_COUNT and return an error code.
++	(getsrv_standard): Ditto.  Fix handling of res_query errors and
++	provide the correct size for the return buffer.
++	(getsrv): Adjust for changed worker functions.
++	(get_dns_cname_standard): Fix handling of res_query errors and provide
++	the correct size for the return buffer.
++
++	dirmngr: Require a c99 compiler.
++	* configure.ac (USE_C99_CFLAGS): New ac_subst.  Set to -std=gnu99 for
++	gcc.
++	* dirmngr/Makefile.am (AM_CFLAGS): Add USE_C99_CFLAGS.
++	(t_http_CFLAGS): Ditto.
++	(t_ldap_parse_uri_CFLAGS): Ditto.
++	(t_dns_stuff_CFLAGS): Ditto.
++
++	doc: Add license notes for libdns.
++	* COPYING.other: New.
++	* Makefile.am (EXTRA_DIST): Add it.
++	* AUTHORS: Add info on libdns.
++	* build-aux/speedo/w32/pkg-copyright.txt: Add license terms.
++
++	common: Add replacements for error codes from gpg-error 1.26.
++
++2016-12-14  Justus Winter  <justus at g10code.com>
++
++	dirmngr: New libdns snapshot.
++
++	dirmngr: Add basic libdns support.
++	* dirmngr/dns.c: New file.
++	* dirmngr/dns.h: New file.
++	* dirmngr/Makefile.am (dirmngr_SOURCES): Add new files.
++	* dirmngr/dns-stuff.c: Include dns.h.xxx use libdns
++	(libdns): New global var for the libdns state.
++	(libdns_error_to_gpg_error): New.
++	(libdns_init): New.
++	(resolve_name_libdns): New.
++	(get_dns_cert_libdns): New stub.
++	(getsrv_libdns): New stub.
++	(get_dns_cname_libdns): New stub.
++
++	dirmngr,build: Remove support for ADNS.
++	* autogen.rc: Remove '--with-adns' argument.
++	* configure.ac: Remove check for ADNS.
++	* dirmngr/dns-stuff.c: Remove all code that uses ADNS.
++	* dirmngr/server.c (cmd_getinfo): Update status line.
++	* doc/dirmngr.texi: Do not mention ADNS.
++
++2016-12-14  NIIBE Yutaka  <gniibe at fsij.org>
++
++	dirmngr: Improve ntbtls support.
++	* dirmngr/http.c [HTTP_USE_NTBTLS] (close_tls_session): Release.
++	(send_request): Call ntbtls_set_transport.
++	(cookie_read, cookie_write): Implement.
++	(cookie_close): Add initial implementation for ntbtls.
++
++2016-12-13  Justus Winter  <justus at g10code.com>
++
++	g10,sm: Spell out --passwd.
++	* g10/gpg.c (opts): Spell out option.
++	* sm/gpgsm.c (opts): Likewise.
++	* doc/gpg.texi: Update accordingly.
++	* doc/gpgsm.texi: Likewise.
++
++	g10: Spell out --gen-revoke.
++	* g10/gpg.c (opts): Spell out option.
++	* doc/gpg.texi: Update accordingly.
++	* po: Update translations.
++
++	g10: Spell out --full-gen-key.
++	* g10/gpg.c (opts): Spell out option.
++	(main): Likewise.
++	* g10/keygen.c (generate_keypair): Likewise.
++	* doc/gpg.texi: Update accordingly.
++
++	g10,sm: Spell out --gen-key.
++	* g10/gpg.c (opts): Spell out option.
++	* sm/gpgsm.c (opts): Likewise.
++	* doc/gpg.texi: Update accordingly.
++
++	g10,sm: Spell out --check-sigs.
++	* g10/gpg.c (opts): Spell out option.
++	* sm/gpgsm.c (opts): Likewise.
++	* doc/gpg.texi: Update accordingly.
++
++	g10,sm: Spell out --list-sigs.
++	* g10/gpg.c (opts): Spell out option.
++	* sm/gpgsm.c (opts): Likewise.
++	* doc/gpg.texi: Update accordingly.
++
++	g10: Hyphenate --clearsign.
++	* g10/gpg.c (opts): Hyphenate option.
++	* doc/gpg.texi: Update accordingly.
++	* po: Update translations.
++	* tests/openpgp: Update tests.
++
++	g10: Spell out --recv-keys.
++	* g10/gpg.c (opts): Spell out option.
++	* doc/gpg.texi: Update accordingly.
++
++	g10: Create expiring keys in quick key generation mode.
++	* doc/gpg.texi: Document that fact.
++	* g10/keygen.c (quick_generate_keypair): Use a default value.
++	* tests/openpgp/quick-key-manipulation.scm: Test that fact.
++
++	gpgscm: Print failed and skipped tests.
++	* tests/gpgscm/tests.scm (test-pool::report): Print failed and skipped
++	tests at the end.
++
++	gpgscm: Generalize the test runner.
++	* tests/gpgscm/tests.scm (test::scm) Add explicit name argument.
++	(test::binary): Likewise.  Also, add missing unquote.
++	* tests/openpgp/run-tests.scm: Adapt accordingly.
++
++	gpgscm: Move the test runner to the Scheme library.
++	* tests/openpgp/run-tests.scm: Move most of the code...
++	* tests/gpgscm/tests.scm: ... here.
++
++	tests: Refactor test runner.
++	* tests/openpgp/run-tests.scm (locate-test): New function.
++	(test): Factor-out the code starting the child process.
++	(test::binary): New function.
++
++	gpgscm: Improve library functions.
++	* tests/gpgscm/tests.scm (absolute-path?): New function.
++	(canonical-path): Use the new function.
++	* tests/gpgscm/lib.scm (string-split-pln): New function.
++	(string-indexp, string-splitp): Likewise.
++	(string-splitn): Express using the above function.
++	(string-ltrim, string-rtrim): Fix corner case.
++	(list->string-reversed): New function.
++	(read-line): Fix performance.
++
++2016-12-12  Werner Koch  <wk at gnupg.org>
++
++	gpg: Fix memory leak in ecc key generation.
++	* g10/keygen.c (ecckey_from_sexp): Release curve.
++
++	gpg: Do not use a fixed string for --gpgconf-list:default_pubkey_algo.
++	* g10/keygen.c (get_default_pubkey_algo): New.
++	(parse_key_parameter_string): Use it.
++	* g10/gpg.c (gpgconf_list): Take value from new function.
++
++	gpg: Fix algo string parsing of --quick-addkey.
++	* g10/keygen.c (parse_key_parameter_string): Fix handling of PART==1.
++	(parse_key_parameter_part): Use default key size if only "rsa", "dsa",
++	or "elg" is given.
++
++2016-12-09  Justus Winter  <justus at g10code.com>
++
++	g10: Create keys that expire in simple key generation mode.
++	* g10/keygen.c (default_expiration_interval): New variable.
++	(generate_keypair): Use the new default.
++
++	tests: Add a test for '--quick-addkey'.
++	* tests/openpgp/quick-key-manipulation.scm: Test '--quick-addkey'.
++
++	tests: New test using all available compression algorithms.
++	* tests/openpgp/Makefile.am (XTESTS): Add new test.
++	* tests/openpgp/compression.scm: New file.
++	* tests/openpgp/defs.scm (all-compression-algos): New variable.
++
++	g10: List compression algorithms using human-readable names.
++	* g10/gpg.c (list_config): List all enabled compression algorithms
++	under the key 'compressname'.
++
++	g10: Fix memory leak.
++	* g10/sign.c (do_sign): Release old signature data.
++
++2016-12-08  Werner Koch  <wk at gnupg.org>
++
++	common: Skip the Byte Order Mark in conf files.
++	* common/argparse.c (optfile_parse): Detect and skip the UTF-8 BOM.
++
++	Fix 2 compiler warnings.
++	* dirmngr/loadswdb.c: Set ERR on malloc failure.
++	* g10/passphrase.c (passphrase_to_dek): Initialize all fields of
++	HELP_S2K.
++
++	wks: New option --status-fd for gpg-wks-client.
++	* tools/wks-util.c: Include status.h.
++	(statusfp): New global var.
++	(wks_set_status_fd): New func.
++	(wks_write_status): New func.
++	* tools/gpg-wks-client.c: Include status.h.
++	(oStatusFD): New constant.
++	(opts): New option --status-fd.
++	(parse_arguments): Handle that option.
++	(main): Return STATUS_SUCCESS or STATUS_FAILURE.
++
++2016-12-08  Justus Winter  <justus at g10code.com>
++
++	gpgscm: Better error reporting.
++	* tests/gpgscm/ffi.scm: Move the customized exception handling and
++	atexit logic...
++	* tests/gpgscm/init.scm: ... here.
++	(throw): Record the current history.
++	(throw'): New function that is history-aware.
++	(rethrow): New function.
++	(*error-hook*): Use the new throw'.
++	* tests/gpgscm/main.c (load): Fix error handling.
++	(main): Save and use the 'sc->retcode' as exit code.
++	* tests/gpgscm/repl.scm (repl): Print call history.
++	* tests/gpgscm/scheme.c (_Error_1): Make a snapshot of the history,
++	use it to provide a accurate location of the expression causing the
++	error at runtime, and hand the history trace to the '*error-hook*'.
++	(opexe_5): Tag all lists at parse time with the current location.
++	* tests/gpgscm/tests.scm: Update calls to 'throw', use 'rethrow'.
++
++	gpgscm: Keep a history of calls for error messages.
++	* tests/gpgscm/init.scm (vm-history-print): New function.
++	* tests/gpgscm/opdefines.h: New opcodes 'CALLSTACK_POP', 'APPLY_CODE',
++	and 'VM_HISTORY'.
++	* tests/gpgscm/scheme-private.h (struct history): New definition.
++	(struct scheme): New field 'history'.
++	* tests/gpgscm/scheme.c (gc): Mark objects in the history.
++	(history_free): New function.
++	(history_init): Likewise.
++	(history_mark): Likewise.
++	(add_mod): New macro.
++	(sub_mod): Likewise.
++	(tailstack_clear): New function.
++	(callstack_pop): Likewise.
++	(callstack_push): Likewise.
++	(tailstack_push): Likewise.
++	(tailstack_flatten): Likewise.
++	(callstack_flatten): Likewise.
++	(history_flatten): Likewise.
++	(opexe_0): New variable 'callsite', keep track of the expression if it
++	is a call, implement the new opcodes, record function applications in
++	the history.
++	(opexe_6): Implement new opcode.
++	(scheme_init_custom_alloc): Initialize history.
++	(scheme_deinit): Free history.
++	* tests/gpgscm/scheme.h (USE_HISTORY): New macro.
++
++	gpgscm: Add flag TAIL_CONTEXT.
++	* tests/gpgscm/scheme.c (S_FLAG_TAIL_CONTEXT): New macro.  This flag
++	indicates that the interpreter is evaluating an expression in a tail
++	context (see R5RS, section 3.5).
++	(opexe_0): Clear and set the flag according to the rules layed out in
++	R5RS, section 3.5.
++	(opexe_1): Likewise.
++
++	gpgscm: Add flags to the interpreter.
++	* tests/gpgscm/scheme-private.h (struct scheme): Add field 'flags'.
++	* tests/gpgscm/scheme.c (S_OP_MASK): New macro.
++	(S_FLAG_MASK, s_set_flag, s_clear_flag, s_get_flag): Likewise.
++	(_s_return): Unpack the encoded opcode and flags.
++	(s_save): Encode the flags along with the opcode.  Use normal
++	integers to encode the result.
++	(scheme_init_custom_alloc): Initialize 'op' and 'flags'.
++
++	gpgscm: Implement tags.
++	* tests/gpgscm/opdefines.h: Add opcodes to create and retrieve tags.
++	* tests/gpgscm/scheme.c (T_TAGGED): New macro.
++	(mk_tagged_value): New function.
++	(has_tag): Likewise.
++	(get_tag): Likewise.
++	(mark): Mark tag.
++	(opexe_4): Implement new opcodes.
++	* tests/gpgscm/scheme.h (USE_TAGS): New macro.
++
++2016-12-08  Werner Koch  <wk at gnupg.org>
++
++	gpg: Fix the fix out-of-bounds access.
++	* g10/tofu.c (build_conflict_set): Revert to int* and fix calloc.
++
++	wks: New option --check for gpg-wks-client.
++	* tools/call-dirmngr.c (wkd_get_key): New.
++	* tools/gpg-wks-client.c (aCheck): New constant.
++	(opts): New option "--check".
++	(main): Call command_check.
++	(command_check): New.
++
++	tools: Move a function from gpg-wks-server to wks-util.c.
++	* tools/gpg-wks-server.c (list_key_status_cb): Remove.
++	(list_key): Move to ...
++	* tools/wks-util.c (wks_list_key): here and rename.  Add new args
++	R_FPR and R_MBOXES and remove the CTX.
++	(list_key_status_cb): New.
++	* tools/wks-util.c: Include ccparray.h, exectool.h, and mbox-util.h.
++	* tools/gpg-wks-server.c (process_new_key): Replace list_key by
++	wks_list_key.
++	(check_and_publish): Ditto.
++
++2016-12-08  Justus Winter  <justus at g10code.com>
++
++	gpgscm: Generalize 'for-each-p'.
++	* tests/gpgscm/tests.scm (for-each-p): Generalize to N lists like
++	for-each.
++	(for-each-p'): Likewise.
++
++	g10: Fix out-of-bounds access.
++	* g10/tofu.c (build_conflict_set): Use 'char'.
++
++2016-12-08  Werner Koch  <wk at gnupg.org>
++
++	tools: Fix use of uninitialized var in mime-maker.
++	* tools/mime-maker.c (ensure_part): Make sure to set R_PARENT on
++	error.
++	(add_missing_headers): Ensure that ERR is set on success.
++
++	* tools/wks-util.c (wks_parse_policy): Fix indentation.
++
++	tools: Fix memleak in gpgconf.
++	* tools/gpgconf.c (main): Free SOCKETDIR.
++
++	gpg: Fix portability problem.
++	* g10/tofu.c (build_conflict_set): Replace variable dynamic array.
++
++2016-12-07  Justus Winter  <justus at g10code.com>
++
++	tests: Add test for '--quick-set-expire'.
++	* tests/openpgp/quick-key-manipulation.scm: Test '--quick-set-expire'.
++
++	tests: Improve quick key manipulation test.
++	* tests/openpgp/quick-key-manipulation.scm: Do not update the trust
++	database, rather be more specific when filtering the user ids.
++
++2016-12-06  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
++
++	agent: Respect --enable-large-secmem.
++	* agent/gpg-agent.c (main): Initialize secmem to the configured buffer
++	size.
++
++2016-12-06  Justus Winter  <justus at g10code.com>
++
++	tests: Add test importing a revocation certificate.
++	* tests/openpgp/Makefile.am (XTESTS): Add new test.
++	* tests/openpgp/import-revocation-certificate.scm: New file.
++	* tests/openpgp/samplemsgs/revoke-2D727CC768697734.asc: Likewise.
++
++	tests: Rename 'error' to 'fail'.
++	* tests/gpgscm/tests.scm (error): Rename to 'fail'.  'error' is a
++	primitive function (an opcode) of the TinySCHEME vm, and 'error' is
++	also defined by R6RS.  Better avoid redefining that.  Fix all call
++	sites.
++	* tests/openpgp/4gb-packet.scm: Adapt.
++	* tests/openpgp/decrypt-multifile.scm: Likewise.
++	* tests/openpgp/ecc.scm: Likewise.
++	* tests/openpgp/export.scm: Likewise.
++	* tests/openpgp/gpgtar.scm: Likewise.
++	* tests/openpgp/gpgv-forged-keyring.scm: Likewise.
++	* tests/openpgp/import.scm: Likewise.
++	* tests/openpgp/issue2015.scm: Likewise.
++	* tests/openpgp/issue2346.scm: Likewise.
++	* tests/openpgp/issue2419.scm: Likewise.
++	* tests/openpgp/key-selection.scm: Likewise.
++	* tests/openpgp/mds.scm: Likewise.
++	* tests/openpgp/multisig.scm: Likewise.
++	* tests/openpgp/setup.scm: Likewise.
++	* tests/openpgp/signencrypt.scm: Likewise.
++	* tests/openpgp/ssh-import.scm: Likewise.
++	* tests/openpgp/tofu.scm: Likewise.
++	* tests/openpgp/verify.scm: Likewise.
++
++	tests: Remove debugging display.
++	* tests/openpgp/tofu.scm: Remove debugging display.
++
++2016-12-06  Neal H. Walfield  <neal at g10code.com>
++
++	tests: Update distributed files.
++	* tests/openpgp/Makefile.am (TEST_FILES): Remove tofu-keys.asc,
++	tofu-keys-secret.asc, tofu-2183839A-1.txt, tofu-BC15C85A-1.txt and
++	tofu-EE37CF96-1.txt.  Add tofu/conflicting/1C005AF3.gpg,
++	tofu/conflicting/1C005AF3-secret.gpg, tofu/conflicting/1C005AF3-1.txt,
++	tofu/conflicting/1C005AF3-2.txt, tofu/conflicting/1C005AF3-3.txt,
++	tofu/conflicting/1C005AF3-4.txt, tofu/conflicting/1C005AF3-5.txt,
++	tofu/conflicting/B662E42F.gpg, tofu/conflicting/B662E42F-secret.gpg,
++	tofu/conflicting/B662E42F-1.txt, tofu/conflicting/B662E42F-2.txt,
++	tofu/conflicting/B662E42F-3.txt, tofu/conflicting/B662E42F-4.txt,
++	tofu/conflicting/B662E42F-5.txt, tofu/conflicting/BE04EB2B.gpg,
++	tofu/conflicting/BE04EB2B-secret.gpg, tofu/conflicting/BE04EB2B-1.txt,
++	tofu/conflicting/BE04EB2B-2.txt, tofu/conflicting/BE04EB2B-3.txt,
++	tofu/conflicting/BE04EB2B-4.txt, tofu/conflicting/BE04EB2B-5.txt and
++	tofu/conflicting/README.
++
++	doc: Improve the text in the gpg manual.
++	* doc/gpg.texi: Improve the text.
++
++	g10: Avoid a memory leak.
++	* g10/gpg.c (main): Free KB when we're done with it.
++
++	tests: Change (interactive-shell) to start an interactive shell.
++	* tests/gpgscm/tests.scm (interactive-shell): Start an interactive
++	shell.
++
++	tests: Check the signature count in the TOFU TFS record.
++	* tests/openpgp/tofu.scm: Check the signature count in the TOFU TFS
++	record.
++
++	tests: Replace data used by the TOFU conflict test.
++	* tests/openpgp/tofu-2183839A-1.txt: Remove file.
++	* tests/openpgp/tofu-BC15C85A-1.txt: Remove file.
++	* tests/openpgp/tofu-EE37CF96-1.txt: Remove file.
++	* tests/openpgp/tofu-keys-secret.asc: Remove file.
++	* tests/openpgp/tofu-keys.asc: Remove file.
++	* tests/openpgp/tofu/conflicting/1C005AF3.gpg: New file.
++	* tests/openpgp/tofu/conflicting/1C005AF3-secret.gpg: New file.
++	* tests/openpgp/tofu/conflicting/1C005AF3-1.txt: New file.
++	* tests/openpgp/tofu/conflicting/1C005AF3-2.txt: New file.
++	* tests/openpgp/tofu/conflicting/1C005AF3-3.txt: New file.
++	* tests/openpgp/tofu/conflicting/1C005AF3-4.txt: New file.
++	* tests/openpgp/tofu/conflicting/1C005AF3-5.txt: New file.
++	* tests/openpgp/tofu/conflicting/B662E42F.gpg: New file.
++	* tests/openpgp/tofu/conflicting/B662E42F-secret.gpg: New file.
++	* tests/openpgp/tofu/conflicting/B662E42F-1.txt: New file.
++	* tests/openpgp/tofu/conflicting/B662E42F-2.txt: New file.
++	* tests/openpgp/tofu/conflicting/B662E42F-3.txt: New file.
++	* tests/openpgp/tofu/conflicting/B662E42F-4.txt: New file.
++	* tests/openpgp/tofu/conflicting/B662E42F-5.txt: New file.
++	* tests/openpgp/tofu/conflicting/BE04EB2B.gpg: New file.
++	* tests/openpgp/tofu/conflicting/BE04EB2B-secret.gpg: New file.
++	* tests/openpgp/tofu/conflicting/BE04EB2B-1.txt: New file.
++	* tests/openpgp/tofu/conflicting/BE04EB2B-2.txt: New file.
++	* tests/openpgp/tofu/conflicting/BE04EB2B-3.txt: New file.
++	* tests/openpgp/tofu/conflicting/BE04EB2B-4.txt: New file.
++	* tests/openpgp/tofu/conflicting/BE04EB2B-5.txt: New file.
++	* tests/openpgp/tofu/conflicting/README: New file.
++	* tests/openpgp/tofu.scm: Update accordingly.
++
++	g10: Remove dead code.
++	* g10/tofu.c (tofu_set_policy_by_keyid): Remove function.
++
++2016-12-05  Werner Koch  <wk at gnupg.org>
++
++	gpg: New option --quick-set-expire.
++	* g10/gpg.c (aQuickSetExpire): New.
++	(opts): New option --quick-set-expire.
++	(main): Implement option.
++	* g10/keyedit.c (menu_expire): Add args FORCE_MAINKEY and
++	NEWEXPIRATION.  Change semantics of the return value.  Change caller.
++	(keyedit_quick_set_expire): New.
++
++2016-12-05  Justus Winter  <justus at g10code.com>
++
++	tests: New test for '--enarmor' and '--dearmor'.
++	* tests/openpgp/Makefile.am (XTESTS): Add new test.
++	* tests/openpgp/enarmor.scm: New file.
++
++2016-12-03  Werner Koch  <wk at gnupg.org>
++
++	gpg: Fix error code arg in ERRSIG status line.
++	* g10/mainproc.c (check_sig_and_print): Use gpg_err_code to return an
++	error code in ERRSIG.
++
++2016-12-02  Werner Koch  <wk at gnupg.org>
++
++	gpg: New option --default-new-key-algo.
++	* common/openpgp-oid.c (openpgp_is_curve_supported): Add optional arg
++	R_ALGO and change all callers.
++	* common/util.h (GPG_ERR_UNKNOWN_FLAG): New error code.
++	* g10/options.h (struct opt): Add field DEF_NEW_KEY_ALGO.
++	* g10/gpg.c (oDefaultNewKeyAlgo): New enum.
++	(opts): New option "--default-new-key-algo".
++	(main): Set the option.
++	* g10/keygen.c: Remove DEFAULT_STD_ FUTURE_STD_ constants and replace
++	them by ...
++	(DEFAULT_STD_KEY_PARAM, FUTURE_STD_KEY_PARAM): new string constants.
++	(get_keysize_range): Remove arg R_DEF and return that value instead.
++	Change all callers.
++	(gen_rsa): Use get_keysize_range instead of the removed
++	DEFAULT_STD_KEYSIZE.
++	(parse_key_parameter_part): New function.
++	(parse_key_parameter_string): New function.
++	(quick_generate_keypair): Refactor using parse_key_parameter_string.
++	(generate_keypair): Ditto.
++	(parse_algo_usage_expire): Ditto.
++
++2016-12-02  Neal H. Walfield  <neal at g10code.com>
++
++	g10: Improve debugging output.
++	* g10/tofu.c (string_to_long): Improve debugging output.
++	(string_to_ulong): Likewise.
++
++2016-12-01  Neal H. Walfield  <neal at g10code.com>
++
++	g10: In the TOFU module, make strings easier to translate.
++	* g10/tofu.c: Remove dead code.
++	(time_ago_str): Simplify implementation since we only want the most
++	significant unit.
++	(format_conflict_msg_part1): Use ngettext.
++	(ask_about_binding): Likewise and only emit full sentences.
++	(show_statistics): Likewise.
++
++2016-12-01  Werner Koch  <wk at gnupg.org>
++
++	dirmngr: Add option --standard-resolver.
++	* dirmngr/dirmngr.c (oStandardResolver): New constant.
++	(opts): New option --standard-resolver.
++	(parse_rereadable_options): Set option.
++	* dirmngr/dns-stuff.c: Refactor all code to support the new option.
++	(standard_resolver): New var.
++	(enable_standard_resolver, standard_resolver_p): New func.
++	* dirmngr/http.c (connect_server): Remove USE_DNS_SRV build
++	conditional.
++	* dirmngr/ks-engine-hkp.c (map_host): Ditto.
++	* dirmngr/server.c (cmd_getinfo) <dnsinfo>: Take care of new option
++	* configure.ac (HAVE_ADNS_IF_TORMODE): Remove var ADNSLIB.  ac_define
++	USE_ADNS in the adns checking code.  Remove options --disable-dns-srv
++	and --disable-dns-cert.  Always look for the system resolver.  Print
++	warning if no system resolver was found.
++	(USE_DNS_CERT, USE_DNS_SRV): Remove ac_defines.
++	(HAVE_SYSTEM_RESOLVER): New ac_define.
++	(USE_DNS_SRV): Remove am_conditional; not used anyway.
++
++	gpg: Let only Dirmngr decide whether CERT is supported.
++	* g10/getkey.c (parse_auto_key_locate): Do not build parts depending
++	on USE_DNS_CERT.
++
++2016-12-01  Justus Winter  <justus at g10code.com>
++
++	tests,build: Fix distcheck.
++	* tests/openpgp/Makefile.am (sample_msgs): Add messages required for
++	the new test 'verify-multifile.scm'.
++
++	tests: Add test for '--verify --multifile'.
++	* tests/openpgp/Makefile.am (XTESTS): Add new test.
++	* tests/openpgp/verify-multifile.scm: New file.
++
++2016-11-30  Justus Winter  <justus at g10code.com>
++
++	tests: Add test for '--encrypt --multifile'.
++	* tests/openpgp/Makefile.am (XTESTS): Add new test.
++	* tests/openpgp/encrypt-multifile.scm: New file.
++
++2016-11-29  Werner Koch  <wk at gnupg.org>
++
++	agent,dirmngr: Tiny restructuring.
++	* agent/gpg-agent.c (handle_connections): Add a comment.
++	* dirmngr/dirmngr.c (main): Move assuan_sock_close of the listening
++	socket to ...
++	(handle_connections): here.  Add a comment why we keep the
++	listening socket open during a shutdown.
++
++	agent,dirmngr: Handle corner case in shutdown mode.
++	* agent/gpg-agent.c (handle_connections): Keep on selecting on the
++	inotify fd even when a shutdown is pending.
++	* dirmngr/dirmngr.c (handle_connections): Ditto.  Also simplifyy the
++	use of the HAVE_INOTIFY_INIT cpp conditional.
++
++	gpgsm: Allow decryption with a card returning a PKCS#1 stripped key.
++	* sm/decrypt.c (prepare_decryption): Handle a 16 byte session key.
++
++	agent,w32: Initialize nPth in server mode.
++	* agent/gpg-agent.c (main) [W32]: Call initialize_modules in server
++	mode.
++
++	gpg: Make --decrypt with output '-&nnnn' work.
++	* g10/plaintext.c (get_output_file): Check and open special filename
++	before falling back to stdout.
++
++	gpg,sm: Merge the two versions of check_special_filename.
++	* sm/gpgsm.c (check_special_filename): Move to ..
++	* common/sysutils.c (check_special_filename): here.  Add arg
++	NOTRANSLATE.
++	(allow_special_filenames): New local var.
++	(enable_special_filenames): New public functions.
++	* sm/gpgsm.c (allow_special_filenames): Remove var.
++	(main): Call enable_special_filenames instead of setting the var.
++	(open_read, open_es_fread, open_es_fwrite): Call
++	check_special_filename with 0 for NOTRANSLATE.
++	* common/iobuf.c (special_names_enabled): Remove var.
++	(iobuf_enable_special_filenames): Remove func.
++	(check_special_filename): Remove func.
++	(iobuf_is_pipe_filename): Call new version of the function with
++	NOTRANSLATE set.
++	(do_open): Ditto.
++	* g10/gpg.c (main): Call enable_special_filenames instead of
++	iobuf_enable_special_filenames.
++	* g10/gpgv.c (main): Ditto.
++
++2016-11-29  Justus Winter  <justus at g10code.com>
++
++	g10: Fix memory leak.
++	* g10/decrypt.c (decrypt_messages): Properly decrease the reference
++	count of the armor filters after pushing them.
++
++	tools,build: Build WKS tools against libintl.
++	* tools/Makefile.am (gpg_wks_server_LDADD): Link against libintl.
++	(gpg_wks_client_LDADD): Likewise.
++
++2016-11-29  Neal H. Walfield  <neal at g10code.com>
++
++	Improve some comments.
++
++	g10: Extend TOFU_STATS to always show the validity.
++	* doc/DETAILS (TOFU_STATS): Rename the VALIDITY field to SUMMARY.  Add
++	a new field called VALIDITY.
++	* g10/tofu.c (write_stats_status): Update output accordingly.
++
++2016-11-29  Justus Winter  <justus at g10code.com>
++
++	tests: Add test for '--decrypt --multifile'.
++	* tests/openpgp/Makefile.am (XTESTS): Add new test.
++	* tests/openpgp/decrypt-multifile.scm: New file.
++
++	gpgscm: Avoid truncating pointers.
++	* tests/gpgscm/scheme.c (_alloc_cellseg): Avoid truncating pointers on
++	systems where sizeof(unsigned long) < sizeof(void *).
++
++2016-11-29  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
++
++	dirmngr: Lazily launch ldap reaper thread.
++	* dirmngr/dirmngr.c (main): Avoid calling ldap_wrapper_launch_thread()
++	Before we need it.
++	* dirmngr/ldap-wrapper.c (ldap_wrapper): Call
++	ldap_wrapper_launch_thread() just in time (before any attempt to use
++	an ldap subprocess).
++
++2016-11-29  Werner Koch  <wk at gnupg.org>
++
++	build: Remove more keywords from the generated ChangeLog.
++	* build-aux/gitlog-to-changelog (parse_amend_file): Generalize keyword
++	removal.
++
++2016-11-28  Justus Winter  <justus at g10code.com>
++
++	tests: Add test for the ssh key export.
++	* tests/openpgp/Makefile.am (XTESTS): Add new test.
++	(sample_keys): Add new files.
++	* tests/openpgp/samplekeys/authenticate-only.pub.asc: New file.
++	* tests/openpgp/samplekeys/authenticate-only.sec.asc: Likewise.
++	* tests/openpgp/ssh-export.scm: Likewise.
++
++	g10: Fix iteration over getkey results.
++	* g10/getkey.c (getkey_next): Only ask 'lookup' for the exact match if
++	our caller requested the key.  Fixes a crash in 'lookup'.
++
++	tests: Rename ssh test.
++	* tests/openpgp/ssh.scm: Rename to 'ssh-import.scm'.
++	* tests/openpgp/Makefile (XTESTS): Likewise.
++
++2016-11-25  NIIBE Yutaka  <gniibe at fsij.org>
++
++	scd: Support OpenPGP card V3 for RSA.
++	* scd/app-openpgp.c (struct app_local_s): Remove max_cmd_data and
++	max_rsp_data fields as Extended Capabilities bits are different.
++	(get_cached_data) Use extcap.max_certlen_3.
++	(get_one_do): Don't use exmode=1.
++	(determine_rsa_response): New.
++	(get_public_key, do_genkey): Call determine_rsa_response.
++	(do_sign): Use keyattr[0].rsa.n_bits / 8, instead of max_rsp_data.
++	(do_auth): Use keyattr[2].rsa.n_bits / 8, instead of max_rsp_data.
++	(do_decipher): Likewise with Use keyattr[1].rsa.n_bits / 8.
++	(show_caps): Remove max_cmd_data and max_rsp_data.
++	(app_select_openpgp): Likewise.
++
++2016-11-23  Justus Winter  <justus at g10code.com>
++
++	gpgscm: Make 'reverse' compatible with 'reverse_in_place'.
++	* tests/gpgscm/scheme.c (reverse): Update prototype, add terminator
++	argument.
++	(opexe_4): Update callsite.
++
++	gpgscm: Clean sweeped cells.
++	* tests/gpgscm/scheme.c (gc): Zero typeflag and car of free cells.
++
++	gpgscm: Fix initialization of 'sink'.
++	* tests/gpgscm/scheme.c (scheme_init_custom_alloc): Also initialize
++	cdr.
++
++2016-11-23  Neal H. Walfield  <neal at g10code.com>
++
++	g10: Avoid gratuitously loading a keyblock when it is already available.
++	* g10/trust.c (get_validity): Add new, optional parameter KB.  Only
++	load the keyblock if KB is NULL.  Update callers.
++	(get_validity): Likewise.
++	* g10/trustdb.c (tdb_get_validity_core): Likewise.
++
++2016-11-22  Neal H. Walfield  <neal at g10code.com>
++
++	g10: Use es_fopen instead of open.
++	* g10/tofu.c: Don't include <utime.h>, <fcntl.h> or <unistd.h>.
++	(busy_handler): Replace use of open with es_fopen.
++
++	g10: If the set of UTKs changes, invalidate any changed policies.
++	* g10/trustdb.c (tdb_utks): New function.
++	* g10/tofu.c (check_utks): New function.
++	(initdb): Call it.
++	* tests/openpgp/tofu.scm: Modify test to check the effective policy of
++	keys whose effective policy changes when we change the set of UTKs.
++
++2016-11-22  NIIBE Yutaka  <gniibe at fsij.org>
++
++	scd: Fix receive buffer size.
++	* scd/apdu.c (send_le): Fix the size, adding two for status
++	bytes to Le.
++
++2016-11-22  Justus Winter  <justus at g10code.com>
++
++	gpgscm: Refactor.
++	* tests/gpgscm/scheme.c (opexe_0): Reduce code duplication.
++
++	gpgscm: Fix property lists.
++	* tests/gpgscm/opdefines.h (put, get): Check arguments.  Also rename
++	to 'set-symbol-property' and 'symbol-property', the names used by
++	Guile, because put and get are too unspecific.
++	* tests/gpgscm/scheme.c (hasprop): Only symbols have property lists.
++	(get_property): New function.
++	(set_property): Likewise.
++	(opexe_4): Use the new functions.
++
++	gpgscm: Fix installation of error handler.
++	* tests/gpgscm/ffi.scm: Set '*error-hook*' again so that the
++	interpreter will use our function.
++
++	gpgscm: Use a static pool of cells for small integers.
++	* tests/gpgscm/scheme-private.h (struct scheme): New fields for the
++	static integer cells.
++	* tests/gpgscm/scheme.c (_alloc_cellseg): New function.
++	(alloc_cellseg): Use the new function.
++	(MAX_SMALL_INTEGER): New macro.
++	(initialize_small_integers): New function.
++	(mk_small_integer): Likewise.
++	(mk_integer): Return a small integer if possible.
++	(_s_return): Do not free 'op' if it is a small integer.
++	(s_save): Use a small integer to box the opcode.
++	(scheme_init_custom_alloc): Initialize small integers.
++	(scheme_deinit): Free chunk of small integers.
++	* tests/gpgscm/scheme.h (USE_SMALL_INTEGERS): New macro.
++
++	tests: Delay querying the avaliable algorithms.
++	* tests/openpgp/defs.scm: Set verbosity earlier, turn 'all-*-algos'
++	into promises.
++	* tests/openpgp/conventional-mdc.scm: Force the promises.
++	* tests/openpgp/conventional.scm: Likewise.
++	* tests/openpgp/encrypt-dsa.scm: Likewise.
++	* tests/openpgp/encrypt.scm: Likewise.
++	* tests/openpgp/gpgtar.scm: Likewise.
++	* tests/openpgp/sigs.scm: Likewise.
++
++	g10: Fix memory leak.
++	* g10/tofu.c (tofu_notice_key_changed): Remove spurious duplicate call
++	to 'hexfingerprint'.
++
++2016-11-21  Neal H. Walfield  <neal at g10code.com>
++
++	g10: Cache the effective policy.  Recompute it when required.
++	* g10/tofu.c (initdb): Add column effective_policy to the bindings
++	table.
++	(record_binding): New parameters effective_policy and set_conflict.
++	Save the effective policy.  If SET_CONFLICT is set, then set conflict
++	according to CONFLICT.  Otherwise, preserve the current value of
++	conflict.  Update callers.
++	(get_trust): Don't compute the effective policy here...
++	(get_policy): ... do it here, if it was not cached.  Take new
++	parameters, PK, the public key, and NOW, the time that the operation
++	started.  Update callers.
++	(show_statistics): New parameter PK.  Pass it to get_policy.  Update
++	callers.
++	(tofu_notice_key_changed): New function.
++	* g10/gpgv.c (tofu_notice_key_changed): New stub.
++	* g10/import.c (import_revoke_cert): Take additional argument CTRL.
++	Pass it to keydb_update_keyblock.
++	* g10/keydb.c (keydb_update_keyblock): Take additional argument CTRL.
++	Update callers.
++	[USE_TOFU]: Call tofu_notice_key_changed.
++	* g10/test-stubs.c (tofu_notice_key_changed): New stub.
++	* tests/openpgp/tofu.scm: Assume that manually setting a binding's
++	policy to auto does not cause the tofu engine to forget about any
++	conflict.
++
++	g10: Correctly parameterize ngettext.
++	* g10/tofu.c (ask_about_binding): Correctly parameterize ngettext.
++
++	g10: Don't use the same variable for multiple SQL compiled statements.
++	* g10/tofu.c (struct tofu_dbs_s): Remove unused field
++	record_binding_update2.  Replace register_insert with
++	register_signature and register_encryption.
++	(tofu_register_signature): Don't use dbs->s.register_insert, but
++	dbs->s.register_signature.
++	(tofu_register_encryption): Don't use dbs->s.register_insert, but
++	dbs->s.register_encryption.
++
++	g10: Add a convenience function for checking if a key is a primary key.
++	* g10/keydb.h (pk_is_primary): New function.
++	* g10/tofu.c (get_trust): Use it.
++	(tofu_register_signature): Likewise.
++	(tofu_register_encryption): Likewise.
++	(tofu_set_policy): Likewise.
++	(tofu_get_policy): Likewise.
++
++2016-11-21  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
++
++	doc: Ship example gpg-agent-browser.socket in examples/systemd-user/.
++	* doc/Makefile.am: Ship gpg-agent-browser.socket alongside the other
++	systemd user service example files.
++
++2016-11-21  NIIBE Yutaka  <gniibe at fsij.org>
++
++	agent: Fix npth + daemon mode problem.
++	* agent/gpg-agent.c (main): Remove duplicated initialization in daemon
++	mode.
++
 +2016-11-18  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.16.
 +
 +2016-11-18  Ineiev  <ineiev at gnu.org>
 +
 +	po: Update Russian translation.
 +
 +2016-11-18  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: Fix flags to open for lock of ToFU.
 +	* g10/tofu.c (busy_handler): Fix the flags and utime is not needed.
 +
 +2016-11-18  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Use a longer timer tick interval.
 +	* dirmngr/dirmngr.c (TIMERTICK_INTERVAL): Always use 60 seconds like
 +	we did for WindowsCE.
 +
 +2016-11-18  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	dirmngr: More w32 system daemon cleanup.
 +	* dirmngr/dirmngr.c (handle_tick): Remove w32 tests for
 +	shutdown_pending; no longer needed.
 +
 +2016-11-18  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: Fix creating a lock for ToFU.
 +	* g10/tofu.c (busy_handler): Add third argument which is mandatory for
 +	O_CREATE flag.
 +
 +	scd: Don't limit to ST-2xxx for PC/SC.
 +	* scd/apdu.c (pcsc_vendor_specific_init): Only check vender ID.
 +
 +2016-11-17  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	dirmngr: Use a default keyserver if none is explicitly set.
 +	* configure.ac: Define DIRMNGR_DEFAULT_KEYSERVER.
 +	* dirmngr/server.c (ensure_keyserver): Use it if no keyservers are set.
 +	* doc/dirmngr.texi: Document this behavior.
 +
 +	dirmngr: Add system CAs if no hkp-cacert is given.
 +	* dirmngr/dirmngr.c (http_session_new): If the user isn't talking to
 +	the HKPS pool, and they have not specified any hkp-cacert, then we
 +	should default to the system CAs, rather than nothing.
 +	* doc/dirmngr.texi: Document choice of CAs.
 +
 +	dirmngr: Register hkp-cacert even if the file doesn't exist yet.
 +	* dirmngr/dirmngr.c (parse_readable_options): If we're unable to turn
 +	an argument for hkp-cacert into an absolute filename, terminate
 +	completely.
 +	* dirmngr/http.c (http_register_tls_ca): Show a warning if file is not
 +	immediately accessible, but register it anyway.
 +
 +2016-11-17  Justus Winter  <justus at g10code.com>
 +
 +	gpgscm: Re-enable the garbage collector in case of errors.
 +	* tests/gpgscm/scheme.c (opexe_0): Enable gc before calling 'Error_1'.
 +
- 	Fixes-commit: 83c184a66b73f312425b01008f0495610e5329a4
- 
 +	gpgscm: Fix string.
 +	* tests/gpgscm/scheme.c (type_to_string): Fix string.
 +
 +2016-11-17  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Auto-sownload the swdb.lst.
 +	* dirmngr/dirmngr.h (struct opt): Add field allow_version_check.
 +	* dirmngr/dirmngr.c (oAllowVersionCheck): New.
 +	(opts): Add --allow-version-check.
 +	(network_activity_seen): New variable.
 +	(parse_rereadable_options): Set opt.allow_version_check.
 +	(main) <aGPGConfList>: Do not anymore set the no change flag for
 +	Windows.  Add allow-version-check.
 +	(netactivity_action): Set network_activity_seen.
 +	(housekeeping_thread): Call dirmngr_load_swdb.
 +	* tools/gpgconf-comp.c (gc_options_dirmngr): Add allow-version-check.
 +	Make "use-tor" available at Basic level.
 +
 +	dirmngr: Improve downloading of swdb.lst.
 +	* dirmngr/loadswdb.c (time_of_saved_swdb): Aslo return the "verified"
 +	timestamp.
 +	(dirmngr_load_swdb): Avoid unnecessary disk or network access witout
 +	FORCE.  Do not update swdb.lst if it did not change.
 +
 +	gpgconf: Change the displayed names of the components.
 +
 +2016-11-16  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Add command to only load the swdb.
 +	* dirmngr/loadswdb.c: New.
 +	* dirmngr/Makefile.am (dirmngr_SOURCES): Add that file.
 +	* dirmngr/server.c: Remove includes cpparray.h and exectool.h.
 +	(cmd_loadswdb): New.
 +	(parse_version_number,parse_version_string): Remove.
 +	(my_mktmpdir, cmp_version): Remove.
 +	(fetch_into_tmpdir): Remove.
 +	(struct verify_swdb_parm_s): Remove.
 +	(verify_swdb_status_cb): Remove.
 +	(cmd_versioncheck): Remove.
 +	(register_commands): Register LOADSWDB.  Remove VERSIONCHECK.
 +
 +	scd,dirmngr: Keep the standard fds when daemonizing.
 +	* dirmngr/dirmngr.c (main): Before calling setsid do not close the
 +	standard fds but connect them to /dev/null.
 +	* scd/scdaemon.c (main): Ditto.  Noet that the old test for a log
 +	stream was even reverted.
 +
 +	common: Rename keybox_file_rename to gnupg_rename_file.
 +	* kbx/keybox-util.c (keybox_file_rename): Rename to ...
 +	* common/sysutils.c (gnupg_rename_file): this.  Change all callers.
 +
 +	wks: Always build gpg-wks-client.
 +	* tools/Makefile.am (gpg_wks_client): Remove macro.
 +	(libexec_PROGRAMS): Add gpg-wks-client.
 +
 +	gpg: New option --override-session-key-fd.
 +	* g10/gpg.c (oOverrideSessionKeyFD): New.
 +	(opts): Add option --override-session-key-fd.
 +	(main): Handle that option.
 +	(read_sessionkey_from_fd): New.
 +
 +2016-11-15  Werner Koch  <wk at gnupg.org>
 +
 +	gpgv: New option --enable-special-filenames.
 +	* g10/gpgv.c (oEnableSpecialFilenames): New.
 +	(opts): Add option --enable-special-filenames.
 +	(main): Implement that option.
 +
 +	gpg: Add new compliance mode "de-vs".
 +	* g10/options.h (CO_DE_VS): New.
 +	(GNUPG): Also allow CO_DE_VS.
 +	* g10/gpg.c (oDE_VS): New.
 +	(parse_compliance_option): Add "de-vs".
 +	(set_compliance_option): Set "de-vs".
 +	* g10/misc.c (compliance_option_string): Return a description string.
 +	(compliance_failure): Ditto.
 +	* g10/keygen.c (ask_algo): Take care of CO_DE_VS.
 +	(get_keysize_range): Ditto.
 +	(ask_curve): Add new field to CURVES and trun flags into bit flags.
 +	Allow only Brainpool curves in CO_DE_VS mode.
 +
 +	gpg: Use usual free semantics for packet structure free functions.
 +	* g10/free-packet.c (free_attributes): Turn function into a nop for a
 +	NULL arg.
 +	(free_user_id): Ditto.
 +	(free_compressed): Ditto.
 +	(free_encrypted): Ditto.
 +	(free_plaintext): Ditto.
 +	(release_public_key_parts): Avoid extra check for NULL.
 +	* g10/getkey.c (get_best_pubkey_byname): Ditto.
 +
 +2016-11-15  Justus Winter  <justus at g10code.com>
 +
 +	g10: Optimize key iteration.
 +	* g10/getkey.c (get_best_pubkey_byname): Use the node returned by
 +	'getkey_next' instead of doing another lookup.
 +
 +	g10: Fix memory leak.
 +	* g10/getkey.c (finish_lookup): Clarify that we do not return a
 +	reference.
 +	(lookup): Clarify the relation between RET_KEYBLOCK and RET_FOUND_KEY.
 +	Check arguments.  Actually release the node if it is not returned.
 +
 +	g10: Fix iteration over getkey results.
 +	* g10/getkey.c (getkey_next): Fix invocation of 'lookup'.  If we want
 +	to use RET_FOUND_KEY, RET_KEYBLOCK must be valid.
 +
- 	Fixes-commit: 8ea72a776a88f3c851e812d258355be80caa1bc1
- 
 +	g10: Fix use-after-free.
 +	* g10/getkey.c (pubkey_cmp): Make a copy of the user id.
 +	(get_best_pubkey_byname): Free the user ids.
 +
 +2016-11-15  Werner Koch  <wk at gnupg.org>
 +
 +	sm: New stub option --compliance.
 +	* sm/gpgsm.c (oCompliance): New.
 +	(opts): Add "--compliance".
 +	(main): Implement as stub.
 +
 +2016-11-15  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: Fix memory leak.
 +	* g10/keyedit.c (menu_adduid): Don't copy 'sig'.
 +
 +2016-11-15  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: New option --compliance.
 +	* g10/gpg.c (oCompliance): New.
 +	(opts): Add "--compliance".
 +	(parse_tofu_policy): Use a generic description string for "help".
 +	(parse_compliance_option): New.
 +	(main): Add option oCompliance.  Factor out code for compliance
 +	setting to ...
 +	(set_compliance_option): new.
 +
 +2016-11-15  Justus Winter  <justus at g10code.com>
 +
 +	g10: Fix memory leak.
 +	* g10/keyedit.c (menu_adduid): Deallocate 'sig'.
 +
 +	gpgscm: Mark cells requiring finalization.
 +	* tests/gpgscm/scheme.c (T_FINALIZE): New macro.
 +	(mk_port): Use the new macro.
 +	(mk_foreign_object): Likewise.
 +	(mk_counted_string): Likewise.
 +	(mk_empty_string): Likewise.
 +	(gc): Only call 'finalize_cell' for cells with the new flag.
 +
 +	gpgscm: Recover more cells.
 +	* tests/gpgscm/scheme.c (_s_return): Recover the cell holding the
 +	opcode.
 +
- 	Fixes-commit: e0cbd3389e2dd6ec19ee3a4c7bad81fa0f1907f5
- 
 +2016-11-14  Justus Winter  <justus at g10code.com>
 +
 +	g10: Fix memory leak.
 +	* g10/mainproc.c (check_sig_and_print): Free 'pk'.
 +
- 	Fixes-commit: 37e3c897252babc203447be9d2f286a4507875ad
- 
 +	gpgscm: Avoid cell allocation overhead.
 +	* tests/gpgscm/scheme-private.h (struct scheme): New fields
 +	'inhibit_gc', 'reserved_cells', and 'reserved_lineno'.
 +	* tests/gpgscm/scheme.c (GC_ENABLED): New macro.
 +	(USE_GC_LOCKING): Likewise.
 +	(gc_reservations): Likewise.
 +	(gc_reservation_failure): New function.
 +	(_gc_disable): Likewise.
 +	(gc_disable): New macro.
 +	(gc_enable): Likewise.
 +	(gc_enabled): Likewise.
 +	(gc_consume): Likewise.
 +	(get_cell_x): Consume reserved cell if garbage collection is disabled.
 +	(_get_cell): Assert that gc is enabled.
 +	(get_cell): Only record cell in the list of recently allocated cells
 +	if gc is enabled.
 +	(get_vector_object): Likewise.
 +	(gc): Assert that gc is enabled.
 +	(s_return): Add comment, adjust call to '_s_return'.
 +	(s_return_enable_gc): New macro.
 +	(_s_return): Add flag 'enable_gc' and re-enable gc if set.
 +	(oblist_add_by_name): Use the new facilities to protect the
 +	allocations.
 +	(new_frame_in_env): Likewise.
 +	(new_slot_spec_in_env): Likewise.
 +	(s_save): Likewise.
 +	(opexe_0): Likewise.
 +	(opexe_1): Likewise.
 +	(opexe_2): Likewise.
 +	(opexe_5): Likewise.
 +	(opexe_6): Likewise.
 +	(scheme_init_custom_alloc): Initialize the new fields.
 +
 +2016-11-14  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix status info encoding.
 +	* scd/command.c (send_status_info): Do percent plus encoding correctly.
 +
 +2016-11-12  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Improve concurrency when Libgcrypt 1.8 is used.
 +	* agent/gpg-agent.c (thread_init_once): Tell Libgcrypt to reinit the
 +	system call clamp.
 +	(agent_libgcrypt_progress_cb): Do not sleep if Libgcrypt is recent
 +	enough.
 +
 +2016-11-11  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Kludge to mitigate blocking calls in Libgcrypt.
 +	* agent/gpg-agent.c (agent_libgcrypt_progress_cb): Sleep for 100ms on
 +	"need_entropy".
 +
 +	dirmngr: Prepare to trigger jobs by network activity.
 +	* dirmngr/http.c (netactivity_cb): New.
 +	(http_register_netactivity_cb): New.
 +	(notify_netactivity): New.
 +	(connect_server): Call that function.
 +	* dirmngr/dirmngr.c (main): Call http_register_netactivity_cb.
 +	(netactivity_action): New stub handler.
 +
 +2016-11-11  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	agent: Clean up comments.
 +	* agent/agent.h: Clean up comments.
 +
 +2016-11-10  Werner Koch  <wk at gnupg.org>
 +
 +	gpg,sm: Add STATUS_ERROR keydb_search and keydb_add-resource.
 +	* g10/keydb.c (keydb_add_resource): Make ANY_REGISTERED
 +	file-global.  Write a STATUS_ERROR.
 +	(maybe_create_keyring_or_box): Check for non-accessible but existant
 +	file.
 +	(keydb_search): Write a STATUS_ERROR if no keyring has been registered
 +	but continue to return NOT_FOUND.
 +	* sm/keydb.c (keydb_add_resource): Rename ANY_PUBLIC to ANY_REGISTERED
 +	and make file-global.  Write a STATUS_ERROR.
 +	(keydb_search): Write a STATUS_ERROR if no keyring has been registered
 +	but continue to return NOT_FOUND.  Also add new arg CTRL and change
 +	all callers to pass it down.
 +
 +	sm: Remove unused arg SECRET from keydb functions.
 +	* sm/keydb.c (struct resource_item): Remove field 'secret'.
 +	(keydb_add_resource): Remove arg 'secret' and change all callers.
 +	(keydb_new): Ditto.
 +
 +2016-11-10  Justus Winter  <justus at g10code.com>
 +
 +	gpgscm: Recover cells from the list of recently allocated cells.
 +	* tests/gpgscm/scheme.c (ok_to_freely_gc): Recover cells.
 +
 +	gpgscm: Recover cells used to maintain interpreter state.
 +	* tests/gpgscm/scheme.c (free_cell): New function.
 +	(free_cons): Likewise.
 +	(_s_return): Use the new function to recover cells used to save the
 +	state of the interpreter in 's_save'.  This reduces the need to do a
 +	garbage collection considerably.
 +
 +	gpgscm: Reduce opcode dispatch overhead.
 +	* tests/gpgscm/scheme.c (s_thread_to): New macro.
 +	(CASE): Likewise.
 +	(opexe_[0-6]): Use 'CASE' instead of 'case' statements, replace
 +	's_goto' with 's_thread_to' where applicable.
 +
 +	gpgscm: Make the compile-hook configurable.
 +	* tests/gpgscm/scheme-private.h (struct scheme): Make field
 +	'COMPILE_HOOK' optional.
 +	* tests/gpgscm/scheme.c (opexe_0): Fix guard.
 +	(scheme_init_custom_alloc): Conditionally initialize 'COMPILE_HOOK'.
 +	* tests/gpgscm/scheme.h (USE_COMPILE_HOOK): Define to 1 by default.
 +
 +	gpgscm: Drop obsolete commented-out code.
 +	* tests/gpgscm/scheme.c (opexe_5): Drop obsolete code.
 +
 +	gpgscm: Remove dubious stack implementation.
 +	* tests/gpgscm/scheme-private.h (struct scheme): Remove related fields.
 +	* tests/gpgscm/scheme.c: Drop all !USE_SCHEME_STACK code.
 +	* tests/gpgscm/scheme.h (USE_SCHEME_STACK): Remove macro.
 +
 +2016-11-10  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Improve error message for --quick-gen-key.
 +	* g10/keygen.c (parse_algo_usage_expire): Use a different error
 +	message for an unknown algorithm name.
 +
 +	dirmngr: Improve concurrency in the non-adns case.
 +	* dirmngr/dns-stuff.c (map_adns_status_to_gpg_error): New.
 +	(resolve_name_adns, get_dns_cert, get_dns_cname): Use that function.
 +	(getsrv) [!USE_ADNS]: Call res_query outside of nPth.
 +
 +2016-11-08  Justus Winter  <justus at g10code.com>
 +
 +	tests: Fix environment setup.
 +	* tests/openpgp/defs.scm (setup-legacy-environment): Do not call
 +	'setup-environment' because that will start the agent, and hence
 +	register the atexit function twice.
 +
 +	Fixes: a55393cb5f4b331cb3a715c7d9a8b91f7606f337
 +
 +	tests: Log and display output from tests when run in parallel.
 +	* tests/openpgp/run-tests.scm (test): Add field 'logfd'.
 +	(test::new, test::set-*): Adapt accordingly.
 +	(test::set-logfd): New function.
 +	(test::open-log-file): Likewise.
 +	(test::run-sync): Use the new function.
 +	(test::run-async): Likewise.
 +	(test::report): Replay the log.
 +	(run-tests-parallel): Reverse the results to restore the original
 +	order.
 +
 +	tests: Simplify test.
 +	* tests/openpgp/issue2417.scm: Simplify.
 +
 +	gpgscm: Expose seek and associated constants.
 +	* tests/gpgscm/ffi.c (do_seek): New function.
 +	(ffi_init): Expose 'seek' and 'SEEK_{SET,CUR,END}'.
 +	* tests/gpgscm/lib.scm: Document the new function.
 +
 +	gpgscm: Fix error message.
 +	* tests/gpgscm/ffi.c (do_wait_processes): Fix and improve error
 +	messages.
 +
 +	tests,w32: Make cleanup more robust.
 +	* tests/openpgp/run-tests.scm (run-tests-parallel): Catch errors when
 +	removing the working directory.  On Windows this can fail if there is
 +	still a process using one of the files there.
 +	(run-tests-sequential): Likewise.
 +
 +	common,w32: Simplify locking.
 +	* common/asshelp.c (lock_spawning): Use the same code on Windows that
 +	we use on all other platforms.
 +	(unlock_spawning): Likewise.
 +
 +2016-11-07  Justus Winter  <justus at g10code.com>
 +
 +	tests: Write a log file for each test.
 +	* tests/openpgp/Makefile.am (CLEANFILES): Delete logs.
 +	* tests/openpgp/run-tests.scm (test::run-sync): Write logs.
 +
 +	gpgscm: Generalize splice to write to multiple sinks.
 +	* tests/gpgscm/ffi.c (ordinal_suffix): New function.
 +	(do_splice): Generalize splice to write to multiple sinks.
 +	* tests/gpgscm/lib.scm (splice): Document this fact.
 +
 +	gpgscm: Drop 'len' argument from splice.
 +	* tests/gpgscm/ffi.c (do_splice): Drop 'len' argument, no-one uses it.
 +	* tests/gpgscm/lib.scm (splice): Document foreign function.
 +
 +	tests: Move environment creation and teardown into each test.
 +	* tests/gpgscm/tests.scm (log): New function.
 +	* tests/openpgp/run-tests.scm (run-tests-parallel): Do not run the
 +	startup and teardown scripts.
 +	(run-tests-sequential): Likewise.
 +	* tests/openpgp/setup.scm: Move all functions...
 +	* tests/openpgp/defs.scm: ... here and make them less verbose.
 +	(setup-environment): New function.
 +	(setup-legacy-environment): Likewise.
 +	(start-agent): Make less verbose, run 'stop-agent' at interpreter
 +	exit.
 +	(stop-agent): Make less verbose.
 +	* tests/openpgp/finish.scm: Drop file.
 +	* tests/openpgp/Makefile.am (EXTRA_DIST): Drop removed file.
 +	* tests/openpgp/4gb-packet.scm: Use 'setup-environment' or
 +	'setup-legacy-environment' as appropriate.
 +	* tests/openpgp/armdetach.scm: Likewise.
 +	* tests/openpgp/armdetachm.scm: Likewise.
 +	* tests/openpgp/armencrypt.scm: Likewise.
 +	* tests/openpgp/armencryptp.scm: Likewise.
 +	* tests/openpgp/armor.scm: Likewise.
 +	* tests/openpgp/armsignencrypt.scm: Likewise.
 +	* tests/openpgp/armsigs.scm: Likewise.
 +	* tests/openpgp/clearsig.scm: Likewise.
 +	* tests/openpgp/conventional-mdc.scm: Likewise.
 +	* tests/openpgp/conventional.scm: Likewise.
 +	* tests/openpgp/decrypt-dsa.scm: Likewise.
 +	* tests/openpgp/decrypt.scm: Likewise.
 +	* tests/openpgp/default-key.scm: Likewise.
 +	* tests/openpgp/detach.scm: Likewise.
 +	* tests/openpgp/detachm.scm: Likewise.
 +	* tests/openpgp/ecc.scm: Likewise.
 +	* tests/openpgp/encrypt-dsa.scm: Likewise.
 +	* tests/openpgp/encrypt.scm: Likewise.
 +	* tests/openpgp/encryptp.scm: Likewise.
 +	* tests/openpgp/export.scm: Likewise.
 +	* tests/openpgp/finish.scm: Likewise.
 +	* tests/openpgp/genkey1024.scm: Likewise.
 +	* tests/openpgp/gpgtar.scm: Likewise.
 +	* tests/openpgp/gpgv-forged-keyring.scm: Likewise.
 +	* tests/openpgp/import.scm: Likewise.
 +	* tests/openpgp/issue2015.scm: Likewise.
 +	* tests/openpgp/issue2417.scm: Likewise.
 +	* tests/openpgp/issue2419.scm: Likewise.
 +	* tests/openpgp/key-selection.scm: Likewise.
 +	* tests/openpgp/mds.scm: Likewise.
 +	* tests/openpgp/multisig.scm: Likewise.
 +	* tests/openpgp/quick-key-manipulation.scm: Likewise.
 +	* tests/openpgp/seat.scm: Likewise.
 +	* tests/openpgp/shell.scm: Likewise.
 +	* tests/openpgp/signencrypt-dsa.scm: Likewise.
 +	* tests/openpgp/signencrypt.scm: Likewise.
 +	* tests/openpgp/sigs-dsa.scm: Likewise.
 +	* tests/openpgp/sigs.scm: Likewise.
 +	* tests/openpgp/ssh.scm: Likewise.
 +	* tests/openpgp/tofu.scm: Likewise.
 +	* tests/openpgp/use-exact-key.scm: Likewise.
 +	* tests/openpgp/verify.scm: Likewise.
 +	* tests/openpgp/version.scm: Likewise.
 +	* tests/openpgp/issue2346.scm: Likewise and simplify.
 +
 +	tests: Do not allow tests to be run in a shared environment.
 +	* tests/openpgp/README: Update.
 +	* tests/openpgp/run-tests.scm (run-tests-parallel-shared): Drop
 +	function.
 +	(run-tests-parallel-isolated): Rename to 'run-tests-parallel'.
 +	(run-tests-sequential-shared): Drop function.
 +	(run-tests-sequential-isolated): Rename to 'run-tests-sequential'.
 +
 +	tests: Fix build.
 +	* tests/openpgp/Makefile.am: Drop dependency on 'mk-tdata'.
 +
 +	Fixes: 70215ff470c82d144e872057dfa5a478cc9195f2
 +
 +2016-11-07  Werner Koch  <wk at gnupg.org>
 +
 +	wks: Encrypt all client mails also the target key,
 +	* tools/gpg-wks-client.c (encrypt_response): Add arg FINGERPRINT.
 +	(send_confirmation_response): Ditto.
 +	(process_confirmation_request): Parse out fingerprint and pass
 +	send_confirmation_response.
 +
 +2016-11-07  Justus Winter  <justus at g10code.com>
 +
 +	tests,tools: Reimplement 'mk-tdata' in Scheme.
 +	* tests/openpgp/defs.scm (tools): Drop 'mk-tdata'.
 +	* tests/openpgp/setup.scm (make-test-data): New function.
 +	* tests/openpgp/verify.scm: Avoid 'mk-tdata'.
 +	* tools/Makefile.am (noinst_PROGRAMS): Drop 'mk-tdata'.
 +	* tools/mk-tdata.c: Drop file.
 +
 +	gpgscm,w32: Provide schemish file handling for binary files.
 +	* tests/gpgscm/lib.scm (call-with-binary-input-file): New function.
 +	(call-with-binary-output-file): Likewise.
 +
 +	gpgscm: Add support for pseudo-random numbers.
 +	* tests/gpgscm/ffi.c (do_getpid): New function.
 +	(do_srandom): Likewise.
 +	(random_scaled): Likewise.
 +	(do_random): Likewise.
 +	(do_make_random_string): Likewise.
 +	(ffi_init): Expose the new functions.
 +	* tests/gpgscm/lib.scm: Document the new functions.
 +
 +	g10: Fix crash.
 +	* g10/getkey.c (get_best_pubkey_byname): If 'get_pubkey_byname' does
 +	not return a getkey context, then it can return at most one key,
 +	therefore there is nothing to rank.  Also, always initialize '*retctx'
 +	to be on the safe side.
 +
- 	GnuPG-bug-id: 2828
 +	Fixes: ab89164be02012f1bf159c971853b8610e966301
 +
 +2016-11-04  Justus Winter  <justus at g10code.com>
 +
 +	gpgscm: Fix printing strings containing zero bytes.
 +	* tests/gpgscm/scheme.c (atom2str): Fix computing the length of Scheme
 +	strings.  Scheme strings can contain zero bytes.
 +
 +	gpgscm: Implement 'atexit'.
 +	* tests/gpgscm/ffi.scm (throw): Run *run-atexit-handlers* when
 +	terminating the interpreter.
 +	(*atexit-handlers*): New variable.
 +	(*run-atexit-handlers*): New function.
 +	(atexit): Likewise.
 +	* tests/gpgscm/main.c (main): Run *run-atexit-handlers* at normal
 +	interpreter shutdown.
 +
 +2016-11-04  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix length error for READKEY.
 +	* scd/app-openpgp.c (do_readkey): Decrement the length.
 +
 +	scd: Add --advanced option for READKEY.
 +	* scd/command.c (cmd_readkey) : Support ADVANCED arg.
 +	* scd/app.c (app_readcert): Add ADVANCED arg.
 +	* scd/app-openpgp.c (do_readkey): Implement ADVANCED arg.
 +	* scd/app-nks.c (do_readkey): Error return with GPG_ERR_NOT_SUPPORTED.
 +
 +2016-11-03  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Extend the PINENTRY_LAUNCHED inquiry and status.
 +	* agent/call-pinentry.c (start_pinentry): Get flavor and version and
 +	pass it to agent_inq_pinentry_launched.
 +	* agent/command.c (agent_inq_pinentry_launched): Add arg EXTRA.
 +	* g10/server.c (gpg_proxy_pinentry_notify): Print a new diagnostic.
 +
 +2016-11-03  Justus Winter  <justus at g10code.com>
 +
 +	g10: Improve and unify key selection for -r and --locate-keys.
 +	* g10/getkey.c (struct pubkey_cmp_cookie): New type.
 +	(key_is_ok, uid_is_ok, subkey_is_ok): New functions.
 +	(pubkey_cmp): Likewise.
 +	(get_best_pubkey_byname): Likewise.
 +	* g10/keydb.h (get_best_pubkey_byname): New prototype.
 +	* g10/keylist.c (locate_one): Use the new function.
 +	* g10/pkclist.c (find_and_check_key): Likewise.
 +	* tests/openpgp/Makefile.am (XTESTS): Add new test.
 +	(TEST_FILES): Add new files.
 +	* tests/openpgp/key-selection.scm: New file.
 +	* tests/openpgp/key-selection/0.asc: Likewise.
 +	* tests/openpgp/key-selection/1.asc: Likewise.
 +	* tests/openpgp/key-selection/2.asc: Likewise.
 +	* tests/openpgp/key-selection/3.asc: Likewise.
 +	* tests/openpgp/key-selection/4.asc: Likewise.
 +
 +	gpgscm,tests: Add new functions to the test environment.
 +	* tests/gpgscm/lib.scm (first, last, powerset): New functions.
 +	* tests/gpgscm/tests.scm (interactive-shell): New function.
 +	* tests/openpgp/Makefile.am (EXTRA_DIST): Add new file.
 +	* tests/openpgp/README: Document 'interactive-shell'.
 +	* tests/openpgp/shell.scm: New file.
 +
 +2016-11-03  Werner Koch  <wk at gnupg.org>
 +
 +	gpgconf: Add a new field to the --query-swdb output.
 +	* tools/gpgconf.c (query_swdb): Insert new field with the installed
 +	version.  Check that the supplied version does not contain a colon.
 +
 +2016-11-02  Werner Koch  <wk at gnupg.org>
 +
 +	gpgconf: Add command --query-swdb.
 +	* tools/gpgconf.c (aQuerySWDB): New.
 +	(opts): Add --query-swdb.
 +	(valid_swdb_name_p): New.
 +	(query_swdb): New.
 +	(main): Implement command --query-swdb.
 +
 +	common: Improve compare_string_versions.
 +	* common/stringhelp.c: Include limits.h.
 +	(compare_version_strings): Change semantics to behave like strcmp.
 +	Include the patch lebel in the comparison.  Allow checking a single
 +	version string.
 +	* common/t-stringhelp.c (test_compare_version_strings): Adjust test
 +	vectors and a few new vectors.
 +	* g10/call-agent.c (warn_version_mismatch): Adjust to new sematics.
 +	* g10/call-dirmngr.c (warn_version_mismatch): Ditto.
 +	* sm/call-agent.c (warn_version_mismatch): Ditto.
 +	* sm/call-dirmngr.c (warn_version_mismatch): Ditto.
 +
 +2016-11-02  Justus Winter  <justus at g10code.com>
 +
 +	gpgscm: Fix inclusion of readline header.
 +	* tests/gpgscm/ffi.c: Define magic macro to prevent the completion
 +	function from redefined.
 +
- 	GnuPG-bug-id: 2824
- 
 +2016-11-02  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	build: Fix misspelled dirmngr.
 +
 +	Spelling: correct spelling of "passphrase".
 +	There were several different variant spellings of "passphrase".  This
 +	should fix them all for all English text.
 +
 +	I did notice that po/it.po contains multiple instances of
 +	"passhprase", which also looks suspect to me, but i do not know
 +	Italian, so i did not try to correct it.
 +
 +2016-11-02  Justus Winter  <justus at g10code.com>
 +
 +	g10,w32: Fix build on Windows.
 +	* g10/tofu.c (begin_transaction): Use the new 'gnupg_usleep'.
 +
 +2016-10-31  Werner Koch  <wk at gnupg.org>
 +
 +	common: New function gnupg_usleep.
 +	* configure.ac (HAVE_NANOSLEEP): Test for nanosleep.
 +	* common/sysutils.c: Always include time.h.
 +	(gnupg_usleep): New.
 +
 +2016-10-31  Andre Heinecke  <aheinecke at intevation.de>
 +
 +	w32: Fix PKG_CONFIG_LIBDIR in --build-w32.
 +	* autogen.sh: Point pkg-config to the right location.
 +
 +2016-10-31  Neal H. Walfield  <neal at g10code.com>
 +
 +	g10: Avoid gratuitious SQLite aborts and starving writers.
 +	* g10/tofu.c: Include <time.h>, <utime.h>, <fcntl.h> and <unistd.h>.
 +	(tofu_dbs_s): Add fields want_lock_file and want_lock_file_ctime.
 +	(begin_transaction): Only yield if DBS->WANT_LOCK_FILE_CTIME has
 +	changed since we took the lock.  Don't use gpgrt_yield to yield, but
 +	sleep for 100ms.  After taking the batch lock, update
 +	DBS->WANT_LOCK_FILE_CTIME.  Also take the batch lock the first time we
 +	take the real lock.  When taking the real lock, use immediate not
 +	deferred mode to avoid gratuitious aborts.
 +	(end_transaction): When dropping the outermost real lock, drop the
 +	batch lock.
 +	(busy_handler): New function.
 +	(opendbs): Set the busy handler to it when opening the DB.  Initialize
 +	CTRL->TOFU.DBS->WANT_LOCK_FILE.
 +	(tofu_closedbs): Free DBS->WANT_LOCK_FILE.
 +
 +2016-10-30  Neal H. Walfield  <neal at g10code.com>
 +
 +	g10: Avoid reading in keys when possible.
 +	* g10/tofu.c (build_conflict_set): If CONFLICT_SET contains a single
 +	element, don't bother to check for cross sigs.  Add parameter PK.
 +	Update callers.
 +
 +	g10: Fix bit setting.
 +	* g10/tofu.c (build_conflict_set): Fix bit setting.
 +
 +2016-10-28  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Enable the Issuer Fingerprint from rfc4880bis.
 +	* g10/build-packet.c (build_sig_subpkt_from_sig): Always write the new
 +	Issuer Fingerprint sub-packet.
 +	* g10/mainproc.c (check_sig_and_print): Always consider that
 +	sub-packet.
 +
 +2016-10-27  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Fix signature checking.
 +	* dirmngr/server.c: Include cpparray.h.
 +	(verify_swdb_parm_s): New.
 +	(verify_swdb_status_cb): New.
 +	(cmd_versioncheck): Use gpgv to correclty verify the signature.
 +	Rename some variable to comply with GNU standards.
 +
 +	gpg: Verify multiple detached signatures with different hash algos.
 +	* g10/mainproc.c (proc_tree): Loose check.  Enable all algos.
 +
 +	common: Add GNUPG_MODULE_NAME_GPGV.
 +	* common/util.h (GNUPG_MODULE_NAME_GPGV): New.
 +	* common/homedir.c (gnupg_module_name): Implement.
 +
 +2016-10-27  Justus Winter  <justus at g10code.com>
 +
 +	g10: Fix iteration over getkey results.
 +	* g10/getkey.c (getkey_next): Return the public key in PK even if
 +	RET_KEYBLOCK is NULL.
 +
 +	g10: Assert preconditions.
 +	* g10/getkey.c (get_pubkey_byname): Assert preconditions.
 +
 +2016-10-27  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Do not implement --supervised in Windows.
 +	* dirmngr/dirmngr.c (opts) [W32]: Remove --supervised.
 +	(main) [W32]: Ditto.
 +
 +	common: Remove debug output from gnupg_get_socket_name.
 +	* common/sysutils.c (gnupg_get_socket_name): Remove debug message and
 +	use my_error_from_syserror.
 +
 +2016-10-27  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	dirmngr: ADNS error handling fix.
 +	* dirmngr/dns-stuff.c (resolve_name_adns, get_dns_cert, get_dns_cname):
 +	Use gpg_error and gpg_err_code_from_errno to compose the error value.
 +
 +2016-10-27  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Convey --quick option to dirmngr for --auto-key-retrieve.
 +	* g10/call-dirmngr.c (gpg_dirmngr_ks_get): Add arg 'quick'.
 +	(gpg_dirmngr_wkd_get): Ditto.
 +	* g10/keyserver.c (keyserver_get): Add arg 'quick'.
 +	(keyserver_get_chunk): Add arg 'quick'.
 +	(keyserver_import_fprint): Ditto.  Change callers to pass 0 for it.
 +	(keyserver_import_keyid): Ditto.
 +	(keyserver_import_wkd): Ditto.
 +	* g10/mainproc.c (check_sig_and_print): Call the 3 fucntions with
 +	QUICK set.
 +
 +2016-10-27  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	common: Fix gnupg_inotify_has_name, differently.
 +	* common/sysutils.c (gnupg_inotify_has_name): Use void * to stop the
 +	warning.
 +
 +	dirmngr: More ADNS error fix.
 +	* dirmngr/dns-stuff.c (get_dns_cert, getsrv, get_dns_cname): Fix return
 +	value.
 +
 +	dirmngr: Fix error return for ADNS.
 +	* dirmngr/dns-stuff.c (resolve_name_adns): Use RET for return value.
 +
 +	g10: Fix ECDH, clarifying the format.
 +	* g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Returns error when
 +	it's short.  Clarify the format.  Handle other prefixes correctly.
 +
 +	scd: Add 0x41 prefix for x-coordinate only result.
 +	* scd/app-openpgp.c (do_decipher): When it's x-coordinate only, add the
 +	prefix 0x41.
 +
 +2016-10-27  Arnaud Fontaine  <arnaud.fontaine at ssi.gouv.fr>
 +
 +	g10: ECDH shared point format.
 +	* g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Improve handling of
 +	ECDH shared point format.
 +
 +2016-10-27  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	dirmngr: Implement --supervised command (for systemd, etc).
 +	* dirmngr/dirmngr.c (main): Add new --supervised command, which is a
 +	mode designed for running under a process supervision system like
 +	systemd or runit.
 +	* doc/dirmngr.texi: document --supervised option.
 +
 +	agent,common: move get_socket_name() into common.
 +	* agent/gpg-agent.c (get_socket_name): move to ...
 +	* common/sysutils.c (gnupg_get_socket_name): ... here.
 +
 +	dirmngr: report actual socket name.
 +	* dirmngr/dirmngr.[ch] (dirmngr_get_current_socket_name): new function
 +	to report known socket name.
 +	* dirmngr/server.c (cmd_getinfo): use dirmngr_get_current_socket_name
 +	to report correct socket name.
 +
 +2016-10-27  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	common: Fix gnupg_inotify_has_name.
 +	* common/sysutils.c (gnupg_inotify_has_name): Take care of the
 +	alignment.
 +
 +	dirmngr: Fix help string and argument.
 +	* dirmngr/server.c (hlp_versioncheck): Add a newline.
 +	(cmd_versioncheck): Fix argument.
 +
 +2016-10-26  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Fix hang due to deferred thread initialization.
 +	* dirmngr/dirmngr.c (main): Call ldap_wrapper_launch_thread after
 +	thread_init.
 +
 +	agent: Avoid double error message.
 +	* agent/gpg-agent.c (map_supervised_sockets): Shorten error message.
 +	Remove unneeded diagnostic.
 +
 +	common: Use GPG_ERR_INV_VALUE instead of GPG_ERR_EINVAL.
 +	* common/sysutils.c (gnupg_inotify_watch_socket): Return
 +	GPG_ERR_INV_VALUE for a missing socket name and set proper error
 +	source.
 +
 +	tests: Improve portability of fake-pinentry.
 +	* tests/openpgp/fake-pinentry.c: Make all functions static.
 +	(get_passphrase): s/unlink/remove/ because that is standard C.
 +	(spacep): Rename to whitespace and change all callers.
 +	(main): Move macro out of if-then chain.
 +
 +2016-10-26  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	agent: --supervised mode improvements.
 +	* agent/gpg-agent.c (map_supervised_socket): if the agent is running
 +	  in --supervised mode and is not actually given LISTEN_FDNAMES
 +	  directives, require at least fd 3 to be open for listening.
 +
 +	common: avoid segfault.
 +	* common/sysutils.c (gnupg_inotify_watch_socket): return EINVAL if
 +	  socket_name is NULL, rather than segfaulting
 +
 +2016-10-25  Justus Winter  <justus at g10code.com>
 +
 +	agent,tests,w32: Fix relaying pinentry user data, fix fake-pinentry.
 +	* agent/call-pinentry.c (start_pinentry): Also send the user data
 +	using an Assuan 'OPTION' command.
 +	* tests/openpgp/fake-pinentry.c (get_passphrase): Fix updating
 +	passphrase file.
 +	(spacep): Include newline characters.
 +	(rstrip): New function.
 +	(main): Handle Windows line endings.  Handle the userdata option, and
 +	restart with the new options.
 +
 +	tests: Do not autostart gpg-agents on teardown.
 +	* tests/openpgp/defs.c (stop-agent): Use '--no-autostart' when calling
 +	gpg-connect-agent.
 +
 +2016-10-25  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Allow command VERSIONCHECK to handle 3 part version numbers.
 +	* dirmngr/server.c (parse_version_string): Add arg MICRO and set it.
 +	(cmp_version): Extend to handle the MICRO part.
 +	(confucius_mktmpdir): Rename to my_mktmpdir.
 +	(my_mktmpdir): xstrconcat does not fail; use strconcat.
 +	(fetch_into_tmpdir): Improve error checking.
 +
 +	common: Use strconcat in gnupg_setenv.
 +	* common/sysutils.c (gnupg_setenv): Replace malloc+stpcpy by
 +	strconcat.  Indent cpp conditionals.
 +	(gnupg_unsetenv): Indent cpp conditionals.
 +
 +2016-10-24  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Replace two sprintf calls.
 +	* g10/keygen.c (print_status_key_created): Use snprintf for now.
 +	(ask_expire_interval): Replace xmalloc and sprintf by xasprintf.
 +
 +	agent: Minor cleanup for recent change in findkey.c.
 +	* agent/findkey.c (agent_write_private_key): Avoid label name error.
 +
 +	agent: Slightly change structure of cmd_readkey.
 +	* agent/command.c (cmd_readkey): Avoid a leave label in the middle of
 +	the code.  Remove the special return.
 +
 +2016-10-24  Kai Michaelis  <kai at gnupg.org>
 +
 +	dirmngr: Fix segfault in VERSIONCHECK.
 +	* dirmngr/server.c (cmd_versioncheck): The VERSIONCHECK command crashes
 +	when called without program version.
 +
 +2016-10-24  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Use canonical curve name of libgcrypt.
 +	* scd/app-openpgp.c (send_key_attr): Use curve instead of OID.
 +	(ecdh_params): New.
 +	(ecc_read_pubkey): Use ecdh_params.  Use curve name.
 +	(ecc_writekey): Likewise.
 +	(ecc_curve): Rename from ecc_oid.
 +	(parse_algorithm_attribute): Use ecc_curve.
 +	* g10/call-agent.c (learn_status_cb): Use openpgp_is_curve_supported to
 +	intern the curve name string.
 +	* g10/card-util.c (card_status): Conver curve name to alias for print.
 +
 +	common: Fix openpgp_is_curve_supported.
 +	* common/openpgp-oid.c (openpgp_is_curve_supported): Support both of
 +	canonical name of the curve and alias.
 +
 +	g10: Fix card keygen for decryption.
 +	* g10/keygen.c (do_generate_keypair): Fix arguments.
 +
 +2016-10-22  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: More card key generation change.
 +	* g10/keygen.c (gen_card_key): Add back ALGO as the second argument.
 +	Don't get ALGO by KEY-ATTR by this function.  It's caller to provide
 +	ALGO.  Don't do that by both of caller and callee.
 +	(generate_keypair): Only put paramerters needed.  Use parameters
 +	for ALGO to call gen_card_key.
 +	(generate_card_subkeypair): Get ALGO and call gen_card_key with it.
 +
 +2016-10-21  Andre Heinecke  <aheinecke at intevation.de>
 +
 +	g10: Write first keybox record in binary mode.
 +	* g10/keydb.c (maybe_create_keyring_or_box): Open in binary mode.
 +
 +2016-10-21  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10,scd: Fix ECC keygen.
 +	* g10/keygen.c (generate_keypair): For card key generation, fill
 +	parameters by KEY-ATTR.
 +
 +	* scd/app-openpgp.c (ecc_read_pubkey): OID should be freed at last,
 +	after its reference by OIDBUF is finished.
 +	(ecc_writekey): Likewise.
 +
 +	scd: Fix segfault changing key attr.
 +	* asc/app-openpgp.c (change_keyattr_from_string): Release after
 +	allocated.
 +
 +2016-10-21  NIIBE Yutaka  <gniibe at fsij.org>
 +	    Arnaud Fontaine  <arnaud.fontaine at ssi.gouv.fr>
 +
 +	g10: Don't ask keysize for for non-RSA card.
 +	* g10/card-util.c (card_status): Bug fix for keyno.
 +	(ask_card_rsa_keysize, do_change_rsa_keysize): Rename.
 +	(generate_card_keys): Only ask keysize when RSA.
 +	(card_generate_subkey): Likewise.
 +
 +	g10: Support ECC for gen_card_key.
 +	* g10/keygen.c (gen_card_key): Remove the first argument of ALGO.
 +	(do_generate_keypair, generate_card_subkeypair): Follow the change.
 +
 +2016-10-21  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	Fix use cases of snprintf.
 +	* agent/call-pinentry.c, agent/call-scd.c, agent/command.c,
 +	build-aux/speedo/w32/g4wihelp.c, common/get-passphrase.c,
 +	dirmngr/dirmngr.c, g10/call-agent.c, g10/cpr.c, g10/keygen.c,
 +	g10/openfile.c, g10/passphrase.c, scd/app-openpgp.c, scd/scdaemon.c,
 +	sm/call-agent.c, sm/call-dirmngr.c, sm/certreqgen.c: Fix assuming C99.
 +
 +	agent: Fix saving with FORCE=1.
 +	* agent/findkey.c (agent_write_private_key): Recover from an error of
 +	GPG_ERR_ENOENT when FORCE=1 and it is opened with "rb+".
 +
 +2016-10-20  Justus Winter  <justus at g10code.com>
 +
 +	tests: Simplify test.
 +	* tests/openpgp/quick-key-manipulation.scm: Avoid creating a temporary
 +	home directory, just make the uids unique.
 +
 +	tests: Flush stdout in the fake pinentry.
 +	* tests/openpgp/fake-pinentry.c (reply): Flush stdout.
 +
- 	Fixes-commit: 94504b3d5af126abb591dedda1ca0f0970822f55
- 
 +	common,w32: Fix setting environment variables on Windows.
 +	* common/sysutils.c (gnupg_setenv): Also update the environment block
 +	maintained by the C runtime.
 +	(gnupg_unsetenv): Likewise.
 +	* tests/gpgscm/ffi.c (do_setenv): Fix error handling.
 +
 +	tests,w32: Cope with Windows line endings.
 +	* tests/openpgp/issue2015.scm: Rstrip line before comparison.
 +
 +	tests: Create and remove socket directories.
 +	* tests/openpgp/defs.scm (start-agent): Move function here and create
 +	the socket directory prior to starting the agent.
 +	(stop-agent): Move function here and remove the socket directory.
 +	* tests/openpgp/finish.scm: Adapt.
 +	* tests/openpgp/setup.scm: Likewise.
 +
 +2016-10-20  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent, g10: Fix keygen.
 +	* agent/command.c (cmd_readkey): Get length after card_readkey.
 +	* g10/keygen.c (gen_card_key): Fix off-by-one error.
 +
 +	scd: GENKEY updates the public key in APP.
 +	* scd/app-openpgp.c (rsa_read_pubkey, ecc_read_pubkey): New.
 +	(read_public_key): New.
 +	(get_public_key, do_genkey): Use read_public_key.
 +
 +	g10: smartcard keygen change.
 +	* g10/call-agent.c (scd_genkey_cb_append_savedbytes): Remove.
 +	(scd_genkey_cb): Only handle KEY-CREATED-AT and PROGRESS.
 +	(agent_scd_genkey): Remove INFO argument.  CREATETIME is now in/out
 +	argument.
 +	(agent_readkey): Use READKEY --card instead of SCD READKEY.
 +	* g10/keygen.c (gen_card_key): Use READKEY --card command of the agent
 +	to retrieve public key information from card and let the agent make
 +	a file for private key with shadow info.
 +
 +	agent: Add --card option for READKEY.
 +	* agent/findkey.c (agent_write_shadow_key): New.
 +	* agent/command-ssh.c (card_key_available): Use agent_write_shadow_key.
 +	* agent/learncard.c (agent_handle_learn): Likewise.
 +	* agent/command.c (cmd_readkey): Add --card option.
 +
 +2016-10-19  Kai Michaelis  <kai at gnupg.org>
 +
 +	dirmngr: improve VERSIONCHECK.
 +	Replace strtok_r() and code formatting. Use code from libgpg-error for
 +	version comparison.
 +
 +2016-10-18  Justus Winter  <justus at g10code.com>
 +
 +	common: Fix copying data to estreams.
 +	* common/exectool.c (copy_buffer_do_copy): Correctly account for
 +	partially written data in the event of errors.
 +
 +	common,w32: Communicate with child in non-blocking mode.
 +	* common/exechelp-w32.c (gnupg_spawn_process): Open streams in
 +	non-blocking mode if requested.
 +
- 	Fixes-commit: 83811e3f1f0c615b2b63bafdb49a35a0fc198088
- 
 +	common,w32: Extend gnupg_create_inbound_pipe et al.
 +	* common/exechelp-w32.c (do_create_pipe): Rename, add arguments, and
 +	create a stream if reqested.
 +	(gnupg_create_inbound_pipe): Use the extended function to open the
 +	stream if requested.
 +	(gnupg_create_outbound_pipe): Likewise.
 +	(gnupg_create_pipe): Update call site.
 +
- 	Fixes-commit: 5d991e333a1885adc40abd9d00c01fec4bd5d9d7
- 
 +	common,w32: Make use of default_errsource in exechelp.
 +	* common/exechelp-posix.c (my_error_from_syserror, my_error): New.
 +	Use them instead of gpg_error and gpg_error_from_syserror.
 +
- 	Fixes-commit: 96c7901ec1c79be732570811223d3ea54875abfe
- 
 +2016-10-18  NIIBE Yutaka  <gniibe at fsij.org>
 +	    Arnaud Fontaine  <arnaud.fontaine at ssi.gouv.fr>
 +
 +	scd: Support ECC key generation.
 +	* scd/app-openpgp.c (get_public_key): Fix a message.
 +	(change_keyattr_from_string, ecc_writekey): Call mpi_release sooner.
 +	(do_genkey): Add ECC support.
 +
 +2016-10-18  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: minor cleanup to merge other works.
 +	* scd/iso7816.c (do_generate_keypair): Use const char * for DATA.
 +	(iso7816_generate_keypair, iso7816_read_public_key): Likewise.
 +	* scd/app-openpgp.c (get_public_key): Follow the change.
 +	(do_genkey): Ditto.  Use ERR instead of RC.  Use u32 for CREATED_AT.
 +
 +2016-10-17  Justus Winter  <justus at g10code.com>
 +
 +	gpgscm: Initialize nesting stack.
 +	* tests/gpgscm/scheme.c (scheme_init_custom_alloc): Initialize nesting
 +	stack.
 +
- 	Fixes-commit: f2249b737055f84842778285bbeff5e61fa55225
- 
 +2016-10-17  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	doc: Document how to manually shut down gpg-agent.
 +	* doc/gpg-agent.texi: document "gpgconf --kill gpg-agent" for manual
 +	  agent termination.
 +
 +	This was requested in a side-comment in https://bugs.debian.org/840669
 +
 +	doc: Point gpg-agent(1) at the right gpg manpage in SEE ALSO.
 +	* doc/gpg-agent.texi (SEE ALSO): refer to @gpgname, instead of
 +	  hard-coding "gpg2".
 +
 +2016-10-17  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix keytocard for ECC.
 +	* scd/app-openpgp.c (build_ecc_privkey_template): Size can be greater
 +	than 128 when it comes with public key for curve of larger field.
 +
 +	gpgconf: Fix for --homedir.
 +	* tools/gpgconf-comp.c (gpg_agent_runtime_change,
 +	scdaemon_runtime_change, dirmngr_runtime_change): Provide the homedir
 +	arguments by --homedir when it's not default.
 +
 +2016-10-16  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Use straightforward names for the default socket names.
 +	* configure.ac (GPG_AGENT_SOCK_NAME): Change name to *.extra.
 +	(GPG_AGENT_EXTRA_SOCK_NAME): Change name to *browser.
 +
 +2016-10-15  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Move inotify code to common and improve it.
 +	* common/sysutils.c: Include sys/inotify.h.
 +	(my_error_from_syserror, my_error): New.
 +	(gnupg_inotify_watch_socket): New.
 +	(gnupg_inotify_has_name): New.
 +	* agent/gpg-agent.c: Do not include sys/inotify.h.
 +	(my_inotify_is_name): Remove.
 +	(handle_connections): Remove HAVE_INOTIFY_INIT protected code and use
 +	the new functions.
 +
 +2016-10-14  Kai Michaelis  <kai at gnupg.org>
 +
 +	dirmngr: use gnupg_mkdtemp instead of mkstemp.
 +	MinGW on debian does not support mkstemp.
 +
 +	dirmngr: add VERSIONCHECK command.
 +	Given an application name and version VERSIONCHECK fetches the software
 +	version list from version.gnupg.org, verifies the signature and returns
 +	whenever the given version is older (UPDATE), current (CURRENT) or newer
 +	(ROLLBACK).
 +
 +2016-10-13  Neal H. Walfield  <neal at g10code.com>
 +
 +	tests: Use shorter filenames.
 +	* tests/openpgp/tofu/cross-sigs/
 +	  1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.gpg: Rename from this...
 +	* tests/openpgp/tofu/cross-sigs/EC38277E-1.gpg: .. to this.
 +	* tests/openpgp/tofu/cross-sigs/
 +	  1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.txt: Rename from this...
 +	* tests/openpgp/tofu/cross-sigs/EC38277E-1.txt: .. to this.
 +	* tests/openpgp/tofu/cross-sigs/
 +	  1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.gpg: Rename from this...
 +	* tests/openpgp/tofu/cross-sigs/EC38277E-2.gpg: .. to this.
 +	* tests/openpgp/tofu/cross-sigs/
 +	  1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.txt: Rename from this...
 +	* tests/openpgp/tofu/cross-sigs/EC38277E-2.txt: .. to this.
 +	* tests/openpgp/tofu/cross-sigs/
 +	  1938C3A0E4674B6C217AC0B987DB2814EC38277E-3.txt: Rename from this...
 +	* tests/openpgp/tofu/cross-sigs/EC38277E-3.txt: .. to this.
 +	* tests/openpgp/tofu/cross-sigs/
 +	  1938C3A0E4674B6C217AC0B987DB2814EC38277E-secret.gpg: Rename from
 +	  this...
 +	* tests/openpgp/tofu/cross-sigs/EC38277E-secret.gpg: .. to this.
 +	* tests/openpgp/tofu/cross-sigs/
 +	  DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.gpg: Rename from this...
 +	* tests/openpgp/tofu/cross-sigs/871C2247-1.gpg: .. to this.
 +	* tests/openpgp/tofu/cross-sigs/
 +	  DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.txt: Rename from this...
 +	* tests/openpgp/tofu/cross-sigs/871C2247-1.txt: .. to this.
 +	* tests/openpgp/tofu/cross-sigs/
 +	  DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.gpg: Rename from this...
 +	* tests/openpgp/tofu/cross-sigs/871C2247-2.gpg: .. to this.
 +	* tests/openpgp/tofu/cross-sigs/
 +	  DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.txt: Rename from this...
 +	* tests/openpgp/tofu/cross-sigs/871C2247-2.txt: .. to this.
 +	* tests/openpgp/tofu/cross-sigs/
 +	  DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.gpg: Rename from this...
 +	* tests/openpgp/tofu/cross-sigs/871C2247-3.gpg: .. to this.
 +	* tests/openpgp/tofu/cross-sigs/
 +	  DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.txt: Rename from this...
 +	* tests/openpgp/tofu/cross-sigs/871C2247-3.txt: .. to this.
 +	* tests/openpgp/tofu/cross-sigs/
 +	  DC463A16E42F03240D76E8BA8B48C6BD871C2247-4.gpg: Rename from this...
 +	* tests/openpgp/tofu/cross-sigs/871C2247-4.gpg: .. to this.
 +	* tests/openpgp/tofu/cross-sigs/
 +	  DC463A16E42F03240D76E8BA8B48C6BD871C2247-secret.gpg: Rename from
 +	  this...
 +	* tests/openpgp/tofu/cross-sigs/871C2247-secret.gpg: .. to this.
 +	* tests/openpgp/Makefile.am (TEST_FILES): Update accordingly.
 +
 +	g10: Be more careful when checking if a binding is signed by a UTK.
 +	* g10/tofu.c (signed_by_utk): When checking if a key is signed by an
 +	ultimately trusted key, only consider the signatures on the specified
 +	user id.
 +	* tests/openpgp/tofu.scm: Add test for the above.
 +
 +	tests: Add test data to TEST_FILES.
 +	* tests/openpgp/Makefile.am (TEST_FILES): Add new test data.
 +
 +	g10: Be more careful when checking cross signatures.
 +	* g10/tofu.c (cross_sigs): When checking cross signatures, only
 +	consider the signatures on the specified user id.
 +	* tests/openpgp/tofu.scm: Add test for the above.
 +	* tests/openpgp/tofu/cross-sigs/
 +	  1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.gpg:
 +	  New file.
 +	* tests/openpgp/tofu/cross-sigs/
 +	  1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.txt: New file.
 +	* tests/openpgp/tofu/cross-sigs/
 +	  1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.gpg: New file.
 +	* tests/openpgp/tofu/cross-sigs/
 +	  1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.txt: New file.
 +	* tests/openpgp/tofu/cross-sigs/
 +	  1938C3A0E4674B6C217AC0B987DB2814EC38277E-3.txt: New file.
 +	* tests/openpgp/tofu/cross-sigs/
 +	  1938C3A0E4674B6C217AC0B987DB2814EC38277E-secret.gpg: New file.
 +	* tests/openpgp/tofu/cross-sigs/
 +	  DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.gpg: New file.
 +	* tests/openpgp/tofu/cross-sigs/
 +	  DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.txt: New file.
 +	* tests/openpgp/tofu/cross-sigs/
 +	  DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.gpg: New file.
 +	* tests/openpgp/tofu/cross-sigs/
 +	  DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.txt: New file.
 +	* tests/openpgp/tofu/cross-sigs/
 +	  DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.gpg: New file.
 +	* tests/openpgp/tofu/cross-sigs/
 +	  DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.txt: New file.
 +	* tests/openpgp/tofu/cross-sigs/
 +	  DC463A16E42F03240D76E8BA8B48C6BD871C2247-4.gpg: New file.
 +	* tests/openpgp/tofu/cross-sigs/
 +	  DC463A16E42F03240D76E8BA8B48C6BD871C2247-secret.gpg: New file.
 +	* tests/openpgp/tofu/cross-sigs/README: New file.
 +
 +	g10: Still check if the key is an UTK or cross signed in batch mode.
 +	* g10/tofu.c (get_trust): If POLICY is ask, but we can't ask, don't
 +	bail immediately.  Instead, check if the key in question is an
 +	ultimately trusted key or cross signed.
 +
 +	g10: If an sqlite operation fails, map the error code to GPG_ERR_GENERAL
 +	* g10/tofu.c (get_policy): If an sqlite operation fails, map the error
 +	  code to GPG_ERR_GENERAL.
 +	(ask_about_binding): Likewise.
 +	(build_conflict_set): Likewise.
 +	(get_trust): Likewise.
 +	(show_statistics): Likewise.
 +	(tofu_register_signature): Likewise.
 +	(tofu_register_encryption): Likewise.
 +
 +	tests: Remove support for deprecated functionality.
 +	* tests/openpgp/tofu.scm: Don't remove tofu.d.  It's deprecated.
 +
 +2016-10-12  Neal H. Walfield  <neal at g10code.com>
 +
 +	g10: When changing a TOFU binding's policy, update the conflict info.
 +	* g10/tofu.c (record_binding): Take an additional argument, CONFLICT.
 +	Set the binding's conflict accordingly.  Update callers.
 +
 +	g10: Make a singular string singular.
 +	* g10/tofu.c (ask_about_binding): Make the singular string singular.
 +
 +	g10: Correctly determine whether a binding has a conflict.
 +	* g10/tofu.c (build_conflict_set): A binding has a conflict is
 +	conflict is *not* NULL, not if it is NULL.
 +
 +	g10: Fix a column's type in TOFU DB.
 +	* g10/tofu.c (initdb): Change policy from a boolean to an integer.
 +
 +2016-10-07  Justus Winter  <justus at g10code.com>
 +
 +	tests: Rework test environment setup.
 +	* tests/openpgp/setup.scm: Import one keyring at a time.  This works
 +	around a yet to be investigated hang on Windows.  It is also much
 +	prettier.
 +
 +	tests: Improve handling of Windows newlines.
 +	* tests/gpgscm/lib.scm (string-split-newlines): New function.
 +	* tests/openpgp/default-key.scm: Use new function.
 +	* tests/openpgp/defs.scm: Likewise.
 +	* tests/openpgp/export.scm: Likewise.
 +	* tests/openpgp/import.scm: Likewise.
 +
 +	gpgscm: Improve test of low-level functions.
 +	* tests/gpgscm/t-child.c: Print large amounts of data.
 +	* tests/gpgscm/t-child.scm: Test that this works.
 +
 +	gpgscm: Improve path handling.
 +	* tests/gpgscm/ffi.c (ffi_init): New Scheme variable '*win32*'.
 +	* tests/gpgscm/tests.scm (canonical-path): Correctly handle paths with
 +	drive letter on Windows.  Use 'path-join'.
 +	(path-expand): Use 'path-join'.
 +
 +	tools: Fix error handling.
 +	* tools/gpgtar-create.c (gpgtar_create): Do not crash if opening the
 +	tarball failed.
 +
 +2016-10-07  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: Fix get_socket_name.
 +	* agent/gpg-agent.c (get_socket_name): Fix the size of copying.
 +
 +2016-10-07  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Put extra parens around bit tests.
 +	* g10/options.h (DBG_MPI): New.
 +	* g10/gpg.c (set_debug): Use macro or extra parens for binary operator.
 +	* g10/parse-packet.c (set_packet_list_mode): Use dbg macro.
 +
 +2016-10-07  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent, dirmngr, scd: Fix init_common_subsystems.
 +	* common/init.c (_init_common_subsystems): Don't call
 +	gpgrt_set_syscall_clamp in this function.
 +	* agent/gpg-agent.c, dirmngr/dirmngr.c, scd/scdaemon.c: Call
 +	gpgrt_set_syscall_clamp after npth_init.
 +
 +2016-10-06  Justus Winter  <justus at g10code.com>
 +
 +	common: Avoid pointer arithmetic on string literals.
 +	* common/gettime.c (rfctimestamp): Use indexing instead.
 +	* common/signal.c (got_fatal_signal): Likewise.
 +
 +	g10: Fix singular term.
 +	* g10/tofu.c (ask_about_binding): Fix singular message.
 +
 +	g10: Use appropriate variant of 'abs'.
 +	* g10/tofu.c (ask_about_binding): Use 'labs' instead of 'abs'.
 +
 +	sm: Remove statement without effect.
 +	* sm/call-dirmngr.c (gpgsm_dirmngr_isvalid): Remove statement without
 +	effect.
 +
 +	g10: Fix testing for debug flag.
 +	* g10/parse-packet.c (set_packet_list_mode): Fix testing for debug
 +	flag.
 +
 +	tools: Improve error handling.
 +	* tools/gpg-wks-server.c (copy_key_as_binary): Initialize 'argv'.
 +
 +	gpgscm: Update callsite of 'gnupg_spawn_process'.
 +	* tests/gpgscm/ffi.c (do_spawn_process): Adapt to the changes to
 +	'gnupg_spawn_process'.
 +
- 	Fixes-commit: 44a32455
- 	Fixes-commit: 96c7901e
- 
 +2016-10-05  Werner Koch  <wk at gnupg.org>
 +
 +	wks: Send key encrypted as required by draft -02.
 +	* tools/gpg-wks-client.c (get_key): Encrypt.
 +	(encrypt_response): Take care of --fake-submission-addr.
 +
 +	wks: Add option --fake-submission-addr to gpg-wks-client.
 +	* tools/gpg-wks-client.c (oFakeSubmissionAddr): New.
 +	(opts): Add option --fake-submission-addr.
 +	(fake_submission_addr): New variable.
 +	(parse_arguments): Set it.
 +	(command_send): Use --fake-submission-addr.
 +
 +	agent: Another minor fix to map_supervised_sockets.
 +	* agent/gpg-agent.c (map_supervised_sockets): Remove debug message.
 +	Provide correct fd in the second error case.
 +
 +	agent: Fix npth + supervised mode problem.
 +	* agent/gpg-agent.c (main): Initialize modules in supervised mode.
 +
 +2016-10-05  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	agent: Fix error handling in map_supervised_sockets.
 +	* agent/gpg-agent.c (map_supervised_sockets): the file descriptor to
 +	  close on error is fd, not i.
 +
 +2016-10-04  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Streamline the supervised mode code.
 +	* agent/gpg-agent.c (get_socket_path): Rename to ...
 +	(get_socket_name): this.  This is to comply with the GNU coding guide.
 +	Use xtrymalloc instead of malloc.  Do not build for W32.
 +	(map_supervised_sockets): Use strtokenize and set the the socket names
 +	here.
 +	(main): Adjust for above change.  Do not close the socket.
 +
 +	agent: Adjust cleanup for supervised mode.  Fix for W32.
 +	* agent/gpg-agent.c (opts) [W32]: Remove option --supervised.
 +	(is_supervised): Move from main() to global.
 +	(inhibit_socket_removal): New.
 +	(cleanup): Take care of supervise mode and INHIBIT_SOCKET_REMOVAL.
 +	(check_own_socket_thread): Set INHIBIT_SOCKET_REMOVAL instead of
 +	seting the socket names to empty.
 +
 +	agent: Adjust supervised mode for the new default socket names.
 +	* agent/gpg-agent.c (main): In supervised mode do not provide default
 +	socket names.  Unset DISPLAY and INSIDE_EMACS.  Use log_error and
 +	agent_exit.
 +
 +2016-10-04  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	agent: Implement --supervised command (for systemd, etc).
 +	* agent/gpg-agent.c (get_socket_path): New function for POSIX systems
 +	to return the path for a provided unix-domain socket.
 +	(map_supervised_sockets): New function to inspect $LISTEN_FDS and
 +	$LISTEN_FDNAMES and map them to the specific functionality offered by
 +	the agent.
 +	(main): Add --supervised command.  When used, listen on already-open
 +	file descriptors instead of opening our own.
 +	* doc/gpg-agent.texi: Document --supervised option.
 +
 +2016-10-04  Justus Winter  <justus at g10code.com>
 +
 +	build,w32: Unconditionally build tests.
 +	* configure.ac (run_tests, RUN_TESTS, RUN_GPG_TESTS): Remove
 +	variables.  They are misleadingly named, as they inhibit building the
 +	tests.  There is no reason not to build the tests even when
 +	cross-compiling, as they are only run if one does 'make check'.
 +	* Makefile: Adapt accordingly.
 +	* tests/Makefile.am: Adapt accordingly.  Avoid building 'asschk' on
 +	Windows as it uses non-portable functions.
 +
 +	tests,w32: Do not expose 'glob' to gpgscm.
 +	* tests/gpgscm/ffi.c (do_glob): Remove function.
 +	(ffi_init): Likewise.
 +
 +	tests,w32: Avoid using 'glob'.
 +	* tests/openpgp/setup.scm: Avoid 'glob' which is not available on
 +	mingw.
 +
 +	tools: Ignore existing directories in gpgtar.
 +	* tools/gpgtar-extract.c (extract_directory): Ignore existing
 +	directories now that we have '--directory'.
 +
 +2016-10-04  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent, dirmngr, scd: npth_init must be after fork.
 +	* agent/gpg-agent.c (thread_init_once, initialize_modules): New.
 +	(main): Make sure no daemonizing-fork call after npth_init, and no npth
 +	calls before npth_init, with care of npth calls by assuan hooks.
 +	* dirmngr/dirmngr.c (thread_init): New.
 +	(main): Make sure npth_init must not be called before daemonizing fork.
 +	* scd/scdaemon.c (main): Likewise.
 +
 +2016-09-30  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Remove the warning for the GKR hijacking.
 +	* g10/call-agent.c (check_hijacking): Remove.
 +	(start_agent): Remove call.
 +
 +	agent: Create the extra sockets in the standard socket dir.
 +	* agent/gpg-agent.c (main): Take the socketdir in account for the
 +	default sockets.
 +	* tools/gpgconf.c (list_dirs): Add "agent-extra-socket" and
 +	"agent-browser-socket".
 +
 +	agent: Kludge to allow disabling of the extra sockets.
 +	* agent/gpg-agent.c (main): Check for special socket names.
 +
 +	wks: Avoid long trustdb checks.
 +	* tools/wks-receive.c (verify_signature): Use --always-trust.
 +
 +2016-09-30  Justus Winter  <justus at g10code.com>
 +
 +	build: Fix build against libiconv.
 +	* agent/Makefile.am: Add INCICONV and LIBICONV.
 +	* common/Makefile.am: Likewise.
 +	* tools/Makefile.am: Likewise.
 +
 +	agent: Enable restricted, browser, and ssh socket by default.
 +	* agent/gpg-agent.c (main): Provide defaults for 'extra-socket' and
 +	'browser-socket', enable ssh socket by default, but do not emit the
 +	'SSH_AUTH_SOCK' variable unless it has been explicitly requested.
 +	* configure.ac (GPG_AGENT_{EXTRA,BROWSER}_SOCK_NAME): New definitions.
 +	* doc/gpg-agent.texi: Update documentation.
 +
 +	w32: Fix STARTTLS on LDAP connections.
 +	* dirmngr/ks-engine-ldap.c (my_ldap_connect): Fix build against
 +	<winldap.h>.
 +
- 	GnuPG-bug-id: 1338
- 	Debian-bug-id: 623526
- 	Fixes-commit: 9e6f8a55
- 
 +2016-09-29  Werner Koch  <wk at gnupg.org>
 +
 +	wks: Partly implement draft-koch-openpgp-webkey-service-02.
 +	* tools/gpg-wks.h (WKS_RECEIVE_DRAFT2): New.
 +	* tools/wks-receive.c: Include rfc822parse.h.
 +	(struct receive_ctx_s): Add fields PARSER, DRAFT_VERSION_2, and
 +	MULTIPART_MIXED_SEEN.
 +	(decrypt_data): Add --no-options.
 +	(verify_signature): Ditto.
 +	(new_part): Check for Wks-Draft-Version header.  Take care of text
 +	parts.
 +	(wks_receive): Set Parser and pass a flag value to RESULT_CB.
 +	* tools/gpg-wks-client.c (read_confirmation_request): New.
 +	(main) <aRead>: Call read_confirmation_request instead of
 +	process_confirmation_request.
 +	(command_receive_cb): Ditto.  Add arg FLAGS..
 +	(decrypt_stream_status_cb, decrypt_stream): New.
 +	(command_send): Set header Wks-Draft-Version.
 +	* tools/gpg-wks-server.c (struct server_ctx_s): Add field
 +	DRAFT_VERSION_2.
 +	(sign_stream_status_cb, sign_stream): New.
 +	(command_receive_cb): Set draft flag.
 +	(send_confirmation_request): Rework to implement protocol draft
 +	version 2.
 +
 +	* tools/gpg-wks.h (DBG_MIME_VALUE, DBG_PARSER_VALUE): New.
 +	(DBG_MIME, DBG_PARSER, DBG_CRYPTO): New.  Use instead of a plain
 +	opt.debug where useful.
 +	* tools/gpg-wks-client.c (debug_flags): Add "mime" and "parser".
 +	* tools/gpg-wks-server.c (debug_flags): Ditto.
 +
 +	tools: Convey signeddata also to the part_data callback in mime-parser.
 +	* tools/mime-parser.c (mime_parser_parse): Factor some code out to ...
 +	(process_part_data): new.
 +	((mime_parser_parse): Also call process_part_data for signed data.
 +
 +	tools: Allow retrieval of signed data from mime-maker.
 +	* tools/mime-maker.c (find_part): New.
 +	(mime_maker_get_part): New.
 +
 +	tools: Change mime-maker to write out CR,LF.
 +	* tools/mime-maker.c (struct part_s): Add field PARTID.
 +	(struct mime_maker_context_s): Add field PARTID_COUNTER.
 +	(dump_parts): Print part ids.
 +	(mime_maker_add_header): Assign PARTID.
 +	(mime_maker_add_container): Ditto.
 +	(mime_maker_get_partid): New.
 +	(write_ct_with_boundary): Remove.
 +	(add_header): Strip trailing white spaces.
 +	(write_header): Remove trailing spaces trimming.  Add arg BOUNDARY.
 +	Handle emdedded LFs.
 +	(write_gap, write_boundary, write_body): New.
 +	(write_tree): Use new functions.
 +
 +	tools: Simplify the mime-maker container creation.
 +	* tools/mime-maker.c (struct part_s): Remove field MEDIATYPE.
 +	(release_parts): Ditto.
 +	(dump_parts): Print a body line only if tehre is a body.
 +	(mime_maker_add_header): Check for body or container.
 +	(mime_maker_add_container): Remove arg MEDIATYPE.  Change all callers.
 +	(mime_maker_end_container): New.
 +
 +	tools: Give mime parser callbacks access to the rfc822 parser.
 +	* tools/mime-parser.c (mime_parser_context_s): Add field MSG.
 +	(parse_message_cb): Set it.
 +	(mime_parser_rfc822parser): New.
 +	* tools/mime-parser.h: Declare rfc822parse_t for the new prototype.
 +
 +2016-09-29  Justus Winter  <justus at g10code.com>
 +
 +	dirmngr: Fix STARTTLS on LDAP connections.
 +	* dirmngr/ks-engine-ldap.c (my_ldap_connect): Fix unfortunate typo.
 +
 +2016-09-28  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Improve WKD by importing only the requested UID.
 +	* g10/keyserver.c: Include mbox-util.h.
 +	(keyserver_import_wkd): Do not use the global import options but
 +	employ an import filter.
 +
 +	gpg: Reject import if an import filter removed all user ids.
 +	* g10/import.c (any_uid_left): New.
 +	(import_one): Check that a UID is left.
 +
 +	gpg: Make import filter data object more flexible.
 +	* g10/main.h (import_filter_t): New.
 +	* g10/import.c (struct import_filter_s): Declare struct.
 +	(import_keep_uid, import_drop_sig): Replace by ...
 +	(import_filter): new.  Adjust all users.
 +	(cleanup_import_globals): Move code to ...
 +	(release_import_filter): new.
 +	(save_and_clear_import_filter): New.
 +	(restore_import_filter): New.
 +
 +	gpg: Make sure that internal key import is done with a binary stream.
 +	* g10/import.c (import_keys_internal): Open stream in binary mode.
 +
 +2016-09-27  Justus Winter  <justus at g10code.com>
 +
 +	build: Do not link gpg-connect-agent against npth.
 +	* tools/Makefile.am: Do not link gpg-connect-agent against npth.
 +
 +	build: Fix check for resolver library on macOS.
 +	* configure.ac: Check for the mangled name of 'dn_skipname' first.
 +
 +	common: Correctly handle modules relying on npth.
 +	* common/Makefile.am (common_sources): Drop 'call-gpg.{c,h}'.
 +	(with_npth_sources): New variable.
 +	(libcommonpth_a_SOURCES): Use the new variable.
 +
 +2016-09-27  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent, sm: Set CTX after start_agent.
 +	* g10/call-agent.c (agent_keytocard): Assign parm.ctx after start_agent.
 +	* sm/call-agent.c (gpgsm_agent_pksign, gpgsm_scd_pksign)
 +	(gpgsm_agent_readkey, gpgsm_agent_scd_serialno)
 +	(gpgsm_agent_scd_keypairinfo, gpgsm_agent_marktrusted)
 +	(gpgsm_agent_passwd, gpgsm_agent_get_confirmation)
 +	(gpgsm_agent_ask_passphrase, gpgsm_agent_keywrap_key)
 +	(gpgsm_agent_export_key): Likewise.
 +
 +	dirmngr: Removal of no-libgcrypt.o.
 +	* dirmngr/Makefile.am (dirmngr_ldap_LDADD): Remove no-libgcrypt.o.
 +
 +	agent: Allow only specific digest size for ECDSA.
 +	* agent/pksign.c (do_encode_dsa): Fix validation of digest size.
 +
 +2016-09-22  Neal H. Walfield  <neal at g10code.com>
 +
 +	g10: When adding a user id, make sure the keyblock has been prepared.
 +	* g10/keyedit.c (keyedit_quick_adduid): Call merge_keys_and_selfsig on
 +	KEYBLOCK before adding the user id.
 +	* tests/openpgp/quick-key-manipulation.scm: Make sure that the key
 +	capabilities don't change when adding a user id.
 +	(key-data): New function.
 +
 +2016-09-20  Justus Winter  <justus at g10code.com>
 +
 +	tests: Add documentation, make interactive debugging possible.
 +	* tests/openpgp/README: Add documentation about debugging and
 +	interfacing with GnuPG.
 +	* tests/openpgp/run-tests.scm (test::run-sync): Hand stdin to the
 +	child so that we can use a repl in the tests.
 +
 +	tests: Port the quick key manipulation test to Scheme.
 +	* tests/openpgp/Makefile.am (XTESTS): Add new test.
 +	* tests/openpgp/quick-key-manipulation.scm: New file.
 +
 +	tests: Remove list of tests from the test runner.
 +	* tests/openpgp/run-tests.scm: Drop hardcoded list.
 +
 +	tests: Reduce runtime of excessive test.
 +	* tests/openpgp/conventional-mdc.scm: Use only two plaintexts when
 +	iterating over all cipher algorithms.
 +
 +	dirmngr: Fix type.
 +	* dirmngr/dns-stuff.c (get_dns_cert): Fix type in fallback code.
 +
 +2016-09-20  Andre Heinecke  <aheinecke at intevation.de>
 +
 +	dirmngr: Open file CRL's in binary mode.
 +	* dirmngr/crlcache.c (crl_cache_load): Open file in binary mode.
 +
 +2016-09-20  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	doc: Fix a xref usage.
 +
 +2016-09-20  Ineiev  <ineiev at gnu.org>
 +
 +	doc: Do not end section names with "."
 +
 +2016-09-20  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	doc: minor fix for @xref.
 +	* doc/yat2m.c (proc_texi_cmd): Captalize "see" for xref.
 +
 +2016-09-20  Justus Winter  <justus at g10code.com>
 +
 +	doc: Implement simple '@ref'erences.
 +	* doc/yat2m.c (proc_texi_cmd): Handle '@ref'.
 +
 +2016-09-20  Ineiev  <ineiev at gnu.org>
 +
 +	doc: Fix full stops.
 +	* doc/gpg-agent.texi, doc/gpg.texi, doc/gpgsm.texi,
 +	doc/instguide.texi, doc/scdaemon.texi, doc/specify-user-id.texi,
 +	doc/tools.texi: Fix.
 +
 +	doc: Fix spacings.
 +	* doc/debugging.texi, doc/dirmngr.texi, doc/gpg-agent.texi,
 +	doc/gpg.texi, doc/tools.texi: Fix.
 +
 +	doc: Improve markup.
 +	* doc/gpg-agent.texi, doc/gpg.texi, doc/gpgsm.texi,
 +	doc/howto-create-a-server-cert.texi, doc/scdaemon.texi,
 +	doc/specify-user-id.texi, doc/tools.texi: Fix.
 +
 +	doc: Replace rfc0123 with RFC-0123.
 +	* doc/gpg.texi, doc/gpgsm.texi, doc/specify-user-id.texi: Fix.
 +
 +	doc: Add missing description of datafile.
 +	* doc/gpg.texi: Fix.
 +
 +	doc: Replace UTF8 with UTF-8.
 +	* doc/gpg.texi: Fix.
 +
 +	doc: Fix mistakes.
 +	* doc/dirmngr.texi, doc/gpg.texi, doc/gpgsm.texi,
 +	doc/howto-create-a-server-cert.texi,
 +	doc/scdaemon.texi, doc/tools.texi: Fix.
 +
 +	doc: Eliminate inconsistent UK English.
 +	* doc/dirmngr.texi, doc/gpg-agent.texi, doc/scdaemon.texi,
 +	doc/tools.texi: Fix.
 +
 +	doc: Use the right reference commands.
 +	* doc/debugging.texi, doc/gpg-agent.texi, doc/gpg.texi, doc/gpgsm.texi,
 +	doc/tools.texi: Fix.
 +
 +	doc: Fix "Not(e) that you can(not) abbreviate".
 +	* doc/dirmngr.texi, doc/gpg-agent.texi, doc/gpg.texi, doc/gpgsm.texi,
 +	doc/scdaemon.texi, doc/tools.texi: Fix.
 +
 +	doc: Fix typos.
 +	* doc/debugging.texi, doc/dirmngr.texi, doc/glossary.texi
 +	* doc/gpg-agent.texi, doc/gpg.texi, doc/gpgsm.texi
 +	* doc/instguide.texi, doc/opt-homedir.texi, doc/scdaemon.texi
 +	* doc/specify-user-id.texi, doc/tools.texi: Fix.
 +
 +	doc: Fix Martin Hellman's name.
 +	* doc/contrib.texi: Fix.
 +
 +2016-09-19  Justus Winter  <justus at g10code.com>
 +
 +	tests: Refine the repl function.
 +	* tests/gpgscm/repl.scm (repl): Add an argument 'environment'.
 +	(interactive-repl): Add an optional argument 'environment'.
 +
 +	tests: Implement interpreter shutdown using exceptions.
 +	* tests/gpgscm/ffi.c (ffi_init): Rename 'exit' to '_exit'.
 +	* tests/gpgscm/ffi.scm (*interpreter-exit*): New variable.
 +	(throw): New function.
 +	(exit): New function.
 +
 +	tests: Correctly handle exceptions in resource handling macros.
 +	* tests/gpgscm/tests.scm (letfd): Correctly release resources when an
 +	exception is thrown.
 +	(with-working-directory): Likewise.
 +	(with-temporary-working-directory): Likewise.
 +	(lettmp): Likewise.
 +
 +	tests: Refine exception handling.
 +	* tests/gpgscm/init.scm (catch): Bind all arguments to '*error*' in
 +	the error handler, update and fix comment.
 +	(*error-hook*): Revert to original definition.
 +	* tests/gpgscm/tests.scm (tr:do): Adapt accordingly.
 +	* tests/openpgp/issue2419.scm: Likewise.
 +
 +	tests: Use descriptive temporary file names.
 +	* tests/gpgscm/ffi.c (do_get_isotime): New function.
 +	(ffi_init): Add parameter 'scriptname', bind new function and
 +	scriptname.
 +	* tests/gpgscm/ffi.h (ffi_init): Update prototype.
 +	* tests/gpgscm/main.c (main): Hand in the script name.
 +	* tests/gpgscm/tests.scm (mkdtemp): Use current time and script name
 +	for the names of temporary directories.
 +
 +2016-09-19  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix regression in fingerprint printing.
 +	* g10/keylist.c (list_keyblock_print): Do not depend calling
 +	print_fingerprint on opt.keyid_format.
 +
 +	dirmngr: Silence diagnostics about starting housekeeping.
 +	* dirmngr/dirmngr.c (housekeeping_thread): Print info only in very
 +	verbose mode.
 +
 +2016-09-19  Justus Winter  <justus at g10code.com>
 +
 +	g10: Fix memory leak.
 +	* g10/tofu.c (build_conflict_set): Free 'kb_all'.
 +
 +2016-09-19  Werner Koch  <wk at gnupg.org>
 +
 +	doc: Update license information.
 +	* tests/fake-pinentries/COPYING: Rename to  ...
 +	* COPYING.CC0: this.  Add a note on the scope of this license.
 +	* COPYING.LIB: Add a note on the scope of this license.
 +	* AUTHORS (License): Mention CC) license.
 +
 +	gpgscm: Fix gcrypt version check.
 +	* tests/gpgscm/main.c (main): Check against required and not installed
 +	version.
 +
 +	gpg: Avoid malloc failure due to no key signatures.
 +	* g10/keyedit.c (check_all_keysigs): Check early for no key
 +	signatures.  Use xtrycalloc.
 +
 +2016-09-17  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	Fix comment and format.
 +	* agent/protect-tool.c (main): Fix comment.
 +	* doc/DETAILS (colon listings): Fix list.
 +	* tests/openpgp/multisig.test: Fix comment.
 +
 +2016-09-17  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	Fix more spelling.
 +	* NEWS, acinclude.m4, agent/command-ssh.c, agent/command.c,
 +	  agent/gpg-agent.c, agent/keyformat.txt, agent/protect-tool.c,
 +	  common/asshelp.c, common/b64enc.c, common/recsel.c, doc/DETAILS,
 +	  doc/HACKING, doc/Notes, doc/TRANSLATE, doc/dirmngr.texi,
 +	  doc/faq.org, doc/gpg-agent.texi, doc/gpg.texi, doc/gpgsm.texi,
 +	  doc/instguide.texi, g10/armor.c, g10/gpg.c, g10/keyedit.c,
 +	  g10/mainproc.c, g10/pkclist.c, g10/tofu.c, g13/sh-cmd.c,
 +	  g13/sh-dmcrypt.c, kbx/keybox-init.c, m4/pkg.m4, sm/call-dirmngr.c,
 +	  sm/gpgsm.c, tests/Makefile.am, tests/gpgscm/Manual.txt,
 +	  tests/gpgscm/scheme.c, tests/openpgp/gpgv-forged-keyring.scm,
 +	  tests/openpgp/multisig.test, tests/openpgp/verify.scm,
 +	  tests/pkits/README, tools/applygnupgdefaults,
 +	  tools/gpg-connect-agent.c, tools/mime-maker.c, tools/mime-parser.c:
 +	  minor spelling cleanup.
 +
 +	move some file encodings to UTF-8.
 +	* dirmgnr/cdblib.c: comment used unnecesary hyphenation
 +	* dirmngr/crlcache.h: comment was iso-8859-1
 +	* doc/contrib.text: list contributors using UTF-8 (now we can
 +	  acknowledge many more people using their preferred orthography)
 +
 +	At least one other files remains in a non-UTF-8 encoding, which i'm
 +	not sure what to do with:
 +
 +	 - build-aux/speedo/w32/inst.nsi is ISO-8859-1, but maybe Windows needs
 +	   it that way?
 +
 +2016-09-16  Neal H. Walfield  <neal at g10code.com>
 +
 +	g10: On failure, propagate the return code.
 +	* g10/tofu.c (tofu_register_encryption): If get_trust fails, set RC.
 +
 +	g10: Don't ignore failure.  On failure, rollback.
 +	* g10/tofu.c (tofu_set_policy): If record_binding fails, fail.  If the
 +	function fails, rollback the transaction.
 +
 +	g10: Load the key block if the supplied user id list is NULL.
 +	* g10/tofu.c (tofu_register_encryption): Load the key block if
 +	USER_ID_LIST is NULL.
 +
 +	g10: Use the accessor functions for accessing and comparing key ids.
 +	* g10/tofu.c (get_trust): Use the pk_main_keyid accessor function.
 +	(tofu_register_signature): Likewise.
 +	(tofu_register_encryption): Likewise.
 +	(tofu_set_policy): Likewise and also use pk_keyid and keyid_cmp.
 +
 +2016-09-16  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	po: convert localizations to UTF-8.
 +	* po/{it,et,pl,ro,gl,es,el,sk,pt,eo,hu}.po: convert to UTF-8
 +
 +	This was an automated conversion process, using:
 +
 +	   for x in po/{it,et,pl,ro,gl,es,el,sk,pt,eo,hu}.po; do
 +	       cs=$(grep charset= $x | cut -f2 -d= | cut -f1 -d\\)
 +	       iconv -f $cs -t UTF-8 < $x >$x.tmp
 +	       sed "s/$cs/UTF-8/" < $x.tmp > $x
 +	       rm -f $x.tmp
 +	   done
 +
 +2016-09-16  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Add support of ECC pubkey attribute.
 +	* scd/app-openpgp.c (ECC_FLAG_PUBKEY): New.
 +	(send_key_attr, get_public_key, ecc_writekey, do_auth, do_decipher)
 +	(parse_algorithm_attribute): Check ECC_FLAG_DJB_TWEAK.
 +	(build_ecc_privkey_template): Add ECC_Q and ECC_Q_LEN.
 +	Support offering public key when ECC_FLAG_PUBKEY sets.
 +	(ecc_writekey): Supply ECC_Q and ECC_Q_LEN.
 +	(parse_algorithm_attribute): Parse pubkey-required byte.
 +
 +2016-09-15  Justus Winter  <justus at g10code.com>
 +
 +	g10: Add missing header.
 +	* g10/trustdb.c: Include 'mbox-util.h'.
 +
 +2016-09-15  Neal H. Walfield  <neal at g10code.com>
 +
 +	g10: Only consider bindings matching the signer's user id.
 +	* g10/trustdb.c (tdb_get_validity_core): If the signer's user id
 +	subpacket is present, only consider matching user ids.
 +
 +	g10: Don't include the signature when printing a binding's validity.
 +	* g10/mainproc.c (check_sig_and_print): When printing information
 +	about a binding don't include the current signature.
 +
 +2016-09-15  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	tests/fake-pinentries: fake pinentries for downstream developers.
 +	* tests/fake-pinentries/README.txt and
 +	  tests/fake-pinentries/fake-pinentry.{sh,py,pl,php}}: New public
 +	  domain (CC0) files to encourage better test suite practices from
 +	  downstream developers.
 +	* tests/fake-pinentries/COPYING (new): a copy of
 +	  https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt
 +
 +	spelling: conenction should be connection.
 +	* dirmngr/server.c, sm/server.c: s/conenction/connection/
 +
 +	spelling: correct achived to achieved.
 +
 +2016-09-15  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	tests/gpgscm: Fix use of pointer.
 +	* tests/gpgscm/scheme-private.h (struct scheme): Use (void *) for
 +	alloc_seg.
 +	* tests/gpgscm/scheme.c (alloc_cellseg): Use (void *) for cp.  Use
 +	(void *) for coercion of address calculation.
 +
 +2016-09-14  Neal H. Walfield  <neal at g10code.com>
 +
 +	g10: Fix whitespace.
 +	* g10/tofu.c (show_statistics): Fix whitespace.
 +
 +	g10: Correctly compute the euclidean distance.
 +	* g10/tofu.c (write_stats_status): Correctly compute the euclidean
 +	distance.
 +	(show_statistics): Likewise.
 +
 +	g10: Change the default TOFU policy for UTKs to good.
 +	* g10/tofu.c (get_trust): Change the default TOFU policy for UTKs to
 +	good.
 +
 +	g10: Add missing static qualifier.
 +	* g10/tofu.c (cross_sigs): Add missing static qualifier.
 +
 +	g10: Default to the "good" TOFU policy for keys signed by a UTK.
 +	* g10/tofu.c (signed_by_utk): New function.
 +	(get_trust): If a key is signed by an ultimately trusted key, then
 +	set any bindings to good.
 +
 +2016-09-14  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Emit a new error status line in --quick-adduid.
 +	* g10/keyedit.c (menu_adduid): Emit an ERROR status for an existsing
 +	user id.
 +
 +	gpg: Allow use of "default" algo for--quick-addkey.
 +	* g10/keygen.c (quick_generate_keypair): Write a status error.
 +	(parse_algo_usage_expire): Set a default curve.
 +
 +2016-09-13  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Improve usability of --quick-gen-key.
 +	* g10/keygen.c (FUTURE_STD_): New constants.
 +	(parse_expire_string): Handle special keywords.
 +	(parse_algo_usage_expire): Allow "future-default".  Simplify call to
 +	parse_expire_string.
 +	(quick_generate_keypair): Always allow an expiration date.  Replace
 +	former "test-default" by "future-default".
 +
 +2016-09-12  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Avoid mixing up status and colon line output.
 +	* g10/keylist.c (list_keyblock_colon): Avoid calling functions which
 +	trigger a status line output before having printed a LF.
 +
 +2016-09-12  Justus Winter  <justus at g10code.com>
 +
 +	tests: Simplify tofu test.
 +	* tests/openpgp/tofu.scm: Simplify now that we only have one db
 +	format.
 +
 +2016-09-10  Ben Kibbey  <bjk at luxsci.net>
 +
 +	Portability build fix.
 +	* kbx/Makefile.am: Add NETLIBS.
 +	* dirmngr/Makefile.am: Ditto for dirmngr_ldap.
 +
 +	Fix symbol conflict.
 +	* g10/gpgcompose.c: Rename struct siginfo to signinfo.
 +
 +2016-09-09  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	gpg: print fingerprint regardless of keyid-format.
 +	* g10/keylist.c (print_fingerprint): use compact format independent of
 +	  keyid-format; (print_key_line): always print the fingerprint
 +
 +2016-09-08  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Remove option --yes from gpgv.
 +	* g10/gpgv.c (opts): Remove --yes.
 +	(main): Always set opt.ANSWER_YES.
 +
 +	gpg: Add options --output and --yes to gpgv.
 +	* g10/gpgv.c (oOutput, oAnswerYes): New.
 +	(opts): Add --output and --yes.
 +	(main): Implement options.
 +
 +	gpg: Make --output work with --verify.
 +	* g10/mainproc.c (proc_plaintext): Handle opt.output.
 +
 +2016-09-07  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Terminate on deletion of the socket file (Linux only).
 +	* dirmngr/dirmngr.c [HAVE_INOTIFY_INIT]: Include sys/inotify.h.
 +	(oDisableCheckOwnSocket): New.
 +	(opts): Add --disable-check-own-socket.
 +	(disable_check_own_socket): New var.
 +	(parse_rereadable_options): Set that var.
 +	(my_inotify_is_name) [HAVE_INOTIFY_INIT]: New.
 +	(handle_connections) [HAVE_INOTIFY_INIT]: New.
 +
 +2016-09-07  Neal H. Walfield  <neal at g10code.com>
 +
 +	g10: Use the time a signature was seen, not the embedded time, for stats
 +	* g10/tofu.c (ask_about_binding): Use the time that a signature was
 +	seen, not allegedly generated, when generating statistics.
 +
 +	tests: Don't use --tofu-db-format.
 +	* tests/openpgp/tofu.scm: Remove use of --tofu-db-format, which is
 +	deprecated.
 +
 +	g10: Check for a new binding a bit later.
 +	* g10/tofu.c (build_conflict_set): Check for the current key after
 +	looking for conflicts and removing any '!'.
 +
 +	g10: Change TOFU code to respect --faked-system-time.
 +	* g10/tofu.c (record_binding): New parameter now.  Update callers.
 +	Don't use SQLite's strftime('%s','now') to get the current time, use
 +	NOW.
 +	(ask_about_binding): Likewise.
 +	(get_trust): New parameter now.  Update callers.
 +	(show_statistics): Likewise.
 +	(tofu_register_signature): Don't use SQLite's strftime('%s','now') to
 +	get the current time, use gnupg_get_time().
 +	(tofu_register_encryption): Likewise.
 +
 +	g10: Use the correct conversion function.
 +	* g10/tofu.c (show_statistics): Use string_to_ulong, not
 +	string_to_long.
 +
 +2016-09-07  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix format string issues in tofu.
 +	* g10/tofu.c (write_stats_status): Use ulong for MESSSAGES.  Fix
 +	format strings.  Simplify by using the new write_status_printf.
 +
 +2016-09-06  Neal H. Walfield  <neal at g10code.com>
 +
 +	g10: Make sure some functions are passed a primary key.
 +	* g10/tofu.c (get_trust): Make sure the caller provides a primary key.
 +	(tofu_register_signature): Likewise.
 +
 +	g10: Tweak TOFU's verbosity.
 +	* g10/tofu.c (time_ago_str): Only show the most significant unit.
 +	* g10/tofu.c (show_statistics): Tweak the output.
 +
 +	g10: Only show the TOFU warning once per key.
 +	* g10/tofu.c (show_statistics): Return whether to call show_warning.
 +	Move the warning from here...
 +	(show_warning): ... to this new function.
 +	(tofu_get_validity): If show_statistics returns a non-zero value, call
 +	show_warning.
 +
 +	g10: Record and show statistics for encrypted messages when using TOFU.
 +	* g10/tofu.c: Include "sqrtu32.h".
 +	(struct tofu_dbs_s.s): Rename get_trust_gather_other_keys to
 +	get_trust_gather_signature_stats.  Add new field
 +	get_trust_gather_encryption_stats.
 +	(initdb): Create the encryptions table.
 +	(ask_about_binding): Show the encryption statistics too.
 +	(tofu_register): Rename from this...
 +	(tofu_register_signature): ... to this and update callers.
 +	(tofu_register_encryption): New function.
 +	(write_stats_status): Add parameters encryption_count,
 +	encryption_first_done and encryption_most_recent.  Update callers.
 +	Compute the trust using the euclidean distance of the signature and
 +	signature count.  Compare with twice the threshold.  Include
 +	encryption count information in the TFS and TOFU_STATS lines.
 +	(show_statistics): Also get information about the encrypted messages.
 +	* g10/trustdb.c (tdb_get_validity_core): Use it.
 +
 +	g10: Simplify the binding statistics shown for a TOFU conflict.
 +	* g10/tofu.c (ask_about_binding): Simplify binding statistics.
 +
 +2016-09-06  Justus Winter  <justus at g10code.com>
 +
 +	gpgscm: Fix detection of unbalanced parenthesis.
 +	* tests/gpgscm/main.c (load): Print error message.
 +	* tests/gpgscm/scheme.c (opexe_0): Correctly report nesting level when
 +	loading files.
 +
 +	tests: Fix test.
 +	* tests/openpgp/multisig.scm: Add missing parenthesis.
 +
 +2016-09-06  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Terminate on deletion of the socket file (Linux only).
 +	* configure.ac (AC_CHECK_FUNCS): Chec for inotify_init.
 +	* agent/gpg-agent.c [HAVE_INOTIFY_INIT]: Include sys/inotify.h.
 +	(my_inotify_is_name) [HAVE_INOTIFY_INIT]: New.
 +	(handle_connections) [HAVE_INOTIFY_INIT]: New.
 +
 +2016-09-05  Justus Winter  <justus at g10code.com>
 +
 +	tests: Speed up the test suite.
 +	* tests/openpgp/run-tests.scm (test::run-sync): Pass additional
 +	arguments to the test.
 +	(test::run-sync-quiet): Likewise.
 +	(test::run-async): Likewise.
 +	(run-tests-{parallel,sequential}-isolated): Create a tarball of the
 +	gnupghome, then extract it for each test.
 +	* tests/openpgp/setup.scm: Refactor into functions, add an interface
 +	to tar-up the created environment, and untar it multiple times.
 +
 +	common: Restore a simpler variant of 'gnupg_wait_process'.
 +	* common/exechelp-posix.c (gnupg_wait_process): Use the code prior to
 +	5ba4f604.
 +
 +	common: Fix error handling.
 +	* common/exechelp-posix.c (store_result): Use xtrymalloc.
 +	(gnupg_wait_processes): Likewise, and check result.
 +
 +2016-09-05  Neal H. Walfield  <neal at g10code.com>
 +
 +	g10: Don't add user attributes to the TOFU DB.
 +	* g10/trustdb.c (tdb_get_validity_core): Skip user attributes.
 +
 +2016-09-05  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Silence --debug IPC output for connections from self.
 +	* agent/command.c (server_local_s): Add fields 'greeting_seen' and
 +	'connect_from_self'.
 +	(io_monitor): Do not log connections from self.
 +	(start_command_handler): Set flag 'connect_from_self'.
 +	* agent/gpg-agent.c (check_own_socket_thread): Disable logging.
 +	(do_start_connection_thread): Do not log conection start and
 +	termination if IPC debugging is enabled.
 +
 +	agent: Small improvement of the server's local state.
 +	* agent/command.c (sserver_local_s): Change flags to use only one bit.
 +	(option_handler): Make an atoi return 1 or 0.
 +
 +2016-09-05  Neal H. Walfield  <neal at g10code.com>
 +
 +	g10: Refactor cross sig check code.
 +	* g10/tofu.c (BINDING_NEW): New enum value.
 +	(BINDING_CONFLICT): Likewise.
 +	(BINDING_EXPIRED): Likewise.
 +	(BINDING_REVOKED): Likewise.
 +	(ask_about_binding): Move cross sig check from here...
 +	(get_trust): ... and the conflict set building from here...
 +	(build_conflict_set): ... to this new function.
 +	(format_conflict_msg_part1): Replace parameter conflict with
 +	conflict_set.  Drop parameter fingerprint.  Update callers.
 +	(ask_about_binding): Drop unused parameter conflict and redundant
 +	parameter bindings_with_this_email_count.  Rename parameter
 +	bindings_with_this_email to conflict_set.  Update callers.
 +
 +2016-09-05  Justus Winter  <justus at g10code.com>
 +
 +	tests: Update README.
 +	* tests/openpgp/README: Update.
 +
 +	tests: Pass flags to test driver.
 +	* tests/openpgp/Makefile.am (xcheck): Pass flags to 'run-tests.scm'.
 +
 +	common: Improve waiting for processes on POSIX.
 +	* common/exechelp-posix.c (struct terminated_child): New definition.
 +	(terminated_children): New variable.
 +	(store_result): New function.
 +	(get_result): Likewise.
 +	(gnupg_wait_process): Store results that were not requested and
 +	consider previously stored results.
 +
 +	waitpid(2) may return information about terminated children that we
 +	did not yet request, and there is no portable way to wait for a
 +	specific set of children.  As a workaround, we store the results of
 +	children for later use.
 +
 +2016-09-05  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Exclude D lines from the IPC debug output.
 +	* dirmngr/dirmngr.h: Include asshelp.h.
 +	* dirmngr/server.c (server_local_s): Add inhibit_dara_logging fields.
 +	(data_line_write): Implement logging inhibit.
 +	(data_line_cookie_close): Print non-logged D lines.
 +	(cmd_wkd_get, cmd_ks_get, cmd_ks_fetch): Do not log D lines.
 +	(dirmngr_assuan_log_monitor): New.
 +	* dirmngr/dirmngr.c (main): Register monitor function.
 +
 +	common: Add an assuan logging monitor.
 +	* common/asshelp.c (my_log_monitor): New var.
 +	(my_libassuan_log_handler): Run that monitor.
 +	(setup_libassuan_logging): Add arg to set a log monitor and change all
 +	callers.
 +
 +	gpg: New export filter drop-subkey.
 +	* g10/import.c (impex_filter_getval): Add properties for key packets.
 +	* g10/export.c (export_drop_subkey): New var.
 +	(cleanup_export_globals): Release that var.
 +	(parse_and_set_export_filter): Add filter "drop-subkey".
 +	(apply_drop_subkey_filter): New.
 +	(do_export_stream): Run that filter.
 +
 +	common: Add string operator gt,ge,le,lt to recsel.
 +	* common/recsel.c (recsel_parse_expr): Add them.
 +	(recsel_dump): Print them.
 +	(recsel_select): Evaluate them.
 +
 +	gpg: Use a common filter_getval for import and export.
 +	* g10/import.c (filter_getval): Rename to ...
 +	(impex_filter_getval): this.  Make global.
 +	(apply_keep_uid_filter, apply_drop_sig_filter): Adjust.
 +	* g10/export.c (filter_getval): Remove.
 +	(apply_drop_sig_filter): Use impex_filter_getval.
 +
 +2016-09-03  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix an action after card removal.
 +	* scd/command.c (update_card_removed): Call apdu_close_reader here.
 +
 +2016-09-02  Werner Koch  <wk at gnupg.org>
 +
 +	wks: Add framework for policy flags.
 +	* tools/call-dirmngr.c (wkd_get_policy_flags): New.
 +	* tools/gpg-wks.h (struct policy_flags_s, policy_flags_t): New.
 +	* tools/wks-util.c (wks_parse_policy): New.
 +	* tools/gpg-wks-client.c (command_send): Get the policy flags to show
 +	a new info line.
 +	* tools/gpg-wks-server.c (get_policy_flags): New.
 +	(process_new_key): get policy flag and add a stub for "auth-submit".
 +	(command_list_domains): Check policy flags.
 +
 +	dirmngr: Add --policy-flags option to WKD_GET.
 +	* dirmngr/server.c (cmd_wkd_get): Add new option.
 +
 +	common: Check read errors in name-value.c.
 +	* common/name-value.c: Check for read errors.
 +
 +2016-09-02  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Release the card reader after card removal.
 +	* scd/command.c (update_reader_status_file): Call apdu_close_reader.
 +
 +	scd: Clean up unused shutdown method.
 +	* scd/apdu.c (shutdown_ccid_reader, apdu_shutdown_reader): Remove.
 +	(reset_ccid_reader): Don't set shutdown_reader.
 +	* scd/ccid-driver.c (ccid_shutdown_reader): Remove.
 +
 +	agent: invoke scdaemon with --homedir.
 +	* agent/call-scd.c (start_scd): Supply --homedir option when it's not
 +	default homedir.
 +
 +	po: Update Japanese translation.
 +
 +2016-09-01  Neal H. Walfield  <neal at g10code.com>
 +
 +	g10: End transaction earlier.
 +	* g10/tofu.c (ask_about_binding): End the transaction earlier.
 +
 +	g10: Don't consider cross-signed keys to be in conflict.
 +	* g10/tofu.c (cross_sigs): New function.
 +	(ask_about_binding): If apparently conflicting keys are cross signed,
 +	then don't mark them as conflicting.
 +
 +2016-09-01  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Avoid homedir creation by --list-config.
 +	* g10/gpg.c (main): Do not register a key for the list config
 +	commands.
 +
 +	gpg: Simplify code to print VALIDSIG.
 +	* g10/mainproc.c (check_sig_and_print): Use hexfingerprint and
 +	write_status_printf.
 +
 +	gpg: Add new function write_status_printf.
 +	* g10/cpr.c (write_status_printf): New.
 +
 +	gpg: Fix printing of pubkey algo in --verbose signature verify.
 +	* g10/sig-check.c (check_signature2): Replace arg PK by R_PK and
 +	change the semantics.  Also clear the other R_ args on function entry,
 +	use gpg_error() and change retturn type to gpg_error_t.
 +	* g10/mainproc.c (do_check_sig): Add arg R_PK.
 +	(list_node): Pass NULL for new arg.
 +	(check_sig_and_print): Rework to make use of the returned PK.
 +
 +2016-09-01  Neal H. Walfield  <neal at g10code.com>
 +
 +	g10: When asking about a TOFU binding conflict, default to unknown.
 +	* g10/tofu.c (ask_about_binding): Default to unknown.
 +
 +	g10: Add support for TRUST_NEVER.
 +	* g10/pkclist.c (do_we_trust): Handle TRUST_NEVER, which can be
 +	returned by the TOFU trust model.
 +	(do_we_trust_pre): Print a different message if TRUSTLEVEL is
 +	TRUST_NEVER.
 +	(check_signatures_trust): Improve comment.
 +
 +	g10: Improve text.
 +	* g10/tofu.c (show_statistics): Improve the text (key and user id, not
 +	just key).
 +
 +	g10: Remove unused parameter.
 +	* g10/tofu.c (show_statistics): Remove unused parameter sig_exclude.
 +	Update callers.
 +
 +2016-09-01  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Copy the correct digest for use by TOFU.
 +	* g10/mainproc.c (do_check_sig): Use the current digest algo.
 +
 +2016-09-01  Neal H. Walfield  <neal at g10code.com>
 +
 +	g10: Be careful to not be in a transaction during long operations.
 +	* g10/tofu.c (begin_transaction): New parameter only_batch.  If set,
 +	only start a batch transaction if there is none and one has been
 +	requested.  Update callers.
 +	(tofu_suspend_batch_transaction): New function.
 +	(tofu_resume_batch_transaction): Likewise.
 +	(ask_about_binding): Take a ctrl_t, not a tofu_dbs_t.  Update
 +	callers.  Gather statistics within a transaction.  Suspend any batch
 +	transaction when getting user input.
 +	(get_trust): Take a ctrl_t, not a tofu_dbs_t.  Update callers.
 +	Enclose in a transaction.
 +	(tofu_get_validity): Use a batch transaction, not a normal
 +	transaction.
 +
 +2016-09-01  Werner Koch  <wk at gnupg.org>
 +
 +	tests: Run test requiring the network only in maintainer-mode.
 +	* dirmngr/Makefile.am (noinst_PROGRAMS, TESTS): Add module_net_tests.
 +	(module_tests): Move t-dns-test to ...
 +	(module_net_tests): here.
 +
 +2016-08-31  Werner Koch  <wk at gnupg.org>
 +
 +	wks: Send a final message to the user.
 +	* tools/gpg-wks-server.c (send_congratulation_message): New.
 +	(check_and_publish): Call it.
 +
 +	wks: Relax permission check for the top directory.
 +	* tools/gpg-wks-server.c: Allow S_IXOTH for the top directory.
 +
 +2016-08-31  Neal H. Walfield  <neal at g10code.com>
 +
 +	g10: On a TOFU conflict, show whether the uids are expired or revoked.
 +	* g10/tofu.c (struct signature_stats): Add fields is_expired and
 +	is_revoked.
 +	(signature_stats_prepend): Clear *stats when allocating it.
 +	(ask_about_binding): Also show whether the user ids are expired or
 +	revoked.
 +
 +	doc: Add a help text for tofu.conflict.
 +	* doc/help.txt (.gpg.tofu.conflict): New help text.
 +
 +	g10: Always trust ultimately trusted keys.
 +	* g10/tofu.c (get_trust): Always return TRUST_ULTIMATE for ultimately
 +	trusted keys.
 +
 +	g10: Fix error detection.
 +	* g10/tofu.c: first_seen == 0 is not an error.
 +
 +	g10: Update a key's TOFU policy in a transaction.
 +	* g10/tofu.c (tofu_set_policy): Do the update in a transaction.
 +	* g10/gpg.c (main): Do a TOFU policy update in a batch transaction.
 +
 +	g10: Fix the show old policy functionality when changing a TOFU policy.
 +	* g10/tofu.c (record_binding): Fix the show old policy functionality.
 +
 +	g10: Drop unused argument.
 +	* g10/tofu.c (begin_transaction): Remove unused option only_batch.
 +
 +	gpg: Move state local to tofu.c to a private structure.
 +	* g10/gpg.h (struct server_control_s.tofu): Move fields in_transaction
 +	and batch_update_started from here...
 +	* g10/tofu.c (struct tofu_dbs_s): ... to here.
 +
 +	gpg: Avoid name spaces clash with future sqlite versions (2).
 +	* g10/gpgsql.h (gpgsql_arg_type): Rename SQLITE_ARG_END to
 +	GPGSQL_ARG_END, SQLITE_ARG_INT to GPGSQL_ARG_INT, SQLITE_ARG_LONG_LONG
 +	to GPGSQL_ARG_LONG_LONG, SQLITE_ARG_STRING to GPGSQL_ARG_STRING, and
 +	SQLITE_ARG_BLOB to GPGSQL_ARG_BLOB.
 +
 +2016-08-31  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix regression in gpgv's printing of the keyid.
 +	* g10/keyid.c (keystr): Take care of KF_NONE != KF_DEFAULT.
 +
 +2016-08-30  Neal H. Walfield  <neal at g10code.com>
 +
 +	g10: Improve TOFU batch update code.
 +	* g10/gpg.h (tofu): Rename field batch_update_ref to
 +	batch_updated_wanted.
 +	* g10/tofu.c (struct tofu_dbs_s): Rename field batch_update to
 +	in_batch_transaction.
 +	(begin_transaction): Only end an extant batch transaction if we are
 +	not in a normal transaction.  When ending a batch transaction, really
 +	end it.  Update ctrl->tofu.batch_update_started when starting a batch
 +	transaction.
 +	(end_transaction): Only release a batch transaction if ONLY_BATCH is
 +	true.  When releasing a batch transaction, assert that there is no
 +	open normal transaction.  Only allow DBS to be NULL if ONLY_BATCH is
 +	true.
 +	(tofu_begin_batch_update): Don't update
 +	ctrl->tofu.batch_update_started.
 +	(opendbs): Call end_transaction unconditionally.
 +
 +	g10: If a key has no valid user ids, change TOFU to return TRUST_NEVER.
 +	* g10/tofu.c (tofu_get_validity): If a key has no valid (non-expired)
 +	user ids, change TOFU to return TRUST_NEVER.
 +
 +	g10: Change tofu_register & tofu_get_validity to process multiple uids.
 +	* g10/tofu.c (tofu_register): Take a list of user ids, not a single
 +	user id.  Only register the bindings, don't compute the trust.  Thus,
 +	change return type to an int and remove the may_ask parameter.  Update
 +	callers.
 +	(tofu_get_validity): Take a list of user ids, not a single user id.
 +	Update callers.  Observe signatures made by expired user ids, but
 +	don't include them in the trust calculation.
 +
 +	g10: Support nested transactions on the TOFU DB.
 +	* g10/gpg.h (struct server_control_s): New field in_transaction.
 +	* g10/tofu.c (struct tofu_dbs_s): Remove fields savepoint_inner and
 +	savepoint_inner_commit.
 +	(begin_transaction): Increment CTRL->TOFU.IN_TRANSACTION.  Name the
 +	savepoint according to the nesting level.
 +	(end_transaction): Name the savepoint according to the nesting level.
 +	Decrement CTRL->TOFU.IN_TRANSACTION.
 +	(rollback_transaction): Likewise.  Only ever rollback a non-batch
 +	transaction.
 +	(opendbs): Assert that there are no outstanding transactions.
 +
 +	g10: Print the info text in more situations.
 +	* g10/tofu.c (ask_about_binding): Print the info text when the policy
 +	is ask and there are multiple bindings with the email address.
 +
 +	g10: Print the formatted text.
 +	* g10/tofu.c (ask_about_binding): Print the formatted text, not the
 +	unformatted text.
 +
 +	g10: When showing a user id's trust, pass the current signature.
 +	* g10/mainproc.c (check_sig_and_print): Consistently pass SIG to
 +	get_validity.
 +
 +2016-08-29  Werner Koch  <wk at gnupg.org>
 +
 +	w32: Fix build regression due to 2aa0701.
 +	* common/logging.c (fun_writer): Always declare 'name_for_err'.
 +
 +	gpgconf: Print the plain socket directory with --list-dirs.
 +	* tools/gpgconf.c (list_dirs): Add plain socketdir out.
 +
 +	common: Add a default socket name feature.
 +	* common/logging.c (log_set_socket_dir_cb): New.
 +	(socket_dir_cb): New.
 +	(set_file_fd): Allow "socket://".
 +	(fun_writer): Implement default socket name.
 +	* common/init.c (_init_common_subsystems): Register default socket.
 +
 +	gpg: Make decryption of -R work w/o --try-secret-key or --default-key.
 +	* g10/getkey.c (enum_secret_keys): At state 3 enumerate the keys in all
 +	cases not just when --try-all-secrets is used.
 +
 +2016-08-25  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix false negatives in Ed25519 signature verification.
 +	* g10/pkglue.c (pk_verify): Fix Ed25519 signatrue values.
 +	* tests/openpgp/verify.scm (msg_ed25519_rshort): New
 +	(msg_ed25519_sshort): New.
 +	("Checking that a valid Ed25519 signature is verified as such"): New.
 +
 +	common: Rename an odd named function.
 +	* common/openpgp-oid.c (oid_crv25519): Rename to oid_cv25519.
 +	(openpgp_oid_is_crv25519): Rename to openpgp_oid_is_cv25519.  Change
 +	callers.
 +
 +	gpg: New option --with-tofu-info.
 +	* g10/gpg.c (oWithTofuInfo): New.
 +	(opts): Add --with-tofu-info.
 +	(main): Set opt.with_tofu_info.
 +	* g10/options.h (struct opt): Add field WITH_TOFU_INFO.
 +	* g10/tofu.c (show_statistics): Add optional arg OUTFP and enter
 +	special mode if not NULL.  Change all callers.
 +	(tofu_write_tfs_record): New.
 +	* g10/keylist.c (list_keyblock_colon): Do not print the tofu policy as
 +	part of the "uid" record.  Print a new "tfs" record if the new option
 +	is set.
 +	* tests/openpgp/tofu.scm (getpolicy): Change from UID to TFS record.
 +
 +2016-08-24  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Change TOFU_STATS to return timestamps.
 +	* g10/tofu.c (write_stats_status): Add arg FP to print a colon
 +	formated line.  Adjust for changed TOFU_STATS interface.
 +	(show_statistics): Let the query return timestamps and use
 +	gnupg_get-time to compute the "time ago" values.
 +
 +	common: Guarantee that gnupg_get_time does not return an error.
 +	* common/gettime.c (gnupg_get_time): Abor if time() failed.
 +	(gnupg_get_isotime): Remove now useless check.
 +	(make_timestamp): Remove check becuase we already checked this modulo
 +	the faked time thing.
 +
 +	wks: Add command --supported to gpg-wks-client.
 +	* tools/gpg-wks-client.c (aSupported): New.
 +	(opts): Add --supported.
 +	(parse_arguments): Ditto.
 +	(main): Call command_supported.
 +	(command_supported): New.
 +
 +2016-08-22  Werner Koch  <wk at gnupg.org>
 +
 +	wks: Install gpg-wks-client under libexec.
 +	* tools/Makefile.am (bin_PROGRAMS): Move gpg-wks-client to ...
 +	(libexec_PROGRAMS): ...here.
 +
 +	common: Remove unused vars in simple-pwquery.
 +	* common/simple-pwquery.c (agent_send_option): Remove unused vars.
 +	(simple_query): Ditto.
 +	(agent_open): Ditto.  Return RC on error.
 +	(simple_pwquery): Remove unused vars.  Remove shadowing of 'p'.
 +
 +2016-08-18  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.15.
 +
 +	po: Update German translation.
 +
 +2016-08-18  Åka Sikrom  <a4 at hush.com>
 +
 +	po: Update Norwegian translation.
 +
 +2016-08-18  Ineiev  <ineiev at gnu.org>
 +
 +	po: Update Russian translation.
 +
 +2016-08-18  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add import filter "drop-sig".
 +	* g10/import.c (import_drop_sig): New variable.
 +	(cleanup_import_globals): Release that.
 +	(parse_and_set_import_filter): Add filter "drop-sig".
 +	(filter_getval): Implement properties for drop-sig.
 +	(apply_drop_sig_filter): New.
 +	(import_one): Apply that filter.
 +
 +	dirmngr: Remove all system daemon features.
 +	* dirmngr/dirmngr.h (opts): Remove fields 'system_service' and
 +	'system_daemon'.
 +	* common/homedir.c (dirmngr_sys_socket_name): Remove.
 +	(dirmngr_user_socket_name): Rename to ...
 +	(dirmngr_socket_name): this.  Change call callers.
 +	* common/asshelp.c (start_new_dirmngr): Remove the system socket
 +	feature.
 +	* tools/gpgconf.c (list_dirs): Do not print "dirmngr-sys-socket".
 +	* sm/server.c (gpgsm_server): Adjust for removed system socket feature.
 +	* dirmngr/server.c (cmd_getinfo): Ditto.
 +	(cmd_killdirmngr): Remove check for system daemon.
 +	(cmd_reloaddirmngr): Ditto.
 +	* dirmngr/dirmngr.c (USE_W32_SERVICE): Remove macro.
 +	(aService): Remove.
 +	(opts): Remove --service.
 +	(w32_service_control): Remove.
 +	(real_main, call_real_main) [W32]: Remove wrapper.
 +	(main): Remove Windows system service feature.  Remove system dameon
 +	feature.  Use only the "~/.gnupg/dirmngr_ldapservers.conf" file.
 +	* dirmngr/certcache.c (load_certs_from_dir): Remove warning in the
 +	system dameon case.
 +	* dirmngr/crlcache.c (DBDIR_D): Always use "~/.gnupg/crls.d".
 +	* dirmngr/ocsp.c (validate_responder_cert): Do not call
 +	validate_cert_chain which was used only in system daemon mode.
 +	* dirmngr/validate.c (validate_cert_chain): Always use the code.
 +
 +	gpg: New option --sender.
 +	* g10/options.h (struct opt): Add field 'sender_list'.
 +	* g10/gpg.c: Include mbox-util.h.
 +	(oSender): New.
 +	(opts): Add option "--sender".
 +	(main): Parse option.
 +
 +2016-08-16  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Allow import of overly large keys.
 +	* agent/command.c (MAXLEN_KEYDATA): Double the size.
 +
 +2016-08-14  Werner Koch  <wk at gnupg.org>
 +
 +	g13: Allow the use of a g13tab label for --mount.
 +	* g13/mount.c (g13_mount_container): Do not run the first access check
 +	if syshelp is required.
 +
 +	g13: Implement --umount for dm-crypt.
 +	* g13/g13.c (main): Implement command --umount.
 +	* g13/mount.c (g13_umount_container): use the syshelper if needed.
 +	* g13/backend.c (be_umount_container): New.
 +	* g13/be-dmcrypt.c (be_dmcrypt_umount_container): New.
 +	* g13/call-syshelp.c (call_syshelp_run_umount): New.
 +	* g13/sh-cmd.c (cmd_umount): New.
 +	(register_commands): Register UMOUNT.
 +	* g13/sh-dmcrypt.c (sh_dmcrypt_umount_container): New.
 +
 +2016-08-13  Werner Koch  <wk at gnupg.org>
 +
 +	g13: Fix double free bug.
 +	* g13/sh-cmd.c (cmd_mount, cmd_resume): Do not xfree TIUPLES.
 +
 +	g13: Consider g13tab for a mount command.
 +	* g13/sh-cmd.c (cmd_getkeyblob): New.
 +	(register_commands): Register it.
 +	* g13/call-syshelp.c (getkeyblob_data_cb): New.
 +	(call_syshelp_get_keyblob): New.
 +	* g13/mount.c: Include callsyshelp.h.
 +	(g13_mount_container): Ask syshelp whether the filename is managed by
 +	g13tab.  Call syshelp to get the encrypted keyblob in this case.
 +
 +	g13: Move some function around.
 +	* g13/keyblob.c (g13_keyblob_decrypt): Move to ...
 +	* g13/server.c: to here.
 +	* g13/suspend.c, g13/mount.c: Include server.h.
 +	* g13/Makefile.am (g13_syshelp_SOURCES): Add keyblob.c
 +
 +	g13: New command --find-device.
 +	* common/status.h (STATUS_BLOCKDEV: New.
 +	* g13/call-syshelp.c: Include "call-syshelp.h".
 +	(finddevice_status_cb, call_syshelp_find_device): New.
 +	* g13/g13.c (aFindDevice): New.
 +	(opts): Add "--find-device".
 +	(main): Implement --find-device.
 +	* g13/sh-cmd.c (cmd_finddevice): New.
 +	(register_commands): Register new command.
 +
 +2016-08-12  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	Avoid leading ": " in the log output when there are no prefixes.
 +	* common/logging.c (do_logv): When no prefixes have been requested,
 +	omit the ": " separator, since there is nothing on the left-hand
 +	side of it.
 +
 +	Call log_set_prefix() with human-readable labels.
 +	* agent/preset-passphrase.c, agent/protect-tool.c, dirmngr/dirmngr.c
 +	* dirmngr/t-http.c, g10/gpg.c, g10/gpgv.c, g13/g13-syshelp.c
 +	* g13/g13.c, kbx/kbxutil.c, scd/scdaemon.c, sm/gpgsm.c
 +	* tests/gpgscm/main.c, tools/gpg-check-pattern.c
 +	* tools/gpg-connect-agent.c, tools/gpgconf.c, tools/gpgtar.c
 +	* tools/symcryptrun.c: Invoke log_set_prefix() with
 +	human-readable labels.
 +
 +2016-08-11  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: New option --input-size-hint.
 +	* g10/options.h: Include stdint.h.
 +	(struct opt): Add field 'input_size_hint'.
 +	* g10/gpg.c (oInputSizeHint): New.
 +	(opts): Add --input-size-hint.
 +	(main): Set opt.input_size_hint.
 +	* g10/progress.c (write_status_progress): Use the hint.
 +
 +	common: New function string_to_u64.
 +	* common/stringhelp.c (string_to_u64): New.
 +	* dirmngr/http.c (longcounter_t): Remove.
 +	(struct cookie_s): Change content_length to uint64_t.
 +	(parse_response): Use string_to_u64.
 +
 +2016-08-11  Justus Winter  <justus at g10code.com>
 +
 +	common: Remove compatibility code.
 +	* common/Makefile.am: Drop deleted files.
 +	* common/w32-afunix.c: Delete file.
 +	* common/w32-afunix.h: Likewise.
 +
- 	GnuPG-bug-id: 2408
- 
 +	common: Rework the simple password query module.
 +	* common/simple-pwquery.c (writen, readline): Drop.
 +	(agent_send_option, agent_send_all_options, agent_open): Just use
 +	libassuan.
 +	(simple_pw_set_socket): Simplify.
 +	(default_inq_cb): New function.
 +	(simple_pwquery, simple_query): Just use libassuan.
 +	* agent/Makefile.am (gpg_preset_passphrase_LDADD): Add libassuan.
 +	* tools/Makefile.am (symcryptrun_LDADD): Likewise.
 +
 +	common: Remove simple password query error codes.
 +	* common/simple-pwquery.h: Remove mapping function.  Move all
 +	definitions of status codes...
 +	* common/simple-pwquery.c: ... here, and define them to meaningful gpg
 +	error values.
 +	* agent/preset-passphrase.c (preset_passphrase): Use error code as-is.
 +	(forget_passphrase): Likewise.
 +	* tools/symcryptrun.c (confucius_get_pass): Likewise.
 +
 +2016-08-10  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Print the signer's UID during verification.
 +	* g10/parse-packet.c (parse_signature): Sanitize the value stored in
 +	SIGNERS_UID.
 +	* g10/mainproc.c (issuer_fpr_string): New.
 +	(check_sig_and_print): Print the signers' UID.  Print the issuer
 +	fingerprint in --rfc4880bis mode.
 +
 +	common: New function try_make_printable_string.
 +	* common/stringhelp.c (sanitize_buffer): Remove.  Move code to ...
 +	* common/miscellaneous.c (try_make_printable_string): new.
 +	(make_printable_string): Call try_make_printable_string.
 +
 +2016-08-10  Justus Winter  <justus at g10code.com>
 +
 +	tests: Fix distcheck.
 +	* tests/openpgp/issue2417.scm: Copy configuration.
 +
 +2016-08-10  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Remove tofu database format "split".
 +	* g10/options.h (struct opt): Remove field tofu_db_format.
 +	* g10/gpg.h (server_control_s): Add fields tofu.batch_update_ref and
 +	tofu.batch_update_started.
 +	* g10/gpg.c (parse_tofu_db_format): Remove.
 +	(main): Make option --tofu-db-format obsolete.
 +	* g10/tofu.c: Major rework.  Remove the pretty complicated and slower
 +	split format and with that all the caching.  Use the dbs struct
 +	directly.  Move global vars for batch update into CTRL.  Change
 +	calling conventions of some function to take CTRL or DBS pointers
 +	instead of  the former low-level database pointer.
 +
 +2016-08-10  Justus Winter  <justus at g10code.com>
 +
 +	g10: Fix opening of trust database.
 +	* g10/tdbio.c (tdbio_set_dbname): This function explicitly checks for
 +	the file size, but handled the case of a zero-sized file incorrectly
 +	by returning success.  Fix this by initializing the database in that
 +	case.
 +	* tests/openpgp/Makefile.am (XTESTS): Add new test.
 +	* tests/openpgp/issue2417.scm: New file.
 +
- 	GnuPG-bug-id: 2417
- 
 +	tests: Fix distcheck.
 +	* tests/openpgp/Makefile.am (EXTRA_DIST): Explicitly add setup and
 +	teardown scripts now that they no longer are included in the list of
 +	tests.
 +
 +	tests: Improve temporary directory handling.
 +	* tests/gpgscm/ffi.c (ffi_init): Rename 'mkdtemp'.
 +	* tests/gpgscm/tests.scm (mkdtemp): New function that uses a sensible
 +	location and template if no arguments are given.
 +	(with-temporary-working-directory): Simplify accordingly.
 +	(make-temporary-file): Likewise.
 +	* tests/openpgp/run-tests.scm (run-tests-parallel-isolated): Likewise.
 +	(run-tests-sequential-isolated): Likewise.
 +
 +	gpgscm: Make the name of foreign functions more unique.
 +	* tests/gpgscm/ffi-private.h (ffi_define_function_name): Add another
 +	underscore.
 +
 +	tests: Run each test in a clean environment.
 +	* tests/openpgp/Makefile.am (TESTS_ENVIRONMENT): Drop obsolete
 +	variables, add 'srcdir', use absolute paths.
 +	(TESTS): Rename to 'XTESTS' to avoid emitting the automake test
 +	runner.  Drop 'setup.scm' and 'finish.scm'.
 +	(xcheck): New target that runs 'run-tests.scm', our Scheme test suite
 +	runner.  It will run each test in a clean environment, isolated from
 +	the other tests.
 +	(EXTRA_DIST): Adapt accordingly.
 +	* tests/openpgp/README: Likewise.
 +
 +	tests: Make ssh test more robust.
 +	* tests/openpgp/ssh.scm: Drop the 'MD5:' which was not printed by
 +	previous ssh versions.
 +
 +2016-08-10  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: SSH support fix.
 +	* agent/command-ssh.c (ssh_handler_request_identities): Keep error
 +	message same.
 +
 +2016-08-09  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Fix regression in recent ssh changes.
 +	* agent/command-ssh.c (sexp_key_construct): Lowercase the algo name.
 +
 +	gpg: Extend the PROGRESS line to give the used unit.
 +	* g10/progress.c (write_status_progress): Print the units parameter.
 +
 +2016-08-09  Ben Kibbey  <bjk at luxsci.net>
 +
 +	Cleanup initialization of libgcrypt.
 +	* common/init.c (init_common_subsystems): Initialize libgcrypt.
 +	* dirmngr/Makefile.am (dirmngr_ldap): Link with libgcrypt.
 +
 +2016-08-09  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: SSH support improvement.
 +	* agent/command-ssh.c (ssh_handler_request_identities): Skip a key with
 +	error, not giving up to handle the request itself.
 +	* agent/cvt-openpgp.c (extract_private_key): Support "ecdsa" key.
 +
 +2016-08-08  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Cleanup of dek_to_passphrase function (part 2).
 +	* g10/passphrase.c (passphrase_get): Remove arg KEYID.  Change arg
 +	MODE to NOCACHE.
 +	(passphrase_to_dek): Remove args KEYID and PUBKEY_ALGO.  Split arg
 +	MODE into CREATE and NOCACHE.  Change all callers and adjust stubs.
 +	(passphrase_clear_cache): Remove args KEYID and ALGO.  They are not
 +	used.  Change caller.
 +
 +	gpg: Cleanup of dek_to_passphrase function (part 1).
 +	* g10/passphrase.c (passphrase_to_dek_ext): Remove args CUSTDESC and
 +	CUSTPROMPT.  Merge into the passphrase_to_dek wrapper.
 +	(passphrase_get): Remove args CUSTOM_DESCRIPTION and CUSTOM_PROMPT.
 +
 +2016-08-08  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: More clean up of SSH support.
 +	* common/util.h (get_pk_algo_from_key): New.
 +	* common/sexputil.c (get_pk_algo_from_key): The implementation.
 +	* agent/gpg-agent.c: Remove include of openpgpdefs.h.
 +	* agent/command-ssh.c (struct ssh_key_type_spec): Use integer ALGO.
 +	(ssh_key_types): Update with GCRY_PK_*.
 +	(make_cstring, sexp_extract_identifier): Remove.
 +	(sexp_key_construct): Use gcry_pk_algo_name to get ALGO string.
 +	(ssh_key_to_blob): Use cadr to get value list.
 +	(ssh_key_type_lookup): Lookup with integer ALGO.
 +	(ssh_receive_key): Follow the change of ssh_key_type_lookup.
 +	(ssh_send_key_public): Likewise.  Use get_pk_algo_from_key to get ALGO.
 +
 +	tests: Add openpgp/gpgv-forged-keyring.scm.
 +	* tests/openpgp/gpgv-forged-keyring.scm: New.
 +	* tests/openpgp/forged-keyring.gpg: New.
 +	* tests/openpgp/Makefile.am (TESTS): Add gpgv-forged-keyring.scm.
 +	* tests/openpgp/defs.scm (tools): Add GPGV.
 +	(GPGV): New.
 +
 +2016-08-06  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Fix long standing regression tracking the connection count.
 +	* agent/gpg-agent.c (get_agent_active_connection_count): New.
 +	(do_start_connection_thread, start_connection_thread_ssh): Bump
 +	ACTIVE_CONNECTIONS up and down.
 +	* agent/command.c (cmd_getinfo): Add subcommand "connections".
 +
 +2016-08-06  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: Clean up SSH support.
 +	* agent/command-ssh.c (file_to_buffer): Remove.
 +	(ssh_handler_request_identities): Use agent_public_key_from_file.
 +
 +2016-08-05  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	gpg: Avoid publishing the GnuPG version by default.
 +	* g10/gpg.c (main): initialize opt.emit_version to 0
 +	* doc/gpg.texi: document different default for --emit-version
 +
 +2016-08-04  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Make sure that keygrips are printed for each subkey.
 +	* g10/keylist.c (list_keyblock_colon): Print an emprty grip in case of
 +	an error.
 +
 +	gpg: Always print the fingerprint in colons mode.
 +	* g10/keylist.c (list_keyblock_colon): Remove arg FPR.  Always print
 +	fingerprint records.  For secret keys always print keygrip records.
 +
 +	tests: Use gpgconf to set the ssh socket envvar.
 +	* tests/openpgp/ssh.scm ("SSH_AUTH_SOCK"): Use gpgconf.
 +
 +	gpgconf: Add limited support for -0.
 +	* tools/gpgconf.h (opt): Add field 'null'.
 +	* tools/gpgconf.c: Add option --null/-0.
 +	(list_dirs): Use it here.
 +
 +2016-08-04  Justus Winter  <justus at g10code.com>
 +
 +	tests: Update list of tests in Scheme test runner.
 +	* tests/openpgp/run-tests.scm: Add missing tests.
 +
 +	tests: Fix path to fake-pinentry.
 +	* tests/openpgp/defs.scm: Correctly compute the path to fake-pinentry.
 +
 +2016-08-04  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	po: Update Japanese translation.
 +
 +	po: update Japanese translation.
 +
 +	g10: Fix checking key for signature validation.
 +	* g10/sig-check.c (check_signature2): Not only subkey, but also primary
 +	key should have flags.valid=1.
 +
 +2016-08-03  Justus Winter  <justus at g10code.com>
 +
 +	kbx: Add missing header file.
 +	* kbx/keybox-update.c: Add missing header file.
 +
 +2016-08-03  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	More cleanup of "allow to".
 +	* README, agent/command.c, agent/keyformat.txt, common/i18n.c,
 +	  common/iobuf.c, common/keyserver.h, dirmngr/cdblib.c,
 +	  dirmngr/ldap-wrapper.c, doc/DETAILS, doc/TRANSLATE,
 +	  doc/announce-2.1.txt, doc/gpg.texi, doc/gpgsm.texi,
 +	  doc/scdaemon.texi, doc/tools.texi, doc/whats-new-in-2.1.txt,
 +	  g10/export.c, g10/getkey.c, g10/import.c, g10/keyedit.c, m4/ksba.m4,
 +	  m4/libgcrypt.m4, m4/ntbtls.m4, po/ca.po, po/cs.po, po/da.po,
 +	  po/de.po, po/el.po, po/eo.po, po/es.po, po/et.po, po/fi.po,
 +	  po/fr.po, po/gl.po, po/hu.po, po/id.po, po/it.po, po/ja.po,
 +	  po/nb.po, po/pl.po, po/pt.po, po/ro.po, po/ru.po, po/sk.po,
 +	  po/sv.po, po/tr.po, po/uk.po, po/zh_CN.po, po/zh_TW.po,
 +	  scd/app-p15.c, scd/ccid-driver.c, scd/command.c, sm/gpgsm.c,
 +	  sm/sign.c, tools/gpgconf-comp.c, tools/gpgtar.h: replace "Allow to"
 +	  with clearer text.
 +
 +	In standard English, the normal construction is "${XXX} allows ${YYY}
 +	to" -- that is, the subject (${XXX}) of the sentence is allowing the
 +	object (${YYY}) to do something.  When the object is missing, the
 +	phrasing sounds awkward, even if the object is implied by context.
 +	There's almost always a better construction that isn't as awkward.
 +
 +	These changes should make the language a bit clearer.
 +
 +	dirmngr: Emit correct spelling of "superseded".
 +	* dirmngr/crlcache.c (list_one_crl_entry): Spell superseded correctly.
 +	* dirmngr/ocsp.c (ocsp_invalid): Likewise.
 +
 +	This might break some tools which parse the existing output and expect
 +	misspellings, but i'm not sure there are many such tools, and we
 +	should use standardized orthography going forward.
 +
 +	Fix spelling and grammar.
 +	* agent/learncard.c: s/coccured/occurred/
 +	* doc/dirmngr.texi: s/ommitted/omitted/, s/orginally/originally/,
 +	  s/reponses/responses/i
 +	* doc/gpg-agent.texi, doc/dirmngr.texi, doc/gpg.texi: Fix "allows
 +	  to" to more conventional english usage.
 +	* doc/tools.texi, g10/gpgcommpose.c, tests/openpgp/armor.scm,
 +	  tests/openpgp/armor.test: s/occured/occurred/
 +	* tools/gpgsplit.c: s/calcualting/calculating/
 +	* sm/server.c: s/formated/formatted/
 +
 +2016-08-03  Werner Koch  <wk at gnupg.org>
 +
 +	gpg,gpgsm: Block signals during keyring/keybox update.
 +	* kbx/keybox-util.c (keybox_file_rename): Add arg BLOCK_SIGNALS.
 +	* kbx/keybox-update.c (rename_tmp_file): Block all signals when doing
 +	a double rename.
 +	* g10/keyring.c (rename_tmp_file): Block all signals during the double
 +	rename.
 +
 +	common: New file utilproto.c.
 +	* common/util.h: Factor prototypes from signal.c out to ...
 +	* common/utilproto.h: new.
 +	* common/Makefile.am (common_sources): Add new file.
 +
 +2016-08-01  Justus Winter  <justus at g10code.com>
 +
 +	gpgsm: Fix machine-readable key listing.
 +	* sm/keylist.c (list_cert_colon): Drop superfluous colon.
 +
- 	GnuPG-bug-id: 2432
- 
 +	tests: Distribute standalone test runner.
 +	* tests/openpgp/Makefile.am (EXTRA_DIST): Add missing file
 +	'run-tests.scm'.
 +
- 	GnuPG-bug-id: 2431
- 
 +2016-07-28  Justus Winter  <justus at g10code.com>
 +
 +	tests: Fix distcheck.
 +	* tests/openpgp/Makefile.am (sample_msgs): New variable.
 +	(EXTRA_DIST): Also ship the sample msgs.
 +
 +2016-07-27  Fredrik Fornwall  <fredrik at fornwall.net>
 +
 +	build: Fix check for Android.
 +	* configure.ac: Match other Android targets as well.
 +
 +2016-07-26  Justus Winter  <justus at g10code.com>
 +
 +	common: Fix iobuf_peek corner case.
 +	Previously, iobuf_peek on a file smaller than 'buflen' would hang.
 +
 +	* common/iobuf.c (underflow): Generalize by adding a target parameter.
 +	(iobuf_peek): Use this to prevent looping here.
 +	* tests/openpgp/Makefile.am (TESTS): Add new test.
 +	* tests/openpgp/setup.scm (dearmor): Move function...
 +	* tests/openpgp/defs.scm (dearmor): ... here.
 +	* tests/openpgp/issue2419.scm: New file.
 +	* tests/openpgp/samplemsgs/issue2419.asc: Likewise.
 +
- 	GnuPG-bug-id: 2419
- 
 +	gpgscm: Do not shadow common function name in catch macro.
 +	* tests/gpgscm/init.scm (catch): Do not shadow 'exit'.
 +
 +	tests: Fix distcheck.
 +	* tests/openpgp/Makefile.am (samplekeys): Add missing key.
 +
- 	Fixes-commit: 4ba11251
- 
 +	gpgscm: Make the verbose setting more useful.
 +	* tests/gpgscm/ffi.c (do_get_verbose): New function.
 +	(do_set_verbose): Likewise.
 +	(ffi_init): Turn *verbose* into a function, add *set-verbose!*.
 +	* tests/gpgscm/tests.scm (call): Adapt accordingly.
 +	(call-with-io): Dump output if *verbose* is high.
 +	(pipe-do): Adapt accordingly.
 +	* tests/openpgp/defs.scm: Set verbosity according to environment.
 +	* tests/openpgp/run-tests.scm (test): Adapt accordingly.
 +
 +	common: Avoid excessive stack use.
 +	* common/exectool.c (copy_buffer_shred): Make passing NULL a nop.
 +	(gnupg_exec_tool_stream): Allocate copy buffers from the heap.
 +
 +	common: Rework resource cleanup when handling errors.
 +	* common/exectool.c (gnupg_exec_tool_stream): Rework error handling.
 +
 +	common: Add unit test for exectool.
 +	* common/Makefile.am: Build new test.
 +	* common/t-exectool.c: New file.
 +
 +2016-07-25  Justus Winter  <justus at g10code.com>
 +
 +	g10: Fix key import statistics.
 +	'transfer_secret_keys' collects statistics on a subkey-basis, while
 +	the other code does not.  This leads to inflated numbers when
 +	importing secret keys.  E.g. 'count' is incremented by the main
 +	parsing loop in 'import', and again in 'transfer_secret_keys', leading
 +	to a total of 3 if one key with two secret subkeys is imported.
 +
 +	* g10/import.c (import_secret_one): Adjust to the fact that
 +	'transfer_secret_keys' collects subkey statistics.
 +	* tests/openpgp/Makefile.am (TESTS): Add new test.
 +	* tests/openpgp/issue2346.scm: New file.
 +	* tests/openpgp/samplekeys/issue2346.gpg: Likewise.
 +
- 	GnuPG-bug-id: 2346
- 
 +2016-07-22  Justus Winter  <justus at g10code.com>
 +
 +	gpgscm: Make function more general.
 +	* tests/gpgscm/tests.scm (in-srcdir): Accept more path fragments.
 +
 +	g10: Properly ignore legacy keys in the keyring cache.
 +	* g10/keyring.c (keyring_rebuild_cache): Properly ignore legacy keys
 +	in the keyring cache.
 +	* tests/migrations/Makefile.am (TESTS): Add new test.
 +	* tests/migrations/common.scm (GPG-no-batch): New variable.
 +	(run-test): New function.
 +	* tests/migrations/issue2276.scm: New file.
 +	* tests/migrations/issue2276.tar.asc: Likewise.
 +
- 	GnuPG-bug-id: 2276
- 
 +2016-07-21  Justus Winter  <justus at g10code.com>
 +
 +	g10: Fix error handling.
 +	* g10/tofu.c (show_statistics): Fix error handling, 0 is a valid
 +	duration.
 +
 +	g10: Drop superfluous begin transaction.
 +	* g10/tofu.c (record_binding): We only need a transaction for the
 +	split format.
 +
 +	gpgscm: Make assert macro more accurate.
 +	* tests/gpgscm/lib.scm (assert): Print the representation of the
 +	failed expression.
 +
 +	gpgscm: Make error message more useful.
 +	* tests/gpgscm/scheme.c (opexe_0): Include names of missing function
 +	parameters in the error message.
 +
 +	g10: Fix crash.
 +	* g10/tofu.c (tofu_closedbs): Fix freeing database handles up to the
 +	cache limit.  Previously, this would crash if db_cache_count == count.
 +
- 	Reported-by: Ben Kibbey <bjk at luxsci.net>
- 
 +2016-07-20  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix card removal/reset on multiple contexts.
 +	* scd/app.c (application_notify_card_reset): Add message for debug.
 +	*scd/command.c (update_card_removed): Call release_application and set
 +	SLOT -1 here.
 +	(struct server_local_s): Remove app_ctx_marked_for_release.
 +	(do_reset): Don't mark release but call release_application here.
 +	(open_card): Remove app_ctx_marked_for_release handling.
 +	(update_reader_status_file): Don't set SLOT here, so that it can be
 +	released the APP by application_notify_card_reset in
 +	update_card_removed.
 +
 +2016-07-19  Justus Winter  <justus at g10code.com>
 +
 +	agent: Add known keys to sshcontrol.
 +	* agent/command-ssh.c (ssh_identity_register): Add a key to sshcontrol
 +	even if it is already in the private key store.
 +	* tests/openpgp/ssh.scm: Test this.
 +
- 	GnuPG-bug-id: 2316
- 
 +	tests: Add test for ssh support.
 +	* tests/gpgscm/tests.scm (path-expand): New function.
 +	* tests/openpgp/Makefile.am (TESTS): Add new test.
 +	(sample_keys): Add new keys.
 +	(CLEANFILES): Clean ssh socket and control file.
 +	* tests/openpgp/fake-pinentry.c (main): Add a default passphrase.
 +	* tests/openpgp/gpg-agent.conf.tmpl: Enable ssh support.
 +	* tests/openpgp/samplekeys/ssh-dsa.key: New file.
 +	* tests/openpgp/samplekeys/ssh-ecdsa.key: Likewise.
 +	* tests/openpgp/samplekeys/ssh-ed25519.key: Likewise.
 +	* tests/openpgp/samplekeys/ssh-rsa.key: Likewise.
 +	* tests/openpgp/ssh.scm: Likewise.
 +
 +2016-07-19  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix race conditions for release_application.
 +	* scd/command.c (do_reset, cmd_restart): Reset app_ctx before calling
 +	release_application.
 +
 +2016-07-18  Justus Winter  <justus at g10code.com>
 +
 +	agent: Fix passphrase cache lookups.
 +	CACHE_MODE_ANY is supposed to match any cache mode except
 +	CACHE_MODE_IGNORE, but the code used '==' to compare cache modes.
 +
 +	* agent/cache.c (cache_mode_equal): New function.
 +	(agent_set_cache): Use the new function to compare cache modes.
 +	(agent_get_cache): Likewise.
 +	* tests/openpgp/Makefile.am (TESTS): Add new test.
 +	* tests/openpgp/issue2015.scm: New file.
 +
- 	GnuPG-bug-id: 2015
- 
 +2016-07-15  Justus Winter  <justus at g10code.com>
 +
 +	build: Always build gpgtar.
 +	We use gpgtar to unpack test data, hence we always build it.  If the
 +	user opts out, we simply don't install it.
 +
 +	* configure.ac: Add comment.
 +	* tests/migrations/Makefile.am (required_pgms): Make sure gpgtar is
 +	built.
 +	* tools/Makefile.am: Always build gpgtar, but do not install it if the
 +	user used '--disable-gpgtar'.
 +
 +2016-07-15  Werner Koch  <wk at gnupg.org>
 +
 +	wks: Publish as binary file.
 +	* tools/gpg-wks-server.c (copy_key_as_binary): New.
 +	(check_and_publish): Use new function instead of rename.
 +
 +2016-07-15  Justus Winter  <justus at g10code.com>
 +
 +	gpgscm: Fix linking.
 +	* tests/gpgscm/Makefile.am: Add -lintl.
 +
 +	g10: Fix building without trust models.
 +	* g10/pkclist.c (write_trust_status): Fall back to the previous
 +	behavior.
 +
- 	Fixes-commit: ae188932
- 
 +	tests: Check for gpgtar.
 +	* tests/migrations/extended-pkf.scm: Skip test if gpgtar is not built.
 +	* tests/migrations/from-classic.scm: Likewise.
 +	* tests/openpgp/gpgtar.scm: Fix check for gpgtar.
 +
 +2016-07-14  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.14.
 +
 +	po: Update the German translation.
 +
 +2016-07-14  Damien Goutte-Gattat  <dgouttegattat at incenp.org>
 +
 +	dirmngr: fix handling of HTTP redirections.
 +	* dirmngr/ks-engine-http.c (ks_http_fetch): Reinitialize HTTP session
 +	when following a HTTP redirection.
 +
 +2016-07-14  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Remove options --print-dane-records and --print-pka-records.
 +	* g10/gpg.c (main): Remove options but print a dedicated warning.
 +	* g10/options.h (struct opt): Remove fields 'print_dane_records' and
 +	'print_pka_records'.
 +	* g10/keylist.c (list_keyblock): Do not call list_keyblock_pka.
 +	(list_keyblock_pka): Remove.
 +
 +2016-07-14  Åka Sikrom  <a4 at hush.com>
 +
 +	po: Complete update of the Norwegian translation.
 +
 +2016-07-14  Yuri Chornoivan  <yurchor at ukr.net>
 +
 +	Update Ukrainian translation.
 +
 +2016-07-14  Ineiev  <ineiev at gnu.org>
 +
 +	Update Russian translation.
 +
 +2016-07-14  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix regression since 2.1 in --search-key with a fingerprint.
 +	* dirmngr/ks-engine-hkp.c (ks_hkp_search): Prefix fingerprint with 0x.
 +
 +	gpgscm: Use kludge to avoid improper use of ffi_schemify_name.
 +	* tests/gpgscm/ffi.c (ffi_schemify_name): Use xstrdup instead of
 +	strdup for now.
 +
 +	build: Require latest released libraries.
 +	* agent/protect.c (OCB_MODE_SUPPORTED): Remove macro.
 +	(do_encryption): Always support OCB.
 +	(do_decryption): Ditto.
 +	(agent_unprotect): Ditto.
 +	* dirmngr/server.c (is_tor_running): Unconditionally build this.
 +
 +2016-07-13  Werner Koch  <wk at gnupg.org>
 +
 +	build: Update config.{guess,sub} to {2016-05-15,2016-06-20}.
 +	* build-aux/config.guess: Update.
 +	* build-aux/config.sub: Update.
 +
 +	gpg: Fix regression due to the new --mimemode options.
 +	* g10/gpg.c (opts): Re-add oTextmodeShort.
 +
 +2016-07-13  Daiki Ueno  <ueno at gnu.org>
 +
 +	gpg: Make --try-all-secrets work for hidden recipients.
 +	* g10/getkey.c (enum_secret_keys): Really enumerate all secret
 +	keys if --try-all-secrets is specified.
 +
 +2016-07-13  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Do not print a the short keyid if the high word is zero.
 +	* g10/keyid.c (format_keyid): Always returh long keyid ifor KF_LONG.
 +
 +	gpg: New option --mimemode.
 +	* g10/gpg.c (oMimemode): New.
 +	(opts): Add --mimemode.
 +	(main): Use --mimemode only in rfc4880bis compliance mode.
 +	* g10/options.h (struct opt): Add field "mimemode".
 +	* g10/build-packet.c (do_plaintext): Allow for mode 'm'.
 +	* g10/encrypt.c (encrypt_simple, encrypt_crypt): Use 'm' if requested.
 +	* g10/plaintext.c (handle_plaintext): Handle 'm' mode.
 +	* g10/sign.c (write_plaintext_packet): Handle 'm' mode.
 +	(sign_file, sign_symencrypt_file): Use 'm' if requested.
 +
 +	wks: Use correct key for the confirmation.
 +	* tools/gpg-wks-client.c (send_confirmation_response): Actually
 +	encrypt to the recipient.
 +
 +	wks: New server command --list-domains.
 +	* tools/gpg-wks-server.c (aListDomains): New.
 +	(opts): Add --list-domains.
 +	(parse_arguments): Implement.
 +	(main): Ditto.  Use only one final diagnostic message.
 +	(command_list_domains): New.
 +	(check_and_publish): Remove directory creation.
 +	(get_domain_list): New.
 +	(expire_pending_confirmations): Rewrite using a list of directories.
 +	(command_cron): Get domain list and pass to
 +	expire_pending_confirmations.
 +
 +2016-07-13  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: Fix envvars for UPDATESTARTUPTTY.
 +	agent/command.c (cmd_updatestartuptty): Use session_env_list_stdenvnames
 +	to get the list.
 +
 +2016-07-12  Werner Koch  <wk at gnupg.org>
 +
 +	g13: Fix memleak.
 +	* g13/g13tuple.c (create_tupledesc): Init refcount to 1.
 +
 +	wks: Add --cron command to gpg-wks-server.
 +	* tools/gpg-wks-server.c (PENDING_TTL): New.
 +	(expire_one_domain, expire_pending_confirmations): New.
 +	(command_cron): New.
 +	(main): Implement --cron.
 +
 +	wks: Try to send an encrypted confirmation back.
 +	* tools/gpg-wks-client.c (encrypt_response_status_cb): New.
 +	(encrypt_response): New.
 +	(send_confirmation_response): Encrypt the response.
 +
 +	* tools/gpg-wks-server.c (send_confirmation_request): Use freeing of
 +	BODY and BODYENC.
 +
 +	wks: Also create DANE record.
 +	* tools/gpg-wks-server.c (copy_key_as_dane): New.
 +	(check_and_publish): Also publish as DANE record.
 +
 +	gpg: Extend import-option import-export to print PKA or DANE.
 +	* g10/export.c (do_export_stream): Move PKA and DANE printing helper
 +	code to ...
 +	(print_pka_or_dane_records): this fucntion.
 +	(write_keyblock_to_output): Add arg OPTIOSN and call
 +	print_pka_or_dane_records if requested.
 +
 +	gpg: Move a function from import.c to export.c.
 +	* g10/import.c (write_keyblock_to_output): Move to ...
 +	* g10/export.c (write_keyblock_to_output): here.  Add arg WITH_ARMOR.
 +	Also make sure never to export ring trust packets.
 +
 +2016-07-11  Werner Koch  <wk at gnupg.org>
 +
 +	gpgconf: Enhance --list-dirs.
 +	* tools/gpgconf.c (main) <aListDir>: Factor code out to ...
 +	(list_dirs): new.  Rewrite to use a table.  Allow selection of a
 +	items.  Add "agent-ssh-socket".
 +
 +2016-07-09  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	gpgv: Tweak default options for extra security.
 +	* g10/gpgv.c (main): Set opt.no_sig _cache, so that it doesn't depend on
 +	cached status.  Similarly, set opt.flags.require_cross_cert for backsig
 +	validation for subkey signature.
 +
 +2016-07-07  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add export options "export-pka" and "export-dane".
 +	* g10/options.h (EXPORT_PKA_FORMAT): New.
 +	* g10/keylist.c (list_keyblock_pka): Do not use DANE flag.
 +	* g10/export.c: Include zb32.h.
 +	(parse_export_options): Add options "export-pka" and "export-dane".
 +	(do_export): Do not armor if either of these option is set.
 +	(print_pka_or_dane_records): New.
 +	(do_export_stream): Implement new options.
 +
 +	gpg: Split a too large export function.
 +	* g10/export.c (do_export_stream): Factor some code out to ...
 +	(do_export_one_keyblock): new.
 +
 +2016-07-07  Justus Winter  <justus at g10code.com>
 +
 +	gpgscm: Capture output of spawned processes.
 +	* tests/gpgscm/tests.scm (call-check): Capture stdout and stderr, and
 +	return stdout if the child exited successfully, or include stderr in
 +	the error.
 +	* tests/openpgp/version.scm: Demonstrate this by checking the stdout.
 +
 +2016-07-06  Werner Koch  <wk at gnupg.org>
 +
 +	doc: Escape file names in generated macros.
 +	* doc/mkdefsinc.c (print_filename): New.
 +	(main): Use it here.
 +
 +	wks: Let the server take the encrytion key from the file.
 +	* tools/gpg-wks-server.c (encrypt_stream): Change arg 'fingerprint' to
 +	'keyfile'.
 +	(store_key_as_pending): Add arg 'r_fname' to make of the keyfile.
 +	(send_confirmation_request): Add arg 'keyfile'.
 +	(process_new_key): Pass on the name of the keyfile.
 +
 +	gpg: New options --recipient-file and --hidden-recipient-file.
 +	* g10/gpg.c (oRecipientFile, oHiddenRecipientFile): New.
 +	(opts): Add options --recipient-file and --hidden-recipient-file.
 +	(main): Implement them.  Also remove duplicate code from similar
 +	options.
 +	* g10/keydb.h (PK_LIST_FROM_FILE): New.
 +	(PK_LIST_SHIFT): Bump up.
 +	* g10/pkclist.c (expand_group): Take care of PK_LIST_FROM_FILE.
 +	(find_and_check_key): Add and implement arg FROM_FILE.
 +	(build_pk_list): Pass new value for new arg.
 +	* g10/getkey.c (get_pubkey_fromfile): New.
 +	* g10/gpgv.c (read_key_from_file): New stub.
 +	* g10/test-stubs.c (read_key_from_file): New stub.
 +	* g10/server.c (cmd_recipient): Add flag --file.
 +	* g10/import.c (read_key_from_file): New.
 +
 +	* tests/openpgp/defs.scm (key-file1): New.
 +	(key-file2): New.
 +	* tests/openpgp/setup.scm: Add their private keys and import the
 +	key-file1.
 +	* tests/openpgp/encrypt.scm: Add new test.
 +
 +	gpg: New option --no-keyring.
 +	* g10/gpg.c (oNoKeyring): New.
 +	(opts): Add "--no-keyring".
 +	(main): Do not register any keyring if the option is used.
 +
 +	gpg: Document use of node flags in import.c and remove unused args.
 +	* g10/import.c (NODE_GOOD_SELFSIG): New.  Use instead of 1.
 +	(NODE_BAD_SELFSIG): New.  Use instead of 2.
 +	(NODE_DELETION_MARK): New.  Use instead of 4.
 +	(NODE_FLAG_A): New.  Use to mark new nodes in merge_blocks.
 +	(chk_self_sigs): Remove unused args FNAME and PK.
 +	(import_one): Adjust call.  Simplify error return because
 +	chk_self_sigs does not return an error code.
 +	(append_uid, append_key, merge_sigs, merge_keysigs): Remove unsued
 +	args FNAME and KEYID.
 +	(merge_blocks, import_one, import_secret_one)
 +	(import_revoke_cert): Remove unused arg FNAME.
 +
 +	gpg: Get rid of an unused arg in a function in getkey.c.
 +	* g10/getkey.c (pk_from_block): Remove unused arg CTX.  Change all
 +	callers.
 +
 +	gpg: Change calling convention for a function in getkey.c.
 +	* g10/getkey.c (merge_selfsigs): Remove arg CTX.  Add args REQ_USAGE
 +	and WANT_EXACT.
 +	(finish_lookup): Adjust caller.  Set LOOKUP_NOT_SELECTED here...
 +	(lookup): and not here.
 +
 +2016-07-05  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix possible out-of-bounds read in is_armored.
 +	* g10/armor.c (check_input): Call is_armored only if LEN >= 2.
 +	(unarmor_pump): Use a 2 byte buffer for is_armored.
 +
 +2016-07-05  Justus Winter  <justus at g10code.com>
 +
 +	tests: Honor environment variable 'TMP'.
 +	This fixes problems with long socket names, e.g. when doing distcheck.
 +
 +	* tests/gpgscm/tests.scm (path-join): New function.
 +	(with-temporary-working-directory): Honor 'TMP'.
 +	(make-temporary-file): Likewise.
 +	* tests/migrations/Makefile.am (TMP): Default to '/tmp'.
 +	(TESTS_ENVIRONMENT): Set 'TMP'.
 +	* tests/openpgp/Makefile.am (TMP): Default to '/tmp'.
 +	(TESTS_ENVIRONMENT): Set 'TMP'.
 +
 +	gpgscm: Improve robustness and compatibility.
 +	* tests/gpgscm/ffi.c (do_getenv): Avoid gccism.
 +	(do_mkdtemp): Handle errors.
 +
 +	tests/migrations: Fix distcheck.
 +	* tests/migrations/Makefile.am (TESTS): Rename test.
 +	(TEST_FILES): Update list.
 +	(EXTRA_DIST): Add common.scm.
 +	* tests/migrations/common.scm (GPGTAR): New variable.
 +	(dearmor): Rename and untar archive.
 +	* tests/migrations/extended-private-key-format.scm: Rename.
 +	(setup): Update.
 +	* tests/migrations/extended-pkf.tar.asc: New file.
 +	* tests/migrations/extended-private-key-format.gpghome: Delete.
 +	* tests/migrations/from-classic.gpghome: Likewise.
 +	* tests/migrations/from-classic.scm (setup): Update.
 +	* tests/migrations/from-classic.tar.asc: New file.
 +
 +	tools/gpgtar: Provide --create and --extract.
 +	* tools/gpgtar.c (cmd_and_opt_values): New values.
 +	(opts): New actions.
 +	(parse_arguments): Handle new actions.
 +	* tests/openpgp/gpgtar.scm: Test new interface.
 +
 +	g10: Fix out-of-bounds read.
 +	* g10/armor.c (use_armor_filter): We need two bytes for 'is_armored'.
 +
 +2016-07-04  Werner Koch  <wk at gnupg.org>
 +
 +	wks: Add command --read to gpg-wks-client.
 +	* tools/gpg-wks-client.c (aRead): New.
 +	(opts): Add command "--read".
 +	(main): Implement that.
 +
 +	tests: Add a gettime test for sizeof (time_t) > 4.
 +	* common/t-gettime.c (test_isotime2epoch): Add 4 more tests.
 +
 +2016-07-03  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Avoid spurious failures on keyblocks with no or only deleted nodes.
 +	* g10/import.c (write_keyblock_to_output): Clear ERR on success.
 +
 +	wks: Let the client only export the requested UID.
 +	* tools/gpg-wks-client.c (get_key): Export only the requested uid.
 +
 +	tools: Call sendmail directly from the wks tools.
 +	* tools/send-mail.c, tools/send-mail.h: New.
 +	* tools/wks-util.c: New.
 +	* tools/Makefile.am (gpg_wks_server_SOURCES): Add them.
 +	(gpg_wks_client_SOURCES): Ditto.
 +	* tools/gpg-wks.h (opt): Add fields use_sendmail and output.
 +	* tools/gpg-wks-client.c: Add options --send and --output.  Rename
 +	command --send to --create.
 +	(command_send, send_confirmation_response): Output via wks_send_mime.
 +	* tools/gpg-wks-server.c:  Add options --send and --output.
 +	(send_confirmation_request): Output via wks_send_mime.
 +	(check_and_publish): Add hack for name-value bug.
 +
 +2016-07-02  Werner Koch  <wk at gnupg.org>
 +
 +	tools: Add options to gpg-wks-server.
 +	* tools/gpg-wks.h (opt): Add 'default_from' and 'extra_headers'.
 +	* tools/gpg-wks-server.c (oFrom, oHeader): New.
 +	(parse_arguments): Set them and check args.
 +	(get_submission_address): New.
 +	(send_confirmation_request): Set correct From address.  Add extra
 +	headers.
 +	(process_new_key): Return an error code.
 +
 +	tools: Extend mime-maker.c:mime_maker_add_header.
 +	* tools/mime-maker.c (add_header): Check header name and allow
 +	name-value syntax.
 +	(mime_maker_add_header): Add mode for a syntax check.
 +
 +	doc: Describe filter expressions.
 +	* doc/gpg.texi: Remove some superfluous .E.
 +	(FILTER EXPRESSIONS): New.
 +
 +	yat2m: Fix table formatting.
 +	* doc/yat2m.c (proc_texi_cmd): Use .TQ for @itemx.  Print a .P at the
 +	end of a level 0 table.
 +
 +2016-07-01  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: New option --export-filter.
 +	* g10/gpg.c (oExportFilter): New.
 +	(opts): Add --export-filter.
 +	(main): Handle option.
 +	* g10/export.c: Include recsel.h, init.h, and mbox-util.h.
 +	(export_keep_uid): New global var.
 +	(cleanup_export_globals): New.
 +	(parse_and_set_export_filter): New.
 +	(filter_getval): New.
 +	(apply_keep_uid_filter): New.
 +	(do_export_stream): Apply filter if set.
 +
 +	gpg: New option --import-filter.
 +	* g10/gpg.c (oImportFilter): New.
 +	(opts): Add --import-filter.
 +	(main): Handle option.
 +	* g10/import.c: Include recsel.h, init.h, and mbox-util.h.
 +	(import_keep_uid): New global var.
 +	(cleanup_import_globals): New.
 +	(parse_and_set_import_filter): New.
 +	(filter_getval): New.
 +	(apply_keep_uid_filter): New.
 +	(import_one): Apply filter if set.
 +
 +	gpg: Allow to cache the mbox in a user id struct.
 +	* g10/packet.h (PKT_user_id): Add field 'mbox'.
 +	* g10/free-packet.c (free_user_id): Free that.
 +
 +	gpg: Make sure a user ID packet has always a terminating Nul in memory.
 +	* g10/keygen.c (write_uid): Avoid overflow.
 +
 +	common: Add function to select records etc.
 +	* common/recsel.c, common/recsel.h: New.
 +	* common/t-recsel.c: New.
 +
 +	common: Smart up register_mem_cleanup_func.
 +	* common/init.c (register_mem_cleanup_func): Avoid double registration.
 +
 +2016-07-01  Justus Winter  <justus at g10code.com>
 +
 +	common: Annotate semi-static allocation.
 +	* common/argparse.c (optfile_parse): Allow string arguments to leak.
 +
 +	g10: Fix memory leak.
 +	* g10/keyserver.c (parse_keyserver_uri): Free URI.
 +
 +	tools/gpgtar: Annotate semi-static allocation.
 +	* tools/gpgtar.c (shell_parse_argv): Annotate argument vector as
 +	leaked.
 +
 +	g10: Fix memory leak.
 +	* g10/import.c (transfer_secret_keys): Release curve from the previous
 +	iteration.
 +
 +	g10: Fix build with disabled kbnode cache.
 +	* g10/kbnode.c (release_unused_nodes): Fix build with disabled kbnode
 +	cache.
 +
 +	g10: Fix memory leak.
 +	* g10/trustdb.c (tdb_get_validity_core): Fix kbnode leak.
 +
 +	g10: Fix memory leak.
 +	* g10/keygen.c (keygen_set_std_prefs): Fix memory leak.
 +
 +	Fix trivial memory leaks in tests.
 +	* dirmngr/t-ldap-parse-uri.c (check_ldap_escape_filter): Free result.
 +	* g10/t-stutter.c (main): Free file name.
 +
 +2016-06-30  Justus Winter  <justus at g10code.com>
 +
 +	tools: Fix trivial memory leak.
 +	* tools/gpg-connect-agent.c (main): Fix trivial memory leak.
 +
 +	g10: Fix memory leak.
 +	* g10/export.c (do_export_stream): Free secret parameters.
 +
 +	g10: Fix memory leak.
 +	* g10/keygen.c (read_parameter_file): Free 'line'.
 +
 +	g10: Fix memory leak.
 +	* g10/sign.c (mk_notation_policy_etc): Free 'mbox'.
 +
 +	common: Fix memory leak.
 +	* g10/textfilter.c (copy_clearsig_text): Free buffer.
 +
 +	common: Fix memory leak.
 +	* common/iobuf.c (iobuf_set_partial_body_length_mode): Only create
 +	context if necessary.
 +
 +	common: Fix memory leak.
 +	* common/simple-pwquery.c (agent_open): Free socket path.
 +
 +	g10: Fix keybox-related memory leaks.
 +	* g10/keydb.c (keydb_release): Clear keyblock cache.
 +	(keydb_get_keyblock): Revert previous change.
 +	* kbx/keybox-blob.c (create_blob_finish): Free previous buffer, free
 +	fixups after applying them.
 +	(_keybox_release_blob): Free buffer.  Currently, the buffer has been
 +	extracted before the keybox is released, but this is the right thing
 +	to do here.
 +
- 	Fixes-commit: c57501cc
- 
 +	g10: Fix memory leak.
 +	* g10/compress.c (release_context): Free buffers.
 +
 +	g10: Fix memory leak.
 +	* g10/sign.c (write_plaintext_packet): Free packet.
 +
 +	g10: Fix memory leak.
 +	* g10/mainproc.c (release_list): Do not exit early if list is NULL,
 +	there are other resources that must be released.
 +
 +	gpgscm: Fix reallocating string ports.
 +	* tests/gpgscm/scheme.c (realloc_port_string): Use memcpy because
 +	Scheme strings may contain 0s.
 +
 +	gpgscm: Free memory backing string ports.
 +	* tests/gpgscm/scheme.c (finalize_cell): Free memory backing string
 +	ports.
 +
 +	gpgscm: Use the allocator from libgcrypt.
 +	* tests/gpgscm/main.c (main): Use the allocator from libgcrypt.
 +
 +	w32: Fix build.
 +	* g10/keyedit.c (keyedit_quick_revuid): Fix call to
 +	'check_trustdb_stale'.
 +
- 	Fixes-commit: 55d112ee
- 
 +2016-06-30  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	g10: Implement gpg --quick-revuid.
 +	* g10/revoke.c (get_default_uid_revocation_reason): New.
 +	* g10/keyedit.c (menu_revuid): Break out creation of uid revocation
 +	into new function core_revuid.
 +	* g10/keyedit.c (keyedit_quick_revuid): New. Selects key and
 +	uid, invokes core_revuid.
 +	* g10/gpg.c (main): Handle --quick-revuid argument.
 +	* doc/gpg.texi: Document --quick-revuid.
 +
 +2016-06-29  Werner Koch  <wk at gnupg.org>
 +
 +	tools: Add gpg-wks-client and gpg-wks-server.
 +	* configure.ac: Add option --enable-wks-tools
 +	* tools/gpg-wks-client.c: New.
 +	* tools/gpg-wks-server.c: New.
 +	* tools/gpg-wks.h: new.
 +	* tools/wks-receive.c: New.
 +	* tools/call-dirmngr.c, tools/call-dirmngr.h: New.
 +
 +	build: Improve GNUPG_BUILD_PROGRAM macro.
 +	* acinclude.m4 (GNUPG_BUILD_PROGRAM): Allow for dash in options.
 +
 +	tools: Add modules for MIME parsing and creating.
 +	* tools/mime-maker.c: New.
 +	* tools/mime-maker.h: New.
 +	* tools/mime-parser.c: New.
 +	* tools/mime-parser.h: New.
 +
 +2016-06-28  Justus Winter  <justus at g10code.com>
 +
 +	gpgscm: Fix memory leaks.
 +	* tests/gpgscm/ffi-private.h (ffi_schemify_name): Fix prototype.
 +	(ffi_define_function_name): Free schemified name.
 +	(ffi_define_function): Likewise.
 +	(ffi_define_constant): Likewise.
 +	(ffi_define_variable_pointer): Likewise.
 +	* tests/gpgscm/ffi.c (do_wait_processes): Free arrays.
 +	(ffi_schemify_name): Fix type.
 +	* tests/gpgscm/main.c (main): Free 'sc'.
 +
 +	gpgscm: Free file names.
 +	* tests/gpgscm/scheme.c (scheme_load_named_file): Free file name.
 +
 +	gpgscm: Fix buffer overflow.
 +	* tests/gpgscm/scheme.c (store_string): Avoid writing past allocated
 +	buffer.
 +
 +	g10: Fix memory leaks.
 +	* g10/keydb.c (keydb_get_keyblock): Free 'sigstatus' and 'iobuf'.
 +	* g10/t-keydb-get-keyblock.c: Fix trivial memory leaks.
 +	* g10/t-keydb.c: Likewise.
 +
 +	common: Fix memory leaks.
 +	* common/ccparray.c (ccparray_put): Free old array.
 +	* common/stringhelp.c (do_make_filename): Free 'home'.
 +	* common/t-convert.c: Fix trivial memory leaks.
 +	* common/t-iobuf.c: Likewise.
 +	* common/t-mbox-util.c: Likewise.
 +	* common/t-name-value.c: Likewise.
 +	* common/t-stringhelp.c: Likewise.
 +	* common/t-strlist.c: Likewise.
 +
 +2016-06-28  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: add option to retrieve extra WKS info.
 +	* dirmngr/server.c (cmd_wkd_get): Add option --submission-address.
 +
 +	gpg: Add hack to --quick-gen-key to create Curve25519 keys.
 +	* g10/keygen.c (quick_generate_keypair): Add special algo string
 +	"test-default".
 +
 +	common: New function rfctimestamp.
 +	* common/gettime.c (rfctimestamp): New.
 +
 +	common: Add missing header file for clarity.
 +	* common/zb32.c: Include zb32.h.
 +
 +2016-06-28  Justus Winter  <justus at g10code.com>
 +
 +	tools/gpgtar: Fix handling of '-'.
 +	* tools/gpgtar-extract.c (gpgtar_extract): Use stdin if file is '-'.
 +	* tools/gpgtar-list.c (gpgtar_list): Likewise.
 +
 +	common: Close input stream.
 +	* common/exechelp-posix.c (gnupg_spawn_process): Also close the input
 +	stream in the child.
 +
 +	common: Fix copying data from the spawned child.
 +	Fixes intermittent gpgtar failures.
 +
 +	* common/exectool.c (copy_buffer_do_copy): Initialize 'nwritten'.
 +	(gnupg_exec_tool_stream): Loop until all data is copied.
 +
 +2016-06-28  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: Fix --list-packets.
 +	* g10/gpg.c (main): Call set_packet_list_mode after assignment of
 +	opt.list_packets.
 +	* g10/mainproc.c (do_proc_packets): Don't stop processing with
 +	--list-packets as the comment says.
 +	* g10/options.h (list_packets): Fix the comment.
 +	* g10/parse-packet.c: Fix the condition for opt.list_packets.
 +
 +2016-06-25  Werner Koch  <wk at gnupg.org>
 +
 +	build: Add aclocal macro from pkg-config.
 +	* m4/pkg.m4: New.
 +
 +	yat2m: Silence lint warnings and fix a printf format bug.
 +	* doc/yat2m.c (ATTR_PRINTF, ATTR_NR_PRINTF, ATTR_MALLOC): New.
 +	(die, err, inf, xmalloc, xcalloc): New prototypes with attributes.
 +	(get_section_buffer): Take care of !N_SECTIONS.
 +	(proc_texi_cmd): Cast precision format arg.
 +	(proc_texi_buffer): Do not set IN_CMD when not used afterwards.
 +
 +2016-06-24  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: New import option "import-export".
 +	* g10/import.c (parse_import_options): Add option "import-export".
 +	(write_keyblock_to_output): New.
 +	(import_one): Implement option.
 +
 +2016-06-23  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: New import option "import-show".
 +	* g10/options.h (IMPORT_SHOW): New.
 +	* g10/import.c (parse_import_options): Add "import-show".
 +	(import_one): Implement that.
 +
 +	gpg: Do not print the validity after key generation.
 +	* g10/keylist.c (struct keylist_context): Add field NO_VALIDITY.
 +	(list_keyblock_print): Take care of it.
 +	(list_keyblock_direct): Add arg NO_VALIDITY.
 +	* g10/keygen.c (do_generate_keypair): Merge keyblock and print w/o
 +	validity.
 +
 +	common: Fix possible small memory leak in b64dec.c.
 +	* common/b64dec.c (b64dec_finish): Always release TITLE.
 +
 +2016-06-23  Justus Winter  <justus at g10code.com>
 +
 +	tests/openpgp: Fake the system time for the tofu test.
 +	The keys in the tofu test are set to expire on 2016-09-17.  Fake the
 +	system time for this test.
 +
 +	This commit includes changes to the old test as well, for those who
 +	need to backport it.
 +
 +	* tests/openpgp/gpg-agent.conf.tmpl: Drop trailing newlines.
 +	* tests/openpgp/tofu.scm: Fake system time.
 +	* tests/openpgp/tofu.test: Likewise.
 +
- 	GnuPG-bug-id: 2393
- 
 +	gpgscm: Handle exceptions in the transformation monad.
 +	* tests/gpgscm/tests.scm (pipe:do): Raise errors.
 +	(tr:spawn): Catch and return errors.
 +	(tr:call-with-content): Likewise.
 +	(tr:{open,write-to,pipe-do,assert-identity,assert-weak-identity}):
 +	Adapt.
 +
 +	tests/openpgp: Improve tests.
 +	* tests/openpgp/multisig.scm: Simplify test.
 +	* tests/openpgp/setup.scm (dearmor): Use pipe.
 +
 +	gpgscm: Add types for special objects.
 +	* tests/gpgscm/scheme.c (enum scheme_types): Add types for boolean,
 +	nil, eof, and the sink object.
 +	(type_to_string): Handle new types.
 +	(scheme_init_custom_alloc): Give special objects a type.
 +
 +	gpgscm: Fix Scheme initialization.
 +	This potentially causes a crash if the garbage collector marks an eof
 +	object.
 +
 +	* tests/gpgscm/scheme.c (scheme_init_custom_alloc): Initialize
 +	'EOF_OBJ'.
 +
 +2016-06-23  Werner Koch  <wk at gnupg.org>
 +
 +	common: Add dedicated private key functions to name-value.c.
 +	* common/name-value.c (struct name_value_container): Add field
 +	'private_key_mode'.
 +	(my_error): New.  Use instead of gpg_error.
 +	(nvc_new_private_key): New.
 +	(nve_release): Add arg 'private_key_mode'.
 +	(nvc_release): Call nve_release with private_key_mode flag.
 +	(nvc_delete): Ditto.
 +	(_nvc_add): Do no special case "Key:" in non-private_key_mode.
 +	(nvc_get_private_key): Return error in non-private_key_mode.
 +	(nvc_set_private_key): Ditto.
 +	(nvc_parse):  Factor all code out to ...
 +	(do_nvc_parse): new.  Add arg 'for_private_key'.
 +	(nvc_parse_private_key): New.
 +	* agent/findkey.c (write_extended_private_key): Replace nvc_parse by
 +	nvc_parse_private_key.
 +	(read_key_file): Ditto.
 +
 +	* common/t-name-value.c (private_key_mode): New variable.
 +	(my_nvc_new): New.  Replace all callers.
 +	(test_key_extraction): Take mode in account.
 +	(run_tests): Ditto.
 +	(run_modification_tests): Ditto.
 +	(parse): Ditto.
 +	(main): Add option --parse and rename --parse to --parse-key.
 +
 +	common: Rename external symbols in name-value.c.
 +	* common/name-value.c, common/name-value.h: Rename symbol prefixes
 +	from "pkc_" to "nvc_" and from "pke_" to "nve_".  Change all callers.
 +
 +	common: Rename private-keys.c to name-value.c.
 +	* common/private-keys.c: Rename to name-value.c.
 +	* common/private-keys.h: Rename to name-value.h.  Chage all users.
 +	* common/t-private-keys.c: Rename to t-name-value.c.
 +	* common/Makefile.am: Adjust accordingly.
 +
 +	common: Add PGP armor decoding to b64dec.
 +	* common/b64dec.c (decoder_states): Add new states.
 +	(b64dec_proc): Handle PGP armored format.
 +
 +2016-06-23  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: Fix regression of card-edit/fetch.
 +	* g10/card-util.c (fetch_url): Call keyserver_fetch instead of
 +	keyserver_import_fprint.
 +
 +2016-06-21  Justus Winter  <justus at g10code.com>
 +
 +	tests/migrations: Convert to Scheme and re-enable.
 +	* configure.ac: Re-enable.
 +	* tests/Makefile.am: Likewise.
 +	* tests/migrations/Makefile.am (TESTS): Use Scheme tests.
 +	* tests/migrations/common.scm: New file.
 +	* tests/migrations/extended-private-key-format.scm: Likewise.
 +	* tests/migrations/from-classic.scm: Likewise.
 +	* tests/migrations/extended-private-key-format.test: Drop file.
 +	* tests/migrations/from-classic.test: Drop file.
 +
 +	gpgscm: Add more file handling functions.
 +	* tests/gpgscm/ffi.c (do_glob): New function.
 +	(ffi_init): Define new function.
 +	* tests/gpgscm/tests.scm (basename-suffix): New function.x
 +
 +	tests/openpgp: Port the remaining tests to Scheme.
 +	* tests/openpgp/Makefile.am (TESTS): Add new tests.
 +	* tests/openpgp/defs.scm (gpg-with-colons): New function.
 +	(get-config): Use new function.
 +	* tests/openpgp/export.scm: New file.
 +	* tests/openpgp/tofu.scm: Likewise.
 +
 +	gpgscm: Improve test framework.
 +	* tests/gpgscm/lib.scm (echo): Move...
 +	* tests/gpgscm/tests.scm (echo): ... here.
 +	(info, error, skip): And use echo here.
 +	(file-exists?): New function.
 +	(tr:spawn): Check that source exists and if the sink has been created.
 +	(tr:call-with-content): Hand in optional arguments.
 +
 +	gpgscm: Use native string searching functions.
 +	* tests/gpgscm/ffi-private.h: Handle character arguments.
 +	* tests/gpgscm/ffi.c (do_string_index): New function.
 +	(do_string_rindex): Likewise.
 +	(do_string_contains): Likewise.
 +	(ffi_init): Define new functions.
 +	* tests/gpgscm/ffi.scm (ffi-define): New macro.
 +	* tests/gpgscm/lib.scm (string-index): Use native function,
 +	demonstrate behavior.
 +	(string-rindex): Likewise.
 +	(string-contains?): Likewise.
 +	Demonstrate behavior of various other functions.
 +	(read-all): Rework so that it can handle large files.
 +
 +	gpgscm: Improve error reporting.
 +	* tests/gpgscm/scheme.c (type_to_string): New function.
 +	(Eval_Cycle): Include actual type in error message.
 +
 +	gpgscm: Make memory allocation failures fatal.
 +	* tests/gpgscm/scheme.c (Eval_Cycle): Exit if we run out of memory.
 +
 +2016-06-21  Werner Koch  <wk at gnupg.org>
 +
 +	sm: Do not install cacert and other root certificates.
 +	* doc/Makefile.am (dist_pkgdata_DATA): Move qualified.txt and
 +	com-certs.pem to ...
 +	(EXTRA_DIST): here.
 +
 +2016-06-20  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add experimental support for an issuer fpr.
 +	* common/openpgpdefs.h (SIGSUBPKT_ISSUER_FPR): New.
 +	* g10/build-packet.c (build_sig_subpkt_from_sig): Add arg PKSK and
 +	insert the issuer fpr if needed.
 +	* g10/sign.c (write_signature_packets): Pass signing key.
 +	(make_keysig_packet): Ditto.
 +	(update_keysig_packet): Ditto.
 +	* g10/parse-packet.c (dump_sig_subpkt): Print issuer fpr.
 +	(parse_one_sig_subpkt): Detect issuer fpr.
 +	(can_handle_critical): Add issuer fpr.
 +	* g10/mainproc.c (check_sig_and_print): Try to get key via fingerprint.
 +	* g10/gpgv.c (keyserver_import_fprint): New stub.
 +	* g10/test-stubs.c (keyserver_import_fprint): New stub.
 +
 +	gpg: New option --rfc4880bis.
 +	* g10/options.h (struct opt): Add field flags.rfc4880bis.
 +	* g10/gpg.c (oRFC4880bis): new.
 +	(opts): add --rfc4880bis.
 +	(main): Implement that and print a warning.
 +
 +2016-06-19  Niibe Yutaka  <gniibe at fsij.org>
 +
 +	scd: Reset nonnull_nad to zero for VENDOR_GEMPC.
 +	* (parse_ccid_descriptor): nonnull_nad = 0 for all GEMPC device.
 +
 +2016-06-17  Werner Koch  <wk at gnupg.org>
 +
 +	tests: Make make distcheck work again.
 +	* Makefile.am (tests): Remove test code which would led to doubling
 +	calls to for e.g. "make distclean".
 +	* tests/Makefile.am: Typo fixes.
 +	* tests/gpgscm/Makefile.am (EXTRA_DIST): Fix name of License file.
 +	Add repl.scm.
 +	(check): Replace by check-local because check is a standard automake
 +	target.
 +	* tests/openpgp/Makefile.am (TESTS_ENVIRONMENT): Replace gmake0sim by
 +	automake generated macro.
 +	(EXTRA_DIST): Add defs.scm
 +
 +	gpgscm: Silence compiler warnings.
 +	* tests/gpgscm/scheme.c (mk_integer): Rename arg NUM to N.
 +	(fill_vector): Ditto.
 +	(mark): Rename var NUM to N.
 +	(set_slot_in_env): Mark SC as unused.
 +	(is_any): Mark P as unused.
 +
 +	Add license notices for TinySCHEME.
 +	* tests/gpgscm/COPYING: Rename to ...
 +	* tests/gpgscm/LICENSE.TinySCHEME: this.
 +	* AUTHORS: Add a note about TinySCHEME.
 +	* build-aux/speedo/w32/pkg-copyright.txt: Add TinySCHEME notice.
 +
 +2016-06-17  Justus Winter  <justus at g10code.com>
 +
 +	tests/openpgp: Reimplement tests in Scheme.
 +	* Makefile.am: Build the test infrastructure on Windows.
 +	* tests/openpgp/Makefile.am (required_pgms): Add gpgscm.
 +	(TESTS_ENVIRONMENT): Make sure gpgscm and the libraries are found.
 +	(TESTS): Replace tests with the new Scheme implementations.
 +	* tests/openpgp/4gb-packet.scm: New file.
 +	* tests/openpgp/README: Likewise.
 +	* tests/openpgp/armdetach.scm: Likewise.
 +	* tests/openpgp/armdetachm.scm: Likewise.
 +	* tests/openpgp/armencrypt.scm: Likewise.
 +	* tests/openpgp/armencryptp.scm: Likewise.
 +	* tests/openpgp/armor.scm: Likewise.
 +	* tests/openpgp/armsignencrypt.scm: Likewise.
 +	* tests/openpgp/armsigs.scm: Likewise.
 +	* tests/openpgp/clearsig.scm: Likewise.
 +	* tests/openpgp/conventional-mdc.scm: Likewise.
 +	* tests/openpgp/conventional.scm: Likewise.
 +	* tests/openpgp/decrypt-dsa.scm: Likewise.
 +	* tests/openpgp/decrypt.scm: Likewise.
 +	* tests/openpgp/default-key.scm: Likewise.
 +	* tests/openpgp/defs.scm: Likewise.
 +	* tests/openpgp/detach.scm: Likewise.
 +	* tests/openpgp/detachm.scm: Likewise.
 +	* tests/openpgp/ecc.scm: Likewise.
 +	* tests/openpgp/encrypt-dsa.scm: Likewise.
 +	* tests/openpgp/encrypt.scm: Likewise.
 +	* tests/openpgp/encryptp.scm: Likewise.
 +	* tests/openpgp/finish.scm: Likewise.
 +	* tests/openpgp/genkey1024.scm: Likewise.
 +	* tests/openpgp/gpgtar.scm: Likewise.
 +	* tests/openpgp/import.scm: Likewise.
 +	* tests/openpgp/mds.scm: Likewise.
 +	* tests/openpgp/multisig.scm: Likewise.
 +	* tests/openpgp/run-tests.scm: Likewise.
 +	* tests/openpgp/seat.scm: Likewise.
 +	* tests/openpgp/setup.scm: Likewise.
 +	* tests/openpgp/signencrypt-dsa.scm: Likewise.
 +	* tests/openpgp/signencrypt.scm: Likewise.
 +	* tests/openpgp/sigs-dsa.scm: Likewise.
 +	* tests/openpgp/sigs.scm: Likewise.
 +	* tests/openpgp/use-exact-key.scm: Likewise.
 +	* tests/openpgp/verify.scm: Likewise.
 +	* tests/openpgp/version.scm: Likewise.
 +
 +	tests/gpgscm: Add a TinySCHEME-based test driver.
 +	* configure.ac: Add new component.
 +	* tests/Makefile.am: Likewise.
 +	* tests/gpgscm/Makefile.am: New file.
 +	* tests/gpgscm/ffi-private.h: Likewise.
 +	* tests/gpgscm/ffi.c: Likewise.
 +	* tests/gpgscm/ffi.h: Likewise.
 +	* tests/gpgscm/ffi.scm: Likewise.
 +	* tests/gpgscm/lib.scm: Likewise.
 +	* tests/gpgscm/main.c: Likewise.
 +	* tests/gpgscm/private.h: Likewise.
 +	* tests/gpgscm/repl.scm: Likewise.
 +	* tests/gpgscm/scheme-config.h: Likewise.
 +	* tests/gpgscm/t-child.c: Likewise.
 +	* tests/gpgscm/t-child.scm: Likewise.
 +	* tests/gpgscm/tests.scm: Likewise.
 +
 +	tests/gpgscm: Foreign objects support for TinySCHEME.
 +	* tests/gpgscm/scheme-private.h (struct cell): Add 'foreign_object'.
 +	(is_foreign_object): New prototype.
 +	(get_foreign_object_{vtable,data}): Likewise.
 +	* tests/gpgscm/scheme.c (enum scheme_types): New type.
 +	(is_foreign_object): New function.
 +	(get_foreign_object_{vtable,data}): Likewise.
 +	(mk_foreign_object): Likewise.
 +	(finalize_cell): Free foreign objects.
 +	(atom2str): Pretty-print foreign objects.
 +	(vtbl): Add new functions.
 +	* tests/gpgscm/scheme.h (struct foreign_object_vtable): New type.
 +	(mk_foreign_object): New prototype.
 +	(struct scheme_interface): Add new functions.
 +
 +	Patch from Thomas Munro,
 +	https://sourceforge.net/p/tinyscheme/patches/13/
 +
 +	tests/gpgscm: Dynamically allocate string buffer.
 +	* tests/gpgscm/scheme-config.h (strbuff{,_size}): Make buffer dynamic.
 +	* tests/gpgscm/scheme.c (expand_strbuff): New function.
 +	(putcharacter): Adapt length test.
 +	(readstrexp): Expand buffer if necessary.
 +	(scheme_init_custom_alloc): Initialize buffer.
 +	(scheme_deinit): Free buffer.
 +
 +	Patch from Thomas Munro,
 +	https://sourceforge.net/p/tinyscheme/patches/11/
 +
 +	tests/gpgscm: Make exception value available.
 +	* tests/gpgscm/init.scm (throw): Hand exception value to the handler.
 +	(catch): And bind it to *error*.
 +
 +	tests/gpgscm: Add package macro.
 +	* tests/gpgscm/init.scm: Add package macro from manual.
 +
 +	tests/gpgscm: Expose function to open streams as Scheme ports.
 +	* tests/gpgscm/scheme.c (vtbl): Add 'port_from_file' to the vtable.
 +	* tests/gpgscm/scheme.h (struct scheme_interface): New field
 +	'mk_port_from_file'.
 +
 +	tests/gpgscm: Nicer error message.
 +	* tests/gpgscm/scheme.c (opexe_0): Include the value that we tried to
 +	evaluate as function-like in the error message.
 +
 +	tests/gpgscm: Fix error hook.
 +	* tests/gpgscm/init.scm (*error-hook*): Fix error hook so that the
 +	whole error message is displayed.
 +
 +	tests/gpgscm: Handle unhandled enumeration values.
 +	* tests/gpgscm/scheme.c (opexe_{3,4}): Handle unhandled enumeration
 +	values in the opcode dispatching code.
 +
 +	tests/gpgscm: Verbatim import of latest TinySCHEME.
 +	Revision 110 from svn://svn.code.sf.net/p/tinyscheme/code/trunk
 +
 +	* tests/gpgscm/COPYING: New file.
 +	* tests/gpgscm/Manual.txt: Likewise.
 +	* tests/gpgscm/init.scm: Likewise.
 +	* tests/gpgscm/opdefines.h: Likewise.
 +	* tests/gpgscm/scheme-private.h: Likewise.
 +	* tests/gpgscm/scheme.c: Likewise.
 +	* tests/gpgscm/scheme.h: Likewise.
 +
 +2016-06-17  Werner Koch  <wk at gnupg.org>
 +
 +	scd: Make option --homedir work.
 +	* scd/scdaemon.c (opts): Add --homedir.
 +
 +2016-06-16  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.13.
 +
 +2016-06-16  Yuri Chornoivan  <yurchor at ukr.net>
 +
 +	po: Update Ukrainian translation.
 +
 +2016-06-16  Ineiev  <ineiev at gnu.org>
 +
 +	po: Update Russian translation.
 +
 +2016-06-16  Werner Koch  <wk at gnupg.org>
 +
 +	po: Update German translation.
 +
 +	Add missing files so that make distcheck works again,
 +	* tests/openpgp/Makefile.am (CLEANFILES): Add created file
 +	"passphrases".
 +	* tools/Makefile.am (EXTRA_DIST): Add no-libgcrypt.c.
 +
 +	tools: Fix typo in function name of symcryptrun.
 +	* tools/symcryptrun.c (main): Fix typo.
 +
 +2016-06-15  Niibe Yutaka  <gniibe at fsij.org>
 +
 +	g10: Fix another race condition for trustdb access.
 +	* g10/tdbio.c (create_version_record): Call create_hashtable to always
 +	make hashtable, together with the version record.
 +	(get_trusthashrec): Remove call to create_hashtable.
 +
 +2016-06-14  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Print the subkey's curve and not the primary key curve.
 +	* g10/keylist.c (list_keyblock_colon): Use PK2 for the subkey's curve.
 +
 +	ldap: Improve info output for v3 fallback.
 +	* dirmngr/dirmngr_ldap.c (fetch_ldap): Do not use log_debug in an
 +	unprotected section.  Replace log_debug by log_info in verbose mode.
 +
 +2016-06-14  Andre Heinecke  <aheinecke at intevation.de>
 +
 +	dirmngr: Try ldap protocol V3 as fallback.
 +	* dirmngr/dirmngr_ldap.c (fetch_ldap): Try V3 Protocol in case
 +	default Protocol gives error.
 +
 +	dirmngr: Print ldap error if bind fails.
 +	* dirmngr/dirmngr_ldap.c (fetch_ldap): Use ldap_err2string on bind
 +	return.
 +
 +2016-06-14  Werner Koch  <wk at gnupg.org>
 +
 +	gpgsm: Allow ciphers AES192 and SERPENT256.
 +	* sm/gpgsm.c (main): Add AES192 cipher.  Allow SERPENT256.
 +
 +	doc: Add files and envvars to a new index.
 +	* doc/gnupg.texi: Define new index "ef".
 +	(Environment Index): New.
 +
 +	gpg: Avoid endless loop in a tofu error case.
 +	* g10/tofu.c (get_trust): Do not jump to out.
 +
 +	gpg: Split tofu's get_trust function into several smaller ones.
 +	* g10/tofu.c (get_trust): Factor code out to ...
 +	(format_conflict_msg_part1): new and to ...
 +	(ask_about_binding): new.
 +
 +2016-06-13  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Un-deprecate option --auto-key-retrieve.
 +	* g10/gpg.c (main): Remove deprecation warning.
 +
 +	gpg: New option --disable-signer-uid, create Signer's UID sub-packet.
 +	* g10/gpg.c (oDisableSignerUID): New.
 +	(opts): New option '--disable-signer-uid'.
 +	(main): Set option.
 +	* g10/options.h (opt): Add field flags.disable_signer_uid.
 +	* g10/sign.c: Include mbox-util.h.
 +	(mk_notation_policy_etc): Embed the signer's uid.
 +	* g10/mainproc.c (check_sig_and_print): Do not use WKD for auto key
 +	retrieval if --disable-signer-uid is used.
 +
 +	gpg: Try Signer's User ID sub-packet with --auto-key-retrieve.
 +	* g10/packet.h (PKT_signature): Add field 'signers_uid'.
 +	* g10/parse-packet.c (parse_signature): Set this field.
 +	* g10/free-packet.c (free_seckey_enc): Free field.
 +	(copy_signature): Copy field.
 +	* g10/mainproc.c (akl_has_wkd_method): New.
 +	(check_sig_and_print): Extend NEWSIG status.  If WKD is enabled try to
 +	locate a missing key via the signature's Signer's User ID sub-packet.
 +	Do this right before trying a keyserver lookup.
 +
 +2016-06-11  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Remove C-99ism, re-indent, and simplify one function.
 +	* g10/call-agent.c (struct keyinfo_data): Rename to
 +	keyinfo_data_parm_s.
 +	(agent_get_keyinfo): Replace C-99 style init.
 +	(keyinfo_status_cb): Use new fucntion split_fields.
 +	* g10/export.c (match_curve_skey_pk): Add missings returns error
 +	cases.
 +	(cleartext_secret_key_to_openpgp): Better clear PK->PKEY first.
 +
 +	common: New function split_fields.
 +	* common/stringhelp.c (split_fields): New.
 +	* common/t-stringhelp.c: Include assert.h.
 +	(test_split_fields): New.
 +	(main): Call test.
 +
 +2016-06-11  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	g10: Export cleartext keys as cleartext.
 +	* g10/export.c (do_export_stream): If a key is stored by the agent in
 +	cleartext, then try to export it as cleartext.
 +	* tests/openpgp/export.test: For secret keys that are stored in
 +	cleartext, test should try to export without pinentry interaction.
 +
 +	g10: Allow receiving cleartext secret keys from agent.
 +	* g10/export.c (match_curve_skey_pk): New function, testing whether an
 +	OpenPGP public key and an S-expression use the same curve.
 +	* g10/export.c (cleartext_secret_key_to_openpgp): New function,
 +	filling in the secret key parameters of a PKT_public_key object from
 +	a corresponding cleartext S-expression.
 +	* g10/export.c, g10/main.h (receive_seckey_from_agent): Add cleartext
 +	parameter, enabling retrieval of the secret key, unlocked.
 +	* g10/export.c (do_export_stream): Send cleartext as 0, keeping current
 +	behavior.
 +	* g10/keygen.c (card_store_key_with_backup): Use cleartext=0 to ensure
 +	that smartcard backups are all passphrase-locked.
 +
 +	g10: Add openpgp_protected flag to agent secret key export functions.
 +	* g10/call-agent.c, g10/call-agent.h (agent_export_key): Add
 +	openpgp_protected flag.
 +	* g10/export.c (receive_seckey_from_agent): Request openpgp_protected
 +	secret keys from agent.
 +	* agent/command.c (hlp_export_key): EXPORT_KEY help text: add a
 +	brief description of the effect of --openpgp.
 +
 +	g10: report whether key in agent is passphrase-protected or not.
 +	* g10/call-agent.c, g10/call-agent.h (agent_get_keyinfo): add
 +	  r_cleartext parameter to report whether a key is stored without
 +	  passphrase protection.
 +	* g10/gpgv.c, g10/test-stubs.c: augment dummy agent_get_keyinfo to
 +	  match new API.
 +	* g10/export.c, g10/keyedit.c, g10/keygen.c, g10/keylist.c,
 +	  g10/sign.c: pass NULL to agent_get_keyinfo since we do not yet
 +	  need to know whether agent is passphrase-protected.
 +
 +2016-06-08  Werner Koch  <wk at gnupg.org>
 +
 +	Explicitly restrict socket permissions.
 +	* agent/gpg-agent.c (create_server_socket): Call chmod before listen.
 +	* scd/scdaemon.c (create_server_socket): Ditto.
 +	* dirmngr/dirmngr.c (main): Ditto.
 +
 +	w32: Fix recent build regression.
 +	* common/homedir.c (_gnupg_socketdir_internal) [W32]: Add definition
 +	for NAME.
 +	* g10/gpg.c (main) [W32]:  Fix use og gnupg_homedir.
 +
 +	* agent/gpg-agent.c (remove_socket): Remove unused var P.
 +	* scd/scdaemon.c (cleanup): Ditto.
 +
 +	gpgconf: New commands --create-socketdir and --remove-socketdir.
 +	* tools/gpgconf.c: Include unistd.h.
 +	(aCreateSocketDir, aRemoveSocketDir): New.
 +	(opts): Add --create-socketdir and --remove-socketdir.
 +	(main): Implement them.
 +
 +	Implement /run/user/UID/gnupg based sockets.
 +	* common/homedir.c: Include sys/stat.h and zb32.h.
 +	(w32_portable_app, w32_bin_is_bin): Change type from int to byte.
 +	(non_default_homedir): New.
 +	(is_gnupg_default_homedir): New.
 +	(default_homedir): Set non_default_homedir.
 +	(gnupg_set_homedir): Set non_default_homedir and make
 +	the_gnupg_homedir and absolute directory name.
 +	(gnupg_homedir): Return an absolute directory name.
 +	(_gnupg_socketdir_internal): New.
 +	(gnupg_socketdir): Implement /run/user/ based sockets.
 +	* tools/gpg-connect-agent.c (get_var_ext): Replace now obsolete
 +	make_filename by xstrdup.
 +	* tools/gpgconf.c (main): Sue gnupg_homedir for the "homedir:" output.
 +
 +	gpgconf: Add option --homedir.
 +	* tools/gpgconf.c (opts): Add --homedir.
 +	(main): Set homedir.
 +
 +	Do not use no-libgcrypt dummy for tools.
 +	* tools/Makefile.am (gpgconf_SOURCES): Remove no-libgcrypt.c.
 +	(gpgconf_LDADD): Add LIBGCRYPT_LIBS.
 +	(gpg_connect_agent_LDADD): Ditto.
 +	(gpgtar_LDADD): Ditto.
 +	* dirmngr/Makefile.am (dirmngr_client_LDADD): Ditto.
 +	(t_common_ldadd): Ditto.  Remove no-libgcrypt.o.
 +
 +	Do not try to remove the enclosing directory of sockets.
 +	* agent/gpg-agent.c (remove_socket): Do not remove the enclosing
 +	directory.
 +	* scd/scdaemon.c (cleanup): Ditto.
 +
 +2016-06-07  Werner Koch  <wk at gnupg.org>
 +
 +	common: New function gnupg_socketdir.
 +	* common/homedir.c (gnupg_socketdir): New.
 +	* agent/gpg-agent.c (create_socket_name): Use new function instead of
 +	gnupg_homedir.
 +	(check_own_socket): Ditto.
 +	(check_for_running_agent): Ditto.
 +	* agent/preset-passphrase.c (main): Ditto.
 +	* common/asshelp.c (start_new_gpg_agent): Ditto.
 +	* scd/scdaemon.c (create_socket_name): Ditto.
 +	* tools/gpgconf.c (main): Ditto.
 +	* tools/symcryptrun.c (main): Ditto.
 +
 +	common: Remove homedir arg from start_new_{dirmngr,gpg_agent}.
 +	* common/asshelp.c (start_new_gpg_agent): Remove arg 'homedir' in
 +	favor of gnupg_homedir ().  Change all callers.
 +	(start_new_dirmngr): Ditto.
 +	* common/get-passphrase.c (gnupg_prepare_get_passphrase): Remove arg
 +	'homedir'.
 +
 +	Replace use of opt.homedir by accessor functions.
 +	* common/homedir.c (the_gnupg_homedir): New var.
 +	(gnupg_set_homedir): New.
 +	(gnupg_homedir): New.
 +	* g10/options.h (struct opt): Remove 'homedir' and replace all users
 +	by the new accessor functions.
 +	* g13/g13-common.h (struct opt): Ditto.
 +	* scd/scdaemon.h (struct opt): Ditto.
 +	* sm/gpgsm.h (struct opt): Ditto.
 +	* dirmngr/dirmngr.h (struct opt): Ditto.
 +	* agent/preset-passphrase.c (opt_homedir): Ditto.
 +	* agent/protect-tool.c (opt_homedir): Ditto.
 +
 +2016-06-07  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	po: Update Japanese translation.
 +
 +	gpg: Fix command line parsing of --quick-addkey and --quick-gen-key.
 +	* g10/gpg.c (main): Compose a block by curly braces.
 +
 +2016-06-06  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Use --keyid-format=none by default.
 +	* g10/gpg.c (main): Init keyid_format to KF_NONE.
 +	* g10/keyid.c (format_keyid): Ditto.
 +	(keystrlen): Ditto.
 +
 +	gpg: Add option --with-subkey-fingerprint.
 +	* g10/gpg.c (oWithSubkeyFingerprint): New.
 +	(opts): Add --with-subkey-fingerprint[s].
 +	(main): Set that option.
 +	* g10/options.h (struct opt): Add 'with_subkey_fingerprint'.
 +	* g10/keylist.c (list_keyblock_print): Print subkey fingerprint.
 +	(print_fingerprint): Tweak printing to use compact format if
 +	desirable.
 +
 +	gpg: Implement --keyid-format=none.
 +	* g10/gpg.c (main): Add option "none" to --keyid-format.
 +	* g10/options.h (KF_NONE): New.
 +	* g10/keyid.c (format_keyid): Implement that.
 +	(keystr): Use format "long" is KF_NONE is in use.
 +	(keystr_with_sub): Ditto.
 +	* g10/keylist.c (list_keyblock_print): Adjust indentaion for KF_NONE.
 +	Factor some code out to ...
 +	(print_key_line): new.
 +	(print_fingerprint): Add mode 20.
 +	* g10/mainproc.c (list_node): Use print_key_line.  Replace MAINKEY by
 +	flags.primary in the PK.  Fix putting a " revoked..." string into the
 +	colons format.
 +	* g10/pkclist.c (do_edit_ownertrust): Use print_key_line.  This
 +	slightly changes the putput format.
 +	* g10/revoke.c (gen_standard_revoke): Use print_key_line.  This may
 +	also put "expires: " into the output.
 +
 +2016-06-04  Werner Koch  <wk at gnupg.org>
 +
 +	w32: Require --enable-build-timestamp for the BUILD_HOSTNAME.
 +	* configure.ac (BUILD_HOSTNAME): Set to "<anon>" bey default.
 +	* build-aux/speedo.mk (speedo_pkg_gnupg_configure): Add
 +	  --enable-build-timestamp.
 +
 +2016-06-02  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add the fingerprint to KEY_CREATED for subkeys.
 +	* g10/keygen.c (print_status_key_created): Make more robust by
 +	allowing a NULL for PK.
 +	(generate_subkeypair): Use print_status_key_created.
 +	(generate_card_subkeypair): Ditto.
 +
 +	gpg: Try to use the passphrase from the primary for --quick-addkey.
 +	* agent/command.c (cmd_genkey): Add option --passwd-nonce.
 +	(cmd_passwd): Return a PASSWD_NONCE in verify mode.
 +	* g10/call-agent.c (agent_genkey): Add arg 'passwd_nonce_addr' and do
 +	not send a RESET if given.
 +	(agent_passwd): Add arg 'verify'.
 +	* g10/keygen.c (common_gen): Add optional arg 'passwd_nonce_addr'.
 +	(gen_elg, gen_dsa, gen_ecc, gen_rsa, do_create): Ditto.
 +	(generate_subkeypair): Use sepeare hexgrip var for the to be created
 +	for hexgrip feature.  Verify primary key first.  Make use of the
 +	passwd nonce.  Allow for a static passphrase.
 +
 +	gpg: Extend the --quick-gen-key command.
 +	* g10/keygen.c (quickgen_set_para): Add arg 'use'.
 +	(quick_generate_keypair): Add args 'algostr', 'usagestr', and
 +	'expirestr'.  Implement primary only key mode.
 +	(parse_algo_usage_expire): Set NBITS for the default algo.
 +	* g10/gpg.c (main): Extend --quick-gen-key command.
 +
 +	gpg: Improve the new parse_subkey_algostr_usagestr fucntion.
 +	* g10/keygen.c (parse_usagestr): Allow "cert".
 +	(generate_subkeypair): Factor expire parsing out to ...
 +	(parse_subkey_algostr_usagestr): here.  Rename to ...
 +	(parse_algo_usage_expire): this.  Add arg 'for_subkey'.  Set CERT for
 +	primary key and check that it is not set for subkeys.
 +
 +	gpg: New command --quick-addkey.
 +	* g10/keygen.c (DEFAULT_STD_SUBKEYUSE): New.
 +	(ask_keysize): Factor code out to ...
 +	(get_keysize_range, fixup_keysize): new.
 +	(parse_parameter_usage): Factor parsing out to  ...
 +	(parse_usagestr): new.  Allow use of "encr" as alias for "encrypt".
 +	(parse_subkey_algostr_usagestr): New.
 +	(generate_subkeypair): Add new args.  Implement unattended mode.
 +
 +	* g10/keyedit.c (keyedit_quick_sign): Factor some code out to ...
 +	(find_by_primary_fpr): new.
 +	(keyedit_quick_addkey): New.
 +	* g10/gpg.c (aQuickAddKey): New.
 +	(opts): Add --quick-addkey.
 +	(main): Implement.
 +
 +	gpg: Do not abort on certain invalid packets.
 +	* g10/build-packet.c (write_fake_data): Check for non-opaque data.
 +	* g10/seskey.c (do_encode_md): Return NULL instead of abort.
 +
 +	common: New function openpgp_is_curve_supported.
 +	* common/openpgp-oid.c: Include openpgpdefs.h.
 +	(oidtable): Add field pubkey_algo.
 +	(openpgp_is_curve_supported): New.
 +
 +2016-06-01  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: Allow User ID length >= 256.
 +	* build-packet.c (do_user_id): Call write_header2 with HDRLEN not set.
 +
 +2016-05-31  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: New status code NOTATION_FLAGS.
 +	* common/status.h (STATUS_NOTATION_FLAGS: New.
 +	* g10/packet.h (struct notation): Add flags.human.
 +	(notation_t): New typedef.
 +	* g10/build-packet.c (sig_to_notation): Set flags.human.
 +	* g10/keylist.c (show_notation): Write STATUS_NOTATION_FLAGS.
 +
 +2016-05-28  Werner Koch  <wk at gnupg.org>
 +
 +	common: Add a status callback to gnupg_exec_tool_stream.
 +	* common/exectool.h (exec_tool_status_cb_t): New.
 +	* common/exectool.c: Include missing exectool.h.
 +	(read_and_log_buffer_t): Replace array by pointer.
 +	(gnupg_exec_tool_stream): Add args 'status_cb' and 'status_cb_value'.
 +	Change all callers to pass NULL for them.  Malloc buffer for
 +	FDERRSTATE.
 +	(read_and_log_stderr): Implement status_fd feature.
 +
 +2016-05-27  Werner Koch  <wk at gnupg.org>
 +
 +	common: Allow a second input stream for gnupg_exec_tool_stream.
 +	* common/exechelp-posix.c (do_exec): Add arg 'except' and pass to
 +	close_all_fds.
 +	(gnupg_spawn_process): Add arg 'except'.  Change callers to pass NULL
 +	for it.
 +	* common/exechelp-w32.c (gnupg_spawn_process): Add dummy arg 'except'.
 +	* common/exechelp-w32ce.c (gnupg_spawn_process): Ditto.
 +	* common/exectool.c (copy_buffer_do_copy): Allow NULL for SINK.
 +	(gnupg_exec_tool_stream): Add arg 'inextra'. Change callers to pass
 +	NULL for it.  Allow NULL for OUTPUT.
 +
 +	common: Simplify the fd closing patch 512c56a.
 +	* common/exechelp-posix.c (get_max_fds): Use /proc/self.
 +
 +	common: Speedup closing fds before an exec.
 +	* common/exechelp-posix.c [__linux__]: Include dirent.h.
 +	(get_max_fds) [__linux__]: Return the actual used highest fd.
 +
 +	tools: Improve debug output of rfc822parse.
 +	* tools/rfc822parse.c (show_event): Add missing events.
 +
 +	build: Remove obsolete tests for funopen and fopencookie.
 +	* configure.ac (AC_CHECK_FUNCS): Remove tests for funopen.
 +
 +	common: Extend gnupg_create_inbound_pipe et al.
 +	* common/exechelp-posix.c (gnupg_create_inbound_pipe): Add args 'r_fp'
 +	and 'nonblock'.
 +	(gnupg_create_outbound_pipe): Ditto.
 +	* common/exechelp-w32.c (gnupg_create_inbound_pipe): Add non yet
 +	functional args 'r_fp' and 'nonblock'.
 +	(gnupg_create_outbound_pipe): Ditto.
 +	* common/exechelp-w32ce.c (gnupg_create_inbound_pipe): Ditto.
 +	(gnupg_create_outbound_pipe): Ditto.
 +
 +	common: Make use of default_errsource in exechelp.
 +	* common/exechelp-posix.c (my_error_from_syserror, my_error): New.
 +	Use them instead of gpg_error and gpg_error_from_syserror.
 +	(create_pipe_and_estream): Remove arg ERRSOURCE and fix use of
 +	OUTBOUND which has a wrong name.  Adjust callers.
 +	(gnupg_spawn_process): Remove arg ERRSOURCE and replace by use of
 +	DEFAULT_ERRSOURCE.
 +	* common/exechelp-w32.c (gnupg_spawn_process): Ditto.
 +	* common/exechelp-w32ce.c (gnupg_spawn_process): Ditto.
 +	* common/exectool.c (gnupg_exec_tool_stream):  Do not pass
 +	GPG_ERROR_FROM_SYSERROR.
 +	* tools/gpgconf-comp.c (gc_component_check_options): Ditto.
 +	(retrieve_options_from_program): Ditto.
 +
 +	gpg: Keep current and total of PROGESS status lines small enough.
 +	* g10/progress.c (progress_filter): Factor status wrote out to...
 +	(write_status_progress): New.  Scale values down.
 +
 +2016-05-27  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	configure: Detection of libusb on FreeBSD.
 +	* configure.ac (LIBUSB_LIBS): Use LIBUSB_NAME for AC_CHECK_LIB.
 +
 +2016-05-25  Werner Koch  <wk at gnupg.org>
 +
 +	build: Switch to new URL for swdb.lst.
 +
 +2016-05-24  Werner Koch  <wk at gnupg.org>
 +
 +	gpgtar: Simplify code by using ccparray.
 +	* tools/gpgtar-create.c (gpgtar_create): Use ccparray functions.
 +	* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
 +	* tools/gpgtar-list.c (gpgtar_list): Ditto.
 +
 +	common: Add simple dynamic array function.
 +	* common/ccparray.c: New.
 +	* common/ccparray.h: New.
 +	* common/t-ccparray.c: New.
 +	* common/Makefile.am (common_sources): Add files.
 +	(module_tests): Add test file.
 +	(t_ccparray_LDADD): New.
 +
 +2016-05-23  Justus Winter  <justus at g10code.com>
 +
 +	tests: Test the pinentry interactions when exporting keys.
 +	* tests/openpgp/export.test: Test pinentry interactions.
 +
 +	tests: Add support for a passphrase queue to fake pinentry.
 +	* tests/openpgp/fake-pinentry.c (get_passphrase): New function.
 +	(main): Add option --passphrasefile and read passphrases from it.
 +
 +	tests: Add logging to fake pinentry.
 +	* tests/openpgp/fake-pinentry.c (log_stream): New variable.
 +	(reply): New function.
 +	(spacep,skip_options,option_value): Copy from common.
 +	(main): Parse arguments, add --logfile option, write logfile.
 +
 +	tests: Add export test.
 +	* tests/openpgp/Makefile.am (TESTS): Add new file.
 +	* tests/openpgp/export.test: New file.
 +
 +2016-05-21  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Speed up key listing in Tofu mode.
 +	* g10/tofu.c (get_trust): Add arg PK.  Uses this instead of a an extra
 +	lookup of the public key by fingerrpint.
 +	(tofu_register): Pass PK to get_trust.
 +	(tofu_get_validity): Ditto.
 +
 +	*g10/tofu.c (tofu_register): Remove unused FINGERPRINT_PP.
 +
 +	gpg: Avoid name spaces clash with future sqlite versions.
 +	* g10/sqlite.c: Rename to gpgsql.c.  Change function prefixes to
 +	gpgsql_.
 +	* g10/sqlite.h: Rename to gpgsql.h.
 +	* g10/tofu.c: Adjust for changes.
 +
 +	gpg: Explicitly close a combined Tofu DB.
 +	* g10/tofu.c (tofu_closedbs): Close combined DB.
 +
 +	gpg: Store the Tofu meta handle for databases in CTRL.
 +	* g10/gpg.h (struct tofu_dbs_s, tofu_dbs_t): New declarations.
 +	(struct server_control_s): Add field tofu.dbs.
 +	* g10/tofu.c (struct dbs): Rename to tofu_dbs_s.  Replace all users by
 +	by tofu_dbs_t.
 +	(opendbs):  Add arg CTRL.  Cache the DBS in CTRL.
 +	(closedbs): Rename to tofu_closedbs and make global.  Add arg CTRL.
 +	(tofu_register): Add arg CTRL.  Change all callers.  Do not call
 +	closedbs.
 +	(tofu_get_validity): Ditto.
 +	(tofu_set_policy): Ditto.
 +	(tofu_get_policy): Ditto.
 +	(tofu_set_policy_by_keyid): Add arg CTRL.
 +	* g10/gpg.c (gpg_deinit_default_ctrl): Call tofu_closedbs.
 +
 +	gpg: Pass CTRL object down to the trust functions.
 +
 +	gpg: Fix the TOFU_STATS_LONG status.
 +	* g10/tofu.c (show_statistics): Print TOFU STATS with formatting
 +	characters.
 +
 +2016-05-19  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Print "[  never ]" instead of err for validity.
 +	* g10/trust.c (uid_trust_string_fixed): Handle NEVER.
 +
 +2016-05-18  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Adjust the WKD lookup to specs version -01.
 +	* dirmngr/server.c (cmd_wkd_get): Remove second occurrence of the
 +	domain part.
 +
 +2016-05-17  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Emit new status line KEY_CONSIDERED.
 +	* common/status.h (STATUS_KEY_CONSIDERED): New.
 +	* g10/getkey.c: Include status.h.
 +	(LOOKUP_NOT_SELECTED, LOOKUP_ALL_SUBKEYS_EXPIRED): New.
 +	(finish_lookup): Add arg R_FLAGS.  Count expired and revoked keys and
 +	set flag.  Check a requested usage before checking for expiraion or
 +	revocation.
 +	(print_status_key_considered): New.
 +	(lookup): Print new status.
 +
 +2016-05-11  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: Fix signature checking.
 +	* g10/sig-check.c (check_signature_over_key_or_uid): Fix call to
 +	walk_kbnode.
 +
 +2016-05-10  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Allow unattended deletion of secret keys.
 +	* agent/command.c (cmd_delete_key): Make the --force option depend on
 +	--disallow-loopback-passphrase.
 +	* g10/call-agent.c (agent_delete_key): Add arg FORCE.
 +	* g10/delkey.c (do_delete_key): Pass opt.answer_yes to
 +	agent_delete_key.
 +
 +2016-05-09  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix buglet in the check_all_keysigs function.
 +	* g10/keyedit.c (sig_comparison): Actually compare the pubkey
 +	algorithms.
 +
 +	gpg: Request a "save" after cmd "check" fixed something.
 +	* g10/keyedit.c (keyedit_menu) <cmdCHECK>: Set modified.
 +
 +2016-05-09  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	po: Update Japanese translation.
 +
 +2016-05-04  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.12.
 +
 +	speedo,w32: Remove the installation directory page.
 +	* build-aux/speedo/w32/inst.nsi (MUI_PAGE_DIRECTORY): Remove.
 +
 +	gpg: Fix const char pointer mismatch with gettext.
 +	* g10/tofu.c (get_trust): Use const char *.
 +
 +	speedo: Build sqlite with static-libgcc.
 +	* build-aux/speedo/patches/sqlite.patch: New.
 +	* Makefile.am (EXTRA_DIST): Add file.
 +
 +	speedo: Also try patch files w/o version number.
 +	* build-aux/speedo.mk (SPKG_template): Try such a patch file.
 +
 +2016-05-04  Andre Heinecke  <aheinecke at intevation.de>
 +
 +	speedo,w32: Install sqlite.
 +	* build-aux/speedo/w32/inst.nsi (-sqlite, -un.sqlite): New.
 +
 +	speedo,w32: Fix uninstallation.
 +	* build-aux/speedo/w32/inst.nsi (-un.gnupg): Delete distsigkey and
 +	dirmngr-conf.skel
 +
 +	speedo,w32: Install localisation.
 +	* build-aux/speedo/w32/inst.nsi (-libgpg-error, GnuPG): Install l10n.
 +	(-un.libgpg-error, -un.gnupg): Uninstall l10n files.
 +
 +2016-05-04  Werner Koch  <wk at gnupg.org>
 +
 +	tests: Disable the migrations tests.
 +	* tests/Makefile.am (SUBDIRS): Remove migrations.
 +	* configure.ac (AC_CONFIG_FILES): Remove migrations Makefile.
 +
 +2016-05-04  Ineiev  <ineiev at gnu.org>
 +
 +	po: Update Russian translation.
 +
 +2016-05-04  Werner Koch  <wk at gnupg.org>
 +
 +	po: Update German translation.
 +
 +	Some minor string changes and fixed a printf format.
 +	* g10/build-packet.c (notation_value_to_human_readable_string): Use
 +	%zu for size_t.
 +
 +	build: Update config.{guess,sub} to 2016-04-02 and 2016-03-30.
 +	* build-aux/config.guess: Update.
 +	* build-aux/config.sub: Update.
 +
 +	agent: Make --allow-loopback-pinentry the default.
 +	* agent/gpg-agent.c (oNoAllowLoopbackPinentry): New.
 +	(opts): Add --no-allow-loopback-pinentry.  Hide
 +	description of --allow-loopback-pinentry.
 +	(parse_rereadable_options): Set opt.allow_loopback_pinentry by
 +	default.
 +	(main): Replace allow-loopback-pinentry by no-allow-loopback-pinentry
 +	in the gpgconf list.
 +	* tools/gpgconf-comp.c (gc_options_gpg_agent): Ditto.
 +
 +2016-05-03  Werner Koch  <wk at gnupg.org>
 +
 +	common: Print https URLs in help messages.
 +	* common/argparse.c (strusage): Print https URLS.
 +
 +	tests: Silence output of some tests.
 +	* common/t-exechelp.c (print_open_fds): Silence non-verbose output.
 +	(test_close_all_fds): Ditto.
 +	* common/t-session-env.c (show_stdnames): Indent output.
 +	* g10/test.c (TEST): Silence non-verbose okay output.
 +	(exit_tests): Ditto.
 +	* tools/gpg-zip.in (tar_verbose_opt): Add option --quiet.
 +	* tests/openpgp/gpgtar.test (GPGZIP): Pass option --quiet.
 +	* tests/openpgp/mds.test: Indent MD5 notice.
 +	* tests/openpgp/version.test: Indent --version output.
 +
 +	gpg: Emit status lines TOFU_STATS and TOFU_STATS_LONG.
 +	* g10/tofu.c (NO_WARNING_THRESHOLD): Rename to BASIC_TRUST_THRESHOLD.
 +	(FULL_TRUST_THRESHOLD): New.
 +	(write_stats_status): New.
 +	(show_statistics): Call new function.  Print TOFU_STATS_LONG.
 +
 +2016-05-02  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Extend TRUST_foo status lines with the trust model.
 +	* g10/trustdb.h (TRUST_FLAG_TOFU_BASED): New.
 +	* g10/trustdb.c (trust_model_string): Lowercase the strings.  Add arg
 +	"model" and change callers to call with OPT.TRUST_MODEL.
 +	* g10/tofu.c (tofu_wot_trust_combine): Set TRUST_FLAG_TOFU_BASED.
 +	* g10/pkclist.c (write_trust_status): New.
 +	(check_signatures_trust): Call new function.
 +
 +	gpg: Improve line wrapping for a tofu message.
 +	* g10/tofu.c (time_ago_str): Mark non-breakable spaces.
 +	(show_statistics): Remove marks.
 +
 +	gpg: Re-format some tofu messages.
 +	* common/status.h (STATUS_TOFU_USER, STATUS_TOFU_STATS)
 +	(STATUS_TOFU_STATS_SHORT, STATUS_TOFU_STATS_LONG): New.
 +	* g10/tofu.c (NO_WARNING_THRESHOLD): New.
 +	(record_binding, tofu_register): Take care of --dry-run.
 +	(show_statistics): Print STATUS_TOFU_USER.  Reformat some messages.
 +	Fix the ngettext/strcmp thing.  Use log_string instead of log_info.
 +	Use NO_WARNING_THRESHOLD constant.
 +	(get_trust): Use format_text and print a compact fingerprint.
 +
 +2016-05-02  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: More fix of error return path.
 +	* scd/command.c (open_card): Return GPG_ERR_ENODEV on the failure of
 +	apdu_connect.
 +
 +2016-04-29  Werner Koch  <wk at gnupg.org>
 +
 +	common: Extend log_string to indent lines.
 +	* common/logging.c (do_logv): Add indentation when called via
 +	log_string.
 +
 +	gpg: Factor some code code out of tofu.c.
 +	* g10/tofu.c (string_to_long): New.
 +	(string_to_ulong): New.
 +	(get_single_unsigned_long_cb): Replace strtol/strtoul by new function.
 +	(get_single_long_cb): Ditto.
 +	(signature_stats_collect_cb):  Ditto.
 +	(get_policy): Ditto.
 +	(show_statistics): Ditto.  Uese es_free instead of free.
 +
 +	gpg: Remove all assert.h and s/assert/log_assert/.
 +
 +	common: Improve log_assert.
 +	* common/logging.c (bug_at): Do not i18n the string.
 +	(_log_assert): New.
 +	* common/logging.h (log_assert): Use new function and pass line
 +	information.
 +
 +2016-04-28  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix error return path.
 +	* scd/ccid-driver.c (bulk_in): Remove EAGAIN handling.
 +	Handle LIBUSB_ERROR_NO_DEVICE to return CCID_DRIVER_ERR_NO_READER.
 +
 +2016-04-27  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix memory leaks.
 +	* scd/ccid-driver.c (scan_or_find_usb_device): Return on
 +	LIBUSB_ERROR_NO_MEM.  Free CONFIG before return except on error.
 +	(scan_or_find_devices): Free device list.
 +
 +2016-04-27  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add experimental AKL method "wkd" and option --with-wkd-hash.
 +	* g10/getkey.c (parse_auto_key_locate): Add method "wkd".
 +	(get_pubkey_byname): Implement that method.  Also rename a variable.
 +	* g10/call-dirmngr.c (gpg_dirmngr_wkd_get): New.
 +	* g10/keyserver.c (keyserver_import_wkd): New.
 +	* g10/test-stubs.c (keyserver_import_wkd): Add stub.
 +	* g10/gpgv.c (keyserver_import_wkd): Ditto.
 +	* g10/options.h (opt):  Add field 'with_wkd_hash'.
 +	(AKL_WKD): New.
 +
 +	* g10/gpg.c (oWithWKDHash): New.
 +	(opts): Add option --with-wkd-hash.
 +	(main): Set that option.
 +	* g10/keylist.c (list_keyblock_print): Implement that option.
 +
 +	dirmngr: Add experimental command WKD_GET.
 +	* dirmngr/server.c (cmd_wkd_get): New.
 +	(register_commands): Add command WKD_GET.
 +
 +	dirmngr: Use system provided root CAs with KS_FETCH.
 +	* dirmngr/ks-engine-http.c (ks_http_fetch): Use HTTP_FLAG_TRUST_SYS.
 +
 +2016-04-26  Werner Koch  <wk at gnupg.org>
 +
 +	http: Allow to request system defined CAs for TLS.
 +	* dirmngr/http.h (HTTP_FLAG_TRUST_DEF, HTTP_FLAG_TRUST_SYS): New.
 +	* dirmngr/http.c (http_session_new): Add arg "flags".
 +	* dirmngr/ks-engine-hkp.c (send_request): Use new flag
 +	HTTP_FLAG_TRUST_DEF for the new arg of http_session_new.
 +	* dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
 +	* dirmngr/t-http.c (main): Ditto.
 +
 +2016-04-25  Werner Koch  <wk at gnupg.org>
 +
 +	common: Minor fixes for the new private-keys.c.
 +	* common/private-keys.c (my_error_from_syserror): New.  Use it in
 +	place of gpg_error_from_syserror.
 +	(_pkc_add, pkc_lookup, pke_next_value): Use ascii_strcasecmp.
 +	(pkc_parse): Use xtrystrdup and append_to_strlist_try as intended.
 +
 +	(_pkc_add): Add braces around if-statement.
 +
 +	common: Use new function to print a failure of xtrymalloc.
 +	* common/miscellaneous.c (xoutofcore): New.
 +	* common/strlist.c (append_to_strlist): Use instead of abort.
 +	(append_to_strlist_try): Use xtrymalloc instead of xmalloc.
 +
 +2016-04-21  Justus Winter  <justus at g10code.com>
 +
 +	common: Add support for the new extended private key format.
 +	* agent/findkey.c (write_extended_private_key): New function.
 +	(agent_write_private_key): Detect if an existing file is in extended
 +	format and update the key within if it is.
 +	(read_key_file): Handle the new format.
 +	* agent/keyformat.txt: Document the new format.
 +	* common/Makefile.am: Add the new files.
 +	* common/private-keys.c: New file.
 +	* common/private-keys.h: Likewise.
 +	* common/t-private-keys.c: Likewise.
 +	* common/util.h (alphap, alnump): New macros.
 +	* tests/migrations: Add test demonstrating that we can cope with the
 +	new format.
 +
 +	common: Add 'free_strlist_wipe' which wipes memory.
 +	* common/strlist.c (free_strlist_wipe): New function.
 +	* common/strlist.h (free_strlist_wipe): New prototype.
 +
 +	common: Add 'append_to_strlist_try' which can fail.
 +	* common/strlist.c (append_to_strlist): Use the new function.
 +	(append_to_strlist_try): New function.
 +	* common/strlist.h (append_to_strlist_try): New prototype.
 +
 +	agent: Convert key format document to org.
 +	* agent/keyformat.txt: Convert to org mode.
 +
 +	tests: Make migration test more robust and silent.
 +	* tests/migrations/from-classic.test: Fix in-tree build, silence test.
 +
- 	Fixes-commit: defbc70b
- 
 +2016-04-21  Werner Koch  <wk at gnupg.org>
 +
 +	w32: Use --enable-gpg2-is-gpg by default.
 +	* autogen.rc: Add option also for plain Windows.
 +
 +	w32: Replace libiconv DLL by iconv feature of libgpg-error.
 +	* configure.ac: Do nor require libiconv for W32.
 +	* common/utf8conv.c [W32]: Do not incluce iconv.h.  Request
 +	libgpg-error iconv macros.
 +	(jnlib_iconv): Use ICONV_CONST macro.
 +	* build-aux/speedo/w32/inst.nsi [!WITH_GUI]: Do not install libiconv.
 +	* build-aux/speedo.mk (speedo_spkgs) [!WITH_GUI]: Likewise.
 +
 +2016-04-20  Justus Winter  <justus at g10code.com>
 +
 +	agent: Sanitize permissions of the private key directory.
 +	* agent/gpg-agent.c (create_private_keys_directory): Set permissions.
 +	* common/sysutils.c (modestr_to_mode): New function.
 +	(gnupg_mkdir): Use new function.
 +	(gnupg_chmod): New function.
 +	* common/sysutils.h (gnupg_chmod): New prototype.
 +	* tests/migrations/from-classic.test: Test migration with existing
 +	directory.
 +
- 	GnuPG-bug-id: 2312
- 
 +	tests: Test the migration from a classic GnuPG home directory.
 +	* configure.ac: Add new directory.
 +	* tests/Makefile.am (SUBDIRS): Likewise.
 +	* tests/migrations/Makefile.am: New file.
 +	* tests/migrations/from-classic.gpghome/pubring.gpg.asc: Likewise.
 +	* tests/migrations/from-classic.gpghome/secring.gpg.asc: Likewise.
 +	* tests/migrations/from-classic.gpghome/trustdb.gpg.asc: Likewise.
 +	* tests/migrations/from-classic.test: Likewise.
 +
 +2016-04-20  Werner Koch  <wk at gnupg.org>
 +
 +	speedo: Use swdb.lst to define the SQLite version.
 +	* build-aux/speedo.mk: Change sqlite to use our mirror and the
 +	swdb.lst file.
 +	* build-aux/speedo/w32/inst.nsi: gpg is now build and installed as
 +	gpg.
 +
 +2016-04-19  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Improve UID selction of --quick-sign-key.
 +	* g10/keyedit.c (keyedit_quick_sign): Improve UID selection and print
 +	error for non-found userids.
 +
 +	gpg: Avoid debug like output at start of --edit-key.
 +	* g10/keyedit.c (check_all_keysigs): Print info only after something
 +	has been modified.
 +
 +2016-04-15  Andre Heinecke  <aheinecke at intevation.de>
 +
 +	dirmngr: Fix https never reported in general help.
 +	* dirmngr/ks-engine-http.c (ks_hkp_help): Also print https
 +	when supported and no uri provided.
 +
 +	dirmngr: Fix https incorrectly reported in help.
 +	* dirmngr/ks-engine-http.c (ks_hkp_help): Only print https if tls
 +	is supported.
 +
 +2016-04-14  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Fix regression due to recent commit 4159567.
 +	* agent/protect.c (do_encryption): Fix CBC hashing.
 +
 +	agent: Allow gpg-protect-tool to handle openpgp-native protection.
 +	* agent/protect-tool.c (read_and_unprotect): Add arg ctrl and pass to
 +	agent_unprotect.
 +	(main): Allocate a simple CTRL object and pass it to
 +	read_and_unprotect.
 +	(convert_from_openpgp_native): Remove stub.
 +	(agent_key_available, agent_get_cache): New stubs.
 +	(agent_askpin): New emulation for the one in call-pinentry.c.
 +	(agent_write_private_key): New to dump key.
 +	* agent/Makefile.am (gpg_protect_tool_SOURCES): Add cvt-openpgp.c
 +
 +	tests: Set fake-pinentry's stdout and stdin to _IOLBF.
 +	* tests/openpgp/fake-pinentry.c (main): Call setvbuf.  Show passphrase
 +	at startup.  Increase buffer.
 +
 +2016-04-12  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Implement new protection mode openpgp-s2k3-ocb-aes.
 +	* agent/protect.c (agent_protect): Add arg use_ocb.  Change all caller
 +	to pass -1 for default.
 +	* agent/protect-tool.c: New option --debug-use-ocb.
 +	(oDebugUseOCB): New.
 +	(opt_debug_use_ocb): New.
 +	(main): Set option.
 +	(read_and_protect): Implement option.
 +
 +	* agent/protect.c (OCB_MODE_SUPPORTED): New macro.
 +	(PROT_DEFAULT_TO_OCB): New macro.
 +	(do_encryption): Add args use_ocb, hashbegin, hashlen, timestamp_exp,
 +	and timestamp_exp_len.  Implement OCB.
 +	(agent_protect): Change to support OCB.
 +	(do_decryption): Add new args is_ocb, aadhole_begin, and aadhole_len.
 +	Implement OCB.
 +	(merge_lists): Allow NULL for sha1hash.
 +	(agent_unprotect): Change to support OCB.
 +	(agent_private_key_type): Remove debug output.
 +
 +	indent: Help Emacs not to get confused by conditional compilation.
 +	* agent/protect.c (calibrate_get_time) [W32]: Use separate function
 +	calls for W32 and W32CE.
 +
 +2016-04-07  Justus Winter  <justus at g10code.com>
 +
 +	g10: Fix exporting secret keys of certain sizes.
 +	* g10/build-packet.c (do_key): Do not use the header length specified
 +	by the public key packet from the keyring, but let 'write_header2'
 +	compute the required length.
 +
 +2016-04-06  Justus Winter  <justus at g10code.com>
 +
 +	Revert "g10: Support armored keyrings in gpgv."
 +	This reverts commit abb352de51bc964c06007fce43ed6f6caea87c15.
 +
 +2016-04-05  Justus Winter  <justus at g10code.com>
 +
 +	dirmngr: Autodetect PEM format in dirmngr-client.
 +	* dirmngr/dirmngr-client.c (init_asctobin): New function.
 +	(main): Move the initialization code to the new function.
 +	(read_pem_certificate): Initialize base64 table.
 +	(read_certificate): Try to decode certificates given in files as PEM
 +	first.
 +
- 	GnuPG-bug-id: 1844
- 
 +2016-04-05  Werner Koch  <wk at gnupg.org>
 +
 +	build: Fix for: Build gpgcompose only in maintainer mode.
 +	* g10/Makefile.am (noinst_PROGRAMS): Always add module_tests.
 +
 +	doc: Install gpg and gpgv man pages under the correct name.
 +	* doc/mkdefsinc.c (main): Add double include guard.  Set variable
 +	gpgtwohack. Define macros gpgname and gpgvname.
 +	* doc/gpg.texi: Remove macro definition for gpgname.  Use Texinfo var
 +	gpgtwohack to prepare the man pages.  Use @gpgname everywhere.
 +	* doc/gpgv.texi: Likewise.
 +	* doc/Makefile.am (myman_pages): Remove gpg2.1 and gpgv2.1 but add
 +	them depending on USE_GPG2_HACK.
 +
 +	build: Build gpgcompose only in maintainer mode.
 +	* g10/Makefile.am (noinst_PROGRAMS): Add gpgcompose only in maintainer
 +	mode.
 +
 +	gpg: Replace use of "gpg2" by GPG_NAME.
 +
 +2016-04-04  Werner Koch  <wk at gnupg.org>
 +
 +	Now build "gpg" binary but install as "gpg2"
 +	* configure.ac (USE_GPG2_HACK): New ac_define am_conditional.
 +	* common/homedir.c (gnupg_module_name): Replace use of macro
 +	NAME_OF_INSTALLED_GPG.
 +	* g10/keygen.c (generate_keypair): Ditto.
 +	* g10/Makefile.am (bin_PROGRAMS): Remove.
 +	(noinst_PROGRAMS): Add gpg or gpg2 and gpgv or gpg2.
 +	(gpg2_hack_list): New.
 +	(use_gpg2_hack): New.
 +	(gpg2_SOURCES): Rename to gpg_SOURCES.
 +	(gpgv2_SOURCES): Rename to gpgv_SOURCES.
 +	(gpg2_LDADD): Rename to gpg_LDADD.
 +	(gpgv2_LDADD): Rename to gpgv_LDADD.
 +	(gpg2_LDFLAGS): Rename to gpg_LDFLAGS.
 +	(gpgv2_LDFLAGS): Rename to gpgv2_LDFLAGS.
 +	(install-exec-hook): Remove WinCE specific rules and add new rules.
 +	(uninstall-local): Uninstall gpg/gpg2 and gpgv/gpgv2.
 +	* tests/openpgp/Makefile.am (required_pgms): s/gpg2/gpg/.
 +	* tests/openpgp/defs.inc: Ditto.
 +	* tests/openpgp/gpgtar.test: Ditto.
 +	* tests/openpgp/mkdemodirs: Ditto.
 +	* tests/openpgp/signdemokey: Ditto.
 +
 +	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Remove obsolete
 +	--enable-mailto, add --enable-gpg2-is-gpg.
 +
 +	tests: Add missing file.
 +	* tests/openpgp/Makefile.am (TEST_FILES): Add plain-largeo.asc.
 +
 +2016-04-04  Justus Winter  <justus at g10code.com>
 +
 +	g10: Support armored keyrings in gpgv.
 +	* doc/gpgv.texi: Document the feature.
 +	* g10/Makefile.am (gpgv2_SOURCES): Add dearmor.c.
 +	* g10/dearmor.c (dearmor_file): Add sink argument.
 +	* g10/gpg.c (main): Adapt accordingly.
 +	* g10/gpgv.c (make_temp_dir): New function.
 +	(main): De-armor keyrings.
 +	* g10/main.h (dearmor_file): Adapt prototype.
 +
- 	GnuPG-bug-id: 2290
- 
 +	tests: Fix default key test.
 +	* tests/openpgp/default-key.test: Avoid using the option
 +	'--trust-model' unconditionally.
 +
 +2016-04-01  Justus Winter  <justus at g10code.com>
 +
 +	build: Check for conflicting trust model options.
 +	* configure.ac: Disable TOFU if configured without trust models, and
 +	check for conflicting options.
 +
 +	g10: Remove option --always-trust if compiled without trust models.
 +	* g10/gpg.c (opts): Remove option --always-trust if compiled without
 +	trust models.
 +
 +2016-03-31  Justus Winter  <justus at g10code.com>
 +
 +	speedo,w32: Build libsqlite3.
 +	* build-aux/speedo.mk (speedo_spkgs): Add libsqlite3 on w32.
 +	(libsqlite3_ver): New variable.
 +	(speedo_pkg_libsqlite3_tar): Likewise.
 +
 +	g10: Use gpg-error abstraction of sched_yield.
 +	* g10/tofu.c (begin_transaction): Use 'gpgrt_yield'.
 +
 +2016-03-29  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix NULL-segv for missing tofu DB.
 +	* g10/tofu.c (opendb): Guard call to timeout function.
 +
 +2016-03-22  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Improve message when asking for key capabilities.
 +	* g10/keygen.c (ask_key_flags): Improve message.
 +
 +	gpg: Remove the extra prompt for Curve25519.
 +	* g10/keygen.c (MY_USE_ECDSADH): New macro local to ask_curve.
 +	(ask_curve): Use a fixed table of curve names and reserve a slot for
 +	Curve448.  Simplify CurveNNNN/EdNNNN switching.
 +	(ask_curve): Remove the Curve25519 is non-standard prompt.
 +
 +2016-03-19  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Silence trustdb computation with --quiet.
 +	* g10/trustdb.c (validate_keys): Do not print log_info stuff in quiet
 +	mode.
 +
 +2016-03-17  Werner Koch  <wk at gnupg.org>
 +
 +	sm: Always create a keybox header when creating a new keybox.
 +	* sm/keydb.c (maybe_create_keybox): Create the header blob.
 +
 +2016-03-17  Neal H. Walfield  <neal at g10code.com>
 +
 +	doc: Improve documentation of --enable-large-rsa.
 +	* doc/gpg.texi (--enable-large-rsa): Improve text.
 +
 +2016-03-17  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: allow removal of the shadowed key.
 +	* agent/findkey.c (agent_delete_key): Remove the key when asked.
 +
 +2016-03-16  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: Add const qualifier.
 +	* g10/gpgcompose.c (show_help): Those are strings not to be modified.
 +
 +2016-03-15  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Do not rely on a certain evaluation order.
 +	* g10/keyedit.c (print_and_check_one_sig): Call check_key_signature
 +	before derefing IS_SELFSIG.
 +
 +2016-03-14  Werner Koch  <wk at gnupg.org>
 +
 +	scd: Add manufacturer id 0x000a.
 +	* g10/card-util.c (get_manufacturer): Add it.
 +
 +2016-03-10  Kevin J. McCarthy  <kevin at 8t8.us>
 +
 +	g10: Silence message if --quiet is given.
 +	* g10/getkey.c (parse_def_secret_key): Silence message if --quiet is
 +	given.
 +
 +2016-03-08  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Add a new test.
 +	* g10/Makefile.am (EXTRA_DIST): Add t-stutter-data.asc.
 +	(module_tests): Add t-stutter.
 +	(t_stutter_SOURCES): New variable.
 +	(t_stutter_LDADD): New variable.
 +
 +2016-03-07  Justus Winter  <justus at g10code.com>
 +
 +	sm: Implement pinentry loopback and reading passphrases from fd.
 +	* doc/gpgsm.texi: Document '--pinentry-mode' and '--passphrase-fd'.
 +	* sm/Makefile.am (gpgsm_SOURCES): Add new files
 +	* sm/call-agent.c (struct default_inq_parm_s): New definition.
 +	(start_agent): Pass in the pinentry mode.
 +	(default_inq_cb): Handle 'PASSPHRASE' and 'NEW_PASSPHRASE' inquiries.
 +	Adapt all call sites to the new callback cookie.
 +	* sm/gpgsm.c (cmd_and_opt_values): Add new values.
 +	(opts): Add new options.
 +	(main): Handle new options.
 +	* sm/gpgsm.h (struct opt): Add field 'pinentry_mode'.
 +	* sm/passphrase.c: New file.
 +	* sm/passphrase.h: Likewise.
 +
- 	GnuPG-bug-id: 1970
- 
 +	sm: Remove unused argument '--fixed-passphrase'.
 +	* doc/gpgsm.texi: Drop description.
 +	* sm/gpgsm.c (cmd_and_opt_values): Drop enum value.
 +	(opts): Drop argument.
 +	(main): Drop argument handling.
 +	* sm/gpgsm.h (struct opt): Drop field 'fixed_passphrase'.
 +
 +	kbx: Avoid undefined behavior.
 +	* kbx/keybox-file.c (_keybox_read_blob2): Cast to unsigned int before
 +	shifting.
 +
 +2016-03-07  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Bug fix for a device with multiple interfaces.
 +	* scd/ccid-driver.c (scan_or_find_usb_device): Use IFC_NO when
 +	accessing interface information.
 +
 +2016-03-04  Justus Winter  <justus at g10code.com>
 +
 +	build: Make libusb a hard requirement if the ccid driver is requested.
 +	* configure.ac: Print an error message and die if the internal ccid
 +	driver is requested but no suitable libusb is found.
 +
 +	g10: Drop superfluous declaration.
 +	* g10/main.h (disable_core_dumps): Drop declaration.
 +
 +	g10: Guard code against errors.
 +	* g10/keygen.c (do_generate_keypair): Check for errors, in which case
 +	'pri_psk' is NULL.
 +
- 	Fixes-commit: bf9d1248
- 
 +2016-03-03  Justus Winter  <justus at g10code.com>
 +
 +	dirmngr: Add more missing CFLAGS.
 +	* dirmngr/Makefile.am (t_ldap_parse_uri_CFLAGS): Add
 +	'GCRYPT_CFLAGS'.
 +	(t_dns_stuff_CFLAGS): Likewise.
 +
- 	GnuPG-bug-id: 2235
- 
 +	tests/openpgp: Skip gpgtar test if it has not been built.
 +	* tests/openpgp/gpgtar.test: Check if executable exists.
 +
- 	GnuPG-bug-id: 2261
- 
 +2016-03-02  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Add new program gpgcompose.
 +	* g10/packet.h: Include "util.h".
 +	* g10/encrypt.c (encrypt_seskey): Don't mark as static.
 +	* g10/gpgcompose.c: New file.
 +	* g10/Makefile.am (noinst_PROGRAMS): Add gpgcompose.
 +	(gpg2_SOURCES): Split everything but gpg.c into...
 +	(gpg_sources): ... this new variable.
 +	(gpgcompose_SOURCES): New variable.
 +	(gpgcompose_LDADD): Likewise.
 +	(gpgcompose_LDFLAGS): Likewise.
 +
 +	gpg: More robustly detect valid non-armored OpenPGP messages.
 +	* g10/armor.c (is_armored): More robustly detect valid non-armored
 +	OpenPGP messages.
 +
 +	common: Provide a function for mapping packet types to strings.
 +	* common/openpgpdefs.h (pkttype_str): New function.
 +
 +	gpg: Rename pop_filter to iobuf_pop_filter and export it.
 +	* common/iobuf.c (pop_filter): Rename from this...
 +	(iobuf_pop_filter): ... to this.  Don't mark it as static.
 +
 +	gpg: Split write_pubkey_enc_from_list.
 +	* g10/encrypt.c (write_pubkey_enc_from_list): Split the body of this
 +	function out into...
 +	(write_pubkey_enc): ... this new function.
 +
 +	gpg: Allow the caller to write the contents of a plaintext packet.
 +	* g10/build-packet.c (do_plaintext): Change the semantics such that if
 +	PT->BUF is NULL, it is the caller's responsibility to write the
 +	content (and disable partial body length mode, if appropriate).
 +
 +	gpg: Add a new function for creating binary notations.
 +	* g10/build-packet.c (blob_to_notation): New function.
 +
 +	gpg: Refactor the printing of binary notations.
 +	* g10/build-packet.c (sig_to_notation): Break printing of binary
 +	notations into...
 +	(notation_value_to_human_readable_string): ... this new function.
 +	Provide a small preview of the binary data substituting non-printable
 +	characters with '?'.
 +
 +2016-03-02  Uldis Anšmits  <uldis.ansmits at tieto.com>
 +
 +	tests/openpgp: Make tests more portable.
 +	* tests/openpgp/default-key.test: Avoid 'grep -q'.
 +	* tests/openpgp/gpgtar.test: Avoid 'grep -qe' and 'diff -q'.
 +	* tests/openpgp/use-exact-key.test: Avoid 'grep -q'.
 +
- 	GnuPG-bug-id: 2262
- 
 +2016-03-02  Justus Winter  <justus at g10code.com>
 +
 +	common: Consolidate Assuan server argument handling.
 +	* common/Makefile.am (common_sources): Add new files.
 +	* common/server-help.c: New file.
 +	* common/server-help.h: Likewise.
 +	* agent/command.c: Drop argument handling primitives in favor of using
 +	the consolidated ones.
 +	* dirmngr/server.c: Likewise.
 +	* g10/server.c: Likewise.
 +	* g13/server.c: Likewise.
 +	* scd/command.c: Likewise.
 +	* sm/server.c: Likewise.
 +
 +2016-03-01  Justus Winter  <justus at g10code.com>
 +
 +	dirmngr: Add missing CFLAGS.
 +	* dirmngr/Makefile.am (t_ldap_parse_uri_CFLAGS): Add
 +	'GPG_ERROR_CFLAGS'.
 +	(t_dns_stuff_CFLAGS): Likewise.
 +
 +	tools: Drop superfluous include.
 +	* tools/gpgtar.c: Do not include unused 'npth.h'.
 +
 +2016-02-26  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Prettify a 2 octet hex output.
 +	* g10/sig-check.c (check_key_signature2): Wrap line and use %02x.
 +
 +2016-02-25  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Show debugging info if a sig with an unsupported sig class is used.
 +	* g10/sig-check.c (check_key_signature2): If SIG->CLASS is
 +	unsupported, show some debugging information.  Don't use BUG to fail.
 +	Just return GPG_ERR_BAD_SIGNATURE.
 +
 +	gpg: More carefully encode a packet's length.
 +	* g10/build-packet.c (write_header2): Make sure the length bits are
 +	cleared.  Fail if HDRLEN is set and the specified length can't be
 +	encoded in the available space.
 +
 +	gpg: Avoid directly twiddling bits.
 +	* g10/build-packet.c (do_plaintext): Use ctb_new_format_p to check the
 +	packet's format.
 +	(write_header2): Likewise.
 +
 +	gpg: Add some asserts.
 +	* g10/build-packet.c (ctb_new_format_p): New function.
 +	(ctb_pkttype): New function.
 +	(do_user_id): Add some asserts.
 +	(do_key): Likewise.
 +	(do_symkey_enc): Likewise.
 +	(do_pubkey_enc): Likewise.
 +	(do_plaintext): Likewise.
 +	(do_encrypted): Likewise.
 +	(do_encrypted_mdc): Likewise.
 +	(do_compressed): Likewise.
 +	(do_signature): Likewise.
 +	(do_signature): Likewise.
 +	(write_header2): Likewise.
 +
 +	gpg: Avoid an unnecessary copy.
 +	* g10/build-packet.c (sig_to_notation): Avoid an unnecessary copy of
 +	the data: the size of the packet is fixed.
 +
 +2016-02-23  Neal H. Walfield  <neal at g10code.com>
 +
 +	common: Reduce buffer size.
 +	* common/iobuf.c (iobuf_copy): Change buffer size from 1 MB to 32 KB.
 +
 +	common: Improve a function's documentation and comments.
 +	* common/iobuf.c (iobuf_set_partial_body_length_mode): Fix
 +	documentation and comment.  Add an assert.
 +
 +	common: Add log_assert.
 +	* common/logging.h (log_assert): New macro.
 +
 +	gpg: Use higher-level functions.
 +	* g10/build-packet.c (do_symkey_enc): Use iobuf_write instead of
 +	iobuf_put in a loop.  Use iobuf_copy instead of iobuf_read and
 +	iobuf_write in a loop.  Move the memory wiping from here...
 +	* common/iobuf.c (iobuf_copy): ... to here.
 +
 +	common: Check for an error before reading.
 +	* common/iobuf.c (iobuf_copy): If DEST has a pending error, don't
 +	start copying.
 +
 +	common: More accurately name function.
 +	* common/iobuf.c (iobuf_set_partial_block_mode): Rename from this...
 +	(iobuf_set_partial_body_length_mode): ... to this.  Update callers.
 +
 +2016-02-23  Werner Koch  <wk at gnupg.org>
 +
 +	g13: Add commands --suspend and --remove.
 +	* g13/g13.c (aSuspend, aResume): New.
 +	(opts): Add commands --suspend and --resume.
 +	(main): Implement dummy command aUmount.  Implement commands aResume
 +	and aSuspend.
 +	* g13/sh-cmd.c (cmd_suspend): New.
 +	(cmd_resume): New.
 +	(register_commands): Add commands RESUME and SUSPEND.
 +	* g13/server.c (cmd_suspend): New.
 +	(cmd_resume): New.
 +	(register_commands): Add commands RESUME and SUSPEND.
 +	* g13/be-dmcrypt.c (be_dmcrypt_suspend_container): New.
 +	(be_dmcrypt_resume_container): New.
 +	* g13/backend.c (be_suspend_container): New.
 +	(be_resume_container): New.
 +	* g13/suspend.c, g13/suspend.h: New.
 +	* g13/mount.c (parse_header, read_keyblob_prefix, read_keyblob)
 +	(decrypt_keyblob, g13_is_container): Move to ...
 +	* g13/keyblob.c: new file.
 +	(keyblob_read): Rename to g13_keyblob_read and make global.
 +	(keyblob_decrypt): Rename to g13_keyblob_decrypt and make global.
 +	* g13/sh-dmcrypt.c (check_blockdev): Add arg expect_busy.
 +	(sh_dmcrypt_suspend_container): New.
 +	(sh_dmcrypt_resume_container): New.
 +	* g13/call-syshelp.c (call_syshelp_run_suspend): New.
 +	(call_syshelp_run_resume): New.
 +
 +	g13: Run mount after dmsetup.
 +	* g13/g13-syshelp.c (main): Reject userids with a slash.
 +	* g13/sh-dmcrypt.c (sh_dmcrypt_mount_container): Run mount if a
 +	mountpoint is known.
 +
 +2016-02-23  Justus Winter  <justus at g10code.com>
 +
 +	tests/openpgp: Qualify executables with extension.
 +	* tests/openpgp/Makefile.am (required_pgms): Qualify executables with
 +	'$EXEEXT'.
 +
 +	tests/openpgp: Reimplement 'pinentry.sh' in c.
 +	* tests/openpgp/Makefile.am: Build new program.
 +	* tests/openpgp/defs.inc: Use the new program.
 +	* tests/openpgp/fake-pinentry.c: New file.
 +
 +	tests/openpgp: Avoid dependency on source files.
 +	* tests/openpgp/plain-largeo.asc: New file.
 +	* tests/openpgp/version.test: Dearmor the new file instead of relying
 +	on the source being present.
 +
 +	tests/openpgp: Fix file removal.
 +	* tests/openpgp/version.test: Fix file removal.
 +
 +	common/exechelp: Provide a way to wait for multiple processes.
 +	* common/exechelp-posix.c (gnupg_wait_process): Generalize to
 +	'gnupg_wait_processes'.
 +	* common/exechelp-w32.c (gnupg_wait_process): Likewise.
 +	* common/exechelp-w32ce.c (gnupg_wait_process): New function stub.
 +	* common/exechelp.h (gnupg_wait_process): New prototype.
 +
 +	common/exechelp: Add general pipe function.
 +	* common/exechelp-posix.c (gnupg_create_pipe): New function.
 +	* common/exechelp-w32.c (INHERIT_{READ,WRITE,BOTH}): New macros.
 +	(create_inheritable_pipe): Generalize so that both ends can be
 +	inherited.
 +	(do_create_pipe): Rename argument accordingly.
 +	(gnupg_create_{in,out}bound_pipe): Use new flags.
 +	(gnupg_create_pipe): New function.
 +	(gnupg_spawn_process): Use new flags.
 +	* common/exechelp-w32ce.c (gnupg_create_pipe): New stub.
 +	* common/exechelp.h (gnupg_create_pipe): New prototype.
 +
 +	common/exechelp: Mute the Windows version.
 +	* common/exechelp-w32.c (gnupg_wait_process): Do not print an error if
 +	the exit code can be returned.  This makes the Windows version behave
 +	like the POSIX version.
 +
 +	common/exechelp: Avoid magic numbers.
 +	* common/exechelp-w32.c (do_create_pipe): Use symbolic names.
 +
 +	common/exechelp: Disable debugging by default.
 +	* common/exechelp-w32.c (DEBUG_W32_SPAWN): Set to 0.
 +
 +	common/exechelp: Fix handle leak.
 +	* common/exechelp-w32.c (gnupg_spawn_process_detached): Close process
 +	handle.
 +
 +	common/exechelp: Fix opening the 'nul' device.
 +	* common/exechelp-w32.c (gnupg_spawn_process): Fix opening the 'nul'
 +	device.
 +
 +	common/exechelp: Fix error handling.
 +	* common/exechelp-w32.c (gnupg_spawn_process): Close the right handle.
 +
 +	common/exechelp: Fix pipe creation.
 +	* common/exechelp-w32.c (gnupg_spawn_process): Fix the creation of the
 +	input pipe.
 +
 +	tools/mk-tdata: Fix data generation on Windows.
 +	* tools/mk-tdata.c (main): Set stdout to binary mode to avoid newline
 +	conversion.
 +
 +2016-02-19  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Systematically detect and fix signatures that are out of order.
 +	* g10/keyedit.c (sig_comparison): New function.
 +	(fix_key_signature_order): Merge functionality into...
 +	(check_all_keysigs): ... this function.  Rewrite to eliminate
 +	duplicates and use a systematic approach to detecting and moving
 +	signatures that are out of order instead of a heuristic.
 +	(fix_keyblock): Don't call fix_key_signature_order.  Call
 +	check_all_keysigs instead after collapsing the uids.
 +
 +	gpg: Split check_key_signature2.
 +	* g10/sig-check.c (hash_uid_node): Rename from this...
 +	(hash_uid_packet): ... to this.  Take a PKT_user_id instead of a
 +	KBNODE.
 +	(check_key_signature2): Split the basic signature checking
 +	functionality into...
 +	(check_signature_over_key_or_uid): ... this new function.
 +
 +	gpg: Split print_and_check_one_sig.
 +	* g10/keyedit.c (print_and_check_one_sig): Split the print
 +	functionality into...
 +	(print_one_sig): ... this new function.
 +
 +	gpg: Split the function check_signature_end.
 +	* g10/sig-check.c (check_signature_end): Break the basic signature
 +	check into...
 +	(check_signature_end_simple): ... this new function.
 +
 +	gpg: Use format_keyid rather than manually formatting the keyid.
 +	* g10/keyedit.c (menu_addrevoker): Use format_keyid rather than
 +	manually formatting the keyid.
 +	* g10/keygen.c (card_write_key_to_backup_file): Likewise.
 +
 +	gpg: Initialize the primary key when generating a key.
 +	* g10/keygen.c (do_generate_keypair): Initialize
 +	pri_psk->flags.primary, pri_psk->keyid and pri_psk->main_keyid.
 +
 +	gpg: Add accessor & utility functions for pk->keyid and pk->main_keyid.
 +	* g10/keydb.h (keyid_cmp): New function.
 +	* g10/keyid.c (pk_keyid): New function.
 +	(pk_main_keyid): New function.
 +	(keyid_copy): New function.
 +	(pk_keyid_str): New function.
 +	* g10/packet.h (PKT_public_key): Update comments for main_keyid and
 +	keyid.
 +
 +2016-02-18  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	gpgparsemail: Allow weirdly-mixed pkcs7 signatures.
 +	* tools/gpgparsemail.c: Add and check info->signing_protocol_2.
 +
 +	gpg: Clean up dangling agent_open and agent_closed declarations.
 +	* g10/keydb.h: Remove agent_open, agent_close declarations/
 +	* g10/migrate.c: #include <unistd.h> for access()
 +
 +2016-02-16  Werner Koch  <wk at gnupg.org>
 +
 +	w32: Make scdaemon build again due to libusb problem.
 +	* configure.ac: Add hack to disable libusb for Windows.  Also use
 +	$host instead of $target in the switch
 +	 --
 +
 +	The new test for libusb does not support cross-compiling.  As a quick
 +	workaround we disable libusb for Windows because we can't use it anyway.
 +
 +	w32: Do not error out if gpgconf is not installed.
 +	* common/homedir.c (check_portable_app): Remove error message.
 +
 +2016-02-16  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Make ASCII armor decoding more robust to encoding errors.
 +	* g10/armor.c (radix64_read): If the = is followed by the string "3D",
 +	check if the following four characters are valid radix 64 and are
 +	followed by a new line.  If so, warn and ignore the '3D'.
 +
 +2016-02-16  Werner Koch  <wk at gnupg.org>
 +
 +	doc: Add a gnupg-module-overview picture.
 +	* doc/gnupg-module-overview.svg: New.
 +	* doc/debugging.texi (Component interaction): New.
 +	* doc/Makefile.am (EXTRA_DIST): Add PNG and PDF versions of
 +	gnupg-module-overview.svg.  Remove two eps files.
 +	(BUILT_SOURCES): Add gnupg-module-overview.pdf and .png.  Remove
 +	gnupg-card-architecture.epsl
 +	(gnupg_TEXINFOS): Add gnupg-module-overview.svg
 +	(gnupg.dvi): New.
 +	(DISTCLEANFILES): Remove build eps files.
 +
 +2016-02-15  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	common, g10: Fix indentation to silence GCC-6.
 +	* common/iobuf.c (iobuf_ioctl): Fix.
 +	* g10/encrypt.c (encrypt_filter): Likewise.
 +	* g10/keyring.c (prepare_search): Likewise.
 +
 +	dirmngr: fix for memory alignment.
 +	* dirmngr/dns-stuff.c (get_dns_cert): Cast through void *.
 +	(getsrv, get_dns_cname): Make sure it's aligned for HEADER.
 +
 +2016-02-14  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add hidden key-edit subcommand "change-usage".
 +	* g10/keyedit.c (cmdCHANGEUSAGE): New.
 +	(cmds): Add command "change-usage".
 +	(keyedit_menu): Handle that command.
 +	(menu_changeusage): New.
 +	* g10/keygen.c (keygen_add_key_flags): New.
 +	(ask_key_flags): Add optional arg current.
 +
 +2016-02-14  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Improve API documentation.
 +	* g10/seskey.c (make_session_key): Improve documentation.
 +	(encode_session_key): Improve documentation.
 +	* g10/encrypt.c (encrypt_seskey): Remove gratuitous initialization.
 +	* g10/dek.h (DEK): Improve documenation.
 +
 +	gpg: Fix calc_header_length when LEN is 0 and improve documentation.
 +	* g10/build-packet.c (calc_header_length): Return the correct haeder
 +	size when LEN is 0.  Fix documentation.
 +
 +	gpg: Fix format_keyid when dynamically allocating the buffer.
 +	* g10/keyid.c (format_keyid): Return a char *, not a const char *.  If
 +	BUFFER is NULL, then set LEN to the static buffer's size.
 +
 +	common: Fix comment.
 +	* common/iobuf.c (iobuf_flush_temp): Fix comment.
 +
 +2016-02-13  Werner Koch  <wk at gnupg.org>
 +
 +	g13: Require a confirmation before g13 is used for DM-Crypt.
 +	* g13/g13-syshelp.c (g13_syshelp_i_know_what_i_am_doing):
 +	* g13/sh-dmcrypt.c (sh_dmcrypt_create_container): Call it.
 +	(sh_dmcrypt_mount_container): Call it.
 +
 +	g13: Second chunk of code to support dm-crypt.
 +	* g13/be-dmcrypt.c, g13/be-dmcrypt.h: New.
 +	* g13/Makefile.am (g13_SOURCES): Add them.
 +	* g13/backend.c: Include be-dmcrypt.h and call-syshelp.h.
 +	(no_such_backend): Rename to _no_such_backend and provide replacement
 +	macro.
 +	(be_is_supported_conttype): Support DM-Crypt.
 +	(be_take_lock_for_create): Call set_segvice for DM-Crypt.
 +	(be_create_new_keys): Make it a dummy for DM-Crypt.
 +	(be_create_container): Call be_dmcrypt_create_container.
 +	(be_mount_container): call be_dmcrypt_mount_container.
 +	* g13/g13-syshelp.c (main): Enable verbose mode.
 +	* g13/g13tuple.c (get_tupledesc_data): New.
 +	* g13/g13tuple.h (unref_tupledesc): New.
 +	* g13/g13.h (server_control_): Add field "recipients".
 +	* g13/g13.c (main): Fix setting of recipients via cmdline.
 +	(g13_deinit_default_ctrl): Release recipients list.
 +	(g13_request_shutdown): New.  Replace all direct update of
 +	shutdown_pending by calls this function.
 +	* g13/server.c (server_local_s): Remove field recipients which is now
 +	part of CTRL.
 +	(reset_notify, cmd_recipient, cmd_create): Adjust for this change.
 +	* g13/create.c (encrypt_keyblob): Rename to g13_encrypt_keyblob.
 +	(g13_create_container): Support DM-Crypt.
 +	* g13/mount.c (parse_header): Allow for meta data copies.
 +	(g13_mount_container): Support DM-Crypt.
 +	* g13/sh-cmd.c (cmd_create): Make it work.
 +	(cmd_mount): New.
 +	* g13/sh-dmcrypt.c (sh_dmcrypt_create_container): Make it work.
 +	(sh_dmcrypt_mount_container): New.
 +
 +	g13: Improve dump_keyblob.
 +	* g13/g13tuple.c: Include keyblob.h.
 +	(find_tuple_uint): Factor code out to ...
 +	(convert_uint): new.
 +	(all_printable): New.
 +	* g13/mount.c (dump_keyblob: Move and rename to ...
 +	* g13/g13tuple.c (dump_tupledesc): here.  Revamp and pretyy print uint
 +	values.
 +
 +	g13: Define 3 new tags.
 +	* g13/keyblob.h (KEYBLOB_TAG_CONT_NSEC): New.
 +	(KEYBLOB_TAG_ENC_NSEC): New.
 +	(KEYBLOB_TAG_ENC_OFF): New.
 +
 +	g13: Rename utils.c to g13tuple.c.
 +	* g13/utils.c: Rename to g13tuple.c.
 +	* g13/utils.h: Rename to g13tuple.h.  Change all users.
 +	* g13/Makefile.am: Adjust accordingly
 +
 +	g13: Add functions to handle uint in a keyblob.
 +	* g13/utils.c (append_tuple_uint): New.
 +	(find_tuple_uint): New.
 +	* g13/t-utils.c: New.
 +	* g13/Makefile.am (noinst_PROGRAMS, TESTS): New.
 +	(module_tests, t_common_ldadd): New.
 +	(t_utils_SOURCES, t_utils_LDADD): New.
 +
 +	g13: Re-factor high level create code.
 +	* g13/create.c (g13_create_container): Factor some code out to ...
 +	* g13/backend.c (be_take_lock_for_create): new.
 +
 +	g13: Return an error for non-existing device.
 +	* g13/sh-cmd.c (cmd_device): Set ERR.
 +
 +	g13: Fix releasing of a syshelp context.
 +	* g13/call-syshelp.c (call_syshelp_release): Allow a NULL arg.
 +
 +	g13: Switch over to common/exectool.c.
 +	* g13/sh-exectool.c: Remove.  It has been replaced by common/exectool.c.
 +	* g13/Makefile.am (g13_syshelp_SOURCES): Remove sh-exectool.c
 +	* g13/sh-blockdev.c: Include exectool.h.  Change sh_exec_tool to
 +	gnupg_exec-tool.
 +	* g13/sh-dmcrypt.c: Ditto.
 +
 +	common: Make gnupg_exec_tool conform to spec.
 +	* common/exectool.c (gnupg_exec_tool): Allocate extra byte.  Allow
 +	zero length read.  Append hidden byte.  Release memory on error.
 +
 +	g13: First chunk of code to support dm-crypt.
 +	* g13/call-syshelp.c, g13/call-syshelp.h: New.
 +	* g13/g13-syshelp.c, g13/g13-syshelp.h: New.
 +	* g13/sh-cmd.c: New.
 +	* g13/sh-blockdev.c: New.
 +	* g13/sh-exectool.c: New.
 +	* g13/sh-dmcrypt.c: New.
 +	* g13/Makefile.am (sbin_PROGRAMS): Add g13-syshelp.c
 +	(g13_syshelp_SOURCES): New.
 +	(g13_syshelp_LDADD): New.
 +
 +	* g13/g13.c (opts): Add option --type.
 +	(g13_deinit_default_ctrl): New.
 +	(main): Implement that option.  Call g13_deinit_default_ctrl.
 +	* g13/g13.h (struct call_syshelp_s): New declaration.
 +	(server_control_s): Add field syshelp_local.
 +	* g13/keyblob.h (KEYBLOB_TAG_CREATED): New.
 +	(KEYBLOB_TAG_ALGOSTR): New.
 +	(KEYBLOB_TAG_HDRCOPY): New.
 +	* g13/backend.c (be_parse_conttype_name): New.
 +	(be_get_detached_name): Add CONTTYPE_DM_CRYPT.
 +
 +	tests: Remove some harmless warnings in regression tests.
 +	* tests/openpgp/gpg-agent.conf.tmpl: Remove --use-standard-socket.
 +
 +2016-02-12  Neal H. Walfield  <neal at g10code.com>
 +
 +	common: Change simple_query to ignore status messages.
 +	* common/simple-pwquery.c (simple_query): Ignore status messages.
 +
 +2016-02-12  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: Make sure to have the directory for trustdb.
 +	* g10/tdbio.c (tdbio_set_dbname): Return earlier if !CREATE.  Check
 +	the directory and create it if none before calling take_write_lock.
 +
 +2016-02-02  Neal H. Walfield  <neal at g10code.com>
 +
 +	doc: Note that rngd can also be used to quickly generate insecure keys.
 +	* doc/gpg-agent.texi (Agent Options): Add comment to the description
 +	of --debug-quick-random that rngd can also be used to quickly generate
 +	key.
 +
 +2016-01-27  Werner Koch  <wk at gnupg.org>
 +
 +	scd: Fix size_t/int mismatch in libusb.
 +	* scd/ccid-driver.c (bulk_in, abort_cmd, ccid_poll): Change msglen to
 +	int.
 +
 +	scd: Fix detection of libusb.
 +	* configure.ac (HAVE_LIBUSB): Clear if no header file was found.
 +	(LIBUSB_LIBS): Ditto.
 +
 +	dirmngr: Build fix for FreeBSD (EAI macros)
 +	* dirmngr/dns-stuff.c (map_eai_to_gpg_error): Map EAI_NODATA and
 +	EAI_ADDRFAMILY only if defined.
 +
 +2016-01-27  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Migrate to new API of libusb 1.0.
 +	* configure.ac (LIBUSB_CPPFLAGS): New.
 +	* scd/Makefile.am (AM_CPPFLAGS): Add LIBUSB_CPPFLAGS.
 +	* scd/ccid-driver.c: Use libusb 1.0 API.
 +
 +2016-01-26  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.11.
 +
 +2016-01-26  Andre Heinecke  <aheinecke at intevation.de>
 +
 +	gpgtar,w32: Fix gpgtar 8 bit encoding handling on W32.
 +	* common/utf8conv.c (wchar_to_utf8): Factor code out to ...
 +	(wchar_to_cp): new.
 +	(utf8_to_wchar): Factor code out to ...
 +	(cp_to_wchar): new.
 +	(wchar_to_native): New.
 +	(native_to_wchar): New.
 +	* tools/gpgtar-create.c (fillup_entry_w32): Use native_to_wchar.
 +	(scan_directory): Use wchar_to_native.
 +
 +2016-01-26  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: Fix segfault on unsupported curve.
 +	* g10/call-agent.c (learn_status_cb): Don't use NULL for strcmp.
 +
 +	sm: small fix for GCC 6.
 +	* sm/export.c (insert_duptable): Use unsigned 0.
 +
 +2016-01-25  Werner Koch  <wk at gnupg.org>
 +	    Daiki Ueno  <ueno at gnu.org>
 +
 +	gpg: Print PROGRESS status lines during key generation.
 +	* g10/call-agent.c (cache_nonce_status_cb): Rewrite by using
 +	has_leading_keyword.  Handle PROGRESS lines.
 +
 +2016-01-25  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Send PROGRESS status lines to the client.
 +	* agent/gpg-agent.c (struct progress_dispatch_s): New.
 +	(progress_dispatch_list): New.
 +	(main): Register libgcrypt pogress handler.
 +	(agent_libgcrypt_progress_cb): New.
 +	(agent_set_progress_cb): New.
 +	(unregister_progress_cb): New.
 +	(agent_deinit_default_ctrl): Call unregister.
 +	* agent/command.c (progress_cb): New.
 +	(start_command_handler): Register progress callback.
 +
 +	speedo: Allow use of SHA-256 checksums.
 +	* build-aux/getswdb.sh: Add option --find-sha256sum.
 +	* build-aux/speedo.mk (libgpg_error_sha2): New var.  Also for all
 +	other packages.
 +	(SHA2SUM): New.
 +	(SETVARS, SETVARS_W64): Prefer sha256sum over sha1sum.
 +	(installer-from-source): Create swdb fragment.
 +
 +2016-01-22  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Indicate that serial numbers are hexadecimal.
 +	* dirmngr/misc.c (hexify_data): Add arg with_prefix.  Adjust all
 +	callers.
 +	* dirmngr/crlcache.c (cache_isvalid): Print "0x" in front of the S/N.
 +
 +	dirmngr: Provide the keyserver pool name even if there is no CNAME.
 +	* dirmngr/ks-engine-hkp.c (map_host): Fix setting of r_poolname.
 +
 +2016-01-22  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +	    wk at gnupg.org
 +
 +	dirmngr: Use sks-keyservers CA by default for the hkps pool.
 +	* dirmngr/Makefile.am (dist_pkgdata_DATA): Add sks-keyservers.netCA.pem.
 +	* dirmngr/http.c (http_session_new): Add optional arg
 +	intended_hostname and set a default cert.
 +	* dirmngr/ks-engine-hkp.c (send_request): Pass httphost to
 +	http_session_new.
 +
 +2016-01-22  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Allow new user ids with only the mail address.
 +	* g10/keygen.c (ask_user_id): Allow empty name.
 +
 +2016-01-21  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Improve header text of the auto-created revocations.
 +	* g10/revoke.c (gen_standard_revoke): Improve header text for the
 +	file.  Add info output.
 +
 +	gpg: Make --auto-key-retrieve work with dirmngr configured server.
 +	* g10/call-dirmngr.c (gpg_dirmngr_ks_list): Make R_KEYSERVER optional.
 +	* g10/keyserver.c (keyserver_any_configured): New.
 +	(keyserver_put): Remove arg keyserver because this will always receive
 +	opt.keyserver which is anyway used when connecting dirmngr.  Do not
 +	check opt.keyserver.
 +	(keyserver_import_cert): Replace opt.keyserver by
 +	keyserver_any_configured.
 +	* g10/mainproc.c (check_sig_and_print): Ditto.
 +	* g10/import.c (revocation_present): Ditto.
 +	* g10/getkey.c (get_pubkey_byname): Ditto.
 +	* g10/gpgv.c (keyserver_any_configured): Add stub.
 +	* g10/test-stubs.c (keyserver_any_configured): Add stub.
 +
 +2016-01-20  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Silence message about ignoring revoked user ids.
 +	* g10/trustdb.c (tdb_get_validity_core): Print message only in debug
 +	mode.
 +
 +	agent: New option --pinentry-timeout.
 +	* agent/gpg-agent.c (oPinentryTimeout): New.
 +	(opts): Add new option.
 +	(parse_rereadable_options): PArse that option.
 +	(main): Tell gpgconf about this option.
 +	* agent/call-pinentry.c (start_pinentry): Send option to Pinentry.
 +	* tools/gpgconf-comp.c (gc_options_gpg_agent): Add Option.
 +
 +2016-01-19  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Streamline use of error messages in tofu.c.
 +	* g10/tofu.c: Make use of print_further_info to reduce the number of
 +	different error messages to be translated.  Also streamline some
 +	messages.
 +
 +	common: Add substitute code for libgpg-error < 1.22.
 +	* common/util.h (GPG_ERR_DB_CORRUPTED): New.
 +
 +	gpg: Add function print_further_info.
 +	* g10/misc.c (print_further_info): New.
 +
 +2016-01-18  Werner Koch  <wk at gnupg.org>
 +
 +	g10: Improve strings printed by tofu.c.
 +	* g10/tofu.c: Include ttyio.h.  Change many strings to help
 +	translating.  Make use of ngettext wehere needed.
 +	(CONTROL_L): New.
 +	(TIME_AGO_UNIT_SMALL_NAME): Remove this and all similar *_NAME macros.
 +	(time_ago_unit): Remove.
 +	(get_trust): Use tty_prints and cpr_get only for the actual prompt.
 +	Add Ctrl-L hack.
 +	(show_statistics): Use two English strings for singular and plural.
 +
 +	* po/POTFILES.in: Add tofu.c.
 +
 +	gpg: Use "days" in "...newer than..." diagnostics.
 +	* g10/sig-check.c (check_signature_metadata_validity): Use days if
 +	useful.
 +
 +	Use ngettext for some strings.
 +	* scd/app-openpgp.c (build_enter_admin_pin_prompt): Use ngettext for
 +	some diagnostics.
 +	(do_genkey): Ditto.
 +	* g10/keyedit.c (check_all_keysigs, menu_delsig, menu_clean): Ditto.
 +	* g10/keylist.c (print_signature_stats): Ditto.
 +	* g10/keyserver.c (keyserver_refresh): Ditto.
 +	* g10/sig-check.c (check_signature_metadata_validity): Ditto.
 +	* g10/sign.c (do_sign): Ditto.
 +	* g10/trustdb.c (reset_trust_records): Ditto.
 +	(validate_keys): Use a table like diagnostic output.
 +
 +2016-01-15  Werner Koch  <wk at gnupg.org>
 +
 +	kbx,w32: Use shorter retry intervals for keybox_file_rename.
 +	* kbx/keybox-util.c (keybox_file_rename): Restart retry intervals
 +	after 800ms.
 +
 +2016-01-14  Werner Koch  <wk at gnupg.org>
 +
 +	w32: Fix deadlock introduced by keybox_file_rename.
 +	* g10/keyring.c (keyring_lock) [W32]: Flush the close cache before
 +	locking.
 +	* kbx/keybox-init.c (keybox_lock) [W32]: Close the file before
 +	locking.
 +
 +	gpg: Detect race between pubring.gpg and pubring.kbx use.
 +	* g10/keydb.c (maybe_create_keyring_or_box): Detect race condition.
 +
 +	kbx: New function keybox_file_rename to replace rename.
 +	* kbx/keybox-util.c: Include windows.h.
 +	(keybox_file_rename): New.
 +	* kbx/keybox-update.c (rename_tmp_file): Replace remove+rename by
 +	keybox_file_rename.
 +	* g10/keyring.c (rename_tmp_file): Ditto.
 +
 +	kbx: Add function keybox_tmp_names to avoid code duplication.
 +	* kbx/keybox-update.c (create_tmp_file): Move some code to...
 +	* kbx/keybox-util.c (keybox_tmp_names): new.
 +	* g10/keyring.c: Include keybox.h.
 +	(create_tmp_file): Replace parts by keybox_tmp_names.
 +
 +	gpg: Make --list-options show-usage the default.
 +	* g10/gpg.c (main): Add LIST_SHOW_USAGE.
 +
 +2016-01-13  Werner Koch  <wk at gnupg.org>
 +
 +	kbx: Change return type of search functions to gpg_error_t.
 +	* kbx/keybox-search.c (keybox_search_reset): Change return type to
 +	gpg_error_t.
 +	(keybox_search): Ditto.  Also handle GPG_ERR_EOF.
 +	* sm/keydb.c (keydb_search_reset): Ditto.
 +
 +	gpg: Improve error code from lock_all.
 +	* g10/keydb.c (lock_all): Do not clobber RC during failur cleanup.
 +
 +	kbx: Improve and fix keybox_lock.
 +	* kbx/keybox-init.c (keybox_lock): Make sure ERR is initialized.  Get
 +	error codes from dotlock functions.
 +
 +	common: Make sure dotlock functions set a proper ERRNO.
 +	* common/dotlock.c (map_w32_to_errno): New.
 +	(read_lockfile): Return a proper ERRNO.
 +	(dotlock_create_unix): Do not let log functions clobber ERRNO.
 +	(dotlock_take_unix): Ditto.
 +	(dotlock_release_unix): Ditto.
 +	(dotlock_create_w32): Set proper ERRNO.
 +	(dotlock_take_w32): Ditto.
 +	(dotlock_release_w32): Ditto.
 +
 +	kbx: Implement keybox_lock for use by gpg.
 +	* kbx/keybox-defs.h: Include dotlock.h and logging.h.
 +	(CONST_KB_NAME): Remove.  Replace usage by KB_NAME.
 +	(struct keybox_name): Add field "lockhd".
 +	* kbx/keybox-init.c (keybox_register_file): Init LOCKHD.
 +	(keybox_lock): Chnage to return gpg_error_t.  Implement locking.
 +
 +	gpg: Make sure to mark a duplicate registered keybox as primary.
 +	* kbx/keybox-init.c (keybox_register_file): Change interface to return
 +	the token even if the file has already been registered.
 +	* g10/keydb.c (primary_keyring): Rename to primary_keydb.
 +	(maybe_create_keyring_or_box): Change return type to gpg_error_t.
 +	(keydb_add_resource): Ditto. s/rc/err/.
 +	(keydb_add_resource): Mark an already registered as primary.
 +	* sm/keydb.c (maybe_create_keybox): Change return type to gpg_error_t.
 +	(keydb_add_resource): Ditto. s/rc/err/.
 +	(keydb_add_resource): Adjust for changed keybox_register_file.
 +
 +2016-01-13  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	Fix to support git worktree.
 +	* autogen.sh, Makefile.am, doc/Makefile.am: Use -e for testing .git.
 +
 +2016-01-12  Werner Koch  <wk at gnupg.org>
 +
 +	ssh: Accept OpenSSH *cert-v01 key variants.
 +	* agent/command-ssh.c (SPEC_FLAG_WITH_CERT): New.
 +	(ssh_key_types): Add OpenSSH cert types.
 +	(stream_read_string): Allow a dummy read.
 +	(ssh_receive_mpint_list): Pass SPEC by reference.
 +	(ssh_receive_mpint_list): New arg CERT and use it.
 +	(ssh_receive_key): Read certificate into an estream object and modify
 +	parser to make use of that object.
 +
 +2016-01-12  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	common: Fix iobuf API of filter function for alignment.
 +	* common/iobuf.h: Fix comment.
 +
 +	common: Fix iobuf API of filter function for alignment.
 +	* common/iobuf.h (IOBUFCTRL_DESC): Change the call semantics.
 +	* common/iobuf.c (iobuf_desc): Add the second argument DESC.
 +	(print_chain, iobuf_close, do_open, iobuf_sockopen, iobuf_ioctl)
 +	(iobuf_push_filter2, pop_filter, iobuf_write_temp): Change calls
 +	of iobuf_desc.
 +	(file_filter, file_es_filter, sock_filter, block_filter): Fill the
 +	description.
 +	* common/t-iobuf.c (every_other_filter, double_filter): Likewise.
 +	* g10/armor.c, g10/cipher.c, g10/compress-bz2.c, g10/compress.c,
 +	g10/decrypt-data.c, g10/encrypt.c, g10/mdfilter.c, g10/progress.c,
 +	g10/textfilter.c: Likewise.
 +
 +2016-01-11  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix NULL de-ref for ambiguous key check in --export-ssh-keys.
 +	* g10/getkey.c: Allow arg RET_KEYBLOCK to be NULL.
 +
 +2016-01-09  Werner Koch  <wk at gnupg.org>
 +
 +	tools: Remove gpgkey2ssh.
 +	* tools/gpgkey2ssh.c: Remove.
 +	* tools/Makefile.am (bin_PROGRAMS): Ditto.
 +
 +2016-01-08  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Support ECDSA keys with --export-ssh-key.
 +	* g10/export.c (key_to_sshblob): Add hack for ECDSA.
 +
 +	gpg: New command --export-ssh-key.
 +	* g10/export.c: Include membuf.h and host2net.h.
 +	(key_to_sshblob): New.
 +	(export_ssh_key): New.
 +	* g10/gpg.c (aExportSshKey): New.
 +	(opts): Add command.
 +	(main): Implement that command.
 +
 +	gpg: Add an exact search flag to the PK struct.
 +	* g10/getkey.c (merge_selfsigs_subkey): Clear exact flag.
 +	(finish_lookup): Set exact flag.
 +	* g10/packet.h (PKT_public_key): Add field flags.exact.
 +
 +	Print warnings if old daemon versions are used.
 +	* common/status.h (STATUS_WARNING): New.
 +	* g10/call-agent.c (warn_version_mismatch): New.
 +	(start_agent): Call warn function.
 +	* g10/call-dirmngr.c: Include status.h.
 +	(warn_version_mismatch): New.
 +	(create_context): Call warn function.
 +	* sm/call-agent.c (warn_version_mismatch): New.
 +	(start_agent): Call warn function.
 +	(gpgsm_agent_learn): Call warn function.
 +	* sm/call-dirmngr.c (warn_version_mismatch): New.
 +	(prepare_dirmngr): Call warn function.
 +
 +	common: New function compare_version_strings.
 +	* common/stringhelp.c (parse_version_number): New.
 +	(parse_version_string): New.
 +	(compare_version_strings): New.
 +	* common/t-stringhelp.c (test_compare_version_strings): New.
 +	(main): Call test.  Return ERRCOUNT instead of 0.
 +
 +	common: New function get_assuan_server_version.
 +	* common/asshelp.c: Include membuf.h.
 +	(get_assuan_server_version): New.
 +	* g10/call-agent.c (agent_get_version): Use new function.
 +
 +	common: New put_membuf_cb to replace static membuf_data_cb.
 +	* common/membuf.c (put_membuf_cb): New.
 +	* agent/call-scd.c (membuf_data_cb): Remove.  Change callers to use
 +	put_membuf_cb.
 +	* common/get-passphrase.c (membuf_data_cb): Ditto.
 +	* g10/call-agent.c (membuf_data_cb): Ditto.
 +	* sm/call-agent.c (membuf_data_cb): Ditto.
 +
 +2016-01-07  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Return an error code from keygrip_from_pk.
 +	* g10/keyid.c (keygrip_from_pk): Return an error code.
 +
 +	gpg: Avoid warnings about possible NULL deref.
 +	* g10/getkey.c (cache_public_key): Protect deref of CE which actually
 +	can't happen.
 +	* g10/keygen.c (quickgen_set_para): s/sprintf/snprintf/.
 +	* g10/tofu.c (end_transaction, rollback_transaction): Allow NULL for
 +	DB.
 +	* g10/trustdb.c (update_min_ownertrust): Remove useless clearling of
 +	ERR.
 +
 +	gpg: Fix warnings about useless assignments.
 +	* g10/armor.c (parse_hash_header): Remove duplicate var assignment.
 +	* g10/getkey.c (cache_user_id): Ditto.
 +	* g10/keygen.c (ask_curve): Ditto.  This also fixes a small memory
 +	leak.
 +
 +	* g10/keygen.c (proc_parameter_file): Remove useless assignment or
 +	pointer increment.
 +	(generate_keypair): Ditto.
 +	* g10/getkey.c (finish_lookup, lookup): Ditto.
 +	* g10/card-util.c (change_pin): Ditto.
 +	* g10/gpg.c (main) <aVerify>: Ditto.
 +	* g10/import.c (import): Ditto.
 +	(print_import_check): Ditto
 +	* g10/keyring.c (do_copy): Ditto.
 +	* g10/tdbio.c (tdbio_read_record): Ditto.
 +	* g10/trustdb.c (tdb_update_ownertrust): Ditto.
 +	(update_validity): Ditto.
 +
 +	* g10/server.c (cmd_passwd): Remove useless call to skip_options.
 +
 +	sm: Avoid warnings about useless assignments.
 +	* sm/call-dirmngr.c (prepare_dirmngr): Remove setting of ERR.
 +	(unhexify_fpr): Remove useless computation on N.
 +	* sm/certchain.c (do_validate_chain): Remove clearing of RC.  Remove
 +	useless setting of RC.
 +	* sm/fingerprint.c (gpgsm_get_keygrip): Remove setting of RC.
 +	* sm/gpgsm.c (build_list): Replace final stpcpy by strcpy.
 +	* sm/keydb.c (keydb_clear_some_cert_flags): Remove clearing of RC.
 +	* sm/server.c (cmd_getauditlog): Comment unused skip_options.
 +
 +	kbx: Avoid warnings about useless assignments.
 +	* kbx/keybox-dump.c (_keybox_dump_blob): Remove setting of IN_RANGE
 +	and the last increment of P.
 +
 +	gpg: Fix DNS cert lookup returning an URL.
 +	* g10/call-dirmngr.c (dns_cert_status_cb): Store URL status in the URL
 +	param.  The old code was entirely buggy (c+p error).
 +
 +2016-01-06  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	Fix keystrlen to work when OPT.KEYID_FORMAT is KF_DEFAULT.
 +	* g10/keyid.c (keystrlen): If opt.keyid_format is KF_DEFAULT unset,
 +	default to KF_SHORT.
 +	(format_keyid): Default to KF_SHORT, not KF_0xLONG.
 +
 +2016-01-06  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Silence some regression tests.
 +	* g10/test.c (TEST): Print diagnostics only in verbose mode.
 +
 +	gpg: Avoid using an uninitialized SALT on premature EOF.
 +	* g10/parse-packet.c (parse_key): Check for premature end of salt.
 +
 +	gpg: Silence warnings found by static analyzer.
 +	* g10/keyedit.c (change_passphrase): Remove useless init of ANY.
 +	(keyedit_quick_adduid): Remove useless setting of ERR.
 +	* g10/parse-packet.c (parse_key): Remove PKTLEN from condition because
 +	it has been checked before the loop.
 +	(parse_plaintext): Remove useless init of PKTLEN.
 +
 +	kbx: Avoid faulty fclose in an error case.
 +	* kbx/keybox-update.c (blob_filecopy): Do not close an uninitialized
 +	file pointer after a failure to create a temp file.
 +	* kbx/keybox-openpgp.c (next_packet): Remove duplicate assignment of
 +	PKTLEN.
 +
 +	dirmngr: Silence one regression test.
 +	* dirmngr/t-dns-stuff.c (main): Do not print info during standard
 +	"make check".
 +
 +	common: Avoid warnings about useless assignments.
 +	* common/b64enc.c (b64enc_finish): Remove var assignment which is not
 +	used later.
 +	* common/iobuf.c (file_filter): Ditto.
 +	* common/tlv.c (do_find_tlv): Ditto.
 +	* common/userids.c (classify_user_id): Ditto.
 +
 +	tests: Use info and error instead of a plain echo.
 +	* tests/openpgp/4gb-packet.test: Use error and info.
 +
 +	common: Do not deref vars in tests after a fail().
 +	* common/t-convert.c (test_bin2hex): Turn if conditions into if-else
 +	chains to avoid accessing unchecked data.
 +	(test_bin2hexcolon): Ditto.
 +	* common/t-mapstrings.c (test_map_static_macro_string): Ditto.
 +	* common/t-stringhelp.c (test_percent_escape): Ditto.
 +	(test_make_filename_try): Ditto.
 +	(test_make_absfilename_try): Ditto.
 +	* common/t-timestuff.c (test_timegm): Ditto.
 +
 +2016-01-05  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Align notes about minimal keysize with actual checks.
 +	* g10/keygen.c (ask_keysize): Use 768 for the minimal value for DSA in
 +	export mode.  Improve readability.
 +
 +2016-01-05  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: Fix RSA verification for card.
 +	* agent/pksign.c (agent_pksign_do): Use S-exp of public key, instead
 +	of shadowed key.
 +
 +2016-01-04  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Fix double free.
 +	* g10/getkey.c (get_pubkeys): Fix double free.
 +
 +2015-12-24  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: IMPORT_KEY with --force option fix.
 +	* agent/cvt-openpgp.c (convert_from_openpgp_main): Add an option not
 +	to check existing key.
 +	(convert_from_openpgp): Ditto.
 +	(convert_from_openpgp_native): Call convert_from_openpgp_main with
 +	dontcare_exist=0.
 +	* agent/command.c (cmd_import_key): Call with dontcare_exist=force.
 +
 +	g10: Use --force when importing key for bkuptocard.
 +	* g10/call-agent.c (agent_import_key): Add an argument FORCE.
 +	* g10/import.c (transfer_secret_keys): Likewise.
 +	(import_secret_one): Call transfer_secret_keys with FORCE=0.
 +	* g10/keyedit.c (keyedit_menu): Call with FORCE=1.
 +
 +	g10: Remove subcommand checkbkupkey for --key-edit.
 +	* g10/keyedit.c (keyedit_menu): Remove cmdCHECKBKUPKEY support.
 +
 +	g10: Allow relative path for specifying the file for bkuptocard.
 +	* g10/keyedit.c (keyedit_menu): Assume the file is under GNUPGHOME.
 +	Also support tilda expansion.
 +
 +	g10: fix regression of bkuptocard subcommand in --edit-key.
 +	* g10/keyedit.c (keyedit_menu): Call transfer_secret_keys.
 +	* g10/import.c (transfer_secret_keys): Make it global function.
 +	Allow stats==NULL.
 +
 +	agent: Support --force option for IMPORT_KEY.
 +	* agent/command.c (cmd_keywrap_key): New option --force.
 +
 +2015-12-23  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Rename struct pubkey to pukey_s and add pubkey_t.
 +	* g10/keydb.h (struct pubkey): Rename to pubkey_s.
 +	(pubkey_t): New.  Change all struct pubkey_s to use this type.
 +	* g10/getkey.c (get_pubkeys): Rename arg keys to r_keys.
 +
 +	gpg: Simplify status message code from commit b30c15bf.
 +	* g10/keygen.c (card_write_key_to_backup_file): Simplify by using
 +	hexfingerprint.
 +
 +	gpg: Add standard free() semantic to pubkey_free.
 +	* g10/getkey.c (pubkey_free): Check for NULL arg.
 +
 +	gpg: Fix use of assert from commit dc417bf0.
 +	* g10/keydb.c (keydb_update_keyblock): De-ref after the assert.  Use
 +	%zu for size_t.
 +
 +	gpg: Do not translate debug output.
 +	* g10/getkey.c (parse_def_secret_key): Do not make strings passed to
 +	log_debug translatable.
 +
 +2015-12-23  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix commit b30c15bf (again).
 +	* g10/keygen.c (do_generate_keypair): Clear the variable S.
 +
 +2015-12-22  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Fix type.
 +	* g10/keygen.c (card_write_key_to_backup_file): Change n to a size_t.
 +
 +	gpg: Fix error message.
 +	* g10/getkey.c (parse_def_secret_key): Fix error message.
 +
 +	gpg: Don't check for ambiguous keys.
 +	* g10/gpg.c (struct result): Move from here...
 +	* g10/keydb.h (struct pubkey): ... to here.  Update users.
 +	* g10/gpg.c (check_user_ids): Move from here...
 +	* g10/getkey.c (get_pubkeys): ... to here.  Update users.  Use
 +	get_pubkey_byname to look up the keys (this also prunes invalid keys).
 +	(pubkey_free): New function.
 +	(pubkeys_free): New function.
 +	* g10/gpg.c (main): Don't check for ambiguous key specifications.
 +
 +	gpg: Lazily evaluate --default-key.
 +	* g10/gpg.c (main): If --encrypt-to-default-key is specified, don't
 +	add --default-key's value to REMUSR here...
 +	* g10/pkclist.c (build_pk_list): ... do it here.
 +	* tests/openpgp/Makefile.am (TESTS): Add default-key.test.
 +	* tests/openpgp/default-key.test: New file.
 +
 +	gpg: Remove unused parameter.
 +	* g10/pkclist.c (build_pk_list): Remove parameter use, which is always
 +	called set to PUBKEY_USAGE_ENC.  Update callers.
 +
 +	gpg: Improve check for ambiguous keys.
 +	* g10/gpg.c (check_user_ids): When checking for ambiguous keys, ignore
 +	encryption-only keys when a signing key is needed and vice-versa.
 +
 +	gpg: Fix TOCTTOU when updating keyblocks.
 +	* g10/keydb.c (keydb_update_keyblock): Don't replace the record at the
 +	current offset.  After taking the lock, extract the fingerprint from
 +	the keyblock, find it and then replace it.
 +
 +	Only add the user supplied CFLAGS after running any autoconf tests.
 +	* configure.ac: Only add the user supplied CFLAGS after running any
 +	autoconf tests.
 +
 +	gpg: Suppress a warning.
 +	* dirmngr/dns-stuff.c (enable_dns_tormode): Reference new_circuit to
 +	avoid a warning when ADNS is not available.
 +
 +	gpg: Remove dead code.
 +	* kbx/keybox-defs.h (struct keybox_found_s): Remove unused fields
 +	offset and n_packets.
 +
 +	gpg: Display the key that is invalid, not the search description.
 +	* g10/getkey.c (parse_def_secret_key): Display the key that is
 +	invalid, not the search description.
 +
 +	gpg: Mark more options as coming from the config file (when this holds)
 +	* g10/gpg.c (main): When --default-key or --encrypt-to-default-key is
 +	taken from the config file, note this.
 +
 +	gpg: Use enums instead of defines.
 +	* g10/keydb.h (PK_LIST_ENCRYPT_TO): Change from a macro to an enum.
 +	(PK_LIST_HIDDEN): Likewise.
 +	(PK_LIST_CONFIG): Likewise.
 +	(PK_LIST_SHIFT): Likewise.n
 +
 +2015-12-21  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	po: Update Japanese translation.
 +
 +	g10: clean up of headers for card.
 +	* g10/main.h (save_unprotected_key_to_card): Remove.
 +	* g10/options.h (ctapi_driver, pcsc_driver, disable_ccid): Remove.
 +
 +2015-12-21  Werner Koch  <wk at gnupg.org>
 +
 +	common: New file fwddecl.h.
 +	* common/util.h (server_control_s, ctrl_t): Move to ...
 +	* common/fwddecl.h: New file.
 +	* common/call-gpg.h: Replace typedef by fwddecl.h.  Change include
 +	protection macro name.
 +	* common/Makefile.am (common_sources): Add fwddecl.h.
 +
 +2015-12-18  Werner Koch  <wk at gnupg.org>
 +
 +	build: Add required macro for pkg-config.
 +	* configure.ac (PKG_PROG_PKG_CONFIG): New.
 +
 +2015-12-18  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: Remove deprecated internal functions.
 +	* g10/keygen.c (do_ask_passphrase, generate_raw_key)
 +	(gen_card_key_with_backup, save_unprotected_key_to_card): Remove.
 +
 +	g10: Fix a regression for generating card key with backup.
 +	* g10/main.h (receive_seckey_from_agent): Declare.
 +	* g10/keygen.c (card_write_key_to_backup_file): New.
 +	(card_store_key_with_backup): New.
 +	(do_generate_keypair): Create a key on host for encryption key when
 +	backup is requested.  Then, call card_store_key_with_backup.
 +
 +2015-12-17  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: factor out a function for secret key retrieval.
 +	* g10/export.c (receive_seckey_from_agent): New.
 +	(do_export_stream): Use it.
 +
 +2015-12-16  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: When checking for ambiguous keys, ignore invalid keys.
 +	* g10/gpg.c (check_user_ids): When checking for ambiguous keys, ignore
 +	disabled, revoked and expired keys (if appropriate for the provided
 +	option).
 +
 +2015-12-15  Werner Koch  <wk at gnupg.org>
 +
 +	common: Use default_errsource for call-gpg and exectool.
 +	* common/call-gpg.c (my_error_from_syserror, my_error_from_errno): New.
 +	Use these wrappers.
 +	* common/exectool.c (my_error_from_syserror): New.  Use these
 +	wrappers.
 +
 +	gpg: Reduce number of strings to translate.
 +	* g10/getkey.c (parse_def_secret_key): Do not make debug messages
 +	translatable.  Make use of print_reported_error.
 +
 +	gpg: New function to printed a detailed error code.
 +	* g10/misc.c (print_reported_error): New.
 +
 +2015-12-15  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Improve the keyblock cache's transparency.
 +	* kbx/keybox-search.c (keybox_seek): New function.
 +	* g10/keydb.c (keydb_search): When reading from the cache, seek to
 +	just after the cached record.
 +
 +	gpg: Improve the keyblock cache's transparency.
 +	* kbx/keybox-search.c (keybox_offset): New function.
 +	* g10/keydb.c (struct keyblock_cache): Add fields resource and offset.
 +	(keyblock_cache_clear): Reset HD->KEYBLOCK_CACHE.RESOURCE and
 +	HD->KEYBLOCK_CACHE.OFFSET.
 +	(keydb_search): Don't use the cached result if it comes before the
 +	current file position.  When caching an entry, also record the
 +	position at which it was found.
 +
 +	gpg: Use more descriptive names.
 +	* g10/keyring.c (KR_NAME): Rename this...
 +	(KR_RESOURCE): ... to this.  Update users.
 +	(struct keyring_name): Rename this...
 +	(struct keyring_resource): ... to this.  Update users.
 +	(struct off_item): Rename this...
 +	(struct key_present): ... to this.  Update users.
 +	(OffsetHashTable): Rename this...
 +	(key_present_hash_t): ... to this.  Update users.
 +	(kr_offtbl): Rename this...
 +	(key_present_hash): ... to this.  Update users.
 +	(kr_offtbl_ready): Rename this...
 +	(key_present_hash_ready): ... to this.  Update users.
 +	(KEY_PRESENT_HASH_BUCKETS): New define.  Replace use of literals
 +	with this.
 +	(new_offset_item): Rename this...
 +	(key_present_value_new): ... to this.  Update users.
 +	(release_offset_items): Drop dead code.
 +	(new_offset_hash_table): Rename this...
 +	(key_present_hash_new): ... to this.  Update users.
 +	(release_offset_hash_table): Drop dead code.
 +	(lookup_offset_hash_table): Rename this...
 +	(key_present_hash_lookup): ... to this.  Update users.
 +	(update_offset_hash_table): Rename this...
 +	(key_present_hash_update): ... to this.  Drop unused parameter off.
 +	Update users.
 +	(update_offset_hash_table_from_kb): Rename this...
 +	(key_present_hash_update_from_kb): ... to this.  Drop unused parameter
 +	off.  Update users.
 +
 +2015-12-15  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	sm: Handle gcry_pk_encrypt return value.
 +	* sm/encrypt.c (encrypt_dek): Don't ignore failure of gcry_pk_encrypt.
 +
 +2015-12-14  Werner Koch  <wk at gnupg.org>
 +
 +	common: Change license of isascii.c to all-premissive,
 +	* common/isascii.c: Change.
 +
 +	common: Change license of some modules to LGPLv3+/GPLv2+.
 +	* common/status.c: Change from GPLv3 to LGPLv3+/GPLv2+.
 +	* common/status.h: Ditto.
 +	* common/yesno.c: Ditto.
 +	* common/common-defs.h: Ditto.
 +	* common/gettime.h: Ditto.
 +	* common/keyserver.h: Ditto.
 +
 +	common: Change license for exectool to LGPLv3+/GPLv2+.
 +	* common/exectool.c, common/exectool.h: Change license.
 +
 +	common: Rename sh-exectool to exectool.
 +	* common/sh-exectool.c: Rename to exectool.c.
 +	* common/sh-exectool.h: Rename to exectool.h.
 +	* common/Makefile.am (common_sources): Adjust for rename.
 +	* common/exectool.c (sh_exec_tool_stream): Rename to
 +	gnupg_exec-tool-stream.
 +	(sh_exec_tool): Rename to gnupg_exec_tool.
 +	* tools/gpgtar-create.c (gpgtar_create): Adjust for changes.
 +	* tools/gpgtar-extract.c: Adjust for changes.
 +	* tools/gpgtar-list.c: Adjust for changes.
 +
 +2015-12-14  Damien Goutte-Gattat  <dgouttegattat at incenp.org>
 +
 +	gpg: Print ownertrust in TOFU+PGP trust model.
 +	* g10/keyedit.c: Print ownertrust in TOFU+PGP trust model.
 +
 +2015-12-14  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Fix --default-key checks.
 +	* g10/getkey.c (parse_def_secret_key): Don't just check if a secret
 +	key is available for the public key, also consider subkeys.  Also
 +	check that the key has the signing capability, is not revoked, is not
 +	expired and is not disabled.  Print a warning if there was a least one
 +	value passed to --default-key and all were ignored.
 +
 +2015-12-14  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix regression for generating RSA keys on card.
 +	* scd/app-openpgp.c (do_genkey): Strip leading zeros for fingerprint
 +	computation.
 +
 +2015-12-12  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Use a regular type instead of a void* for import stats.
 +	* g10/import.c (struct stats_s): Rename to import_stats_s.  Change all
 +	users.
 +	* g10/main.h (import_stats_t): New.  Change fucntions to use this
 +	instead of a void pointer.
 +
 +	Remove replacements for libgpg-error < 1.21.
 +	* common/util.h: Remove replacement macros for libgpg-error<1.21.
 +	* common/types.h: Ditto.
 +	* common/mischelp.h: Ditto.
 +	* common/t-mapstrings.c: Include t-support.h before stringhelp.h
 +	* common/t-stringhelp.c: Ditto.
 +	* common/t-support.h: Always include gpg-error.h.
 +	* kbx/keybox-search.c: Do not include stringhelp.h so that keybox-defs
 +	comes first.
 +
 +2015-12-11  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Fix buffer overflow.
 +	* g10/keydb.c (keydb_search_desc_dump): Fix buffer overflow.
 +
 +2015-12-11  Justus Winter  <justus at g10code.com>
 +
 +	agent: Improve error handling.
 +	* agent/pksign.c (agent_pksign_do): Improve error handling.
 +
 +	Fix required libgpg-error version.
 +	* configure.ac (NEED_GPG_ERROR_VERSION): We need version 1.21 for the
 +	poll interface.
 +
 +2015-12-11  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Don't error out if a key occurs multiple times in the keyring.
 +	* g10/gpg.c (check_user_ids): Don't error out if a key occurs multiple
 +	times in the keyring.  Instead, print a warning.  When printing out
 +	fingerprint prints, use format_hexfingerprint to format them.
 +
 +2015-12-10  Daniel Hoffend  <dh at dotlan.net>
 +
 +	scd: Fix removal of unplugged usb readers on Windows.
 +	* scd/apdu.c (pcsc_error_to_sw): map PCSC_E_NO_SERVICE and
 +	PCSC_E_SERVICE_STOPPED to the internal SW_HOST_NO_READER error code.
 +
 +2015-12-07  Justus Winter  <justus at g10code.com>
 +
 +	tests: Add some more gpgtar tests.
 +	* tests/openpgp/gpgtar.test: Add more tests.
 +
 +	dirmngr: Initialize http status code.
 +	* dirmngr/ks-action.c (ks_action_search): Initialize 'http_status' as
 +	it is unused if LDAP is used to search for keys.
 +
 +2015-12-04  Daiki Ueno  <ueno at gnu.org>
 +
 +	gpg: Write ERROR status on delete-key cancellation.
 +	* g10/delkey.c (do_delete_key): Write ERROR status code with the error
 +	location "delete_key.secret", when the user cancelled the operation on
 +	Pinentry.
 +
 +2015-12-04  Justus Winter  <justus at g10code.com>
 +
 +	dirmngr: Stricter handling of http error codes.
 +	* dirmngr/ks-action.c (ks_action_search): Only retry if the keyserver
 +	responded with a '404 Not Found'.
 +	* dirmngr/ks-engine-hkp.c (send_request): Return http status code.
 +	(ks_hkp_search): Likewise.
 +	(ks_hkp_{get,put}): Adapt call to 'send_request'.
 +	* dirmngr/ks-engine.h (ks_hkp_search): Update prototype.
 +
 +	dirmngr: Really search all keyservers for patterns.
 +	* dirmngr/ks-action.c (ks_action_search): Search all configured
 +	keyservers for the given patterns.
 +
- 	GnuPG-bug-id: 1038
- 
 +	dirmngr: Handle http status '501 Not Implemented'.
 +	* dirmngr/ks-engine-hkp.c (send_request): Handle status 501 and return
 +	GPG_ERR_NOT_IMPLEMENTED.
 +
- 	GnuPG-bug-id: 1221
- 
 +	tools/gpgtar: Implement symmetric encryption.
 +	* tests/openpgp/gpgtar.test: Add test case.
 +	* tools/gpgtar-create.c (gpgtar_create): Pass '--symmetric' flag to
 +	gpg.
 +	* tools/gpgtar.c (parse_arguments): We do handle the argument now.
 +
 +	tools/gpgtar: Implement signing.
 +	* tests/openpgp/gpgtar.test: Test signing.
 +	* tools/gpgtar-create.c (gpgtar_create): Add 'sign' option, add the
 +	appropriate gpg arguments to implement signing and selecting the local
 +	user.
 +	* tools/gpgtar.c (parse_options): We do handle '--local-user' now.
 +	(main): Handle signing, encrypting, and doing both when creating an
 +	archive.
 +	* tools/gpgtar.h (gpgtar_create): Update prototype.
 +
 +	tools/gpgtar: Use the new exectool helper.
 +	* tools/Makefile.am: gpgtar now requires neither npth nor libassuan.
 +	* tools/gpgtar-create.c (gpgtar_create): Use the new 'sh-exectool'
 +	helper.
 +	* tools/gpgtar-extract.c (gpgtar_extract): Likewise.
 +	* tools/gpgtar-list.c (gpgtar_list): Likewise.
 +	* tools/gpgtar.c (main): Set default gpg program.  Drop the
 +	initialization of npth and libassuan.
 +
 +	common: Add a stream interface to 'sh-exectool'.
 +	* common/sh-exectool.c (struct copy_buffer): Add infrastructure for
 +	copying between streams.
 +	(copy_buffer_{init,shred,do_copy,flush}): New functions.
 +	(sh_exec_tool_stream): Rework 'sh_exec_tool' to operate on streams.
 +	(nop_free): New function.
 +	(sh_exec_tool): Express this in terms of 'sh_exec_tool_stream'.
 +	* common/sh-exectool.h (sh_exec_tool_stream): New prototype.
 +
 +	common: Add header file and build the new code.
 +	* common/Makefile.am (common_sources): Add new files.
 +	* common/sh-exectool.h: New file.
 +
 +2015-12-04  Werner Koch  <wk at gnupg.org>
 +
 +	common: Add code to execute a helper.
 +	* common/sh-exectool.c: New file.
 +
 +	Release 2.1.10.
 +
 +2015-12-04  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	po: Japanese translation.
 +
 +2015-12-04  Werner Koch  <wk at gnupg.org>
 +
 +	speedo,w32: Improve installer.
 +	* build-aux/speedo/w32/inst.nsi (SEC_gnupg): Install dirmngr.conf and
 +	distsigkey.gpg.
 +	(un.gnupglast): Stop dirmngr.
 +
 +	gpg: Do not pre-check keys given on the command line.
 +	* g10/keydb.h (PK_LIST_ENCRYPT_TO, PK_LIST_HIDDEN, PK_LIST_CONFIG)
 +	(PK_LIST_SHIFT): New.
 +	* g10/pkclist.c (build_pk_list): Use them here.
 +	* g10/gpg.c (check_user_ids, main): Ditto.
 +
 +	* g10/gpg.c (main): Set PK_LIST_CONFIG for REMUSR and LOCUSR.
 +	(check_user_ids): Skip check for command line specified options.
 +
 +	dirmngr: Add command to print the resolver version.
 +	* dirmngr/server.c (cmd_getinfo): Add sub-command "dnsinfo".
 +
 +	gpg: Allow "help" as value for --tofu-policy.
 +	* g10/gpg.c (parse_tofu_policy): Add keyword "help".
 +	(parse_tofu_db_format): Ditto.
 +
 +	Do not translate messages printed with log_debug.
 +	* common/asshelp.c (start_new_gpg_agent): Do not i18n string.
 +	(start_new_dirmngr): Ditto.
 +	* g10/mainproc.c (proc_encrypted): Ditto.  Print only if debug is
 +	enabled.
 +
 +2015-12-04  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix for removing the prefix.
 +	* scd/app-openopg.c (do_decipher): Fix the condition.
 +
 +	scd: Simplify saving application context.
 +	* scd/app.c (lock_table): Remove LAST_APP field.
 +	(lock_reader, app_dump_state, application_notify_card_reset)
 +	(release_application): Follow the change.
 +	(check_conflict): New.
 +	(check_application_conflict): Lock the slot and call check_conflict.
 +	(select_application): Call check_conflict and not use LAST_APP.
 +
 +	scd: More fix for Curve25519 prefix handling.
 +	* scd/app-openpgp.c (do_decipher): Handle trancated cipher text.
 +	Also fix xfree bug introduced.
 +
 +2015-12-03  Werner Koch  <wk at gnupg.org>
 +
 +	scd: Another fix for Curve25519 prefix handling.
 +	* scd/app-openpgp.c (do_decipher): Check 0x02 also for 16+1 byte long
 +	INDATA.
 +	(do_decipher): Fix integer arithmetic in void pointer.
 +	(do_decipher): Add missing memcpy.
 +
 +	build: Avoid dependecy problems in "make distcheck".
 +	* doc/Makefile.am (gnupg.texi): Depend on defs.inc.
 +
 +	build: Change how caller provided CFLAGS are used by configure.
 +	* configure.ac: Append instead of prepend caller provided CFLAGS.
 +
 +	gpg: Add variant of 'key "%s" not found: %s' error message.
 +	* g10/gpg.c (check_user_ids): Change error message.
 +	* g10/delkey.c (do_delete_key): Ditto.
 +
 +	gpg: Make keyidlist more robust in case of errors.
 +	* g10/keyserver.c (keyidlist): Clear *KLIST on error.
 +
 +	gpg: Take care of keydb_new returning NULL.
 +	* g10/keydb.c (keydb_new): Print an error message if needed.  Also use
 +	xtrycalloc because we return an error anyway.
 +	* g10/delkey.c (do_delete_key): Handle error retruned by keydb_new.
 +	* g10/export.c (do_export_stream): Ditto.
 +	* g10/getkey.c (get_pubkey): Ditto.
 +	(get_pubkey_fast): Ditto.
 +	(get_pubkeyblock): Ditto.
 +	(get_seckey): Ditto.
 +	(key_byname): Ditto.
 +	(get_pubkey_byfprint): Ditto.
 +	(get_pubkey_byfprint_fast): Ditto.
 +	(parse_def_secret_key): Ditto.
 +	(have_secret_key_with_kid): Ditto.
 +	* g10/import.c (import_one): Ditto.
 +	(import_revoke_cert): Ditto.
 +	* g10/keyedit.c (keyedit_quick_adduid): Ditto.
 +	* g10/keygen.c (quick_generate_keypair): Ditto.
 +	(do_generate_keypair): Ditto.
 +	* g10/trustdb.c (validate_keys): Ditto.
 +	* g10/keyserver.c (keyidlist): Ditto.
 +	* g10/revoke.c (gen_desig_revoke): Ditto.
 +	(gen_revoke): Ditto.
 +	* g10/gpg.c (check_user_ids): Ditto.
 +	(main): Do not print an error message for keydb_new error.
 +	* g10/keylist.c (list_all): Use actual error code returned by
 +	keydb_new.
 +
 +	* g10/t-keydb-get-keyblock.c (do_test): Abort on keydb_new error.
 +	* g10/t-keydb.c (do_test): Ditto.
 +
 +	* g10/keyring.c (keyring_new): Actually return an error so that the
 +	existing keydb_new error checking makes sense for a keyring resource.
 +	(keyring_rebuild_cache): Take care of keyring_new returning an error.
 +
 +	gpg: Change some error messages.
 +	* g10/getkey.c (parse_def_secret_key): Change error message.  Replace
 +	log_debug by log_info.
 +	* g10/gpg.c (check_user_ids): Make function static.  Change error
 +	messages.
 +	(main): Change error messages.
 +	* g10/revoke.c (gen_revoke): Ditto.
 +
 +2015-12-03  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix "Conflicting usage" bug.
 +	* scd/apdu.c (apdu_close_reader): Call CLOSE_READER method even if we
 +	  got an error from apdu_disconnect.
 +	* scd/app-common.h (no_reuse): Remove.
 +	* scd/app.c (application_notify_card_reset): Deallocate APP here.
 +	(select_application, release_application): Don't use NO_REUSE.
 +
 +	scd: Fix for Curve25519 prefix handling.
 +	* scd/app-openpgp.c (do_decipher): More condition for AES decipher.
 +	  Handle the prefix in cipher text.  Always add the prefix in result.
 +
 +2015-12-03  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Use the matching key if the search description is exact.
 +	* g10/gpg.c (check_user_ids): If the search description is for an
 +	exact match (a keyid or fingerprint that ends in '!'), then use the
 +	matching key, not the primary key.
 +	* tests/openpgp/Makefile.am (TESTS): Add use-exact-key.test.
 +	(priv_keys): Add privkeys/00FE67F28A52A8AA08FFAED20AF832DA916D1985.asc,
 +	privkeys/1DF48228FEFF3EC2481B106E0ACA8C465C662CC5.asc,
 +	privkeys/A2832820DC9F40751BDCD375BB0945BA33EC6B4C.asc,
 +	privkeys/ADE710D74409777B7729A7653373D820F67892E0.asc and
 +	privkeys/CEFC51AF91F68A2904FBFF62C4F075A4785B803F.asc.
 +	(sample_keys): Add
 +	samplekeys/E657FB607BB4F21C90BB6651BC067AF28BC90111.asc.
 +	* tests/openpgp/privkeys/00FE67F28A52A8AA08FFAED20AF832DA916D1985.asc:
 +	New file.
 +	* tests/openpgp/privkeys/1DF48228FEFF3EC2481B106E0ACA8C465C662CC5.asc:
 +	New file.
 +	* tests/openpgp/privkeys/A2832820DC9F40751BDCD375BB0945BA33EC6B4C.asc:
 +	New file.
 +	* tests/openpgp/privkeys/ADE710D74409777B7729A7653373D820F67892E0.asc:
 +	New file.
 +	* tests/openpgp/privkeys/CEFC51AF91F68A2904FBFF62C4F075A4785B803F.asc:
 +	New file.
 +	* tests/openpgp/samplekeys/E657FB607BB4F21C90BB6651BC067AF28BC90111.asc:
 +	New file.
 +	* tests/openpgp/use-exact-key.test: New file.
 +	* tests/openpgp/version.test: Install the new private keys.
 +
 +2015-12-02  Werner Koch  <wk at gnupg.org>
 +
 +	build: Require at least Libassuan 2.4.1.
 +	* configure.ac (NEED_LIBASSUAN_VERSION): Set to 2.4.1.
 +	* agent/gpg-agent.c (create_server_socket): Remove check for
 +	libassuan >= 2.3.0 and >= 2.1.4.
 +	(main): Remove check for libassuan >= 2.1.4.
 +	* scd/scdaemon.c (create_server_socket): Remove check for
 +	libassuan >= 2.1.4.
 +	* dirmngr/dirmngr.c (set_tor_mode): Remove check for
 +	libassuan >= 2.3.0.
 +	* dirmngr/http.c (http_raw_connect, send_request): Remove checks for
 +	libassuan >= 2.3.0.
 +
 +2015-12-02  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Improve documentation.
 +	* g10/tofu.c (initdb): Improve documentation.
 +
 +	gpg: Fix type mismatch resulting in a buffer overflow.
 +	* g10/tofu.c (record_binding): Change policy_old's type from an enum
 +	tofu_policy to a long: this variable is passed by reference and a long
 +	is expected.
 +
 +2015-12-02  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Switch to an onion address if Tor is running.
 +	* dirmngr/dirmngr.h (opt): Turn field 'keyserver' into an strlist.
 +	* dirmngr/dirmngr.c (parse_rereadable_options): Allow multiple
 +	--keyserver options.
 +	* dirmngr/server.c (server_local_s): Add field 'tor_state'.
 +	(release_uri_item_list): New.
 +	(release_ctrl_keyservers): Use it.
 +	(start_command_handler): Release list of keyservers.
 +	(is_tor_running): New.
 +	(cmd_getinfo): Re-implement "tor" subcommand using new fucntion.
 +	(ensure_keyserver): Rewrite.
 +	* g10/dirmngr-conf.skel: Add two keyserver options.
 +
 +	http: Enhance parser to detect .onion addresses.
 +	* dirmngr/http.h (parsed_uri_s): Add flag 'onion'.
 +	* dirmngr/http.c (do_parse_uri): Set that flag.
 +	* dirmngr/t-http.c (main): Print flags.
 +
 +2015-12-02  Neal H. Walfield  <neal at g10code.com>
 +
 +	common,gpg: Fix processing of search descriptions ending in '!'.
 +	* g10/gpg.c (check_user_ids): If the search description describes a
 +	keyid or fingerprint and ends in a '!', include the '!' in the
 +	rewritten description.
 +	* common/userids.c (classify_user_id): Accept keyids and fingerprints
 +	ending in '!'.
 +
 +2015-12-01  Justus Winter  <justus at g10code.com>
 +
 +	dirmngr: Improve error handling.
 +	* dirmngr/dns-stuff.c (getsrv): Avoid looking at 'header' before
 +	checking for errors, but silently ignore errors when looking up SRV
 +	records.
 +
 +2015-12-01  Werner Koch  <wk at gnupg.org>
 +
 +	build: Let configure show the the status of Tor support.
 +	* configure.ac (show_tor_support): New
 +
 +2015-11-30  Werner Koch  <wk at gnupg.org>
 +
 +	doc: Make make distcheck work again.
 +	* doc/Makefile.am (DISTCLEANFILES): Add gpgkey2ssh.1
 +
 +	yat2m: Add keyword @url.
 +	* doc/yat2m.c (proc_texi_cmd): Add keyword @url.
 +
 +	doc: Build man pages with the same date as the info files.
 +	* doc/Makefile.am (yat2m-stamp): Use option --date.
 +
 +	yat2m: New option --date.
 +	* doc/yat2m.c (opt_date): new.
 +	(isodatestring): Use it if set.
 +	(main): New option --date.
 +
 +2015-11-27  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Avoid extra translation strings.
 +	* g10/keyedit.c (menu_expire): Use only one prompt.
 +
 +	kbx: Include gpg-error prior to mischelp.h.
 +	* kbx/keybox-init.c: Change order of includes.
 +
 +	gpg,w32: Fix a format string error.
 +	* g10/keyring.c (keyring_search): Fix format string for off_t.
 +
 +	Silence compiler warnings related to not using assuan_fd_t.
 +	* common/call-gpg.c (start_gpg): Use assuan_fd_t.  Note that the
 +	declaration was already fixed by a previous change.
 +	* dirmngr/server.c (cmd_getinfo): Use assuan_fd_t.
 +
 +	Avoid incompatible pointer assignment warnings on Windows.
 +	* common/logging.c (fun_writer): Use gpgrt_ssize_t instead of ssize_t.
 +	* dirmngr/server.c (data_line_cookie_write): Ditto.
 +	* sm/certdump.c (format_name_writer): Ditto.
 +	* sm/server.c (data_line_cookie_write): Ditto.
 +	* dirmngr/http.c (cookie_read, cookie_write): Ditto.
 +
 +	dirmngr: Avoid a declarations after statements.
 +	* tools/gpgtar.c (parse_arguments): Use a block for a local varibale
 +	definition.
 +
 +	dirmngr: Avoid casting away a const from an char**.
 +	* dirmngr/ldap.c (start_cert_fetch_ldap): Do not use pointers from
 +	global variables.
 +
 +	dirmngr: Allow testing for a running Tor via "getinfo tor".
 +	* dirmngr/server.c (cmd_getinfo): Print an S line if Tor is not
 +	running.
 +
 +2015-11-26  Werner Koch  <wk at gnupg.org>
 +
 +	g13: Fix commit 1a045b13.
 +	* g13/g13.c (main): Use existsing function.
 +
 +	common: Fix off-by-one access in the new format_text.
 +	* common/stringhelp.c (format_text): Use existsing fucntion to trim
 +	trailing spaces.  Fix off-by-one access.
 +
 +	dirmngr: Improve output of "getinfo tor".
 +	* dirmngr/server.c (cmd_getinfo): Print a message along with OK.
 +
 +	dirmngr: Let Libassuan employ nPth wrappers for connect.
 +	* dirmngr/http.c (my_unprotect, my_protect): Remove.
 +	(connect_server): Do not use these wrappers.
 +
 +2015-11-26  Justus Winter  <justus at g10code.com>
 +
 +	tools/gpgtar: Add '--dry-run'.
 +	* tools/gpgtar-extract.c (extract_{regular,directory}): Honor
 +	'--dry-run'.
 +	* tools/gpgtar.c (enum cmd_and_opt_values): New value.
 +	(opts): Add '--dry-run'.
 +	(parse_arguments): Handle '--dry-run'.
 +	* tools/gpgtar.h (opt): Add field 'dry_run'.
 +
 +	tools/gpgtar: Handle '--gpg-args'.
 +	* tools/gpgtar-create.c (gpgtar_create): Use given arguments.
 +	* tools/gpgtar-extract.c (gpgtar_extract): Likewise.
 +	* tools/gpgtar-list.c (gpgtar_list): Likewise.
 +	* tools/gpgtar.c (enum cmd_and_opt_values): New value.
 +	(opts): Add 'gpg-args'.
 +	(parse_arguments): Handle arguments.
 +	* tools/gpgtar.h (opt): Add field 'gpg_arguments'.
 +	* tests/openpgp/gpgtar.test: Simplify accordingly.
 +
 +	common: Make the GPG arguments configurable in call-gpg.
 +	* common/call-gpg.c (start_gpg): Add parameter 'gpg_arguments'.
 +	(_gpg_encrypt, gpg_encrypt_blob, gpg_encrypt_stream): Likewise.
 +	(_gpg_decrypt, gpg_decrypt_blob, gpg_decrypt_stream): Likewise.
 +	* common/call-gpg.h: Adapt prototypes.
 +	* g13/create.c (encrypt_keyblob): Adapt callsite.
 +	* g13/g13-common.h (opt): Add field 'gpg_arguments'.
 +	* g13/g13.c (main): Construct default arguments.
 +	* g13/mount.c (decrypt_keyblob): Adapt callsite.
 +	* tools/gpgtar-create.c (gpgtar_create): Likewise.
 +	* tools/gpgtar-extract.c (gpgtar_extract): Likewise.
 +	* tools/gpgtar-list.c (gpgtar_list): Likewise.
 +
 +	tools/gpgtar: Handle '--tar-args' for compatibility with gpg-zip.
 +	* tools/gpgtar.c (enum cmd_and_opt_values): New value.
 +	(opts): Add new group for tar options, rearrange a little, add
 +	'--tar-args'.
 +	(tar_opts): New variable.
 +	(shell_parse_stringlist): New function.
 +	(shell_parse_argv): Likewise.
 +	(parse_arguments): Add option argument, handle '--tar-args'.
 +	(main): Fix invokation of 'parse_arguments'.
 +	* tests/openpgp/gpgtar.test: Simplify decryption.
 +
 +	tools/gpgtar: Rework argument parsing.
 +	* tools/gpgtar.c (main): Move argument parsing into its own function.
 +
 +2015-11-25  Justus Winter  <justus at g10code.com>
 +
 +	tests: Add tests for gpgtar and gpg-zip.
 +	* tests/openpgp/Makefile.am (TESTS): Add new file.
 +	* tests/openpgp/gpgtar.test: New file.
 +
 +	tools/gpgtar: Handle '--directory' argument.
 +	* tools/gpgtar-extract.c (gpgtar_extract): Only generate a directory
 +	name if none is given via arguments.
 +	* tools/gpgtar.c (enum cmd_and_opt_values): New constant.
 +	(opts): Add argument.
 +	(main): Parse argument.
 +	* tools/gpgtar.h (opt): New field 'directory'.
 +
 +	tools/gpgtar: Handle '--gpg' argument.
 +	* tools/gpgtar-create.c (gpgtar_create): Use given gpg program.
 +	* tools/gpgtar-extract.c (gpgtar_extract): Likewise.
 +	* tools/gpgtar-list.c (gpgtar_list): Likewise.
 +	* tools/gpgtar.c (enum cmd_and_opt_values): New constant.
 +	(opts): Add argument.
 +	(main): Handle argument.
 +	* tools/gpgtar.h (opt): Add field 'gpg_program'.
 +
 +	tools/gpgtar: Improve error handling.
 +	* tools/gpgtar-create.c (gpgtar_create): Return an error code, fix
 +	error handling.
 +	* tools/gpgtar-extract.c (gpgtar_extract): Likewise.
 +	* tools/gpgtar-list.c (read_header): Return an error code.
 +	(gpgtar_list): Return an error code, fix error handling.
 +	(gpgtar_read_header): Return an error code.
 +	* tools/gpgtar.c: Add missing include.
 +	(main): Print an generic error message if a command failed and no
 +	error has been printed yet.
 +	* tools/gpgtar.h (gpgtar_{create,extract,list,read_header}): Fix the
 +	prototypes accordingly.
 +
 +	tools: Add encryption and decryption support to gpgtar.
 +	* tools/Makefile.am: Amend CFLAGS and LDADD.
 +	* tools/gpgtar-create.c (gpgtar_create): Add encrypt flag and encrypt
 +	stream if requested.
 +	* tools/gpgtar-extract.c (gpgtar_extract): Likewise for decryption.
 +	* tools/gpgtar-list.c (gpgtar_list): Likewise.
 +	* tools/gpgtar.c (main): Initialize npth and assuan.  Parse recipient
 +	and local user, and note which flags are currently ignored.  Adapt
 +	calls to gpgtar_list and friends.
 +	(tar_and_encrypt): Drop stub function and prototype.
 +	(decrypt_and_untar): Likewise.
 +	(decrypt_and_list): Likewise.
 +	* tools/gpgtar.h (gpgtar_{create,extract,list}): Add encryption or
 +	decryption argument.
 +
 +	common: Add stream interface to call-pgp.
 +	* common/call-gpg.c (struct writer_thread_parms): Add field 'stream'.
 +	(writer_thread_main): Support reading from a stream.
 +	(start_writer): Add stream argument.
 +	(struct reader_thread_parms): Add field 'stream'.
 +	(reader_thread_main): Support writing to a stream.
 +	(start_reader): Add stream argument.
 +	(_gpg_encrypt): Add stream api.
 +	(gpg_encrypt_blob): Adapt accordingly.
 +	(gpg_encrypt_stream): New function.
 +	(_gpg_decrypt): Add stream api.
 +	(gpg_decrypt_blob): Adapt accordingly.
 +	(gpg_decrypt_stream): New function.
 +	* common/call-gpg.h (gpg_encrypt_stream): New prototype.
 +	(gpg_decrypt_stream): Likewise.
 +
 +	common: Refactor the call-gpg code.
 +	* common/call-gpg.c (gpg_{en,de}crypt_blob): Move most of the code
 +	into two new functions, _gpg_encrypt and _gpg_decrypt.
 +
 +	g13: Move 'call-gpg.c' to common.
 +	* common/Makefile.am (common_sources): Add files.
 +	* g13/call-gpg.c: Move to 'common' and adapt slightly.  Add a
 +	parameter to let callees override the gpg program to execute.
 +	* g13/call-gpg.h: Likewise.
 +	* g13/Makefile.am (g13_SOURCES): Drop files.
 +	* g13/create.c (encrypt_keyblob): Hand in the gpg program to execute.
 +	* g13/mount.c (decrypt_keyblob): Likewise.
 +
 +2015-11-24  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: When comparing keyids, use the keyid, not the fingerprint's suffix.
 +	* g10/keyedit.c (menu_select_key): Use spacep and hexdigitp instead of
 +	inline tests.  Don't compare P to the suffix of the fingerprint.  If P
 +	appears to be a keyid, do an exact compare against the keyid.  If it
 +	appears to be a fingerprint, do an exact compare against the
 +	fingerprint.
 +
 +2015-11-23  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Reflow long texts.
 +	* common/stringhelp.c (format_text): New function.
 +	* common/t-stringhelp.c (stresc): New function.
 +	(test_format_text): New function.  Test format_text.
 +	* g10/tofu.c (get_trust): Use format_text to reflow long texts.
 +	(show_statistics): Likewise.
 +
 +	common: Extend utf8_charcount to include the string's length.
 +	* common/stringhelp.c (utf8_charcount): Take additional parameter,
 +	len.  Process at most LEN bytes.
 +
 +2015-11-23  Justus Winter  <justus at g10code.com>
 +
 +	dirmngr: Fix http lookups when libadns is used.
 +	* dirmngr/dns-stuff.c (resolve_name_adns): Fill in the port.
 +
 +	dirmngr: Fix SRV record lookups when using the system resolver.
 +	* dirmngr/dns-stuff.c (getsrv): Fix error handling.
 +
 +	dirmngr: Honor ports specified in SRV records.
 +	* dirmngr/ks-engine-hkp.c (struct hostinfo_s): New field 'port'.
 +	(create_new_hostinfo): Initialize 'port'.
 +	(add_host): Add host parameter and update the hosttable entry.
 +	(map_host): Return port if known, adjust calls to 'add_host'.
 +	(make_host_part): Let 'map_host' specify the port if known.
 +
 +	dirmngr: Support hkp server pools using SRV records.
 +	* dirmngr/ks-engine-hkp.c (map_host): Handle SRV records.
 +
 +	dirmngr: Refactor 'map_host'.
 +	* dirmngr/ks-engine-hkp.c (add_host): New function.
 +	(map_host): Use the new function.
 +
 +	dirmngr: Fix pool detection.
 +	* dirmngr/ks-engine-hkp (arecords_is_pool): Fix counting IP addresses.
 +
 +	dirmngr: Refactor 'map_host'.
 +	* dirmngr/ks-engine-hkp.c (arecords_is_pool): New function.
 +	(map_host): Use the new function.
 +
 +	dirmngr: Start dirmngr on demand.
 +	* common/asshelp.h: Include 'util.h'.
 +	* dirmngr/dirmngr-client.c (main): Use 'start_new_dirmngr' to connect
 +	to the dirmngr.
 +	(start_dirmngr): Drop now unused declaration and function.
 +
 +2015-11-23  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: If sqlite is not available, don't build things depending on it.
 +	* configure.ac: Define the automake conditional SQLITE3.
 +	* tests/openpgp/Makefile.am (TESTS): Move the sqlite3 dependent tests
 +	to...
 +	(sqlite3_dependent_tests): ... this new variable.  If SQLITE3 is not
 +	defined, then clear this variable.
 +
 +	gpg: Allow updating the expiration time of multiple subkeys at once.
 +	* g10/keyedit.c (menu_expire): Allow updating the expiration time of
 +	multiple subkeys at once.
 +
 +	gpg: Don't crash if key is not passed an argument.
 +	* g10/keyedit.c (menu_select_key): Don't crash if P is NULL.
 +
 +2015-11-20  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Fail if the search description passed to --gen-revoke is ambiguous.
 +	* g10/revoke.c (gen_revoke): Error out if the search description is
 +	ambiguous.
 +
 +	gpg: Refactor print_seckey_info.
 +	* g10/keylist.c (print_seckey_info): Break formatting functionality
 +	into...
 +	(format_seckey_info): ... this new function.
 +
 +	gpg: Improve an error message.
 +	* g10/revoke.c (gen_revoke): Provide a more descriptive error message
 +	if searching for a key fails.
 +
 +2015-11-19  Justus Winter  <justus at g10code.com>
 +
 +	dirmngr: Improve error handling.
 +	* dirmngr/crlcache.c (crl_cache_cert_isvalid): Add missing break.
 +
 +	dirmngr: Fix memory leak.
 +	* dirmngr/ldap.c (start_cert_fetch_ldap): Avoid leaking all malloc'ed
 +	arguments.
 +
 +	agent: Improve error handling.
 +	* agent/trustlist.c (istrusted_internal): Initialize 'err'.
 +
 +	common: Avoid undefined behavior.
 +	* common/iobuf.c (iobuf_esopen): Initialize 'len' as 'file_es_filter'
 +	will make use of it.
 +
 +	g10: Avoid undefined behavior.
 +	* g10/trust.c (clean_one_uid): Avoid a computation involving an
 +	uninitialized value.
 +
 +	scd: Improve error handling.
 +	* scd/app-openpgp.c (get_public_key): Improve error handling.
 +
 +2015-11-18  Justus Winter  <justus at g10code.com>
 +
 +	dirmngr: Gracefully handle premature termination of TLS streams.
 +	* dirmngr/http.c (close_tls_session): New function.
 +	(session_unref): Use the new function to close the TLS stream.
 +	(cookie_read): If the stream terminated prematurely, close it and
 +	return a short read.
 +
 +2015-11-17  Neal H. Walfield  <neal at g10code.com>
 +	    Michael Mönch  <michael.moench at marktjagd.de>
 +
 +	tools: Fix option parsing for gpg-zip.
 +	* tools/gpg-zip.in: Correctly set GPG when --gpg is specified.
 +	Correctly set TAR when --tar is specified.  Pass TAR_ARGS to tar.
 +
 +2015-11-17  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Allow selecting subkeys using a keyid.
 +	* g10/keyedit.c (menu_select_key): Take an additional argument, p.
 +	Update callers.  If P is a hex string, then assume that P is a key id
 +	or fingerprint and select subkeys with matching key ids or
 +	fingerprints.
 +	* doc/gpg.texi: Update documentation for the key subcommand.
 +
 +2015-11-17  Justus Winter  <justus at g10code.com>
 +
 +	dirmngr: Fix specifying keyservers by IP address.
 +	* dirmngr/ks-engine-hkp.c (map_host): Update the original 'hosttable'
 +	entry instead of creating another one.
 +
 +2015-11-17  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Change keydb_search to not return legacy keys.
 +	* g10/keyring.c (keyring_search): Take new argument, ignore_legacy.
 +	If set, skip any legacy keys.  Update callers.
 +	* g10/keydb.c (keydb_search): Skip any legacy keys.
 +	(keydb_search_first): Don't skip legacy keys.  Treat them
 +	as an error.
 +	(keydb_search_next): Likewise.
 +	(keydb_search_fpr): Likewise.
 +	* g10/export.c (do_export_stream): Likewise.
 +	* g10/getkey.c (lookup): Likewise.
 +	(have_secret_key_with_kid): Likewise.
 +	* g10/keylist.c (list_all): Likewise.
 +	(keyring_rebuild_cache): Likewise.
 +	* g10/keyserver.c (keyidlist): Likewise.
 +	* g10/trustdb.c (validate_key_list): Likewise.
 +
 +	gpg: Correctly handle an error.
 +	* g10/keyring.c (keyring_search): If a compare function returns an
 +	error, treat it as an error.
 +
 +	gpg: Correctly handle keyblocks followed by legacy keys.
 +	* g10/keyring.c (keyring_get_keyblock): If we encounter a legacy
 +	packet after already having some non-legacy packets, then treat the
 +	legacy packet as a keyblock boundary, not as part of the keyblock.
 +	* g10/t-keydb-get-keyblock.c: New file.
 +	* g10/t-keydb-get-keyblock.gpg: New file.
 +	* g10/Makefile.am (EXTRA_DIST): Add t-keydb-get-keyblock.gpg.
 +	(module_tests): Add t-keydb-get-keyblock.
 +	(t_keydb_get_keyblock_SOURCES): New variable.
 +	(t_keydb_get_keyblock_LDADD): Likewise.
 +
 +	gpg: Make debugging search descriptors easier.
 +	* g10/keydb.c (dump_search_desc): Rename from this...
 +	(keydb_search_desc_dump): ... to this.  Only process a single search
 +	descriptor.  Improve output.  Don't mark as static.  Update callers.
 +
 +	gpg: Add function format_keyid.
 +	* g10/options.h (opt.keyid_format): Add new value KF_DEFAULT.
 +	* g10/keyid.c (format_keyid): New function.
 +	(keystr): Use it.
 +
 +	gpg: Use a more appropriate error code.
 +	* g10/gpg.c (check_user_ids): Return a more appropriate error code if
 +	a user id is ambiguous.
 +
 +2015-11-17  Justus Winter  <justus at g10code.com>
 +
 +	Fix typos found using codespell.
 +	* agent/cache.c: Fix typos.
 +	* agent/call-pinentry.c: Likewise.
 +	* agent/call-scd.c: Likewise.
 +	* agent/command-ssh.c: Likewise.
 +	* agent/command.c: Likewise.
 +	* agent/divert-scd.c: Likewise.
 +	* agent/findkey.c: Likewise.
 +	* agent/gpg-agent.c: Likewise.
 +	* agent/w32main.c: Likewise.
 +	* common/argparse.c: Likewise.
 +	* common/audit.c: Likewise.
 +	* common/audit.h: Likewise.
 +	* common/convert.c: Likewise.
 +	* common/dotlock.c: Likewise.
 +	* common/exechelp-posix.c: Likewise.
 +	* common/exechelp-w32.c: Likewise.
 +	* common/exechelp-w32ce.c: Likewise.
 +	* common/exechelp.h: Likewise.
 +	* common/helpfile.c: Likewise.
 +	* common/i18n.h: Likewise.
 +	* common/iobuf.c: Likewise.
 +	* common/iobuf.h: Likewise.
 +	* common/localename.c: Likewise.
 +	* common/logging.c: Likewise.
 +	* common/openpgp-oid.c: Likewise.
 +	* common/session-env.c: Likewise.
 +	* common/sexputil.c: Likewise.
 +	* common/sysutils.c: Likewise.
 +	* common/t-sexputil.c: Likewise.
 +	* common/ttyio.c: Likewise.
 +	* common/util.h: Likewise.
 +	* dirmngr/cdblib.c: Likewise.
 +	* dirmngr/certcache.c: Likewise.
 +	* dirmngr/crlcache.c: Likewise.
 +	* dirmngr/dirmngr-client.c: Likewise.
 +	* dirmngr/dirmngr.c: Likewise.
 +	* dirmngr/dirmngr_ldap.c: Likewise.
 +	* dirmngr/dns-stuff.c: Likewise.
 +	* dirmngr/http.c: Likewise.
 +	* dirmngr/ks-engine-hkp.c: Likewise.
 +	* dirmngr/ks-engine-ldap.c: Likewise.
 +	* dirmngr/ldap-wrapper.c: Likewise.
 +	* dirmngr/ldap.c: Likewise.
 +	* dirmngr/misc.c: Likewise.
 +	* dirmngr/ocsp.c: Likewise.
 +	* dirmngr/validate.c: Likewise.
 +	* g10/encrypt.c: Likewise.
 +	* g10/getkey.c: Likewise.
 +	* g10/gpg.c: Likewise.
 +	* g10/gpgv.c: Likewise.
 +	* g10/import.c: Likewise.
 +	* g10/keydb.c: Likewise.
 +	* g10/keydb.h: Likewise.
 +	* g10/keygen.c: Likewise.
 +	* g10/keyid.c: Likewise.
 +	* g10/keylist.c: Likewise.
 +	* g10/keyring.c: Likewise.
 +	* g10/mainproc.c: Likewise.
 +	* g10/misc.c: Likewise.
 +	* g10/options.h: Likewise.
 +	* g10/packet.h: Likewise.
 +	* g10/parse-packet.c: Likewise.
 +	* g10/pkclist.c: Likewise.
 +	* g10/pkglue.c: Likewise.
 +	* g10/plaintext.c: Likewise.
 +	* g10/server.c: Likewise.
 +	* g10/sig-check.c: Likewise.
 +	* g10/sqlite.c: Likewise.
 +	* g10/tdbio.c: Likewise.
 +	* g10/test-stubs.c: Likewise.
 +	* g10/tofu.c: Likewise.
 +	* g10/trust.c: Likewise.
 +	* g10/trustdb.c: Likewise.
 +	* g13/create.c: Likewise.
 +	* g13/mountinfo.c: Likewise.
 +	* kbx/keybox-blob.c: Likewise.
 +	* kbx/keybox-file.c: Likewise.
 +	* kbx/keybox-init.c: Likewise.
 +	* kbx/keybox-search-desc.h: Likewise.
 +	* kbx/keybox-search.c: Likewise.
 +	* kbx/keybox-update.c: Likewise.
 +	* scd/apdu.c: Likewise.
 +	* scd/app-openpgp.c: Likewise.
 +	* scd/app-p15.c: Likewise.
 +	* scd/app.c: Likewise.
 +	* scd/ccid-driver.c: Likewise.
 +	* scd/command.c: Likewise.
 +	* scd/iso7816.c: Likewise.
 +	* sm/base64.c: Likewise.
 +	* sm/call-agent.c: Likewise.
 +	* sm/call-dirmngr.c: Likewise.
 +	* sm/certchain.c: Likewise.
 +	* sm/gpgsm.c: Likewise.
 +	* sm/import.c: Likewise.
 +	* sm/keydb.c: Likewise.
 +	* sm/minip12.c: Likewise.
 +	* sm/qualified.c: Likewise.
 +	* sm/server.c: Likewise.
 +	* tools/gpg-check-pattern.c: Likewise.
 +	* tools/gpgconf-comp.c: Likewise.
 +	* tools/gpgkey2ssh.c: Likewise.
 +	* tools/gpgparsemail.c: Likewise.
 +	* tools/gpgtar.c: Likewise.
 +	* tools/rfc822parse.c: Likewise.
 +	* tools/symcryptrun.c: Likewise.
 +
 +2015-11-16  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Fix error checking and improve error reporting.
 +	* g10/gpg.c (check_user_ids): Differentiate between a second result
 +	and an error.  If the key specification is ambiguous or an error
 +	occurs, set RC appropriately.
 +
 +2015-11-14  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Use only one fingerprint formatting function.
 +	* g10/gpg.h (MAX_FORMATTED_FINGERPRINT_LEN): New.
 +	* g10/keyid.c (hexfingerprint): Add optional args BUFFER and BUFLEN.
 +	Change all callers.
 +	(format_hexfingerprint): New.
 +	* g10/keylist.c (print_fingerprint): Change to use hexfingerprint.
 +	* g10/tofu.c (fingerprint_format): Remove.  Replace calls by
 +	format_hexfingerprint.
 +
 +2015-11-13  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Simplify the tofu interface by using the public key packet.
 +	* g10/tofu.c (fingerprint_str): Remove.
 +	(tofu_register): Take a public key instead of a fingerprint as arg.
 +	Use hexfingerprint() to get a fpr from the PK.
 +	(tofu_get_validity): Ditto.
 +	(tofu_set_policy, tofu_get_policy): Simplify by using hexfingerprint.
 +	* g10/trustdb.c (tdb_get_validity_core): Pass the primary key PK to
 +	instead of the fingerprint to the tofu functions.
 +
 +	gpg: Make trusted-key override for Tofu robust against swapped tofu.db.
 +	* g10/tofu.c (get_trust): For the UTK check lookup the key by
 +	fingerprint.
 +
 +	gpg: Fix regression in --locate-keys (in 2.1.9).
 +	* g10/getkey.c (getkey_ctx_s): Add field "extra_list".
 +	(get_pubkey_byname): Store strings in the context.
 +	(getkey_end): Free EXTRA_LIST.
 +
 +2015-11-12  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Print a new EXPORTED status line.
 +	* common/status.h (STATUS_EXPORTED): New.
 +	* g10/export.c (print_status_exported): New.
 +	(do_export_stream): Call that function.
 +
 +	gpg: Print export statistics to the status-fd.
 +	* common/status.h (STATUS_EXPORT_RES): New.
 +	* g10/main.h (export_stats_t): New.
 +	* g10/export.c (export_stats_s): New.
 +	(export_new_stats, export_release_stats): New.
 +	(export_print_stats): New.
 +	(export_pubkeys, export_seckeys, export_secsubkeys)
 +	(export_pubkey_buffer, do_export): Add arg "stats".
 +	(do_export_stream): Add arg stats and update it.
 +	* g10/gpg.c (main) <aExport, aExportSecret, aExportSecretSub>: Create,
 +	pass, and print a stats object to the export function calls.
 +
 +	* g10/export.c (export_pubkeys_stream): Remove unused function.
 +
 +	dirmngr: Do not block during ADNS calls.
 +	* dirmngr/dns-stuff.c: Include npth.h
 +	(my_unprotect, my_protect): New wrapper.
 +	(resolve_name_adns): Put unprotect/protect around adns calls.
 +	(get_dns_cert): Ditto.
 +	(getsrv): Ditto.
 +	(get_dns_cname): Ditto.
 +
 +	dirmngr: New option --nameserver.
 +	* dirmngr/dirmngr.c (oNameServer): New.
 +	(opts): Add --nameserver.
 +	(parse_rereadable_options): Act upon oNameServer.
 +	* dirmngr/dns-stuff.c (DEFAULT_NAMESERVER): New.
 +	(tor_nameserver): New.
 +	(set_dns_nameserver): New.
 +	(my_adns_init): Make name server configurable.
 +
 +2015-11-11  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Fix cache consistency problem.
 +	g10/keyring.c (keyring_search): Only mark the cache as completely
 +	filled if we start the scan from the beginning of the keyring.
 +
 +2015-11-10  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Default to the the PGP trust model.
 +	* g10/trustdb.c (init_trustdb): If we can't read the trust model from
 +	the trust DB, default to TM_PGP, not TM_TOFU_PGP.
 +
 +	gpg: Default to the flat TOFU DB format.
 +	* g10/tofu.c (opendbs): If the TOFU DB format is set to auto and there
 +	is no TOFU DB, default to the flat format.
 +
 +2015-11-09  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Change to new ADNS Tor mode init scheme.
 +	* dirmngr/dns-stuff.c (tor_credentials): New.
 +	(enable_dns_tormode): Add arg new_circuit and update tor_credentials.
 +	(my_adns_init): Rework to set Tor mode using a config file options and
 +	always use credentials.
 +	* dirmngr/server.c (cmd_dns_cert): Improve error message.
 +	* dirmngr/t-dns-stuff.c (main): Add option --new-circuit.
 +
 +	dirmngr: Improve detection of ADNS.
 +	* configure.ac (HAVE_ADNS_FREE): New ac_define.
 +
 +2015-11-09  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Add reder information to --card-status.
 +	* g10/call-agent.h, g10/call-agent.c (agent_release_card_info)
 +	g10/card-util.c (card_status): Add READER.
 +	* scd/apdu.c (close_ccid_reader, open_ccid_reader): Handle RDRNAME.
 +	(apdu_get_reader_name): New.
 +	* scd/ccid-driver.c (ccid_open_reader): Add argument to RDRNAME_P.
 +	* scd/command.c (cmd_learn): Return READER information.
 +
 +2015-11-06  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Avoid new strings.
 +	* g10/decrypt-data.c (decrypt_data): Use already translated strings.
 +
 +	common: Fix commit f99830b.
 +	* common/userids.c (classify_user_id): Avoid underflow.  Use spacep to
 +	also trim tabs.
 +
 +2015-11-06  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Fix formatting string.
 +	* g10/decrypt-data.c (decrypt_data): Fix formatting string.
 +
 +	gpg: Add new option --only-sign-text-ids.
 +	* g10/options.h (opt): Add field only_sign_text_ids.
 +	* g10/gpg.c (enum cmd_and_opt_values): Add value oOnlySignTextIDs.
 +	(opts): Handle oOnlySignTextIDs.
 +	(main): Likewise.
 +	* g10/keyedit.c (sign_uids): If OPT.ONLY_SIGN_TEXT_IDS is set, don't
 +	select non-text based IDs automatically.
 +	(keyedit_menu): Adapt the prompt asking to sign all user ids according
 +	to OPT.ONLY_SIGN_TEXT_IDS.
 +	* doc/gpg.texi: Document the new option --only-sign-text-ids.
 +
 +	common: When classifying keyids and fingerprints, reject trailing junk.
 +	* common/userids.c (classify_user_id): Trim any trailing whitespace.
 +	Before assuming that a hexstring corresponds to a key id or
 +	fingerprint, make sure that it is NUL terminated.
 +
 +	gpg: Check for ambiguous or non-matching key specs.
 +	* g10/gpg.c (check_user_ids): New function.
 +	(main): Check that any user id specifications passed to --local-user
 +	and --remote-user correspond to exactly 1 user.  Check that any user
 +	id specifications passed to --default-key correspond to at most 1
 +	user.  Warn if any user id specifications passed to --local-user or
 +	--default-user are possible ambiguous (are not specified by long keyid
 +	or fingerprint).
 +	* g10/getkey.c (parse_def_secret_key): Don't warn about possible
 +	ambiguous key descriptions here.
 +
 +	common: Add new function strlist_rev.
 +	* common/strlist.c (strlist_rev): New function.
 +	* common/t-strlist.c: New file.
 +	* common/Makefile.am (common_sources): Add strlist.c and strlist.h.
 +	(module_tests): Add t-strlist.
 +	(t_strlist_LDADD): New variable.
 +
 +	common: Include required, but not included headers in t-support.h.
 +	* common/t-support.h: Include <stdlib.h> and <stdio.h>.
 +
 +2015-11-05  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Indicate which characters are invalid.
 +	* g10/keygen.c (ask_user_id): Indicate which characters are invalid.
 +
 +	gpg: Add support for unwrapping the outer level of encryption.
 +	* g10/decrypt-data.c (decrypt_data): If OPT.UNWRAP_ENCRYPTION is set,
 +	copy the data to the output file instead of continuing to process it.
 +	* g10/gpg.c (enum cmd_and_opt_values): Add new value oUnwrap.
 +	(opts): Handle oUnwrap.
 +	(main): Likewise.
 +	* g10/options.h (opt): Add field unwrap_encryption.
 +	* g10/plaintext.c (handle_plaintext): Break the output file selection
 +	functionality into ...
 +	(get_output_file): ... this new function.
 +
 +	common: Add a function for copying data from one iobuf to another.
 +	* common/iobuf.c (iobuf_copy): New function.
 +
 +	doc: Note that gpgkey2ssh is deprecated.
 +	* doc/tools.texi (gpgkey2ssh): Note that gpgkey2ssh is deprecated.
 +
 +	tools: Fix gpgkey2ssh's most gratuitous errors.  Use gpg2, not gpg.
 +	* tools/gpgkey2ssh.c (main): Add support for --help.  Replace the most
 +	gratuitous asserts with error messages.  Invoke gpg2, not gpg.
 +
 +2015-11-05  Neal H. Walfield  <neal at g10code.com>
 +	    Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	doc: Add documentation for gpgkey2ssh.
 +	* doc/tools.texi: Add documentation for gpgkey2ssh.
 +
 +2015-11-04  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Print a better error message for --multifile --sign --encrypt.
 +	* g10/gpg.c (main): Print a better error message for --multifile
 +	--sign --encrypt.
 +
 +	gpg: Add --encrypt-to-default-key.
 +	* g10/getkey.c (parse_def_secret_key): Drop the static qualifier and
 +	export the function.
 +	* g10/gpg.c (enum cmd_and_opt_values): Add value oEncryptToDefaultKey.
 +	(opts): Handle oEncryptToDefaultKey.
 +	(main): Likewise.
 +	* g10/options.h (opt): Add field encrypt_to_default_key.
 +
 +	gpg: Allow multiple --default-key options.  Take the last available key.
 +	* g10/getkey.c (parse_def_secret_key): New function.
 +	(get_seckey_default): Add parameter ctrl.  Update callers.  Use
 +	parse_def_secret_key to get the default secret key, if any.
 +	(getkey_byname): Likewise.
 +	(enum_secret_keys): Likewise.
 +	* g10/options.h (opt): Change def_secret_key's type from a char * to a
 +	strlist_t.
 +	* g10/gpg.c (main): When processing --default-key, add the key to
 +	OPT.DEF_SECRET_KEY.
 +	* g10/gpgv.c (get_session_key): Add parameter ctrl.  Update callers.
 +	* g10/mainproc.c (proc_pubkey_enc): Likewise.
 +	(do_proc_packets): Likewise.
 +	* g10/pkclist.c (default_recipient): Likewise.
 +	* g10/pubkey-enc.c (get_session_key): Likewise.
 +	* g10/sign.c (clearsign_file): Likewise.
 +	(sign_symencrypt_file): Likewise.
 +	* g10/skclist.c (build_sk_list): Likewise.
 +	* g10/test-stubs.c (get_session_key): Likewise.
 +
 +2015-11-04  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix error handling with libusb-compat library.
 +	* scd/ccid-driver.c (bulk_out): Use LIBUSB_ERRNO_NO_SUCH_DEVICE.
 +
 +	scd: fix change_keyattr.
 +	* scd/app-openpgp.c (change_keyattr_from_string): Fix parsing.
 +
 +2015-11-03  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Change out of core error message.
 +	* g10/tofu.c (fingerprint_str): Die with the error code returned by
 +	the failed function.
 +	(time_ago_str): Ditto.  Do not make a comma translatable.
 +	(fingerprint_format): Use "%zu" for a size_t.
 +
 +	gpg: Make translation easier.
 +	* g10/import.c (import_secret_one): Split info string for easier
 +	translation.
 +
 +2015-11-03  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Also show when the most recently signed message was observed.
 +	* g10/tofu.c (show_statistics): Also show when the most recently
 +	signed message was observed.
 +
 +	gpg: Split a utility function out of a large function.
 +	* g10/tofu.c (show_statistics): Break the time delta to string code
 +	into...
 +	(time_ago_str): ... this new function.
 +
 +	gpg: Fix message formatting.
 +	* g10/tofu.c (get_trust): Fix message formatting.
 +
 +	gpg: Don't store formatting fingerprints in the TOFU DB.
 +	* g10/tofu.c (fingerprint_pp): Split this function into...
 +	(fingerprint_str): ... this function...
 +	(fingerprint_format): ... and this function.
 +	(record_binding): Store the unformatted fingerprint in the DB.  Only
 +	use the formatting fingerprint when displaying a message to the user.
 +	(get_trust): Likewise.
 +	(show_statistics): Likewise.
 +	(tofu_register): Likewise.
 +	(tofu_get_validity): Likewise.
 +	(tofu_set_policy): Likewise.
 +	(tofu_get_policy): Likewise.
 +
 +2015-11-02  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: notify a user when importing stub is skipped.
 +	* g10/import.c (transfer_secret_keys): Return GPG_ERR_NOT_PROCESSED
 +	when stub_key_skipped.
 +	(import_secret_one): Notify a user, suggesting --card-status.
 +
 +2015-10-31  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Consider newlines to be whitespace in an SQL statement.
 +	* g10/sqlite.c (sqlite3_stepx): When making sure that there is no
 +	second SQL statement, ignore newlines.
 +
 +2015-10-30  Werner Koch  <wk at gnupg.org>
 +
 +	common: Improve t-zb32 to be used for manual encoding.
 +	* common/t-support.h (no_exit_on_fail, errcount): New.
 +	(fail): Bump errcount.
 +	* common/t-zb32.c (main): Add options to allow manual use.
 +
 +	common: Add separate header for zb32.c.
 +	* common/util.h (zb32_encode): Move prototype to ...
 +	* common/zb32.h: new.  Include this for all callers of zb32_encode.
 +
 +2015-10-29  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Display the correct error message.
 +	* g10/trustdb.c (validate_keys): If tdbio_update_version_record fails,
 +	RC does not contain the error code.  Save the error code in rc2 and
 +	use that.
 +
 +	gpg: Eliminate a memory leak.
 +	* g10/trustdb.c (validate_key_list): Don't leak the keyblocks on
 +	failure.
 +
 +	gpg: Remove unused prototype.
 +	g10/keyring.h (keyring_locate_writable): Remove unused prototype.
 +
 +	gpg: Eliminate a memory leak.
 +	* g10/gpg.c (main): Don't leak OPT.DEF_RECIPIENT.
 +
 +	gpg: Fix keyring support.
 +	* g10/keydb.c (keydb_rebuild_caches): Only mark the cached as prepared
 +	if it is actually prepared, which it only is if the resource is a
 +	keybox.
 +
 +	gpg: Change sqlite3_stepx to pass the sqlite3_stmt * to the callback.
 +	* g10/sqlite.h (enum sqlite_arg_type): Add SQLITE_ARG_BLOB.
 +	(sqlite3_stepx_callback): New declaration.
 +	(sqlite3_stepx): Change the callback's type to sqlite3_stepx_callback,
 +	which passes an additional parameter, the sqlite3_stmt *.  Update
 +	users.
 +
 +	gpg: Move sqlite helper functions into their own file.
 +	* g10/tofu.c (sqlite3_exec_printf): Move from here...
 +	* g10/sqlite.c (sqlite3_exec_printf): ... to this new file.  Don't
 +	mark as static.
 +	* g10/tofu.c (sqlite3_stepx): Move from here...
 +	* g10/sqlite.c (sqlite3_stepx): ... to this new file.  Don't
 +	mark as static.
 +	* g10/tofu.c (enum sqlite_arg_type): Move from here...
 +	* g10/sqlite.h (enum sqlite_arg_type): ... to this new file.
 +
 +2015-10-29  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	doc: Don't install gpg-zip.1.
 +	* doc/Makefile.am (myman_pages): Remove gpg-zip.1.
 +	(DISTCLEANFILES): Add gpg-zip.1.
 +
 +2015-10-28  Werner Koch  <wk at gnupg.org>
 +
 +	sm: Allow combination of usage flags --gen-key.
 +	* sm/certreqgen.c (create_request): Re-implement building of the
 +	key-usage extension.
 +
 +2015-10-28  Damien Goutte-Gattat  <dgouttegattat at incenp.org>
 +
 +	doc: Document some changed default options.
 +	* doc/gpg.texi: Update the description of some options which are
 +	  now enabled by default.
 +
 +2015-10-28  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Fix NULL-deref while loading a CRL.
 +	* dirmngr/crlcache.c (crl_parse_insert): Set error before leaping to
 +	failure.
 +
 +	dirmngr: Minor cleanup of the SRV RR code.
 +	* dirmngr/dns-stuff.c: Include unistd.h.
 +	(getsrv): Run srand only once.
 +	* dirmngr/t-dns-stuff.c (main): Allow passing another name for --srv
 +	and change output format.
 +
 +	dirmngr: Add a getaddrinfo wrapper backend using ADNS.
 +	* dirmngr/dns-stuff.c: Replace all use of default_errsource.
 +	(my_adns_init): Move to top.
 +	(resolve_name_adns): New.
 +	(resolve_dns_name) [USE_ADNS]: Divert to new func.
 +
 +2015-10-26  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Do not call an extra get_validity if no-show-uid-validity is used.
 +	* g10/mainproc.c (check_sig_and_print): Do not call the informational
 +	get_validity if we are not going to use it.
 +
 +2015-10-26  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	gpg: Ensure all weak digest rejection notices are shown.
 +	* g10/main.h: Add rejection_shown flag to each weakhash struct
 +	* g10/misc.c (print_digest_algo_note, additional_weak_digest): Do not
 +	treat MD5 separately; (print_digest_rejected_note): Use
 +	weakhash.rejection_shown instead of static shown.
 +	* g10/options.h (opt): Change from additional_weak_digests to
 +	weak_digests.
 +	* g10/sig-check.c: Do not treat MD5 separately.
 +	* g10/gpg.c (main): Explicitly set MD5 as weak.
 +	* g10/gpgv.c (main): Explicitly set MD5 as weak.
 +
 +2015-10-26  Werner Koch  <wk at gnupg.org>
 +
 +	w32: Make it build again if Tofu support is not available.
 +	* g10/keylist.c (public_key_list) [!USE_TOFU]: Do not call tofu
 +	functions.
 +
 +	dirmngr: Support Tor hidden services.
 +	* dirmngr/dns-stuff.c (is_onion_address): New.
 +	* dirmngr/ks-engine-hkp.c (hostinfo_s): Add field "onion".
 +	(map_host): Special case onion addresses.
 +	(ks_hkp_print_hosttable): Print an 'O' for an onion address.
 +	* dirmngr/http.c (connect_server): Special case onion addresses.
 +
 +	dirmngr,w32: Remove gethostbyname hack and make it build again.
 +	* dirmngr/http.c (connect_server) [W32]: Remove gethostbyname hack;
 +	we require getaddrinfo anyway.
 +	* dirmngr/dns-stuff.c (AI_ADDRCONFIG): Add replacement if not defined.
 +	(map_eai_to_gpg_error) [W32]: Take care of unsupported codes.
 +
 +2015-10-26  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Make sure we only have a single SQL statement.
 +	* g10/tofu.c (sqlite3_stepx): Make sure SQL only contains a single SQL
 +	statement.
 +
 +	gpg: When the TOFU DB is in batch mode, periodically drop the locks.
 +	* g10/tofu.c: Include <sched.h>.
 +	(batch_update_started): New variable.
 +	(begin_transaction): If we've been in batch mode for a while, then
 +	commit any extant batch transactions.
 +	(tofu_begin_batch_update): If we are not in batch mode, initialize
 +	batch_update_started.
 +
 +2015-10-25  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Add workaround for broken getaddrinfo.
 +	* dirmngr/dns-stuff.c (resolve_name_standard): On failure retry by
 +	first resolving the CNAME.
 +	(get_dns_cname): New.
 +
 +	* dirmngr/t-dns-stuff.c (main): Add option --cname.
 +
 +	dirmngr: Better handle systems without IPv6 or IPv4.
 +	* dirmngr/dns-stuff.c (resolve_name_standard): Use AI_ADDRCONFIG.
 +
 +	dirmngr: Replace use of getnameinfo by resolve_dns_addr.
 +	* dirmngr/ks-engine-hkp.c (my_getnameinfo): Remove.
 +	(map_host): Use resolve_dns_addr.
 +
 +	dirmngr: Implement a getnameinfo wrapper.
 +	* dirmngr/dns-stuff.h (DNS_NUMERICHOST): New.
 +	(DNS_WITHBRACKET): New.
 +	* dirmngr/dns-stuff.c (resolve_name_standard): Factor code out to...
 +	(map_eai_to_gpg_error): new.
 +	(resolve_addr_standard): New.
 +	(resolve_dns_addr): New.
 +
 +	* dirmngr/ks-engine-hkp.c (is_ip_address): Move to ...
 +	* dirmngr/dns-stuff.c (is_ip_address): here.  Add support for non
 +	bracketed v6 addresses.
 +
 +	* dirmngr/t-dns-stuff.c: Remove header netdb.h.
 +	(main): Add option --bracket.  Use resolve_dns_name instead of
 +	getnameinfo.
 +
 +2015-10-23  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Provide an interface to patch TOFU updates.
 +	* g10/tofu.c (struct db): Rename begin_transaction to savepoint_batch.
 +	Rename end_transaction to savepoint_batch_commit.  Update users.
 +	Remove field rollback.  Add fields savepoint_inner and
 +	savepoint_inner_commit.  Add field batch_update.
 +	(dump_cache): New function.
 +	(batch_update): New variable.
 +	(begin_transaction). New function.
 +	(end_transaction): New function.
 +	(rollback_transaction): New function.
 +	(tofu_begin_batch_update): New function.
 +	(tofu_end_batch_update): New function.
 +	(closedb): End any pending batch transaction.
 +	(closedbs): Assert that none of the DBs have a started batch
 +	transaction if we not in batch mode.
 +	(record_binding): Use the begin_transaction, end_transaction and
 +	rollback_transaction functions instead of including the SQL inline.
 +	Also start a batch mode transaction if we are using the flat format.
 +	(tofu_register): Use the begin_transaction, end_transaction and
 +	rollback_transaction functions instead of including the SQL inline.
 +	* g10/gpgv.c (tofu_begin_batch_update): New function.
 +	(tofu_end_batch_update): New function.
 +	* g10/test-stubs.c (tofu_begin_batch_update): New function.
 +	(tofu_end_batch_update): New function.
 +
 +	gpg: Cache prepared SQL queries and open DB connections.
 +	* g10/tofu.c: Include <stdarg.h>.
 +	(prepares_saved) [DEBUG_TOFU_CACHE]: New variable.
 +	(queries) [DEBUG_TOFU_CACHE]: New variable.
 +	(struct db): Add fields prevp, begin_transaction, end_transaction,
 +	rollback, record_binding_get_old_policy, record_binding_update,
 +	record_binding_update2, get_policy_select_policy_and_conflict,
 +	get_trust_bindings_with_this_email, get_trust_gather_other_user_ids,
 +	get_trust_gather_other_keys, register_already_seen, and
 +	register_insert.
 +	[DEBUG_TOFU_CACHE]: Add field hits.
 +	(STRINGIFY): New macro.
 +	(STRINGIFY2): New macro.
 +	(enum sqlite_arg_type): New enum.
 +	(sqlite3_stepx): New function.
 +	(combined_db): Remove variable.
 +	(opendb): Don't cache the combined db.
 +	(struct dbs): New struct.  Update users to use this as the head of the
 +	local DB list rather than overloading struct db.
 +	(unlink_db): New function.
 +	(link_db): New function.
 +	(db_cache): New variable.
 +	(db_cache_count): New variable.
 +	(DB_CACHE_ENTRIES): Define.
 +	(getdb): If the dbs specific cache doesn't include the DB, look at
 +	DB_CACHE.  Only if that also doesn't include the DB open the
 +	corresponding DB.
 +	(closedb): New function.
 +	(opendbs): Don't open the combined DB.  Just return an initialized
 +	struct dbs.
 +	(closedbs): Don't close the dbs specific dbs.  Attach them to the
 +	front of DB_CACHE.  If DB_CACHE contains more than DB_CACHE_ENTRIES,
 +	close enough dbs from the end of the DB_CACHE list such that DB_CACHE
 +	only contains DB_CACHE_ENTRIES.  Don't directly close the dbs, instead
 +	use the new closedb function.
 +	[DEBUG_TOFU_CACHE]: Print out some statistics.
 +	(record_binding): Use sqlite3_stepx instead of sqlite3_exec or
 +	sqlite3_exec_printf.
 +	(get_policy): Likewise.
 +	(get_trust): Likewise.
 +	(tofu_register): Likewise.
 +
 +	gpg: Return the DBs meta-handle rather than the sqlite3 handle.
 +	* g10/tofu.c (getdb): Return a struct db * instead of an sqlite *.
 +	Update users.
 +
 +	gpg: Use the proper type.
 +	* g10/options.h: Include "tofu.h".
 +	(opt.tofu_default_policy): Change type to enum tofu_policy.
 +	* g10/gpgv.c (enum tofu_policy): Don't redeclare.
 +	* g10/test-stubs.c (enum tofu_policy): Likewise.
 +
 +2015-10-22  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Implement Tor mode for SRV RRs.
 +	* dirmngr/dns-stuff.c (get_dns_cert): Factor adns init out to...
 +	(my_adns_init): new.
 +	(getsrv)[USE_ADNS]: Use my_adns_init.
 +	(getsrv)[!USE_ADNS]: Return an error if Tor mode is active.
 +
 +	* dirmngr/t-dns-stuff.c: Add option --use-tor.
 +
 +	dirmngr: Do not use MAXDNAME.
 +	* dirmngr/dns-stuff.c (getsrv): Replace MAXDNAME.
 +	* dirmngr/dns-stuff.h (MAXDNAME): Remove.
 +	(struct srventry): Use a fixed value instead of MAXDNAME.
 +	* dirmngr/http.c (connect_server): Use DIMof instead of MAXDNAME.
 +	Malloc a helper array.
 +
 +	Move SRV RR code from common/ to dirmngr/.
 +	* common/srv.c: Merge into dirmngr/dns-stuff.c.  Delete file.
 +	* common/srv.h: Merge into dirmngr/dns-stuff.h.  Delete file.
 +	* common/Makefile.am (common_sources): Remove srv.c and srv.h.
 +	* g10/keyserver.c: Do not include srv.h.  The code using it is anyway
 +	disabled.
 +	* dirmngr/http.c: Remove header srv.h and stubs.
 +	* dirmngr/t-dns-stuff.c: Add option --srv.
 +
 +2015-10-21  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Use the new DNS wrapper for the HTTP module.
 +	* dirmngr/t-http.c (main): Init assuan sockets.
 +	* dirmngr/http.c: Include dns-stuff.h.
 +	(connect_server)[!HAVE_GETADDRINFO]: Remove all code.
 +	(connect_server): Change to use resolve_dns_name.
 +
 +	dirmngr: Allow use of http.c if USE_NPTH is not defined.
 +	* dirmngr/http.c (send_request): Always set the gnutls pull/push
 +	functions.
 +	(my_npth_read): Rename to ...
 +	(my_gnutls_read) .. this.  Use system read if !USE_NPTH.
 +	(my_npth_write): Rename to ...
 +	(my_gnutls_write) .. this.  Use system write if !USE_NPTH.
 +
 +	dirmngr: Check that getaddrinfo is available.
 +	* dirmngr/Makefile.am (t_http_SOURCES): Add dns-stuff.c.
 +	(t_ldap_parse_uri_SOURCES): Ditto.
 +	* dirmngr/dns-stuff.c: Bail out if neither ADNS nor getaddrinfo is
 +	available.
 +
 +	dirmngr: Use the new DNS wrapper for the HKP engine.
 +	* dirmngr/ks-engine-hkp.c (my_getnameinfo): Change arg type to
 +	dns_addrinfo_t.
 +	(map_host): Replace getaddrinfo by resolve_dns_name.
 +
 +	dirmngr: Implement a getaddrinfo wrapper.
 +	* dirmngr/dns-stuff.h: Include some header files.
 +	(dns_addinfo_t, dns_addrinfo_s): New.
 +	* dirmngr/dns-stuff.c: Always include DNS related headers.
 +	(free_dns_addrinfo): New.
 +	(resolve_name_standard): New.
 +	(resolve_dns_name): New.
 +
 +	* dirmngr/t-dns-stuff.c: Include netdb.h.
 +	(main): Keep old default mode with no args but else print outout of
 +	resolve_dns_name.  Revamp option parser.
 +
 +	common: Add more replacement error codes.
 +	* common/util.h (GPG_ERR_SERVER_FAILED): New.
 +	(GPG_ERR_NO_KEY): New.
 +	(GPG_ERR_NO_NAME): New.
 +
 +2015-10-21  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: If the saved trust model is unknown, default to tofu+pgp.
 +	* g10/trustdb.c (init_trustdb): If the saved trust model is unknown,
 +	default to tofu+pgp instead of pgp.
 +
 +	gpg: Don't accidentally free UTK_LIST.
 +	* g10/trustdb.c (validate_keys): Don't free UTK_LIST.
 +
 +	gpg: When evaluating trust reg exps, treat tofu+pgp like pgp.
 +	* g10/trustdb.c (validate_one_keyblock): When checking trust regular
 +	expressions, treat the tofu+pgp trust model the same as the pgp trust
 +	model.
 +
 +	gpg: If a key is ultimate trusted, return that in the tofu model.
 +	* g10/tofu.c (get_trust): If the policy is auto or none, check if the
 +	key is ultimately trusted.  If so, return that.
 +	(tofu_register): If the key is ultimately trusted, don't show any
 +	statistics.
 +	(tofu_get_validity): Likewise.
 +
 +	gpg: Keep the trust DB up to date for the tofu and tofu+pgp models.
 +	* g10/trustdb.c (init_trustdb): Recognize tofu and tofu+pgp as
 +	possibly saved trust models.  Also register the ultimately trusted
 +	keys if the trust model is tofu or tofu+pgp.
 +	(check_trustdb): Don't skip if the trust model is tofu or tofu+pgp.
 +	(update_trustdb): Likewise.
 +	(tdb_check_trustdb_stale): Likewise.
 +	(validate_keys): If the trust model is TOFU, just write out the
 +	ultimately trusted keys.
 +
 +	gpg: Factor out code into a standalone function.
 +	* g10/trustdb.c (tdb_keyid_is_utk): New function.
 +	(add_utk): Use it.
 +
 +	dirmngr: Allow building with libassuan < 2.3.
 +	* dirmngr/http.c (send_request): Use newer assuan function only if
 +	available.
 +
 +2015-10-21  Neal H. Walfield  <neal at g10code.com>
 +	    Andre Heinecke  <aheinecke at intevation.de>
 +
 +	gpg: Make the tofu DB check and initialization atomic.
 +	* g10/tofu.c (initdb): Make the version check and the database
 +	initialization atomic.
 +
 +2015-10-21  Werner Koch  <wk at gnupg.org>
 +
 +	build: Make --disable-g13 the default.
 +	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Add --enable-g13.  Remove
 +	--enable-gpgtar because that is enabled anyway.
 +	* configure.ac: Do not build g13 by default.
 +
 +	dirmngr: Rename file dns-cert.c.
 +	* dirmngr/dns-cert.c: Rename to dirmngr/dns-stuff.c.
 +	* dirmngr/dns-cert.h: Rename to dirmngr/dns-stuff.h and change
 +	includers.
 +	* dirmngr/t-dns-cert.c: Rename to dirmngr/t-dns-stuff.c.
 +	* dirmngr/Makefile.am: Adjust.
 +
 +	common: Add status code for use by g13.
 +	* common/status.h (STATUS_PLAINTEXT_FOLLOWS): New.
 +
 +2015-10-20  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Prefer ADNS over system resolver.
 +	* configure.ac (HAVE_ADNS_IF_TORMODE): New ac_define.
 +	(USE_DNS_CERT): Prefer ADNS over the system resolver.
 +	* dirmngr/dns-cert.c (tor_mode): New global var.
 +	(enable_dns_tormode): New func.
 +	(get_dns_cert): Use DNS resolver at 8.8.8.8 in tor-mode.
 +	* dirmngr/server.c (cmd_dns_cert): If supported allow DNS requests.
 +
 +	w32: Allow building again.
 +	* dirmngr/http.c (connect_server): Fix called function name.
 +
 +	build: Allow building without SQLlite support.
 +	* configure.ac: Add option --dsiable-tofu and --disable-sqlite.
 +	(NEED_SQLITE_VERSION): New var.
 +	(USE_TOFU): New ac_define and am_conditional.
 +	* autogen.sh (build-w32): Add PKG_CONFIG_LIBDIR to configure so that
 +	pkg-config find the correct .pc file.
 +
 +	* g10/Makefile.am (tofu_source): New.  Build only if enabled.
 +	* g10/gpg.c (parse_trust_model)[!USE_TOFU]: Disable tofu models.
 +	(parse_tofu_policy)[!USE_TOFU]: Disable all.
 +	(parse_tofu_db_format)[!USE_TOFU]: Disable all.
 +	(main) <aTOFUPolicy>[!USE_TOFU]: Skip.
 +	* g10/keyedit.c (show_key_with_all_names_colon)[!USE_TOFU]: Do not
 +	call tofu functions.
 +	* g10/keylist.c (list_keyblock_colon)[!USE_TOFU]: Ditto.
 +	* g10/trustdb.c (tdb_get_validity_core)[!USE_TOFU]: Skip tofu
 +	processing.
 +
 +2015-10-20  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Don't die immediately if the TOFU DB is locked.
 +	* g10/tofu.c (opendb): Don't die immediately if the DB is locked.
 +
 +	gpg: Improve output.
 +	* g10/tofu.c (get_trust): Also show the binding when indicating a
 +	conflict occurred.
 +
 +	gpg: Synchronize translation template.
 +	* g10/tofu.c (show_statistics): Synchronize translation template.
 +
 +	gpg: When showing conflicts, also show bindings with no recorded sigs.
 +	* g10/tofu.c (signature_stats_collect_cb): If the time_ago column is
 +	NULL, then both time_ago and count should be 0.
 +	(get_trust): Reverse the direction of the join so that we also get
 +	statistics about bindings without any signatures.
 +
 +	gpg: Improve text.
 +	* g10/tofu.c (show_statistics): Improve text.
 +
 +	gpg: Use the right variable to display the information.
 +	* g10/tofu.c (get_trust): Use the right variable to display the
 +	conflicting key.
 +
 +	gpg: Make failing to create a directory a soft error.
 +	* g10/tofu.c (getdb): Don't exit if we can't create the directory.
 +	Just return an error.
 +
 +	common: Make sure tilde expansion works for the mkdir functions.
 +	* common/mkdir_p.c (gnupg_amkdir_p): Use make_filename_try on the
 +	first directory component as well.
 +
 +	gpg: Remove unused prototype digest_algo_from_sig.
 +	* g10/packet.h (digest_algo_from_sig): Remove prototype without a
 +	corresponding implementation.
 +
 +2015-10-19  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Allow building with libassuan < 2.3.
 +	* dirmngr/dirmngr.c (set_tor_mode): Use newer assuan function only if
 +	available.
 +	* dirmngr/http.c (http_raw_connect): Ditto.
 +
 +2015-10-19  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Fix --desig-revoke.
 +	* g10/revoke.c (gen_desig_revoke): Add additional parameter ctrl.
 +	Check that the secret key is available.  If not, display an error
 +	message.
 +
 +	gpg: Improve function documentation and some comments.
 +	* g10/main.h: Improve function documentation.
 +	* g10/packet.h.h: Improve function documentation.
 +	* g10/sig-check.c: Improve function documentation and some comments.
 +
 +	gpg: Improve and regularize naming of signature checking functions.
 +	* g10/packet.h (signature_check): Rename from this...
 +	(check_signature): ... to this.  Update users.
 +	(signature_check2): Rename from this...
 +	(check_signature2): ... to this.  Update users.
 +	* g10/sig-check.c (do_check): Rename from this...
 +	(check_signature_end): ... to this.  Update users.
 +	(do_check_messages): Rename from this...
 +	(check_signature_metadata_validity): ... to this.  Update users.
 +
 +	gpg: Mark local function as static.
 +	* g10/tdbio.c (put_record_into_cache): Mark as static.
 +
 +2015-10-19  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	gpg: Print warning when rejecting weak digests.
 +	* g10/misc.c (print_md5_rejected_note): Rename to ..
 +	(print_digest_rejected_note): this.  Parameterize function to take an
 +	enum gcry_md_algos.
 +	* g10/sig-check.c: Use print_digest_rejected_note() when rejecting
 +	signatures.
 +
 +	gpg: Add option --weak-digest to gpg and gpgv.
 +	* g10/options.h: Add additional_weak_digests linked list to opts.
 +	* g10/main.h: Declare weakhash linked list struct and
 +	additional_weak_digest() function to insert newly-declared weak
 +	digests into opts.
 +	* g10/misc.c: (additional_weak_digest): New function.
 +	(print_digest_algo_note): Check for deprecated digests; use proper
 +	gcry_md_algos type.
 +	* g10/sig-check.c: (do_check): Reject weak digests in addition to MD5.
 +	* g10/gpg.c: Add --weak-digest option to gpg.
 +	* doc/gpg.texi: Document gpg --weak-digest option.
 +	* g10/gpgv.c: Add --weak-digest option to gpgv.
 +	* doc/gpgv.texi: Document gpgv --weak-digest option.
 +
 +2015-10-19  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Make --use-tor work - still leaks DNS.
 +	* dirmngr/dirmngr.c (set_tor_mode): New.
 +	(main, reread_configuration): Call it.
 +	* dirmngr/http.c (http_raw_connect, send_request): Check whether TOR
 +	mode is enabled if the FORCE_TOR flag is given.
 +
 +	dirmngr: Use Assuan socket wrappers for http.c.
 +	* dirmngr/http.c: Include assuan.h.  Changed all code taking a socket
 +	descriptor from int to assuan_fd_t.
 +	(my_unprotect, my_protect): New.
 +	(my_connect): Remove.
 +	(_my_socket_new, _my_socket_unref): use assuan_sock_close.
 +	(connect_server): Use assuan_sock_connect, assuan_sock_new, and
 +	assuan_sock_close.
 +	* dirmngr/Makefile.am (t_common_ldadd): Add LIBASSUAN_LIBS.
 +
 +2015-10-19  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Fix formatting.
 +	* g10/tofu.c (get_trust): Fix formatting.
 +
 +	gpg: Don't forget to free some memory.
 +	* g10/tofu.c (tofu_register): Free SIG_DIGEST before returning.
 +
 +	gpg: If a conflict occurs in batch mode, record that.
 +	* g10/tofu.c (get_trust): If a conflict occurs when MAY_ASK is false,
 +	set conflict to the key.  When prompting the user, don't show the
 +	conflicting key if the conflicting key is the current key.
 +
 +2015-10-18  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Silence two more warnings.
 +	* g10/trustdb.c (tdb_get_validity_core): Silence a warning.
 +	* g10/tofu.c (tofu_register): Move SIG_DIGEST computation to the top
 +	so that it is not uninitialized in case of an early error.
 +
 +	gpg: Fix harmless compiler warnings.
 +	* g10/tofu.h (_tofu_GET_POLICY_ERROR): New.  This avoids warnings
 +	about undefined enum values in a switch.
 +	* g10/trustdb.h (_tofu_GET_TRUST_ERROR): New.
 +	* g10/tofu.c (TIME_AGO_FUTURE_IGNORE): Move to the top.
 +	(opendbs): Avoid compiler warning (use braces).
 +	(GET_POLICY_ERROR): Replace define by enum _tofu_GET_POLICY_ERROR.
 +	(get_policy): Remove assert.
 +	(GET_TRUST_ERROR): Replace by _tofu_GET_TRUST_ERROR macro.
 +	(show_statistics): Undef MIN_SECS et al. after use.
 +
 +	common: Avoid warning about const char ** assignment.
 +	* common/mkdir_p.c (gnupg_amkdir_p): Also strdup first item.  Return
 +	an error on malloc failure.
 +	(gnupg_mkdir_p): Fix type of dirs and tmp_dirs.
 +
 +	Move http module from common/ to dirmngr/.
 +	* common/http.c: Move to ../dirmngr/.
 +	* common/http.h: Move to ../dirmngr/.
 +	* common/t-http.c: Move to ../dirmngr/.
 +	* common/tls-ca.pem: Move to ../dirmngr/.
 +	* common/Makefile.am: Do not build libcommontls.a libcommontlsnpth.a.
 +	Remove http.c related stuff.
 +	* po/POTFILES.in: Move http.c to dirmngr/.
 +	* dirmngr/Makefile.am (EXTRA_DIST): Add tls-ca.pem.
 +	(module_maint_tests): New.
 +	(noinst_PROGRAMS): Add module_maint_tests.
 +	(dirmngr_SOURCES): Add http.c and http.h.
 +	(dirmngr_LDADD): Remove libcommontlsnpth.
 +	(t_common_ldadd): Ditto.
 +	(t_http_SOURCES, t_http_CFLAGS, t_http_LDADD): New.
 +	(t_ldap_parse_uri_SOURCES): Add http.c.
 +	(t_ldap_parse_uri_CFLAGS): Build without npth.
 +	($(PROGRAMS)): Do not require libcommontls.a libcommontlsnpth.a.
 +	* dirmngr/dirmngr.h, dirmngr/ks-engine.h: Fix include of http.h.
 +
 +2015-10-18  Neal H. Walfield  <neal at g10code.com>
 +
 +	g10: Fix assert.
 +	* g10/tofu.c (get_trust): Fix assert.
 +
 +	g10: Add TOFU support.
 +	* configure.ac: Check for sqlite3.
 +	(SQLITE3_CFLAGS): AC_SUBST it.
 +	(SQLITE3_LIBS): Likewise.
 +	* g10/Makefile.am (AM_CFLAGS): Add $(SQLITE3_CFLAGS).
 +	(gpg2_SOURCES): Add tofu.h and tofu.c.
 +	(gpg2_LDADD): Add $(SQLITE3_LIBS).
 +	* g10/tofu.c: New file.
 +	* g10/tofu.h: New file.
 +	* g10/options.h (trust_model): Define TM_TOFU and TM_TOFU_PGP.
 +	(tofu_db_format): Define.
 +	* g10/packet.h (PKT_signature): Add fields digest and digest_len.
 +	* g10/gpg.c: Include "tofu.h".
 +	(cmd_and_opt_values): Declare aTOFUPolicy, oTOFUDefaultPolicy,
 +	oTOFUDBFormat.
 +	(opts): Add them.
 +	(parse_trust_model): Recognize the tofu and tofu+pgp trust models.
 +	(parse_tofu_policy): New function.
 +	(parse_tofu_db_format): New function.
 +	(main): Initialize opt.tofu_default_policy and opt.tofu_db_format.
 +	Handle aTOFUPolicy, oTOFUDefaultPolicy and oTOFUDBFormat.
 +	* g10/mainproc.c (do_check_sig): If the signature is good, copy the
 +	hash to SIG->DIGEST and set SIG->DIGEST_LEN appropriately.
 +	* g10/trustdb.h (get_validity): Add arguments sig and may_ask.  Update
 +	callers.
 +	(tdb_get_validity_core): Add arguments sig and may_ask.  Update
 +	callers.
 +	* g10/trust.c (get_validity) Add arguments sig and may_ask.  Pass them
 +	to tdb_get_validity_core.
 +	* g10/trustdb.c: Include "tofu.h".
 +	(trust_model_string): Handle TM_TOFU and TM_TOFU_PGP.
 +	(tdb_get_validity_core): Add arguments sig and may_ask.  If
 +	OPT.TRUST_MODEL is TM_TOFU or TM_TOFU_PGP, compute the TOFU trust
 +	level.  Combine it with the computed PGP trust level, if appropriate.
 +	* g10/keyedit.c: Include "tofu.h".
 +	(show_key_with_all_names_colon): If the trust mode is tofu or
 +	tofu+pgp, then show the trust policy.
 +	* g10/keylist.c: Include "tofu.h".
 +	(public_key_list): Also show the PGP stats if the trust model is
 +	TM_TOFU_PGP.
 +	(list_keyblock_colon): If the trust mode is tofu or
 +	tofu+pgp, then show the trust policy.
 +	* g10/pkclist.c: Include "tofu.h".
 +	* g10/gpgv.c (get_validity): Add arguments sig and may_ask.
 +	(enum tofu_policy): Define.
 +	(tofu_get_policy): New stub.
 +	(tofu_policy_str): Likewise.
 +	* g10/test-stubs.c (get_validity): Add arguments sig and may_ask.
 +	(enum tofu_policy): Define.
 +	(tofu_get_policy): New stub.
 +	(tofu_policy_str): Likewise.
 +	* doc/DETAILS: Describe the TOFU Policy field.
 +	* doc/gpg.texi: Document --tofu-set-policy, --trust-model=tofu,
 +	--trust-model=tofu+pgp, --tofu-default-policy and --tofu-db-format.
 +	* tests/openpgp/Makefile.am (TESTS): Add tofu.test.
 +	(TEST_FILES): Add tofu-keys.asc, tofu-keys-secret.asc,
 +	tofu-2183839A-1.txt, tofu-BC15C85A-1.txt and tofu-EE37CF96-1.txt.
 +	(CLEANFILES): Add tofu.db.
 +	(clean-local): Add tofu.d.
 +	* tests/openpgp/tofu.test: New file.
 +	* tests/openpgp/tofu-2183839A-1.txt: New file.
 +	* tests/openpgp/tofu-BC15C85A-1.txt: New file.
 +	* tests/openpgp/tofu-EE37CF96-1.txt: New file.
 +	* tests/openpgp/tofu-keys.asc: New file.
 +	* tests/openpgp/tofu-keys-secret.asc: New file.
 +
 +2015-10-16  Neal H. Walfield  <neal at g10code.com>
 +
 +	common: Prefix the mkdir functions with gnupg_.  Make args const.
 +	* common/mkdir_p.h (mkdir_p): Rename from this...
 +	(gnupg_mkdir_p): ... to this.  Change directory_component's type from
 +	char * to const char *.
 +	(amkdir_p): Rename from this...
 +	(gnupg_amkdir_p): ... to this.  Change directory_component's type from
 +	char * to const char *.
 +	* common/mkdir_p.c (mkdir_p): Rename from this...
 +	(gnupg_mkdir_p): ... to this.  Change directory_component's type from
 +	char * to const char *.
 +	(amkdir_p): Rename from this...
 +	(gnupg_amkdir_p): ... to this.  Change directory_component's type from
 +	char * to const char *.
 +
 +2015-10-14  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	cleanup: Fix confusion between gpg_error_t and gpg_err_code_t.
 +	* dirmngr/crlcache.c (hash_dbfile): Use gpg_error_t for ERR.
 +	* kbx/keybox-update.c (keybox_set_flags): Call
 +	gpg_err_code_from_syserror.
 +
 +2015-10-13  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	po: Update Japanese translation.
 +
 +2015-10-12  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Try hard to use MDC also for sign+symenc.
 +	* g10/encrypt.c (use_mdc): Make it a global func.
 +	* g10/sign.c (sign_symencrypt_file): Use that function to decide
 +	whether to use an MDC.
 +	* tests/openpgp/conventional-mdc.test: Add a simple test case.
 +
 +2015-10-09  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.9.
 +
 +2015-10-09  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: simplify agent_get_passphrase.
 +	* agent/call-pinentry.c (agent_get_passphrase): Simplify.
 +
 +	agent: fix agent_askpin.
 +	* agent/call-pinentry.c (agent_askpin): Fix off-by-one error.
 +
 +	agent: Fix function return type for check_cb and agent_askpin.
 +	* agent/call-pinentry.c (unlock_pinentry): Return gpg_error_t.
 +	(start_pinentry, setup_qualitybar): Likewise.
 +	(agent_askpin): Fix return value check of check_cb.
 +	* agent/command-ssh.c (reenter_compare_cb): Return gpg_error_t.
 +	(ssh_identity_register): Fix return value check of agent_askpin.
 +	* agent/cvt-openpgp.c (try_do_unprotect_cb): Return gpg_error_t.
 +	* agent/findkey.c (try_unprotect_cb): Likewise.
 +	* agent/genkey.c (reenter_compare_cb): Return gpg_error_t.
 +	(agent_ask_new_passphrase): Fix return value check of agent_askpin.
 +
 +2015-10-08  Andre Heinecke  <aheinecke at intevation.de>
 +
 +	dirmngr: Default to http protocol for http-proxy.
 +	* common/http.c (send_request): Fix handling for hostname:port string.
 +
 +2015-10-08  Werner Koch  <wk at gnupg.org>
 +
 +	common: Allow building of mkdir_p.c for Windows.
 +	* common/mkdir_p.c: Change license and comment debug statements.
 +	(amkdir_p, mkdir_p): Fail on malloc error and use default_errsource to
 +	build an error code.  Change return value to gpg_error_t.
 +	(amkdir_p): Use gnupg_mkdir.
 +
 +	* common/membuf.c: Include util.h first to avoid redefined macro
 +	warnings.
 +
 +	gpg: Add option --print-dane-records.
 +	* g10/options.h (opt): Add field "print_dane_records".
 +	* g10/gpg.c (oPrintDANERecords): new.
 +	(opts): Add --print-dane-records.
 +	(main): Set that option.
 +	* g10/export.c (do_export): Remove EXPORT_DANE_FORMAT handling.
 +	(do_export_stream): Add EXPORT_DANE_FORMAT handling.
 +	* g10/keylist.c (list_keyblock_pka): Implement DANE record printing.
 +
 +	* g10/gpgv.c (export_pubkey_buffer): New stub.
 +	* g10/test-stubs.c (export_pubkey_buffer): New stub.
 +
 +	gpg: Pass CTRL parameter to all key listing functions.
 +	* g10/keylist.c (public_key_list): Add arg CTRL.
 +	(secret_key_list): Ditto.
 +	(list_all, list_one): Ditto.
 +	(locate_one): Ditto.
 +	(list_keyblock_pka): Ditto.
 +	(list_keyblock): Ditto.
 +	(list_keyblock_direct): Ditto.
 +	* g10/keygen.c (proc_parameter_file): Add arg CTRL.
 +	(read_parameter_file): Ditto.
 +	(quick_generate_keypair): Ditto.
 +	(do_generate_keypair): Ditto.
 +	(generate_keypair): Pass arg CTRL.
 +	* g10/gpg.c (main): Pass arg CTRL to quick_generate_keypair.
 +
 +2015-10-07  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Remove unfinished experimental code to export as S-expressions.
 +	* g10/options.h (EXPORT_SEXP_FORMAT): Remove.
 +	(EXPORT_DANE_FORMAT): New.
 +	* g10/export.c (parse_export_options): Remove "export-sexp-format".
 +	(export_seckeys): Adjust for removed option.
 +	(export_secsubkeys): Ditto.
 +	(do_export): Prepare for DANE format.
 +	(build_sexp, build_sexp_seckey): Remove.
 +	(do_export_stream): Remove use of removed functions.
 +
 +2015-10-06  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add new --auto-key-locate mechanism "dane".
 +	* g10/call-dirmngr.c (gpg_dirmngr_dns_cert): Allow fetching via DANE.
 +	* g10/keyserver.c (keyserver_import_cert): Add arg "dane_mode".
 +	* g10/options.h (AKL_DANE): New.
 +	* g10/getkey.c (get_pubkey_byname): Implement AKL_DANE.
 +	(parse_auto_key_locate): Ditto.
 +
 +	dirmngr: Addlow fetching keys using OpenPGP DANE.
 +	* dirmngr/server.c (cmd_dns_cert): Add option --dane.
 +
 +	dirmngr: Improve DNS code to retrieve arbitrary records.
 +	* dirmngr/dns-cert.c (get_dns_cert): Add hack to retrieve arbitrary
 +	resource records.
 +	* dirmngr/dns-cert.h (DNS_CERTTYPE_RRBASE): New.
 +	(DNS_CERTTYPE_RR61): New.
 +
 +	dirmngr: Change DNS code to make additions easier.
 +	* dirmngr/dns-cert.c (get_dns_cert) [!USE_ADNS]: Change loop to allow
 +	adding more resource types.
 +
 +	dirmngr: Make commands RELOADDIRMNGR and KILLDIRMNGR work properly.
 +	* dirmngr/server.c (cmd_killdirmngr): Set assuan close flag.
 +	(cmd_reloaddirmngr): Use check_owner_permission.
 +
 +	dirmngr: Do tilde expansion for --hkp-cacert.
 +	* dirmngr/dirmngr.c (parse_rereadable_options): Do tilde expansion and
 +	check for cert file existance in option --hkp-cacert.
 +
 +	gpg: Fail decryption for AES etc message w/o MDC.
 +	* g10/mainproc.c (proc_encrypted): Fail for modern messages w/o MDC.
 +
 +2015-10-06  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: Fix verification of signature for smartcard.
 +	* agent/pksign.c (agent_pksign_do): Use public key smartcard.
 +
 +	agent: Fix non-allocation for pinentry_loopback.
 +	* agent/call-pinentry.c (agent_get_passphrase): Don't allocate, it will
 +	be allocated by pinentry_loopback.
 +
 +2015-10-05  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Install a dirmngr.conf file.
 +	* g10/dirmngr-conf.skel: New.
 +	* g10/Makefile.am (EXTRA_DIST): Add file.
 +	(install-data-local, uninstall-local): Install that file.
 +	* g10/openfile.c (copy_options_file): Add arg "name", return a value,
 +	simplify with xstrconcat, and factor warning message out to:
 +	(try_make_homedir): here.  Also install dirmngr.conf.
 +	* g10/options.skel: Remove --keyserver entry.
 +
 +	gpg: Deprecate the --keyserver option.
 +	* g10/keyserver.c (keyserver_refresh): Change return type to
 +	gpg_error_t.  Use gpg_dirmngr_ks_list to print the name of the
 +	keyserver to use.
 +	(keyserver_search): Do not print the "no keyserver" error
 +	message.  The same error is anyway returned from dirmngr.
 +	* g10/call-dirmngr.c (ks_status_parm_s): Add field "keyword".
 +	(ks_status_cb): Handle other status keywords.
 +	(gpg_dirmngr_ks_list): New.
 +	* tools/gpgconf-comp.c (gc_options_gpg): Deprecate "keyserver".
 +	(gc_options_dirmngr): Add "Keyserver" group and "keyserver".
 +
 +	dirmngr: Add option --keyserver.
 +	* dirmngr/dirmngr.c (oKeyServer): New.
 +	(opts): Add "keyserver".
 +	(parse_rereadable_options): Parse that options
 +	(main): Add option to the gpgconf list.
 +	* dirmngr/dirmngr.h (opt): Add field "keyserver".
 +	* dirmngr/server.c (ensure_keyserver): New.
 +	(make_keyserver_item): New.  Factored out from
 +	(cmd_keyserver): here.  Call ensure_keyserver.
 +	(cmd_ks_search): Call ensure_keyserver.
 +	(cmd_ks_get): Ditto.
 +	(cmd_ks_fetch): Ditto.
 +	(cmd_ks_put): Ditto.
 +
 +	dirmngr: Make clear that --use-tor is not yet ready for use.
 +	* dirmngr/dirmngr.c (main): Print a warning if --use-tor has been
 +	given.
 +	* tools/gpgconf-comp.c (gc_options_dirmngr): Make --use-tor invisible.
 +
 +	gpgconf: Change displayed name of Dirmngr to "Key Acquirer".
 +	* tools/gpgconf-comp.c (gc_component): Change printed name.
 +
 +2015-10-02  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Fix use-after-free due to a realloc shrinking.
 +	* dirmngr/ks-engine-hkp.c (map_host): Do not use original pointer
 +	after realloc.
 +
 +	agent: Fix alignment problem with the second passphrase struct.
 +	* agent/genkey.c (agent_ask_new_passphrase): Use a separate malloc for
 +	PI2.  Check return value of the malloc function.
 +	* agent/command-ssh.c (ssh_identity_register): Use a separate malloc
 +	for PI2.  Wipe PI2.
 +
 +2015-10-01  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix a practical hang after use of --faked-system-time.
 +	* g10/sign.c (update_keysig_packet): Bail out if we would need to long
 +	for a new timestamp.
 +
 +	gpg: Print more info with "check selfsig".
 +	* g10/keyedit.c (print_and_check_one_sig): Print more Some sigsub
 +	packets.
 +
 +	gpg: Add debug helper to --edit-keys's check sub-command.
 +	* g10/keyedit.c (print_and_check_one_sig): Add arg "extended" and
 +	print an asterisk for the chosen selfsig.
 +	(check_all_keysigs): Add arg "only_selfsig"
 +	(keyedit_menu) <cmdCHECK>: Add optional arg "selfsig".
 +
 +2015-10-01  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	common: Fix strsplit.
 +	* common/stringhelp.c (strsplit): Fix arguments order.
 +
 +2015-09-30  Neal H. Walfield  <neal at g10code.com>
 +
 +	common: Add mkdir_p.
 +	* common/mkdir_p.c: New file.
 +	* common/mkdir_p.h: New file.
 +	* common/Makefile.am (common_sources): Add mkdir_p.c and mkdir_p.h.
 +
 +	common: Remove unused files.
 +	* common/xmalloc.c: Remove file.
 +	* common/xmalloc.h: Remove file.
 +
 +	common: Include <gpg-error.h>.
 +	* common/logging.h: Include <gpg-error.h>.
 +
 +2015-09-29  Neal H. Walfield  <neal at g10code.com>
 +
 +	g10: Remove unused struct cmp_help_context_s.
 +	* g10/sig-check.c (struct cmp_help_context_s) Remove unused struct.
 +
 +	g10: Avoid an unnecessary copy.
 +	* g10/sig-check.c (signature_check2): Avoid copying PK to RET_PK.
 +	Instead, directly use the provided storage.  If none is provided
 +	allocate some.
 +
 +2015-09-29  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	ssh: Fix fingerprint computation for EdDSA key.
 +	* common/ssh-utils.c (get_fingerprint): Handle the prefix of 0x40.
 +	* common/t-ssh-utils.c (sample_keys): Add a new key.
 +
 +	agent: RSA signature verification by gpg-agent.
 +	* g10/sign.c (do_sign): Let verify signature by gpg-agent.
 +	* agent/pksign.c (agent_pksign_do): Call gcry_pk_verify for RSA.
 +
 +2015-09-28  Werner Koch  <wk at gnupg.org>
 +
 +	common: Provide two new error code replacements.
 +	* common/util.h (GPG_ERR_FALSE, GPG_ERR_TRUE): Rew replcements.
 +
 +	common: Change calling convention for gnupg_spawn_process.
 +	* common/exechelp.h (GNUPG_SPAWN_NONBLOCK): New.
 +	(GNUPG_SPAWN_RUN_ASFW, GNUPG_SPAWN_DETACHED): Macro to replace the
 +	numbers.
 +	* common/exechelp.h (gnupg_spawn_process): Change function to not take
 +	an optional stream for stdin but to return one.
 +	* common/exechelp-posix.c (gnupg_spawn_process): Implement change.
 +	(create_pipe_and_estream): Add args outbound and nonblock.
 +	* common/exechelp-w32.c (gnupg_spawn_process): Implement change.
 +
 +2015-09-28  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Handle error correctly.
 +	* scd/apdu.c (apdu_connect): Initialize variables and check an error
 +	of apdu_get_status_internal.
 +
 +2015-09-22  Werner Koch  <wk at gnupg.org>
 +
 +	ssh: Add 256, 384 and 521 bit test keys for the fingerprint.
 +	* common/t-ssh-utils.c (sample_keys): Add 3 new keys.
 +
 +	ssh: Fix fingerprint computation for 384 bit ECDSA keys.
 +	* common/ssh-utils.c (get_fingerprint): Fix hashed string.
 +
 +2015-09-19  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: Fix importing ECC key.
 +	* agent/cvt-openpgp.c (convert_from_openpgp_main): Only encrypted
 +	parameters are stored as opaque.
 +	(apply_protection): ARRAY members are all normal, non-opaque MPI.
 +	(extract_private_key): Get public key as normal, non-opaque MPI.
 +	Remove support of ECC key with '(flags param)'.
 +	Remove support of "ecdsa" and "ecdh" keys of our experiment.
 +
 +	scd: Fix KEYTOCARD handling for ECC key.
 +	* scd/app-openpgp.c (ecc_writekey): Only public key can be native
 +	format.
 +
 +2015-09-19  Neal H. Walfield  <neal at g10code.com>
 +
 +	common: Add new function strlist_length.
 +	* common/strlist.c (strlist_length): New function.
 +
 +2015-09-18  Werner Koch  <wk at gnupg.org>
 +
 +	gpgconf: Change displayed name of Dirmngr to "Network Manager".
 +	* tools/gpgconf-comp.c (gc_component): Change printed name.
 +
 +	dirmngr: Add option --use-tor as a stub.
 +	* dirmngr/dirmngr.h (opt): Add field "use_tor".
 +	* dirmngr/dirmngr.c (oUseTor): New.
 +	(opts): Add --use-tor.
 +	(parse_rereadable_options): Set option.
 +	(main): Tell gpgconf about that option.
 +
 +	* dirmngr/crlfetch.c (crl_fetch): Pass TOR flag to the http module and
 +	return an error if LDAP is used in TOR mode.
 +	(ca_cert_fetch): Return an error in TOR mode.
 +	(start_cert_fetch): Ditto.
 +	* dirmngr/ks-engine-finger.c (ks_finger_fetch): Pass TOR flag to the
 +	http module.
 +	* dirmngr/ks-engine-hkp.c (send_request): Ditto.
 +	* dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
 +	* dirmngr/ks-engine-ldap.c (ks_ldap_get): Return an error in TOR mode.
 +	(ks_ldap_search): Ditto.
 +	(ks_ldap_put): Ditto.
 +	* dirmngr/ocsp.c (do_ocsp_request): Ditto.  Also pass TOR flag to the
 +	http module.
 +
 +	* dirmngr/server.c (option_handler): Add "honor-keyserver-url-used".
 +	(cmd_dns_cert): Return an error in TOR mode.
 +	(cmd_getinfo): Add subcommand "tor"
 +	* tools/gpgconf-comp.c (gc_options_dirmngr): Add TOR group.
 +
 +	gpg: Report a conflict between honor-keyserver-url and TOR.
 +	* g10/call-dirmngr.c (create_context): Send option and print a verbose
 +	error.
 +
 +	http: Add flag to force use of TOR (part 1)
 +	* common/http.h (HTTP_FLAG_FORCE_TOR): New.
 +	* common/http.c (http_raw_connect, send_request): Detect flag and
 +	return an error for now.
 +
 +2015-09-17  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	po: Update Japanese translation.
 +
 +	scd: Fix ccid-driver timeout for OpenPGPcard v2.1.
 +	* scd/ccid-driver.c (CCID_CMD_TIMEOUT): New.
 +	(ccid_transceive_apdu_level, ccid_transceive): Use.
 +
 +2015-09-16  Werner Koch  <wk at gnupg.org>
 +
 +	agent: New option --pinentry-invisible-char.
 +	* agent/gpg-agent.c (oPinentryInvisibleChar): New.
 +	(opts): Add option.
 +	(parse_rereadable_options): Set option.
 +	* agent/agent.h (opt): Add field pinentry_invisible_char.
 +	* agent/call-pinentry.c (start_pinentry): Pass option to pinentry.
 +
 +	g13: Move some code to a separate module.
 +	* g13/g13-common.c, g13/g13-common.h: New.
 +	* g13/Makefile.am (g13_SOURCES): Add new files.
 +	* g13/g13.c (g13_errors_seen): Move to g13-common.c.
 +	(cmdline_conttype): New.
 +	(main): Use g13_init_signals and g13_install_emergency_cleanup.
 +	(emergency_cleanup, g13_exit): Move to g13-common.c.
 +	* g13/g13.h: Move OPT and some other code to g13-common.h.
 +
 +	gpg: Fix skip function dummy parameter.
 +	* g10/trustdb.c (search_skipfnc): Fix dummy argument
 +
 +	gpg: Change last commit to avoid extra translations.
 +	* g10/keyedit.c (keyedit_menu): Do not print usage hints in expert
 +	mode.
 +
 +2015-09-16  Neal H. Walfield  <neal at g10code.com>
 +
 +	g10: Improve error message.
 +	* g10/keyedit.c (keyedit_menu): When complaining that a user ID or key
 +	must be selected, indicate what command to use to do this.
 +
 +	g10: Be more careful when merging self-signed data.
 +	* g10/getkey.c (merge_selfsigs_main): Stop looking for self-signed
 +	data belonging to the public key when we encounter an attribute packet
 +	or a subkey packet, not just a user id packet.  When looking for
 +	self-signed data belonging to a user id packet, stop when we see a
 +	user attribute packet.
 +
 +	g10: Simplify some complicated boolean expressions.
 +	* g10/getkey.c (finish_lookup): Simplify logic.
 +
 +	g10: Also mark revoked and expired keys as unusable.
 +	* g10/getkey.c (skip_unusable): Also mark the key as unusable if it
 +	has been revoked or has expired.
 +
 +	g10: Release resources when returning an error in get_seckey.
 +	* g10/getkey.c (get_seckey): If the key doesn't have a secret key,
 +	release *PK.
 +
 +	g10: Improve documentation and comments for getkey.c.
 +	* g10/getkey.c: Improve documentation and comments for most
 +	functions.  Move documentation for public functions from here...
 +	* g10/keydb.h: ... to here.
 +
 +	g10: Remove unused function have_any_secret_key.
 +	* g10/getkey.c (have_any_secret_key): Remove function.
 +
 +	g10: Bring cache semantics closer to non-cache semantics.
 +	* g10/getkey.c (get_pubkey_fast): When reading from the cache, only
 +	consider primary keys.
 +
 +	g10: Break out of the loop earlier.
 +	* g10/getkey.c (have_secret_key_with_kid): Once we find the relevent
 +	key or subkey, stop searching.
 +
 +	g10: Don't skip legacy keys if the search mode is KEYDB_SEARCH_MODE_NEXT
 +	* g10/getkey.c (lookup): Also don't skip legacy keys if the search
 +	mode is KEYDB_SEARCH_MODE_NEXT.
 +
 +	g10: Remove unused function get_seckeyblock_byfprint.
 +	* g10/keydb.h (get_seckeyblock_byfprint): Remove prototype.
 +	* g10/getkey.c (get_seckeyblock_byfprint): Remove function.
 +
 +	g10: Remove unused function get_seckey_byfprint.
 +	* g10/keydb.h (get_seckey_byfprint): Remove prototype.
 +	* g10/getkey.c (get_seckey_byfprint): Remove function.
 +
 +	g10: Simplify get_seckey_byname: it was never called with NAME not NULL.
 +	* g10/keydb.h (get_seckey_byname): Rename from this...
 +	(get_seckey_default): ... to this.  Drop the parameter name.  Update
 +	users.
 +	* g10/getkey.c (get_seckey_byname): Rename from this...
 +	(get_seckey_default): ... to this.  Drop the parameter name.  Drop the
 +	code which assumed that NAME is not NULL.
 +
 +	g10: Eliminate the redundant function get_keyblock_byfprint.
 +	* g10/keydb.h (get_keyblock_byfprint): Remove prototype.  Replace use
 +	of this function with get_pubkey_byfprint.
 +	* g10/getkey.c (get_pubkey_byname): Remove function.
 +
 +	g10: Simplify semantics of get_pubkey_byname.
 +	* g10/getkey.c (get_pubkey_byname): If R_KEYBLOCK is not NULL, return
 +	the keyblock in R_KEYBLOCK independent of whether PK is set or not.
 +
 +	g10: Eliminate the redundant function get_pubkey_byname.
 +	* g10/getkey.c (get_pubkey_byname): Remove function.
 +	(lookup): Replace use of get_pubkey_byname by get_pubkey_byfprint.
 +
 +	g10: Eliminate the redundant function get_pubkey_end.
 +	* g10/keydb.h (get_pubkey_end): Remove declaration.  Replace use of
 +	function with getkey_end.
 +	* g10/getkey.c (get_pubkey_byname): Remove function.
 +
 +	g10: Eliminate the redundant function get_pubkey_next.
 +	* g10/keydb.h (get_pubkey_next): Remove prototype.
 +	* g10/getkey.c (get_pubkey_next): Remove function.
 +	* g10/keylist.c (locate_one): Use getkey_next instead of
 +	get_pubkey_next.
 +
 +	kbx: Change skipfnc's prototype so that we can provide all information.
 +	* kbx/keybox-search-desc.h (struct keydb_search_desc.skipfnc): Change
 +	third parameter to be the index of the user id packet in the keyblock
 +	rather than the packet itself.  Update users.
 +
 +	g10: Remove unused prototype (get_pubkey_byfpr).
 +	* g10/keydb.h (get_pubkey_byfpr): Remove unused prototype.
 +
 +	g10: Remove unused function (get_pubkey_bynames).
 +	* g10/keydb.h (get_pubkey_bynames): Remove prototype.
 +	* g10/getkey.c (get_pubkey_bynames): Remove function.
 +
 +	g10: Simplify code.  Turn struct getkey_ctx_s.found_key into an argument
 +	* g10/getkey.c (struct getkey_ctx_s): Remove field found_key.
 +	(lookup): Add argument ret_found_key.  If not NULL, set it to the
 +	found key.  Update callers.
 +	(pk_from_block): Add argument found_key.  Use it instead of
 +	CTX->FOUND_KEY.  Update callers.
 +	(finish_lookup): Return a KBNODE (the found key) instead of an int.
 +	Don't set CTX->FOUND_KEY.  Return the found key instead.
 +
 +	g10: Remove unused field struct getkey_ctx_s.kbpos.
 +	* g10/getkey.c (struct getkey_ctx_s): Remove field kbpos.
 +	(getkey_end): Don't clear CTX->KBPOS.
 +
 +	g10: Simplify code: remove field struct getkey_ctx_s.keyblock.
 +	* g10/getkey.c (struct getkey_ctx_s): Remove field keyblock.
 +	(finish_lookup): Add parameter keyblock.  Update caller to pass this.
 +	(lookup): Add new local variable keyblock.  Use this instead of
 +	ctx->keyblock for referencing the keyblock.
 +
 +2015-09-16  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: Fix registering SSH Key of Ed25519.
 +	* agent/command-ssh.c (stream_read_string): Add the prefix of 0x40.
 +
 +2015-09-15  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	po: Update Japanese translation.
 +
 +2015-09-10  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.8.
 +
 +	tests: Silence the 5gb-packet test.
 +	* tests/openpgp/4gb-packet.test: Send output to /dev/null.
 +
 +	g10: Fix make distcheck problem.
 +	* g10/test.c: Include string.h.
 +	(prepend_srcdir): New.  Taken from Libgcrypt.
 +	(test_free): New.
 +	* g10/t-keydb.c (do_test): Malloc the filename.
 +	* g10/Makefile.am (AM_CPPFLAGS): Remove -DSOURCE_DIR
 +	(EXTRA_DIST): Add t-keydb-keyring.kbx.
 +
 +	g10: Improve portability of the new test driver.
 +	* g10/test.c: Include stdio.h and stdlib.h.
 +	(verbose): New.
 +	(print_results): Rename to exit_tests.
 +	(main): Remove atexit and call exit_tests.  Set verbose.
 +	(ASSERT, ABORT): Call exit_tests instead of exit.
 +
 +2015-09-09  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Allow sending much larger keyblocks.
 +	* dirmngr/server.c (MAX_CERT_LENGTH): Increase to 16k.
 +	(MAX_KEYBLOCK_LENGTH): Increase to 20M.
 +
 +2015-09-07  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Force key attribute change for writekey.
 +	* scd/app-openpgp.c (change_rsa_keyattr): New.
 +	(change_keyattr_from_string): Use change_rsa_keyattr.
 +	(rsa_writekey): Call change_rsa_keyattr when different size.
 +	(ecc_writekey): Try to change key attribute.
 +
 +	scd: KEYNO cleanup.
 +	* scd/app-openpgp.c (get_public_key, send_keypair_info, do_readkey)
 +	(change_keyattr, change_keyattr_from_string, ecc_writekey, do_genkey)
 +	(compare_fingerprint, check_against_given_fingerprint): KEYNO starts
 +	from 0.
 +
 +2015-09-02  Neal H. Walfield  <neal at g10code.com>
 +
 +	g10: Remove unused field req_algo.
 +	* g10/packet.h (PKT_public_key): Remove unused field req_algo.  Remove
 +	users.
 +	* g10/getkey.c (struct getkey_ctx_s): Remove unused field req_algo.
 +	Remove users.
 +
 +	g10: Use a symbolic constant instead of a literal.
 +	* g10/trustdb.c (KEY_HASH_TABLE_SIZE): Define.
 +	(new_key_hash_table): Use KEY_HASH_TABLE_SIZE instead of a literal.
 +	(release_key_hash_table): Likewise.
 +	(test_key_hash_table): Likewise.
 +	(add_key_hash_table): Likewise.
 +
 +	g10: Add test for keydb as well as new testing infrastructure.
 +	* g10/Makefile.am (EXTRA_DIST): Add test.c.
 +	(AM_CPPFLAGS): Add -DSOURCE_DIR="\"$(srcdir)\"".
 +	(module_tests): Add t-keydb.
 +	(t_keydb_SOURCES): New variable.
 +	(t_keydb_LDADD): Likewise.
 +	* g10/t-keydb.c: New file.
 +	* g10/t-keydb-keyring.kbx: New file.
 +	* g10/test-stubs.c: New file.
 +	* g10/test.c: New file.
 +
 +	g10: Make the keyblock cache per-handle rather than global.
 +	* g10/keydb.c (keyblock_cache): Don't declare this variable.  Instead...
 +	(struct keyblock_cache): ... turn its type into this first class
 +	object...
 +	(struct keydb_handle): ... and instantiate it once per database
 +	handle.  Update all users.
 +	(keydb_rebuild_caches): Don't invalidate the keyblock cache.
 +
 +	g10: If iobuf_seek fails when reading from the cache, do a hard read.
 +	* g10/keydb.c (keydb_get_keyblock): If the iobuf_seek fails when
 +	reading from the cache, then simply clear the cache and try reading
 +	from the database.
 +
 +	iobuf: Reduce verbosity of test.
 +	* common/t-iobuf.c (main): Reduce verbosity.
 +
 +	iobuf: Add the IOBUF_INPUT_TEMP type to improve input temp handling.
 +	* common/iobuf.h (enum iobuf_use): Add new member, IOBUF_INPUT_TEMP.
 +	* common/iobuf.c (iobuf_temp_with_content): Create the iobuf as an
 +	IOBUF_INPUT_TEMP, not an IOBUF_INPUT buffer.  Assert that LENGTH ==
 +	A->D.SIZE.
 +	(iobuf_push_filter2): If A is an IOBUF_INPUT_TEMP, then make the new
 +	filter an IOBUF_INPUT filter and set its buffer size to
 +	IOBUF_BUFFER_SIZE.
 +	(underflow): If A is an IOBUF_INPUT_TEMP, then just return EOF; don't
 +	remove already read data.
 +	(iobuf_seek): If A is an IOBUF_INPUT_TEMP, don't discard the buffered
 +	data.
 +	(iobuf_alloc): Allow USE == IOBUF_INPUT_TEMP.
 +	(pop_filter): Allow USE == IOBUF_INPUT_TEMP.
 +	(iobuf_peek): Allow USE == IOBUF_INPUT_TEMP.
 +	(iobuf_writebyte): Fail if USE == IOBUF_INPUT_TEMP.
 +	(iobuf_write): Fail if USE == IOBUF_INPUT_TEMP.
 +	(iobuf_writestr): Fail if USE == IOBUF_INPUT_TEMP.
 +	(iobuf_flush_temp): Fail if USE == IOBUF_INPUT_TEMP.
 +
 +	iobuf: Rename IOBUF_TEMP to IOBUF_OUTPUT_TEMP.
 +	* common/iobuf.h (enum iobuf_use): Rename IOBUF_TEMP to
 +	IOBUF_OUTPUT_TEMP.  Update users.
 +
 +	iobuf: Use a first-class enum.
 +	* common/iobuf.h (enum iobuf_use): Name the IOBUF_OUTPUT, etc. enum.
 +	(struct iobuf_struct): Change the field use's type to it.
 +
 +	iobuf: Fix test.
 +	* common/t-iobuf.c (content_filter): If there is nothing to read,
 +	don't forget to set *LEN to 0.
 +	(main): Fix checks.
 +
 +2015-09-01  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Protect commit 135b1e3 against misbehaving Libgcrypt.
 +	* agent/command-ssh.c (ssh_key_to_blob): Check DATALEN.
 +
 +	gpg: Remove option --no-sig-create-check.
 +	* g10/gpg.c (opts): Remove --no-sig-create-check.
 +	* g10/options.h (struct opt): Remove field no_sig_create_check.
 +	* g10/sign.c (do_sign): Always check unless it is RSA and we are using
 +	Libgcrypt 1.7.
 +
 +	common: Assume an utf-8 locale on iconv errors.
 +	* common/utf8conv.c (handle_iconv_error): Use utf-8 as fallback.
 +
 +	common: Fix regression in building argpase.c standalone.
 +	* common/argparse.c (is_native_utf8) [GNUPG_MAJOR_VERSION]: New.
 +
 +2015-08-31  Neal H. Walfield  <neal at g10code.com>
 +
 +	g10: Don't leak memory if we fail to initialize a new database handle.
 +	* g10/keydb.c (keydb_new): If we fail to open a keyring or keybox
 +	correctly release all resources.
 +
 +	g10: Improve interface documentation of the keydb API.
 +	* g10/keydb.c: Improve code comments and documentation of internal
 +	interfaces.  Improve documentation of public APIs and move that to...
 +	* g10/keydb.h: ... this file.
 +
 +	g10: Don't cache search results if the search didn't scan the whole DB.
 +	* g10/keydb.c (struct keydb_handle): Add new field is_reset.
 +	(keydb_new): Initialize hd->is_reset to 1.
 +	(keydb_locate_writable): Set hd->is_reset to 1.
 +	(keydb_search): Set hd->is_reset to 0.  Don't cache a key not found if
 +	the search started from the beginning of the database.
 +
 +	g10: Have keydb_search_first call keydb_search_reset before searching.
 +	* g10/keydb.c (keydb_search_first): Reset the handle before starting
 +	the search.
 +
 +	g10: Remove unused parameter.
 +	* g10/keydb.h (keydb_locate_writable): Remove unused parameter
 +	reserved.  Update users.
 +
 +2015-08-31  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: Fix SSH public key for EdDSA.
 +	* agent/command-ssh.c (ssh_key_to_blob): Remove the prefix 0x40.
 +
 +2015-08-26  Neal H. Walfield  <neal at g10code.com>
 +
 +	g10: Simplify cache.  Only include data that is actually used.
 +	* g10/keydb.c (struct kid_list_s): Rename from this...
 +	(struct kid_not_found_cache_bucket): ... to this.  Update users.
 +	Remove field state.
 +	(kid_list_t): Remove type.
 +	(KID_NOT_FOUND_CACHE_BUCKETS): Define.  Use this instead of a literal.
 +	(kid_found_table): Rename from this...
 +	(kid_not_found_cache_bucket): ... to this.  Update users.
 +	(kid_found_table_count): Rename from this...
 +	(kid_not_found_cache_count): ... to this.  Update users.
 +	(kid_not_found_p): Only return whether a key with the specified key id
 +	is definitely not in the database.
 +	(kid_not_found_insert): Remove parameter found.  Update callers.
 +	(keydb_search): Only insert a key id in the not found cache if it is
 +	not found.  Rename local variable once_found to already_in_cache.
 +
 +2015-08-25  Werner Koch  <wk at gnupg.org>
 +
 +	Add configure option --enable-build-timestamp.
 +	* configure.ac (BUILD_TIMESTAMP): Set to "<none>" by default.
 +
 +	gpg: Emit ERROR status for key signing failures.
 +	* g10/keyedit.c (sign_uids): Write an ERROR status for a signing
 +	failure.
 +	(menu_adduid, menu_addrevoker, menu_revsig): Ditto.
 +	(menu_revuid, menu_revkey, menu_revsubkey): Ditto.
 +
 +	gpg: Print a new FAILURE status after most commands.
 +	* common/status.h (STATUS_FAILURE): New.
 +	* g10/cpr.c (write_status_failure): New.
 +	* g10/gpg.c (main): Call write_status_failure for all commands which
 +	print an error message here.
 +	* g10/call-agent.c (start_agent): Print an STATUS_ERROR if we can't
 +	set the pinentry mode.
 +
 +2015-08-24  Neal H. Walfield  <neal at g10code.com>
 +
 +	agent: Raise the maximum password length.  Don't hard code it.
 +	* agent/agent.h (MAX_PASSPHRASE_LEN): Define.
 +	* agent/command-ssh.c (ssh_identity_register): Use it instead of a
 +	hard-coded literal.
 +	* agent/cvt-openpgp.c (convert_from_openpgp_main): Likewise.
 +	* agent/findkey.c (unprotect): Likewise.
 +	* agent/genkey.c (agent_ask_new_passphrase): Likewise.
 +
 +2015-08-24  Werner Koch  <wk at gnupg.org>
 +
 +	sm: Support secret key export via the Assuan interface.
 +	* sm/server.c (cmd_export): Add options --secret, --raw, and --pkcs12.
 +
 +2015-08-23  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Allow sending of Zack's key.
 +	* dirmngr/server.c (MAX_KEYBLOCK_LENGTH): Increase to 1 MiB.
 +
 +	gpg: Fix regression in packet parser from Aug 19.
 +	* g10/parse-packet.c (parse): Use an int to compare to -1.  Use
 +	buf32_to_ulong.
 +
 +	gpg: Show not found keys with --locate-key --verbose.
 +	* g10/keylist.c (locate_one): Print a diagnostic for a not-found key.
 +
 +2015-08-21  Neal H. Walfield  <neal at g10code.com>
 +
 +	common: Don't incorrectly reject 4 GB - 1 sized packets.
 +	* g10/parse-packet.c (parse): Don't reject 4 GB - 1 sized packets.
 +	Add the constraint that the type must be 63.
 +	* kbx/keybox-openpgp.c (next_packet): Likewise.
 +	* tests/openpgp/4gb-packet.asc: New file.
 +	* tests/openpgp/4gb-packet.test: New file.
 +	* tests/openpgp/Makefile.am (TESTS): Add 4gb-packet.test.
 +	(TEST_FILES): Add 4gb-packet.asc.
 +
 +	common: Don't assume on-disk layout matches in-memory layout.
 +	* g10/packet.h (PKT_signature): Change revkey's type from a struct
 +	revocation_key ** to a struct revocation_key *.  Update users.
 +
 +	common: Don't incorrectly copy packets with partial lengths.
 +	* g10/parse-packet.c (parse): We don't handle copying packets with a
 +	partial body length to an output stream.  If this occurs, log an error
 +	and abort.
 +
 +	common: Check parameters more rigorously.
 +	* g10/parse-packet.c (dbg_copy_all_packets): Check that OUT is not
 +	NULL.
 +	(copy_all_packets): Likewise.
 +
 +	common: Don't continuing processing on error.
 +	* g10/parse-packet.c (dbg_parse_packet): Also return if parse returns
 +	an error.
 +	(parse_packet): Likewise.
 +	(dbg_search_packet): Likewise.
 +	(search_packet): Likewise.
 +
 +	common: Better respect the packet's length when reading it.
 +	* g10/parse-packet.c (parse_signature): Make sure PKTLEN doesn't
 +	underflow.  Be more careful that a read doesn't read more data than
 +	PKTLEN says is available.
 +
 +2015-08-20  Werner Koch  <wk at gnupg.org>
 +
 +	po: Add lost translation of validity strings.
 +	* po/POTFILES.in (trust.c): Add missing file.
 +	* po/de.po: Changed German validity strings.
 +	* doc/help.de.txt: Ditto.
 +
 +2015-08-20  Neal H. Walfield  <neal at g10code.com>
 +
 +	g10/parse-packet.c:parse: Try harder to not ignore an EOF.
 +	* g10/parse-packet.c (parse): Be more robust: make sure to process any
 +	EOF.
 +
 +	g10/parse-packet.c: Replace literal with symbolic expression.
 +	* g10/parse-packet.c (dump_hex_line): Use sizeof rather than the
 +	buffer's size.
 +
 +	Add documentation for g10/parse-packet.c.
 +	* g10/packet.h: Add documentation for functions defined in
 +	parse-packet.c.
 +	* g10/parse-packet.c: Improve comments for many functions.
 +
 +	g10/packet.h: Remove unused argument from enum_sig_subpkt.
 +	* g10/packet.h (enum_sig_subpkt): Remove argument RET_N.  Update
 +	callers.
 +	* g10/parse-packet.c (enum_sig_subpkt): Remove argument RET_N.
 +
 +	g10/parse-packet.c:mpi_read: Detect EOF and correct boundary conditions.
 +	* g10/parse-packet.c (mpi_read): Improve documentation.  Correctly
 +	handle an EOF.  On overflow, correctly return the number of bytes read
 +	from the pipeline.
 +
 +	common/iobuf.c: Make control flow more obvious.
 +	* common/iobuf.c (iobuf_read): Make control flow more obvious.
 +	(iobuf_get_filelength): Likewise.
 +	(iobuf_get_fd): Likewise.
 +	(iobuf_seek): Likewise.
 +
 +	common/iobuf.c: Add some sanity checks to catch programmer bugs.
 +	* common/iobuf.c (iobuf_alloc): Check that BUFSIZE is not 0.
 +	(iobuf_readbyte): Check that A is an input filter.  Check that the
 +	amount of read data is at most the amount of buffered data.
 +	(iobuf_read): Check that A is an input filter.
 +	(iobuf_writebyte): Check that A is not an input filter.
 +	(iobuf_writestr): Check that A is not an input filter.
 +	(iobuf_flush_temp): Check that A is not an input filter.
 +
 +	common/iobuf.c:iobuf_write_temp: Elide redundant code.
 +	* common/iobuf.c (iobuf_write_temp): Don't repeat iobuf_flush_temp.
 +	Use it directly.
 +
 +	common/iobuf.c: Have iobuf_writestr use iobuf_write, not iobuf_writebyte
 +	* common/iobuf.c (iobuf_write): Don't write a byte at a time.  Use
 +	iobuf_write.
 +
 +	common/iobuf: Improve documentation and code comments.
 +	common/iobuf.h: Improve documentation and code comments.
 +	common/iobuf.c: Likewise.
 +
 +	common/iobuf.c: Adjust buffer size of filters in front of temp filters.
 +	* common/iobuf.c (iobuf_push_filter2): If the head filter is a temp
 +	filter, use IOBUF_BUFFER_SIZE for the new filter.
 +
 +	common/iobuf.c: Buffered data should not be processed by new filters.
 +	* common/iobuf.c (iobuf_push_filter2): If the pipeline is an output or
 +	temp pipeline, the new filter shouldn't assume ownership of the old
 +	head's internal buffer: the data was written before the filter was
 +	added.
 +	* common/t-iobuf.c (double_filter): New function.
 +	(main): Add test cases for the above bug.
 +
 +	common/iobuf.c: Flush the pipeline in iobuf_temp_to_buffer.
 +	* common/iobuf.c (iobuf_temp_to_buffer): Flush each filter in the
 +	pipeline and copy the data from the last (not the first) filter's
 +	internal buffer.
 +
 +	common/iobuf.c: Combine iobuf_open, iobuf_create and iobuf_openrw.
 +	* common/iobuf.c (do_open): New function, which is a generalization of
 +	iobuf_open, iobuf_Create, iobuf_openrw.
 +	(iobuf_open): Call do_open.
 +	(iobuf_create): Likewise.
 +	(iobuf_openrw): Likewise.
 +
 +	common/iobuf.h: Remove iobuf_open_fd_or_name.
 +	* common/iobuf.h (iobuf_open_fd_or_name): Remove prototype.  Replace
 +	use with either iobuf_open or iobuf_fdopen_nc, as appropriate.
 +	* common/iobuf.c (iobuf_open): Remove function.
 +
 +	common/iobuf.c: Rename iobuf_flush and make it a static function.
 +	* common/iobuf.h (iobuf_flush): Remove prototype.
 +	* common/iobuf.c (filter_flush): New static prototype.
 +	(iobuf_flush): Rename...
 +	(filter_flush): ... to this.  Make static.  Simplify code.  Update
 +	callers.
 +
 +	common/iobuf.c: Don't abort freeing a pipeline if freeing a filter fails
 +	* common/iobuf.c (iobuf_cancel): Don't abort freeing a pipeline if
 +	freeing a filter fails.  This needs to a memory leak.  Instead, keep
 +	freeing and return the error code of the first filter that fails.
 +
 +	common/iobuf.c: Improve iobuf_peek.
 +	* common/iobuf.c (underflow): Take additional parameter
 +	clear_pending_eof.  If not set, don't clear a pending eof when
 +	returning EOF.  Update callers.
 +	(iobuf_peek): Fill the internal buffer, if needed, to be able to
 +	better satisfy any request.
 +
 +	common/iobuf.c: When requested, fill the buffer even if it is not empty.
 +	* common/iobuf.c (underflow): Don't require that the buffer be empty.
 +	When called, fill any available space.
 +
 +	common/t-iobuf.c: Add a test case for multiple EOFs.
 +	common/t-iobuf.c (main): Add a test case for multiple EOFs in an INPUT
 +	pipeline.
 +
 +	common/iobuf.c: Better respect boundary conditions in iobuf_read_line.
 +	* common/iobuf.c (iobuf_read_line): Be more careful with boundary
 +	conditions.
 +	* common/iobuf.h: Include <gpg-error.h>.
 +	* common/t-iobuf.c: New file.
 +	* common/Makefile.am (module_tests): Add t-iobuf.
 +	(t_mbox_util_LDADD): New variable.
 +
 +	common/iobuf.c: Fix filter type for iobuf_temp_with_content.
 +	* common/iobuf.c (iobuf_temp_with_content): Set the filter type to
 +	IOBUF_INPUT, not IOBUF_TEMP, which is only for output filters that
 +	write into a dynamic buffer.
 +
 +	common/iobuf.h: Remove unimplemented prototypes.
 +	* common/iobuf.h (iobuf_unread): Remove unimplemented prototype.
 +	(iobuf_clear_eof): Likewise.
 +	(iobuf_append): Likewise.
 +
 +	common/iobuf.c: Refactor code to not need the desc field.
 +	* common/iobuf.h (struct iobuf_struct): Remove field desc.
 +	* common/iobuf.c (iobuf_desc): New function.  When a filter's
 +	description is needed, use this instead of the filter's desc field.
 +
 +	common/iobuf.h: Clarify semantics of nofast.  Simplify implementation.
 +	* common/iobuf.h (struct iobuf_struct): Clarify semantics of nofast.
 +	Simplify use of nofast to implement just these semantics.
 +
 +	common/iobuf.c: Remove dead code (directfp).
 +	* common/iobuf.h (struct iobuf_struct): Remove field directfp.  Remove
 +	all uses of it.
 +
 +	common/iobuf.c: Remove dead code (opaque).
 +	* common/iobuf.h (struct iobuf_struct): Remove field opaque.  Remove
 +	all uses of it.
 +
 +	common/iobuf.h: Replace further use of literals with symbolic constants.
 +	* common/iobuf.c: Move BLOCK_FILTER_INPUT,
 +	BLOCK_FILTER_OUTPUT_BLOCK_FILTER_TEMP from here...
 +	* common/iobuf.h: ... to here and rename to IOBUF_INPUT, IOBUF_OUTPUT
 +	and IOBUF_TEMP, respectively.  Where appropriate, use these macros
 +	instead of a literal.
 +
 +2015-08-17  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Avoid linking to Libksba.
 +	* kbx/keybox.h (KEYBOX_WITH_X509): Do not define.
 +	* sm/Makefile.am (AM_CPPFLAGS): Define it here.
 +	(common_libs): Change to libkeybox509.a
 +	* g10/Makefile.am (AM_CFLAGS): remove KSBA_CFLAGS.
 +	(gpg2_LDADD, gpgv2_LDADD): Remove KSBA_LIBS
 +	* kbx/Makefile.am (noinst_LIBRARIES): Add libkeybox509.a.
 +	(libkeybox509_a_SOURCES): New.
 +	(libkeybox_a_CFLAGS): New.
 +	(libkeybox509_a_CFLAGS): New.
 +	(kbxutil_CFLAGS): New.
 +	* kbx/keybox-search.c (has_keygrip) [!KEYBOX_WITH_X509]: Declare args
 +	as unused.
 +
 +2015-08-16  Ben Kibbey  <bjk at luxsci.net>
 +
 +	Fix pinentry loopback and passphrase contraints.
 +	* agent/command.c (cmd_get_passphrase): Don't repeat passphrase for
 +	pinentry loopback mode.
 +	* agent/genkey.c (check_passphrase_constraints): Immediately return when
 +	pinentry mode is loopback.
 +
 +	Fix sending INQUIRE_MAXLEN for symmetric data.
 +	* g10/passphrase.c (passphrase_to_dek_ext): Write the status message.
 +
 +2015-08-15  Ben Kibbey  <bjk at luxsci.net>
 +
 +	Inform a user about inquire length limit.
 +	* common/status.h (INQUIRE_MAXLEN): New.
 +	* g10/call-agent.c (default_inquire_cb): Send STATUS_INQUIRE_MAXLEN.
 +	client when inquiring a passphrase over pinentry-loopback.
 +
 +	Allow --gen-key to inquire a passphrase.
 +	* g10/gpg.c (main): test for --command-fd during --gen-key parse.
 +
 +	When --command-fd is set then imply --batch to let gpg inquire a
 +	passphrase rather than requiring a pinentry.
 +
 +2015-08-11  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.7.
 +
 +2015-08-10  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: fix ECC key handling.
 +	* agent/cvt-openpgp.c (get_keygrip, convert_secret_key)
 +	(convert_transfer_key): CURVE is the name of curve.
 +
 +2015-08-08  Neal H. Walfield  <neal at g10code.com>
 +
 +	common/iobuf.c: Replace use of literals with symbolic constants.
 +	* common/iobuf.c (BLOCK_FILTER_INPUT): Define.  Where appropriate, use
 +	this instead of a literal.
 +	(BLOCK_FILTER_OUTPUT): Likewise.
 +	(BLOCK_FILTER_TEMP): Likewise.
 +
 +2015-08-07  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Allow gpgv to work with a trustedkeys.kbx file.
 +	* g10/keydb.h (KEYDB_RESOURCE_FLAG_GPGVDEF): New.
 +	* g10/keydb.c (keydb_add_resource): Take care of new flag.
 +	* g10/gpgv.c (main): Use new flag.
 +
 +	agent: Add option --force to the DELETE_KEY command.
 +	* agent/findkey.c (agent_delete_key): Add arg "force".
 +	* agent/command.c (cmd_delete_key): Add option --force.
 +
 +	common: Change alias for Curve25519 to "cv25519".
 +	* common/openpgp-oid.c (oidtable): Change alias.
 +
 +2015-08-06  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Remove duplicated printing of the curve name in "sub" lines.
 +	* g10/keylist.c (list_keyblock_print): Do not print extra curve name.
 +
 +	gpg: Add commands "fpr *" and "grip" to --edit-key.
 +	* g10/keyedit.c (cmdGRIP): New.
 +	(cmds): Add command "grip".
 +	(keyedit_menu) <cmdFPR>: Print subkeys with argument "*".
 +	(keyedit_menu) <cmdGRIP>: Print keygrip.
 +	(show_key_and_fingerprint): Add arg "with_subkeys".
 +	(show_key_and_grip): New.
 +	* g10/keylist.c (print_fingerprint): Add mode 4.
 +
 +	gpg: Adjust UID line indentation for common key algos.
 +	* g10/keylist.c (list_keyblock_print): Change UID line indentation
 +	* g10/mainproc.c (list_node): Ditto.
 +
 +2015-08-06  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	Curve25519 support.
 +	* agent/cvt-openpgp.c (get_keygrip): Handle Curve25519.
 +	(convert_secret_key, convert_transfer_key): Ditto.
 +	* common/openpgp-oid.c (oidtable): Add Curve25519.
 +	(oid_crv25519, openpgp_oid_is_crv25519): New.
 +	* common/util.h (openpgp_oid_is_crv25519): New.
 +	* g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Handle the case
 +	with Montgomery curve which uses x-only coordinate.
 +	* g10/keygen.c (gen_ecc): Handle Curve25519.
 +	(ask_curve): Change the API and second arg is to return subkey algo.
 +	(generate_keypair, generate_subkeypair): Follow chage of ask_curve.
 +	* g10/keyid.c (keygrip_from_pk): Handle Curve25519.
 +	* g10/pkglue.c (pk_encrypt): Handle Curve25519.
 +	* g10/pubkey-enc.c (get_it): Handle the case with Montgomery curve.
 +	* scd/app-openpgp.c (ECC_FLAG_DJB_TWEAK): New.
 +	(send_key_attr): Work with general ECC, Ed25519, and Curve25519.
 +	(get_public_key): Likewise.
 +	(ecc_writekey): Handle flag_djb_tweak.
 +
 +	common: extend API of openpgp_oid_to_curve for canonical name.
 +	* common/openpgp-oid.c (openpgp_oid_to_curve): Add CANON argument.
 +	* common/util.h: Update.
 +	* g10/import.c (transfer_secret_keys): Follow the change.
 +	* g10/keyid.c (pubkey_string): Likewise.
 +	* g10/keylist.c (list_keyblock_print, list_keyblock_colon): Likewise.
 +	* parse-packet.c (parse_key): Likewise.
 +	* scd/app-openpgp.c (send_key_attr, get_public_key): Likewise.
 +
 +2015-08-05  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix ecc_oid.
 +	* scd/app-openpgp.c (ecc_oid): Call with OIDBUF.
 +
 +	scd: Fix ECC support.
 +	* scd/app-openpgp.c (send_key_attr): Send KEYNO.
 +	(get_public_key): Fix SEXP composing.
 +	(ecc_writekey): Fix OID length calculation.
 +	(ecc_oid): Prepend the length before query.
 +	(parse_algorithm_attribute): Handle the case the curve is not available.
 +
 +2015-08-04  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix duplicate key import due to legacy key in keyring.
 +	* g10/keydb.c (keydb_search_fpr): Skip legacy keys.
 +
 +	gpg: Properly handle legacy keys while looking for a secret key.
 +	* g10/getkey.c (have_secret_key_with_kid): Skip legacy keys.
 +
 +2015-07-31  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix endless loop for expired keys given by fpr.
 +	* g10/getkey.c (lookup): Disable keydb caching when continuing a
 +	search.
 +
 +2015-07-29  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Do not return "Legacy Key" from lookup if a key is expired.
 +	* g10/getkey.c (lookup): Map GPG_ERR_LEGACY_KEY.
 +
 +	gpg: Indicate secret keys and cards in a key-edit listing.
 +	* g10/keyedit.c (sign_uids): Add arg "ctrl".
 +	(show_key_with_all_names_colon): Ditto.
 +	(show_key_with_all_names): Ditto.
 +
 +	* g10/keyedit.c (show_key_with_all_names): Print key record
 +	indicators by checking with gpg-agent.
 +	(show_key_with_all_names): Ditto.  May now also print sec/sbb.
 +
 +2015-07-28  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Remove the edit-key toggle command.
 +	* g10/keyedit.c (cmds): Remove helptext from "toggle".
 +	(keyedit_menu): Remove "toggle" var and remove the sub/pub check
 +	against toggle.
 +
 +	common,w32: Avoid unused var warning about msgcache.
 +	* common/i18n.c (USE_MSGCACHE): New.
 +	(msgcache) [!USE_MSGCACHE]: Do not define.
 +	(i18n_localegettext): Repalce #if conditions by USE_MSGCACHE.
 +
 +	w32: Try more places to find an installed Pinentry.
 +	* common/homedir.c (get_default_pinentry_name): Re-implement to
 +	support several choices for Windows.
 +
 +2015-07-26  Werner Koch  <wk at gnupg.org>
 +
 +	scd: Fix size_t/unsigned int mismatch.
 +	* scd/app-openpgp.c (ecc_writekey): Use extra var n.
 +
 +	Replace GNUPG_GCC_A_ macros by GPGRT_ATTR_ macros.
 +	* common/util.h: Provide replacement for GPGRT_ATTR_ macros when using
 +	libgpg-error < 1.20.
 +	* common/mischelp.h: Ditto.
 +	* common/types.h: Ditto.
 +
 +2015-07-25  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: support any curves defined by libgcrypt.
 +	* g10/call-agent.h (struct agent_card_info_s): Add curve field.
 +	* g10/call-agent.c (learn_status_cb): Use curve name.
 +	* g10/card-util.c (card_status): Show pubkey name.
 +	* scd/app-openpgp.c (struct app_local_s): Record OID and flags.
 +	(store_fpr): Use ALGO instead of key type.
 +	(send_key_attr): Use curve name instead of OID.
 +	(get_public_key): Clean up by OID to curve name.
 +	(ecc_writekey): Support any curves in libgcrypt.
 +	(do_genkey, do_auth, ): Follow the change.
 +	(ecc_oid): New.
 +	(parse_algorithm_attribute): Show OID here.
 +
 +2015-07-23  Peter Wu  <peter at lekensteyn.nl>
 +
 +	build: ignore scissor line for the commit-msg hook.
 +	* build-aux/git-hooks/commit-msg: Stop processing more lines when the
 +	  scissor line is encountered.
 +
 +2015-07-23  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Format change to specify "rsa2048" for KEY-ATTR.
 +	* g10/card-util.c (do_change_keysize): Put "rsa".
 +	* scd/app-openpgp.c (change_keyattr, change_keyattr_from_string):
 +	Change the command format.
 +	(rsa_writekey): Check key type.
 +	(do_writekey): Remove "ecdh" and "ecdsa" support which was available
 +	in experimental libgcrypt before 1.6.0.
 +
 +2015-07-22  Werner Koch  <wk at gnupg.org>
 +
 +	Avoid a leading double slash in make_filename.
 +	* common/stringhelp.c (do_make_filename): Special case leading '/'.
 +
 +2015-07-21  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: change_keyattr_from_string for ECC.
 +	* scd/app-openpgp.c (change_keyattr, change_keyattr_from_string):
 +	Support ECC.
 +	(rsa_writekey): Don't change key attribute.
 +
 +2015-07-17  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Use openpgpdefs.h for constants.
 +	* scd/app-openpgp.c: Include openpgpdefs.h.
 +
 +2015-07-16  Neal H. Walfield  <neal at g10code.com>
 +
 +	Don't segfault if the first 'auto-key-locate' option is 'clear'.
 +	* g10/getkey.c (free_akl): If AKL is NULL, just return.
 +
 +2015-07-10  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: Support non-NLS build.
 +	* agent/agent.h: Use ENABLE_NLS and define L_() macro.
 +
 +2015-07-09  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Remove unused files.
 +	* scd/Makefile.am (sc_copykeys_*): Remove.
 +	* scd/sc-copykeys.c: Remove.
 +	* scd/pcsc-wrapper.c: Remove.
 +	* scd/{card-common.h,card-dinsig.c,card-p15.c,card.c}: Remove.
 +
 +2015-07-08  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: Use canonical name for curve.
 +	* g10/import.c (transfer_secret_keys): Use canonical name.
 +	* common/openpgp-oid.c (openpgp_curve_to_oid): Return NULL on error.
 +	* g10/keyid.c (pubkey_string): Follow change of openpgp_curve_to_oid.
 +	* g10/keylist.c (list_keyblock_print, list_keyblock_colon): Ditto.
 +	* g10/parse-packet.c (parse_key): Ditto.
 +
 +2015-07-03  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	drop long-deprecated gpgsm-gencert.sh.
 +	 * tools/gpgsm-gencert.sh: remove deprecated script entirely.  It is
 +	   fully replaced by gpgsm --gen-key
 +	 * doc/tools.texi: remove gpgsm-gencert.sh documentation
 +	 * .gitignore: no longer ignore gpgsm-gencert.sh manpage
 +	 * doc/Makefile.am: quit making the manpage
 +	 * tools/Makefile.am: quit distributing the script
 +	 * doc/howto-create-a-server-cert.texi: overhaul documentation to use
 +	   gpgsm --gen-key and tweak explanations
 +
 +2015-07-02  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	po: Update Japanese translation.
 +
 +	scd: Support AES decryption for OpenPGPcard v3.0.
 +	* scd/app-openpgp.c (do_decipher): Support AES decryption.
 +
 +2015-07-01  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.6.
 +
 +2015-07-01  Daiki Ueno  <ueno at gnu.org>
 +
 +	agent: Unset INSIDE_EMACS on gpg-agent startup.
 +	* agent/gpg-agent.c (main): Unset INSIDE_EMACS envvar.
 +
 +2015-07-01  Werner Koch  <wk at gnupg.org>
 +
 +	common: Implement i18n_localegettext.
 +	* common/i18n.c (msg_cache_s, msg_cache_head_s): New.
 +	(msgcache): New.
 +	(i18n_localegettext): Implement locale dependent lookup.
 +
 +2015-06-30  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	Pass DBUS_SESSION_BUS_ADDRESS for gnome3.
 +	* common/session-env.c (stdenvnames): Add DBUS_SESSION_BUS_ADDRESS.
 +
 +2015-06-30  Werner Koch  <wk at gnupg.org>
 +
 +	Flag the L_() function with attribute format_arg.
 +	* agent/agent.h (LunderscorePROTO): New.
 +	* common/util.h (GNUPG_GCC_ATTR_FORMAT_ARG): New.
 +	* common/i18n.h (GNUPG_GCC_ATTR_FORMAT_ARG): New. Use for
 +	i18n_localegettext.  Expand LunderscorePROTO.
 +	* agent/genkey.c (check_passphrase_constraints): Use xtryasprintf
 +	again to keep the old translations.
 +
 +	agent: Use different translation func for Pinentry strings.
 +	* po/Makevars (XGETTEXT_OPTIONS): Add keyword "L_".
 +	* common/i18n.c (i18n_localegettext): New stub.
 +	* common/i18n.h: Expand the LunderscoreIMPL macro.
 +	* agent/agent.h (L_): New.
 +	(LunderscoreIMPL): New.
 +	* agent/call-pinentry.c (setup_qualitybar): Add arg ctrl anc change
 +	caller.
 +	* agent/findkey.c (try_unprotect_cb): Add local var ctrl.
 +	* agent/genkey.c (check_passphrase_constraints): Replace xtryasprintf
 +	by xtrystrdup to avoid gcc warning.  Unfortinately this changes the
 +	string.
 +	(agent_ask_new_passphrase): Cleanup the use of initial_errtext.
 +
 +	gpg: Make show-sig-subpackets work again.
 +	* g10/gpg.c (parse_list_options): Fix offset for subpackets.
 +
 +2015-06-29  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Prepare for Libassuan with Cygwin support.
 +	* agent/gpg-agent.c (create_server_socket): Add arg "cygwin".  Call
 +	assuan_sock_set_flag if Assuan version is recent enough.
 +	(main): Create ssh server socket with Cygwin flag set.
 +
 +2015-06-29  Neal H. Walfield  <neal at gnu.org>
 +
 +	Show passphrase constraints errors as password prompt errors.
 +	* agent/agent.h (check_passphrase_constraints): Add parameter
 +	failed_constraint and remove parameter silent.  Update callers.
 +	* agent/genkey.c (check_passphrase_constraints): Add parameter
 +	failed_constraint and remove parameter silent.  If FAILED_CONSTRAINT
 +	is not NULL and OPT.ENFORCE_PASSPHRASE_CONSTRAINTS is FALSE, save the
 +	error text in *FAILED_CONSTRAINT and don't call take_this_one_anyway
 +	or take_this_one_anyway2.  If FAILED_CONSTRAINT is NULL, act as if
 +	SILENT was set.
 +	(agent_ask_new_passphrase): Change initial_errtext's type from a const
 +	char * to a char *.  Pass it to check_passphrase_constraints.  If it
 +	contains malloc's memory, free it.
 +
 +2015-06-29  Neal H. Walfield  <neal at g10code.com>
 +
 +	Improve documentation for default-cache-ttl and default-cache-ttl-ssh.
 +	* doc/gpg-agent.texi (Agent Options): Improve documentation for
 +	default-cache-ttl and default-cache-ttl-ssh.
 +
 +	Don't raise max-cache-ttl to default-cache-ttl.
 +	* agent/gpg-agent.c (finalize_rereadable_options): Don't raise
 +	max-cache-ttl to default-cache-ttl.  Likewise for max-cache-ttl-ssh
 +	and default-cache-ttl-ssh.
 +
 +	Improve the description of old packets with an indeterminate length.
 +	* g10/parse-packet.c (parse): Make the description more accurate when
 +	listing packets: old format packets don't support partial lengths,
 +	only indeterminate lengths (RFC 4880, Section 4.2).
 +
 +2015-06-29  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Add --verify to the PASSWD command.
 +	* agent/command.c (cmd_passwd): Add option --verify.
 +
 +	agent,w32: Do not create a useless socket with --enable-putty-support.
 +	* agent/agent.h (opt): Remove field ssh_support.
 +	* agent/gpg-agent.c (ssh_support): New.  Replace all opt.ssh_support
 +	by this.
 +	(main): Do not set ssh_support along with setting putty_support.
 +
 +	gpgsm: Add command option "offline".
 +	* sm/server.c (option_handler): Add "offline".
 +	(cmd_getinfo): Ditto.
 +	* sm/certchain.c (is_cert_still_valid):
 +	(do_validate_chain):
 +	* sm/gpgsm.c (gpgsm_init_default_ctrl): Default "offline" to the value
 +	of --disable-dirmngr.
 +	* sm/call-dirmngr.c (start_dirmngr_ext): Better also check for
 +	ctrl->offline.
 +
 +2015-06-26  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Support button flag and AES key data for OpenPGPcard v3.0.
 +	* scd/app-openpgp.c (do_getattr, show_caps, app_select_openpgp):
 +	Support button and symmetric decryption.
 +	(do_setattr): Support setting AESKEY.
 +
 +2015-06-25  Andre Heinecke  <aheinecke at intevation.de>
 +
 +	sm: Fix cert storage for ephemeral certs.
 +	* sm/keydb.c (keydb_store_cert): Clear ephemeral flag for
 +	existing certs if store should not be ephemeral.
 +
 +2015-06-23  Werner Koch  <wk at gnupg.org>
 +
 +	Allow use of debug flag names for all tools.
 +	* g13/g13.c: Make use of debug_parse_flag.
 +	* scd/scdaemon.c: Ditto.
 +	* sm/gpgsm.c: Ditto
 +	* agent/gpg-agent.c: Ditto.  But do not terminate on "help"
 +	* dirmngr/dirmngr.c: Ditto.
 +
 +	common: Improve fucntion parse_debug_flag.
 +	* common/miscellaneous.c (parse_debug_flag): Add hack not to call
 +	exit.  Add "none" and "all" flags.
 +
 +2015-06-23  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: pinpad workaround for PC/SC implementations.
 +	* scd/adpu.c (pcsc_pinpad_verify, pcsc_pinpad_modify): Bigger buffer
 +	for TPDU card reader.
 +
 +2015-06-22  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Allow debug flag names for --debug.
 +	* g10/gpg.c (opts): Change arg for oDebug to a string.
 +	(debug_flags): New; factored out from set_debug.
 +	(set_debug): Remove "--debug-level help".  Use parse_debug_flag to
 +	print the used flags.
 +	(main): Use parse_debug_flag for oDebug.
 +
 +	common: Add function parse_debug_flag.
 +	* common/miscellaneous.c (parse_debug_flag): New.
 +	* common/util.h (struct debug_flags_s): New.
 +
 +	common: Add function strtokenize.
 +	* common/stringhelp.c: Include assert.h.
 +	(strtokenize): New.
 +	* common/t-stringhelp.c (test_strtokenize): New.
 +
 +	gpg: Fix regression due to recent commit 6500f33.
 +	* g10/keydb.c (kid_list_s): Keep a state in the table.
 +	(kid_not_found_table): Rename to kid_found_table.
 +	(n_kid_not_found_table): Rename to kid_found_table_count.
 +	(kid_not_found_p): Return found state.
 +	(kid_not_found_insert): Add arg found.
 +	(keydb_search): Store found state in the table.
 +
 +2015-06-22  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix Cherry ST-2000 support for pinpad input.
 +	* scd/apdu.c (pcsc_vendor_specific_init): Set pinmax to 15.
 +	* scd/ccid-driver.c (ccid_transceive_secure): Add zero for the
 +	template of APDU.
 +
 +2015-06-20  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Print number of good signatures with --check-sigs.
 +	* g10/keylist.c (keylist_context): Add field good_sigs.
 +	(list_keyblock_print): Updated good_sigs.
 +	(print_signature_stats): Print number of good signatures and use
 +	log_info instead of tty_printf.
 +
 +	gpg: Improve speed of --check-sigs and --lish-sigs.
 +	* g10/keydb.c (kid_list_t): New.
 +	(kid_not_found_table, n_kid_not_found_table): New.
 +	(kid_not_found_p, kid_not_found_insert, kid_not_found_flush): New.
 +	(keydb_insert_keyblock): Flush the new cache.
 +	(keydb_delete_keyblock): Ditto.
 +	(keydb_update_keyblock): Ditto.
 +	(keydb_search): Use the new cache.
 +	(keydb_dump_stats): New.
 +	* g10/gpg.c (g10_exit): Dump keydb stats.
 +
 +2015-06-19  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add more log_clock calls to keydb.c.
 +	* g10/keydb.c (keydb_get_keyblock): Add log_clock calls.
 +
 +	gpg: Print available debug flags using "--debug-level help".
 +	* g10/gpg.c (set_debug): Add "help" option and use a table for the
 +	flags.
 +
 +	gpg: Fix export problem in case an old keyring has PGP-2 keys.
 +	* g10/export.c (do_export_stream): Skip legacy keys.
 +
 +2015-06-18  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Fix the cleanup zombies fix (685b782).
 +	* dirmngr/ldap-wrapper.c (ldap_wrapper_thread): Do not close the
 +	stdout reader after EOF from read_log_data.
 +	* dirmngr/crlcache.c (crl_cache_reload_crl): Close the reader before
 +	the next iteration.
 +
 +2015-06-17  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Print a warning for obsolete options.
 +	* g10/misc.c (obsolete_scdaemon_option): Move to
 +	* common/miscellaneous.c (obsolete_option): ... here.
 +	* agent/gpg-agent.c (main): Use obsolete_option for the 3 obsolete
 +	options.
 +
 +2015-06-16  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Cleanup zombies and fix hang on shutdown.
 +	* dirmngr/ldap-wrapper.c (ldap_wrapper_thread): Move nfds computation
 +	into the loop.  Check the queue also on timeout.  Close log_fd and
 +	reader context on EOF or error.
 +
 +	dirmngr: Avoid accessing uninitialized memory in log callback.
 +	* dirmngr/dirmngr.c (pid_suffix_callback): Clear int_and_ptr_u before
 +	use.
 +	(start_connection_thread): Ditto.
 +	(handle_connections): Ditto.
 +
 +2015-06-16  Neal H. Walfield  <neal at g10code.com>
 +
 +	Don't prompt for the password multiple times in pinentry loopback mode.
 +	* g10/gpg.c (main): If OPT.PINENTRY_MODE is PINENTRY_MODE_LOOPBACK,
 +	clear OPT.PASSPHRASE_REPEAT.
 +
 +2015-06-16  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	po: Update Japanese Translation.
 +
 +2015-06-15  Werner Koch  <wk at gnupg.org>
 +
 +	doc: Add defs.inc to BUILT_SOURCES.
 +
 +2015-06-11  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.5.
 +
 +	agent: Fix --extra-socket on Windows.
 +	* agent/gpg-agent.c (start_connection_thread): Rename to ...
 +	(do_start_connection_thread): this.  Factor nonce checking out to ...
 +	(start_connection_thread_std): this,
 +	(start_connection_thread_extra): this,
 +	(start_connection_thread_browser): and this.
 +
 +	agent: Add experimental option --browser-socket.
 +	* agent/agent.h (opt): Add field "browser_socket".
 +	* agent/command.c (cmd_setkeydesc): Use a different message for
 +	restricted==2.
 +	* agent/gpg-agent.c (oBrowserSocket): New.
 +	(opts): Add --browser-socket.
 +	(socket_name_browser, redir_socket_name_browser): New.
 +	(socket_nonce_browser): New.
 +	(cleanup): Cleanup browser socket.
 +	(main): Implement option.
 +	(start_connection_thread_browser): New.
 +	(handle_connections): Add arg listen_fd_browser and use it.
 +
 +2015-06-10  Daiki Ueno  <ueno at gnu.org>
 +
 +	agent: Add option --allow-emacs-pinentry.
 +	* agent/agent.h (opt): Add field allow_emacs_pinentry.
 +	* agent/call-pinentry.c (start_pinentry): Act upon new var.
 +	* agent/gpg-agent.c (oAllowEmacsPinentry): New.
 +	(opts): Add option --allow-emacs-pinentry.
 +	(parse_rereadable_options): Set this option.
 +	* tools/gpgconf-comp.c (gc_options_gpg_agent): Add new option.
 +
 +2015-06-09  Werner Koch  <wk at gnupg.org>
 +
 +	doc: Do not used fixed file names in the manuals.
 +	* doc/mkdefsinc.c: New.
 +	* doc/Makefile.am: Include cmacros.am.
 +	(EXTRA_DIST): Add mkdefsinc.c defsincdate.
 +	(BUILT_SOURCES): Add defsincdate
 +	(CLEANFILES): Add mkdefsinc and defs.inc.
 +	(mkdefsinc): New rule.
 +	(yat2m-stamp): Depend on defs.inc.
 +	($(myman_pages) gnupg.7): Ditto.
 +	(gnupg.texi): Remove rule to touch itself.
 +	(dist-hook): New.
 +	(defsincdate): New.
 +	(defs.inc): New.
 +	* doc/gnupg.texi: Remove inclusion of version.texi.  Include defs.inc.
 +	Also include defs.inc in all files used to build man files.  Change
 +	fixed directory names to those from defs.inc.
 +
 +	dirmngr: Avoid crash due to an empty crls.d/DIR.txt.
 +	* dirmngr/crlcache.c (check_dir_version): Avoid segv.
 +
 +2015-06-08  Werner Koch  <wk at gnupg.org>
 +
 +	doc: Change the manual source to be only for GnuPG 2.1.
 +
 +	Convey envvar INSIDE_EMACS to the pinentry.
 +	* common/session-env.c (stdenvnames): Add it.
 +
 +	agent: Add command "getinfo std_env_names".
 +	* agent/command.c (cmd_getinfo): Add new sub-command.
 +
 +2015-06-05  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: do_decipher change for OpenPGPcard v3.0.
 +	* scd/app-openpgp.c (do_decipher): Add a header for ECDH.
 +
 +2015-06-04  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Replace -1 by GPG_ERR_NOT_FOUND in tdbio.c.
 +	* g10/tdbio.c (lookup_hashtable): Return GPG_ERR_NOT_FOUND.
 +	* g10/tdbdump.c (import_ownertrust): Test for GPG_ERR_NOT_FOUND.
 +	* g10/trustdb.c (read_trust_record): Ditto.
 +	(tdb_get_ownertrust, tdb_get_min_ownertrust): Ditto.
 +	(tdb_update_ownertrust, update_min_ownertrust): Ditto.
 +	(tdb_clear_ownertrusts, update_validity): Ditto.
 +	(tdb_cache_disabled_value): Ditto.
 +
 +	gpg: Cleanup error code path in case of a bad trustdb.
 +	* g10/tdbio.c (tdbio_read_record): Fix returning of the error.
 +
 +	gpg: Fix output in case of a corrupted trustdb.
 +	* g10/tdbdump.c (list_trustdb): Add arg FP and change callers to pass
 +	es_stdout.
 +	* g10/tdbio.c (upd_hashtable): On a corrupted trustdb call
 +	list_trustdb only in verbose > 1 mode and let it dump to stderr.
 +
 +2015-05-29  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix key template of ECC.
 +	* scd/app-openpgp.c (build_ecc_privkey_template): Use correct value.
 +
 +2015-05-28  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: Fix a race condition initially creating trustdb.
 +	* g10/tdbio.c (take_write_lock, release_write_lock): New.
 +	(put_record_into_cache, tdbio_sync, tdbio_end_transaction): Use
 +	new lock functions.
 +	(tdbio_set_dbname): Fix the race.
 +	(open_db): Don't call dotlock_create.
 +
 +2015-05-27  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: Remove g10/signal.c.
 +	* g10/signal.c: Remove.
 +	* g10/main.h: Remove old function API.
 +	* g10/tdbio.c: Use new API, even in the dead code.
 +
 +2015-05-20  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Cleanup caching code for command GET_PASSPHRASE.
 +	* agent/command.c (cmd_get_passphrase): Read from the user cache.
 +
 +2015-05-19  Neal H. Walfield  <neal at g10code.com>
 +
 +	agent: When the password cache is cleared, also clear the ext. cache.
 +	* agent/agent.h (agent_clear_passphrase): New declaration.
 +	* agent/call-pinentry.c (agent_clear_passphrase): New function.
 +	* agent/command.c (cmd_clear_passphrase): Call agent_clear_passphrase.
 +
 +	agent: Modify agent_clear_passphrase to support an ext. password cache.
 +	* agent/agent.h (agent_get_passphrase): Add arguments keyinfo and
 +	cache_mode.  Update callers.
 +	* agent/call-pinentry.c (agent_get_passphrase): Add arguments keyinfo
 +	and cache_mode.  If KEYINFO and CACHE_MODE describe a cachable key,
 +	then send SETKEYINFO to the pinentry.
 +
 +2015-05-19  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: detects public key encryption packet error properly.
 +	g10/mainproc.c (proc_pubkey_enc): Only allow relevant algorithms for
 +	encryption.
 +
 +2015-05-15  Werner Koch  <wk at gnupg.org>
 +
 +	build: Make --disable-gpgsm work.
 +	* Makefile.am: Always build kbx/
 +	* g10/Makefile.am (AM_CFLAGS): Include KSBA_CFLAGS.
 +
 +2015-05-12  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.4.
 +
 +	speedo: Add make option SELFCHECK=0 to build a new release.
 +	* build-aux/getswdb.sh: Add option --skip-selfcheck.
 +	* build-aux/speedo.mk: Add option SELFCHECK.
 +
 +2015-05-11  Werner Koch  <wk at gnupg.org>
 +
 +	common: Cope with AIX problem on number of open files.
 +	* common/exechelp-posix.c: Limit returned value for too hight values.
 +
 +	gpg-connect-agent: Fix quoting of internal percent+ function.
 +	* tools/gpg-connect-agent.c (get_var_ext) <percent, percent+): Also
 +	escape '+'.
 +
 +	agent: Add option --no-allow-external-cache.
 +	* agent/agent.h (opt): Add field allow_external_cache.
 +	* agent/call-pinentry.c (start_pinentry): Act upon new var.
 +	* agent/gpg-agent.c (oNoAllowExternalCache): New.
 +	(opts): Add option --no-allow-external-cache.
 +	(parse_rereadable_options): Set this option.
 +
 +	agent: Add strings for use by future Pinentry versions.
 +	* agent/call-pinentry.c (start_pinentry): Add more strings.
 +
 +	agent: Add option --debug-pinentry.
 +	* agent/gpg-agent.c (oDebugPinentry): New.
 +	(opts): Add --debug-pinentry.
 +	(parse_rereadable_options): Set that option.
 +	* agent/call-pinentry.c (start_pinentry): Pass option to
 +	assuan_set_flag.
 +
 +2015-05-08  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Avoid cluttering stdout with trustdb info in verbose mode.
 +	* g10/trustdb.c (validate_keys): Call dump_key_array only in debug
 +	mode.
 +
 +	gpg: Fix wrong output in list mode.
 +	* g10/parse-packet.c (parse_gpg_control): Replace puts by es_fputs to
 +	LISTFP.
 +
 +	gpg: New command --quick-adduid.
 +	* g10/keygen.c (ask_user_id): Factor some code out to ...
 +	(uid_already_in_keyblock): new.
 +	(generate_user_id): Add arg UIDSTR.  Fix leaked P.
 +	* g10/keyedit.c (menu_adduid): Add new arg uidstring.  Adjust caller.
 +	(keyedit_quick_adduid): New.
 +	* g10/gpg.c (aQuickAddUid): New.
 +	(opts):  Add command --quick-adduid.
 +	(main): Implement that.
 +
 +	gpg: Add push/pop found state feature to keydb.
 +	* g10/keydb.c (keydb_handle): Add field saved_found.
 +	(keydb_new): Init new field.
 +	(keydb_push_found_state, keydb_pop_found_state): New.
 +	* g10/keyring.c (kyring_handle): Add field saved_found.
 +	(keyring_push_found_state, keyring_pop_found_state): New.
 +
 +	gpg: Minor code merging in keyedit.
 +	* g10/keyedit.c (fix_keyblock): Rename to fix_key_signature_order.
 +	(fix_keyblock): New.  Call fix_key_signature_order and other fix
 +	functions.
 +	(keyedit_menu): Factor code out to new fix_keyblock.
 +	(keyedit_quick_sign): Ditto.  Check for primary fpr before calling
 +	fix_keyblock.
 +
 +2015-05-07  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Minor change for 56b5c9f.
 +	* agent/call-pinentry.c (agent_askpin): Move option setting to ...
 +	(start_pinentry): here.  Fix error code check.
 +
 +2015-05-07  Kristian Fiskerstrand  <kf at sumptuouscapital.com>
 +
 +	dirmngr: Fix segfault in ldap engine.
 +	(ks-engine-ldap.c) Fix segfault caused by missing check whether uri is
 +	initialized
 +
 +2015-05-07  Neal H. Walfield  <neal at g10code.com>
 +
 +	agent: Improve support for externally cached passwords.
 +	* agent/call-pinentry.c (PINENTRY_STATUS_PASSWORD_FROM_CACHE): New
 +	constant.
 +	(pinentry_status_cb): Add it to *FLAGS if PASSWORD_FROM_CACHE was
 +	provided.
 +	(agent_askpin): Pass "OPTION allow-external-password-cache" to the
 +	pinentry.  Always pass SETKEYINFO to the pinentry.  If there is no
 +	stable identifier, then use "--clear".  If the password is incorrect
 +	and PINENTRY_STATUS_PASSWORD_FROM_CACHE is set in *PINENTRY_STATUS,
 +	then decrement PININFO->FAILED_TRIES.
 +
 +	agent: Or in the value; don't overwrite the variable.
 +	* agent/call-pinentry.c (pinentry_status_cb): Or in
 +	PINENTRY_STATUS_CLOSE_BUTTON; don't overwrite *FLAG.
 +
 +	agent: Avoid magic numbers.  Use more accurate names.
 +	* agent/call-pinentry.c (PINENTRY_STATUS_CLOSE_BUTTON): New constant.
 +	(PINENTRY_STATUS_PIN_REPEATED): Likewise.
 +	(close_button_status_cb): Rename from this...
 +	(pinentry_status_cb): ... to this.  Use the constants.
 +	(agent_askpin): Rename local variable from close_button to
 +	pinentry_status.  Use symbolic constants rather than magic numbers.
 +
 +2015-05-07  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Improve 'General key info' line of --card-status.
 +	* g10/keylist.c (print_pubkey_info): Print either "pub" or "sub".
 +
 +	* g10/getkey.c (get_pubkey_byfprint): Add optional arg R_KEYBLOCK.
 +	* g10/keyid.c (keyid_from_fingerprint): Adjust for change.
 +	* g10/revoke.c (gen_desig_revoke): Adjust for change.
 +	* g10/card-util.c (card_status): Simplify by using new arg.  Align
 +	card-no string.
 +
 +	* g10/card-util.c (card_status): Remove not used GnuPG-1 code.
 +
 +	gpg: Fix regression not displaying the card serial number.
 +	* g10/call-agent.c (keyinfo_status_cb): Detect KEYINFO.
 +
 +2015-05-06  Werner Koch  <wk at gnupg.org>
 +
 +	speedo,w32: Install a native pinentry.
 +	* build-aux/speedo.mk: Always build pinentry for w32.
 +	(speedo_pkg_pinentry_configure): Adjust to modern pinentry.
 +	* build-aux/speedo/w32/inst.nsi: Install native pinentry under the
 +	name pinentry-basic.exe.
 +
 +2015-05-01  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: fix cmp_public_key.
 +	* g10/free-packet.c (cmp_public_keys): Compare opaque
 +	data at the first entry of the array when it's unknown algo.
 +
 +2015-04-30  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: PC/SC reader selection by partial string match.
 +	* scd/apdu.c (open_pcsc_reader_direct): Partial string match.
 +
 +2015-04-24  Werner Koch  <wk at gnupg.org>
 +
 +	common: Remove JNLIB from boiler plate (jnlib merge).
 +	* common/README.jnlib: Remove.
 +
 +	common: Rename log and gcc attribute macros (jnlib merge).
 +	* common/logging.h: Rename JNLIB_LOG_* to GPGRT_LOG_*.
 +	* common/mischelp.h: Rename JNLIB_GCC_* to GPGRT_GCC_*.
 +
 +	common: Remove two JNLIB_ macros (jnlib merge).
 +	* configure.ac: Merge seperate jnlib checks.
 +	(HAVE_JNLIB_LOGGING): Remove.
 +	* common/logging.c, common/simple-pwquery.c (JNLIB_NEED_AFLOCAL):
 +	Rename to GNUPG_COMMON_NEED_AFLOCAL.  Change all tests.
 +
 +	common: Remove libjnlib-config.h (jnlib merge).
 +	* common/libjnlib-config.h: Remove.
 +	* common/common-defs.h (getenv) [HAVE_GETENV]: New.  From removed
 +	header.
 +	(getpid) [HAVE_W32CE_SYSTEM]: New.  From removed header.
 +	* common/argparse.c: Include util.h and common-defs.h.  Replace
 +	jnlib_ macro names for non-GNUPG builds by x* names.
 +	* common/dotlock.c: Ditto.
 +	* common/logging.c: Include util.h and common-defs.h.  Replace jnlib_
 +	symbol names by x* names.
 +	* common/strlist.c: Ditto.
 +	* common/utf8conv.c: Ditto.
 +	* common/w32-reg.c: Ditto.
 +	* common/mischelp.c: Ditto.  Also remove _jnlib_free.
 +	* common/stringhelp.c: Ditto.
 +	(JNLIB_LOG_WITH_PREFIX): Do not depend on this macro.
 +	* common/logging.h (JNLIB_LOG_WITH_PREFIX): Do not depend on this
 +	macro.
 +
 +2015-04-23  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Move all DNS access to Dirmngr.
 +	* common/dns-cert.h: Move to ../dirmngr/.
 +	* common/dns-cert.c: Move to ../dirmngr/.  Change args to return the
 +	key as a buffer.
 +	* common/t-dns-cert.c: Move to ../dirmngr/.
 +	* common/pka.c, common/pka.h, common/t-pka.c: Remove.
 +
 +	* dirmngr/server.c (data_line_cookie_write): Factor code out to
 +	data_line_write and make it a wrapper for that.
 +	(data_line_write): New.
 +	(cmd_dns_cert): New.
 +	(register_commands): Register new command.
 +
 +	* g10/Makefile.am (LDADD): Remove DNSLIBS.
 +	* g10/call-dirmngr.c (dns_cert_parm_s): New.
 +	(dns_cert_data_cb, dns_cert_status_cb): New.
 +	(gpg_dirmngr_dns_cert): New.
 +	(gpg_dirmngr_get_pka): New.
 +	* g10/gpgv.c (gpg_dirmngr_get_pka): New dummy function.
 +	* g10/keyserver.c (keyserver_import_cert): Replace get_dns_cert by
 +	gpg_dirmngr_dns_cert.
 +	(keyserver_import_pka): Replace get_pka_info by gpg_dirmngr_get_pka.
 +	* g10/mainproc.c: Include call-dirmngr.h.
 +	(pka_uri_from_sig): Add CTX arg. Replace get_pka_info by
 +	gpg_dirmngr_get_pka.
 +
 +	common: Minor change of hex2str to allow for embedded nul.
 +	* common/convert.c (hex2str): Set ERRNO.  Return adjusted COUNT.
 +
 +2015-04-23  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	common: removal of t-support.c from t_jnlib_src.
 +	* common/Makefile.am (t_jnlib_src): Remove t-support.c.
 +
 +2015-04-21  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Make keyserver-option http_proxy work.
 +	* g10/options.h (opt): Add field keyserver_options.http_proxy.
 +	* g10/keyserver.c (warn_kshelper_option): Add arg noisy.
 +	(parse_keyserver_options): Parse into new http_proxy field.
 +	* g10/call-dirmngr.c (create_context): Send the http-proxy option.
 +
 +	common: Make proper use of http proxy parameter.
 +	* common/http.c (is_hostname_port): New.
 +	(send_request): Fix proxy name parsing.
 +
 +	dirmngr: Add http proxy support for keyservers.
 +	* dirmngr/dirmngr.h (server_control_s): Add field http_proxy.
 +	* dirmngr/dirmngr.c (dirmngr_init_default_ctrl): Copy http_proxy value
 +	from OPT.
 +	(dirmngr_deinit_default_ctrl): New.
 +	(main): Call dirmngr_deinit_default_ctrl.
 +	* dirmngr/server.c (start_command_handler): Ditto.
 +	(option_handler): Add option "http-proxy".
 +	* dirmngr/crlfetch.c (crl_fetch): Take http_proxy from CTRL.
 +	* dirmngr/ocsp.c (do_ocsp_request): Ditto.
 +	* dirmngr/ks-engine-hkp.c (send_request): Add proxy support.
 +	* dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
 +
 +	gpg: Do not use honor-keyserver-url sub-option by default.
 +
 +	gpg: Make preferred keyservers work.
 +	* g10/call-dirmngr.c (dirmngr_local_s): Add field set_keyservers_done.
 +	(create_context): Move keyserver setting to ...
 +	(open_context): here.
 +	(clear_context_flags): New.
 +	(gpg_dirmngr_ks_get): Add arg override_keyserver.
 +	* g10/keyserver.c (keyserver_refresh): Improve diagnostics.
 +	(keyserver_get_chunk): Ditto.  Pass OVERRIDE_KEYSERVER to ks_get.
 +
 +	gpg: Update sub-options of --keyserver-options.
 +	* g10/options.h (KEYSERVER_HTTP_PROXY): New.
 +	(KEYSERVER_USE_TEMP_FILES, KEYSERVER_KEEP_TEMP_FILES): Remove.
 +	(KEYSERVER_TIMEOUT): New.
 +	* common/keyserver.h (KEYSERVER_TIMEOUT): Remove.
 +	* g10/keyserver.c (keyserver_opts): Remove obsolete "use-temp-files"
 +	and "keep-temp-files". Add "http-proxy" and "timeout".
 +	(parse_keyserver_options): Remove 1.2 compatibility option
 +	"honor-http_proxy".  Remove "use-temp-files" and "keep-temp-files"
 +	code.
 +
 +2015-04-14  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Send the new SETKEYINFO command to the Pinentry.
 +	* agent/call-pinentry.c (agent_askpin): Add args keyinfo and
 +	cache_mode.  Change all callers to pass (NULL,0) for them.  Send
 +	SETKEYINFO command.
 +	* agent/findkey.c (unprotect): Pass the keygrip and the cache_mode for
 +	the new args.
 +
 +2015-04-14  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: better handling of extended APDU.
 +	* scd/apdu.c (send_le): Bug fix for not append Z when lc<0&&le<0.
 +	* scd/app-common.h (struct app_ctx_s): Use bit fields for flags.
 +	* scd/ccid-driver.c (CCID_MAX_BUF): New.  Only for OpenPGPcard.
 +	(struct ccid_driver_s): New field of max_ccid_msglen.
 +	 Remove ifsd field.
 +	(parse_ccid_descriptor): Initialize max_ccid_msglen.
 +	(ccid_transceive_apdu_level): Implement sending extended APDU in
 +	chain of CCID message.
 +
 +2015-04-13  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix NULL-segv due to invalid imported data.
 +	* g10/free-packet.c (my_mpi_copy): New.
 +	(copy_public_key, copy_signature): Use instead of mpi_copy.
 +
 +2015-04-13  Neal H. Walfield  <neal at g10code.com>
 +
 +	dirmngr: If LDAP is not enable, don't build the LDAP bits.
 +	* dirmngr/Makefile.am (dirmngr_SOURCES): Only include
 +	ks-engine-ldap.c, ldap-parse-uri.c and ldap-parse-uri.h if USE_LDAP
 +	is TRUE.
 +	(module_tests): Only add t-ldap-parse-uri if USE_LDAP is TRUE.
 +	* dirmngr/ks-action.c: Only include "ldap-parse-uri.h" if USE_LDAP is
 +	TRUE.
 +	(ks_action_help): Don't invoke LDAP functionality if USE_LDAP is not
 +	TRUE.
 +	(ks_action_search): Likewise.
 +	(ks_action_get): Likewise.
 +	(ks_action_put): Likewise.
 +	* dirmngr/server.c: Only include "ldap-parse-uri.h" if USE_LDAP is
 +	TRUE.
 +	(cmd_keyserver): Don't invoke LDAP functionality if USE_LDAP is not
 +	TRUE.
 +
 +2015-04-13  Werner Koch  <wk at gnupg.org>
 +
 +	common: Do without nested fucntions to support non-gcc.
 +	* common/t-stringhelp.c (test_strsplit): Remove nested function.
 +
 +2015-04-11  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.3.
 +
 +2015-04-11  Yuri Chornoivan  <yurchor at ukr.net>
 +
 +	po: Update Ukrainian translation.
 +
 +2015-04-11  Ineiev  <ineiev at gnu.org>
 +
 +	po: Update and review Russian translation.
 +
 +2015-04-10  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr,w32: Make it build for Windows.
 +	* dirmngr/Makefile.am (t_common_ldadd): Add missing libs.
 +
 +	Remove obsolete directories from AM_CPPFLAGS.
 +
 +	dirmngr,w32: Replace functions not available under Windows.
 +	* dirmngr/ks-engine-ldap.c (extract_attributes): Replace isoptime and
 +	gmtime_r.
 +
 +	common: Add new function gnupg_gmtime.
 +	* common/gettime.c (gnupg_gmtime): New.
 +	(gnupg_get_isotime): Use it.  Also take care of an gmtime_t returning
 +	an error.
 +
 +	common: Add new function isodate_human_to_tm.
 +	* common/gettime.c (isotime_human_p): Add arg date_only.
 +	(isodate_human_to_tm): New.
 +	* common/t-gettime.c (test_isodate_human_to_tm): New.
 +	(main): Call new test.
 +
 +	dirmngr,w32: Avoid name clash with existing function.
 +	* dirmngr/ks-engine-ldap.c (ldap_connect): Rename to my_ldap_connect.
 +
 +	gpgparsemail: Fix last commit (3f2bdac)
 +	* tools/rfc822parse.c (parse_field): Replace break by goto.
 +
 +2015-04-09  Werner Koch  <wk at gnupg.org>
 +
 +	gpgparsemail: Fix case of zero length continuation lines.
 +	* tools/rfc822parse.c (parse_field): Loop after continuation line.
 +
 +2015-04-08  Werner Koch  <wk at gnupg.org>
 +
 +	sm: Fix certificate lookup in dirmngr cache.
 +	* sm/call-dirmngr.c (get_cached_cert): Fix typo in LOOKUP command.
 +
 +2015-04-06  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Print the user id in --fast-list-mode.
 +	* g10/keylist.c (list_keyblock_print, list_keyblock_colon): Change.
 +
 +	gpg: Prepare to pass additional context to the list functions.
 +	* g10/keylist.c (struct sig_stats): Rename to keylist_context and add
 +	field check_sigs.
 +	(keylist_context_release): New.
 +	(list_all): Set listctx.check_sigs and call release func.
 +	(list_one): Ditto.
 +	(locate_one): Ditto.
 +	(list_keyblock_print): Use .check_sigs field.  Repalce arg opaque by
 +	listctx.
 +	(list_keyblock): Ditto.  Make static.
 +	(list_keyblock_direct): New.
 +	* g10/keygen.c (do_generate_keypair): Replace list_keyblock by
 +	list_keyblock_direct.
 +
 +	gpg: Merge duplicated code for get_user_id et al.
 +	* g10/getkey.c (get_user_id_string): Add args mode and r_LEN.
 +	(get_user_id_string_native): Add new args.
 +	(get_long_user_id_string, get_user_id): Rewrite using
 +	get_user_id_string.
 +
 +	gpg: Add new option --debug-iolbf.
 +	* g10/gpg.c (oDebugIOLBF): new.
 +	(opts): Add --debug-iolbf.
 +	(main): Set option.
 +
 +	Rename DBG_ASSUAN to DBG_IPC and add separate DBG_EXTPROG.
 +	* g10/options.h (DBG_EXTPROG_VALUE): Separate from DBG_IPC_VALUE.
 +
 +	Fix use of DBG_CACHE and DBG_LOOKUP.
 +	* dirmngr/dirmngr.h (DBG_LOOKUP_VALUE): Change to 8192.
 +	* g10/options.h (DBG_LOOKUP_VALUE, DBG_LOOKUP): New.
 +	* g10/getkey.c: Use DBG_LOOKUP instead of DBG_CACHE at most places.
 +
 +	gpg: Rename a debug macro.
 +	* g10/options.h (DBG_CIPHER_VALUE): Rename to DBG_CRYPTO_VALUE.
 +	(DBG_CIPHER): Rename to DBG_CRYPTO.
 +
 +2015-04-05  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix DoS while parsing mangled secret key packets.
 +	* g10/parse-packet.c (parse_key): Check PKTLEN before calling mpi_read
 +	et al.
 +
 +2015-04-03  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: Fix keytocard.
 +	g10/call-agent.h (agent_scd_learn): Add FORCE option.
 +	g10/call-agent.c (agent_scd_learn): Implement FORCE option.
 +	g10/keygen.c (gen_card_key): Follow the change of option.
 +	g10/card-util.c (change_pin, card_status, factory_reset): Likewise.
 +	g10/keyedit.c (keyedit_menu): Update private key storage by
 +	agent_scd_learn.
 +
 +	agent: Add --force option for LEARN.
 +	* agent/command.c (cmd_learn): Handle --force option.
 +	(cmd_keytocard): Don't update key storage file.
 +	* agent/agent.h (agent_handle_learn): Add FORCE.
 +	* agent/learncard.c (agent_handle_learn): Implement FORCE to update
 +	key stroage file.
 +
 +2015-03-31  Neal H. Walfield  <neal at g10code.com>
 +
 +	dirmngr: Don't use alloca.
 +	* dirmngr/ks-engine-ldap.c (ks_ldap_put): Replace use of alloca with
 +	xmalloc and xfree.
 +
 +	dirmngr: Simplify truncation of long strings in debug code.
 +	* dirmngr/ks-engine-ldap.c (modlist_dump): Simplify truncation of long
 +	strings.
 +
 +	dirmngr: Use a better error code.
 +	* dirmngr/ldap-parse-uri.c (ldap_parse_uri): On error, return
 +	GPG_ERR_GENERAL, not GPG_ERR_ASS_GENERAL.
 +
 +	dirmngr: Better encapsulate the keyservers variable.
 +	* dirmngr/dirmngr.h (struct server_control_s): Move field keyservers
 +	from here...
 +	* dirmngr/server.c (struct server_local_s): ... to here.  Update
 +	users.
 +	* dirmngr/ks-action.h (ks_action_resolve): Add argument keyservers.
 +	(ks_action_search): Likewise.
 +	(ks_action_get): Likewise.
 +	(ks_action_put): Likewise.
 +	* dirmngr/ks-action.c (ks_action_resolve): Add argument keyservers.
 +	Use it instead of ctrl->keyservers.
 +	(ks_action_search): Likewise.
 +	(ks_action_get): Likewise.
 +	(ks_action_put): Likewise.
 +
 +2015-03-28  Neal H. Walfield  <neal at g10code.de>
 +
 +	gpg: Only use the last specified keyserver.
 +	* g10/gpg.c (main): Only use the last specified keyserver.
 +
 +2015-03-25  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Fix resource leaks and check rare errors.
 +	* dirmngr/ks-engine-ldap.c (keyspec_to_ldap_filter): Fix resource
 +	leak.
 +	(ks_ldap_search): Check error from es_fopenmem.  Use LDAP_ERR where
 +	required.
 +	(modlist_dump): Check error from es_fopenmem.
 +	(uncescape): s/int/size_t/.  Use existing macros.
 +	(extract_attributes): Use existing trim function.
 +	(ks_ldap_put): Do not segv on error from modlist_dump.
 +
 +	dirmngr: Minor cleanups.
 +	* dirmngr/ks-engine-ldap.c [__riscos__]: Remove doubled util.h.
 +	(ldap_to_gpg_err): s/GPG_ERR_GENERAL/GPG_ERR_INTERNAL/.
 +	(tm2ldaptime): Use snprintf.
 +	(ldap_connect): Get error code prior to log_error and and use modern
 +	function.   Use xfree, xtrustrdup etc.
 +	(modlist_lookup): Use GNUPG_GCC_A_USED.
 +	(modlist_free): Use xfree.
 +
 +	common: Add macro GNUPG_GCC_A_USED.
 +	* common/util.h (GNUPG_GCC_A_USED): New.
 +
 +	sm: Change default algos to SHA256 (CSR) and AES128 (bulk encryption).
 +	* sm/certreqgen.c (create_request): Change default hash algo.
 +	* sm/gpgsm.c (DEFAULT_CIPHER_ALGO): Change default bulk cipher algo.
 +
 +2015-03-24  Werner Koch  <wk at gnupg.org>
 +
 +	gpg,w32: Handle forward slash in --keyring option.
 +	* g10/keydb.c (keydb_add_resource): Allow forward slash under Windows.
 +
 +2015-03-23  Neal H. Walfield  <neal at g10code.de>
 +
 +	Improve documentation for ks_hkp_get.
 +	* dirmngr/ks-engine-hkp.c (ks_hkp_get): Improvement documentation.
 +
 +	Improve documenation of http_parse_uri.
 +	* common/http.c (http_parse_uri): Improve documentation.
 +
 +	Add support to talking to LDAP key servers.
 +	* g10/call-dirmngr.c (record_output): New function.
 +	(ks_put_inq_cb): Use it here to generate a --with-colons like output
 +	instead of a custom format.
 +	* dirmngr/ks-action.c: Include "ldap-parse-uri.h".
 +	(ks_action_help): If the provided URI is an LDAP URI, then use
 +	ldap_parse_uri to parse.  Call ks_ldap_help.
 +	(ks_action_search): If passed an LDAP URI, then call ks_ldap_search.
 +	(ks_action_get): Likewise.
 +	(ks_action_put): Likewise.  Also, change data from a 'const void *' to
 +	a 'void *' and add info and infolen parameters.  Add note that
 +	function may modify DATA.
 +	* dirmngr/ks-action.h (ks_action_put): Update declaration accordingly.
 +	* dirmngr/server.c: Include "ldap-parse-uri.h".
 +	(cmd_keyserver): If ITEM->URI is an LDAP URI, parse it using
 +	ldap_parse_uri.
 +	(hlp_ks_put): Improve documentation.
 +	(cmd_ks_put): Also pass info and infolen to ks_action_put.  Improve
 +	documentation.
 +	* dirmngr/ks-engine.h (ks_ldap_help): New declaration.
 +	(ks_ldap_search): Likewise.
 +	(ks_ldap_get): Likewise.
 +	(ks_ldap_put): Likewise.
 +	* dirmngr/ks-engine-ldap.c: New file.
 +	* dirmngr/Makefile.am (dirmngr_SOURCES): Add ks-engine-ldap.c,
 +	ldap-parse-uri.c and ldap-parse-uri.h.
 +	(dirmngr_LDADD) [USE_LDAP]: Add $(ldaplibs).
 +
 +	Import _gpgme_parse_timestamp from gpgme as parse_timestamp.
 +	* common/gettime.h (parse_timestamp): New declaration.
 +	* common/gettime.c (_win32_timegm): New function imported from
 +	gpgme/src/conversion.c:_gpgme_timegm.
 +	(parse_timestamp): New function imported from
 +	gpgme/src/conversion.c:_gpgme_parse_timestamp.
 +
 +	Move copy_stream function to misc.c.
 +	* dirmngr/ks-action.c (copy_stream): Move function from here...
 +	* dirmngr/misc.c (copy_stream): ... to here and drop the static
 +	qualifier.
 +	* dirmngr/misc.h (copy_stream): Add declaration.
 +
 +	Move armor_data to misc.c.
 +	* dirmngr/ks-engine-hkp.c (armor_data): Move function from here...
 +	* dirmngr/misc.c (armor_data): ... to here and drop static qualifier.
 +	* dirmngr/misc.h: New declaration.
 +
 +	Add new LDAP utility functions.
 +	* dirmngr/Makefile.am (module_tests): New variable.
 +	(noinst_PROGRAMS): New primary.  Set it to $(module_tests).
 +	(TESTS): New variable.  Set it to $(module_tests).
 +	(t_common_src): New variable.
 +	(t_common_ldadd): Likewise.
 +	(t_ldap_parse_uri_SOURCES): New primary.
 +	(t_ldap_parse_uri_LDADD): Likewise.
 +	* dirmngr/ldap-parse-uri.c: New file.
 +	* dirmngr/ldap-parse-uri.h: Likewise.
 +	* dirmngr/t-ldap-parse-uri.c: Likewise.
 +	* dirmngr/t-support.h: Likewise.
 +
 +	Add new function uri_query_lookup.
 +	* common/http.h (uri_query_lookup): New declaration.
 +	* common/http.c (uri_query_lookup): The corresponding implementation.
 +
 +	Add new function strlist_find.
 +	* common/strlist.h (strlist_find): New declaration.
 +	* common/strlist.c (strlist_find): New function.
 +
 +	common: Add new helper function, strsplit.
 +	* common/stringhelp.h (strsplit): New declaration.
 +	* common/stringhelp.c (strsplit): New function.
 +	* common/t-stringhelp.c (test_strsplit): New function.
 +	(main): Call it here.
 +
 +2015-03-20  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Consider a mailbox only userid in mail search mode.
 +	* kbx/keybox-search.c: Include mbox-util.h.
 +	(blob_cmp_mail): Improve OpenPGP uid parsing.
 +
 +	common: Add function is_valid_mailbox_mem.
 +	* common/mbox-util.c (mem_count_chr): New.
 +	(my_memstr): New.
 +	(has_invalid_email_chars): Change args to work on a buffer.
 +	(is_valid_mailbox_mem): New.
 +	(is_valid_mailbox): Rewrite to use is_valid_mailbox_mem.
 +
 +	gpg: Find keys using mail addresses with garbage after the '>'
 +	* kbx/keybox-search.c (blob_cmp_mail): Stop comparing at the '>'.
 +
 +	common: Fix syntax error when building with gnutls.
 +	* common/http.c (send_request): Add missing comma.
 +
 +2015-03-19  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Emit status line NEWSIG before signature verification starts.
 +	* g10/mainproc.c (check_sig_and_print): Emit STATUS_NEWSIG.
 +
 +	agent: Compute correct MPI length header for protected ECC keys.
 +	* agent/cvt-openpgp.c (apply_protection): Strip leading zeroes from
 +	opaque MPIs to comply with the OpenPGP spec.
 +
 +	hkps: Fix host name verification when using pools.
 +	* common/http.c (send_request): Set the requested for SNI.
 +	* dirmngr/ks-engine-hkp.c (map_host): Return the poolname and not
 +	the selecting a host.
 +
 +	Define replacement error codes from libgpg-error 1.19.
 +	* common/util.h: Add GPG_ERR_LDAP codes for libgpg-error < 1.19.
 +
 +2015-03-17  Andre Heinecke  <aheinecke at intevation.de>
 +
 +	gpgtar: Fix extracting files with !(size % 512)
 +	* tools/gpgtar-extract.c (extract_regular): Handle size multiples
 +	  of RECORDSIZE.
 +
 +2015-03-17  Werner Koch  <wk at gnupg.org>
 +
 +	common: Add feature to ease using argparse's usage().
 +	* common/argparse.c (show_help): Take care of flag value
 +	(usage): Ditto.
 +
 +	common: Allow standalone build of argparse.c.
 +	* common/argparse.h: Remove types.h - not required.
 +	* common/argparse.c: Change to allow standalone use.
 +
 +2015-03-16  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Create all MPIs with RFC-4880 correct length headers.
 +	* g10/build-packet.c (gpg_mpi_write): Strip leading zeroes.
 +
 +	gpg: Allow printing of MPI values in --list-mode.
 +	* g10/parse-packet.c (set_packet_list_mode): Set mpi_print_mode.
 +	* g10/misc.c (mpi_print): Do not print an extra leading zero.
 +
 +	gpg: Fix broken write of opaque MPI length header.
 +	* g10/build-packet.c (gpg_mpi_write): Use a char array for the length.
 +
 +2015-03-15  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix possible dead code elimination.
 +	* g10/encrypt.c: Change condition for detecting a real file.
 +
 +	g13: Fix pointer wrap check.
 +	* g13/utils.c (find_tuple, next_tuple): Cast pointer to size_t before
 +	doing an overflow check.
 +
 +	agent: Remove useless conditions in command.c.
 +	* agent/command.c (cmd_setkeydesc): Remove NULL check.
 +	(cmd_get_passphrase): Ditto.
 +	(cmd_clear_passphrase): Ditto.
 +	(cmd_get_confirmation): Ditto.
 +	(cmd_getval): Ditto.
 +	(cmd_putval): Ditto.
 +
 +	agent: Fix length test in sshcontrol parser.
 +	* agent/command-ssh.c (ssh_search_control_file): Check S before
 +	upcasing it.
 +
 +	agent: Remove useless conditions.
 +	* agent/genkey.c (agent_ask_new_passphrase): Remove useless condition.
 +	* agent/command-ssh.c (ssh_identity_register): Ditto.
 +
 +	gpg: Remove useless condition.
 +	* g10/keylist.c (list_keyblock_colon): Remove useless condition (PK).
 +	(list_keyblock_print):  Likewise.
 +
 +	scd: Fix possible NULL deref in apdu.c.
 +	* scd/apdu.c (control_pcsc_direct): Take care of BUFLEN being NULL.
 +	(control_pcsc_wrapped): Ditto.
 +
 +	common: Make openpgp_oid_to_str more robust.
 +	* common/openpgp-oid.c (openpgp_oid_to_str): Take care of
 +	gcry_mpi_get_opaque returning NULL.  Remove useless condition !BUF.
 +
 +2015-03-11  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Improve error reporting from Pinentry.
 +	* agent/call-pinentry.c (unlock_pinentry): Add error logging.  Map
 +	error source of uncommon errors to Pinentry.
 +
 +2015-03-10  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Change --print-pka-records into an option.
 +	* g10/gpg.c (aPrintPKARecords): Rename to oPrintPKARecords and do not
 +	use it as a command.
 +	* g10/keylist.c (list_keyblock): List PKA rceords also for secret
 +	keys.
 +
 +	gpg: Add --list-gcrypt-config and "curve" item for --list-config.
 +	* common/openpgp-oid.c (curve_supported_p): New.
 +	(openpgp_enum_curves): New.
 +	* common/t-openpgp-oid.c (test_openpgp_enum_curves): New.
 +	(main): Add option --verbose.
 +	* g10/gpg.c (opts): Add --list-gcrypt-config.
 +	(list_config): Add items "curve" and "curveoid".  Remove unused code.
 +
 +2015-03-09  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: fix for 64-bit arch.
 +	* agent/pksign.c (agent_pksign_do): Use int.
 +	* scd/app-openpgp.c (get_public_key): Likewise.
 +
 +2015-03-04  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	gpg: avoid chatter about trustdb when --quiet.
 +	* g10/trustdb.c (tdb_check_trustdb_stale): avoid log_info() when
 +	  opt.quiet
 +
 +2015-02-26  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Lowercase mailbox for PKA lookups.
 +	* common/stringhelp.c (ascii_strlwr): New.
 +	* common/mbox-util.c (mailbox_from_userid): Downcase result.
 +
 +	gpg: Fix memory leak due to PKA lookup.
 +	* g10/keyserver.c (keyserver_import_pka): Move the xfree.
 +
 +2015-02-25  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Switch to a hash and CERT record based PKA system.
 +	* common/dns-cert.c (get_dns_cert): Make r_key optional.
 +	* common/pka.c: Rewrite for the new hash based lookup.
 +	* common/t-pka.c: New.
 +	* configure.ac: Remove option --disable-dns-pka.
 +	(USE_DNS_PKA): Remove ac_define.
 +	* g10/getkey.c (parse_auto_key_locate): Always include PKA.
 +
 +	common: Allow requesting a specific certtype with get_dns_cert()
 +	* common/dns-cert.c (get_dns_cert): Add arg want_certtype.  Change all
 +	callers.
 +	(CERTTYPE_): Move constants to ...
 +	* common/dns-cert.h: here as DNS_CERTTYPE_.
 +
 +	Move new mailbox.c source file to common/.
 +	* g10/mailbox.c: Move to ...
 +	* common/mbox-util.c: new file.
 +	* common/mbox-util.h: New. Include where needed.
 +	* g10/t-mailbox.c: Move to ...
 +	* common/t-mbox-util.c: new file.
 +
 +2015-02-24  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add command --print-pka-records.
 +	* g10/gpg.c (main): Add command --print-pka-records.
 +	* g10/options.h (struct opt): Add field "print_pka_records".
 +	* g10/keylist.c (list_keyblock_pka): New.
 +	(list_keyblock): Call it if new option is set.
 +	(print_fingerprint): Add mode 10.
 +
 +	gpg: Add function to extract the mailbox.
 +	* g10/misc.c (has_invalid_email_chars, is_valid_mailbox)
 +	(is_valid_user_id): Move to ...
 +	* g10/mailbox.c: new file.
 +	(string_has_ctrl_or_space, has_dotdot_after_at): New.
 +	(has_invalid_email_chars): New.
 +
 +	* g10/t-mailbox.c: New.
 +	* g10/Makefile.am (module_tests): Add t-mailbox.
 +	(t_mailbox_SOURCES, t_mailbox_LDADD): New.
 +
 +2015-02-23  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add option to print fingerprints in ICAO spelling.
 +	* g10/gpg.c: Add option --with-icao-spelling.
 +	* g10/options.h (struct opt): Add with_icao_spelling.
 +	* g10/keylist.c (print_icao_hexdigit): New.
 +	(print_fingerprint): Print ICAO spelling.
 +
 +	gpg: Skip legacy keys while searching keyrings.
 +	* g10/getkey.c (search_modes_are_fingerprint): New.
 +	(lookup): Skip over legacy keys.
 +
 +	common: Fix regression due to commit 2183683b.
 +	* common/dns-cert.c (get_dns_cert): Remove cruft.
 +
 +2015-02-19  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Replace remaining uses of stdio by estream.
 +	* g10/sign.c (sign_file):  Use log_printf instead of stderr.
 +	* g10/tdbdump.c (export_ownertrust): Use estream fucntions.
 +	(import_ownertrust): Ditto.
 +	* g10/tdbio.c (tdbio_dump_record): Ditto.  Change arg to estream_t.
 +
 +	gpg: Fix segv due to NULL value stored as opaque MPI.
 +	* g10/build-packet.c (gpg_mpi_write): Check for NULL return from
 +	gcry_mpi_get_opaque.
 +	(gpg_mpi_write_nohdr, do_key): Ditto.
 +	* g10/keyid.c (hash_public_key): Ditto.
 +
 +2015-02-12  Werner Koch  <wk at gnupg.org>
 +
 +	scd: Fix regression in 2.1.2 (due to commit 2183683)
 +	* scd/apdu.c (pcsc_vendor_specific_init): Replace use of
 +	bufNN_to_uint by direct code.
 +
 +2015-02-12  Andre Heinecke  <aheinecke at intevation.de>
 +
 +	dirmngr: Initialize cache from sysconfig dir.
 +	* dirmngr/certcache.c (cert_cache_init): Load certificates
 +	from sysconfig dir instead of the homeidr.
 +	* dirmngr/dirmngr.c (main): Removed parsing of obsolete
 +	homedir_data option.
 +	* dirmngr/dirmngr.h (opt): Removed homedir_data.
 +	* doc/dirmngr.texi: Update and clarify certs directory doc.
 +
 +2015-02-11  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.2.
 +
 +	dirmngr: Avoid warning about unused function.
 +	* dirmngr/dirmngr.c (my_gnutls_log): Build only if gnutls is used.
 +
 +	build: Update standard build-aux files.
 +
 +	Use inline functions to convert buffer data to scalars.
 +	* common/host2net.h (buf16_to_ulong, buf16_to_uint): New.
 +	(buf16_to_ushort, buf16_to_u16): New.
 +	(buf32_to_size_t, buf32_to_ulong, buf32_to_uint, buf32_to_u32): New.
 +
 +2015-02-09  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Prevent an invalid memory read using a garbled keyring.
 +	* g10/keyring.c (keyring_get_keyblock): Whitelist allowed packet
 +	types.
 +	* g10/keydb.c (parse_keyblock_image): Ditto.
 +
 +	gpg: Fix a NULL-deref in export due to invalid packet lengths.
 +	* g10/build-packet.c (write_fake_data): Take care of a NULL stored as
 +	opaque MPI.
 +
 +	gpg: Fix a NULL-deref due to empty ring trust packets.
 +	* g10/parse-packet.c (parse_trust): Always allocate a packet.
 +
 +2015-02-04  Werner Koch  <wk at gnupg.org>
 +
 +	gpg-agent: Use "pinentry-basic" as fallback.
 +	* common/homedir.c (get_default_pinentry_name): New.
 +	(gnupg_module_name): Use that for the default pinentry.
 +	(gnupg_module_name_flush_some): New.
 +	* agent/gpg-agent.c (agent_sighup_action): Flush some module names.
 +	* agent/call-pinentry.c (start_pinentry): Do not modify
 +	opt.pinentry_program.
 +
 +	w32: Add manifest to gpg.
 +	* g10/gpg.w32-manifest.in: New.
 +	* g10/gpg-w32info.rc: Add manifest.
 +	* g10/Makefile.am (EXTRA_DIST): Add manifest.
 +	(gpg-w32info.o): Depend on manifest.
 +	* configure.ac (BUILD_VERSION): New.
 +	(AC_CONFIG_FILES): Add manifest.
 +
 +2015-02-03  Werner Koch  <wk at gnupg.org>
 +
 +	Update copyright years.
 +	* common/w32info-rc.h.in (W32INFO_COMPANYNAME): Change to "The GnuPG
 +	Project".
 +
 +2015-02-02  Werner Koch  <wk at gnupg.org>
 +
 +	w32: Change default Windows install dir and add bin to PATH.
 +	* build-aux/speedo.mk (WITH_GUI): New macro.  The Windows installer is
 +	now build by default without any GUI stuff.
 +	* build-aux/speedo/w32/inst.nsi: Change standard installation
 +	directory.
 +	(AddToPath, un.RemoveFromPath): New.
 +	(gnupginst): Add bin directory to the PATH.
 +
 +2015-02-01  Werner Koch  <wk at gnupg.org>
 +
 +	w32: Allow for Unicocde installation directory.
 +	* common/homedir.c (w32_rootdir): Use Unicode fucntion not only for
 +	WinCE.
 +
 +2015-01-30  Joshua Rogers  <git at internot.info>
 +
 +	kbx: Fix resource leak.
 +	* kbx/keybox-update.c (blob_filecopy): Fix resource leak.  On error
 +	return, 'fp' and 'newfp' was never closed.
 +
 +2015-01-29  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Fix use of imported but unprotected openpgp keys.
 +	* agent/agent.h (PRIVATE_KEY_OPENPGP_NONE): New.
 +	* agent/command.c (do_one_keyinfo): Implement it.
 +	* agent/findkey.c (agent_key_from_file): Ditto.
 +	(agent_key_info_from_file): Ditto.
 +	(agent_delete_key): Ditto.
 +	* agent/protect.c (agent_private_key_type): Add detection for openpgp
 +	"none" method.
 +
 +2015-01-29  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	po: Update Japanese Translation.
 +
 +2015-01-28  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Limit the size of key packets to a sensible value.
 +	* g10/parse-packet.c (MAX_KEY_PACKET_LENGTH): New.
 +	(MAX_UID_PACKET_LENGTH): New.
 +	(MAX_COMMENT_PACKET_LENGTH): New.
 +	(MAX_ATTR_PACKET_LENGTH): New.
 +	(parse_key): Limit the size of a key packet to 256k.
 +	(parse_user_id): Use macro for the packet size limit.
 +	(parse_attribute): Ditto.
 +	(parse_comment): Ditto.
 +
 +	gpg: Fix buffering problem in --list-config.
 +	* g10/gpg.c (list_config): Replace print_sanitized_string2 by
 +	es_write_sanitized.
 +
 +	* common/stringhelp.c (print_sanitized_buffer2): Remove.
 +	(print_sanitized_buffer, print_sanitized_utf8_buffer): Remove.
 +	(print_sanitized_utf8_buffer, print_sanitized_utf8_string): Remove.
 +	(print_sanitized_string): Remove.
 +
 +	* sm/certdump.c (print_dn_part, print_dn_parts): Remove arg FP.
 +	(pretty_print_sexp, gpgsm_print_name2, gpgsm_print_name): Remove.
 +
 +	Add a hook to be called right after main.
 +	* common/init.c (early_system_init): New stub function.
 +
 +	gpg: Allow predefined names as answer to the keygen.algo prompt.
 +	* g10/keygen.c (ask_algo): Add list of strings.
 +
 +	agent: Add some extra robustness to extract_private_key.
 +	* agent/cvt-openpgp.c (extract_private_key): Add arg "arraysize".
 +	Make sure that R_FLAGS and R_CURVE are set to NULL.
 +
 +2015-01-28  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix varargs call for 64-bit arch on ECC keys.
 +	* scd/app-openpgp.c (store_fpr): Remove CARD_VERSION from the
 +	arguments.
 +	(rsa_writekey): Follow the change.
 +	(do_genkey): Likewise.
 +	(ecc_writekey): Likewise.  Cast to size_t.
 +
 +2015-01-27  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix segv introduced to commit 4d7c9b0.
 +	* g10/keygen.c (get_parameter_passphrase): Take care of R == NULL.
 +
 +2015-01-27  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: Fix agent_public_key_from_file for ECC.
 +	* agent/cvt-openpgp.c (extract_private_key): New.
 +	(convert_to_openpgp): Use extract_private_key.
 +	* agent/findkey.c (agent_public_key_from_file): Use
 +	extract_private_key.
 +
 +2015-01-26  Werner Koch  <wk at gnupg.org>
 +
 +	sm: Simplify fix ed8383c6.
 +	* sm/minip12.c (p12_build): Release PWBUF only at the end.
 +
 +2015-01-25  Joshua Rogers  <git at internot.info>
 +
 +	ccid: Remove incorrect expression leading to errors.
 +	* scd/ccid-driver.c (send_escape_cmd): Fix setting of 'rc'.
 +
 +2015-01-23  Werner Koch  <wk at gnupg.org>
 +
 +	gpgconf: Fix validity check for UINT32 values.
 +	* tools/gpgconf-comp.c (option_check_validity): Enable check for
 +	UINT32.
 +
 +2015-01-22  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Improve skipping of PGP-2 keys.
 +	* g10/keydb.c (keydb_search_first, keydb_search_next): Skip legacy
 +	keys.
 +	* g10/keyring.c (keyring_get_keyblock): Handle GPG_ERR_LEGACY_KEY.
 +	(prepare_search): Ditto.
 +	(keyring_rebuild_cache): Skip legacy keys.
 +	* g10/keyserver.c (keyidlist): Ditto.
 +	* g10/trustdb.c (validate_key_list): Ditto.
 +
 +	gpg: Add dedicated error code for PGP-2 keys.
 +	* g10/parse-packet.c (parse_key): Return GPG_ERR_LEGACY_KEY for PGP2
 +	keys.
 +	* g10/import.c (read_block): Simplify by checking GPG_ERR_LEGACY_KEY.
 +	* g10/getkey.c (lookup): Silence error message for PGP-2 keys.
 +
 +	* common/util.h (GPG_ERR_LEGACY_KEY): Add replacement for older
 +	libgpg-error.
 +
 +	gpg: Replace remaining old error code macros by GPG_ERR_.
 +	* g10/gpg.h (g10_errstr): Remove macro and change all occurrences by
 +	gpg_strerror.
 +	(G10ERR_): Remove all macros and change all occurrences by their
 +	GPG_ERR_ counterparts.
 +
 +	gpg: Remove an unused variable.
 +	* g10/getkey.c (getkey_ctx_s): Remove last_rc.
 +
 +2015-01-21  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Fix TLS build problems.
 +	* dirmngr/Makefile.am (AM_CFLAGS): Add flags for TLS libs.
 +
 +	gpg: Support --passphrase with --quick-gen-key.
 +	* g10/keygen.c: Include shareddefs.h.
 +	(quick_generate_keypair): Support static passphrase.
 +	(get_parameter_passphrase): New.
 +	(do_generate_keypair): Use it.
 +
 +	gpg: Re-enable the "Passphrase" parameter for batch key generation.
 +	* agent/command.c (cmd_genkey): Add option --inq-passwd.
 +	* agent/genkey.c (agent_genkey): Add new arg override_passphrase.
 +	* g10/call-agent.c (inq_genkey_parms): Handle NEWPASSWD keyword.
 +	(agent_genkey): Add arg optional arg "passphrase".
 +	* g10/keygen.c (common_gen, gen_elg, gen_dsa, gen_ecc)
 +	(gen_rsa, do_create): Add arg "passphrase" and pass it through.
 +	(do_generate_keypair): Make use of pPASSPHRASE.
 +	(release_parameter_list): Wipe out a passphrase parameter.
 +
 +2015-01-19  Werner Koch  <wk at gnupg.org>
 +
 +	kbx: Minor cleanup for the previous fix.
 +	* kbx/keybox-search.c (blob_get_keyid): Rename to
 +	blob_get_first_keyid. Check number of keys and remove blob type check.
 +
 +2015-01-19  Damien Goutte-Gattat  <dgouttegattat at incenp.org>
 +
 +	kbx: Call skipfnc callback to filter out keys.
 +	* kbx/keybox-search.c (blob_get_keyid): New.
 +	(keybox-search): Call skipfnc callback function.
 +
 +2015-01-13  Andreas Schwier  <andreas.schwier at cardcontact.de>
 +
 +	scd: Allow for certificates > 1024 with PC/SC.
 +	* scd/pcsc-wrapper.c (handle_transmit): Enlarge buffer to 4096 too
 +	allow for larger certificates.
 +
 +2015-01-08  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	dirmngr: Fix error code path of map_host.
 +	* dirmngr/ks-engine-hkp.c (map_host): Fix error return.
 +
 +2015-01-08  Joshua Rogers  <git at internot.info>
 +
 +	scd: fix get_public_key for OpenPGPcard v1.0.
 +	* scd/app-openpgp.c (get_public_key): correctly close 'fp' upon use.
 +
 +2015-01-07  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	dirmngr: fix LDAP query PATTERNS limit check.
 +	* dirmngr/ldap.c (start_cert_fetch_ldap): fix ARGC limitation.
 +
 +	scd: fix merge failure.
 +	* scd/apdu.c (pcsc_pinpad_verify): Remove wrong lines inserted by
 +	merge.
 +
 +2015-01-05  Werner Koch  <wk at gnupg.org>
 +
 +	sm,g13: Init local vars to avoid compiler warnings.
 +	* sm/misc.c (transform_sigval): Init RSA_S_LEN.
 +	* g13/mount.c (read_keyblob): Init HEADERLEN.
 +
 +	gpg: Remove unused args from a function.
 +	* g10/keyserver.c (parse_keyserver_uri): Remove args configname and
 +	configlineno.  Change all callers.
 +
 +	gpg: Clear a possible rest of the KDF secret buffer.
 +	* g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Fix order of args.
 +
 +	build: Require automake 1.14.
 +	* configure.ac (AM_INIT_AUTOMAKE): Add serial-tests.
 +
 +2015-01-04  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Make --allow-loopback-pinentry gpgconf changeable.
 +
 +2014-12-22  Joshua Rogers  <git at internot.info>
 +
 +	tools: Free variable before return.
 +	* tools/gpgconf-comp.c: Free 'dest_filename' before it is returned
 +	upon error.
 +
 +2014-12-22  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	sm: Avoid double-free on iconv failure.
 +	* sm/minip12.c: (p12_build) if jnlib_iconv_open fails, avoid
 +	double-free of pwbuf.
 +
 +	scd: Avoid double-free on error condition in scd.
 +	* scd/command.c (cmd_readkey): avoid double-free of cert
 +
 +	avoid future chance of using uninitialized memory.
 +	* common/iobuf.c: (iobuf_open): initialize len
 +
 +	avoid double-close in unusual dotlock situations.
 +	* common/dotlock.c: (dotlock_create_unix) avoid double-close()
 +	 in unusual situations.
 +
 +	gpgkey2ssh: clean up varargs.
 +	* tools/gpgkey2ssh.c (key_to_blob) : ensure that va_end is called.
 +
 +2014-12-22  Werner Koch  <wk at gnupg.org>
 +
 +	doc: Fix memory leak in yat2m.
 +	* doc/yat2m.c (write_th): Free NAME.
 +
 +	dirmngr: Fix memory leak.
 +	* dirmngr/server.c (cmd_ks_search, cmd_ks_get): Fix memory leak.
 +
 +	* dirmngr/ks-engine-hkp.c (ks_hkp_mark_host): Remove double check.
 +
 +	dirmngr: Remove un-needed check.
 +	* dirmngr/crlfetch.c (crl_fetch): Check that URL is not NULL.
 +
 +	dirmngr,gpgsm: Return NULL on fail.
 +	* dirmngr/ldapserver.c (ldapserver_parse_one): Set SERVER to NULL.
 +	* sm/gpgsm.c (parse_keyserver_line): Ditto.
 +
 +2014-12-22  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: ECDH Support.
 +	* agent/divert-scd.c (divert_pkdecrypt): Support ECDH.
 +	* scd/app-openpgp.c (get_algo_byte, store_fpr): Support ECDH.
 +	(send_key_attr): Support ECDH.  Fix EdDSA algorithm value.
 +	(retrieve_key_material): Initialize fields.
 +	(get_public_key, ecc_writekey, do_writekey): Support ECDH.
 +	(ecdh_writekey): Remove.
 +	(do_decipher): Support ECDH.
 +	(parse_algorithm_attribute): Support ECDH.  Fix EdDSA.
 +
 +2014-12-19  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Make sure --max-cache-ttl is >= --default-cache-ttl.
 +	* agent/gpg-agent.c (finalize_rereadable_options): New.
 +	(main, reread_configuration): Call it.
 +
 +	agent: Keep the session environment for restricted connections.
 +	* agent/command-ssh.c (setup_ssh_env): Move code to ...
 +	* agent/gpg-agent.c (agent_copy_startup_env): .. new function.  Change
 +	calllers.
 +	* agent/command.c (start_command_handler): Call that fucntion for
 +	restricted connections.
 +
 +	agent: Fix string prepended to remotely initiated prompts.
 +	* agent/command.c (cmd_setkeydesc): Use %0A and not \n. Make
 +	translatable.
 +
 +2014-12-18  Werner Koch  <wk at gnupg.org>
 +
 +	build: Remove option to build without agent.
 +	* configure.ac (build-agent): Set to yes.
 +
 +2014-12-17  Werner Koch  <wk at gnupg.org>
 +
 +	gpgconf: Exit with failure if --launch fails.
 +	* tools/gpgconf-comp.c (gc_component_launch): Return an error code.
 +	* tools/gpgconf.c (main): Exit if launch failed.
 +
 +2014-12-16  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.1.
 +
 +	po: Update the German translation.
 +
 +2014-12-16  Petr Pisar  <petr.pisar at atlas.cz>
 +
 +	po: Update Czech translation.
 +
 +2014-12-16  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Show private DO information in the card status.
 +	* g10/call-agent.c (agent_release_card_info): Free private_do.
 +	(learn_status_cb): Parse PRIVATE-DO-n stati.
 +
 +2014-12-16  Ineiev  <ineiev at gnu.org>
 +
 +	po: Update Russian translation.
 +
 +2014-12-16  Jedi  <jedi at jedi.org>
 +
 +	po: Update zh_TW translation.
 +
 +2014-12-15  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add sub-command "factory-reset" to --card-edit.
 +	* common/util.h (GPG_ERR_OBJ_TERM_STATE): New.
 +	* scd/iso7816.c (map_sw): Add this error code.
 +	* scd/app-openpgp.c (do_getattr): Return the life cycle indicator.
 +	* scd/app.c (select_application): Allow a return value of
 +	GPG_ERR_OBJ_TERM_STATE.
 +	* scd/scdaemon.c (set_debug): Print the DBG_READER value.
 +	* g10/call-agent.c (start_agent): Print a status line for the
 +	termination state.
 +	(agent_scd_learn): Make arg "info" optional.
 +	(agent_scd_apdu): New.
 +	* g10/card-util.c (send_apdu): New.
 +	(factory_reset): New.
 +	(card_edit): Add command factory-reset.
 +
 +	gpg: Fix regression in notation data regression.
 +	* g10/misc.c (pct_expando): Reorder conditions for clarity.
 +	* g10/sign.c (write_signature_packets): Fix notation data creation.
 +
 +	gpg: Avoid extra LF in notaion data listing.
 +	* g10/keylist.c (show_notation): Use log_printf.
 +
 +2014-12-12  Werner Koch  <wk at gnupg.org>
 +
 +	scd: Fix possibly inhibited checkpin of the admin pin.
 +	* scd/app-openpgp.c (do_check_pin): Do not check a byte of a released
 +	buffer.
 +
 +	gpg: Let --card--status create a shadow key (card key stub).
 +	* agent/command.c (cmd_learn): Add option --sendinfo.
 +	* agent/learncard.c (agent_handle_learn): Add arg "send" andsend
 +	certifciate only if that is set.
 +	* g10/call-agent.c (agent_scd_learn): Use --sendinfo.  Make INFO
 +	optional.
 +	(agent_learn): Remove.
 +	* g10/keygen.c (gen_card_key): Replace agent_learn by agent_scd_learn.
 +
 +	gpg: Fix possible read of unallocated memory.
 +	* g10/parse-packet.c (can_handle_critical): Check content length
 +	before calling can_handle_critical_notation.
 +
 +2014-12-11  Werner Koch  <wk at gnupg.org>
 +
 +	build: Replace deprecated autconf macro.
 +	* m4/intl.m4: s/AM_PROG_MKDIR_P/AC_PROG_MKDIR_P/
 +	* m4/po.m4: Ditto.
 +
 +2014-12-08  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Improve dead host detection.
 +	* dirmngr/ks-engine-hkp.c (handle_send_request_error): Mark host dead
 +	also for 2 other error messages.
 +
 +	http: Improve diagnostic messages.
 +	* common/http.c (send_request): Print TLS alert info
 +	(connect_server): Detect bogus DNS entry.
 +
 +	gpg: Obsolete some keyserver helper options.
 +	* g10/options.h (opt): Remove keyserver_options.other.
 +	* g10/gpg.c (main): Obsolete option --honor-http-proxt.
 +	* g10/keyserver.c (add_canonical_option): Replace by ...
 +	(warn_kshelper_option): New.
 +	(parse_keyserver_uri): Obsolete "x-broken-http".
 +
 +	dirmngr: Return a proper error for all dead hosts.
 +	* dirmngr/ks-engine-hkp.c (map_host): Change to return an gpg_error_t.
 +	Return an error code for all dead hosts.
 +	(make_host_part): Change to return an gpg_error_t.  Change all
 +	callers.
 +
 +	gpg: Write a status line for a failed --send-keys.
 +	* g10/keyserver.c (keyserver_put): Write an status error.
 +
 +2014-12-08  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix for EdDSA.
 +	* scd/app-openpgp.c (get_algo_byte): It catches 22.
 +	(store_fpr): It's MPI usually, but it's opaque bytes for EdDSA.
 +
 +2014-12-05  Andre Heinecke  <aheinecke at intevation.de>
 +
 +	Document no-allow-mark-trusted option.
 +	    doc: Document no-allow-mark-trusted for gpg-agent
 +
 +	    * doc/gpg-agent.texi: Change allow-mark-trusted doc to
 +	    no-allow-mark-trusted.
 +
 +	    --
 +	    Since rev. 78a56b14 allow-mark-trusted is the default option
 +	    and was replaced by no-allow-mark-trusted to disable the
 +	    interactive prompt.
 +
 +2014-12-05  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix for NIST P-256.
 +	* g10/card-util.c (card_store_subkey): Error check.
 +	* scd/app-opengpg.c (ecc_writekey): Support NIST P-256.
 +	(do_writekey): Error check.
 +
 +2014-12-04  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Allow import of large keys.
 +	* g10/import.c (import): Skip too large keys.
 +	* kbx/keybox-file.c (IMAGELEN_LIMIT): Change limit from 2MB to 5MB.
 +
 +2014-12-03  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Remove option aliases --[no-]throw-keyid and --notation-data.
 +	* g10/gpg.c (opts): Remove them.
 +	* g10/options.h (opt): s/throw_keyid/throw_keyids/ and change users.
 +
 +2014-12-02  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Replace some sprintf.
 +	* agent/call-scd.c (agent_card_pksign): Replace sprintf by bin2hex.
 +	* agent/command-ssh.c (ssh_identity_register): Ditto.
 +	* agent/pkdecrypt.c (agent_pkdecrypt): Replace sprintf by
 +	put_membuf_printf.
 +
 +2014-12-01  Werner Koch  <wk at gnupg.org>
 +
 +	tools: Improve watchgnupg portability.
 +	* configure.ac (AC_CHECK_HEADERS): Check for sys.select.h
 +	* tools/watchgnupg.c: Include it.
 +
 +	gpg: Fix export bug using exact search with only one key in the keybox.
 +	* g10/export.c (do_export_stream): Disable caching.
 +	* g10/keyserver.c (keyidlist): Ditto.
 +
 +	scd: Implement socket redirection.
 +	* scd/scdaemon.c (ENAMETOOLONG): New.
 +	(redir_socket_name): New.
 +	(cleanup): Take care of a redirected socket.
 +	(main): Pass redir_socket_name to create_server_socket.
 +	(create_socket_name): Remove superfluous length check.
 +	(create_server_socket): Add arg r_redir_name and implement
 +	redirection.  Replace assert for older Assuan by an error message.
 +
 +	dirmngr: Implement socket redirection.
 +	* dirmngr/dirmngr.c (ENAMETOOLONG): new.
 +	(redir_socket_name): New.
 +	(main): Add Assuan socket redirection.
 +	(cleanup): Adjust cleanup for redirection.
 +
 +2014-11-28  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Implement socket redirection.
 +	* agent/gpg-agent.c (ENAMETOOLONG): New.
 +	(redir_socket_name, redir_socket_name_extra)
 +	(redir_socket_name_ssh): New.
 +	(remove_socket): Take care of the redir names.
 +	(main): Pass the redir names to create_server_socket.
 +	(create_socket_name): Remove length check - that is anyway done later.
 +	(create_server_socket): Add arg r_redir_name and implement redirection
 +	if Libassuan is at least 2.14.
 +
 +	gpg: Change another BUG() call to a regular error message.
 +	* g10/mainproc.c (proc_tree): Replace BUG by a proper error messages.
 +
 +	Add option --no-autostart.
 +	* g10/gpg.c: Add option --no-autostart.
 +	* sm/gpgsm.c: Ditto.
 +	* g10/options.h (opt): Add field autostart.
 +	* sm/gpgsm.h (opt): Ditto.
 +	* g10/call-agent.c (start_agent): Print note if agent was not
 +	autostarted.
 +	* sm/call-agent.c (start_agent): Ditto.
 +	* g10/call-dirmngr.c (create_context): Likewise.
 +	* sm/call-dirmngr.c (start_dirmngr_ext): Ditto.
 +
 +2014-11-27  Мирослав Николић  <wk at gnupg.org>
 +
 +	gpg-agent: Add restricted connection feature.
 +	* agent/agent.h (opt): Add field extra_socket.
 +	(server_control_s): Add field restricted.
 +	* agent/command.c: Check restricted flag on many commands.
 +	* agent/gpg-agent.c (oExtraSocket): New.
 +	(opts): Add option --extra-socket.
 +	(socket_name_extra): New.
 +	(cleanup): Cleanup that socket name.
 +	(main): Implement oExtraSocket.
 +	(create_socket_name): Add arg homedir and change all callers.
 +	(create_server_socket): Rename arg is_ssh to primary and change
 +	callers.
 +	(start_connection_thread): Take ctrl as arg.
 +	(start_connection_thread_std): New.
 +	(start_connection_thread_extra): New.
 +	(handle_connections): Add arg listen_fd_extra and replace the
 +	connection starting code by parameterized loop.
 +	* common/asshelp.c (start_new_gpg_agent): Detect the use of the
 +	restricted mode and don't fail on sending the pinentry environment.
 +
 +	* common/util.h (GPG_ERR_FORBIDDEN): New.
 +
 +	agent: Make auditing of the option list easier.
 +	* agent/gpg-agent.c (opts): Use ARGPARSE_ macros.
 +
 +2014-11-26  Kristian Fiskerstrand  <kf at sumptuouscapital.com>
 +
 +	dirmngr: Only report hkps scheme when available.
 +	* dirmngr/ks-engine-hkp.c (ks_hkp_help): Make use of TLS macros.
 +
 +2014-11-26  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Change a bug() call to a regular error message.
 +	* g10/decrypt-data.c (decrypt_data): Return an error code instead of
 +	calling BUG().
 +
 +2014-11-25  Werner Koch  <wk at gnupg.org>
 +
 +	Fix buffer overflow in openpgp_oid_to_str.
 +	* common/openpgp-oid.c (openpgp_oid_to_str): Fix unsigned underflow.
 +
 +	* common/t-openpgp-oid.c (BADOID): New.
 +	(test_openpgp_oid_to_str): Add test cases.
 +
 +2014-11-24  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix use of uninit.value in listing sig subpkts.
 +	* g10/parse-packet.c (dump_sig_subpkt): Print regex subpacket
 +	sanitized.
 +
 +	gpg: Fix off-by-one read in the attribute subpacket parser.
 +	* g10/parse-packet.c (parse_attribute_subpkts): Check that the
 +	attribute packet is large enough for the subpacket type.
 +
 +	gpg: Fix batch generation of ECC keys.
 +	* g10/keygen.c (get_parameter_algo): Map ECC algorithm strings
 +	directly.
 +
 +2014-11-24  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	Distinguish between ARGPARSE_AMBIGUOUS_{OPTION,COMMAND}
 +	* common/argparse.c (initialize): Use correct value.
 +
 +	gpg: Refer to --throw-keyids instead of --throw-keyid.
 +	* g10/encrypt.c: adjust error message
 +
 +2014-11-21  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Track number of skipped v3 keys on import.
 +	* g10/import.c (stats_s): Add field v3keys.
 +	(import): Update this field.
 +	(import_print_stats): Print v3 key count.
 +	(read_block): Skip v3 keys and return a count for them.
 +
 +	gpg: Fix regression in parse_key.
 +	* g10/parse-packet.c (parse): Better return just the gpg_err_code.
 +	(parse_key): Return the error code.
 +
 +	speedo: Add simple logos to the installer.
 +	* build-aux/speedo/w32/README.txt: Include GnuPG Readme.
 +	* build-aux/speedo/w32/gnupg-logo-150x57.bmp: New.
 +	* build-aux/speedo/w32/gnupg-logo-164x314.bmp: New.
 +	* build-aux/speedo/w32/inst.nsi: Add logos.
 +	* build-aux/speedo.mk ($(bdir)/NEWS.tmp): Extract news items.
 +
 +2014-11-20  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix hash detection for ECDSA.
 +	* g10/sign.c (sign_file): Use DSA or ECDSA and not DSA|EdDSA.
 +
 +	Fix linker problem on OS X.
 +	* common/init.c (default_errsource): Move to the .data segmemt.
 +
 +2014-11-19  Werner Koch  <wk at gnupg.org>
 +
 +	gpg-connect-agent: Add convenience option --uiserver.
 +
 +	Add "gpgconf --kill dirmngr" and avoid useless launch before a kill.
 +	* common/asshelp.c (start_new_gpg_agent): Add arg autostart.  Change
 +	all callers to use 1 for it.
 +	(start_new_dirmngr): Ditto.
 +	* tools/gpg-connect-agent.c: Add option --no-autostart.
 +	(main): Default autostart to 1.
 +	(start_agent): Implement no-autostart.
 +	* tools/gpgconf-comp.c (gpg_agent_runtime_change): Use --no-autostart.
 +	(scdaemon_runtime_change): Ditto.
 +	(dirmngr_runtime_change): New.
 +
 +	po: Copied missing translations from the 2.0 branch.
 +	* po/LINGUAS: Add new translations.
 +
 +2014-11-17  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix a NULL-deref for invalid input data.
 +	* g10/mainproc.c (proc_encrypted): Take care of canceled passpharse
 +	entry.
 +
 +2014-11-13  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Make the use of "--verify FILE" for detached sigs harder.
 +	* g10/openfile.c (open_sigfile): Factor some code out to ...
 +	(get_matching_datafile): new function.
 +	* g10/plaintext.c (hash_datafiles): Do not try to find matching file
 +	in batch mode.
 +	* g10/mainproc.c (check_sig_and_print): Print a warning if a possibly
 +	matching data file is not used by a standard signatures.
 +
 +	gpg: Fix a missing LF in debug output.
 +	* g10/kbnode.c (dump_kbnode): Print a LF.
 +
 +	gpg: Remove PGP-2 related cruft.
 +	* g10/armor.c (parse_hash_header,carmor_filter): Ignore MD5 in hash
 +	header.
 +	(fake_packet): Remove pgp-2 workaround for white space stripping.
 +	* g10/filter.h (armor_filter_context_t): Remove field pgp2mode.
 +	* g10/options.h (opt): Remove field pgp2_workarounds.
 +	* g10/gpg.c (main): Do not set this field.
 +	* g10/gpgv.c (main): Ditto.
 +	* g10/mainproc.c (proc_encrypted): Use SHA-1 as fallback s2k hash
 +	  algo.  Using MD5 here is useless.
 +	(proc_plaintext): Remove PGP-2 related woraround
 +	(proc_tree): Remove another workaround but keep the one for PGP-5.
 +
 +2014-11-12  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Improve perceived speed of secret key listings.
 +	* g10/keylist.c (list_keyblock): Flush stdout for secret keys.
 +
 +	gpg: Fix regression in --refresh-keys.
 +	* g10/keyserver.c (keyserver_get): Factor all code out to ...
 +	(keyserver_get_chunk): new.  Extimate line length.
 +	(keyserver_get): Split up requests into chunks.
 +
 +	gpg: Add import options "keep-ownertrust".
 +	* g10/options.h (IMPORT_KEEP_OWNERTTRUST): New.
 +	* g10/import.c (parse_import_options): Add "keep-ownertrust".
 +	(import_one): Act upon new option.
 +
 +2014-11-11  Werner Koch  <wk at gnupg.org>
 +
 +	Remove use of gnulib (part 2)
 +	* configure.ac (strpbrk): Add to AC_CHECK_FUNCS.
 +	(gl_EARLY): Remove.
 +	* common/stringhelp.c (strpbrk) [!HAVE_STRPBRK]: New.
 +	* common/sysutils.c (gnupg_mkdtemp): New.  Based on code from
 +	glibc-2.6.
 +	(gnupg_setenv): Rewrite.
 +	(gnupg_unsetenv): Rewrite.
 +	* g10/exec.c: Include sysutils.h and replace mkdtemp by gnupg_mkdtemp.
 +	* g13/be-encfs.c: Ditto.
 +	* g13/mount.c: Ditto.
 +	* tools/symcryptrun.c (confucius_mktmpdir): Ditto.
 +
 +	Remove use of gnulib (part 1)
 +	* gl/: Remove entire tree.
 +	* configure.ac: Remove gnulib tests and the gl/ Makefile.
 +	(setenv): Add to AC_CHECK_FUNCS.
 +	* autogen.rc (extra_aclocal_flags): Set to empty.
 +	* Makefile.am (ACLOCAL_AMFLAGS): Remove -I gl/m4
 +	(SUBDIRS): Remove gl/.
 +	* agent/Makefile.am (common_libs): Remove ../gl/gnulib.a
 +	* common/Makefile.am (t_common_ldadd): Ditto.
 +	* dirmngr/Makefile.am (dirmngr_LDADD): Ditto.
 +	(dirmngr_ldap_LDADD, dirmngr_client_LDADD): Ditto.
 +	* g10/Makefile.am (needed_libs): Ditto.
 +	* g13/Makefile.am (g13_LDADD): Ditto.
 +	* kbx/Makefile.am (kbxutil_LDADD): Ditto.
 +	($(PROGRAMS)): Ditto.
 +	* scd/Makefile.am (scdaemon_LDADD): Ditto.
 +	* sm/Makefile.am (common_libs): Ditto.
 +	* tools/Makefile.am (common_libs, commonpth_libs): Ditto.
 +
 +	* agent/gpg-agent.c: Remove "mkdtemp.h"
 +	* g10/exec.c: Ditto.
 +	* scd/scdaemon.c: Ditto.
 +	* tools/symcryptrun.c: Ditto.
 +	* common/sysutils.c: Remove "setenv.h"
 +
 +	* common/t-timestuff.c: Use putenv if setenv is not available.
 +
 +2014-11-07  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Remove warning message for non-implemented search modes.
 +	* kbx/keybox-search.c (keybox_search): Silently ignore.
 +	* doc/specify-user-id.texi: Docuement '@", '+', and '.' search
 +	prefixes.
 +
 +	w32: Fix http access module.
 +	* common/http.c (write_server) [W32]: Rework to use send() instead of
 +	write even when build with npth.
 +	(cookie_read) [W32]: Rework to use recv() instead of read even when
 +	build with npth.
 +
 +	build: Add method to use a custom swdb.lst and use adns with Windows.
 +	* build-aux/getswdb.sh: Add option --skip-verify.
 +	* build-aux/speedo.mk: Add config var CUSTOM_SWDB.  Tage adns version
 +	from swdb and build for Windows with adns.
 +
 +	build: Improve test for ADNS.
 +	* configure.ac <adns>: Use adns_free as probe function for libadns.
 +	(HAVE_ADNS_FREE): Remove bogus tests to set this and remove the macro.
 +	(ADNSLIBS): Do not ac_subst - it is only used within configure.
 +
 +2014-11-05  Werner Koch  <wk at gnupg.org>
 +
 +	speedo: Append the date to the Windows installer.
 +	* build-aux/speedo.mk (BUILD_DATESTR): New.
 +	(dist-source, installer): Use it.
 +
 +	Release 2.1.0.
 +
 +	Avoid sign extension when shifting the MSB.
 +	* sm/fingerprint.c (gpgsm_get_short_fingerprint): Cast MSB before
 +	shifting.
 +	* g10/build-packet.c (delete_sig_subpkt): Ditto.
 +
 +2014-11-04  Werner Koch  <wk at gnupg.org>
 +
 +	Remove all expired common CA certificates.
 +	* doc/com-certs.pem: Remove certifciates.
 +
 +2014-11-02  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Avoid extra pinentries for each subkey in --export-secret-keys.
 +	* agent/command.c (cmd_export_key): Actually implement the cache_nonce
 +	feature.
 +	* g10/export.c (do_export_stream): Make use of a cache_nonce.
 +
 +	gpg: Fix endless loop in keylisting with fingerprint.
 +	* g10/getkey.c (getkey_next): Disable cache.
 +
 +	gpg: Minor cleanup for key listing related code.
 +	* g10/getkey.c (get_pubkey_next): Divert to getkey_next.
 +	(get_pubkey_end): Move code to getkey_end.
 +	* g10/keydb.c (keydb_search_reset): Add a debug statement.
 +	(dump_search_desc): Add arg HD and print the handle.
 +
 +	gpg: Do not show an useless passphrase prompt in batch mode.
 +	* g10/keygen.c: Remove unused PASSPHRASE related code.
 +	(proc_parameter_file): Remove useless asking for a passphrase in batch
 +	mode.
 +
 +2014-10-31  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Remove superfluous check for Libgcrypt >= 1.4.0.
 +	* g10/gpg.c (main): Remove check.
 +
 +	kbx: Let keydb_search skip unwanted blobs.
 +	* kbx/keybox.h (keybox_blobtype_t): New.
 +	* kbx/keybox-defs.h (BLOBTYPE_*): Replace by KEYBOX_BLOBTYPE_*.
 +	* kbx/keybox-search.c (keybox_search): Add arg want_blobtype and skip
 +	non-matching blobs.
 +	* sm/keydb.c (keydb_search): Pass KEYBOX_BLOBTYPE_X509 to keybox_search.
 +	* g10/keydb.c (keydb_search): Pass KEYBOX_BLOBTYPE_PGP to keybox_search.
 +
 +	gpg: Fix --rebuild-keydb-caches.
 +	* g10/parse-packet.c (parse_key): Store even unsupported packet
 +	versions.
 +	* g10/keyring.c (keyring_rebuild_cache): Do not copy keys with
 +	versions less than 4.
 +
 +	gpg: Fix testing for secret key availability.
 +	* g10/getkey.c (have_secret_key_with_kid): Do not change the search
 +	mode.
 +
 +	build: Avoid distributing backup files etc.
 +	* Makefile.am (EXTRA_DIST): Do not include directories.
 +
 +2014-10-30  Werner Koch  <wk at gnupg.org>
 +
 +	tests: Speed up the genkey1024.test by using not so strong random.
 +	* agent/gpg-agent.c (oDebugQuickRandom): New.
 +	(opts): New option --debug-quick-random.
 +	(main): Use new option.
 +	* common/asshelp.c (start_new_gpg_agent): Add hack to pass an
 +	additional argument for the agent name.
 +	* tests/openpgp/defs.inc: Pass --debug-quick-random to the gpg-agent
 +	starting parameters.
 +	* tests/openpgp/version.test: Ditto.
 +
 +2014-10-29  Werner Koch  <wk at gnupg.org>
 +
 +	common: Check option arguments for a valid range.
 +	* common/argparse.h (ARGPARSE_INVALID_ARG): New.
 +	* common/argparse.c: Include limits h and errno.h.
 +	(initialize): Add error strings for new error constant.
 +	(set_opt_arg): Add range checking.
 +
 +	Fix stdint.h problem for Apple.
 +	* gl/stdint_.h [__APPLE__]: Include hack.
 +
 +2014-10-27  Werner Koch  <wk at gnupg.org>
 +
 +	speedo: Fixes for native build.
 +	* build-aux/speedo.mk (TARGETOS): Init with empty string.
 +	(speedo_pkg_gnupg_configure): Use --enable-gpg2-is-gpg only for w32.
 +	(INST_VERSION, INST_PROD_VERSION): Create only for w32.
 +
 +2014-10-24  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Support pinentries with integrated repeat passphrase feature.
 +	* agent/agent.h (struct pin_entry_info_s): Add fields repeat_okay and
 +	with_repeat.
 +	* agent/call-pinentry.c (close_button_status_cb): Rewrite and check
 +	for PIN_REPEAT.  Change users to check only the relevant bit.
 +	(agent_askpin): Support repeat logic of new Pinentries.
 +
 +	* agent/command-ssh.c (ssh_identity_register): Use the new repeat
 +	feature.
 +	* agent/genkey.c (agent_ask_new_passphrase): Ditto.
 +
 +2014-10-19  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Silence "packet with obsolete versoin" warnings.
 +	* g10/parse-packet.c (parse_key): Print warning only in very verbose
 +	mode.
 +
 +	gpg: Make card key generation work again.
 +	* g10/call-agent.c (agent_scd_learn): Rename from agent_learn.
 +	(agent_learn): New.
 +	* g10/keygen.c (gen_card_key): Call new agent-learn.
 +
 +2014-10-17  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Allow building without LDAP support.
 +	* configure.ac: Add option --disable-ldap.
 +	(USE_LDAP): New ac_define and am_conditional.
 +	* dirmngr/Makefile.am: Take care of USE_LDAP.
 +	* dirmngr/dirmngr.c (!USE_LDAP): Make all ldap options dummy options
 +	and do not call any ldap function.
 +	* dirmngr/server.c (!USE_LDAP): Do not call any ldap function.
 +	* dirmngr/crlfetch.c (!USE_LDAP): Ditto.
 +
 +	w32: Set SYSROOT to help finding config scripts.
 +	* autogen.sh <build-w32>: Set SYSROOT.
 +
 +	gpg: Remove all support for v3 keys and always create v4-signatures.
 +	* g10/build-packet.c (do_key): Remove support for building v3 keys.
 +	* g10/parse-packet.c (read_protected_v3_mpi): Remove.
 +	(parse_key): Remove support for v3-keys.  Add dedicated warnings for
 +	v3-key packets.
 +	* g10/keyid.c (hash_public_key): Remove v3-key support.
 +	(keyid_from_pk): Ditto.
 +	(fingerprint_from_pk): Ditto.
 +
 +	* g10/options.h (opt): Remove fields force_v3_sigs and force_v4_certs.
 +	* g10/gpg.c (cmd_and_opt_values): Remove oForceV3Sigs, oNoForceV3Sigs,
 +	oForceV4Certs, oNoForceV4Certs.
 +	(opts): Turn --force-v3-sigs, --no-force-v3-sigs, --force-v4-certs,
 +	--no-force-v4-certs int dummy options.
 +	(main): Remove setting of the force_v3_sigs force_v4_certs flags.
 +	* g10/revoke.c (gen_revoke, create_revocation): Always create v4 certs.
 +	* g10/sign.c (hash_uid): Remove support for v3-signatures
 +	(hash_sigversion_to_magic): Ditto.
 +	(only_old_style): Remove this v3-key function.
 +	(write_signature_packets): Remove support for creating v3-signatures.
 +	(sign_file): Ditto.
 +	(sign_symencrypt_file): Ditto.
 +	(clearsign_file): Ditto.  Remove code to emit no Hash armor line if
 +	only v3-keys are used.
 +	(make_keysig_packet): Remove arg SIGVERSION and force using
 +	v4-signatures.  Change all callers to not pass a value for this arg.
 +	Remove all v3-key related code.
 +	(update_keysig_packet): Remove v3-signature support.
 +	* g10/keyedit.c (sign_uids): Always create v4-signatures.
 +
 +	* g10/textfilter.c (copy_clearsig_text): Remove arg pgp2mode and
 +	change caller.
 +
 +2014-10-13  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Remove extra RSA import status line.
 +	* g10/import.c (stats_s): Remove field "imported_rsa".
 +	(import_print_stats): Do not print separate value for RSA.
 +	(import_one): Remove the RSA counter.
 +
 +	gpg: Fix informative printing of user ids.
 +	* g10/getkey.c (keyid_list): Add field "fpr".
 +	(cache_user_id): Store fpr and check for dups only by fpr.
 +	(get_pubkey_byfpr): New.
 +	(get_user_id_string): Make static and use xasprintf.
 +	(get_long_user_id_string): Use xasprintf.
 +	(get_user_id_byfpr): New.
 +	(get_user_id_byfpr_native): New.
 +	* g10/keyid.c (fingerprint_from_pk): Make arg RET_LEN optional.
 +	* g10/import.c (import_one): Use get_user_id_byfpr_native.
 +
 +	gpg: Allow importing keys with duplicated long key ids.
 +	* g10/keydb.c (keydb_handle): Add field no_caching.
 +	(keyblock_cache): Repalce field kid by fpr.
 +	(keydb_disable_caching): New.
 +	(keydb_search): Use the fingerprint as cache index.
 +
 +	* g10/import.c (import_one): Use the fingerprint and not the kid to
 +	lookup the key.  Call keydb_disable_caching beofre re-searching for
 +	update.
 +
 +	* tests/openpgp/import.test: Add a test case.
 +
 +	tests: Speed up conventional encryption tests for gpg.
 +	* tests/openpgp/conventional-mdc.test: Add an s2k-count option.
 +	* tests/openpgp/conventional.test: Ditto.
 +
 +2014-10-12  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Minor change for better readability.
 +	* g10/build-packet.c (write_version): Remove.
 +	(do_pubkey_enc, do_onepass_sig): Write version directly.
 +
 +2014-10-10  Werner Koch  <wk at gnupg.org>
 +
 +	doc: Fix a man page rendering problem.
 +	* doc/gpg-agent.texi (Agent Configuration): Fix rendering of the
 +	sshcontrol example.
 +
 +2014-10-10  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	gpg: Add build and runtime support for larger RSA keys.
 +	* configure.ac: Added --enable-large-secmem option.
 +	* g10/options.h: Add opt.flags.large_rsa.
 +	* g10/gpg.c: Contingent on configure option: adjust secmem size,
 +	add gpg --enable-large-rsa, bound to opt.flags.large_rsa.
 +	* g10/keygen.c: Adjust max RSA size based on opt.flags.large_rsa
 +	* doc/gpg.texi: Document --enable-large-rsa.
 +
 +2014-10-09  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Skip overlong keys and a print a warning.
 +	* kbx/keybox-search.c (keybox_search): Add arg r_skipped and skip too
 +	long blobs.
 +	* sm/keydb.c (keydb_search): Call keybox_search with a dummy param.
 +	* g10/keydb.c (struct keydb_handle): Add field skipped_long_blobs.
 +	(keydb_search_reset): Reset that field.
 +	(keydb_search): Update that field.
 +	(keydb_get_skipped_counter): New.
 +	* g10/keylist.c (list_all): Print count of skipped keys.
 +
 +	gpg: Sync keylist output and warning messages.
 +	* g10/keylist.c (list_all): Flush stdout before logging.
 +	* g10/misc.c (print_pubkey_algo_note): Ditto.
 +	(print_cipher_algo_note): Ditto.
 +	(print_digest_algo_note): Ditto.
 +	(print_md5_rejected_note): Ditto.
 +
 +	kbx: Fix handling of overlong keys.
 +	* kbx/keybox-file.c (IMAGELEN_LIMIT): Change limit from 10^6 to 2MiB.
 +	(_keybox_read_blob2): Skip too long record records.
 +	(_keybox_write_blob): Do not accept too long record.
 +	* kbx/keybox-dump.c (file_stats_s): Add field skipped_long_blobs.
 +	(_keybox_dump_file): Print new counter.
 +	(_keybox_dump_file): Skip too long records.
 +	----
 +
 +	To test this feature you may set the limit back to 1MiB and use key
 +	F7F0E70F307D56ED which is in my local copy close to 2MiB.  Without
 +	this patch it was possible to import the key but access to that key
 +	and all keys stored after it was not possible.
 +
 +	gpg: Take care to use pubring.kbx if it has ever been used.
 +	* kbx/keybox-defs.h (struct keybox_handle): Add field for_openpgp.
 +	* kbx/keybox-file.c (_keybox_write_header_blob): Set openpgp header
 +	flag.
 +	* kbx/keybox-blob.c (_keybox_update_header_blob): Add arg for_openpgp
 +	and set header flag.
 +	* kbx/keybox-init.c (keybox_new): Rename to do_keybox_new, make static
 +	and add arg for_openpgp.
 +	(keybox_new_openpgp, keybox_new_x509): New.  Use them instead of the
 +	former keybox_new.
 +	* kbx/keybox-update.c (blob_filecopy): Add arg for_openpgp and set the
 +	openpgp header flags.
 +
 +	* g10/keydb.c (rt_from_file): New.  Factored out and extended from
 +	keydb_add_resource.
 +	(keydb_add_resource): Switch to the kbx file if it has the openpgp
 +	flag set.
 +
 +	* kbx/keybox-dump.c (dump_header_blob): Print header flags.
 +
 +2014-10-09  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	Avoid unnecessary library linkage.
 +	* dirmngr/Makefile.am: Avoid $(DNSLIBS) for dirmngr_ldap
 +	* g10/Makefile.am: $(LIBREADLINE) is only for gpg2; gpgv2 does not
 +	need $(LIBASSUAN_LIBS)
 +	* sm/Makefile.am: gpgsm does not need $(ZLIBS)
 +	* tools/Makefile.am: gpgconf does not need $(NPTH_LIBS)
 +
 +2014-10-08  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Avoid error exit if keygrip computations fails in a key listing.
 +	* g10/keyid.c (keygrip_from_pk): Use log_info and clear array on error.
 +
 +2014-10-03  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.0-beta864.
 +
 +	gpg: Allow creating a cert-only primary key.
 +	* g10/keygen.c (ask_key_flags): Allow a 'c' in direct entry.
 +
 +	build: Add configure options --disable-{ntb,gnu}tls.
 +	* configure.ac: Add --disable-ntbtls and --disable-gnutls.
 +
 +2014-10-03  Andre Heinecke  <aheinecke at intevation.de>
 +
 +	gpg: Check gpg-agent version before 2.1 migration.
 +	* g10/call-agent.c, g10/call-agent.h (agent_get_version): New.
 +	* g10/migrate.c (migrate_secring): Abort migration if
 +	agent_get_version returns not at least 2.1.0
 +
 +2014-10-03  Werner Koch  <wk at gnupg.org>
 +
 +	po: Update German translation.
 +
 +	Remove support for the GPG_AGENT_INFO envvar.
 +	* agent/agent.h (opt): Remove field use_standard_socket.
 +	* agent/command.c (cmd_killagent): Always allow killing.
 +	* agent/gpg-agent.c (main): Turn --{no,}use-standard-socket and
 +	--write-env-file into dummy options.  Always return true for
 +	--use-standard-socket-p. Do not print the GPG_AGENT_INFO envvar
 +	setting or set that envvar.
 +	(create_socket_name): Simplify by removing non standard socket
 +	support.
 +	(check_for_running_agent): Ditto.
 +	* common/asshelp.c (start_new_gpg_agent): Remove GPG_AGENT_INFO use.
 +	* common/simple-pwquery.c (agent_open): Ditto.
 +	* configure.ac (GPG_AGENT_INFO_NAME): Remove.
 +	* g10/server.c (gpg_server): Do not print the AgentInfo comment.
 +	* g13/server.c (g13_server): Ditto.
 +	* sm/server.c (gpgsm_server): Ditto.
 +	* tools/gpgconf.c (main): Simplify by removing non standard socket
 +	support.
 +
 +2014-10-02  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix regression removing SHA256.
 +	* g10/misc.c (map_md_openpgp_to_gcry): Always use SHA256.
 +
 +	First changes for future use of NTBTLS.
 +	* configure.ac (NEED_NTBTLS_ABI, NEED_NTBTLS_VERSION): New.
 +	(HTTP_USE_NTBTLS): New.  Prefer over GNUTLS.
 +	* m4/ntbtls.m4: New.
 +	* m4/Makefile.am (EXTRA_DIST): Add new file.
 +	* common/http.c: Add conditionals to eventually use NTBTLS.
 +
 +	build: Update m4 scripts.
 +	* m4/gpg-error.m4: Update from Libgpg-error git master.
 +	* m4/libgcrypt.m4: Update from Libgcrypt git master.
 +	* configure.ac: Declare SYSROOT a precious variable.  Add extra error
 +	message for library configuration mismatches.
 +
 +2014-09-29  Werner Koch  <wk at gnupg.org>
 +
 +	doc: Remove GnuPG-1 related parts from gpg.texi.
 +	* doc/Makefile.am (YAT2M_OPTIONS): Add 2.1 to the source info.
 +	* doc/gpg.texi: Remove gpg1 related texts.
 +
 +2014-09-27  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Default to SHA-256 for all signature types on RSA keys.
 +	* g10/main.h (DEFAULT_DIGEST_ALGO): Use SHA256 in --gnupg and SHA1 in
 +	strict RFC or PGP modes.
 +	* g10/sign.c (make_keysig_packet): Use DEFAULT_DIGEST_ALGO also for
 +	RSA key signatures.
 +	* configure.ac: Do not allow to disable sha256.
 +
 +	gpg: Simplify command --gen-key and add --full-gen-key.
 +	* g10/gpg.c (aFullKeygen): New.
 +	(opts): Add command --full-key-gen.
 +	(main): Implement it.
 +	* g10/keygen.c (DEFAULT_STD_ALGO): Replace wrong GCRY_PK_RSA although
 +	the value is identical.
 +	(DEFAULT_STD_CURVE): New.
 +	(DEFAULT_STD_SUBALGO): New.
 +	(DEFAULT_STD_SUBKEYSIZE): New.
 +	(DEFAULT_STD_SUBCURVE): New.
 +	(quick_generate_keypair): Use new macros here.
 +	(generate_keypair): Add arg "full" and fix call callers. Do not ask
 +	for keysize in non-full node.
 +	(ask_user_id): Add arg "full" and simplify for non-full mode.
 +
 +2014-09-26  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add shortcut for setting key capabilities.
 +	* g10/keygen.c (ask_key_flags): Add shortcut '='.
 +	* doc/help.txt (gpg.keygen.flags): New.
 +
 +2014-09-25  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Do not always print dashes in obsolete_option.
 +	* g10/gpg.c (main): Pass option names to obsolete_option without
 +	double dash.
 +	* g10/misc.c (obsolete_option, obsolete_scdaemon_option): Print double
 +	dash only for command line options.
 +
 +2014-09-25  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	gpg: Warn about (but don't fail) on scdaemon options in gpg.conf.
 +	* g10/gpg.c: Add config options that should belong in scdaemon.conf
 +	* g10/main.h, g10/misc.c (obsolete_scdaemon_option): New.
 +
 +2014-09-22  Werner Koch  <wk at gnupg.org>
 +
 +	speedo: Check that wget and gpgv are installed.
 +	* build-aux/getswdb.sh: Check for required tools.
 +
 +	speedo: Autodetect sha1sum tools.
 +	* build-aux/getswdb.sh: Add option --find-sha1sum.
 +	* build-aux/speedo.mk (check-tools): New phony target.  Not yet used.
 +	(SHA1SUM): New var.  Use it instead of sha1sum.
 +
 +	gpg: Create default keyring with .kbx suffix.
 +	* g10/keydb.c (maybe_create_keyring_or_box): Rename arg for clarity.
 +	(keydb_add_resource): Fix order of args to maybe_create_keyring_or_box
 +	and check and create .kbx.
 +
 +2014-09-20  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: --delete-secret-key - check that a secret key exists.
 +	* g10/delkey.c (do_delete_key): Check availibility of a secret key.
 +
 +	gpg: Make algorithm selection prompt for ECC more clear.
 +	* g10/keygen.c (ask_algo): Change 9 to "ECC and ECC".
 +
 +2014-09-18  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.0-beta834.
 +
 +	speedo: Distribute needed files.
 +	* Makefile.am (EXTRA_DIST): Add speedo stuff.
 +
 +	build: Enable gpgtar by default.
 +
 +	common: Do not build maintainer modules in non-maintainer mode.
 +	* common/Makefile.am (module_maint_tests): Use only in maintainer
 +	mode.
 +	(t_common_cflags): New.
 +
 +	common: Remove superfluous statements.
 +	* common/exechelp-posix.c: Remove weak pragmas.
 +	* common/sexputil.c (make_canon_sexp_from_rsa_pk): Remove double
 +	const.
 +
 +	g13: Avoid segv after pipe creation failure.
 +	* g13/call-gpg.c (gpg_encrypt_blob): Init some vars in case of an
 +	early error.
 +	(gpg_decrypt_blob): Ditto.
 +
 +	scd: Fix int/short mismatch in format string of app-p15.c.
 +	* scd/app-p15.c (parse_certid): Use snprintf and cast value.
 +	(send_certinfo): Ditto.
 +	(send_keypairinfo): Ditto.
 +	(do_getattr): Ditto.
 +
 +	agent: Init a local variable in the error case.
 +	* agent/pksign.c (do_encode_md): Init HASH on error.
 +
 +	agent: Remove left over debug output.
 +	* agent/command-ssh.c (ssh_signature_encoder_eddsa): Remove debug
 +	output.
 +
 +	agent: Silence compiler warning for a debug message.
 +	* agent/call-pinentry.c (agent_query_dump_state): Use %p for
 +	POPUP_TID.
 +
 +	sm: Silence compiler warnings.
 +	* sm/certreqgen-ui.c (gpgsm_gencertreq_tty): Remove unused var I.
 +	* sm/certreqgen.c (proc_parameters): Init PUBLIC to avoid compiler
 +	warning.
 +
 +	gpg: Silence a compiler warning.
 +	* g10/parse-packet.c (enum_sig_subpkt): Replace hack.
 +
 +	gpg: Replace a hash algo test function.
 +	* g10/gpg.c (print_mds): Replace openpgp_md_test_algo.
 +
 +	speedo: Various fixes.
 +	* build-aux/speedo.mk: Take zlib and bzip2 from ftp.gnupg.org.  Minor
 +	other fixes.
 +
 +2014-09-17  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Print a warning if the subkey expiration may not be what you want.
 +	* g10/keyedit.c (subkey_expire_warning): New.
 +	(keyedit_menu): Call it when needed.
 +
 +	gpg: Improve passphrase caching.
 +	* agent/cache.c (last_stored_cache_key): New.
 +	(agent_get_cache): Allow NULL for KEY.
 +	(agent_store_cache_hit): New.
 +	* agent/findkey.c (unprotect): Call new function and try to use the
 +	last stored key.
 +
 +	* g10/revoke.c (create_revocation): Add arg CACHE_NONCE and pass to
 +	make_keysig_packet.
 +	(gen_standard_revoke): Add arg CACHE_NONCE and pass to
 +	create_revocation.
 +	* g10/keygen.c (do_generate_keypair): Call gen_standard_revoke with
 +	cache nonce.
 +
 +2014-09-12  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Use algorithm id 22 for EdDSA.
 +	* common/openpgpdefs.h (PUBKEY_ALGO_EDDSA): Change to 22.
 +	* g10/keygen.c (ask_curve): Reword the Curve25519 warning note.
 +
 +2014-09-11  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Stop early on bogus old style comment packets.
 +	* g10/parse-packet.c (parse_key): Take care of too short packets for
 +	old style commet packets.
 +
 +2014-09-10  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Support https for KS_FETCH.
 +	* dirmngr/ks-engine-hkp.c (cert_log_cb): Move to ...
 +	* dirmngr/misc.c (cert_log_cb): here.
 +	* dirmngr/ks-engine-http.c (ks_http_fetch): Support 307-redirection
 +	and https.
 +
 +	dirmngr: Fix the ks_fetch command for the http scheme.
 +	* common/http.c (http_session_ref): Allow for NULL arg.
 +
 +2014-09-08  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix memory leak in ECC encryption.
 +	* g10/pkglue.c (pk_encrypt): Fix memory leak and streamline error
 +	handling.
 +
 +2014-09-02  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix export of NIST ECC keys.
 +	* common/openpgp-oid.c (struct oidtable): New.
 +	(openpgp_curve_to_oid): Rewrite and allow OID as input.
 +	(openpgp_oid_to_curve): Make use of the new table.
 +
 +	agent: Fix import of OpenPGP EdDSA keys.
 +	* agent/cvt-openpgp.c (get_keygrip): Special case EdDSA.
 +	(convert_secret_key): Ditto.
 +	(convert_transfer_key): Ditto.
 +	(apply_protection): Handle opaque MPIs.
 +
 +	(do_unprotect): Check FLAG_OPAQUE instead of FLAG_USER1 before
 +	unpacking an opaque mpi.
 +
 +2014-09-01  Kyle Butt  <kylebutt at gmail.com>
 +
 +	gpg: Fix export of ecc secret keys by adjusting check ordering.
 +	* g10/export.c (transfer_format_to_openpgp): Move the check against
 +	PUBKEY_MAX_NSKEY to after the ECC code adjusts the number of
 +	parameters.
 +
 +2014-09-01  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Allow key unprotection using AES-256.
 +	* agent/protect.c (PROT_CIPHER): Rename to GCRY_CIPHER_AES128 for
 +	clarity.
 +	(do_decryption): Add args prot_cipher and prot_cipher_keylen.  USe
 +	them instead of the hardwired values.
 +	(agent_unprotect): Change to use a table of protection algorithms.
 +	Add AES-256 variant.
 +
 +2014-08-28  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Do not show "MD5" and triplicated "RSA" in --version.
 +	* g10/gpg.c (build_list_pk_test_algo): Ignore RSA aliases
 +	(build_list_md_test_algo): Ignore MD5.
 +
 +	gpg: Do not show "MD5" and triplicated "RSA" in --version.
 +	* g10/gpg.c (build_list_pk_test_algo): Ignore RSA aliases
 +	(build_list_md_test_algo): Ignore MD5.
 +
 +2014-08-26  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Remove CAST5 from the default prefs and order SHA-1 last.
 +	* g10/keygen.c (keygen_set_std_prefs): Update prefs.
 +
 +	Switch to the libgpg-error provided estream.
 +	* configure.ac (NEED_GPG_ERROR_VERSION): Reguire 1.14.
 +	(GPGRT_ENABLE_ES_MACROS): Define.
 +	(estream_INIT): Remove.
 +	* m4/estream.m4: Remove.
 +	* common/estream-printf.c, common/estream-printf.h: Remove.
 +	* common/estream.c, common/estream.h: Remove.
 +	* common/init.c (_init_common_subsystems): Call gpgrt initialization.
 +
 +	gpg: Allow for positional parameters in the passphrase prompt.
 +	* g10/passphrase.c (passphrase_get): Replace sprintf by xasprintf.
 +
 +2014-08-20  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix "can't handle public key algorithm" warning.
 +	* g10/parse-packet.c (unknown_pubkey_warning): Check for encr/sign
 +	capabilities.
 +
 +2014-08-19  Werner Koch  <wk at gnupg.org>
 +
 +	speedo: Get version numbers from online database.
 +	* build-aux/getswdb.sh: New.
 +	* build-aux/speedo.mk: Get release version numbers from swdb.lst.
 +
 +	build: Create VERSION file via autoconf.
 +	* Makefile.am (dist-hook): Remove creation of VERSION.
 +	(EXTRA_DIST): Add VERSION.
 +	* configure.ac: Let autoconf create VERSION.
 +
 +2014-08-18  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Install the current release signing pubkey.
 +	* g10/distsigkey.gpg: New.
 +
 +	agent: Return NO_SECKEY instead of ENONET for PKSIGN and others.
 +	* agent/pksign.c (agent_pksign_do): Replace ENONET by NO_SECKEY.
 +	* agent/findkey.c (agent_key_from_file): No diagnostic for NO_SECKEY.
 +	* agent/pkdecrypt.c (agent_pkdecrypt): Replace checking for ENOENT.
 +
 +	kbx: Make user id and signature data optional for OpenPGP.
 +	* kbx/keybox-blob.c (_keybox_create_openpgp_blob): Remove restriction.
 +
 +	gpg: Change default cipher for --symmetric from CAST5 to AES-128.
 +	* g10/main.h (DEFAULT_CIPHER_ALGO): Chhange to AES or CAST5 or 3DES
 +	depending on configure option.
 +	* g10/gpg.c (main): Set opt.s2k_cipher_algo to DEFAULT_CIPHER_ALGO.
 +
 +	yat2m: Support @set and @value.
 +	* doc/yat2m.c (variablelist): New.
 +	(set_variable): New.
 +	(macro_set_p): Also check the variables.
 +	(proc_texi_cmd): Support the @value command.
 +	(parse_file): Support the @set command.
 +	(top_parse_file): Release variablelist.
 +
 +	yat2m: Support the $* command for man page rendering.
 +
 +2014-08-17  Werner Koch  <wk at gnupg.org>
 +
 +	estream: Change license from GPL to LPGL.
 +	* common/estream-printf.c, common/estream-printf.h: Change license.
 +	* common/estream.c, common/estream.h: Ditto.
 +
 +2014-08-14  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.0-beta783.
 +
 +	po: Update the German (de) translation.
 +
 +	sm: Create homedir and lock empty keybox creation.
 +	* sm/gpgsm.h (opt): Add field "no_homedir_creation".
 +	* sm/gpgsm.c (main): Set it if --no-options is used.
 +	* sm/keydb.c (try_make_homedir): New.  Similar to the one from
 +	g10/openfile.c.
 +	(maybe_create_keybox): New.  Similar to the one from g10/keydb.c.
 +	(keydb_add_resource): Replace some code by maybe_create_keybox.
 +
 +	gpg: Screen keyserver responses.
 +	* g10/main.h (import_screener_t): New.
 +	* g10/import.c (import): Add screener callbacks to param list.
 +	(import_one): Ditto.
 +	(import_secret_one): Ditto.
 +	(import_keys_internal): Ditto.
 +	(import_keys_stream): Ditto.
 +	* g10/keyserver.c (struct ks_retrieval_screener_arg_s): New.
 +	(keyserver_retrieval_screener): New.
 +	(keyserver_get): Pass screener to import_keys_es_stream().
 +
 +	scd: Minor changes to app-sc-hsm.
 +	* scd/app-sc-hsm.c: Re-indendet some parts and set some vars to NULL
 +	after xfree for improbed robustness.
 +	(read_ef_prkd): Replace serial operator by blocks for better
 +	readability.
 +	(apply_PKCS_padding): Rewrite for easier auditing.
 +	(strip_PKCS15_padding): Ditto.  Add stricter check on SRCLEN.
 +
 +	gpg: Disable an MD5 workaround for pgp2 by default.
 +	* g10/sig-check.c (do_check): Move some code to ...
 +	* g10/misc.c (print_md5_rejected_note): new function.
 +	* g10/mainproc.c (proc_tree, proc_plaintext): Enable MD5 workaround
 +	only if option --allow-weak-digest-algos is used.
 +
 +	gpg: Remove options --pgp2 and --rfc1991.
 +	* g10/gpg.c (oRFC1991, oPGP2): Remove
 +	(opts): Remove --pgp2 and --rfc1991.
 +	* g10/options.h (CO_PGP2, CO_RFC1991): Remove.  Remove all users.
 +	(RFC2440, PGP2): Remove.  Remove all code only enabled by these
 +	conditions.
 +	* tests/openpgp/clearsig.test: Remove --rfc1991 test.
 +
 +	build: Fix autogen.sh base version hack.
 +	* autogen.sh <find-version>: Fix.
 +
 +	gpg: Remove --compress-keys and --compress-sigs feature.
 +	* g10/gpg.c (oCompressKeys, oCompressSigs): Remove.
 +	(opts): Turn --compress-keys and --compress-signs in NOPs.
 +	* g10/options.h (opt): Remove fields compress_keys and compress_sigs.
 +	* g10/export.c (do_export): Remove compress_keys feature.
 +	* g10/sign.c (sign_file): Remove compress_sigs feature.
 +
 +2014-08-13  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add list-option "show-usage".
 +	* g10/gpg.c (parse_list_options): Add "show-usage".
 +	* g10/options.h (LIST_SHOW_USAGE): New.
 +	* g10/keyid.c (usagestr_from_pk): Add arg FILL.  Change caller.
 +	* g10/keylist.c (list_keyblock_print): Print usage info.
 +
 +2014-08-12  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Make --with-colons work again for --search-keys.
 +	* g10/keyserver.c (search_line_handler): Replace log_debug by
 +	es_printf.
 +
 +2014-08-08  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	po: Update Japanese translation.
 +
 +2014-07-25  Werner Koch  <wk at gnupg.org>
 +
 +	scd: Minor and editorial changes to app-sc-hsm.c.
 +	* scd/app-sc-hsm.c (select_and_read_binary): Use SW_ macro.
 +	(parse_certid): Remove useless test.
 +	(send_certinfo, send_keypairinfo): Shrink malloc to the needed size.
 +	(do_getattr): Ditto.
 +	(verify_pin): Use SW_ macro.
 +	(do_decipher): Replace OFS variable and extend comment.
 +
 +	scd: Add a new status word code.
 +	* scd/apdu.h (SW_REF_DATA_INV): New.
 +	* scd/apdu.c (apdu_strerror): Add string.
 +
 +2014-07-25  Andreas Schwier  <andreas.schwier at cardcontact.de>
 +
 +	scd: Support for SmartCard-HSM.
 +	* scd/app-sc-hsm.c: New.
 +	* scd/app.c (select_application, get_supported_applications): Register
 +	new app.
 +
 +2014-07-25  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Switch to an EdDSA format with prefix byte.
 +	* g10/keygen.c (gen_ecc): USe "comp" for EdDSA.
 +
 +2014-07-23  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Show just one warning with all failed passphrase constraints.
 +	* agent/genkey.c (check_passphrase_constraints): Build a final warning
 +	after all checks.
 +
 +	agent: Only one confirmation prompt for an empty passphrase.
 +	* agent/genkey.c (check_passphrase_constraints): Moev empty passphrase
 +	check to the front.
 +
 +	gpg: Add command --quick-gen-key.
 +	* g10/gpg.c (aQuickKeygen): New.
 +	* g10/misc.c (is_valid_user_id): New stub.
 +	* g10/keygen.c (quickgen_set_para): New.
 +	(quick_generate_keypair): New.
 +
 +	common: Add cpr_get_answer_is_yes_def()
 +	* g10/cpr.c (cpr_get_answer_is_yes): Factor code out to ....
 +	(cpr_get_answer_is_yes_def): ...new.
 +
 +	gpg: Make --quick-sign-key promote local key signatures.
 +	* g10/keyedit.c (sign_uids): Promote local sigs in quick mode.
 +
 +2014-07-22  Werner Koch  <wk at gnupg.org>
 +
 +	scd: Do not use the pcsc-wrapper.
 +	* scd/apdu.c (NEED_PCSC_WRAPPER): Do not define.
 +	* scd/Makefile.am (libexec_PROGRAMS): Remove gnupg-pcsc-wrapper
 +	(gnupg_pcsc_wrapper_SOURCES): Remove.
 +	(gnupg_pcsc_wrapper_LDADD): Remove.
 +	(gnupg_pcsc_wrapper_CFLAGS): Remove.
 +
 +2014-07-21  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Improve --list-packets output for faulty packets.
 +	* g10/parse-packet.c: Add list_mode output for certain failures.
 +
 +	gpg: Cap size of attribute packets at 16MB.
 +	* g10/parse-packet.c (parse_attribute): Avoid xmalloc failure and cap
 +	size of packet.
 +
 +2014-07-03  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.0-beta751.
 +
 +	gpg: Make show-uid-validity the default.
 +
 +	tests: Fix end-of-all-ticks test for Western locales.
 +	* common/t-timestuff.c (test_timegm): Use timegm if available.
 +	(main): Set TX to UTC if timegm is not available.
 +
 +2014-07-03  Kristian Fiskerstrand  <kf at sumptuouscapital.com>
 +
 +	gpg: Spelling error.
 +
 +2014-06-30  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Auto-create revocation certificates.
 +	* configure.ac (GNUPG_OPENPGP_REVOC_DIR): New config define.
 +	* g10/revoke.c (create_revocation): Add arg "leadin".
 +	(gen_standard_revoke): New.
 +	* g10/openfile.c (get_openpgp_revocdir): New.
 +	(open_outfile): Add MODE value 3.
 +	* g10/keyid.c (hexfingerprint): New.
 +	* g10/keygen.c (do_generate_keypair): Call gen_standard_revoke.
 +
 +	estream: Fix minor glitch in "%.*s" format.
 +	* common/estream-printf.c (pr_string): Take care of non-nul terminated
 +	strings.
 +
 +	gpg: Rearrange code in gen_revoke.
 +	* g10/revoke.c (gen_revoke): Factor some code out to ...
 +	(create_revocation): new.
 +
 +	gpg: Create exported secret files and revocs with mode 700.
 +	* common/iobuf.c (direct_open): Add arg MODE700.
 +	(iobuf_create): Ditto.
 +	* g10/openfile.c (open_outfile): Add arg RESTRICTEDPERM.  Change call
 +	callers to pass 0 for it.
 +	* g10/revoke.c (gen_desig_revoke, gen_revoke): Here pass true for new
 +	arg.
 +	* g10/export.c (do_export): Pass true for new arg if SECRET is true.
 +
 +	common: Minor code cleanup for a legacy OS.
 +	* common/iobuf.c (direct_open) [__riscos__]: Simply cpp conditionals.
 +
 +2014-06-27  Werner Koch  <wk at gnupg.org>
 +
 +	speedo: Fix the w32 installer name.
 +
 +	po: Update some strings of the French (fr) translation.
 +
 +	po: Update the German (de) translation.
 +
 +	agent: Adjust for changed npth_eselect under W32.
 +	* agent/gpg-agent.c (handle_connections) [W32]: Make events_set an
 +	unsigned int to match the changed prototype.
 +
 +	dirmngr: Use the homedir based socket also under W32.
 +	* common/homedir.c (dirmngr_user_socket_name): Use same code for all
 +	platforms.
 +
 +2014-06-27  Yuri Chornoivan  <yurchor at ukr.net>
 +
 +	po: Update and enable Ukrainian (uk) translation.
 +
 +	Fix typos in messages.
 +
 +2014-06-27  Werner Koch  <wk at gnupg.org>
 +
 +	build: Remove unused options.
 +	* configure.ac: Remove option --build-agent-only.
 +	(FAKE_CURL, GPGKEYS_CURL): Remove check for cURL
 +	(GPGKEYS_MAILTO): Remove ac_subst but keep the currently unused
 +	SENDMAIL check.
 +	(GPGKEYS_KDNS): Remove ac_subst.
 +	* autogen.rc (final_info): Remove suggestion to use the removed option
 +	--enable-mailto.
 +
 +2014-06-27  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Add pinpad support for REINER SCT cyberJack go.
 +	* scd/ccid-driver.h (VENDOR_REINER, CYBERJACK_GO): New.
 +	* scd/ccid-driver.c (ccid_transceive_secure): Handle the case for
 +	VENDOR_REINER. Original work was by Alina Friedrichsen (tiny change).
 +
 +2014-06-27  Werner Koch  <wk at gnupg.org>
 +
 +	scd: Support reader Gemalto IDBridge CT30.
 +	* scd/ccid-driver.h (GEMPC_CT30): New product id.
 +	* scd/ccid-driver.c (parse_ccid_descriptor): Add quirk for that
 +	reader.
 +
 +2014-06-26  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Limit keysize for unattended key generation to useful values.
 +	* g10/keygen.c (gen_elg): Enforce keysize 1024 to 4096.
 +	(gen_rsa): Enforce keysize 1024 to 4096.
 +	(gen_dsa): Enforce keysize 768 to 3072.
 +
 +	Enable DNS SRV records again.
 +	* configure.ac (GPGKEYS_HKP, GPGKEYS_FINGER): Remove ac_subst.
 +	(use_dns_srv): Make test work.
 +
 +	agent: Fix export of RSA keys to OpenPGP.
 +	* agent/cvt-openpgp.c (convert_transfer_key): Fix sexp build format
 +	string.
 +
 +	gpg,gpgsm: Simplify wrong_args function.
 +
 +	speedo: "make clean-gnupg" may not remove the source.
 +	* build-aux/speedo.mk (clean-$(1)): Take care of gnupg.
 +
 +	gpgsm: Fix default config name.
 +
 +2014-06-25  Werner Koch  <wk at gnupg.org>
 +
 +	doc: Improve the rendering of the manual.
 +
 +	doc: Update for modern makeinfo.
 +	* doc/texi.css: Remove.
 +	* doc/Makefile.am (AM_MAKEINFOFLAGS): Use --css-ref.
 +
 +	gpg: Allow key-to-card upload for cert-only keys.
 +	* g10/card-util.c (card_store_subkey): Allo CERT usage for key 0.
 +
 +2014-06-24  Werner Koch  <wk at gnupg.org>
 +
 +	doc: Add conditionals for GnuPG-1.
 +
 +2014-06-20  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Make export of ECC keys work again.
 +	* agent/cvt-openpgp.c (convert_to_openpgp): Use the curve name instead
 +	of the curve parameters.
 +	* g10/export.c (canon_pubkey_algo): Rename to ...
 +	(canon_pk_algo): this.  Support ECC.
 +	(transfer_format_to_openpgp): Expect curve name.
 +
 +	gpg: Avoid infinite loop in uncompressing garbled packets.
 +	* g10/compress.c (do_uncompress): Limit the number of extra FF bytes.
 +
 +2014-06-17  Kristian Fiskerstrand  <kf at sumptuouscapital.com>
 +
 +	gpg: Fix a couple of spelling errors.
 +
 +2014-06-17  Werner Koch  <wk at gnupg.org>
 +
 +	speedo: Support building from dist-source generated tarball.
 +
 +2014-06-13  Werner Koch  <wk at gnupg.org>
 +
 +	http: Print human readable GNUTLS status.
 +	* common/http.c (send_gnutls_bye): Take care of EAGAIN et al.
 +	(http_verify_server_credentials): Print a human readable status.
 +
 +2014-06-12  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Improve the output of --list-packets.
 +	* g10/parse-packet.c (parse): Print packet meta info in list mode.
 +
 +2014-06-11  Werner Koch  <wk at gnupg.org>
 +
 +	speedo: Improve building of the w32 installer.
 +	* build-aux/speedo.mk: Change name of build directory to PLAY.
 +	Improve the dist-source target.
 +	* build-aux/speedo/w32/gdk-pixbuf-loaders.cache: Add a blank
 +	line (plus comment).
 +	* build-aux/speedo/w32/inst.nsi: Change name of file to gnupg-w32-*.
 +	Install more tools.
 +
 +2014-06-10  Werner Koch  <wk at gnupg.org>
 +
 +	speedo: Revamped speedo and include a w32 installer.
 +	* build-aux/speedo/: New.
 +	* build-aux/speedo/w32/: New.
 +
 +	build: Add more options to autogen.sh.
 +	* autogen.sh: Add options --print-host and --print-build.
 +
 +	w32: Fix build problem with dirmngr.
 +	* dirmngr/ks-engine-hkp.c (EAI_SYSTEM) [W32]: Add replacement
 +	constant.
 +
 +	gpg: Use more specific reason codes for INV_RECP.
 +	* g10/pkclist.c (find_and_check_key, build_pk_list): Use more specific
 +	reasons codes for INV_RECP.
 +
 +2014-06-06  Werner Koch  <wk at gnupg.org>
 +
 +	Improve the beta number generation.
 +	* autogen.sh: Add option --find-version
 +	* configure.ac: Rework the setting of the mym4_ variables.
 +
 +2014-06-05  Werner Koch  <wk at gnupg.org>
 +
 +	Remove keyserver helper code.
 +	* configure.ac: Remove keyserver helper related stuff.
 +	* Makefile.am (SUBDIRS): Remove keyserver.
 +	* keyserver/Makefile.am: Remove.
 +
 +	gpg: Require confirmation for --gen-key with experimental curves.
 +	* g10/keygen.c (ask_curve): Add arg both.  Require confirmation for
 +	Curve25519.
 +
 +	gpg: Auto-migrate existing secring.gpg.
 +	* g10/migrate.c: New.
 +	* g10/import.c (import_old_secring): New.
 +	(import_one): Add arg silent.
 +	(transfer_secret_keys): Add arg batch.
 +	(import_secret_one): Add args batch and for_migration.
 +	* g10/gpg.c (main): Call migration function.
 +
 +2014-06-04  Werner Koch  <wk at gnupg.org>
 +
 +	gpgsm: Fix commit be07ed65.
 +	* sm/server.c (option_handler): Use "with-secret".
 +
 +2014-06-03  Werner Koch  <wk at gnupg.org>
 +
 +	Add new option --with-secret.
 +	* g10/gpg.c: Add option --with-secret.
 +	* g10/options.h (struct opt): Add field with_secret.
 +	* g10/keylist.c (public_key_list): Pass opt.with_secret to list_all
 +	and list_one.
 +	(list_all, list_one): Add arg mark_secret.
 +	(list_keyblock_colon): Add arg has_secret.
 +	* sm/gpgsm.c: Add option --with-secret.
 +	* sm/server.c (option_handler): Add option "with-secret".
 +	* sm/gpgsm.h (server_control_s): Add field with_secret.
 +	* sm/keylist.c (list_cert_colon): Take care of with_secret.  Also move
 +	the token string from the wrong field 14 to 15.
 +
 +	gpgsm: New commands --export-secret-key-{p8,raw}
 +	* sm/gpgsm.c: Add new commands.
 +	* sm/minip12.c (build_key_sequence): Add arg mode.
 +	(p12_raw_build): New.
 +	* sm/export.c (export_p12): Add arg rawmode.  Call p12_raw_build.
 +	(gpgsm_p12_export): Ditto.
 +	(print_short_info): Print the keygrip.
 +
 +2014-06-02  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Avoid NULL-deref in default key listing.
 +	* g10/keyid.c (hash_public_key): Take care of NULL keys.
 +	* g10/misc.c (pubkey_nbits): Ditto.
 +
 +	gpg: Simplify default key listing.
 +	* g10/mainproc.c (list_node): Rework.
 +
 +	gpg: Graceful skip reading of corrupt MPIs.
 +	* g10/parse-packet.c (mpi_read): Change error message on overflow.
 +
 +	gpgsm: Handle re-issued CA certificates in a better way.
 +	* sm/certchain.c (find_up_search_by_keyid): Consider all matching
 +	certificates.
 +	(find_up): Add some debug messages.
 +
 +	gpgsm: Add a way to save a found state.
 +	* kbx/keybox-defs.h (keybox_found_s): New.
 +	(keybox_handle): Factor FOUND out to above.  Add saved_found.
 +	* kbx/keybox-init.c (keybox_release): Release saved_found.
 +	(keybox_push_found_state, keybox_pop_found_state): New.
 +
 +	* sm/keydb.c (keydb_handle): Add field saved_found.
 +	(keydb_new): Init it.
 +	(keydb_push_found_state, keydb_pop_found_state): New.
 +
 +	gpg: Fix bug parsing a zero length user id.
 +	* g10/getkey.c (get_user_id): Do not call xmalloc with 0.
 +
 +	* common/xmalloc.c (xmalloc, xcalloc): Take extra precaution not to
 +	pass 0 to the arguments.
 +
 +2014-05-19  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Print certificates on failed TLS verification.
 +	* dirmngr/ks-engine-hkp.c (cert_log_cb): New.
 +	(send_request): Set callback.
 +
 +	http: Add callback to help logging of server certificates.
 +	* common/http.c (http_session_s): Add field cert_log_cb.
 +	(http_session_set_log_cb): New.
 +	(http_verify_server_credentials): Call callback.
 +
 +2014-05-16  Werner Koch  <wk at gnupg.org>
 +
 +	keyserver: Improve support for hkps pools.
 +	* dirmngr/ks-engine-hkp.c (hostinfo_s): Add fields cname, v4addr, and
 +	v6addr.
 +	(create_new_hostinfo): Clear them.
 +	(my_getnameinfo): Add args numeric and r_isnumeric.
 +	(is_ip_address): New.
 +	(map_host): Add arg r_host.  Rewrite the code to handle pools in a
 +	special way.
 +	(ks_hkp_print_hosttable): Change format of help info output.
 +	(make_host_part): Add arg optional r_httphost.
 +	(send_request): Add arg httphost.
 +	(ks_hkp_search, ks_hkp_get, ks_hkp_put): Get httphost and pass it to
 +	send_request.
 +
 +	http: Allow overriding of the Host header.
 +	* common/http.c (http_open): Add arg httphost.
 +	(http_open_document): Pass NULL for httphost.
 +	(send_request): Add arg httphost.  If given, use HTTPHOST instead of
 +	SERVER.  Use https with a proxy if requested.
 +	(http_verify_server_credentials): Do not stop at the first error
 +	message.
 +	* dirmngr/ocsp.c (do_ocsp_request): Adjust call to http_open.
 +	* keyserver/curl-shim.c (curl_easy_perform): Ditto.
 +	* dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
 +	* dirmngr/ks-engine-hkp.c (ks_hkp_help): Ditto.
 +
 +2014-05-14  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix uninitialized access to search descindex with gpg keyboxes.
 +	* kbx/keybox-search.c (keybox_search): Add arg  R_DESCINDEX.  Chnage
 +	both callers.
 +	* g10/keydb.c (keydb_search): Always set DESCINDEX.
 +
 +	w32: Make make_absfilename work with drive letters.
 +	* common/stringhelp.c (do_make_filename) [HAVE_DRIVE_LETTERS]: Fix.
 +
 +	gpg: Remove useless diagnostic in MDC verification.
 +	* g10/decrypt-data.c (decrypt_data): Do not distinguish between a bad
 +	MDC packer header and a bad MDC.
 +
 +	gpg: Fix glitch entering a full expiration time.
 +	* g10/keygen.c (ask_expire_interval): Get the current time after the
 +	prompt.
 +
 +2014-05-08  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Fix import of non-protected gpg keys.
 +	* agent/cvt-openpgp.c (do_unprotect): Return an s-exp also for
 +	non-protected keys.
 +	(convert_from_openpgp_main): Do not call agent_askpin for a
 +	non-protected key.
 +
 +	Make more use of *_NAME macros.
 +	* configure.ac (GPG_DISP_NAME, GPGSM_DISP_NAME): New.
 +	(GPG_AGENT_DISP_NAME, SCDAEMON_DISP_NAME): New.
 +	(DIRMNGR_DISP_NAME, G13_DISP_NAME): New.
 +	(GPGCONF_DISP_NAME): New.
 +	(SCDAEMON_SOCK_NAME): New.
 +	* common/argparse.c (show_help): Map description string.
 +
 +2014-05-08  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: Fix auth key comment handling.
 +	* agent/command-ssh.c (ssh_send_key_public): Handle the case with no
 +	comment.
 +
 +2014-05-07  Werner Koch  <wk at gnupg.org>
 +
 +	Make -jN work again.
 +	* common/Makefile.am ($(PROGRAMS)): New rule
 +	(t_http_LDADD): Use libcommontls.a without directory prefix.
 +	* dirmngr/Makefile.am ($(PROGRAMS)): New rule.
 +
 +	gpg: Print the key algorithm/curve with signature info.
 +	* g10/mainproc.c (check_sig_and_print): Print the name and curve.
 +
 +	gpg: Fix memleak in signature verification of bogus keys.
 +	* g10/mainproc.c (check_sig_and_print): Factor common code out to ...
 +	(print_good_bad_signature): here.
 +
 +	gpg: Mark experimental algorithms in the key listing.
 +	* g10/keylist.c (list_keyblock_print): Remove duplicate curve name.
 +	Print a note for experimental algorithms.
 +	* g10/misc.c (print_pubkey_algo_note): Fix warning message.
 +
 +	gpg: Finish experimental support for Ed25519.
 +	* agent/cvt-openpgp.c (try_do_unprotect_arg_s): Add field "curve".
 +	(get_keygrip): Add and use arg CURVE.
 +	(convert_secret_key): Ditto.
 +	(convert_transfer_key): Ditto.
 +	(get_npkey_nskey): New.
 +	(prepare_unprotect): Replace gcrypt functions by
 +	get_npkey_nskey.  Allow opaque MPIs.
 +	(do_unprotect): Use CURVE instead of parameters.
 +	(convert_from_openpgp_main): Ditto.
 +	(convert_to_openpgp):  Simplify.
 +	* g10/import.c (one_mpi_from_pkey): Remove.
 +	(transfer_secret_keys): Rewrite to use the curve instead of the
 +	parameters.
 +	* g10/parse-packet.c (parse_key): Mark protected MPIs with USER1 flag.
 +
 +	* common/openpgp-oid.c (openpgp_curve_to_oid): Allow the use of
 +	 "NIST P-256" et al.
 +	* g10/keygen.c (ask_curve): Add arg ALGO.
 +	(generate_keypair): Rewrite the ECC key logic.
 +
 +	* tests/openpgp/ecc.test: Provide the "ecc" passphrase.
 +
 +	kbx: Add experimental support for EDDSA.
 +	* kbx/keybox-openpgp.c (parse_key): Use algo constants and add
 +	experimental support for EdDSA.
 +
 +	agent: Remove greeting message.
 +	* agent/gpg-agent.c (main): Remove greeting.  Make --no-greeting a
 +	dummy.
 +
 +2014-05-06  Werner Koch  <wk at gnupg.org>
 +
 +	Use "samethread" mode keyword for some es_fopenmem.
 +	* dirmngr/ks-engine-hkp.c (armor_data): Add mode keyword.
 +	* g10/call-dirmngr.c (ks_put_inq_cb): Ditto.
 +	* scd/atr.c (atr_dump): Ditto.
 +
 +2014-05-05  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Add support for hkps keyservers.
 +	* dirmngr/dirmngr.c: Include gnutls.h.
 +	(opts): Add --gnutls-debug and --hkp-cacert.
 +	(opt_gnutls_debug, my_gnutls_log): New.
 +	(set_debug): Set gnutls log level.
 +	(parse_rereadable_options): Register a CA file.
 +	(main): Init GNUTLS.
 +	* dirmngr/ks-engine-hkp.c (ks_hkp_help): Support hkps.
 +	(send_request): Ditto.
 +
 +	http: Add reference counting to the session object.
 +	* common/http.c (http_session_t): Add field "refcount".
 +	(_my_socket_new, _my_socket_ref, _my_socket_unref): Add debug code.
 +	(send_request, my_npth_read, my_npth_write): Use SOCK object for the
 +	transport ptr.
 +	(http_session_release): Factor all code out to ...
 +	(session_unref): here.  Deref SOCK.
 +	(http_session_new): Init refcount and transport ptr.
 +	(http_session_ref): New.  Ref and unref all assignments.
 +
 +2014-05-02  Werner Koch  <wk at gnupg.org>
 +
 +	http: Add HTTP_FLAG_FORCE_TLS and http_get_tls_info.
 +	* common/http.c (http_parse_uri): Factor code out to ...
 +	(parse_uri): here.  Add arg FORCE_TLS.
 +	(do_parse_uri): Ditto.  Implement flag.
 +	(http_get_tls_info): New.
 +	(http_register_tls_ca): Allow clearing of the list.
 +	(send_request): Use a default verification function.
 +	* common/http.h (HTTP_FLAG_FORCE_TLS): New.
 +	* common/t-http.c (main): Add several command line options.
 +
 +	common: Fix test for openpgp_oid_is_ed25519.
 +	* common/t-openpgp-oid.c (test_openpgp_oid_is_ed25519): Add correct
 +	value.
 +
 +	http: Revamp TLS API.
 +	* configure.ac (NEED_GNUTLS_VERSION): New.
 +	(HTTP_USE_GNUTLS, LIBGNUTLS_CFLAGS, LIBGNUTLS_LIBS): New ac_subst.
 +
 +	* common/http.h (http_session_t): New.
 +	* common/http.c: Remove compatibility for gnutls < 3.0.
 +	(http_session_s): New.
 +	(cookie_s): Replace gnutls_session_t by http_session_t.
 +	(tls_callback, tls_ca_certlist): New variables.
 +	(my_socket_unref): Add preclose args.
 +	(my_npth_read, my_npth_write): New.
 +	(make_header_line): Fix bug using int* instead of char*.
 +	(http_register_tls_callback): New.
 +	(http_register_tls_ca): New.
 +	(http_session_new): New.
 +	(http_session_release): New.
 +	(http_get_header_names): New.
 +	(escape_data): Add hack to escape in forms mode.
 +	(send_request) [HTTP_USE_GNUTLS]: Support SNI.
 +	(send_request) [HTTP_USE_GNUTLS]: Fix use of make_header_line.
 +	(send_gnutls_bye): New.
 +	(cookie_close): Make use of preclose feature.
 +	(http_verify_server_credentials): New.
 +	(main) [TEST]: Remove test code.
 +	* common/t-http.c: New.
 +	* common/tls-ca.pem: New.
 +	* common/Makefile.am (tls_sources): New. Move http code to here.
 +	(libcommontls_a_SOURCES): New.
 +	(libcommontlsnpth_a_SOURCES): New.
 +	(EXTRA_DIST): Add tls-ca.pem
 +	(module_maint_tests): Add t-http.
 +	(t_http_SOURCES, t_http_CFLAGS, t_http_LDADD): New.
 +
 +	* dirmngr/Makefile.am (dirmngr_LDADD): Add libcommontlsnpth.
 +
 +	common: Cleanup the use of USE_NPTH and HAVE_NPTH macros.
 +	* configure.ac (HAVE_NPTH): New ac_define.
 +	* common/estream.c: Use USE_NPTH instead of HAVE_NPTH.
 +	* common/http.c: Ditto.  Replace remaining calls to pth by npth calls.
 +	(connect_server): Remove useless _().
 +	* common/exechelp-posix.c, common/exechelp-w32.c
 +	* common/exechelp-w32ce.c: Use HAVE_PTH to include npth.h.
 +	* common/init.c (_init_common_subsystems): Remove call to pth_init.
 +	* common/sysutils.c (gnupg_sleep): Use npth_sleep.
 +	* scd/ccid-driver.c (my_sleep): Ditto.
 +
 +2014-04-30  Werner Koch  <wk at gnupg.org>
 +
 +	estream: Implement "samethread" mode keyword.
 +	* src/estream.c (estream_internal): Add field SAMETHREAD.
 +	(init_stream_lock, lock_stream, trylock_stream, unlock_stream): Use it.
 +	(parse_mode): Add arg SAMETHREAD and parse that keyword.
 +	(es_initialize): Rename to ...
 +	(init_stream_obj): this.  Add arg SAMETHREAD.
 +	(es_create): Add arg SAMETHREAD.  Call init_stream_lock after
 +	init_stream_obj.
 +	(doreadline): Call es_create with samethread flag.
 +	(es_fopen, es_mopen, es_fopenmem, es_fopencookie, do_fdopen)
 +	(do_fpopen, do_w32open): Implement "samethread" keyword.
 +	(es_freopen): Take samthread flag from old stream.
 +	(es_tmpfile): Call es)_create w/o samethread.
 +
 +	estream: Fix deadlock in es_fileno.
 +	* src/estream.c (es_fileno_unlocked): Call the unlocked functions.
 +
 +	estream: Add debug code to the lock functions.
 +	* common/estream.c (dbg_lock_0, dbg_lock_1, dbg_lock_1): New.
 +
 +	estream: Replace locking macros by functions.
 +	* common/estream.c: Replace most macros.
 +
 +2014-04-28  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	ECC Fixes.
 +	* agent/cvt-openpgp.c (get_keygrip, convert_secret_key)
 +	(convert_transfer_key): Follow newer (>= 1.6) libgcrypt API, which
 +	does not distinguish the detail.
 +	(do_unprotect, convert_from_openpgp_main): Don't call
 +	map_pk_openpgp_to_gcry, as it's the value of libgcrypt API already and
 +	not the value defined by OpenPGP.
 +	(convert_to_openpgp): It's "ecc".
 +	* agent/gpg-agent.c (map_pk_openpgp_to_gcry): Remove.
 +	* g10/call-agent.c (agent_pkdecrypt): Fix off-by-one error.
 +	* g10/pubkey-enc.c (get_it): Fix swapping the fields error.
 +
 +2014-04-22  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Pass --homedir to gpg-agent.
 +	* agent/gpg-agent.c (main): Make sure homedir is absolute.
 +	* common/asshelp.c (lock_spawning): Create lock file with an absolute
 +	name.
 +	(start_new_gpg_agent): Use an absolute name for the socket and pass
 +	option --homedir to the agent.
 +	(start_new_dirmngr): Use an absolute name for the --homedir.
 +
 +	common: Add functions make_absfilename and make_absfilename_try.
 +	* common/stringhelp.c (do_make_filename): Add modes 2 and 3.
 +	(make_absfilename): New.
 +	(make_absfilename_try): New.
 +
 +	common: Add function gnupg_getcwd.
 +	* tools/gpg-connect-agent.c (gnu_getcwd): Move to ...
 +	* common/sysutils.c (gnupg_getcwd): .. here.
 +	* tools/gpg-connect-agent.c (get_var_ext): Use gnupg_getcwd.
 +
 +	gpg: Print a warning if GKR has hijacked gpg-agent.
 +	* g10/call-agent.c (check_hijacking): New.
 +	(start_agent): Call it.
 +	(membuf_data_cb, default_inq_cb): Move more to the top.
 +
 +2014-04-17  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: New %U expando for the photo viewer.
 +	* g10/photoid.c (show_photos): Set namehash.
 +	* g10/misc.c (pct_expando): Add "%U" expando.
 +
 +	common: Add z-base-32 encoder.
 +	* common/zb32.c: New.
 +	* common/t-zb32.c: New.
 +	* common/Makefile.am (common_sources): Add zb82.c
 +	(module_tests): Add t-zb32.
 +
 +2014-04-16  Werner Koch  <wk at gnupg.org>
 +
 +	Two minor code cleanups and one NULL deref on error fix.
 +	* common/estream.c (es_freopen): Remove useless check for STREAM.
 +	* kbx/keybox-blob.c (_keybox_create_x509_blob): Remove useless check
 +	for BLOB.
 +	* tools/sockprox.c (run_proxy): Do not fclose(NULL).
 +
 +2014-04-15  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Re-enable secret key deletion.
 +	* g10/call-agent.c (agent_delete_key): New.
 +	* g10/keydb.h (FORMAT_KEYDESC_DELKEY): New.
 +	* g10/passphrase.c (gpg_format_keydesc): Support new format.
 +	* g10/delkey.c (do_delete_key): Add secret key deletion.
 +
 +	gpg: Re-indent a file.
 +	* g10/delkey.c: Re-indent.
 +	(do_delete_key, delete_keys): Change return type top gpg_error_t.
 +
 +	gpg: Fix regression in secret key export.
 +	* agent/cvt-openpgp.c (convert_to_openpgp): Fix use
 +	gcry_sexp_extract_param.
 +	* g10/export.c (do_export_stream): Provide a proper prompt to the
 +	agent.
 +
 +	gpg: Change pinentry prompt to talk about "secret key".
 +	* g10/passphrase.c (gpg_format_keydesc): Add mode 2.  Change strings.
 +	* g10/keydb.h (FORMAT_KEYDESC_NORMAL, FORMAT_KEYDESC_IMPORT)
 +	(FORMAT_KEYDESC_EXPORT): New.  Use them for clarity.
 +
 +	agent: Add command DELETE_KEY.
 +	* agent/command.c (cmd_delete_key): New.
 +	* agent/findkey.c (modify_description): Add '%C' feature.
 +	(remove_key_file): New.
 +	(agent_delete_key): New.
 +	* agent/command-ssh.c (search_control_file): Make arg R_DISABLE
 +	optional.
 +
 +	* configure.ac: Require libgpg-error 1.13.
 +
 +2014-04-09  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: EdDSA support.
 +	* scd/app-openpgp.c (KEY_TYPE_EDDSA, CURVE_ED25519): New.
 +	(struct app_local_s): Add eddsa.
 +	(get_algo_byte, store_fpr): Support KEY_TYPE_EDDSA.
 +	(get_ecc_key_parameters, get_curve_name): Support CURVE_ED25519.
 +	(send_key_attr, get_public_key): Support KEY_TYPE_EDDSA.
 +	(build_ecc_privkey_template): Rename as it supports both of
 +	ECDSA and EdDSA.
 +	(ecc_writekey): Rename.  Support CURVE_ED25519, too.
 +	(do_writekey): Follow the change of ecc_writekey.
 +	(do_auth): Support KEY_TYPE_EDDSA.
 +	(parse_ecc_curve): Support CURVE_ED25519.  Bug fix for other curves.
 +	(parse_algorithm_attribute): Bug fix for ECDH.  Support EdDSA.
 +
 +2014-04-08  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Fix compiler warning.
 +	* common/mischelp.h (JNLIB_GCC_HAVE_PUSH_PRAGMA): New.
 +	* dirmngr/dirmngr.c (handle_tick): Factor time check out to ...
 +	(time_for_housekeeping_p): new.
 +
 +	gpgconf: Add command --launch.
 +	* tools/gpgconf.c: Add command --launch.
 +	* tools/gpgconf-comp.c (gc_component_launch): New.
 +
 +	scd: Silent compiler warnings about unused variables.
 +	* scd/app-openpgp.c (build_ecdsa_privkey_template): Mark unused arg.
 +	(ecdh_writekey): Mark unused args.
 +
 +2014-04-08  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: Support EdDSA.
 +	* agent/pksign.c (agent_pksign_do): Handle EdDSA signature.
 +
 +	g10: EdDSA support.
 +	* g10/keyid.c (keygrip_from_pk): Compute keygrip of EdDSA key.
 +	* g10/keygen.c (generate_subkeypair): Ed25519 is for EdDSA.
 +	* common/openpgp-oid.c (oid_ed25519): Update.
 +
 +2014-04-04  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: EdDSA support for SSH.
 +	* agent/command-ssh.c (ssh_signature_encoder_eddsa): Signature is
 +	two 32-byte opaque data which should not be interpreted as number.
 +
 +2014-03-27  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add commands --quick-sign-key and --quick-lsign-key.
 +	* g10/gpg.c (main): Add commands --quick-sign-key and
 +	--quick-lsign-key.
 +	* g10/keyedit.c (sign_uids): Add args FP and QUICK.
 +	(keyedit_quick_sign): New.
 +	(show_key_with_all_names): Add arg NOWARN.
 +
 +	Change some keyedit functions to allow printing to arbitrary streams.
 +	* common/ttyio.c (tty_print_string): Add optional arg FP. Change all
 +	callers.
 +	(tty_print_utf8_string2): Ditto.
 +	* g10/keyedit.c (show_prefs):  Ditto.
 +	(show_key_with_all_names_colon): Ditto.
 +	(show_names): Ditto.
 +	* g10/keylist.c (print_revokers): Ditto.
 +	(print_fingerprint): Ditto.
 +
 +2014-03-23  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Replace es_mopen by es_fopenmem for ssh.
 +	* agent/command-ssh.c (ssh_read_key_public_from_blob): Use
 +	es_fopenmem.
 +	(ssh_handler_request_identities): Ditto.
 +	(ssh_request_process): Ditto.
 +
 +2014-03-22  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Put ssh key type as comment into sshcontrol.
 +	* agent/command-ssh.c (ssh_key_type_spec): Add field name.
 +	(ssh_key_types): Add human readable names.
 +	(add_control_entry): Add arg SPEC and print key type as comment.
 +	(ssh_identity_register): Add arg SPEC.
 +	(ssh_handler_add_identity): Add var SPEC and pass ssh_receive_key.
 +
 +	agent: Support the Ed25519 signature algorithm for ssh.
 +	* agent/command-ssh.c (SPEC_FLAG_IS_EdDSA): New.
 +	(ssh_key_types): Add entry for ssh-ed25519.
 +	(ssh_identifier_from_curve_name): Move to the top.
 +	(stream_read_skip): New.
 +	(stream_read_blob): New.
 +	(ssh_signature_encoder_rsa): Replace MPIS array by an s-exp and move
 +	the s-exp parsing to here.
 +	(ssh_signature_encoder_dsa): Ditto.
 +	(ssh_signature_encoder_ecdsa): Ditto.
 +	(ssh_signature_encoder_eddsa): New.
 +	(sexp_key_construct): Rewrite.
 +	(ssh_key_extract): Rename to ...
 +	(ssh_key_to_blob): .. this and rewrite most of it.
 +	(ssh_receive_key): Add case for EdDSA.
 +	(ssh_convert_key_to_blob, key_secret_to_public): Remove.
 +	(ssh_send_key_public): Rewrite.
 +	(ssh_handler_request_identities): Simplify.
 +	(data_sign): Add rename args.  Add new args HASH and HASHLEN.  Make
 +	use of es_fopenmen and es_fclose_snatch.  Remove parsing into MPIs
 +	which is now doe in the sgnature encoder functions.
 +	(ssh_handler_sign_request): Take care of Ed25519.
 +	(ssh_key_extract_comment): Rewrite using gcry_sexp_nth_string.
 +
 +	agent: Cleanups to prepare implementation of Ed25519.
 +	* agent/cvt-openpgp.c: Remove.
 +	(convert_to_openpgp): Use gcry_sexp_extract_param.
 +	* agent/findkey.c (is_eddsa): New.
 +	(agent_is_dsa_key, agent_is_eddsa_key): Check whether ecc means EdDSA.
 +	* agent/pksign.c (agent_pksign_do): Add args OVERRIDEDATA and
 +	OVERRIDEDATALEN.
 +
 +	* common/ssh-utils.c (is_eddsa): New.
 +	(get_fingerprint): Take care or EdDSA.
 +
 +2014-03-18  Werner Koch  <wk at gnupg.org>
 +
 +	tools: Fix NULL deref in gpg-connect-agent.
 +	* tools/gpg-connect-agent.c (handle_inquire): Do not pass NULL to
 +	strlen.
 +
 +	dirmngr: Resurrect hosts in the HKP hosttable.
 +	* dirmngr/dirmngr.c (HOUSEKEEPING_INTERVAL): New.
 +	(housekeeping_thread): New.
 +	(handle_tick): Call new function.
 +	* dirmngr/ks-engine-hkp.c (RESURRECT_INTERVAL): New.
 +	(struct hostinfo_s): Add field died_at and set it along with the dead
 +	flag.
 +	(ks_hkp_print_hosttable): Print that info.
 +	(ks_hkp_housekeeping): New.
 +
 +	common: New function elapsed_time_string.
 +	* common/gettime.c (elapsed_time_string): New.
 +
 +2014-03-17  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Reject signatures made with MD5.
 +	* g10/gpg.c: Add option --allow-weak-digest-algos.
 +	(main): Set option also in PGP2 mode.
 +	* g10/options.h (struct opt): Add flags.allow_weak_digest_algos.
 +	* g10/sig-check.c (do_check): Reject MD5 signatures.
 +	* tests/openpgp/defs.inc: Add allow_weak_digest_algos to gpg.conf.
 +
 +	gpg: Make --auto-key-locate work again with keyservers.
 +	* dirmngr/ks-engine-hkp.c (ks_hkp_get): Allow exact search mode.
 +	* g10/keyserver.c (keyserver_import_name): Implement.
 +	(keyserver_get): Use exact mode for name based import.
 +	(keyserver_get): Add args R_FPR and R_FPRLEN.  Change all callers.
 +
 +	gpg: New mechanism "clear" for --auto-key-locate.
 +	* g10/getkey.c (parse_auto_key_locate): Implement "clear".
 +
 +2014-03-14  Werner Koch  <wk at gnupg.org>
 +
 +	gpg-connect-agent: Make it easier to connect to the dirmngr.
 +	* tools/gpg-connect-agent.c: Add options --dirmngr and
 +	--dirmngr-program.
 +
 +	dirmngr: Make use of IPv4 and IPV6 more explicit.
 +	* common/http.c (connect_server): Handle the new flags.
 +	* common/http.h (HTTP_FLAG_IGNORE_IPv4, HTTP_FLAG_IGNORE_IPv4): New.
 +	* dirmngr/ks-engine-hkp.c (map_host): Add arg r_httpflags.
 +	(make_host_part): Ditto.
 +	(send_request): Add arg httpflags.
 +	(ks_hkp_search, ks_hkp_get, ks_hkp_put): Handle httpflags.
 +
 +	dirmngr: Do not use brackets around legacy IP addresses.
 +	* dirmngr/ks-engine-hkp.c (my_getnameinfo): Change args to take a
 +	complete addrinfo.  Bracket only v6 addresses.  Change caller.
 +
 +	gpg: Print the actual used keyserver address.
 +	* dirmngr/ks-engine-hkp.c (ks_hkp_search, ks_hkp_get): Print SOURCE
 +	status lines.
 +	* g10/call-dirmngr.c (ks_status_parm_s): New.
 +	(ks_search_parm_s): Add field stparm.
 +	(ks_status_cb): New.
 +	(ks_search_data_cb): Send source to the data callback.
 +	(gpg_dirmngr_ks_search): Change callback prototope to include the
 +	SPECIAL arg.  Adjust all users.  Use ks_status_cb.
 +	(gpg_dirmngr_ks_get): Add arg r_source and use ks_status_cb.
 +	* g10/keyserver.c (search_line_handler): Adjust callback and print
 +	"data source" disgnostic.
 +	(keyserver_get): Print data source diagnostic.
 +
 +	dirmngr: Default to a user socket name and enable autostart.
 +	* common/homedir.c (dirmngr_socket_name): Rename to
 +	dirmngr_sys_socket_name.
 +	(dirmngr_user_socket_name): New.
 +	* common/asshelp.c (start_new_dirmngr): Handle sys and user dirmngr
 +	socket.
 +	* dirmngr/dirmngr.c (main): Ditto.
 +	* dirmngr/server.c (cmd_getinfo): Ditto.
 +	* sm/server.c (gpgsm_server): Ditto.
 +	* dirmngr/dirmngr-client.c (start_dirmngr): Likewise.
 +	* tools/gpgconf.c (main): Print "dirmngr-sys-socket" with --list-dirs.
 +
 +	* configure.ac (USE_DIRMNGR_AUTO_START): Set by default.
 +
 +2014-03-12  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add option --dirmngr-program.
 +	* g10/gpg.c: Add option --dirmngr-program.
 +	* g10/options.h (struct opt): Add field dirmngr_program.
 +	* g10/call-dirmngr.c (create_context): Use new var.
 +
 +	* dirmngr/dirmngr.c: Include gc-opt-flags.h.
 +	(main): Remove GC_OPT_FLAG_*.
 +	* tools/gpgconf-comp.c (GC_OPT_FLAG_NO_CHANGE): Move macro to ...
 +	* common/gc-opt-flags.h: here.
 +
 +	dirmngr: Detect dead keyservers and try another one.
 +	* dirmngr/ks-action.c (ks_action_resolve): Rename var for clarity.
 +	(ks_action_search, ks_action_put): Ditto.
 +	(ks_action_get): Consult only the first server which retruned some
 +	data.
 +
 +	* dirmngr/ks-engine-hkp.c (SEND_REQUEST_RETRIES): New.
 +	(map_host): Add arg CTRL and call dirmngr_tick.
 +	(make_host_part): Add arg CTRL.
 +	(mark_host_dead): Allow the use of an URL.
 +	(handle_send_request_error): New.
 +	(ks_hkp_search, ks_hkp_get, ks_hkp_put): Mark host dead and retry on
 +	error.
 +
 +	http: Add a flag to the URL parser indicating a literal v6 address.
 +	* common/http.h (struct parsed_uri_t): Add field v6lit.
 +	* common/http.c (do_parse_uri): Set v6lit.
 +
 +2014-03-12  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: writekey support of ECC.
 +	* scd/app-openpgp.c (CURVE_SEC_P256K1, get_algo_byte): New.
 +	(store_fpr): Support ECC keys with varargs.
 +	(get_ecc_key_parameters, get_curve_name): Support secp256k1.
 +	(parse_ecc_curve): Likewise.
 +	(build_ecdsa_privkey_template, rsa_writekey, ecdsa_writekey): New.
 +	(ecdh_writekey): New.  Not implemented yet.
 +	(do_writekey): Call rsa_writekey, ecdsa_writekey, or ecdh_writekey.
 +	(do_genkey): Follow the change of store_fpr.
 +
 +2014-03-11  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Put brackets around IP addresses in the hosttable.
 +	* dirmngr/ks-engine-hkp.c (EAI_OVERFLOW): Provide a substitute.
 +	(my_getnameinfo): New.
 +	(map_host): Use it.
 +
 +	dirmngr: Add command option to mark hosts as dead or alive.
 +	* dirmngr/server.c (cmd_killdirmngr): Factor some code out to ...
 +	(check_owner_permission): here.
 +	(cmd_keyserver): Add options --dead and --alive.
 +	* dirmngr/ks-engine-hkp.c (host_in_pool_p): New.
 +	(ks_hkp_mark_host): New.
 +
 +	dirmngr: Make Assuan output of keyblocks easier readable.
 +	* dirmngr/server.c (data_line_cookie_write): Print shorter data lines
 +	in verbose mode.
 +
 +	dirmngr: Fix HKP host selection code.
 +	* dirmngr/server.c (cmd_keyserver): Add option --resolve and change
 +	--print-hosttable to --hosttable.
 +	* dirmngr/ks-action.c (ks_printf_help): New.
 +	(ks_action_resolve): New.
 +	* dirmngr/ks-engine-hkp.c (select_random_host): Fix selection.
 +	(ks_hkp_print_hosttable): Print to assuan stream.
 +	(map_host): Remove debug code.  Add arg FORCE_SELECT.  Return numeric
 +	IP addr if it can't be resolved.
 +	(make_host_part): Add arg FORCE_SELECT; change callers to pass false.
 +	(ks_hkp_resolve): New.
 +
 +	List readline support in configure summary.
 +	* m4/readline.m4: Set gnupg_cv_have_readline.
 +	* configure.ac: Add readline support to summary output.
 +
 +2014-03-11  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: API change of agent_key_from_file.
 +	* agent/findkey.c (agent_key_from_file): Always return S-expression.
 +	* agent/command.c (cmd_passwd): Distinguish by SHADOW_INFO.
 +	(cmd_export_key): Likewise.  Free SHADOW_INFO.
 +	(cmd_keytocard): Likewise.  Release S_SKEY.
 +	* agent/pkdecrypt.c (agent_pkdecrypt): Likewise.
 +	* agent/pksign.c (agent_pksign_do): Likewise.  Use the S-expression to
 +	know the key type.
 +
 +2014-03-10  Werner Koch  <wk at gnupg.org>
 +
 +	Backport useful code from fixes for bug 1447.
 +	* configure.ac: Cehck for inet_ntop.
 +	* m4/libcurl.m4: Provide a #define for the version of the curl
 +	library.
 +
 +	scd: acquire lock in new_reader_slot.
 +	* scd/apdu.c (new_reader_slot): Acquire lock.
 +	(open_ct_reader, open_pcsc_reader_direct, open_pcsc_reader_wrapped)
 +	(open_ccid_reader, open_rapdu_reader): Release lock.
 +	(lock_slot, trylock_slot, unlock_slot): Move more to the top.
 +
 +	Do not require libiconv for Android.
 +	* configure.ac (require_iconv): New.  Set to false for android.
 +	(AM_ICONV): Run only if required.
 +
 +2014-03-07  Werner Koch  <wk at gnupg.org>
 +
 +	dirmmgr: Use a portability wrapper for struct timeval.
 +	* dirmngr/dirmngr_ldap.c [W32]: Include winber.h.
 +	(my_ldap_timeval_t): New.
 +
 +	Silence more warnings about unused vars and args.
 +	* dirmngr/cdblib.c (cdb_init) [W32]: Remove unused var.
 +	* dirmngr/dirmngr-client.c (start_dirmngr): s/int/assuan_fd_t/.
 +	* dirmngr/dirmngr.c (w32_service_control): Mark unused args.
 +	(call_real_main): New.
 +	(main) [W32]: Use new function to match prototype.
 +	(real_main) [W32]: Mark unused vars.
 +	(handle_signal) [W32]: Do not build the function at all.
 +	(handle_connections) [W32]: Do not define signo.
 +	* dirmngr/ldap-wrapper-ce.c (outstream_reader_cb): Remove used vars.
 +	* g10/tdbio.c (ftruncate) [DOSISH]: Define only if not yet defined.
 +
 +	dirmngr: Simplify strtok macro.
 +	* dirmngr/ldap-url.c (ldap_utf8_strtok): Remove unused r3d arg.
 +	(ldap_str2charray): Remove lasts.
 +
 +	Use attribute __gnu_printf__ also in estream header files.
 +	* common/estream-printf.h: Use attribute gnu_printf.
 +	* common/estream.h: Ditto.
 +
 +	Use attribute __gnu_printf__ with our estream-printf functions.
 +	* common/mischelp.h (JNLIB_GCC_A_PRINTF): Use __gnu_printf__
 +	(JNLIB_GCC_A_NR_PRINTF): Ditto.
 +
 +	w32: Silence warnings about unused vars.
 +	* agent/gpg-agent.c (main) [W32]: Mark unused vars.
 +	* sm/gpgsm.c (run_protect_tool) [W32]: Ditto.
 +	* g10/trustdb.c (check_regexp) [DISABLE_REGEX]: Ditto.
 +	* scd/scdaemon.c (main) [W32]: Ditto.
 +	(handle_connections) [W32]: Ditto.
 +	(handle_signal) [W32]: Do not build the function at all.
 +	* scd/apdu.c (pcsc_send_apdu_direct): Ditto.
 +	(connect_pcsc_card): s/long/pcsc_dword_t/.
 +	(open_pcsc_reader_direct): Remove var listlen.
 +
 +	w32: Fix a potential problem in gpgconf's gettext.
 +	* tools/gpgconf-comp.c (my_dgettext) [USE_SIMPLE_GETTEXT]: Make sure
 +	to return something even DOMAIN is not given.
 +
 +	Silence several warnings when building under Windows.
 +	* agent/call-scd.c (start_scd): Replace int by assuan_fd_t.
 +	(start_pinentry): Ditto.
 +	* common/asshelp.c (start_new_gpg_agent): Replace int by assuan_fd_t.
 +	* common/dotlock.c (GNUPG_MAJOR_VERSION): Include stringhelp.h for
 +	prototypes on Windows and some other platforms.
 +	* common/logging.c (fun_writer): Declare addrbuf only if needed.
 +	* g10/decrypt.c (decrypt_message_fd) [W32]: Return not_implemented.
 +	* g10/encrypt.c (encrypt_crypt) [W32]: Return error if used in server
 +	mode.
 +	* g10/dearmor.c (dearmor_file, enarmor_file): Replace GNUPG_INVALID_FD
 +	by -1 as temporary hack for Windows.
 +	* g10/export.c (do_export): Ditto.
 +	* g10/revoke.c (gen_desig_revoke, gen_revoke): Ditto.
 +	* g10/sign.c (sign_file, clearsign_file, sign_symencrypt_file): Ditto.
 +	* g10/server.c (cmd_verify, gpg_server) [W32]: Return an error.
 +
 +	w32: Include winsock2.h to silence warnings.
 +
 +	gl: Avoid warning about shadowing an arg.
 +	* gl/setenv.c (KNOWN_VALUE): s/value/_v/.
 +
 +	common: Fix build problem with Sun Studio compiler.
 +	* common/estream.c (ESTREAM_MUTEX_UNLOCK): Use int dummy dummy
 +	functions.
 +	(ESTREAM_MUTEX_INITIALIZE): Ditto.
 +
 +	gpg: Do not require a trustdb with --always-trust.
 +	* g10/tdbio.c (tdbio_set_dbname): Add arg R_NOFILE.
 +	* g10/trustdb.c (trustdb_args): Add field no_trustdb.
 +	(init_trustdb): Set that field.
 +	(revalidation_mark):  Take care of a nonexistent trustdb file.
 +	(read_trust_options): Ditto.
 +	(tdb_get_ownertrust): Ditto.
 +	(tdb_get_min_ownertrust): Ditto.
 +	(tdb_update_ownertrust): Ditto.
 +	(update_min_ownertrust): Ditto.
 +	(tdb_clear_ownertrusts): Ditto.
 +	(tdb_cache_disabled_value): Ditto.
 +	(tdb_check_trustdb_stale): Ditto.
 +	(tdb_get_validity_core): Ditto.
 +	* g10/gpg.c (main): Do not create a trustdb with most commands for
 +	trust-model always.
 +
 +	gpg: Print a "not found" message for an unknown key in --key-edit.
 +	* g10/keyedit.c (keyedit_menu): Print message.
 +
 +	gpg: Protect against rogue keyservers sending secret keys.
 +	* g10/options.h (IMPORT_NO_SECKEY): New.
 +	* g10/keyserver.c (keyserver_spawn, keyserver_import_cert): Set new
 +	flag.
 +	* g10/import.c (import_secret_one): Deny import if flag is set.
 +
 +	agent: Fix UPDATESTARTUPTTY for ssh.
 +	* agent/command-ssh.c (setup_ssh_env): Fix env setting.
 +
 +	gpgv: Init Libgcrypt to avoid syslog warning.
 +	* g10/gpgv.c (main): Check libgcrypt version and disable secure
 +	memory.
 +
 +	Improve libcurl detection.
 +	* m4/libcurl.m4: Do not use AC_PATH_PROG if --with-libcurl as been
 +	given.  Suggested by John Marshall.
 +
 +	gpg: Remove legacy keyserver examples from the template conf file.
 +	* g10/options.skel: Update.
 +
 +	(cherry picked from commit f3c5cc8bcd37e38b5d65db6a50466e22d03d1f0c)
 +
 +	w32: Define WINVER only if needed.
 +	* common/sysutils.c (WINVER): Define only if less that 5.0.
 +
 +	w32: Remove unused code.
 +	* jnlib/w32-reg.c (write_w32_registry_string): Remove.
 +
 +	agent: Make --allow-mark-trusted the default.
 +	* agent/gpg-agent.c (opts, main): Add option --no-allow-mark-trusted.
 +	Put this option into the gpgconf-list.
 +	(main): Enable opt.allow_mark_trusted by default.
 +	* tools/gpgconf-comp.c (gc_options_gpg_agent): Replace
 +	allow-mark-trusted by no-allow-mark-trusted.
 +
 +	* agent/trustlist.c (agent_marktrusted): Always set the "relax" flag.
 +
 +	ssh: Add support for Putty.
 +	* agent/gpg-agent.c [W32]: Include Several Windows header.
 +	(opts): Change help text for enable-ssh-support.
 +	(opts, main): Add option --enable-putty-support
 +	(putty_support, PUTTY_IPC_MAGIC, PUTTY_IPC_MAXLEN): New for W32.
 +	(agent_init_default_ctrl): Add and asssert call.
 +	(putty_message_proc, putty_message_thread): New.
 +	(handle_connections) [W32]: Start putty message thread.
 +	* common/sysutils.c (w32_get_user_sid): New for W32 only
 +	* tools/gpgconf-comp.c (gc_options_gpg_agent): Add
 +	--enable-ssh-support and --enable-putty-support.  Make the
 +	configuration group visible at basic level.
 +	* agent/command-ssh.c (serve_mmapped_ssh_request): New for W32 only.
 +
 +	agent: Fix binary vs. text mode problem in ssh.
 +	* agent/command-ssh.c (file_to_buffer)
 +	(ssh_handler_request_identities): Open streams in binary mode.
 +	(start_command_handler_ssh): Factor some code out to ..
 +	(setup_ssh_env): new function.
 +
 +	Fix syntax error for building on APPLE.
 +	* scd/pcsc-wrapper.c [__APPLE__]: Fix syntax error.
 +
 +	Ignore obsolete option --disable-keypad.
 +	* scd/scdaemon.c (opts): Ignore --disable-keypad.
 +
 +	Allow marking options as ignored.
 +	* jnlib/argparse.h (ARGPARSE_OPT_IGNORE): New.
 +	(ARGPARSE_TYPE_MASK): New, for internal use.
 +	(ARGPARSE_ignore): New.
 +	* jnlib/argparse.c (optfile_parse, arg_parse): Replace remaining
 +	constants by macros.
 +	(optfile_parse): Implement ARGPARSE_OPT_IGNORE.
 +	(arg_parse): Exclide ignore options from --dump-options.
 +
 +2014-03-06  Werner Koch  <wk at gnupg.org>
 +
 +	common: Fix recent commit 55656208.
 +	* common/membuf.c (get_membuf_shrink): Fix use of LEN.
 +
 +2014-03-06  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	Fix g10/trust.c.
 +	* g10/trust.c (register_trusted_keyid, register_trusted_key)
 +	(update_ownertrust): Call functions with tdb_.
 +
 +2014-02-26  Werner Koch  <wk at gnupg.org>
 +
 +	common: Replace all macros in strusage() returned strings.
 +	* common/argparse.c (writechar): Remove.
 +	(writestrings): Simplify.
 +	(strusage): Use map_static_macro_string.
 +
 +	common: New function map_static_macro_string.
 +	* common/mapstrings.c: New.
 +	* common/t-mapstrings.c: New.
 +	* common/t-support.h (DIM, DIMof): Define if not defined.
 +	* common/Makefile.am: Add new files.
 +
 +	common: New function get_membuf_shrink.
 +	* common/membuf.c (get_membuf_shrink): New.
 +
 +	agent: Fixed unresolved symbol under Windows.
 +	* agent/gpg-agent.c (main): s/ttyname/gnupg_ttyname/.
 +
 +	common: Require an installed libiconv.
 +	* common/utf8conv.c: Remove dynload.h.
 +	(load_libiconv): Remove.  Remove all calls to it.
 +
 +2014-02-10  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Silent more compiler warnings due to some configure options.
 +	* g10/keygen.c (generate_keypair, gen_card_key)
 +	(gen_card_key_with_backup) [!ENABLE_CARD_SUPPORT]: Mark unused args.
 +
 +	tests: Avoid segv if dns cert lookup is not configured.
 +	* common/dns-cert.c (get_dns_cert) [!USE_DNS_CERT]: Reset return args.
 +
 +	gpg: Cleanup compiler warnings due to some configure options.
 +	* g10/photoid.c (show_photos) [DISABLE_PHOTO_VIEWER]: Mark args as
 +	unused.
 +	* tools/gpgconf-comp.c (my_dgettext): Mark DOMAIN as unused if NLS is
 +	not configured.
 +
 +	gpg: Allow building without any trust model support.
 +	* configure.ac: Add option --disable-trust-models
 +	(NO_TRUST_MODELS): New ac_define and am_conditional.
 +	* g10/Makefile.am (trust_source): New.
 +	(gpg2_SOURCES): Factor some files out to above.  Add trust.c.
 +	* g10/gpg.c [NO_TRUST_MODELS]: Disable options --export-ownertrust,
 +	--import-ownertrust, --update-trustdb, --check-trustdb, --fix-trustdb,
 +	--list-trustdb, --trustdb-name, --auto-check-trustdb,
 +	--no-auto-check-trustdb, and --force-ownertrust.
 +	(parse_trust_model) [NO_TRUST_MODELS]: Do not build.
 +	(main) [NO_TRUST_MODELS]: Set trust_model to always and exclude all
 +	trustdb related option code.
 +	* g10/keyedit.c (cmds) [NO_TRUST_MODELS]: Remove menu items "trust",
 +	"enable", and "disable".
 +	* g10/keylist.c (public_key_list) [NO_TRUST_MODELS]: Do not print
 +	"tru" record.
 +
 +	* g10/trust.c: New.
 +	* g10/trustdb.c (struct key_item): Move to trustdb.h.
 +	(register_trusted_keyid): Rename to tdb_register_trusted_keyid.
 +	(register_trusted_key): Rename to tdb_register_trusted_key.
 +	(trust_letter, uid_trust_string_fixed, trust_value_to_string)
 +	(string_to_trust_value, get_ownertrust_with_min, get_ownertrust_info)
 +	(get_ownertrust_string, get_validity_info, get_validity_string)
 +	(clean_sigs_from_uid, clean_uid_from_key, clean_key): Move to trust.c.
 +	(mark_usable_uid_certs): Move to trust.c and make global.
 +	(is_in_klist): Move as inline to trustdb.h.
 +	(trustdb_check_or_update): Rename to tdb_check_or_update
 +	(revalidation_mark): Rename to tdb_revalidation_mark.
 +	(get_ownertrust): Rename to tdb_get_ownertrust.
 +	(get_min_ownertrust): Rename to tdb_get_min_ownertrust.
 +	(update_ownertrust): Rename to tdb_update_ownertrust.
 +	(clear_ownertrusts): Rename to tdb_clear_ownertrusts.
 +	(cache_disabled_value): Rename to tdb_cache_disabled_value.
 +	(check_trustdb_stale): Rename to tdb_check_trustdb_stale.
 +	(get_validity): Rename to tdb_get_validity_core, add arg MAIN_PK and
 +	factor some code out to ...
 +	* trust.c (get_validity): ...new.
 +	(check_or_update_trustdb): New wrapper.
 +	(revalidation_mark): New wrapper.
 +	(get_ownertrust): New wrapper.
 +	(get_ownertrust_with_min): New wrapper.
 +	(update_ownertrust): New wrapper.
 +	(clear_ownertrusts): New wrapper.
 +	(cache_disabled_value): New wrapper.
 +	(check_trustdb_stale): New wrapper.
 +
 +	* tests/openpgp/defs.inc (opt_always): New.  Use in all tests instead
 +	of --always-trust.
 +
 +	tests: Handle disabled algorithms.
 +	* tests/openpgp/mds.test: Skip disabled algorithms.
 +	* tests/openpgp/signencrypt-dsa.test: Ditto.
 +	* tests/openpgp/sigs-dsa.test: Ditto.
 +
 +2014-02-07  Werner Koch  <wk at gnupg.org>
 +
 +	Silence annoying ABI change warning.
 +	* configure.ac [GCC]: Pass -Wno-psabi for gcc >= 4.6.  Avoid some gcc
 +	option tests for gcc >= 4.6
 +
 +	Allow disabling of card support.
 +	* configure.ac: Add option --disable-card-support.  Also add
 +	am_conditional and do not build scd if card support is enabled.
 +
 +	gpg: List only available algos in --gen-key.
 +	* g10/keygen.c (ask_algo, ask_curve): Take care of GPG_USE_<algo>.
 +
 +	gpg: Change --print-mds to output enabled OpenPGP algos.
 +	* g10/gpg.c (print_mds): Use opengpg_md_test_algo.  Test also for MD5
 +	availibility.
 +
 +	gpg: Avoid compiler warnings for disabled algos.
 +	* g10/misc.c (map_cipher_openpgp_to_gcry): Add case for disabled algo.
 +	(openpgp_pk_test_algo2): Ditto.
 +	(map_md_openpgp_to_gcry): Ditto.
 +
 +2014-02-05  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Change format for the key size in --list-key and --edit-key.
 +	* g10/gpg.c (oLegacyListMode, opts, main): Add --legacy-list-mode.
 +	* g10/options.h (struct opt): Add field legacy_list_mode.
 +	* g10/keydb.h (PUBKEY_STRING_SIZE): New.
 +	* g10/keyid.c (pubkey_string): New.
 +	* g10/import.c (import_one, import_secret_one): Use pubkey_string.
 +	* g10/keylist.c (print_seckey_info): Ditto.
 +	(print_pubkey_info, print_card_key_info): Ditto.
 +	(list_keyblock_print): Ditto.
 +	* g10/mainproc.c (list_node): Ditto.
 +	* g10/pkclist.c (do_edit_ownertrust, build_pk_list): Ditto.
 +	* g10/keyedit.c (show_key_with_all_names): Ditto.  Also change the
 +	format.
 +	(show_basic_key_info): Ditto.
 +	* common/openpgp-oid.c (openpgp_curve_to_oid): Also allow "ed25519".
 +	(openpgp_oid_to_curve): Downcase "ed25519"
 +
 +2014-01-31  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add configure options to disable algorithms.
 +	* acinclude.m4 (GNUPG_GPG_DISABLE_ALGO): New.
 +	* configure.ac: Add --enable-gpg-* options to disable non MUS
 +	algorithms.
 +	* g10/misc.c (map_cipher_openpgp_to_gcry): Implement these options.
 +	(openpgp_pk_test_algo2): Ditto.
 +	(map_md_openpgp_to_gcry): Ditto.
 +	(openpgp_cipher_test_algo, openpgp_md_test_algo): Simplify.
 +
 +	gpg: Improve --version algo info output.
 +	* g10/misc.c (openpgp_pk_algo_name): Return a different string for
 +	each ECC algorithm.
 +	* g10/gpg.c (build_list_pk_test_algo): New wrapper to cope with the
 +	different algo type enums.
 +	(build_list_pk_algo_name): Ditto.
 +	(build_list_cipher_test_algo): Ditto.
 +	(build_list_cipher_algo_name): Ditto.
 +	(build_list_md_test_algo): Ditto.
 +	(build_list_md_algo_name): Ditto.
 +	(my_strusage): Use them.
 +	(list_config): Ditto. Add "pubkeyname".
 +	(build_list): Add letter==1 hack.
 +
 +	gpg: Start using OpenPGP digest algo ids.
 +	* g10/misc.c (print_pubkey_algo_note): Use enum typedef for the arg.
 +	(print_cipher_algo_note): Ditto.
 +	(print_digest_algo_note): Ditto.
 +	(map_md_openpgp_to_gcry): New.
 +	(openpgp_md_test_algo): Rewrite.
 +	(openpgp_md_algo_name): Rewrite to do without Libgcrypt.
 +	* g10/cpr.c (write_status_begin_signing): Remove hardwired list of
 +	algo ranges.
 +
 +	gpg: Use only OpenPGP cipher algo ids.
 +	* g10/misc.c (map_cipher_openpgp_to_gcry): Use explicit mapping and
 +	use enums for the arg and return value.
 +	(map_cipher_gcry_to_openpgp): Ditto.
 +	(openpgp_cipher_blocklen): Use constant macros.
 +	(openpgp_cipher_test_algo): Use mapping function and prepare to
 +	disable algorithms.
 +	(openpgp_cipher_algo_name): Do not use Libgcrypt.
 +
 +	* g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Replace
 +	CGRY_CIPHER_* by CIPHER_ALGO_*.
 +
 +	* common/openpgpdefs.h (cipher_algo_t): Remove unused
 +	CIPHER_ALGO_DUMMY.
 +
 +2014-01-30  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Use only OpenPGP public key algo ids and add the EdDSA algo id.
 +	* common/sexputil.c (get_pk_algo_from_canon_sexp): Change to return a
 +	string.
 +	* g10/keygen.c (check_keygrip): Adjust for change.
 +	* sm/certreqgen-ui.c (check_keygrip): Likewise.
 +
 +	* agent/pksign.c (do_encode_dsa): Remove bogus map_pk_openpgp_to_gcry.
 +
 +	* g10/misc.c (map_pk_openpgp_to_gcry): Remove.
 +	(openpgp_pk_test_algo): Change to a wrapper for openpgp_pk_test_algo2.
 +	(openpgp_pk_test_algo2): Rewrite.
 +	(openpgp_pk_algo_usage, pubkey_nbits): Add support for EdDSA.
 +	(openpgp_pk_algo_name): Rewrite to remove need for gcry calls.
 +	(pubkey_get_npkey, pubkey_get_nskey): Ditto.
 +	(pubkey_get_nsig, pubkey_get_nenc): Ditto.
 +	* g10/keygen.c(do_create_from_keygrip):  Support EdDSA.
 +	(common_gen, gen_ecc, ask_keysize, generate_keypair): Ditto.
 +	* g10/build-packet.c (do_key): Ditto.
 +	* g10/export.c (transfer_format_to_openpgp): Ditto.
 +	* g10/getkey.c (cache_public_key): Ditto.
 +	* g10/import.c (transfer_secret_keys): Ditto.
 +	* g10/keylist.c (list_keyblock_print, list_keyblock_colon): Ditto.
 +	* g10/mainproc.c (proc_pubkey_enc): Ditto.
 +	* g10/parse-packet.c (parse_key): Ditto,
 +	* g10/sign.c (hash_for, sign_file, make_keysig_packet): Ditto.
 +	* g10/keyserver.c (print_keyrec): Use openpgp_pk_algo_name.
 +	* g10/pkglue.c (pk_verify, pk_encrypt, pk_check_secret_key): Use only
 +	OpenPGP algo ids and support EdDSA.
 +	* g10/pubkey-enc.c (get_it): Use only OpenPGP algo ids.
 +	* g10/seskey.c (encode_md_value): Ditto.
 +
 +2014-01-29  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Remove cipher.h and put algo ids into a common file.
 +	* common/openpgpdefs.h (cipher_algo_t, pubkey_algo_t, digest_algo_t)
 +	(compress_algo_t): New.
 +	* agent/gpg-agent.c: Remove ../g10/cipher.h. Add openpgpdefs.h.
 +	* g10/cipher.h (DEK): Move to ...
 +	* g10/dek.h: new file.
 +	* g10/cipher.h (is_RSA, is_ELGAMAL, is_DSA)
 +	(PUBKEY_MAX_NPKEY, PUBKEY_MAX_NSKEY, PUBKEY_MAX_NSIG, PUBKEY_MAX_NENC)
 +	(PUBKEY_USAGE_SIG, PUBKEY_USAGE_ENC, PUBKEY_USAGE_CERT)
 +	(PUBKEY_USAGE_AUTH, PUBKEY_USAGE_NONE): Move to
 +	* g10/packet.h: here.
 +	* g10/cipher.h: Remove.  Remove from all files.
 +	* g10/filter.h, g10/packet.h:  Include dek.h.
 +	* g10/Makefile.am (common_source): Remove cipher.h.  Add dek.h.
 +
 +	include: Remove this directory.
 +	* include/cipher.h: Move to ...
 +	* g10/cipher.h: here.
 +	* agent/gpg-agent.c: Adjust header file name.
 +
 +	* include/host2net.h: Move to ...
 +	* common/host2net.h: here.  Change license to LGPLv3/GPLv2.  Adjust
 +	notices to reflect that only me worked on that file.
 +
 +	* include/types.h: Remove.
 +	* common/types.h: Include inttypes.h.  Add byte typedef and comments
 +	for __riscos__.
 +	* common/iobuf.h: Adjust header file name.
 +
 +	* include/_regex.h: Remove this unused file.
 +
 +	* include/Makefile.am: Remove.
 +	* Makefile.am (SUBDIRS): Remove "include".
 +	* configure.ac (AC_CONFIG_FILES): Remove include/Makefile.
 +	* include/ChangeLog-2011: Move to ...
 +	* common/ChangeLog-2011.include: here.
 +	* common/Makefile.am (EXTRA_DIST): Add file.
 +
 +	* include/zlib-riscos.h: Move this repo only file to ...
 +	* g10/zlib-riscos.h: here.
 +
 +	* include/: Remove.
 +
 +2014-01-17  Werner Koch  <wk at gnupg.org>
 +
 +	Remove unused u64 type definitions.
 +	* configure.ac: Remove check for uint64 and UINT64_C.
 +	* include/types.h: Remove u64 stuff.
 +	* common/types.h: Ditto.
 +
 +2014-01-16  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: Not remove SSH socket when already running.
 +	* agent/gpg-agent.c (main): Defer setting of socket_name_ssh to avoid
 +	removal of the socket when it will die in create_server_socket for
 +	socket_name.
 +
 +	agent: Fix agent_is_eddsa_key.
 +	* agent/findkey.c (agent_is_eddsa_key): Implemented.
 +
 +2014-01-15  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	Add secp256k1.
 +	* common/openpgp-oid.c (openpgp_curve_to_oid): Add secp256k1.
 +	(openpgp_oid_to_curve): Likewise.
 +
 +	* g10/keygen.c (ask_curve): Add secp256k1.
 +
 +2014-01-10  Werner Koch  <wk at gnupg.org>
 +
 +	autogen.sh: Add rule for 64 bit windows.
 +
 +	Turn autogen.sh into a generic script.
 +	* autogen.sh: Revamp.
 +	* autogen.rc: New.
 +	* Makefile.am (EXTRA_DIST): Add autogen.rc.
 +
 +	Rename scripts/ to build-aux/
 +	* scripts/: Rename to build-aux/
 +	* Makefile.am: Adjust accordingly.
 +	* configure.ac (AC_CONFIG_AUX_DIR): Change to build-aux.
 +
 +2014-01-09  Werner Koch  <wk at gnupg.org>
 +
 +	Improve the speedo make script.
 +	* scripts/gpg-w32-dev/README: Remove
 +	* scripts/gpg-w32-dev/GNUmakefile, scripts/gpg-w32-dev/speedo.mk:
 +	Merge into ..
 +	* scripts/speedo.mk: this.
 +
 +	gpgsplit: Allow building without zlib support.
 +	* tools/gpgsplit.c [!HAVE_ZLIB]: Do not include zlib.h.
 +	(handle_zlib): Build only if HAVE_ZLIB is defined.
 +	(write_part): Support zlib and zip only if HAVE_ZLIB is defined.
 +
 +	w32: Fix backslash quoting in registry name.
 +	* configure.ac (GNUPG_REGISTRY_DIR): Double backslashes.
 +
 +	Fix test for zlib.
 +	* configure.ac (HAVE_ZLIB): Define only if found.
 +
 +	Add --enable-silent-rules stuff.
 +	* configure.ac: Add AM_SILENT_RULES.
 +
 +2014-01-08  Werner Koch  <wk at gnupg.org>
 +
 +	w32: Add macro for the registry key.
 +	* configure.ac (GNUPG_REGISTRY_DIR) [W32]: New ac-define.
 +	* common/homedir.c (default_homedir): Use it.
 +	* common/logging.c (do_logv): Use it.
 +
 +2013-12-11  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Change --show-session-key to print the session key earlier.
 +	* g10/cpr.c (write_status_strings): New.
 +	(write_status_text): Replace code by a call to write_status_strings.
 +	* g10/mainproc.c (proc_encrypted): Remove show_session_key code.
 +	* g10/decrypt-data.c (decrypt_data): Add new show_session_key code.
 +
 +2013-12-05  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Change OID of Ed25519 and add Brainpool oids.
 +	* common/openpgp-oid.c (openpgp_curve_to_oid): Change OID for
 +	Ed25519.  Add brainpool OIDs.
 +	(openpgp_oid_to_curve): Ditto.
 +
 +2013-11-29  Werner Koch  <wk at gnupg.org>
 +
 +	common: Add put_membuf_printf.
 +	* common/membuf.c (put_membuf_printf): New.
 +
 +2013-11-27  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Change armor Version header to emit only the major version.
 +	* g10/options.h (opt): Rename field no_version to emit_version.
 +	* g10/gpg.c (main): Init opt.emit_vesion to 1.  Change --emit-version
 +	to bump up opt.emit_version.
 +	* g10/armor.c (armor_filter): Implement different --emit-version
 +	values.
 +
 +2013-11-18  Werner Koch  <wk at gnupg.org>
 +
 +	Make use of the *_NAME etc macros.
 +	Replace hardwired strings at many places with new macros from config.h
 +	and use the new strusage macro replacement feature.
 +
 +	* common/asshelp.c (lock_spawning) [W32]: Change the names of the spawn
 +	sentinels.
 +	* agent/command.c (cmd_import_key): Use asprintf to create the prompt.
 +
 +	Add strusage macro replacement feature.
 +	* common/argparse.c (writechar): New.
 +	(writestrings): Add macro replacement feature.
 +	(show_help): Remove specialized @EMAIL@ replacement.
 +	* configure.ac (GNUPG_NAME, GPG_NAME, GPGSM_NAME): Define.
 +	(GPG_AGENT_NAME, DIRMNGR_NAME, G13_NAME, GPGCONF_NAME): Define.
 +	(GPGTAR_NAME, GPG_AGENT_INFO_NAME, GPG_AGENT_SOCK_NAME): Define.
 +	(GPG_AGENT_SSH_SOCK_NAME, DIRMNGR_INFO_NAME): Define.
 +	(DIRMNGR_SOCK_NAME): Define.
 +
 +2013-11-15  Werner Koch  <wk at gnupg.org>
 +
 +	kbx: Implement update operation for OpenPGP keyblocks.
 +	* kbx/keybox-update.c (keybox_update_keyblock): Implement.
 +	* kbx/keybox-search.c (get_blob_flags): Move to ...
 +	* kbx/keybox-defs.h (blob_get_type): here.
 +	* kbx/keybox-file.c (_keybox_read_blob2): Fix calling without R_BLOB.
 +	* g10/keydb.c (build_keyblock_image): Allow calling without
 +	R_SIGSTATUS.
 +	(keydb_update_keyblock): Implement for keybox.
 +
 +	* kbx/keybox-dump.c (_keybox_dump_blob): Fix printing of the unhashed
 +	size.  Print "does not expire" also on 64 bit platforms.
 +
 +	gpg: Rework ECC support and add experimental support for Ed25519.
 +	* agent/findkey.c (key_parms_from_sexp): Add algo name "ecc".
 +	(agent_is_dsa_key): Ditto.
 +	(agent_is_eddsa_key): New.  Not finished, though.
 +	* agent/pksign.c (do_encode_eddsa): New.
 +	(agent_pksign_do): Use gcry_log_debug functions.
 +	* agent/protect.c (agent_protect): Parse a flags parameter.
 +	* g10/keygen.c (gpg_curve_to_oid): Move to ...
 +	* common/openpgp-oid.c (openpgp_curve_to_oid): here and rename.
 +	(oid_ed25519): New.
 +	(openpgp_oid_is_ed25519): New.
 +	(openpgp_oid_to_curve): New.
 +	* common/t-openpgp-oid.c (test_openpgp_oid_is_ed25519): New.
 +	* g10/build-packet.c (gpg_mpi_write): Write the length header also for
 +	opaque MPIs.
 +	(gpg_mpi_write_nohdr): New.
 +	(do_key): Use gpg_mpi_write_nohdr depending on algorithm.
 +	(do_pubkey_enc): Ditto.
 +	* g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Use
 +	gpg_mpi_write_nohdr.
 +	* g10/export.c (transfer_format_to_openpgp):
 +	* g10/keygen.c (ecckey_from_sexp): Return the error.
 +	(gen_ecc): Repalce arg NBITS by CURVE.
 +	(read_parameter_file): Add keywords "Key-Curve" and "Subkey-Curve".
 +	(ask_curve): New.
 +	(generate_keypair, generate_subkeypair): Use ask_curve.
 +	(do_generate_keypair): Also pass curve name.
 +	* g10/keylist.c (list_keyblock_print, list_keyblock_colon): Print
 +	curve name.
 +	* g10/parse-packet.c (mpi_read): Remove workaround for
 +	Libcgrypt < 1.5.
 +	(parse_key): Fix ECC case.  Print the curve name.
 +	* g10/pkglue.c (mpi_from_sexp): Rename to get_mpi_from_sexp.
 +	(pk_verify, pk_check_secret_key): Add special case for Ed25519.
 +	* g10/seskey.c (encode_md_value): Ditto.
 +	* g10/sign.c (do_sign, hash_for, sign_file): Ditto.
 +
 +	kbx: Fix possible segv in kbxdump.
 +	* kbx/keybox-dump.c (_keybox_dump_blob): Check length before get32.
 +
 +	Require Libgcrypt 1.6.
 +	* agent/pksign.c (do_encode_dsa): Remove Libgcrypt version check
 +
 +2013-11-13  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: more pinpad input fix for PC/SC.
 +	* scd/apdu.c (check_pcsc_pinpad): Set default values here.
 +	(pcsc_pinpad_verify, pcsc_pinpad_modify): Remove setting default
 +	values, as it's too late.
 +
 +2013-11-11  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: more pinpad fix.
 +	* scd/apdu.c (check_pcsc_pinpad): Set ->minlen and ->maxlen only when
 +	those are specified.
 +	(pcsc_pinpad_modify): Remove old check code.
 +
 +2013-10-29  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: pinpad fix for PC/SC on Windows.
 +	* scd/apdu.c (SCARD_CTL_CODE): Fix for Windows.
 +
 +2013-10-28  Werner Koch  <wk at gnupg.org>
 +
 +	doc: Change yat2m to allow arbitrary condition names.
 +	* doc/yat2m.c (MAX_CONDITION_NESTING): New.
 +	(gpgone_defined): Remove.
 +	(condition_s, condition_stack, condition_stack_idx): New.
 +	(cond_is_active, cond_in_verbatim): New.
 +	(add_predefined_macro, set_macro, macro_set_p): New.
 +	(evaluate_conditions, push_condition, pop_condition): New.
 +	(parse_file): Rewrite to use the condition stack.
 +	(top_parse_file): Set prefined macros.
 +	(main): Change -D to define arbitrary macros.
 +
 +2013-10-25  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: fix pinpad input on Windows.
 +	* scd/apdu.c (open_pcsc_reader_direct): Don't call
 +	pcsc_vendor_specific_init here, but...
 +	(connect_pcsc_card): Call it here.
 +
 +2013-10-23  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	po: Update Japanese translation.
 +
 +2013-10-16  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: add pinpad readers information for PC/SC service.
 +	* scd/apdu.c (pcsc_vendor_specific_init): Add information for Cherry
 +	ST-2xxx, Reiner cyberJack, Vasco DIGIPASS, FSIJ Gnuk Token, and KAAN
 +	Advance.
 +
 +2013-10-15  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: remove pin length check.
 +	* scd/apdu.c (pcsc_pinpad_verify): Remove old check code for pin
 +	length.
 +
 +2013-10-04  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Limit the nesting level of I/O filters.
 +	* common/iobuf.c (MAX_NESTING_FILTER): New.
 +	(iobuf_push_filter2): Limit the nesting level.
 +
 +	* g10/mainproc.c (mainproc_context): New field ANY.  Change HAVE_DATA
 +	and ANY_SIG_SIGN to bit fields of ANY.  Add bit field
 +	UNCOMPRESS_FAILED.
 +	(proc_compressed): Avoid printing multiple Bad Data messages.
 +	(check_nesting): Return GPG_ERR_BAD_DATA instead of UNEXPECTED_DATA.
 +
 +2013-10-02  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix bug with deeply nested compressed packets.
 +	* g10/mainproc.c (MAX_NESTING_DEPTH): New.
 +	(proc_compressed): Return an error code.
 +	(check_nesting): New.
 +	(do_proc_packets): Check packet nesting depth.  Handle errors from
 +	check_compressed.
 +
 +2013-09-08  Werner Koch  <wk at gnupg.org>
 +
 +	Switch to deterministic DSA.
 +	* agent/pksign.c (rfc6979_hash_algo_string): New.
 +	(do_encode_dsa) [Libgcrypt >= 1.6]: Make use of RFC-6979.
 +
 +2013-08-30  Werner Koch  <wk at gnupg.org>
 +
 +	scd: Suppress gcc warning about possible uninitialized use.
 +	* scd/app-nks.c (parse_pwidstr): Always init r_pwid.
 +
 +	gpg: Use 2048 as the default keysize in batch mode.
 +	* g10/keygen.c (gen_elg, gen_dsa, gen_rsa): Set default keysize to
 +	2048.
 +
 +	gpgtar: Fix building for systems with a separate libintl.
 +	* tools/Makefile.am (gpgtar_LDADD): Add LIBINTL and LIBICONV.
 +
 +	scd: Use vendor and product id macros also in apdu.c.
 +	* scd/ccid-driver.c: Move vendor and product ids to ...
 +	* scd/ccid-driver.h: here.
 +	* scd/apdu.c (CCID_DRIVER_INCLUDE_USB_IDS): Define to include ids.
 +	(pcsc_vendor_specific_init): Use vendor and product id macros.
 +
 +2013-08-30  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: PC/SC pinpad input improvement.
 +	* scd/apdu.c (struct reader_table_s): Add members: PINMIN, PINMAX, and
 +	PINPAD_VERLEN_SUPPORTED.
 +	(CM_IOCTL_VENDOR_IFD_EXCHANGE, FEATURE_GET_TLV_PROPERTIES,
 +	PCSCv2_PART10_PROPERTY_*): New.
 +	(new_reader_slot): Initialize pinpad_varlen_supported, pinmin, pinmax.
 +	(pcsc_vendor_specific_init): New.
 +	(open_pcsc_reader_direct, open_pcsc_reader_wrapped): Call
 +	pcsc_vendor_specific_init.
 +	(check_pcsc_pinpad): Not detect here but use the result of
 +	pcsc_vendor_specific_init.
 +	(pcsc_pinpad_verify, pcsc_pinpad_modify): Specify bNumberMessage.
 +
 +2013-08-29  Jonas Borgström  <jonas at borgstrom.se>
 +
 +	scd: add support for RSA_CRT and RSA_CRT_N key import.
 +	* scd/app-openpgp.c (do_writekey): Added RSA_CRT and RSA_CRT_N support.
 +
 +2013-08-29  Werner Koch  <wk at gnupg.org>
 +
 +	kbx: Add a few macros for easier readability.
 +	* kbx/keybox-update.c (FILECOPY_INSERT)
 +	(FILECOPY_DELETE, FILECOPY_UPDATE): New macros.  Replace numbers by
 +	them.
 +
 +2013-08-28  Werner Koch  <wk at gnupg.org>
 +
 +	Fix commit 04e2c83f.
 +	* agent/command-ssh.c (stream_read_string): Do not assign to a NULL
 +	ptr.
 +
 +	gpg: Make decryption with the OpenPGP card work.
 +	* scd/app-common.h (APP_DECIPHER_INFO_NOPAD): New.
 +	* scd/app-openpgp.c (do_decipher): Add arg R_INFO.
 +	* scd/app-nks.c (do_decipher): Add arg R_INFO as a dummy.
 +	* scd/app.c (app_decipher): Add arg R_INFO.
 +	* scd/command.c (cmd_pkdecrypt): Print status line "PADDING".
 +	* agent/call-scd.c (padding_info_cb): New.
 +	(agent_card_pkdecrypt): Add arg R_PADDING.
 +	* agent/divert-scd.c (divert_pkdecrypt): Ditto.
 +	* agent/pkdecrypt.c (agent_pkdecrypt): Ditto.
 +	* agent/command.c (cmd_pkdecrypt):  Print status line "PADDING".
 +	* g10/call-agent.c (padding_info_cb): New.
 +	(agent_pkdecrypt): Add arg R_PADDING.
 +	* g10/pubkey-enc.c (get_it): Use padding info.
 +
 +	agent: Fix two compiler warnings.
 +	* agent/command.c (cmd_preset_passphrase, pinentry_loopback): Use %zu
 +	in format string.
 +	* scd/ccid-driver.c (ccid_get_atr): Ditto.
 +	* agent/command-ssh.c (stream_read_string): Init arg STRING_SIZE to
 +	avoid maybe_unitialized warning.
 +
 +2013-08-27  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: fix parsing login-data DO.
 +	* scd/app-openpgp.c (parse_login_data): Release RELPTR.  Fix parsing.
 +
 +	scd: fix Vega for Alpha reader.
 +	* scd/ccid-driver.c (ccid_vendor_specific_init): Fix error handling
 +	and size of command.
 +
 +2013-08-21  Werner Koch  <wk at gnupg.org>
 +
 +	scd: Make SPRx32 pinpad work with PC/SC on Windows.
 +	* scd/apdu.c (CM_IOCTL_GET_FEATURE_REQUEST): Use SCARD_CTL_CODE.
 +	(SCARD_CTL_CODE): Define if not defined.
 +	(reader_table_s): Add is_spr532.
 +	(new_reader_slot): Clear it.
 +	(check_pcsc_pinpad): Set it.
 +	(pcsc_pinpad_verify, pcsc_pinpad_modify): Add fix for SPR532.
 +
 +	scd: Improve --enable-pinpad-varlen.
 +	* tools/gpgconf-comp.c (gc_options_scdaemon): Add
 +	enable-pinpad-varlen.
 +	* scd/apdu.c (check_pcsc_pinpad): Detect SPRx32 reader.
 +
 +2013-08-08  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Extend cmd KEYINFO to return data from sshcontrol.
 +	* agent/command-ssh.c (struct control_file_s): Rename to
 +	ssh_control_file_s.
 +	(ssh_open_control_file, ssh_close_control_file)
 +	(ssh_read_control_file, ssh_search_control_file): New.
 +	(control_file_t):  Rename and move to ...
 +	* agent/agent.h (ssh_control_file_t): here.
 +	* agent/command.c (do_one_keyinfo): Add args is_ssh, ttl, disabled,
 +	and confirm. Rename unknown keytype indicator from '-' to 'X'.  Extend
 +	output.
 +	(cmd_keyinfo): Add options --ssh-list and --with-ssh.
 +
 +2013-08-02  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: No need to create a trustdb when encrypting with --always-trust.
 +	* g10/gpg.c (main): Special case setup_trustdb for --encrypt.
 +
 +2013-08-01  Werner Koch  <wk at gnupg.org>
 +
 +	w32: Fix recent patch 9ff72e4.
 +	* common/homedir.c (check_portable_app): Fix the name of the control
 +	file.
 +
 +	agent: Include missing prototype.
 +	* agent/protect.c: Include cvt-openpgp.h.
 +
 +	w32: Add code to support a portable use of GnuPG.
 +	* common/homedir.c (w32_bin_is_bin, w32_portable_app) [W32]: New.
 +	(check_portable_app) [W32]: New.
 +	(standard_homedir, default_homedir) [W32]: Support the portable flag.
 +	(w32_rootdir, w32_commondir) [W32]: Ditto.
 +	(gnupg_bindir, gnupg_cachedir, dirmngr_socket_name) [W32]: Ditto.
 +	* common/logging.h (JNLIB_LOG_NO_REGISTRY): New.
 +	* common/logging.c (no_registry): New variable.
 +	(log_set_prefix, log_get_prefix): Set/get that variable.
 +	(do_logv): Do not check the registry if that variable is set.
 +
 +	Silence compiler warning about deprecated Libgcrypt symbols.
 +	* configure.ac (AH_BOTTOM): Define GCRYPT_NO_DEPRECATED.
 +
 +	dirmngr: Define missing LDAP constant.
 +	* dirmngr/ldap-url.c (LDAP_SCOPE_DEFAULT): Define if missing.
 +
 +	scd: Fix a syntax error for Apple and Windows.
 +	* scd/apdu.c (pcsc_dword_t) [W32]: Fix syntax error.
 +
 +	common: Fix a build error when using adns.
 +	* common/dns-cert.c (get_dns_cert) [USE_ADNS]: Fix synatx error.
 +
 +2013-07-31  Werner Koch  <wk at gnupg.org>
 +
 +	common: Comment out unused code.
 +	* common/w32-reg.c (write_w32_registry_string): Comment out.
 +
 +	dirmngr: Remove unused file.
 +	* dirmngr/get-path.c: Remove.
 +
 +2013-06-27  Werner Koch  <wk at gnupg.org>
 +
 +	sm: Remove cruft from source files.
 +	* sm/keydb.c, sm/keydb.h: Remove disabled code parts.
 +
 +	Prepare for newer automake versions.
 +	* configure.ac (AM_INIT_AUTOMAKE): Replace 2 argument form by the
 +	option form.  Add options from the top Makefile.
 +	(AM_CONFIG_HEADER): Rename to AC_CONFIG_HEADER.
 +	* Makefile.am (AUTOMAKE_OPTIONS): Remove.
 +
 +	* kbx/Makefile.am: Remove INCLUDES.  Include cmacros.am.  FActor some
 +	AM_CPPFLAGS options to  AM_CFLAGS.
 +
 +2013-06-26  Werner Koch  <wk at gnupg.org>
 +
 +	Fix Makefile regression.
 +	* agent/Makefile.am (gpg_agent_DEPENDENCIES): Remove cruft from wrong
 +	resolve conflict 2013-04-25.
 +	(gpg_agent_DEPENDENCIES): Remove obsolete gpg_agent_res_deps
 +	(gpg_agent_LDFLAGS): Remove obsolete gpg_agent_res_ldflags.
 +
 +2013-05-22  Werner Koch  <wk at gnupg.org>
 +
 +	Implement unattended OpenPGP secret key import.
 +	* agent/command.c (cmd_import_key): Add option --unattended.
 +	* agent/cvt-openpgp.c (convert_transfer_key): New.
 +	(do_unprotect): Factor some code out to ...
 +	(prepare_unprotect): new function.
 +	(convert_from_openpgp): Factor all code out to ...
 +	(convert_from_openpgp_main): this.  Add arg 'passphrase'.  Implement
 +	openpgp-native protection modes.
 +	(convert_from_openpgp_native): New.
 +	* agent/t-protect.c (convert_from_openpgp_native): New dummy fucntion
 +	* agent/protect-tool.c (convert_from_openpgp_native): Ditto.
 +	* agent/protect.c (agent_unprotect): Add arg CTRL.  Adjust all
 +	callers.  Support openpgp-native protection.
 +	* g10/call-agent.c (agent_import_key): Add arg 'unattended'.
 +	* g10/import.c (transfer_secret_keys): Use unattended in batch mode.
 +
 +	New debug functions log_printcanon and log_printsexp.
 +	* common/sexputil.c (sexp_to_string, canon_sexp_to_string): New.
 +	(log_printcanon, log_printsexp): New.
 +
 +	agent: Fix length detection of canonical formatted openpgp keys.
 +	* agent/command.c (cmd_import_key): Pass 0 instead of KEYLEN to
 +	gcry_sexp_canon_len.
 +
 +	agent: New option --disable-check-own-socket.
 +	* agent/gpg-agent.c (oDisableCheckOwnSocket): New.
 +	(disable_check_own_socket): New.
 +	(parse_rereadable_options): Set new option.
 +	(check_own_socket): Implement new option.
 +
 +2013-05-07  Werner Koch  <wk at gnupg.org>
 +
 +	w32: Add icons and version information.
 +	* common/gnupg.ico: New.  Take from artwork/gnupg-favicon-1.ico.
 +	* agent/gpg-agent-w32info.rc: New.
 +	* g10/gpg-w32info.rc: New.
 +	* scd/scdaemon-w32info.rc: New.
 +	* sm/gpgsm-w32info.rc: New.
 +	* tools/gpg-connect-agent-w32info.rc: New.
 +	* common/w32info-rc.h.in: New.
 +	* configure.ac (BUILD_REVISION, BUILD_FILEVERSION, BUILD_TIMESTAMP)
 +	(BUILD_HOSTNAME): New.
 +	(AC_CONFIG_FILES): Add w32info-rc.h.
 +	* am/cmacros.am (.rc.o): New rule.
 +	* agent/Makefile.am, common/Makefile.am, g10/Makefile.am
 +	* scd/Makefile.am, sm/Makefile.am, tools/Makefile.am: Add stuff to
 +	build resource files.
 +
 +2013-05-07  Ian Abbott  <abbotti at mev.co.uk>
 +
 +	doc: fix some Texinfo warnings.
 +	* doc/gpg.texi: Fix syntax and add missing menu entries.
 +	* doc/gpgsm.texi: Fix subsectioning.
 +
 +2013-04-22  Werner Koch  <wk at gnupg.org>
 +
 +	Fix potential heap corruption in "gpg -v --version".
 +	* g10/gpg.c (build_list): Rewrite to cope with buffer overflow in
 +	certain locales.
 +
 +2013-04-19  Werner Koch  <wk at gnupg.org>
 +
 +	gpgsm: Remove non-implemented commands from --help.
 +	* sm/gpgsm.c (opts): Removed commands --clearsign, --symmetric,
 +	--send-keys, and --recv-keys.
 +
 +2013-04-19  Daiki Ueno  <ueno at gnu.org>
 +
 +	Make sure to call fflush if estream_t is backed with stdio.
 +	* common/estream.c (es_func_fp_write): Call fflush after fwrite.
 +
 +2013-04-19  Werner Koch  <wk at gnupg.org>
 +
 +	doc: Formatting fixes.
 +	* doc/Makefile.am (.fig.jpg): Correct to use -L jpeg.
 +	* doc/gpg.texi: Fix cross reference for --options.
 +	* doc/gpgsm.texi: Likewise.
 +	* doc/gpl.texi: Fix enumerate and re-indent examples.
 +
 +2013-04-01  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: move SCDaemon to libexecdir.
 +	* common/homedir.c (gnupg_module_name): It's now libexecdir.
 +	* scd/Makefile.am (libexec_PROGRAMS): Add scdaemon
 +	(bin_PROGRAMS): Remove scdaemon.
 +
 +2013-03-29  Werner Koch  <wk at gnupg.org>
 +
 +	copyright assignments are not anymore required.
 +
 +2013-03-26  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: PC/SC status fix.
 +	* scd/apdu.c (pcsc_get_status_direct): Check PCSC_STATE_MUTE only when
 +	PCSC_STATE_PRESENT.
 +
 +	* scd/pcsc-wrapper.c (handle_status): Ditto.
 +
 +	scd: PC/SC cleanup (more).
 +	* scd/apdu.c (control_pcsc_direct, control_pcsc_wrapped, control_pcsc)
 +	(check_pcsc_pinpad, pcsc_pinpad_verify, pcsc_pinpad_modify): Use
 +	pcsc_dword_t.
 +
 +	scd: call update_card_removed only when detecting removal.
 +	* scd/command.c (update_reader_status_file): Add condition
 +	vr->status == 0.
 +
 +2013-03-22  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: PC/SC cleanup.
 +	* scd/apdu.c (pcsc_dword_t): New.  It was named as DWORD (double-word)
 +	when a word was 16-bit.
 +	(struct reader_table_s): Fixes for types.
 +	(struct pcsc_readerstate_s) [__APPLE__]: Enable #pragma pack(1).
 +	Throughout: Fixes for types.
 +
 +	* scd/pcsc-wrapper.c: Likewise.
 +
 +2013-03-21  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	po: Enable ja.po.
 +	* po/LINGUAS: Enable ja.po.
 +
 +	scd: change default value of pinpad maxlen.
 +	* scd/apdu.c (pcsc_pinpad_verify, pcsc_pinpad_modify): Default value
 +	of maxlen for pinpad input is now 15 (was: 25).
 +
 +	* scd/ccid-driver.c (ccid_transceive_secure): Likewise.
 +
 +2013-03-20  Werner Koch  <wk at gnupg.org>
 +
 +	Add code to allow for late memory cleanup.
 +	* common/init.c (mem_cleanup_item_t): New.
 +	(run_mem_cleanup): New.
 +	(_init_common_subsystems): Add an atexit for it.
 +	(register_mem_cleanup_func): New.
 +
 +	* g10/kbnode.c (cleanup_registered): New.
 +	(release_unused_nodes): New.
 +	(alloc_node): Call register_mem_cleanup_func.
 +
 +	kbx: Remove unused macro.
 +	* kbx/keybox.h (KEYBOX_WITH_OPENPGP): Remove unused macro.
 +
 +2013-03-19  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Print indicator for unknown key capability.
 +	* g10/keylist.c (print_capabilities): Print '?' for unknown usage.
 +
 +2013-03-19  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	gpg: Allow setting of all zero key flags.
 +	* g10/keygen.c (do_add_key_flags): Do not check for empty key flags.
 +
 +2013-03-19  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Distinguish between missing and cleared key flags.
 +	* include/cipher.h (PUBKEY_USAGE_NONE): New.
 +	* g10/getkey.c (parse_key_usage): Set new flag.
 +
 +2013-03-15  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: ccid-driver supporting larger APDU.
 +	* scd/ccid-driver.c (ccid_transceive_apdu_level): Support larger
 +	APDU.
 +
 +	scd: fix missing close paren.
 +	* scd/app-openpgp.c (du_auth): Fix.
 +
 +2013-03-09  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: support ECDSA signing.
 +	* scd/app-openpgp.c (do_sign): Only prepend message digest block
 +	for RSA or do_auth.
 +	(do_auth): Remove message digest block for ECDSA.
 +
 +2013-03-08  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: support ECDSA public key.
 +	* scd/app-openpgp.c (key_type_t): New.
 +	(CURVE_NIST_P256, CURVE_NIST_P384, CURVE_NIST_P521): New.
 +	(struct app_local_s): Change keyattr to have key_type and union.
 +	(get_ecc_key_parameters, get_curve_name): New.
 +	(send_key_attr, get_public_key): Support ECDSA.
 +	(build_privkey_template, do_writekey, do_genkey): Follow the change
 +	of the member KEY_ATTR.
 +	(parse_historical): New.
 +	(parse_algorithm_attribute): Support ECDSA.
 +
 +2013-03-05  Werner Koch  <wk at gnupg.org>
 +
 +	Require libgpg-error 1.11.
 +	* configure.ac: Require libgpg-error 1.11.
 +	* common/util.h (GPG_ERR_NO_KEYSERVER, GPG_ERR_INV_CURVE)
 +	(GPG_ERR_UNKNOWN_CURVE): Remove fallback definitions.
 +
 +2013-02-28  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: pksign result conversion to sexp to upper layer.
 +	* agent/agent.h (divert_pksign): Add R_SIGLEN argument.
 +	* agent/divert-scd.c (divert_pksign): Return length at R_SIGLEN.
 +	* agent/call-scd.c (agent_card_pksign): Move composition of
 +	S-expression to...
 +	* agent/pksign.c (agent_pksign_do): ... here.
 +
 +2013-02-22  Werner Koch  <wk at gnupg.org>
 +
 +	Use has_leading_keyword in the assuan callbacks.
 +	* agent/call-pinentry.c (inq_quality): Use has_leading_keyword.
 +	* agent/call-scd.c (inq_needpin, inq_writekey_parms): Ditto.
 +	* g10/call-agent.c (inq_writecert_parms, keyinfo_status_cb): Ditto.
 +	(inq_genkey_parms, inq_ciphertext_cb, inq_import_key_parms): Ditto.
 +	* g10/call-dirmngr.c (ks_put_inq_cb): Ditto.
 +	* sm/call-agent.c (default_inq_cb, inq_ciphertext_cb): Ditto.
 +	(inq_genkey_parms, istrusted_status_cb, learn_status_cb): Ditto.
 +	(keyinfo_status_cb, inq_import_key_parms): Ditto.
 +	* sm/call-dirmngr.c (inq_certificate, isvalid_status_cb): Ditto.
 +	(lookup_status_cb, run_command_inq_cb, run_command_status_cb): Ditto.
 +
 +	Remove some unused variables.
 +	* tools/gpgconf-comp.c (gc_process_gpgconf_conf): Remove unused
 +	used_components.
 +	* agent/command-ssh.c (ssh_signature_encoder_ecdsa): Mark unused arg.
 +	* g13/g13.c (main): Comment variable of yet unimplemented options.
 +
 +	gpg: Fix a memory leak in batch key generation.
 +	* g10/keygen.c (append_to_parameter): New.
 +	(proc_parameter_file): Use new func to extend the parameter list.
 +
 +	* g10/passphrase.c (passphrase_to_dek_ext): Print a diagnostic of
 +	gcry_kdf_derive failed.
 +	* g10/keygen.c (proc_parameter_file): Print a diagnostic if
 +	passphrase_to_dek failed.
 +
 +	gpg: Handle the agent's NEW_PASSPHRASE inquiry.
 +	* g10/call-agent.c (default_inq_cb): Take care of NEW_PASSPHRASE.
 +
 +	common: Add func has_leading_keyword.
 +	* common/stringhelp.c (has_leading_keyword): New.
 +
 +	Remove build hacks for FreeBSD.
 +	* configure.ac [freebsd]: Do not add /usr/local to CPPFLAGS and
 +	LDFLAGS.
 +
 +2013-02-22  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: fix two bugs.
 +	* agent/command.c (cmd_keytocard): Decrement KEYDATALEN.
 +	* agent/findkey.c (agent_public_key_from_file): Increment for ELEMS.
 +
 +	gpg: fix keytocard and support ECC card for key attribute.
 +	* g10/call-agent.c (agent_keytocard): Supply PARM arg.
 +	* g10/card-util.c (card_status): Support ECC.
 +	(card_store_subkey): Don't assume RSA.
 +
 +2013-02-21  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix a memory leak in batch key generation.
 +	* g10/keygen.c (append_to_parameter): New.
 +	(proc_parameter_file): Use new func to extend the parameter list.
 +
 +	* g10/passphrase.c (passphrase_to_dek_ext): Print a diagnostic of
 +	gcry_kdf_derive failed.
 +	* g10/keygen.c (proc_parameter_file): Print a diagnostic if
 +	passphrase_to_dek failed.
 +
 +	gpg: Handle the agent's NEW_PASSPHRASE inquiry.
 +	* g10/call-agent.c (default_inq_cb): Take care of NEW_PASSPHRASE.
 +
 +	common: Add func has_leading_keyword.
 +	* common/stringhelp.c (has_leading_keyword): New.
 +
 +2013-02-20  Werner Koch  <wk at gnupg.org>
 +
 +	Remove build hacks for FreeBSD.
 +	* configure.ac [freebsd]: Do not add /usr/local to CPPFLAGS and
 +	LDFLAGS.
 +
 +2013-02-12  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	gpg: Implement card_store_subkey again.
 +	* g10/call-agent.h (agent_keytocard): New.
 +	* g10/call-agent.c (agent_keytocard): New.
 +	* g10/card-util.c (replace_existing_key_p): Returns 1 when replace.
 +	(card_generate_subkey): Check return value of replace_existing_key_p.
 +	(card_store_subkey): Implement again using agent_keytocard.
 +
 +	agent: Add KEYTOCARD command.
 +	* agent/agent.h (divert_writekey, agent_card_writekey): New.
 +	* agent/call-scd.c (inq_writekey_parms, agent_card_writekey): New.
 +	* agent/command.c (cmd_keytocard, hlp_keytocard): New.
 +	(register_commands): Add cmd_keytocard.
 +	* agent/divert-scd.c (divert_writekey): New.
 +
 +	Japanese: update po and doc.
 +	* doc/help.ja.txt, po/ja.po: Updated.
 +
 +2013-02-08  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Rename 'keypad' to 'pinpad'.
 +	* NEWS: Mention scd changes.
 +
 +	* agent/divert-scd.c (getpin_cb): Change message.
 +
 +	* agent/call-scd.c (inq_needpin): Change the protocol to
 +	POPUPPINPADPROMPT and DISMISSPINPADPROMPT.
 +	* scd/command.c (pin_cb): Likewise.
 +
 +	* scd/apdu.c (struct reader_table_s): Rename member functions.
 +	(check_pcsc_pinpad, pcsc_pinpad_verify, pcsc_pinpad_modify,
 +	check_ccid_pinpad, ccid_pinpad_operation, apdu_check_pinpad
 +	apdu_pinpad_verify, apdu_pinpad_modify): Rename.
 +
 +	* scd/apdu.h (SW_HOST_NO_PINPAD, apdu_check_pinpad)
 +	(apdu_pinpad_verify, apdu_pinpad_modify): Rename.
 +
 +	* scd/iso7816.h (iso7816_check_pinpad): Rename.
 +
 +	* scd/iso7816.c (map_sw): Use SW_HOST_NO_PINPAD.
 +	(iso7816_check_pinpad): Rename.
 +	(iso7816_verify_kp, iso7816_change_reference_data_kp): Follow
 +	the change.
 +
 +	* scd/ccid-driver.h (CCID_DRIVER_ERR_NO_PINPAD): Rename.
 +	* scd/ccid-driver.c (ccid_transceive_secure): Use it.
 +
 +	* scd/app-dinsig.c (verify_pin): Follow the change.
 +	* scd/app-nks.c (verify_pin): Follow the change.
 +
 +	* scd/app-openpgp.c (check_pinpad_request): Rename.
 +	(parse_login_data, verify_a_chv, verify_chv3, do_change_pin): Follow
 +	the change.
 +
 +	* scd/scdaemon.c (oDisablePinpad, oEnablePinpadVarlen): Rename.
 +
 +	* scd/scdaemon.h (opt): Rename to disable_pinpad,
 +	enable_pinpad_varlen.
 +
 +	* tools/gpgconf-comp.c (gc_options_scdaemon): Rename to
 +	disable-pinpad.
 +
 +2013-02-07  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add pinentry-mode feature.
 +	* g10/gpg.c: Include shareddefs.h.
 +	(main): Add option --pinentry-mode.
 +	* g10/options.h (struct opt): Add field pinentry_mode.
 +	* g10/passphrase.c: Include shareddefs.h.
 +	(have_static_passphrase): Take care of loopback pinentry_mode.
 +	(read_passphrase_from_fd): Ditto.
 +	(get_static_passphrase): New.
 +	(passphrase_to_dek_ext): Factor some code out to ...
 +	(emit_status_need_passphrase): new.
 +	* g10/call-agent.c (start_agent): Send the pinentry mode.
 +	(default_inq_cb): Take care of the PASSPHRASE inquiry.  Return a
 +	proper error code.
 +	(agent_pksign): Add args keyid, mainkeyid and pubkey_algo.
 +	(agent_pkdecrypt): Ditto.
 +	* g10/pubkey-enc.c (get_it): Pass new args.
 +	* g10/sign.c (do_sign): Pass new args.
 +
 +	* g10/call-agent.c (struct default_inq_parm_s): New.  Change all
 +	similar structs to reference this one.  Change all users and inquire
 +	callback to use this struct, instead of NULL or some undefined but not
 +	used structs.  This change will help to eventually get rid of global
 +	variables.
 +
 +2013-02-06  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Move a typedef to common and provide parse_pinentry_mode.
 +	* common/agent-opt.c: New.
 +	* common/shareddefs.h: New.
 +	* common/Makefile.am: Add new files.
 +	* agent/agent.h: Include shareddefs.h.
 +	(pinentry_mode_t): Factor out to shareddefs.h.
 +	* agent/command.c (option_handler): Use parse_pinentry_mode.
 +
 +	agent: Return a better error code if no passphrase was given.
 +	* agent/protect.c (hash_passphrase): Handle an empty passphrase.
 +
 +2013-02-05  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix check_keypad_request.
 +	* scd/app-openpgp.c (check_keypad_request): 0 means not to use pinpad.
 +
 +	SCD: Add vendor specific initalization.
 +	* scd/ccid-driver.c (ccid_vendor_specific_init): New.
 +	(ccid_open_reader): Call ccid_vendor_specific_init.
 +
 +	SCD: Support P=N format for login data.
 +	* scd/app-openpgp.c (parse_login_data): Support P=N format.
 +
 +	SCD: Better interoperability.
 +	* scd/apdu.c: Fill bTeoPrologue[2] field.
 +
 +	SCD: Defaults to use pinpad if the reader has the capability.
 +	* scd/app-openpgp.c (struct app_local_s): Remove VARLEN.
 +	(parse_login_data): "P=0" means to disable pinpad.
 +	(check_keypad_request): Default is to use pinpad if available.
 +
 +	SCD: handle keypad request on the card.
 +	* scd/app-openpgp.c: Add 2013.
 +	(struct app_local_s): Add keypad structure.
 +	(parse_login_data): Add parsing keypad request on the card.
 +	(check_keypad_request): New.
 +	(verify_a_chv, verify_chv3, do_change_pin): Call check_keypad_request
 +	to determine use of keypad.
 +
 +	SCD: Minor fix of ccid-driver.
 +	* scd/ccid-driver.c (VENDOR_VEGA): Fix typo.
 +
 +	SCD: Add support of Covadis VEGA_ALPHA reader.
 +	* scd/ccid-driver.c: Add 2013.
 +	(VENDER_VEGA, VEGA_ALPHA):New.
 +	(ccid_transceive_secure): VEGA_ALPHA is same firmware as GEMPC_PINPAD.
 +	Change bNumberMessage to 0x01, as it works better (was: 0xff).
 +
 +	SCD: Support fixed length PIN input for keypad (PC/SC).
 +	* scd/apdu.c (pcsc_keypad_verify): SUpport fixed length PIN input for
 +	keypad.
 +	(pcsc_keypad_modify): Likewise.
 +	* scd/ccid-driver.c (ccid_transceive_secure): Clean up.
 +
 +	SCD: Support fixed length PIN input for keypad.
 +	* scd/iso7816.h (struct pininfo_s): Remove MODE and add FIXEDLEN.
 +	* scd/app-dinsig.c (verify_pin): Initialize FIXEDLEN to unknown.
 +	* scd/app-nks.c (verify_pin): Likewise.
 +	* scd/app-openpgp.c (verify_a_chv, verify_chv3, do_change_pin):
 +	Likewise.
 +	* scd/apdu.c (check_pcsc_keypad): Add comment.
 +	(pcsc_keypad_verify, pcsc_keypad_modify): PC/SC driver only support
 +	readers with the feature of variable length input (yet).
 +	(apdu_check_keypad): Set FIXEDLEN.
 +	* scd/ccid-driver.c (ccid_transceive_secure): Add GEMPC_PINPAD
 +	specific settings.
 +	Support fixed length PIN input for keypad.
 +
 +	SCD: API cleanup for keypad handling.
 +	* scd/iso7816.h (struct pininfo_s): Rename from iso7816_pininfo_s.
 +	Change meaning of MODE.
 +	(pininfo_t): Rename from iso7816_pininfo_t.
 +	* scd/sc-copykeys.c: Include "iso7816.h".
 +	* scd/scdaemon.c, scd/command.c: Likewise.
 +	* scd/ccid-driver.c: Include "scdaemon.h" and "iso7816.h".
 +	(ccid_transceive_secure): Follow the change of PININFO_T.
 +	* scd/app.c: Include "apdu.h" after "iso7816.h".
 +	* scd/iso7816.c (iso7816_check_keypad, iso7816_verify_kp)
 +	(iso7816_change_reference_data_kp): Follow the change of API.
 +	* scd/apdu.c (struct reader_table_s): Change API of CHECK_KEYPAD,
 +	KEYPAD_VERIFY, KEYPAD_MODIFY to have arg of PININFO_T.
 +	(check_pcsc_keypad, check_ccid_keypad): Likewise.
 +	(apdu_check_keypad, apdu_keypad_verify, apdu_keypad_modify): Likewise.
 +	(pcsc_keypad_verify, pcsc_keypad_modify, ct_send_apdu)
 +	(pcsc_send_apdu_direct,  pcsc_send_apdu_wrapped, pcsc_send_apdu)
 +	(send_apdu_ccid, ccid_keypad_operation, my_rapdu_send_apdu, send_apdu)
 +	(send_le): Follow the change of API.
 +	* scd/apdu.h (apdu_check_keypad, apdu_keypad_verify)
 +	(apdu_keypad_modify): Change the API.
 +	* scd/app-dinsig.c, scd/app-nks.c, scd/app-openpgp.c: Follow the
 +	change.
 +
 +	SCD: Clean up.  Remove PADLEN for keypad input.
 +	* scd/apdu.c (struct pininfo_s): Use iso7816_pininfo_s.
 +	(struct reader_table_s): Remove last arg from check_keypad method.
 +	(check_pcsc_keypad, check_pcsc_keypad): Remove PIN_PADLEN.
 +	(pcsc_keypad_verify, pcsc_keypad_modify): Don't check PIN_PADLEN.
 +	(send_apdu_ccid, ccid_keypad_operation): Remove PIN_PADLEN.
 +	(apdu_check_keypad, apdu_keypad_verify, apdu_keypad_modify):
 +	Likewise.
 +
 +	* scd/apdu.h (apdu_check_keypad, apdu_keypad_verify)
 +	(apdu_keypad_modify): Remove PIN_PADLEN.
 +
 +	* scd/ccid-driver.c (ccid_transceive_secure): Remove PIN_PADLEN.
 +
 +	* scd/ccid-driver.h (ccid_transceive_secure): Remove PIN_PADLEN.
 +
 +	* scd/iso7816.c (iso7816_check_keypad, iso7816_verify_kp)
 +	(iso7816_change_reference_data_kp): Remove PADLEN.
 +
 +	* scd/iso7816.h (struct iso7816_pininfo_s): Remove PADLEN, PADCHAR.
 +
 +	SCD: Add option enable-keypad-varlen and support for GEMPC_PINPAD.
 +	* scd/scdaemon.h (opt): Add enable_keypad_varlen.
 +	* scd/scdaemon.c (cmd_and_opt_values): Add oEnableKeypadVarlen.
 +	(opts, main): Add oEnableKeypadVarlen.
 +	* scd/ccid-driver.c (GEMPC_PINPAD): New.
 +	(ccid_transceive_secure): Add enable_varlen handling.
 +	Enable GEMPC_PINPAD.
 +
 +2013-01-30  Werner Koch  <wk at gnupg.org>
 +
 +	Remove unused status codes.
 +	* common/status.h (STATUS_BEGIN_STREAM, STATUS_END_STREAM)
 +	(STATUS_SIEXPIRED): Remove unused codes.
 +
 +	gpg: Add status line PINENTRY_LAUNCHED.
 +	* common/status.h (STATUS_PINENTRY_LAUNCHED): New.
 +	* g10/server.c (server_local_s): Add field allow_pinentry_notify.
 +	(option_handler): Add option "allow-pinentry-notify".
 +	(gpg_proxy_pinentry_notify): New.
 +	* g10/call-agent.c (default_inq_cb): Factor code out to the new
 +	function.
 +
 +2013-01-25  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: Fix a bug of handling return code from npth_join.
 +	* agent/call-pinentry.c (agent_popup_message_stop): Fix npth_join
 +	return code.
 +
 +2013-01-11  Christian Aistleitner  <christian at quelltextlich.at>
 +
 +	gpg: Fix honoring --cert-digest-algo when recreating a cert.
 +	* g10/sign.c (update_keysig_packet): Override original signature's
 +	digest algo in hashed data and for hash computation.
 +
 +2013-01-11  Werner Koch  <wk at gnupg.org>
 +
 +	Fix spurious cruft from configure summary output.
 +	* configure.ac (build_scdaemon_extra): Remove $tmp cruft.
 +
 +2013-01-11  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	SCD: Hold lock for pinpad input.
 +	* scd/apdu.c (apdu_check_keypad, apdu_keypad_verify)
 +	(apdu_keypad_modify): Hold lock to serialize communication.
 +
 +2013-01-08  Werner Koch  <wk at gnupg.org>
 +
 +	kbx: Switch from MD5 to SHA-1 for the checksum.
 +	* kbx/keybox-blob.c (put_membuf): Use a NULL buf to store zero bytes.
 +	(create_blob_finish): Write just the needed space.
 +	(create_blob_finish): Switch to SHA-1.
 +	* kbx/keybox-dump.c (print_checksum): New.
 +	(_keybox_dump_blob): Print the checksum and the verification status.
 +
 +	gpg: Cache keybox searches.
 +	* common/iobuf.c (iobuf_seek): Fix for temp streams.
 +	* g10/pubkey-enc.c (get_session_key, get_it): Add some log_clock calls.
 +	* g10/keydb.c (dump_search_desc): New.
 +	(enum_keyblock_states, struct keyblock_cache): New.
 +	(keyblock_cache_clear): New.
 +	(keydb_get_keyblock, keydb_search): Implement a keyblock cache.
 +	(keydb_update_keyblock, keydb_insert_keyblock, keydb_delete_keyblock)
 +	(keydb_rebuild_caches, keydb_search_reset): Clear the cache.
 +
 +	Make log_clock easier to read.
 +	* common/logging.c (log_clock): Print in microseconds.
 +
 +	gpg: Remove a function wrapper.
 +	* g10/keydb.h (keydb_search): Remove macro.
 +	* g10/keydb.c (keydb_search2): Rename to keydb_search.  Change all
 +	callers.
 +
 +2013-01-08  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	SCD: Support not-so-smart card readers.
 +	* scd/ccid-driver.c (struct ccid_driver_s): Add auto_voltage,
 +	auto_param, and auto_pps.
 +	(parse_ccid_descriptor): Set auto_voltage, auto_param, and auto_pps.
 +	Support non-autoconf readers.
 +	(update_param_by_atr): New.
 +	(ccid_get_atr): Use 5V for PowerOn when auto_voltage is not supported.
 +	Use 0x10 when nonnull_nad for SetParameters.
 +	Call update_param_by_atr for parsing ATR, and use param for
 +	SetParameters.
 +	Send PPS if reader requires it and card is negotiable.
 +	When bNadValue in the return values of SetParameters == 0,
 +	clear handle->nonnull_nad flag.
 +
 +2013-01-07  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Set the node flags while retrieving a keyblock.
 +	* g10/keydb.c (parse_keyblock_image): Add args PK_NO and UID_NO and
 +	set the note flags accordingly.
 +	(keydb_get_keyblock): Transfer PK_NO and UID_NO to parse_keyblock_image.
 +	* kbx/keybox-search.c (blob_cmp_fpr, blob_cmp_fpr_part)
 +	(blob_cmp_name, blob_cmp_mail): Return the key/user number.
 +	(keybox_search): Set the key and user number into the found struct.
 +	(keybox_get_keyblock): Add args R_PK_NO and R_UID_NO and set them from
 +	the found struct.
 +
 +	New function log_clock.
 +	* common/logging.c (log_clock): New.
 +	* g10/gpg.c (set_debug): Print clock debug flag.
 +	* g10/options.h (DBG_CLOCK_VALUE, DBG_CLOCK): New.
 +
 +	gpg: Allow searching for user ids in a keybox.
 +	* kbx/keybox-search.c (blob_cmp_name): Add arg X509 and adjust for PGP
 +	use.  Change callers.
 +	(blob_cmp_mail): Add arg X509 and find the mailbox offset for PGP.
 +	Chnage callers.
 +	(has_subject_or_alt): Rename to has_username.
 +	(has_username): Allow blobtype PGP.
 +	(has_mail): Ditto.
 +
 +	gpg: Allow generation of more than 4096 keys in one run.
 +	* g10/getkey.c (cache_public_key): Make room in the cache if needed.
 +
 +2013-01-07  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	Update Japanese Translation.
 +	* po/ja.po: Fix wrong translations for designated revocation.
 +	Reported by Hideki Saito.
 +
 +	Conflicts:
 +		po/ja.po
 +
 +2013-01-05  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	Update Japanese Translation.
 +	* po/ja.po: Fix fuzzy translations.
 +
 +2013-01-03  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	Update Japanese Translation.
 +	* po/ja.po: Update with POT.
 +
 +	Update Japanese Translation.
 +	* po/ja.po: Start from the new one of 2.0.
 +
 +2012-12-28  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add signature cache support to the keybox.
 +	* g10/keydb.c (parse_keyblock_image): Add arg SIGSTATUS.
 +	(keydb_get_keyblock): Handle it.
 +	(build_keyblock_image): Add arg SIGSTATUS.
 +	(keydb_insert_keyblock): Handle it.
 +	* kbx/keybox-blob.c (pgp_create_sig_part): Add arg SIGSTATUS.
 +	(_keybox_create_openpgp_blob): Ditto.
 +	* kbx/kbxutil.c (import_openpgp): Adjust for above change.
 +	* kbx/keybox.h (KEYBOX_FLAG_SIG_INFO): New.
 +	* kbx/keybox-search.c (_keybox_get_flag_location): Handle new flag.
 +	(keybox_get_keyblock): Add arg R_SIGSTATUS.
 +	* kbx/keybox-update.c (keybox_insert_keyblock): Add arg SIGSTATUS.
 +
 +	kbxutil: Improve format of the Sig-Expire lines.
 +	* kbx/keybox-dump.c (_keybox_dump_blob): Print the expirate timestamp.
 +
 +	gpg: First working support for keyboxes.
 +	* g10/getkey.c (get_pubkey_fast): Improve the assertion.
 +	* kbx/keybox.h: Include iobuf.h.
 +	* kbx/keybox-blob.c (keyboxblob_uid): Add field OFF.
 +	(KEYBOX_WITH_OPENPGP): Remove use of this macro.
 +	(pgp_create_key_part_single): New.
 +	(pgp_temp_store_kid): Change to use the keybox-openpgp parser.
 +	(pgp_create_key_part): Ditto.
 +	(pgp_create_uid_part): Ditto.
 +	(pgp_create_sig_part): Ditto.
 +	(pgp_create_blob_keyblock): Ditto.
 +	(_keybox_create_openpgp_blob): Ditto.
 +	* kbx/keybox-search.c (keybox_get_keyblock): New.
 +	* kbx/keybox-update.c (keybox_insert_keyblock): New.
 +	* g10/keydb.c (parse_keyblock_image):
 +	(keydb_get_keyblock): Support keybox.
 +	(build_keyblock_image): New.
 +	(keydb_insert_keyblock): Support keybox.
 +
 +	* kbx/kbxutil.c (import_openpgp, main): Add option --dry-run and print
 +	a kbx file to stdout.
 +
 +	* kbx/keybox-file.c (_keybox_read_blob2): Allow keyblocks up to 10^6
 +	bytes.
 +
 +	kbxutil: Print algo number and fold similar lines.
 +	* kbx/keybox-defs.h (_keybox_openpgp_key_info): Add field ALGO.
 +	* kbx/keybox-openpgp.c (parse_key): Store algo.
 +	* kbx/kbxutil.c (dump_openpgp_key): Print algo number.
 +	* kbx/keybox-dump.c (_keybox_dump_blob): Print identical Sig-Expire
 +	value lines with a range of indices.
 +
 +2012-12-27  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: First patches to support a keybox storage backend.
 +	* kbx/keybox-defs.h (_keybox_write_header_blob): Move prototype to ..
 +	* kbx/keybox.h: here.
 +	* kbx/keybox-init.c (keybox_lock): Add dummy function
 +	* g10/keydb.c: Include keybox.h.
 +	(KeydbResourceType): Add KEYDB_RESOURCE_TYPE_KEYBOX.
 +	(struct resource_item): Add field kb.
 +	(maybe_create_keyring_or_box): Add error descriptions to diagnostics.
 +	Add arg IS_BOX.  Write a header for a new keybox file.
 +	(keydb_add_resource): No more need for the force flag.  Rename the
 +	local variable "force" to "create".  Add URL scheme "gnupg-kbx".  Add
 +	magic test to detect a keybox file.  Add basic support for keybox.
 +	(keydb_new, keydb_get_resource_name, keydb_delete_keyblock)
 +	(keydb_locate_writable, keydb_search_reset, keydb_search2): Add
 +	support for keybox.
 +	(lock_all, unlock_all): Ditto.
 +	* g10/Makefile.am (needed_libs): Add libkeybox.a.
 +	(gpg2_LDADD, gpgv2_LDADD): Add KSBA_LIBS as a workaround.
 +
 +	* g10/keydb.h (KEYDB_RESOURCE_FLAG_PRIMARY)
 +	KEYDB_RESOURCE_FLAG_DEFAULT, KEYDB_RESOURCE_FLAG_READONLY): New.
 +	* g10/gpg.c, g10/gpgv.c (main): Use new constants.
 +
 +2012-12-20  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Import only packets which are allowed in a keyblock.
 +	* g10/import.c (valid_keyblock_packet): New.
 +	(read_block): Store only valid packets.
 +
 +2012-12-19  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Make commit 2b3cb2ee actually work.
 +	* g10/sign.c (update_keysig_packet): Use digest_algo.
 +
 +	(cherry-picked from commit d23ec86095714d388acac14b515445fe69f019e9)
 +
 +	gpg: Suppress "public key already present" in quiet mode.
 +	* g10/pkclist.c (find_and_check_key, build_pk_list): Print a
 +	diagnostic only in non-quiet mode.
 +
 +2012-12-18  Werner Koch  <wk at gnupg.org>
 +
 +	common: Add meta option ignore-invalid-option.
 +	* common/argparse.c (iio_item_def_s, IIO_ITEM_DEF): New.
 +	(initialize): Init field IIO_LIST.
 +	(ignore_invalid_option_p): New.
 +	(ignore_invalid_option_add): New.
 +	(ignore_invalid_option_clear): New.
 +	(optfile_parse): Implement meta option.
 +
 +2012-12-13  Werner Koch  <wk at gnupg.org>
 +	    Hans of Guardian  <hans at guardianproject.info>
 +
 +	utf8conv.c: Add hacks for Android.
 +	* common/utf8conv.c [HAVE_ANDROID_SYSTEM]: Do not include iconv.h.
 +	(iconv_open, iconv_close, load_libiconv) [HAVE_ANDROID_SYSTEM]: New
 +	dummy functions.
 +	(set_native_charset) [HAVE_ANDROID_SYSTEM]: Force use of "utf-8".
 +	(jnlib_iconv_open) [HAVE_ANDROID_SYSTEM]: Act the same as under W32.
 +	(jnlib_iconv) [HAVE_ANDROID_SYSTEM]: Ditto.
 +	(jnlib_iconv_close) [HAVE_ANDROID_SYSTEM]: Ditto.
 +
 +2012-12-13  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	SCD: Fix the process of writing key or generating key.
 +	* scd/app-openpgp.c (store_fpr): Flush KEY-FPR and KEY-TIME.
 +
 +2012-12-12  Werner Koch  <wk at gnupg.org>
 +
 +	ssh: Support ECDSA keys.
 +	* agent/command-ssh.c (SPEC_FLAG_IS_ECDSA): New.
 +	(struct ssh_key_type_spec): Add fields CURVE_NAME and HASH_ALGO.
 +	(ssh_key_types): Add types ecdsa-sha2-nistp{256,384,521}.
 +	(ssh_signature_encoder_t): Add arg spec and adjust all callers.
 +	(ssh_signature_encoder_ecdsa): New.
 +	(sexp_key_construct, sexp_key_extract, ssh_receive_key)
 +	(ssh_convert_key_to_blob): Support ecdsa.
 +	(ssh_identifier_from_curve_name): New.
 +	(ssh_send_key_public): Retrieve and pass the curve_name.
 +	(key_secret_to_public): Ditto.
 +	(data_sign): Add arg SPEC and change callers to pass it.
 +	(ssh_handler_sign_request): Get the hash algo from SPEC.
 +	* common/ssh-utils.c (get_fingerprint): Support ecdsa.
 +
 +	* agent/protect.c (protect_info): Add flag ECC_HACK.
 +	(agent_protect): Allow the use of the "curve" parameter.
 +	* agent/t-protect.c (test_agent_protect): Add a test case for ecdsa.
 +
 +	* agent/command-ssh.c (ssh_key_grip): Print a better error code.
 +
 +2012-12-11  Werner Koch  <wk at gnupg.org>
 +
 +	ssh: Rewrite a function for better maintainability.
 +	* agent/command-ssh.c (ssh_signature_encoder_dsa): Rewrite.
 +
 +2012-12-10  Werner Koch  <wk at gnupg.org>
 +
 +	ssh: Improve key lookup for many keys.
 +	* agent/command-ssh.c: Remove dirent.h.
 +	(control_file_s): Add struct item.
 +	(rewind_control_file): New.
 +	(search_control_file): Factor code out to ...
 +	(read_control_file_item): New.
 +	(ssh_handler_request_identities): Change to iterate over entries in
 +	sshcontrol.
 +
 +	ssh: Cleanup sshcontrol file access code.
 +	* agent/command-ssh.c (SSH_CONTROL_FILE_NAME): New macro to replace
 +	the direct use of the string.
 +	(struct control_file_s, control_file_t): New.
 +	(open_control_file, close_control_file): New.  Use them instead of
 +	using fopen/fclose directly.
 +
 +	agent: Add envvar "gnupg_SSH_AUTH_SOCK_by"
 +	* agent/gpg-agent.c (main): Pass new envar gnupg_SSH_AUTH_SOCK_by to
 +	an invoked process.
 +
 +	config: Update npth.m4.
 +	* m4/npth.m4: Take from current npth master.
 +
 +2012-12-04  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	Revert SCD changes of 2010-05-03.
 +	* scd/apdu.c (pcsc_no_service): Remove.
 +	(open_pcsc_reader_direct, open_pcsc_reader_wrapped): Remove
 +	pcsc_no_service support.
 +	(apdu_open_reader): Remove R_NO_SERVICE.
 +	* scd/apdu.h (apdu_open_reader): Remove R_NO_SERVICE.
 +	* scd/command.c (reader_disabled): Remove.
 +	(get_current_reader): Follow the change of R_NO_SERVICE.
 +	(open_card, cmd_serialno, scd_command_handler): Remove reader_disabled
 +	support.
 +	* scd/sc-copykeys.c (main): Follow the change of R_NO_SERVICE.
 +
 +	Don't keep opening unavailable card reader.
 +	* scd/command.c (update_reader_status_file): Don't call
 +	get_current_reader.
 +
 +2012-11-30  David Shaw  <dshaw at jabberwocky.com>
 +
 +	Refresh sample keys.
 +
 +	Adjust awk to not add trailing whitespace.
 +	* mksamplekeys: Tweak awk script to not add trailing whitespace to
 +	  blank lines (makes git pre-commit hook unhappy)
 +
 +2012-11-29  David Shaw  <dshaw at jabberwocky.com>
 +
 +	The keyserver search menu should honor --keyid-format.
 +	* keyserver.c (print_keyrec): Honor --keyid-format when getting back
 +	  full fingerprints from the keyserver (the comment in the code was
 +	  correct, the code was not).
 +
 +2012-11-27  Werner Koch  <wk at gnupg.org>
 +
 +	Fix printing of ECC algo names in hkp keyserver listings.
 +	* g10/keyserver.c (print_keyrec): Map OpenPGP algorithm ids.
 +
 +2012-11-26  Ben Kibbey  <bjk at luxsci.net>
 +
 +	Check for inet_addr() in -lnsl.
 +	* configure.ac: Check for inet_addr() in libnsl.
 +
 +2012-11-20  Werner Koch  <wk at gnupg.org>
 +
 +	Do not use a broken ttyname.
 +	* configure.ac (HAVE_BROKEN_TTYNAME): New ac_define set for Android
 +	systems.
 +	* common/util.h (gnupg_ttyname): New macro.  Change all callers of
 +	ttyname to use this macro instead.
 +	(ttyname) [W32]: Rename to _gnupg_ttyname and use also if
 +	HAVE_BROKEN_TTYNAME is defined.
 +	* common/simple-pwquery.c (agent_send_all_options): Keep on using
 +	ttyname unless HAVE_BROKEN_TTYNAME is set.  This is because this file
 +	may be used standalone.
 +
 +2012-11-16  Werner Koch  <wk at gnupg.org>
 +
 +	Fix non-portable use of chmod in autogen.sh.
 +	* autogen.sh: Remove option -c from chmod.
 +
 +	Improve parsing of the GIT revision number.
 +	* configure.ac (mmm4_revision): Use git rev-parse.
 +
 +	Add an OpenPGP card vendor.
 +	* g10/card-util.c (get_manufacturer): Add Yubico.
 +
 +2012-11-06  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Use wipememory instead of memset in one place.
 +	* agent/command.c (clear_outbuf): Use wipememory.  Suggested by Ben
 +	Kibbey.
 +
 +	Allow decryption with card keys > 3072 bits.
 +	* scd/command.c (MAXLEN_SETDATA): New.
 +	(cmd_setdata): Add option --append.
 +	* agent/call-scd.c (agent_card_pkdecrypt): Use new option for long
 +	data.
 +
 +	* scd/app-openpgp.c (struct app_local_s): Add field manufacturer.
 +	(app_select_openpgp): Store manufacturer.
 +	(do_decipher): Print a note for broken cards.
 +
 +2012-11-02  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: Fix wrong use of gcry_sexp_build_array.
 +	* findkey.c (agent_public_key_from_file): Fix use of
 +	gcry_sexp_build_array.
 +
 +2012-10-31  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	SCD: Upon error, open_pcsc_reader_wrapped does same as _direct.
 +	* scd/apdu.c (PCSC_E_NO_SERVICE): New.
 +	(open_pcsc_reader_direct): Use PCSC_E_NO_SERVICE.
 +	(open_pcsc_reader_wrapped): Set pcsc_no_service.
 +
 +2012-08-24  Werner Koch  <wk at gnupg.org>
 +
 +	Update and enable French translation.
 +	* po/fr.po: Update.
 +	* po/LINGUAS: Enable fr.
 +
 +2012-08-24  David Prévot  <taffit at debian.org>
 +
 +	Fix typos spotted during translations.
 +	* agent/genkey.c: s/to to/to/
 +	* sm/*.c: s/failed to allocated/failed to allocate/
 +	* sm/certlist.c, ./dirmngr/validate.c: s/should have not/should not have/
 +	* g10/seskey.c: missing closing parenthesis
 +	* dirmngr/crlcache.c: s/may has/may have/
 +
 +	Consistency fix:
 +
 +	* g10/gpg.c, kbx/kbxutil.c, sm/gpgsm.c: uppercase after Syntax
 +	* dirmngr/dirmngr_ldap: no period in Syntax
 +	* dirmngr/dirmngr-client.c: infinitive for option description:
 +		s/certificates are expected/expect certificates/
 +
 +	Keep previous msgids of translated messages.
 +	* po/Makefile.in.in: Use --previous with msgmerge.
 +
 +2012-08-24  Hans-Christoph Steiner  <hans at eds.org>
 +
 +	Fix build system for Android by disabling tests since its x-compiled.
 +	* configure.ac (HAVE_ANDROID_SYSTEM, RUN_TESTS): New.
 +	(AH_BOTTOM) [__ANDROID__]: Do not re-define ttyname.
 +	* Makefile.am: Depend tests on new RUN_TESTS conditional.
 +
 +2012-08-24  Werner Koch  <wk at gnupg.org>
 +
 +	Fix left over use of jnlib on some platforms.
 +	* tools/watchgnupg.c: Take mischelp.h from common/ and not jnlib/.
 +
 +2012-06-25  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: handle reader/token removal.
 +	* scd/apdu.c (pcsc_error_to_sw): PCSC_E_UNKNOWN_READER means
 +	SW_HOST_NO_READER.
 +
 +2012-06-05  Werner Koch  <wk at gnupg.org>
 +
 +	Change all quotes in strings and comments to the new GNU standard.
 +	The asymmetric quotes used by GNU in the past (`...') don't render
 +	nicely on modern systems.  We now use two \x27 characters ('...').
 +
 +	The proper solution would be to use the correct Unicode symmetric
 +	quotes here.  However this has the disadvantage that the system
 +	requires Unicode support.  We don't want that today.  If Unicode is
 +	available a generated po file can be used to output proper quotes.  A
 +	simple sed script like the one used for en at quote is sufficient to
 +	change them.
 +
 +	The changes have been done by applying
 +
 +	  sed -i "s/\`\([^'\`]*\)'/'\1'/g"
 +
 +	to most files and fixing obvious problems by hand.  The msgid strings in
 +	the po files were fixed with a similar command.
 +
 +2012-05-24  Werner Koch  <wk at gnupg.org>
 +
 +	Print the hash algorithm in colon mode key listing.
 +	* g10/keylist.c (list_keyblock_colon): Print digest_algo.
 +
 +	Fix type conflict warning.
 +	* g10/keylist.c: Change min_cert_level to a byte.
 +
 +2012-05-11  Werner Koch  <wk at gnupg.org>
 +
 +	Switch to the new automagic beta numbering scheme.
 +	* configure.ac: Add all the require m4 magic.
 +
 +2012-05-08  Werner Koch  <wk at gnupg.org>
 +
 +	Add tweaks for the not anymore patented IDEA algorithm.
 +	* g10/keygen.c (keygen_set_std_prefs): Include IDEA only in PGP2
 +	compatibility mode.
 +	* g10/misc.c (idea_cipher_warn): Remove.  Also remove all callers.
 +	* common/status.h (STATUS_RSA_OR_IDEA): Remove.  Do not emit this
 +	status anymore.
 +
 +	po: Update de.po.
 +	* po/de.po: Update.
 +
 +	common: Remove generated files only during maintainer-clean.
 +	* common/Makefile.am (CLEANFILES): Rename to MAINTAINERCLEANFILES.
 +
 +2012-04-30  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Fix deadlock in trustlist due to the switch to npth.
 +	* agent/trustlist.c (clear_trusttable): New.
 +	(agent_reload_trustlist): Use new function.
 +	(read_trustfiles): Require to be called with lock held.
 +	(agent_istrusted): Factor all code out to ...
 +	(istrusted_internal): new.  Add ALREADY_LOCKED arg.  Make sure the
 +	table islocked.  Do not print TRUSTLISTFLAG stati if called internally.
 +	(agent_marktrusted): Replace calls to agent_reload_trustlist by
 +	explicit code.
 +
 +2012-04-26  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	make DNS and URI fields work in gpgsm --gen-key.
 +	* sm/certreqgen-ui.c (gpgsm_gencertreq_tty): Actually set mb_uri and
 +	mb_dns.avoid buffer strncpy-induced buffer overrun
 +
 +2012-04-26  Jim Meyering  <jim at meyering.net>
 +
 +	avoid buffer strncpy-induced buffer overrun.
 +	* dirmngr/crlcache.c (open_dir): Ensure that both this_update
 +	and next_update member strings are NUL-terminated.
 +
 +	remove doubled words in a comment.
 +
 +2012-04-20  Werner Koch  <wk at gnupg.org>
 +
 +	Change license for some files in common to LGPLv3+/GPLv2+.
 +	Having the LGPL on the common GnuPG code helps to share code
 +	between GnuPG and related projects (like GPGME and Libassuan).  This
 +	is good for interoperability and to reduces bugs.
 +
 +	* common/asshelp.c, common/asshelp.h, common/asshelp2.c, common/b64dec.c
 +	* common/b64enc.c, common/convert.c, common/dns-cert.c
 +	* common/dns-cert.h common/exechelp-posix.c, common/exechelp-w32.c
 +	* common/exechelp-w32ce.c, common/exechelp.h, common/get-passphrase.c
 +	* common/get-passphrase.h, common/gettime.c, common/gpgrlhelp.c
 +	* common/helpfile.c, common/homedir.c, common/http.c, common/http.h
 +	* common/i18n.c, common/init.c, common/init.h, common/iobuf.c
 +	* common/iobuf.h, common/localename.c, common/membuf.c, common/membuf.h
 +	* common/miscellaneous.c, common/openpgp-oid.c, common/openpgpdefs.h
 +	* common/percent.c, common/pka.c, common/pka.h, common/session-env.c
 +	* common/session-env.h, common/sexp-parse.h, common/sexputil.c
 +	* common/signal.c, common/srv.c, common/srv.h, common/ssh-utils.c
 +	* common/ssh-utils.h, common/sysutils.c, common/sysutils.h
 +	* common/tlv.c, common/tlv.h, common/ttyio.c, common/ttyio.h
 +	* common/userids.c, common/userids.h, common/xasprintf.c: Change
 +	license to LGPLv3+/GPLv2+/
 +
 +2012-04-10  Ben Kibbey  <bjk at luxsci.net>
 +
 +	Fix killing PID -1.
 +	When the KILLSCD command had been sent a race condition would occur
 +	causing PID -1 getting killed, which on Linux seems to terminate all
 +	applications for the current user.
 +
 +2012-04-05  Werner Koch  <wk at gnupg.org>
 +
 +	Do not mix test result with progress lines.
 +	This makes parsing of the results easier.  Fixes bug#1400.
 +
 +	* tests/openpgp/defs.inc (progress_cancel, progress_end)
 +	(progress_new): New.
 +	* tests/openpgp/conventional-mdc.test: Use progress functions
 +	* tests/openpgp/conventional.test: Ditto.
 +	* tests/openpgp/encrypt-dsa.test: Ditto.
 +	* tests/openpgp/encrypt.test: Ditto.
 +	* tests/openpgp/sigs.test: Ditto.
 +
 +2012-04-04  Ben Kibbey  <bjk at luxsci.net>
 +
 +	Mention status messages in the documentation.
 +	Note INQUIRE_MAXLEN.
 +
 +	Document PASSWD --preset.
 +
 +	Document GENKEY options.
 +
 +	Document PRESET_PASSPHRASE.
 +
 +	Document CLEAR_PASSPHRASE.
 +	And describe the --mode=normal option.
 +
 +2012-03-27  Werner Koch  <wk at gnupg.org>
 +
 +	Fix timegm regression test.
 +	* common/t-timestuff.c (test_timegm): Change test to use January and
 +	not February or December+1.  Bug spotted by Daniel Kahn Gillmor.
 +
 +	Print warning for arguments not considered an option.
 +	GnuPG requires that options are given before other arguments.  This
 +	can sometimes be confusing.  We now print a warning if we found an
 +	argument looking alike a long option without being preceded by the
 +	stop option.  This is bug#1343.
 +
 +	* common/argparse.h (ARGPARSE_FLAG_STOP_SEEN): New.
 +	* common/argparse.c (arg_parse): Set new flag.
 +	* g10/gpg.c (main): Print the warning.
 +	* agent/gpg-agent.c (main): Ditto.
 +	* dirmngr/dirmngr.c (main): Ditto.
 +	* g13/g13.c (main): Ditto.
 +	* scd/scdaemon.c (main): Ditto.
 +	* sm/gpgsm.c (main): Ditto.
 +	* tools/gpg-connect-agent.c (main): Ditto.
 +	* tools/gpgconf.c (main): Ditto.
 +
 +2012-03-26  Werner Koch  <wk at gnupg.org>
 +
 +	Allow compress algorithm 0.
 +	* g10/mainproc.c (proc_compressed): Remove superfluous check for
 +	compress algorithm 0.  Reported by pfandrade.  This is bug#1326.
 +
 +	Add mksamplekeys script.
 +	* doc/mksamplekeys: New.
 +
 +2012-02-28  Marcus Brinkmann  <mb at g10code.com>
 +
 +	Replace npth_yield in busy wait by npth_usleep.
 +	* dirmngr/ldap-wrapper.c (ldap_wrapper_wait_connections): Call
 +	npth_usleep instead of npth_yield.
 +
 +2012-02-16  Marcus Brinkmann  <mb at g10code.com>
 +
 +	Check for lber and link dirmngr_ldap to it.
 +	* configure.ac (LBER_LIBS, HAVE_LBER): New variables, check for lber.
 +	* dirmngr/Makefile.am (dirmngr_lda_LDADD): Add $(LBER_LIBS).
 +
 +2012-02-07  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Add pin length field to the shadowed private key format.
 +	This is not yet fully implemented.  It will eventually allow to
 +	support pinpad equipped readers which do not support variable length
 +	pin lengths.
 +	* agent/protect.c (parse_shadow_info): Add optional arg R_PINLEN and
 +	parse pinlen info.  Change all callers to pass NULL for it.
 +
 +	Use new status printing functions.
 +	* agent/command.c (cmd_geteventcounter): Get rid of static buffers.
 +	* scd/command.c (cmd_serialno, cmd_learn): Simplify by using
 +	print_assuan_status.
 +
 +	agent: New function agent_print_status.
 +	* common/asshelp2.c (vprint_assuan_status): New.
 +	(print_assuan_status): Re-implement using above func.
 +	* agent/command.c (agent_print_status): New.
 +
 +	po: Add Ukrainian translation.
 +	* po/uk.po: New.
 +
 +	common: Replace macro based function calls by using DEFAULT_ERRSOURCE.
 +	* common/dns-cert.h (get_dns_cert): Remove macro.
 +	* common/dns-cert.c (_get_dns_cert): Rename to get_dns_cert.  Replace
 +	arg ERRSOURCE by global DEFAULT_ERRSOURCE.
 +	* common/http.h (http_parse_uri, http_raw_connect, http_open)
 +	(http_open_document, http_wait_response): Remove macros.
 +	* common/http.c (_http_parse_uri, _http_raw_connect, _http_open)
 +	(_http_open_document, _http_wait_response): Remove underscore from
 +	symbols.  Replace args ERRSOURCE by global DEFAULT_ERRSOURCE.
 +	* common/ssh-utils.h (ssh_get_fingerprint)
 +	(ssh_get_fingerprint_string): Remove macros.
 +	* common/ssh-utils.h (_ssh_get_fingerprint)
 +	(_ssh_get_fingerprint_string): Remove underscore from symbols.
 +	Replace args ERRSOURCE by global DEFAULT_ERRSOURCE.
 +	* common/tlv.h (parse_ber_header, parse_sexp): Remove macros.
 +	* common/tlv.c: Include util.h.
 +	(_parse_ber_header, _parse_sexp): Remove underscore from symbols.
 +	Replace args ERRSOURCE by global DEFAULT_ERRSOURCE.
 +
 +2012-02-06  Werner Koch  <wk at gnupg.org>
 +
 +	Add replacement hack for Android's broken ttyname.
 +	* configure.ac (HAVE_TTYNAME) [__ANDROID__]: Add hack.
 +
 +	agent: Simplify printing of INQUIRE_MAXLEN.
 +	* agent/command.c: Include asshelp.h.
 +	(cmd_pkdecrypt, cmd_genkey, cmd_preset_passphrase)
 +	(pinentry_loopback): Use print_assuan_status for INQUIRE_MAXLEN.
 +
 +	common: Add function print_assuan_status.
 +	* common/asshelp2.c: New.
 +	(print_assuan_status): New function.
 +	* common/Makefile.am (common_sources): Add asshelp2.c.
 +
 +	common: Add a global variable to for the default error source.
 +	For the shared code parts it is cumbersome to pass an error sourse
 +	variable to each function.  Its value is always a constant for a given
 +	binary and thus a global variable makes things a lot easier than the
 +	former macro stuff.
 +	* common/init.c (default_errsource): New global var.
 +	(init_common_subsystems): Rename to _init_common_subsystems.  Set
 +	DEFAULT_ERRSOURCE.
 +	* common/init.h: Assert value of GPG_ERR_SOURCE_DEFAULT.
 +	(init_common_subsystems): New macro.
 +	* common/util.h (default_errsource): Add declaration.
 +	* kbx/keybox-defs.h: Add some GPG_ERR_SOURCE_DEFAULT trickery.
 +
 +2012-02-03  Ben Kibbey  <bjk at luxsci.net>
 +
 +	Also let GENKEY and PKDECRYPT send the INQUIRE_MAXLEN status message.
 +	* agent/command.c (cmd_pkdecrypt): Send the INQUIRE_MAXLEN status
 +	message before doing the inquire.
 +	(cmd_genkey): Ditto.
 +
 +2012-02-02  Ben Kibbey  <bjk at luxsci.net>
 +
 +	Inform the client of the preset passphrase length.
 +	* agent/command.c (cmd_preset_passphrase): Send the INQUIRE_MAXLEN
 +	status message before inquiring the passphrase.
 +
 +2012-02-01  David Shaw  <dshaw at jabberwocky.com>
 +
 +	Honor --cert-digest-algo when recreating a cert.
 +	* g10/sign.c (update_keysig_packet): Honor --cert-digest-algo when
 +	  recreating a cert.
 +
 +	This is used by various things in --edit-key like setpref, primary,
 +	etc.  Suggested by Christian Aistleitner.
 +
 +2012-01-27  Werner Koch  <wk at gnupg.org>
 +
 +	gl: Add support for Android to stdint.h replacement.
 +	* gl/stdint_.h: When included from Bionic <sys/types.h>, just include
 +	the system's <stdint.h>.
 +
 +	gpg-connect-tool: Take the string "true" as a true condition.
 +	* tools/gpg-connect-agent.c (main): Handle strings "true" and "yes" in
 +	conditions as expected.
 +
 +2012-01-26  Ben Kibbey  <bjk at luxsci.net>
 +
 +	Return GPG_ERR_CARD_NOT_PRESENT when pinentry-mode=loopback.
 +	Since there isn't a way to prompt the user to insert the smartcard when
 +	pinentry-mode=loopback, return GPG_ERR_CARD_NOT_PRESENT instead of
 +	GPG_ERR_NO_PIN_ENTRY.
 +
 +	* agent/divert-scd.c (ask_for_card): Return GPG_ERR_CARD_NOT_PRESENT
 +	when pinentry-mode=loopback.
 +
 +	Also check for GPG_ERR_ASS_CANCELED during an inquire.
 +	Fix pinentry-mode=loopback when cancelling an inquire from scdaemon.
 +	This is similar to commit 4f21f8d but for both protocol command
 +	cancellation and pinentry cancellation.
 +
 +	* agent/call-scd.c (agent_card_pkdecrypt): Check for
 +	GPG_ERR_ASS_CANCELED.
 +	(agent_card_pksign): Ditto.
 +
 +2012-01-25  Werner Koch  <wk at gnupg.org>
 +
 +	nPth is now a hard requirement for GnuPG.
 +	* configure.ac: Remove cruft to allow building without npth.
 +
 +	Require libassuan 2.1.0.
 +	* configure.ac (NEED_LIBASSUAN_VERSION): Set to 2.1.0.  This is due to
 +	the npth changes.
 +
 +	Fix strerror vs. gpg_strerror usage.
 +	This bug was introduced by the migration to npth.
 +	* agent/gpg-agent.c (handle_connections): Use strerror.
 +
 +	Add missing variable.
 +	* agent/gpg-agent.c (handle_connections) [!W32]: Add missing variable.
 +
 +2012-01-25  Marcus Brinkmann  <marcus.brinkmann at ruhr-uni-bochum.de>
 +
 +	Port LDAP wrapper to NPTH.
 +	* agent/gpg-agent.c (handle_connections): Handle error.
 +	* dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c: Port to NPTH.
 +
 +	Port Windows code to NPTH.
 +	* agent/gpg-agent.c (get_agent_ssh_socket_name): Use
 +	INVALID_HANDLE_VALUE instead of 0.
 +	(handle_signal) [!HAVE_W32_SYSTEM]: Don't define.
 +	(handle_connections): Port Windows code to NPTH.
 +	* dirmngr/dirmngr.c (handle_connections): Port Windows code to NPTH.
 +	* g13/g13.c (handle_connections): Port Windows code to NPTH.
 +	* scd/scdaemon.c (handle_connections): Port Windows code to NPTH.
 +
 +	Port to npth.
 +	* configure.ac: Don't check for PTH but for NPTH.
 +	(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
 +	(have_pth): Rename to ...
 +	(have_npth): ... this.
 +	(USE_GNU_NPTH): Rename to ...
 +	(USE_GNU_PTH): ... this.
 +	* m4/npth.m4: New file.
 +	* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
 +	agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
 +	agent/trustlist.c, common/Makefile.am, common/estream.c,
 +	common/exechelp-posix.c, common/exechelp-w32.c,
 +	common/exechelp-w32ce.c, common/http.c, common/init.c,
 +	common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
 +	dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
 +	dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
 +	g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
 +	scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
 +	scd/scdaemon.c, tools/Makefile.am: Port to npth.
 +
 +2012-01-25  Werner Koch  <wk at gnupg.org>
 +
 +	Require gitlog-to-changelog to be installed.
 +	* Makefile.am (GITLOG_TO_CHANGELOG): New.
 +	(gen-ChangeLog): Use installed version of gitlog-to-changelog.
 +
 +2012-01-20  David Shaw  <dshaw at jabberwocky.com>
 +
 +	Changes to --min-cert-level should cause a trustdb rebuild (issue 1366)
 +	* g10/gpgv.c, g10/trustdb.c (read_trust_options): Add min_cert_level
 +
 +	* g10/trustdb.c (check_trustdb_stale): Request a rebuild if
 +	  pending_check_trustdb is true (set when we detect a trustdb
 +	  parameter has changed).
 +
 +	* g10/keylist.c (public_key_list): Use 'l' in the "tru" with-colons
 +	  listing for min_cert_level not matching.
 +
 +	* g10/tdbio.c (tdbio_update_version_record, create_version_record,
 +	  tdbio_db_matches_options, tdbio_dump_record, tdbio_read_record,
 +	  tdbio_write_record): Add a byte for min_cert_level in the tdbio
 +	  version record.
 +
 +2012-01-20  Werner Koch  <wk at gnupg.org>
 +
 +	estream: Fix unclean usage of realloc.
 +	* common/estream-printf.c (_ESTREAM_PRINTF_MALLOC): Remove.
 +	(_ESTREAM_PRINTF_FREE): Remove.
 +	(_ESTREAM_PRINTF_REALLOC): New.
 +	(fixed_realloc) [!_ESTREAM_PRINTF_REALLOC]): New.
 +	(estream_vasprintf): Use my_printf_realloc instead of my_printf_malloc
 +	and my_printf_free.
 +	(dynamic_buffer_out): Use my_printf_realloc instead of realloc.
 +
 +	Do not copy default merge commit log entries into the ChangeLog.
 +	* scripts/gitlog-to-changelog: Skip merge commits.
 +
 +2012-01-18  Ben Kibbey  <bjk at luxsci.net>
 +
 +	Add the INQUIRE_MAXLEN status message.
 +	This status message is used to inform the client of the maximum length
 +	of an inquired passphrase and is used in pinentry-mode=loopback.
 +
 +	* agent/command.c (pinentry_loopback): Send the INQUIRE_MAXLEN status
 +	message before doing the inquire.
 +
 +2012-01-16  Jim Meyering  <meyering at redhat.com>
 +
 +	yat2m: don't dereference pointer to freed memory.
 +	* doc/yat2m.c (top_parse_file): Correct macrolist-freeing loop.
 +
 +	gpg-agent: fix lc-messages handling not to change Xauthority setting.
 +	* agent/gpg-agent.c (main): Supply omitted "break" statement for
 +	lc-messages option.  Otherwise, control would fall through to the
 +	following oXauthority case and use the same value there.
 +
 +2012-01-15  Werner Koch  <wk at gnupg.org>
 +
 +	Fix indentation.
 +
 +2012-01-14  Ben Kibbey  <bjk at luxsci.net>
 +
 +	Fix scdaemon pinentry inquire cancelation.
 +	Similar to commit 29af488 but also fixes PKDECRYPT and PKSIGN.
 +
 +	* agent/call-scd.c (agent_card_pkdecrypt): Check for GPG_ERR_CANCELED
 +	when returning from the PKDECRYPT operation of scdaemon and cancel the
 +	inquire.
 +	(agent_card_pksign): Ditto.
 +	(cancel_inquire): New.
 +
 +2012-01-11  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix segv with RSA_S keys.
 +	* g10/misc.c (pubkey_get_npkey, pubkey_get_nskey)
 +	(pubkey_get_nsig, pubkey_get_nenc): Map all RSA algo ids to
 +	GCRY_PK_RSA.
 +
 +	estream: Avoid printing leading zeroes by %p on 32 bit systems.
 +	* common/estream-printf.c (pr_pointer): Synchronize definition of
 +	AULONG with its use.
 +
 +2012-01-11  David Shaw  <dshaw at jabberwocky.com>
 +
 +	Refresh sample keys.
 +
 +2012-01-10  David Shaw  <dshaw at jabberwocky.com>
 +
 +	Adapt HKP fix for fingerprint/long keyid retrievals for dirmngr.
 +	* dirmngr/ks-engine-hkp.c (ks_hkp_get): Use the longest valid keyid form
 +
 +2012-01-06  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Make the double space in the middle of a fingerprint optional.
 +	This change might help to c+p a fingerprint from an HTML page without
 +	being enclosed in a "pre" tag.
 +	* common/userids.c (classify_user_id): Skip a second blank in the
 +	middle of a fingerprint.
 +
 +	gpg: Allow use of a standard space separated fingerprint.
 +	* common/userids.c (classify_user_id): Check for space separated GPG
 +	fingerprint.
 +
 +2012-01-06  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	Merge ccid_driver_improvement branch.
 +	* scd/apdu.c (ccid_keypad_operation): Rename from ccid_keypad_verify.
 +	(open_ccid_reader): Use ccid_keypad_operation for verify and modify.
 +
 +	* scd/ccid-driver.c (VENDOR_VASCO, VASCO_920): New.
 +	(ccid_transceive_apdu_level): Permit sending packet where
 +	apdulen <= 289.  Support receiving packets in a chain.
 +	(ccid_transceive_secure): Maximum is 15 for VASCO DIGIPASS 920.
 +	Support keypad_modify method such as CHANGE_REFERENCE_DATA: 0x24.
 +
 +2012-01-03  Marcus Brinkmann  <marcus.brinkmann at ruhr-uni-bochum.de>
 +
 +	Silence gcc warning.
 +	* sm/call-dirmngr.c (get_cached_cert): Make sure buflen is initialized.
 +
 +	Revert last change, add comment about link() return values.
 +	* common/dotlock.c (use_hardlinks_p, dotlock_take_unix): Do not check
 +	return value of link().
 +
 +	Fix compiler warnings.
 +	* common/dotlock.c (use_hardlinks_p, dotlock_take_unix): Check return
 +	value of link().
 +	* g13/g13.c: Make sure err is initialized.
 +	* scd/scdaemon.c (main) [!USE_GCRY_THREAD_CBS]: Do not define ERR.
 +
 +	Fix last change: Only set gcrypt thread callback for older versions.
 +	* dirmngr/dirmngr.c, g13/g13.c: Rename FIX_GCRY_PTH_INIT to
 +	USE_GCRY_THREAD_CBS.
 +
 +2012-01-03  Werner Koch  <wk at gnupg.org>
 +
 +	Terminate csh commands with a semicolon also for dirmngr.
 +	* dirmngr/dirmngr.c (main): Terminate csh style output with a semicolon.
 +
 +	Terminate csh commands with a semicolon.
 +	Fixes bug#1386.
 +
 +	* agent/gpg-agent.c (main): Terminate csh style output with a semicolon.
 +	* scd/scdaemon.c: Ditto.
 +
 +2012-01-02  Marcus Brinkmann  <marcus.brinkmann at ruhr-uni-bochum.de>
 +
 +	Only set gcrypt thread callback for older version of gcrypt.
 +	* agent/gpg-agent.c, dirmngr/dirmngr.c, g13/g13.c, scd/scdaemon.c
 +	(USE_GCRY_THREAD_CBS): New macro, defined if
 +	GCRY_THREAD_OPTION_VERSION is 0.
 +	(fixed_gcry_pth_init) [!USE_GCRY_THREAD_CBS]: Don't define.
 +	(main) [!USE_GCRY_THREAD_CBS]: Do not install thread callbacks.
 +
 +2011-12-28  David Shaw  <dshaw at jabberwocky.com>
 +
 +	Use the longest key ID available when talking to a HKP server.
 +	This is issue 1340.  Now that PKSD is dead, and SKS supports long key
 +	IDs, this is safe to do.  Patch from Daniel Kahn Gillmor
 +	<dkg at fifthhorseman.net>.
 +
 +2011-12-20  Werner Koch  <wk at gnupg.org>
 +
 +	Post-release version number update.
 +
 +	Release 2.1.0beta3.
 +
 +	Prepare for the beta3 release.
 +
 +	po: Update the German translation.
 +
 +	Add the STEED Self-Signing Nonthority certificate.
 +	* doc/com-certs.pem: Install it when creating a keybox.
 +
 +	faq: Add section on US export restrictions.
 +
 +	Require Libassuan 2.0.3.
 +	* configure.ac: Require Libassuan 2.0.3.
 +	* agent/call-scd.c (ASSUAN_CONVEY_COMMENTS): Remove macro replacement.
 +	* agent/command.c (cmd_killagent) [ASSUAN_FORCE_CLOSE]: Remove
 +	dependency.
 +	(cmd_killagent) [ASSUAN_FORCE_CLOSE]: Ditto.
 +	* scd/command.c (cmd_killscd) [ASSUAN_FORCE_CLOSE]: Ditto.
 +
 +2011-12-20  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	Add error log and debug log for pcsc_keypad_verify and pcsc_keypad_modify.
 +	* scd/apdu.c (pcsc_keypad_verify): Add debug log and error log.
 +	(pcsc_keypad_modify): Likewise.
 +
 +2011-12-19  Werner Koch  <wk at gnupg.org>
 +	    Ben Kibbey  <bjk at luxsci.net>
 +
 +	scd: Fix for card change returning GPG_ERR_CARD_RESET.
 +	* scd/apdu.c (apdu_connect): Do not test for zero atrlen.
 +
 +2011-12-16  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	Don't kill pinentry by SIGKILL but let it quit by SIGINT.
 +	* agent/call-pinentry.c (agent_popup_message_stop): To pinentry, send
 +	SIGINT (was: SIGKILL).
 +
 +2011-12-15  David Shaw  <dshaw at jabberwocky.com>
 +
 +	Merge fix for issue 1331 from 1.4.
 +	* photoid.c (generate_photo_id): Check for the JPEG magic numbers
 +	instead of JFIF since some programs generate an EXIF header first.
 +
 +2011-12-15  Werner Koch  <wk at gnupg.org>
 +
 +	scd: Prefer application Geldkarte over DINSIG.
 +	* scd/app.c (select_application): Reorder application tests.
 +
 +	scd: Add option --dump-atr to command APDU.
 +	* scd/atr.c: Rewrite.
 +	* scd/Makefile.am (scdaemon_SOURCES): Add atr.c and atr.h.
 +	* scd/command.c (cmd_apdu): Add option --dump-atr.
 +
 +	estream: New function es_fclose_snatch.
 +	* common/estream.c (cookie_ioctl_function_t): New type.
 +	(es_fclose_snatch): New function.
 +	(COOKIE_IOCTL_SNATCH_BUFFER): New constant.
 +	(struct estream_internal): Add field FUNC_IOCTL.
 +	(es_initialize): Clear FUNC_IOCTL.
 +	(es_func_mem_ioctl): New function.
 +	(es_fopenmem, es_fopenmem_init): Init FUNC_IOCTL.
 +
 +2011-12-14  Werner Koch  <wk at gnupg.org>
 +
 +	scd: Skip S/N reading for the "undefined" application.
 +	* scd/app.c (select_application): Skip serial number reading.
 +
 +	scd: Add more status word values for documentation.
 +
 +	scd: Add the "undefined" stub application.
 +	* scd/app.c (select_application): Implement the "undefined"
 +	application.
 +
 +	agent: Pass comment lines from scd verbatim thru gpg-agent.
 +	* agent/call-scd.c (pass_status_thru): Pass comment lines verbatim.
 +	* tools/gpg-connect-agent.c (help_cmd_p): New.
 +	(main): Treat an "SCD HELP" the same as "HELP".
 +
 +	scd: Fix resetting and closing of the reader.
 +	* scd/command.c (update_card_removed): Do no act on an invalid VRDR.
 +	(do_reset): Ignore apdu_reset error codes for no and inactive card.
 +	Close the reader before setting the slot to -1.
 +	(update_reader_status_file): Notify the application before closing the
 +	reader.
 +
 +	scd: Add debug option for reader function calls.
 +	* scd/scdaemon.h (DBG_READER_VALUE, DBG_READER): New.
 +	* scd/apdu.c (apdu_open_reader, apdu_close_reader)
 +	(apdu_shutdown_reader, apdu_connect, apdu_disconnect)
 +	(apdu_reset, apdu_get_atr, apdu_get_status): Add debug code.
 +	(apdu_activate): Remove this unused function.
 +
 +2011-12-13  Werner Koch  <wk at gnupg.org>
 +
 +	scd: New option --debug-assuan-log-cats.
 +	* scd/scdaemon.c (oDebugAssuanLogCats): New.
 +	(opts): Add option --debug-assuan-log-cats.
 +	(main): Implement option.
 +	* common/asshelp.c (set_libassuan_log_cats): New.
 +
 +	scd: Introduce a virtual reader table.
 +	The vreader table makes the code more clear by explicitly talking
 +	about APDU slots and reader indices.  It also accommodates for future
 +	extensions.
 +
 +	* scd/scdaemon.h (server_control_s): Remove READER_SLOT.
 +	* scd/scdaemon.c (scd_init_default_ctrl): Do not init READER_SLOT.
 +	* scd/app.c (check_application_conflict): Add arg SLOT.
 +	* scd/command.c (slot_status_s): Rename to vreader_s.
 +	(server_local_s): Add field VREADER_IDX as replacement for
 +	the READER_SLOT in server_control_s.  Change all users.
 +	(slot_table): Rename to vreader_table.  Change all users.
 +	(vreader_slot): New.
 +	(do_reset, cmd_apdu): Map vreader to apdu slot.
 +	(get_reader_slot): Rename to get_current_reader.  Return -1 on error.
 +	(open_card): Map vreader toapdu slot.  Pass slot to
 +	check_application_conflict.
 +	(scd_command_handler): Init VREADER_IDX.
 +	(update_reader_status_file): Reset SLOT field on error.
 +
 +2011-12-12  Werner Koch  <wk at gnupg.org>
 +
 +	scd: Retry command SERIALNO for an inactive card.
 +	* scd/command.c (cmd_serialno): Retry once for an inactive card.
 +
 +	Fix detection of card removal and insertion.
 +	* scd/apdu.c (apdu_connect): Return status codes for no card available
 +	and inactive card.
 +	* scd/command.c (TEST_CARD_REMOVAL): Also test for GPG_ERR_CARD_RESET.
 +	(open_card): Map apdu_connect status to GPG_ERR_CARD_RESET.
 +
 +	gitlog-to-changelog: New option --tear-off.
 +	* scripts/gitlog-to-changelog: Add option --tear-off.
 +	* Makefile.am (gen-ChangeLog): Use that option.
 +
 +2011-12-07  Werner Koch  <wk at gnupg.org>
 +
 +	gpgsm: Add new validation model "steed".
 +	* sm/gpgsm.h (VALIDATE_FLAG_STEED): New.
 +	* sm/gpgsm.c (gpgsm_parse_validation_model): Add model "steed".
 +	* sm/server.c (option_handler): Allow validation model "steed".
 +	* sm/certlist.c (gpgsm_cert_has_well_known_private_key): New.
 +	* sm/certchain.c (do_validate_chain): Handle the
 +	well-known-private-key attribute.  Support the "steed" model.
 +	(gpgsm_validate_chain): Ditto.
 +	* sm/verify.c (gpgsm_verify): Return "steed" in the trust status line.
 +	* sm/keylist.c (list_cert_colon): Print the new 'w' flag.
 +
 +	Correct punctuation in the ChangeLog summary line.
 +	* Makefile.am (gen-ChangeLog): Supply --append-dot.
 +
 +	Allow comments which will not show up in the ChangeLog.
 +	* scripts/gitlog-to-changelog: Ignore lines after a "--" line.
 +
 +2011-12-06  Werner Koch  <wk at gnupg.org>
 +
 +	gpgsm: Allow specification of an AuthorityKeyIdentifier.
 +	* sm/certreqgen.c (pAUTHKEYID): New.
 +	(read_parameters): Add keyword Authority-Key-Id.
 +	(proc_parameters): Check its value.
 +	(create_request): Insert an Authority-Key-Id.
 +
 +	gpgsm: Allow arbitrary extensions for cert creation.
 +	* sm/certreqgen.c (pSUBJKEYID, pEXTENSION): New.
 +	(read_parameters): Add new keywords.
 +	(proc_parameters): Check values of new keywords.
 +	(create_request): Add SubjectKeyId and extensions.
 +	(parse_parameter_usage): Support "cert" and the encrypt alias "encr".
 +
 +	gpgsm: Fix storing of the serial number.
 +	* sm/certreqgen.c (create_request): Fix hex-bin conversion.
 +
 +2011-12-05  Werner Koch  <wk at gnupg.org>
 +
 +	Fix last change.
 +	* agent/command.c (start_command_handler): Remove use of removed var.
 +
 +	Amend the agent code with more comments.
 +	* agent/command.c (server_local_s): Remove unused field MESSAGE_FD.
 +
 +2011-12-02  Werner Koch  <wk at gnupg.org>
 +
 +	Support the Cherry ST-2000 card reader.
 +	* scd/ccid-driver.c (SCM_SCR331, SCM_SCR331DI, SCM_SCR335)
 +	(SCM_SCR3320, SCM_SPR532, CHERRY_ST2000): New constants.
 +	(parse_ccid_descriptor): Use them.
 +	(scan_or_find_usb_device, ccid_transceive_secure): Handle Cherry
 +	ST-2000.  Suggested by Matthias-Christian Ott.
 +
 +	Avoid possible double free in export.c.
 +	* g10/export.c (transfer_format_to_openpgp): Avoid possible double
 +	  free of LIST.  Reported by NIIBE Yutaka.
 +
 +2011-12-02  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	Fix pinpad input support for passphrase modification.
 +	* apdu.c (pcsc_keypad_verify): Have dummy Lc field with value 0.
 +	(pcsc_keypad_modify): Likewise.
 +	(pcsc_keypad_modify): It's only for ISO7816_CHANGE_REFERENCE_DATA.
 +	bConfirmPIN value is determined by the parameter p0.
 +
 +	* app-openpgp.c (do_change_pin): The flag use_keypad should be 0 when
 +	reset_mode is on, or resetcode is on.  use_keypad only makes sense for
 +	iso7816_change_reference_data_kp.
 +
 +	* iso7816.h (iso7816_put_data_kp): Remove.
 +	(iso7816_reset_retry_counter_kp): Remove.
 +	(iso7816_reset_retry_counter_with_rc_kp): Remove.
 +	(iso7816_change_reference_data_kp): Add an argument: IS_EXCHANGE.
 +
 +	* iso7816.c (iso7816_put_data_kp): Remove.
 +	(iso7816_reset_retry_counter_kp): Remove.
 +	(iso7816_reset_retry_counter_with_rc_kp): Remove.
 +	(iso7816_change_reference_data_kp): Add an argument: IS_EXCHANGE.
 +
 +2011-12-01  Werner Koch  <wk at gnupg.org>
 +
 +	Add hook to check the commit log syntax.
 +	* autogen.sh: Install commit-msg hook for git.
 +
 +	Generate the ChangeLog from commit logs.
 +	* scripts/gitlog-to-changelog: New script.  Taken from gnulib.
 +	* scripts/git-log-fix: New file.
 +	* scripts/git-log-footer: New file.
 +	* doc/HACKING: Describe the ChangeLog policy
 +	* ChangeLog: New file.
 +	* Makefile.am (EXTRA_DIST): Add new files.
 +	(gen-ChangeLog): New.
 +	(dist-hook): Run gen-ChangeLog.
 +
 +	Rename all ChangeLog files to ChangeLog-2011.
 +
 +2011-12-01  Werner Koch  <wk at gnupg.org>
 +
 +	NB: Changes done before December 1st, 2011 are described in
 +	per directory files named ChangeLog-2011.  See doc/HACKING for
 +	details.
 +
 +        -----
 +	Copyright (C) 2011 Free Software Foundation, Inc.
 +
 +	Copying and distribution of this file and/or the original GIT
 +	commit log messages, with or without modification, are
 +	permitted provided the copyright notice and this notice are
 +	preserved.
diff --cc VERSION
index 291d0de,0000000..2f1a5aa
mode 100644,000000..100644
--- a/VERSION
+++ b/VERSION
@@@ -1,1 -1,0 +1,1 @@@
- 2.1.16
++2.1.17
diff --cc doc/defsincdate
index e548e39,0000000..aba2d9a
mode 100644,000000..100644
--- a/doc/defsincdate
+++ b/doc/defsincdate
@@@ -1,1 -1,0 +1,1 @@@
- 1479392975
++1482224038
diff --cc po/ca.po
index b5c757a,56c6d97..6d5b7a9
--- a/po/ca.po
+++ b/po/ca.po
@@@ -27,7 -27,6 +27,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg 1.4.0\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-11-18 16:54+0100\n"
++"POT-Creation-Date: 2016-12-20 11:28+0100\n"
  "PO-Revision-Date: 2005-02-04 02:04+0100\n"
  "Last-Translator: Jordi Mallach <jordi at gnu.org>\n"
  "Language-Team: Catalan <ca at dodds.net>\n"
@@@ -177,25 -148,11 +177,25 @@@ msgstr "la contrasenya és errònia
  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:838 common/dotlock.c:839 g10/card-util.c:839
- #: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1306 g10/keygen.c:4577
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
++#: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't create '%s': %s\n"
  msgstr "no s'ha pogut crear «%s»: %s\n"
  
 +#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
- #: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1307
++#: g10/import.c:305 g10/import.c:448 g10/import.c:621 g10/keygen.c:3681
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
- #: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
- #: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:825 g10/sign.c:1025
++#: g10/sign.c:1130 g10/sign.c:1275 g10/tdbdump.c:143 g10/tdbdump.c:151
++#: g10/tdbio.c:720 g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161
++#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
++#: dirmngr/certcache.c:368 dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1564
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
@@@ -260,11 -206,9 +260,11 @@@ msgstr "Introduïu la contrasenya; aque
  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:92 g10/call-agent.c:1100
++#: agent/divert-scd.c:92 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1101
++#: agent/divert-scd.c:93 g10/call-agent.c:1102
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  
@@@ -408,49 -326,34 +408,49 @@@ msgstr "
  "Opcions:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
  #, 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:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:170 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "detall"
  
 +#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "una mica més silenciós"
  
- #: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
  msgid "csh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
- #: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
++#: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
  #, fuzzy
  msgid "|FILE|read options from FILE"
  msgstr "|FITXER|carrega el mòdul d'extensió especificat"
  
- #: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:177
  msgid "do not detach from the console"
  msgstr ""
  
@@@ -541,162 -427,120 +541,162 @@@ msgstr "no és suportat
  #. 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:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:481 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1025 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:358
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:124 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  #, fuzzy
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr "Si us plau, informeu sobre els errors a <gnupg-bugs at gnu.org>.\n"
  
- #: agent/gpg-agent.c:491
++#: agent/gpg-agent.c:490
  #, 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:493
++#: agent/gpg-agent.c:492
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:537 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:442
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:793
++#: agent/gpg-agent.c:1082 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:812
  #, 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"
  
- #: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
- #: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1093 agent/gpg-agent.c:1935 g10/gpg.c:2510
++#: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:817
++#: dirmngr/dirmngr.c:1670 tools/symcryptrun.c:932
  #, fuzzy, c-format
  #| msgid "option file `%s': %s\n"
  msgid "option file '%s': %s\n"
  msgstr "fitxer d'opcions «%s»: %s\n"
  
- #: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:806
++#: agent/gpg-agent.c:1101 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:825
  #, 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:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
- #: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
++#: agent/gpg-agent.c:1223 g10/gpg.c:3643 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:936 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:527
  #, 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:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
++#: agent/gpg-agent.c:2080 scd/scdaemon.c:1073 dirmngr/dirmngr.c:1081
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
  msgstr "no s'ha pogut crear «%s»: %s\n"
  
- #: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
++#: agent/gpg-agent.c:2097 scd/scdaemon.c:1086 dirmngr/dirmngr.c:1094
  #, fuzzy, c-format
  msgid "socket name '%s' is too long\n"
  msgstr "Certificat de revocació vàlid"
  
- #: agent/gpg-agent.c:2134
++#: agent/gpg-agent.c:2135
  #, fuzzy
  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:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
++#: agent/gpg-agent.c:2145 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1126
  #, fuzzy
  msgid "error getting nonce for the socket\n"
  msgstr "error en crear «%s»: %s\n"
  
- #: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
++#: agent/gpg-agent.c:2150 scd/scdaemon.c:1113 dirmngr/dirmngr.c:1129
  #, fuzzy, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "error mentre s'enviava a «%s»: %s\n"
  
- #: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
- #: dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2160 agent/gpg-agent.c:2197 scd/scdaemon.c:1121
++#: dirmngr/dirmngr.c:1138
  #, 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:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:2165 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1143
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
  msgstr "ha fallat l'actualització: %s\n"
  
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
++#: agent/gpg-agent.c:2172 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1149
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
  msgstr "s'està escrivint la clau secreta a «%s»\n"
  
- #: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: agent/gpg-agent.c:2191 agent/gpg-agent.c:2234 g10/exec.c:199
 +#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, 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:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: agent/gpg-agent.c:2194 agent/gpg-agent.c:2239 g10/openfile.c:491
 +#: g10/openfile.c:520 sm/keydb.c:103
  #, fuzzy, c-format
  msgid "directory '%s' created\n"
  msgstr "%s: s'ha creat el directori\n"
  
- #: agent/gpg-agent.c:2244
++#: agent/gpg-agent.c:2245
  #, 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:2248
++#: agent/gpg-agent.c:2249
  #, 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:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
++#: agent/gpg-agent.c:2392 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1871
  #, 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:2598
++#: agent/gpg-agent.c:2599
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2603
++#: agent/gpg-agent.c:2604
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2678
++#: agent/gpg-agent.c:2679
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2683
++#: agent/gpg-agent.c:2684
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
++#: agent/gpg-agent.c:2881 scd/scdaemon.c:1272 dirmngr/dirmngr.c:2075
  #, 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:2942 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2954 scd/scdaemon.c:1321
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
  msgstr "\t%lu claus es descarta\n"
  
- #: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
++#: agent/gpg-agent.c:3092 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  #, fuzzy
  msgid "no gpg-agent running in this session\n"
  msgstr "gpg-agent no està disponible en aquesta sessió\n"
@@@ -712,8 -554,6 +712,8 @@@ msgid "
  "Password cache maintenance\n"
  msgstr ""
  
- #: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
++#: agent/protect-tool.c:106 g10/gpg.c:424 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:153 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -721,9 -561,6 +721,9 @@@ msgstr "
  "@Ordres:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
- #: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:92 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:168 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -777,8 -606,6 +777,8 @@@ 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:362 dirmngr/dirmngr.c:1469
- #: tools/gpgconf.c:323
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1472
++#: tools/gpgconf.c:328
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
  msgstr "error en la lectura de «%s»: %s\n"
@@@ -950,9 -748,6 +950,9 @@@ msgstr "l'algoritme de protecció %d%s 
  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:438
 +#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
- #: dirmngr/ldap-wrapper.c:710
++#: dirmngr/ldap-wrapper.c:711
  #, fuzzy, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "error en la creació de la contrasenya: %s\n"
@@@ -964,8 -756,6 +964,8 @@@
  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:848 dirmngr/dirmngr.c:1155
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1167
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
  msgstr "error en la lectura de «%s»: %s\n"
@@@ -1013,28 -794,23 +1013,28 @@@ msgid "problem setting the gpg-agent op
  msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
  
  # bolcats de memòria?  ivb
- #: common/sysutils.c:144
++#: common/sysutils.c:148
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "no s'han pogut desactivar els bolcats de memòria: %s\n"
  
  # Indi. ivb
- #: common/sysutils.c:239
++#: common/sysutils.c:250
  #, fuzzy, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
  
- #: common/sysutils.c:271
++#: common/sysutils.c:282
  #, fuzzy, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
  
- #: common/sysutils.c:659
++#: common/sysutils.c:693
  #, fuzzy, c-format
  msgid "waiting for file '%s' to become accessible ...\n"
  msgstr "ha fallat l'actualització: %s\n"
  
- #: common/sysutils.c:685
++#: common/sysutils.c:719
  #, fuzzy, c-format
  msgid "renaming '%s' to '%s' failed: %s\n"
  msgstr "no s'ha pogut crear l'armadura: %s\n"
@@@ -1111,7 -872,6 +1111,7 @@@ msgstr "
  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:554
++#: common/miscellaneous.c:556
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
@@@ -1237,8 -974,6 +1237,8 @@@ msgstr "armadura: %s\n
  # 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
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3098
++#: scd/app-openpgp.c:3111
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
@@@ -1462,7 -1155,6 +1462,7 @@@ msgstr "
  # Probablement és una clau, femení. jm
  # Werner FIXME: please add translator comment saying *what* is
  # uncompressed so we know the gender. jm
- #: common/argparse.c:401 dirmngr/dirmngr.c:1173
++#: common/argparse.c:401 dirmngr/dirmngr.c:1185
  #, fuzzy
  msgid "out of core\n"
  msgstr "no forçat"
@@@ -1521,8 -1202,6 +1521,8 @@@ msgstr "no s'ha trobat la clau públic
  msgid "waiting for lock %s...\n"
  msgstr "s'està escrivint la clau secreta a «%s»\n"
  
- #: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
- #: dirmngr/dirmngr.c:715
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:725
++#: dirmngr/dirmngr.c:734
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
@@@ -1565,7 -1236,6 +1565,7 @@@ msgstr "armadura inesperada:
  msgid "invalid dash escaped line: "
  msgstr "la línia escapada amb guió és invàlida: "
  
- #: g10/armor.c:873 g10/armor.c:1490
++#: g10/armor.c:873 g10/armor.c:1493
  #, fuzzy, c-format
  msgid "invalid radix64 character %02X skipped\n"
  msgstr "el caràcter radix64 %02x invàlid s'ha omés\n"
@@@ -1582,7 -1249,6 +1582,7 @@@ msgstr "fi de fitxer prematur (en CRC)\
  msgid "malformed CRC\n"
  msgstr "CRC malformat\n"
  
- #: g10/armor.c:962 g10/armor.c:1527
++#: g10/armor.c:962 g10/armor.c:1530
  #, fuzzy, c-format
  msgid "CRC error; %06lX - %06lX\n"
  msgstr "error de CRC; %06lx - %06lx\n"
@@@ -1596,16 -1260,13 +1596,16 @@@ msgstr "fí de fitxer prematur (al fina
  msgid "error in trailer line\n"
  msgstr "error en l'última línia\n"
  
- #: g10/armor.c:1303
++#: g10/armor.c:1306
  msgid "no valid OpenPGP data found.\n"
  msgstr "no s'han trobat dades OpenPGP vàlides.\n"
  
- #: g10/armor.c:1308
++#: g10/armor.c:1311
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
  msgstr "l'armadura és invàlida: la línia és més llarga que %d caràcters\n"
  
- #: g10/armor.c:1312
++#: g10/armor.c:1315
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr ""
@@@ -1698,8 -1344,6 +1698,8 @@@ msgstr "
  
  # Destès? ivb
  # Desatès, sí. jm
- #: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
- #: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2030
++#: g10/keygen.c:4087 g10/revoke.c:215 g10/revoke.c:618
  #, fuzzy
  msgid "can't do this in batch mode\n"
  msgstr "no es pot fet això en mode desatès\n"
@@@ -1710,15 -1353,10 +1710,15 @@@ msgid "This command is only available f
  msgstr "Aquesta ordre no està permesa mentre s'està en mode %s.\n"
  
  # Parts?  Peces?  ivb
- #: g10/card-util.c:109 scd/app-openpgp.c:2454
++#: g10/card-util.c:109 scd/app-openpgp.c:2467
  #, fuzzy
  msgid "Reset Code not or not anymore available\n"
  msgstr "parts de la clau secreta no estan disponbles\n"
  
 +#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
- #: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
- #: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1768
++#: g10/keygen.c:1945 g10/keygen.c:2313 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "La vostra selecció? "
  
@@@ -1785,10 -1409,6 +1785,10 @@@ msgstr "no hi ha cap clau pública corr
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
- #: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:334
++#: g10/import.c:592 g10/import.c:640 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
++#: dirmngr/dirmngr.c:1510 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
@@@ -1862,7 -1467,6 +1862,7 @@@ msgstr "La generació de claus ha falla
  msgid "not an OpenPGP card"
  msgstr "no s'han trobat dades OpenPGP vàlides.\n"
  
- #: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
++#: g10/card-util.c:1173 g10/keygen.c:4106 g10/keygen.c:5092
  #, 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"
@@@ -1893,13 -1492,10 +1893,13 @@@ msgstr "Quina grandària voleu? (1024) 
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "Quina grandària voleu? (1024) "
  
- #: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
++#: g10/card-util.c:1316 g10/keygen.c:2122 g10/keygen.c:2154
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "arrodonida fins a %u bits\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2207 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr ""
@@@ -1953,9 -1539,6 +1953,9 @@@ msgstr "   (%d) RSA (només xifrar)\n
  msgid "   (3) Authentication key\n"
  msgstr ""
  
- #: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
- #: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
- #: g10/keygen.c:2314 g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1508
++#: g10/keygen.c:1794 g10/keygen.c:1822 g10/keygen.c:1952 g10/keygen.c:2060
++#: g10/keygen.c:2336 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "La selecció és invàlida.\n"
  
@@@ -1989,7 -1566,6 +1989,7 @@@ msgstr "Signar realment? 
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1816 g10/keyedit.c:1867
++#: g10/card-util.c:1816 g10/keyedit.c:1868
  msgid "quit this menu"
  msgstr "ix del menú"
  
@@@ -2000,7 -1575,6 +2000,7 @@@ msgstr "les ordres entren en conflicte\
  
  # «pantalla» o «ajuda»?  ivb
  # «ajuda», evidentment. jm
- #: g10/card-util.c:1819 g10/keyedit.c:1870
++#: g10/card-util.c:1819 g10/keyedit.c:1871
  msgid "show this help"
  msgstr "mostra aquesta ajuda"
  
@@@ -2082,31 -1638,21 +2082,31 @@@ msgstr "
  msgid "Admin commands are not allowed\n"
  msgstr ""
  
- #: g10/card-util.c:2127 g10/keyedit.c:2816
++#: g10/card-util.c:2127 g10/keyedit.c:2817
  msgid "Invalid command  (try \"help\")\n"
  msgstr "L'ordre no és vàlida (proveu «help»)\n"
  
- #: g10/decrypt.c:191 g10/encrypt.c:955
++#: g10/decrypt.c:190 g10/encrypt.c:955
  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:4851 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4904 g10/keyring.c:398 g10/keyring.c:771
  #, 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:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
- #: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
- #: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4858 g10/keyedit.c:2051
++#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2163
  #, fuzzy, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "no s'ha trobat la clau «%s»: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
- #: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
- #: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4866 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:645 g10/tofu.c:2171
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
@@@ -2170,7 -1704,6 +2170,7 @@@ msgstr "hi ha una clau secreta per a l
  msgid "use option \"--delete-secret-keys\" to delete it first.\n"
  msgstr "utilitzeu l'opció «--delete-secret-keys» per a eliminar-la primer.\n"
  
- #: g10/encrypt.c:232 g10/sign.c:1292
++#: g10/encrypt.c:232 g10/sign.c:1294
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "error en la creació de la contrasenya: %s\n"
@@@ -2190,7 -1720,6 +2190,7 @@@ msgstr "Ha fallat el procés de signatu
  msgid "'%s' already compressed\n"
  msgstr "«%s» ja està comprimida\n"
  
- #: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:610
  #, fuzzy, c-format
  #| msgid "WARNING: `%s' is an empty file\n"
  msgid "WARNING: '%s' is an empty file\n"
@@@ -2209,7 -1736,6 +2209,7 @@@ msgid "
  msgstr ""
  "forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n"
  
- #: g10/encrypt.c:707 g10/sign.c:984
++#: g10/encrypt.c:707 g10/sign.c:986
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2246,7 -1767,6 +2246,7 @@@ msgstr "xifrat amb l'algoritme %d (desc
  
  # És no-wrap?  ivb
  # Com? jm
- #: g10/decrypt-data.c:164 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:129
  msgid ""
  "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
  msgstr ""
@@@ -2347,8 -1849,6 +2347,8 @@@ msgstr "
  msgid " - skipped"
  msgstr "%s: es descarta: %s\n"
  
- #: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:845 g10/sign.c:1148
++#: g10/export.c:1251 g10/import.c:1543 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:847 g10/sign.c:1150
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
@@@ -2375,8 -1871,6 +2375,8 @@@ msgstr "clau %08lX: clau d'estil PGP 2.
  msgid "WARNING: nothing exported\n"
  msgstr "AVÍS: no s'ha exportat res\n"
  
- #: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
- #: g10/plaintext.c:151 g10/plaintext.c:174
++#: g10/export.c:2283 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/plaintext.c:167 g10/plaintext.c:190
  #, fuzzy, c-format
  #| msgid "error creating `%s': %s\n"
  msgid "error creating '%s': %s\n"
@@@ -2424,8 -1909,6 +2424,8 @@@ msgstr "error en crear «%s»: %s\n
  msgid "No fingerprint"
  msgstr "Empremta digital:"
  
- #: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
- #: g10/revoke.c:701
++#: g10/getkey.c:1873 g10/keyedit.c:2929 g10/keyedit.c:3016 g10/revoke.c:637
++#: g10/revoke.c:702
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
@@@ -2458,220 -1936,176 +2458,226 @@@ 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/gpg.c:424 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:200
  #, fuzzy
  msgid "make a signature"
  msgstr "|[fitxer]|crea una signatura"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:427
  #, fuzzy
  msgid "make a clear text signature"
  msgstr "|[fitxer]|crea una signatura en text clar"
  
- #: g10/gpg.c:426 sm/gpgsm.c:202
++#: g10/gpg.c:429 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "crea una signatura separada"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:430 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "xifra dades"
  
- #: g10/gpg.c:429
++#: g10/gpg.c:432
  msgid "encryption only with symmetric cipher"
  msgstr "xifra només amb xifratge simètric"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:434 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "desxifra dades (predeterminat)"
  
- #: g10/gpg.c:433 sm/gpgsm.c:206
++#: g10/gpg.c:436 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "verifica una signatura"
  
- #: g10/gpg.c:435 sm/gpgsm.c:207
++#: g10/gpg.c:438 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "llista claus"
  
- #: g10/gpg.c:437
++#: g10/gpg.c:440
  msgid "list keys and signatures"
  msgstr "llista claus i signatures"
  
  # «de les claus» o «de la clau»?  ivb
- #: g10/gpg.c:438
++#: g10/gpg.c:443
  #, fuzzy
  msgid "list and check key signatures"
  msgstr "comprova les signatures de la claus"
  
  # «dactilars» o «digitals»?  ivb
- #: g10/gpg.c:439 sm/gpgsm.c:212
++#: g10/gpg.c:445 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "llista claus i empremtes digitals"
  
- #: g10/gpg.c:440 sm/gpgsm.c:210
++#: g10/gpg.c:446 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "llista claus secretes"
  
- #: g10/gpg.c:442 sm/gpgsm.c:213
++#: g10/gpg.c:448 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "genera un nou parell de claus"
  
- #: g10/gpg.c:444
++#: g10/gpg.c:451
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly generate a new key pair"
  msgstr "genera un nou parell de claus"
  
- #: g10/gpg.c:446
++#: g10/gpg.c:454
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly add a new user-id"
  msgstr "genera un nou parell de claus"
  
- #: g10/gpg.c:449
++#: g10/gpg.c:459
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly revoke a user-id"
  msgstr "genera un nou parell de claus"
  
- #: g10/gpg.c:451
++#: g10/gpg.c:462
+ #, fuzzy
+ #| msgid "generate a new key pair"
+ msgid "quickly set a new expiration date"
+ msgstr "genera un nou parell de claus"
+ 
++#: g10/gpg.c:464
  msgid "full featured key pair generation"
  msgstr ""
  
- #: g10/gpg.c:452
++#: g10/gpg.c:467
  msgid "generate a revocation certificate"
  msgstr "genera un certificat de revocació"
  
- #: g10/gpg.c:454 sm/gpgsm.c:215
++#: g10/gpg.c:470 sm/gpgsm.c:216
  msgid "remove keys from the public keyring"
  msgstr "elimina claus de l'anell públic"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:472
  msgid "remove keys from the secret keyring"
  msgstr "elimina claus de l'anell secret"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:474
  #, fuzzy
  #| msgid "sign a key"
  msgid "quickly sign a key"
  msgstr "signa una clau"
  
- #: g10/gpg.c:460
++#: g10/gpg.c:476
  #, fuzzy
  #| msgid "sign a key locally"
  msgid "quickly sign a key locally"
  msgstr "signa una clau localment"
  
- #: g10/gpg.c:461
++#: g10/gpg.c:477
  msgid "sign a key"
  msgstr "signa una clau"
  
- #: g10/gpg.c:462
++#: g10/gpg.c:478
  msgid "sign a key locally"
  msgstr "signa una clau localment"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:479
  msgid "sign or edit a key"
  msgstr "signa o edita una clau"
  
- #: g10/gpg.c:465 sm/gpgsm.c:233
++#: g10/gpg.c:481 sm/gpgsm.c:234
  #, fuzzy
  msgid "change a passphrase"
  msgstr "canvia la contrasenya"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:485
  msgid "export keys"
  msgstr "exporta claus"
  
- #: g10/gpg.c:468
++#: g10/gpg.c:486
  msgid "export keys to a keyserver"
  msgstr "exporta claus a un servidor de claus"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:487
  msgid "import keys from a keyserver"
  msgstr "importa claus d'un servidor de claus"
  
- #: g10/gpg.c:471
++#: g10/gpg.c:490
  msgid "search for keys on a keyserver"
  msgstr "cerca claus en un servidor de claus"
  
- #: g10/gpg.c:473
++#: g10/gpg.c:492
  msgid "update all keys from a keyserver"
  msgstr "actualitza totes les claus des d'un servidor de claus"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:498
  msgid "import/merge keys"
  msgstr "importa/fon claus"
  
- #: g10/gpg.c:482
++#: g10/gpg.c:501
  msgid "print the card status"
  msgstr ""
  
- #: g10/gpg.c:483
++#: g10/gpg.c:502
  msgid "change data on a card"
  msgstr ""
  
- #: g10/gpg.c:484
++#: g10/gpg.c:504
  msgid "change a card's PIN"
  msgstr ""
  
- #: g10/gpg.c:496
++#: g10/gpg.c:516
  msgid "update the trust database"
  msgstr "actualitza la base de dades de confiança"
  
- #: g10/gpg.c:505
++#: g10/gpg.c:525
  #, fuzzy
  msgid "print message digests"
  msgstr "|algo [fitxers]|imprimeix resums de missatges"
  
- #: g10/gpg.c:508 sm/gpgsm.c:228
++#: g10/gpg.c:528 sm/gpgsm.c:229
  msgid "run in server mode"
  msgstr ""
  
- #: g10/gpg.c:510
++#: g10/gpg.c:530
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:514 sm/gpgsm.c:246
++#: g10/gpg.c:534 sm/gpgsm.c:248
  msgid "create ascii armored output"
  msgstr "crea eixida amb armadura ascii"
  
- #: g10/gpg.c:517 sm/gpgsm.c:262
++#: g10/gpg.c:537 sm/gpgsm.c:264
  #, fuzzy
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|NOM|xifra per a NOM"
  
- #: g10/gpg.c:533 sm/gpgsm.c:298
++#: g10/gpg.c:553 sm/gpgsm.c:300
  #, fuzzy
  msgid "|USER-ID|use USER-ID to sign or decrypt"
  msgstr "usa aquest id per a signar o desxifrar"
  
- #: g10/gpg.c:539
++#: g10/gpg.c:559
  #, fuzzy
  msgid "|N|set compress level to N (0 disables)"
  msgstr "|N|nivell de compressió N (0 no comprimeix)"
  
- #: g10/gpg.c:546
++#: g10/gpg.c:566
  msgid "use canonical text mode"
  msgstr "usa el mode de text canònic"
  
- #: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
++#: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
  #, fuzzy
  msgid "|FILE|write output to FILE"
  msgstr "|FITXER|carrega el mòdul d'extensió especificat"
  
- #: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
++#: g10/gpg.c:598 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
  msgid "do not make any changes"
  msgstr "no fa cap canvi"
  
- #: g10/gpg.c:579
++#: g10/gpg.c:599
  msgid "prompt before overwriting"
  msgstr "pregunta abans de sobreescriure"
  
- #: g10/gpg.c:628
++#: g10/gpg.c:648
  msgid "use strict OpenPGP behavior"
  msgstr ""
  
- #: g10/gpg.c:654 sm/gpgsm.c:355
++#: g10/gpg.c:674 sm/gpgsm.c:357
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2682,7 -2116,16 +2688,17 @@@ 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:657 sm/gpgsm.c:358
++#: g10/gpg.c:677
+ #, fuzzy
+ #| msgid ""
+ #| "@\n"
+ #| "Examples:\n"
+ #| "\n"
+ #| " -se -r Bob [file]          sign and encrypt for user Bob\n"
+ #| " --clear-sign [file]         make a clear text signature\n"
+ #| " --detach-sign [file]       make a detached signature\n"
+ #| " --list-keys [names]        show keys\n"
+ #| " --fingerprint [names]      show fingerprints\n"
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2702,13 -2145,11 +2718,13 @@@ msgstr "
  " --list-keys [noms]         mostra claus\n"
  " --fingerprint [noms]       mostra empremtes digitals\n"
  
- #: g10/gpg.c:1026
++#: g10/gpg.c:1047
  #, 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:1029
++#: g10/gpg.c:1050
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg [options] [files]\n"
@@@ -2728,7 -2169,6 +2744,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:1040 sm/gpgsm.c:588
++#: g10/gpg.c:1061 sm/gpgsm.c:580
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2736,613 -2176,435 +2752,550 @@@ msgstr "
  "\n"
  "Algoritmes suportats:\n"
  
- #: g10/gpg.c:1043
++#: g10/gpg.c:1064
  msgid "Pubkey: "
  msgstr "Clau pública: "
  
- #: g10/gpg.c:1050 g10/keyedit.c:3402
++#: g10/gpg.c:1071 g10/keyedit.c:3483
  msgid "Cipher: "
  msgstr "Xifratge: "
  
- #: g10/gpg.c:1057
++#: g10/gpg.c:1078
  msgid "Hash: "
  msgstr "Dispersió: "
  
- #: g10/gpg.c:1064 g10/keyedit.c:3451
++#: g10/gpg.c:1085 g10/keyedit.c:3532
  msgid "Compression: "
  msgstr "Compressió: "
  
- #: g10/gpg.c:1133 sm/gpgsm.c:662
++#: g10/gpg.c:1154 sm/gpgsm.c:654
  #, fuzzy, c-format
  msgid "usage: %s [options] %s\n"
  msgstr "forma d'ús: gpg [opcions] "
  
- #: g10/gpg.c:1321 sm/gpgsm.c:751
++#: g10/gpg.c:1342 sm/gpgsm.c:743
  msgid "conflicting commands\n"
  msgstr "les ordres entren en conflicte\n"
  
- #: g10/gpg.c:1339
++#: g10/gpg.c:1360
  #, 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:1537
++#: g10/gpg.c:1558
  #, 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:1540
++#: g10/gpg.c:1561
  #, 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:1543
++#: g10/gpg.c:1564
  #, 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:1549
++#: g10/gpg.c:1570
  #, 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:1552
++#: g10/gpg.c:1573
  #, 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:1555
++#: g10/gpg.c:1576
  #, 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:1561
++#: g10/gpg.c:1582
  #, 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:1564
++#: g10/gpg.c:1585
  #, 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:1567
++#: g10/gpg.c:1588
  #, 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:1573
++#: g10/gpg.c:1594
  #, 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:1576
++#: g10/gpg.c:1597
  #, 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:1579
++#: g10/gpg.c:1600
  #, 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:1786
++#: g10/gpg.c:1816
  #, fuzzy, c-format
  msgid "unknown configuration item '%s'\n"
  msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1925
  msgid "display photo IDs during key listings"
  msgstr ""
  
- #: g10/gpg.c:1895
++#: g10/gpg.c:1927
  #, fuzzy
  msgid "show key usage information during key listings"
  msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1929
  msgid "show policy URLs during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1931
  #, fuzzy
  msgid "show all notations during signature listings"
  msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1933
  msgid "show IETF standard notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1937
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1939
  #, 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:1909
++#: g10/gpg.c:1941
  msgid "show user ID validity during key listings"
  msgstr ""
  
- #: g10/gpg.c:1911
++#: g10/gpg.c:1943
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  
- #: g10/gpg.c:1913
++#: g10/gpg.c:1945
  msgid "show revoked and expired subkeys in key listings"
  msgstr ""
  
- #: g10/gpg.c:1915
++#: g10/gpg.c:1947
  #, fuzzy
  msgid "show the keyring name in key listings"
  msgstr "mostra en quin anell de claus està una clau llistada"
  
- #: g10/gpg.c:1917
++#: g10/gpg.c:1949
  #, fuzzy
  msgid "show expiration dates during signature listings"
  msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
  
- #: g10/gpg.c:2019 g10/gpg.c:2056
++#: g10/gpg.c:2051 g10/gpg.c:2088
  #, fuzzy, c-format
  msgid "valid values for option '%s':\n"
  msgstr "opcions d'importació no vàlides\n"
  
- #: g10/gpg.c:2030
++#: g10/gpg.c:2062
  #, fuzzy, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "el destinatari predeterminat és desconegut «%s»\n"
  
- #: g10/gpg.c:2032 g10/gpg.c:2068
++#: g10/gpg.c:2064 g10/gpg.c:2100
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2066
++#: g10/gpg.c:2098 g10/keygen.c:167
  #, fuzzy, c-format
  msgid "invalid value for option '%s'\n"
  msgstr "opcions d'importació no vàlides\n"
  
- #: g10/gpg.c:2203
++#: g10/gpg.c:2235
  #, fuzzy, c-format
  #| msgid "NOTE: old default options file `%s' ignored\n"
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic «%s»\n"
  
- #: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
++#: g10/gpg.c:2839 g10/gpg.c:3610 g10/gpg.c:3622
  #, 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:2978 g10/gpg.c:2990
++#: g10/gpg.c:3011 g10/gpg.c:3023
  #, 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:3012
++#: g10/gpg.c:3045
  #, fuzzy, c-format
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "No és una adreça vàlida\n"
  
- #: g10/gpg.c:3044 sm/gpgsm.c:1166
++#: g10/gpg.c:3077 sm/gpgsm.c:1158
  #, fuzzy, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "l'algoritme de dispersió és invàlid «%s»\n"
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3130
  #, 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:3119 g10/gpg.c:3322 g10/keyedit.c:5338
++#: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
  #, fuzzy
  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:3137
++#: g10/gpg.c:3170
  #, fuzzy, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d opcions d'exportació no vàlides\n"
  
- #: g10/gpg.c:3140
++#: g10/gpg.c:3173
  #, fuzzy
  msgid "invalid keyserver options\n"
  msgstr "opcions d'exportació no vàlides\n"
  
- #: g10/gpg.c:3147
++#: g10/gpg.c:3180
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: opcions d'importanció no vàlides\n"
  
- #: g10/gpg.c:3150
++#: g10/gpg.c:3183
  msgid "invalid import options\n"
  msgstr "opcions d'importació no vàlides\n"
  
- #: g10/gpg.c:3156 g10/gpg.c:3171
++#: g10/gpg.c:3189 g10/gpg.c:3204
  #, fuzzy, c-format
  msgid "invalid filter option: %s\n"
  msgstr "opcions d'importació no vàlides\n"
  
- #: g10/gpg.c:3162
++#: g10/gpg.c:3195
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d opcions d'exportació no vàlides\n"
  
- #: g10/gpg.c:3165
++#: g10/gpg.c:3198
  msgid "invalid export options\n"
  msgstr "opcions d'exportació no vàlides\n"
  
- #: g10/gpg.c:3177
++#: g10/gpg.c:3210
  #, fuzzy, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: opcions d'importanció no vàlides\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3213
  #, fuzzy
  msgid "invalid list options\n"
  msgstr "opcions d'importació no vàlides\n"
  
- #: g10/gpg.c:3188
++#: g10/gpg.c:3221
  msgid "display photo IDs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3190
++#: g10/gpg.c:3223
  msgid "show policy URLs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3192
++#: g10/gpg.c:3225
  #, fuzzy
  msgid "show all notations during signature verification"
  msgstr "%s no és un joc de caràcters vàlid\n"
  
- #: g10/gpg.c:3194
++#: g10/gpg.c:3227
  msgid "show IETF standard notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3231
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3200
++#: g10/gpg.c:3233
  #, 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:3202
++#: g10/gpg.c:3235
  #, fuzzy
  msgid "show user ID validity during signature verification"
  msgstr "%s no és un joc de caràcters vàlid\n"
  
- #: g10/gpg.c:3204
++#: g10/gpg.c:3237
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  
- #: g10/gpg.c:3206
++#: g10/gpg.c:3239
  #, 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:3208
++#: g10/gpg.c:3241
  msgid "validate signatures with PKA data"
  msgstr ""
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3243
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr ""
  
- #: g10/gpg.c:3217
++#: g10/gpg.c:3250
  #, fuzzy, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d opcions d'exportació no vàlides\n"
  
- #: g10/gpg.c:3220
++#: g10/gpg.c:3253
  #, fuzzy
  msgid "invalid verify options\n"
  msgstr "opcions d'exportació no vàlides\n"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3260
  #, 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:3417
++#: g10/gpg.c:3452
  #, 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:3420
++#: g10/gpg.c:3455
  msgid "invalid auto-key-locate list\n"
  msgstr ""
  
- #: g10/gpg.c:3553 sm/gpgsm.c:1507
++#: g10/gpg.c:3592 sm/gpgsm.c:1501
  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:3564
++#: g10/gpg.c:3603
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "AVÍS: %s té preferència sobre %s\n"
  
- #: g10/gpg.c:3573
++#: g10/gpg.c:3612
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s no és permés amb %s!\n"
  
- #: g10/gpg.c:3576
++#: g10/gpg.c:3615
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s no té sentit amb %s!\n"
  
- #: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
++#: g10/gpg.c:3630 sm/gpgsm.c:1518 dirmngr/dirmngr.c:951
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3651
  #, 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:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
++#: g10/gpg.c:3686 g10/gpg.c:3710 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "l'algorisme de xifratge triat no és vàlid\n"
  
- #: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
++#: g10/gpg.c:3692 g10/gpg.c:3716 sm/gpgsm.c:1591 sm/gpgsm.c:1597
  msgid "selected digest algorithm is invalid\n"
  msgstr "l'algorisme de resum seleccionat no és vàlid\n"
  
- #: g10/gpg.c:3659
++#: g10/gpg.c:3698
  #, fuzzy
  msgid "selected compression algorithm is invalid\n"
  msgstr "l'algorisme de xifratge triat no és vàlid\n"
  
- #: g10/gpg.c:3665
++#: g10/gpg.c:3704
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n"
  
- #: g10/gpg.c:3680
++#: g10/gpg.c:3719
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed ha de ser major que 0\n"
  
- #: g10/gpg.c:3682
++#: g10/gpg.c:3721
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed ha de ser major que 1\n"
  
- #: g10/gpg.c:3684
++#: g10/gpg.c:3723
  #, fuzzy
  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:3686
++#: g10/gpg.c:3725
  #, fuzzy
  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:3688
++#: g10/gpg.c:3727
  #, fuzzy
  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:3691
++#: g10/gpg.c:3730
  #, fuzzy
  #| 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:3695
++#: g10/gpg.c:3734
  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:3702
++#: g10/gpg.c:3741
  msgid "invalid default preferences\n"
  msgstr "les preferències per defecte són invàlides\n"
  
- #: g10/gpg.c:3706
++#: g10/gpg.c:3745
  msgid "invalid personal cipher preferences\n"
  msgstr "les preferències personals de xifrat són invàlides\n"
  
- #: g10/gpg.c:3710
++#: g10/gpg.c:3749
  msgid "invalid personal digest preferences\n"
  msgstr "les preferències personals de digest són invàlides\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3753
  msgid "invalid personal compress preferences\n"
  msgstr "les preferències personals de compressió són invàlides\n"
  
- #: g10/gpg.c:3750
++#: g10/gpg.c:3789
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s encara no funciona amb %s\n"
  
- #: g10/gpg.c:3797
++#: g10/gpg.c:3836
  #, fuzzy, c-format
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr "no podeu usar l'algorisme de xifratge «%s» mentre esteu en mode %s\n"
  
- #: g10/gpg.c:3802
++#: g10/gpg.c:3841
  #, fuzzy, c-format
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr "no podeu usar l'algorisme de resum %s mentre esteu en mode %s\n"
  
- #: g10/gpg.c:3807
++#: g10/gpg.c:3846
  #, fuzzy, c-format
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr "no podeu usar l'algorisme de compressió %s mentre esteu en mode %s\n"
  
- #: g10/gpg.c:3906
++#: g10/gpg.c:3945
  #, 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:3918
++#: g10/gpg.c:3957
  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:3975
- msgid "--store [filename]"
- msgstr "--store [nom_del_fitxer]"
- 
- #: g10/gpg.c:3985
- msgid "--symmetric [filename]"
- msgstr "--symmetric [nom_del_fitxer]"
- 
- #: g10/gpg.c:3989
++#: g10/gpg.c:4028
  #, fuzzy, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "ha fallat el desxifratge: %s\n"
  
- #: g10/gpg.c:4000
- msgid "--encrypt [filename]"
- msgstr "--encrypt [nom_del_fitxer]"
- 
- #: g10/gpg.c:4016
- #, fuzzy
- msgid "--symmetric --encrypt [filename]"
- msgstr "--sign --encrypt [nom_del_fitxer]"
- 
- #: g10/gpg.c:4018
++#: g10/gpg.c:4057
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4021
++#: g10/gpg.c:4060
  #, fuzzy, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr "no podeu usar %s mentre esteu en mode %s\n"
  
- #: g10/gpg.c:4042
- msgid "--sign [filename]"
- msgstr "--sign [nom_del_fitxer]"
- 
- #: g10/gpg.c:4058
- msgid "--sign --encrypt [filename]"
- msgstr "--sign --encrypt [nom_del_fitxer]"
- 
- #: g10/gpg.c:4076
- #, fuzzy
- msgid "--symmetric --sign --encrypt [filename]"
- msgstr "--sign --encrypt [nom_del_fitxer]"
- 
- #: g10/gpg.c:4078
++#: g10/gpg.c:4117
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4081
++#: g10/gpg.c:4120
  #, fuzzy, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr "no podeu usar %s mentre esteu en mode %s\n"
  
- #: g10/gpg.c:4105
- msgid "--sign --symmetric [filename]"
- msgstr "--sign --symmetric [nom_del_fitxer]"
- 
- #: g10/gpg.c:4117
- msgid "--clearsign [filename]"
- msgstr "--clearsign [nom_del_fitxer]"
- 
- #: g10/gpg.c:4147
- msgid "--decrypt [filename]"
- msgstr "--decrypt [nom_del_fitxer]"
- 
- #: g10/gpg.c:4174
- msgid "--sign-key user-id"
- msgstr "--sign-key user-id"
- 
- #: g10/gpg.c:4178
- msgid "--lsign-key user-id"
- msgstr "--lsign-key user-id"
- 
- #: g10/gpg.c:4199
- msgid "--edit-key user-id [commands]"
- msgstr "--edit-key user-id [ordres]"
- 
- #: g10/gpg.c:4215
- #, fuzzy
- msgid "--passwd <user-id>"
- msgstr "--sign-key user-id"
- 
- #: g10/gpg.c:4411 g10/keyserver.c:1837
++#: g10/gpg.c:4462 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "l'enviament al servidor de claus ha fallat: %s\n"
  
- #: g10/gpg.c:4416
++#: g10/gpg.c:4467
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "la recepció des del servidor de claus ha fallat: %s\n"
  
- #: g10/gpg.c:4422
++#: g10/gpg.c:4473
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "l'exportació de la clau ha fallat: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4486
  #, 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:4447
++#: g10/gpg.c:4498
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "ha fallat la cerca al servidor de claus: %s\n"
  
- #: g10/gpg.c:4460
++#: g10/gpg.c:4511
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "ha fallat el refresc des del servidor de claus: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4578
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "no s'ha pogut llevar l'armadura: %s\n"
  
- #: g10/gpg.c:4538
++#: g10/gpg.c:4589
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "no s'ha pogut crear l'armadura: %s\n"
  
- #: g10/gpg.c:4630
++#: g10/gpg.c:4681
  #, 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:4776 g10/tofu.c:2002
++#: g10/gpg.c:4827 g10/tofu.c:2151
  #, fuzzy, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "error en la creació de la contrasenya: %s\n"
  
- #: g10/gpg.c:4788
++#: g10/gpg.c:4839
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4835
- msgid "[filename]"
- msgstr "[nom_del_fitxer]"
- 
- #: g10/gpg.c:4841
++#: g10/gpg.c:4894
  msgid "Go ahead and type your message ...\n"
  msgstr "Endavant, escriviu el missatge...\n"
  
- #: g10/gpg.c:5179
++#: g10/gpg.c:5232
  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:5181
++#: g10/gpg.c:5234
  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:5214
++#: g10/gpg.c:5267
  #, fuzzy
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "la URL de política de signatura donada no és vàlida\n"
@@@ -3356,7 -2616,6 +3309,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:82 sm/gpgsm.c:345
++#: g10/gpgv.c:82 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|escriu informació d'estat en aquest FD"
  
@@@ -3388,328 -2642,262 +3341,328 @@@ msgstr "No hi ha ajuda disponible
  msgid "No help available for '%s'"
  msgstr "No hi ha ajuda disponible per a `%s'"
  
- #: g10/import.c:151
++#: g10/import.c:152
  msgid "import signatures that are marked as local-only"
  msgstr ""
  
- #: g10/import.c:154
++#: g10/import.c:155
  msgid "repair damage from the pks keyserver during import"
  msgstr ""
  
- #: g10/import.c:157
++#: g10/import.c:158
  #, fuzzy
  msgid "do not clear the ownertrust values during import"
  msgstr "actualitza la base de dades de confiança"
  
- #: g10/import.c:160
++#: g10/import.c:161
  #, fuzzy
  msgid "do not update the trustdb after import"
  msgstr "actualitza la base de dades de confiança"
  
- #: g10/import.c:163
++#: g10/import.c:164
  #, fuzzy
  msgid "show key during import"
  msgstr "mostra empremta"
  
- #: g10/import.c:166
++#: g10/import.c:167
  msgid "only accept updates to existing keys"
  msgstr ""
  
- #: g10/import.c:169
++#: g10/import.c:170
  #, fuzzy
  msgid "remove unusable parts from key after import"
  msgstr "la clau secreta és inusable"
  
- #: g10/import.c:172
++#: g10/import.c:173
  msgid "remove as much as possible from key after import"
  msgstr ""
  
- #: g10/import.c:175
++#: g10/import.c:176
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:326 g10/import.c:568
++#: g10/import.c:327 g10/import.c:569
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "es descarta un bloc de tipus %d\n"
  
- #: g10/import.c:585
++#: g10/import.c:586
  #, fuzzy, c-format
  msgid "%lu keys processed so far\n"
  msgstr "fins ara s'han processat %lu claus\n"
  
- #: g10/import.c:655
++#: g10/import.c:656
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "Nombre total processat: %lu\n"
  
- #: g10/import.c:658
++#: g10/import.c:659
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr " claus noves descartades: %lu\n"
  
- #: g10/import.c:660
++#: g10/import.c:661
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr " claus noves descartades: %lu\n"
  
- #: g10/import.c:663
++#: g10/import.c:664
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "                sense ID: %lu\n"
  
- #: g10/import.c:666 sm/import.c:130
++#: g10/import.c:667 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "              importades: %lu"
  
- #: g10/import.c:670 sm/import.c:134
++#: g10/import.c:671 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "          no modificades: %lu\n"
  
- #: g10/import.c:672
++#: g10/import.c:673
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "       ID d'usuaris nous: %lu\n"
  
- #: g10/import.c:674
++#: g10/import.c:675
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "          subclaus noves: %lu\n"
  
- #: g10/import.c:676
++#: g10/import.c:677
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "        signatures noves: %lu\n"
  
- #: g10/import.c:678
++#: g10/import.c:679
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "       noves revocacions: %lu\n"
  
- #: g10/import.c:680 sm/import.c:136
++#: g10/import.c:681 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr " claus privades llegides: %lu\n"
  
- #: g10/import.c:682 sm/import.c:138
++#: g10/import.c:683 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "claus privades importades: %lu\n"
  
- #: g10/import.c:684 sm/import.c:140
++#: g10/import.c:685 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr "claus privades no canviades: %lu\n"
  
- #: g10/import.c:686 sm/import.c:142
++#: g10/import.c:687 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "              importades: %lu\n"
  
- #: g10/import.c:688
++#: g10/import.c:689
  #, fuzzy, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "        signatures noves: %lu\n"
  
- #: g10/import.c:690
++#: g10/import.c:691
  #, fuzzy, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr " claus privades llegides: %lu\n"
  
- #: g10/import.c:1034
++#: g10/import.c:1035
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
  "algorithms on these user IDs:\n"
  msgstr ""
  
- #: g10/import.c:1076
++#: g10/import.c:1077
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1091
++#: g10/import.c:1092
  #, fuzzy, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "signatura %s, algorisme de resum %s\n"
  
- #: g10/import.c:1103
++#: g10/import.c:1104
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1116
++#: g10/import.c:1117
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr ""
  
- #: g10/import.c:1118
++#: g10/import.c:1119
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  
- #: g10/import.c:1143
++#: g10/import.c:1144
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  
- #: g10/import.c:1379 g10/import.c:2167
++#: g10/import.c:1380 g10/import.c:2168
  #, fuzzy, c-format
  msgid "key %s: no user ID\n"
  msgstr "clau %08lX: sense ID\n"
  
- #: g10/import.c:1385
++#: g10/import.c:1386
  #, fuzzy, c-format
  msgid "key %s: %s\n"
  msgstr "es descarta «%s»: %s\n"
  
- #: g10/import.c:1386 g10/import.c:2141
++#: g10/import.c:1387 g10/import.c:2142
  msgid "rejected by import screener"
  msgstr ""
  
- #: g10/import.c:1416
++#: g10/import.c:1417
  #, fuzzy, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "clau %08lX: corrupció de la subclau HKP reparada\n"
  
- #: g10/import.c:1434
++#: g10/import.c:1435
  #, fuzzy, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "clau %08lX: s'ha acceptat la ID d'usuari no autosignada «%s»\n"
  
- #: g10/import.c:1444 g10/import.c:1475
++#: g10/import.c:1445 g10/import.c:1476
  #, fuzzy, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "clau %08lX: l'ID no és vàlid\n"
  
- #: g10/import.c:1446
++#: g10/import.c:1447
  msgid "this may be caused by a missing self-signature\n"
  msgstr "açò pot ser causat per l'absència d'autosignatura\n"
  
- #: g10/import.c:1516 g10/import.c:2318
++#: g10/import.c:1517 g10/import.c:2319
  #, fuzzy, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "clau %08lX: no s'ha trobat la clau pública: %s\n"
  
- #: g10/import.c:1522
++#: g10/import.c:1523
  #, fuzzy, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "clau %08lX: clau nova - es descarta \n"
  
- #: g10/import.c:1537
++#: g10/import.c:1538
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "no s'ha trobat cap anell escrivible: %s\n"
  
- #: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
++#: g10/import.c:1547 g10/import.c:1648 g10/import.c:2385
  #, fuzzy, c-format
  #| msgid "error writing keyring `%s': %s\n"
  msgid "error writing keyring '%s': %s\n"
  msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
  
- #: g10/import.c:1566
++#: g10/import.c:1567
  #, fuzzy, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "clau %08lX: s'ha importat la clau pública «%s»\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1591
  #, fuzzy, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "clau %08lX: no correspon a la nostra còpia\n"
  
- #: g10/import.c:1606 g10/import.c:2342
++#: g10/import.c:1607 g10/import.c:2343
  #, fuzzy, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "clau %08lX: no s'ha trobat el bloc de claus original: %s\n"
  
- #: g10/import.c:1614 g10/import.c:2349
++#: g10/import.c:1615 g10/import.c:2350
  #, fuzzy, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "clau %08lX: no s'ha pogut llegir el bloc de claus original: %s\n"
  
- #: g10/import.c:1657
++#: g10/import.c:1658
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "clau %08lX: «%s» 1 ID d'usuari nou\n"
  
- #: g10/import.c:1660
++#: g10/import.c:1661
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
  
- #: g10/import.c:1663
++#: g10/import.c:1664
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "clau %08lX: «%s» 1 signatura nova\n"
  
- #: g10/import.c:1666
++#: g10/import.c:1667
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "clau %08lX: «%s» %d signatures noves\n"
  
- #: g10/import.c:1669
++#: g10/import.c:1670
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "clau %08lX: «%s» 1 subclau nova\n"
  
- #: g10/import.c:1672
++#: g10/import.c:1673
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "clau %08lX: «%s» %d subclaus noves\n"
  
- #: g10/import.c:1675
++#: g10/import.c:1676
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "clau %08lX: «%s» %d signatures noves\n"
  
- #: g10/import.c:1678
++#: g10/import.c:1679
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "clau %08lX: «%s» %d signatures noves\n"
  
- #: g10/import.c:1681
++#: g10/import.c:1682
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
  
- #: g10/import.c:1684
++#: g10/import.c:1685
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
  
- #: g10/import.c:1707
++#: g10/import.c:1708
  #, fuzzy, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "clau %08lX: «%s» no ha estat modificada\n"
  
- #: g10/import.c:2019 g10/import.c:2264
++#: g10/import.c:2020 g10/import.c:2265
  #, fuzzy, c-format
  msgid "key %s: secret key imported\n"
  msgstr "clau %08lX: s'ha importat la clau secreta\n"
  
- #: g10/import.c:2027
++#: g10/import.c:2028
  #, fuzzy, c-format
  #| msgid "skipped: secret key already present\n"
  msgid "key %s: secret key already exists\n"
  msgstr "es descarta: la clau secreta ja és present\n"
  
- #: g10/import.c:2035
++#: g10/import.c:2036
  #, fuzzy, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "error mentre s'enviava a «%s»: %s\n"
  
- #: g10/import.c:2140
++#: g10/import.c:2141
  #, fuzzy, c-format
  msgid "secret key %s: %s\n"
  msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
  
- #: g10/import.c:2160 g10/import.c:2195
++#: g10/import.c:2161 g10/import.c:2196
  #, fuzzy
  msgid "importing secret keys not allowed\n"
  msgstr "s'està escrivint la clau secreta a «%s»\n"
  
- #: g10/import.c:2184
++#: g10/import.c:2185
  #, fuzzy, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr "clau %08lX: clau secreta amb xifrat %d no vàlid - es descarta\n"
@@@ -3724,12 -2912,10 +3677,12 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2256
++#: g10/import.c:2257
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2311
++#: g10/import.c:2312
  #, fuzzy, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
@@@ -3739,22 -2925,18 +3692,22 @@@
  # O «rebutjara»? ivb
  # Per tots els canvis d'anglicisme «ignorat» -> «es descarta»,
  # «es rebutja» està bé. jm
- #: g10/import.c:2360
++#: g10/import.c:2361
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "clau %08lX: el certificat de revocació és invàlid: %s: es rebutja\n"
  
- #: g10/import.c:2393
++#: g10/import.c:2394
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "clau %08lX: s'ha importat el certificat de revocació «%s»\n"
  
- #: g10/import.c:2469
++#: g10/import.c:2470
  #, fuzzy, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "clau %08lX: no hi ha ID per a la signatura\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2487
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr ""
@@@ -3762,116 -2944,95 +3715,116 @@@
  "«%s»\n"
  "\n"
  
- #: g10/import.c:2488
++#: g10/import.c:2489
  #, fuzzy, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "clau %08lX: l'autosignatura no és vàlida en l'id d'usuari «%s»\n"
  
- #: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
++#: g10/import.c:2506 g10/import.c:2532 g10/import.c:2583
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "clau %08lX: l'algoritme de clau pública no és suportat\n"
  
- #: g10/import.c:2506
++#: g10/import.c:2507
  #, fuzzy, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n"
  
- #: g10/import.c:2520
++#: g10/import.c:2521
  #, fuzzy, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "clau %08lX: no hi ha una subclau per a l'enllaç de la clau\n"
  
- #: g10/import.c:2533
++#: g10/import.c:2534
  #, fuzzy, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "clau %08lX: l'enllaç de subclau és invàlid\n"
  
- #: g10/import.c:2549
++#: g10/import.c:2550
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "clau %08lX: s'ha eliminat un enllaç de subclau múltiple\n"
  
- #: g10/import.c:2571
++#: g10/import.c:2572
  #, fuzzy, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "clau %08lX: no hi ha una subclau per a la clau de revocació\n"
  
- #: g10/import.c:2584
++#: g10/import.c:2585
  #, fuzzy, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "clau %08lX: Subclau de revocació no vàlida\n"
  
- #: g10/import.c:2599
++#: g10/import.c:2600
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "clau %08lX: s'han eliminat subclaus de revocació múltiples\n"
  
- #: g10/import.c:2641
++#: g10/import.c:2642
  #, fuzzy, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "clau %08lX: es descarta l'ID d'usuari '"
  
- #: g10/import.c:2665
++#: g10/import.c:2666
  #, fuzzy, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "clau %08lX: es descarta la subclau\n"
  
- #: g10/import.c:2694
++#: g10/import.c:2695
  #, fuzzy, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "clau %08lX: la signatura és inexportable (classe %02x) - es descarta\n"
  
- #: g10/import.c:2705
++#: g10/import.c:2706
  #, fuzzy, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr ""
  "clau %08lX: el certificat de revocació és en el lloc equivocat - es "
  "descarta\n"
  
- #: g10/import.c:2723
++#: g10/import.c:2724
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "clau %08lX: el certificat de revocació és invàlid: %s - es descarta\n"
  
- #: g10/import.c:2737
++#: g10/import.c:2738
  #, fuzzy, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr ""
  "clau %08lX: la signatura de la subclau és en el lloc equivocat - es "
  "descarta\n"
  
- #: g10/import.c:2745
++#: g10/import.c:2746
  #, fuzzy, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr ""
  "clau %08lX: la classe de signatura és inesperada (0x%02x) - es descarta\n"
  
- #: g10/import.c:2887
++#: g10/import.c:2888
  #, fuzzy, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "clau %08lX: s'ha detectat un ID d'usuari duplicat - es fusiona\n"
  
- #: g10/import.c:2951
++#: g10/import.c:2952
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr ""
  "AVÍS: la clau %08lX pot estar revocada: s'adquireix la clau de revocació "
  "%08lX\n"
  
- #: g10/import.c:2967
++#: g10/import.c:2968
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr ""
  "AVÍS: la clau %08lX pot estar revocada: la clau de revocació %08lX no està "
  "present.\n"
  
- #: g10/import.c:3031
++#: g10/import.c:3032
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "clau %08lX: s'hi ha afegit el certificat de revocació «%s»\n"
  
- #: g10/import.c:3069
++#: g10/import.c:3070
  #, fuzzy, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n"
@@@ -3908,54 -3063,43 +3861,54 @@@ msgstr "error en crear «%s»: %s\n
  msgid "error opening key DB: %s\n"
  msgstr "error en la lectura de «%s»: %s\n"
  
- #: g10/keydb.c:1782
++#: g10/keydb.c:1786
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[revocation]"
  msgstr "[revocació]"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[self-signature]"
  msgstr "[autosignatura]"
  
- #: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
++#: g10/keyedit.c:433 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: dirmngr/ldap-wrapper.c:694
  #, fuzzy, c-format
  msgid "error allocating memory: %s\n"
  msgstr "error en crear l'anell «%s»: %s\n"
  
- #: g10/keyedit.c:629
++#: g10/keyedit.c:630
  #, fuzzy, c-format
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr "clau %08lX: l'algoritme de clau pública no és suportat\n"
  
- #: g10/keyedit.c:638
++#: g10/keyedit.c:639
  #, fuzzy, c-format
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "signatura %s, algorisme de resum %s\n"
  
- #: g10/keyedit.c:800
++#: g10/keyedit.c:801
  #, fuzzy
  msgid " (reordered signatures follow)"
  msgstr "Signatura correcta de \""
  
- #: g10/keyedit.c:913
++#: g10/keyedit.c:914
  #, fuzzy, c-format
  msgid "key %s:\n"
  msgstr "es descarta «%s»: %s\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:917
  #, fuzzy, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
  msgstr[0] "L'ID d'usuari «%s» està revocat."
  msgstr[1] "L'ID d'usuari «%s» està revocat."
  
- #: g10/keyedit.c:919 g10/keylist.c:480
++#: g10/keyedit.c:920 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
@@@ -3963,7 -3107,6 +3916,7 @@@ msgid_plural "%d signatures not checke
  msgstr[0] "1 signatura no comprovada per falta de clau\n"
  msgstr[1] "1 signatura no comprovada per falta de clau\n"
  
- #: g10/keyedit.c:923 g10/keylist.c:476
++#: g10/keyedit.c:924 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
@@@ -3971,21 -3114,18 +3924,21 @@@ msgid_plural "%d bad signatures\n
  msgstr[0] "%d signatures errònies\n"
  msgstr[1] "%d signatures errònies\n"
  
- #: g10/keyedit.c:927
++#: g10/keyedit.c:928
  #, fuzzy, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
  msgstr[0] "Signatura correcta de \""
  msgstr[1] "Signatura correcta de \""
  
- #: g10/keyedit.c:932
++#: g10/keyedit.c:933
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:992 g10/pkclist.c:274
++#: g10/keyedit.c:993 g10/pkclist.c:274
  #, fuzzy
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
@@@ -3997,70 -3137,55 +3950,70 @@@ msgstr "
  "verificar les claus d'altres usuaris (mirant passaports,\n"
  "comprovant empremtes de diferents fonts...)?\n"
  
- #: g10/keyedit.c:996 g10/pkclist.c:286
++#: g10/keyedit.c:997 g10/pkclist.c:286
  #, fuzzy, c-format
  msgid "  %d = I trust marginally\n"
  msgstr " %d = Hi confie marginalment\n"
  
- #: g10/keyedit.c:997 g10/pkclist.c:288
++#: g10/keyedit.c:998 g10/pkclist.c:288
  #, fuzzy, c-format
  msgid "  %d = I trust fully\n"
  msgstr " %d = Hi confie plenament\n"
  
- #: g10/keyedit.c:1015
++#: g10/keyedit.c:1016
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
  "trust signatures on your behalf.\n"
  msgstr ""
  
- #: g10/keyedit.c:1032
++#: g10/keyedit.c:1033
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  
- #: g10/keyedit.c:1160
++#: g10/keyedit.c:1161
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1168
++#: g10/keyedit.c:1169
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "L'ID d'usuari «%s» està revocat."
  
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
- #: g10/keyedit.c:2246
++#: g10/keyedit.c:1178 g10/keyedit.c:1206 g10/keyedit.c:1233 g10/keyedit.c:1417
++#: g10/keyedit.c:2247
  msgid "Are you sure you still want to sign it? (y/N) "
  msgstr "Segur que encara voleu signarla? (s/N) "
  
  # O no s'ha pogut? ivb
  # FIXME: comprovar context. jm
- #: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
- #: g10/keyedit.c:2251 g10/keyedit.c:3177
++#: g10/keyedit.c:1192 g10/keyedit.c:1220 g10/keyedit.c:1247 g10/keyedit.c:1423
++#: g10/keyedit.c:2252 g10/keyedit.c:3178
  msgid "  Unable to sign.\n"
  msgstr "  No es pot signar.\n"
  
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1197
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "L'ID d'usuari «%s» ha caducat."
  
- #: g10/keyedit.c:1224
++#: g10/keyedit.c:1225
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "L'ID d'usuari «%s» no està autosignat."
  
- #: g10/keyedit.c:1253
++#: g10/keyedit.c:1254
  #, fuzzy, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "L'ID d'usuari «%s» no està autosignat."
  
- #: g10/keyedit.c:1255
++#: g10/keyedit.c:1256
  #, fuzzy
  msgid "Sign it? (y/N) "
  msgstr "Signar realment? "
  
- #: g10/keyedit.c:1282
++#: g10/keyedit.c:1283
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -4069,11 -3194,9 +4022,11 @@@ msgstr "
  "La vostra signatura en «%s»\n"
  "és una signatura d'estil PGP 2.x.\n"
  
- #: g10/keyedit.c:1291
++#: g10/keyedit.c:1292
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr "Voleu ascendir-la a una autosignatura OpenPGP? (s/N) "
  
- #: g10/keyedit.c:1304
++#: g10/keyedit.c:1305
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -4082,11 -3205,9 +4035,11 @@@ msgstr "
  "La vostra signatura actual en «%s»\n"
  "ha caducat.\n"
  
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:1310
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr "Voleu crear una nova signatura per a reemplaçar la caducada? (s/N) "
  
- #: g10/keyedit.c:1330
++#: g10/keyedit.c:1331
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -4095,43 -3216,34 +4048,43 @@@ msgstr "
  "La vostra signatura en «%s»\n"
  "és una signatura local.\n"
  
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:1336
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr "Voleu ascendir-la a una signatura completament exportable? (s/N) "
  
- #: g10/keyedit.c:1355
++#: g10/keyedit.c:1356
  #, fuzzy, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "«%s» ja estava signada localment amb la clau %08lX\n"
  
- #: g10/keyedit.c:1359
++#: g10/keyedit.c:1360
  #, fuzzy, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "«%s» ja estava signada amb la clau %08lX\n"
  
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:1365
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "Voleu signarla un altre cop, de tota manera? (s/N) "
  
- #: g10/keyedit.c:1386
++#: g10/keyedit.c:1387
  #, fuzzy, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "No hi ha res que signar amb la clau %08lX\n"
  
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1411
  msgid "This key has expired!"
  msgstr "La clau ha caducat!"
  
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1429
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "Aquesta clau caducarà el %s.\n"
  
- #: g10/keyedit.c:1434
++#: g10/keyedit.c:1435
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr "Voleu que la vostra signatura caduque alhora? (S/n) "
  
- #: g10/keyedit.c:1475
++#: g10/keyedit.c:1476
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -4141,32 -3253,26 +4094,32 @@@ msgstr "
  "pertany realment a la persona esmentada anteriorment? Si no sabeu què \n"
  "contestar, entreu «0».\n"
  
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1481
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) No vaig a contestar.%s\n"
  
- #: g10/keyedit.c:1482
++#: g10/keyedit.c:1483
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) No ho he comprovat en absolut.%s\n"
  
- #: g10/keyedit.c:1484
++#: g10/keyedit.c:1485
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) He fet algunes comprovacions.%s\n"
  
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:1488
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) He fet comprovacions molt acurades.%s\n"
  
- #: g10/keyedit.c:1494
++#: g10/keyedit.c:1495
  #, fuzzy
  msgid "Your selection? (enter '?' for more information): "
  msgstr "Seleccioneu una opció (introduïu «?» per obtindre més informació):"
  
- #: g10/keyedit.c:1521
++#: g10/keyedit.c:1522
  #, fuzzy, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -4175,138 -3281,113 +4128,138 @@@ msgstr "
  "Esteu segur que voleu signar aquesta clau\n"
  "amb la vostra clau: \""
  
- #: g10/keyedit.c:1529
++#: g10/keyedit.c:1530
  #, fuzzy
  msgid "This will be a self-signature.\n"
  msgstr ""
  "\n"
  "Açò serà una autosignatura.\n"
  
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:1535
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr ""
  "\n"
  "AVÍS: la signatura no es marcarà com a inexportable.\n"
  
- #: g10/keyedit.c:1541
++#: g10/keyedit.c:1542
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr ""
  "\n"
  "AVÍS: la signatura no es marcarà com a irrevocable.\n"
  
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1552
  #, fuzzy
  msgid "The signature will be marked as non-exportable.\n"
  msgstr ""
  "\n"
  "La signatura es marcarà com a inexportable.\n"
  
- #: g10/keyedit.c:1558
++#: g10/keyedit.c:1559
  #, fuzzy
  msgid "The signature will be marked as non-revocable.\n"
  msgstr ""
  "\n"
  "La signatura es marcarà com a irrevocable.\n"
  
- #: g10/keyedit.c:1565
++#: g10/keyedit.c:1566
  #, fuzzy
  msgid "I have not checked this key at all.\n"
  msgstr ""
  "\n"
  "No he comprovat aquesta clau en absolut.\n"
  
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:1571
  #, fuzzy
  msgid "I have checked this key casually.\n"
  msgstr ""
  "\n"
  "He fet algunes comprovacions a aquesta clau.\n"
  
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:1576
  #, fuzzy
  msgid "I have checked this key very carefully.\n"
  msgstr ""
  "\n"
  "He comprovat aquesta clau amb molta cura.\n"
  
- #: g10/keyedit.c:1587
++#: g10/keyedit.c:1588
  #, fuzzy
  msgid "Really sign? (y/N) "
  msgstr "Signar realment? "
  
- #: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
- #: g10/keyedit.c:6463 g10/sign.c:323
++#: g10/keyedit.c:1639 g10/keyedit.c:6308 g10/keyedit.c:6391 g10/keyedit.c:6500
++#: g10/keyedit.c:6562 g10/sign.c:325
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "Ha fallat el procés de signatura: %s\n"
  
- #: g10/keyedit.c:1725
++#: g10/keyedit.c:1726
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  
- #: g10/keyedit.c:1755
++#: g10/keyedit.c:1756
  #, fuzzy, c-format
  #| msgid "error creating passphrase: %s\n"
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "error en la creació de la contrasenya: %s\n"
  
- #: g10/keyedit.c:1869
++#: g10/keyedit.c:1870
  msgid "save and quit"
  msgstr "desa i ix"
  
- #: g10/keyedit.c:1872
++#: g10/keyedit.c:1873
  #, fuzzy
  msgid "show key fingerprint"
  msgstr "mostra empremta"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1874
  #, fuzzy
  msgid "show the keygrip"
  msgstr "Notació de signatura: "
  
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1875
  msgid "list key and user IDs"
  msgstr "llista claus i ID"
  
  # Per aquesta zona (keyedit) hi ha un cacau d'infinitius i presents...  ivb
  # Yeah, els vaig corregir abans de que enviares la teua correcció. jm
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1877
  msgid "select user ID N"
  msgstr "tria l'ID d'usuari N"
  
  # Per aquesta zona (keyedit) hi ha un cacau d'infinitius i presents...  ivb
  # Yeah, els vaig corregir abans de que enviares la teua correcció. jm
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1878
  #, fuzzy
  msgid "select subkey N"
  msgstr "tria l'ID d'usuari N"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1879
  #, fuzzy
  msgid "check signatures"
  msgstr "revoca signatures"
  
- #: g10/keyedit.c:1884
++#: g10/keyedit.c:1885
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr ""
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1890
  #, fuzzy
  msgid "sign selected user IDs locally"
  msgstr "signa la clau localment"
  
- #: g10/keyedit.c:1890
++#: g10/keyedit.c:1891
  #, fuzzy
  msgid "sign selected user IDs with a trust signature"
  msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1893
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr ""
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1895
  msgid "add a user ID"
  msgstr "afegeix un ID d'usuari"
  
@@@ -4314,139 -3395,110 +4267,139 @@@
  # Si et refereixes a Photo vs. photo, ho deixe en minúscules, que en tot
  # el menú està tot en minúscules. Tb hi ha molts ID vs. id en els msgids
  # i no hem unificat en català. Potser li ho diré a Werner. jm.
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1897
  msgid "add a photo ID"
  msgstr "afegeix un photo ID"
  
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1898
  #, fuzzy
  msgid "delete selected user IDs"
  msgstr "esborra un ID d'usuari"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1901
  #, fuzzy
  msgid "add a subkey"
  msgstr "addkey"
  
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1904
  msgid "add a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1906
  msgid "move a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1908
  msgid "move a backup key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1910
  #, fuzzy
  msgid "delete selected subkeys"
  msgstr "esborra una clau secundària"
  
- #: g10/keyedit.c:1911
++#: g10/keyedit.c:1912
  msgid "add a revocation key"
  msgstr "afegeix una clau de revocació"
  
- #: g10/keyedit.c:1913
++#: g10/keyedit.c:1914
  #, fuzzy
  msgid "delete signatures from the selected user IDs"
  msgstr ""
  "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1916
  #, fuzzy
  msgid "change the expiration date for the key or selected subkeys"
  msgstr "No podeu canviar la data de caducitat de les claus v3\n"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1918
  #, fuzzy
  msgid "flag the selected user ID as primary"
  msgstr "marca l'ID d'usuari com a primari"
  
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1921
  msgid "list preferences (expert)"
  msgstr "llista les preferències (expert)"
  
- #: g10/keyedit.c:1921
++#: g10/keyedit.c:1922
  msgid "list preferences (verbose)"
  msgstr "llista les preferències (detallat)"
  
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:1924
  #, fuzzy
  msgid "set preference list for the selected user IDs"
  msgstr ""
  "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
  
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1927
  #, fuzzy
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
  
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1929
  #, fuzzy
  msgid "set a notation for the selected user IDs"
  msgstr ""
  "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1931
  msgid "change the passphrase"
  msgstr "canvia la contrasenya"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1934
  msgid "change the ownertrust"
  msgstr "canvia la confiança"
  
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1937
  #, fuzzy
  msgid "revoke signatures on the selected user IDs"
  msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
  
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1939
  #, fuzzy
  msgid "revoke selected user IDs"
  msgstr "revoca un ID d'usuari"
  
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1942
  #, fuzzy
  msgid "revoke key or selected subkeys"
  msgstr "revoca una clau secundària"
  
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1944
  #, fuzzy
  msgid "enable key"
  msgstr "activa una clau"
  
- #: g10/keyedit.c:1944
++#: g10/keyedit.c:1945
  #, fuzzy
  msgid "disable key"
  msgstr "desactiva una clau"
  
  # Igual que dalt.  ivb
  # Idem :) jm
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1947
  #, fuzzy
  msgid "show selected photo IDs"
  msgstr "mostra el photo ID"
  
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1949
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:1951
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2063
  msgid "Secret key is available.\n"
  msgstr "La clau secreta està disponible.\n"
  
- #: g10/keyedit.c:2162
++#: g10/keyedit.c:2163
  msgid "Need the secret key to do this.\n"
  msgstr "Cal la clau secreta per a fer açò.\n"
  
- #: g10/keyedit.c:2183
++#: g10/keyedit.c:2184
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4454,284 -3506,229 +4407,289 @@@
  "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
  msgstr ""
  
- #: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
++#: g10/keyedit.c:2240 g10/keyedit.c:3178 g10/keyedit.c:3317 g10/keyedit.c:3379
  msgid "Key is revoked."
  msgstr "La clau està revocada."
  
- #: g10/keyedit.c:2262
++#: g10/keyedit.c:2263
  #, fuzzy
  msgid "Really sign all user IDs? (y/N) "
  msgstr "Realment voleu signar tots els ID d'usuari? "
  
- #: g10/keyedit.c:2266
++#: g10/keyedit.c:2267
  #, fuzzy
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "Realment voleu signar tots els ID d'usuari? "
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2275
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
  
- #: g10/keyedit.c:2285
++#: g10/keyedit.c:2286
  #, fuzzy, c-format
  msgid "Unknown signature type '%s'\n"
  msgstr "la classe de signatura és desconeguda"
  
- #: g10/keyedit.c:2309
++#: g10/keyedit.c:2310
  #, 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/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
++#: g10/keyedit.c:2332 g10/keyedit.c:2356 g10/keyedit.c:2550
  msgid "You must select at least one user ID.\n"
  msgstr "Heu de seleccionar al menys un ID d'usuari.\n"
  
- #: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
++#: g10/keyedit.c:2334 g10/keyedit.c:2358 g10/keyedit.c:2512 g10/keyedit.c:2552
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2336
++#: g10/keyedit.c:2337
  msgid "You can't delete the last user ID!\n"
  msgstr "No podeu esborrar l'últim ID d'usuari!\n"
  
- #: g10/keyedit.c:2339
++#: g10/keyedit.c:2340
  #, fuzzy
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "Realment voleu eliminar tots els ID d'usuari seleccionats? "
  
- #: g10/keyedit.c:2340
++#: g10/keyedit.c:2341
  #, fuzzy
  msgid "Really remove this user ID? (y/N) "
  msgstr "Realment voleu eliminar aquest ID d'usuari? "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2397
++#: g10/keyedit.c:2398
  #, fuzzy
  msgid "Really move the primary key? (y/N) "
  msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
  
- #: g10/keyedit.c:2409 g10/keyedit.c:4866
++#: g10/keyedit.c:2410 g10/keyedit.c:4964
  #, fuzzy
  msgid "You must select exactly one key.\n"
  msgstr "Heu de seleccionar, si més no, una clau.\n"
  
- #: g10/keyedit.c:2436
++#: g10/keyedit.c:2437
  msgid "Command expects a filename argument\n"
  msgstr ""
  
- #: g10/keyedit.c:2457
++#: g10/keyedit.c:2458
  #, fuzzy, c-format
  msgid "Can't open '%s': %s\n"
  msgstr "no s'ha pogut obrir «%s»: %s\n"
  
- #: g10/keyedit.c:2474
++#: g10/keyedit.c:2475
  #, fuzzy, c-format
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "error en crear l'anell «%s»: %s\n"
  
- #: g10/keyedit.c:2509
++#: g10/keyedit.c:2510
  msgid "You must select at least one key.\n"
  msgstr "Heu de seleccionar, si més no, una clau.\n"
  
- #: g10/keyedit.c:2515
++#: g10/keyedit.c:2516
  #, fuzzy
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "Realment voleu eliminar les claus seleccionades? "
  
- #: g10/keyedit.c:2517
++#: g10/keyedit.c:2518
  #, fuzzy
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "Realment voleu eliminar aquesta clau? "
  
- #: g10/keyedit.c:2555
++#: g10/keyedit.c:2556
  #, fuzzy
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
  
- #: g10/keyedit.c:2556
++#: g10/keyedit.c:2557
  #, fuzzy
  msgid "Really revoke this user ID? (y/N) "
  msgstr "Realment voleu eliminar aquest ID d'usuari? "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2575
  #, fuzzy
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "Realment voleu revocar aquesta clau? "
  
- #: g10/keyedit.c:2585
++#: g10/keyedit.c:2586
  #, fuzzy
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "Realment voleu revocar les claus seleccionades? "
  
- #: g10/keyedit.c:2587
++#: g10/keyedit.c:2588
  #, fuzzy
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "Realment voleu revocar aquesta clau? "
  
- #: g10/keyedit.c:2645
++#: g10/keyedit.c:2646
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  
- #: g10/keyedit.c:2690
++#: g10/keyedit.c:2691
  #, fuzzy
  msgid "Set preference list to:\n"
  msgstr "estableix la llista de preferències"
  
- #: g10/keyedit.c:2697
++#: g10/keyedit.c:2698
  #, fuzzy
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr ""
  "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
  
- #: g10/keyedit.c:2699
++#: g10/keyedit.c:2700
  #, fuzzy
  msgid "Really update the preferences? (y/N) "
  msgstr "Realment voleu actualitzar les preferències? "
  
- #: g10/keyedit.c:2773
++#: g10/keyedit.c:2774
  #, fuzzy
  msgid "Save changes? (y/N) "
  msgstr "Voleu desar els canvis? "
  
- #: g10/keyedit.c:2777
++#: g10/keyedit.c:2778
  #, fuzzy
  msgid "Quit without saving? (y/N) "
  msgstr "Voleu eixir sense desar? "
  
- #: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
- #: g10/keyedit.c:3267 g10/keyedit.c:3332
++#: g10/keyedit.c:2789 g10/keyedit.c:2799 g10/keyedit.c:2943 g10/keyedit.c:3046
++#: g10/keyedit.c:3268 g10/keyedit.c:3333 g10/keyedit.c:3409
  #, c-format
  msgid "update failed: %s\n"
  msgstr "ha fallat l'actualització: %s\n"
  
- #: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
++#: g10/keyedit.c:2805 g10/keyedit.c:3273 g10/keyedit.c:3338 g10/keyedit.c:3416
  msgid "Key not changed so no update needed.\n"
  msgstr "La clau no ha canviat, per tant no cal actualització.\n"
  
- #: g10/keyedit.c:3038
++#: g10/keyedit.c:3039
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
  msgstr "La generació de claus ha fallat: %s\n"
  
- #: g10/keyedit.c:3083
++#: g10/keyedit.c:3084
  #, fuzzy, c-format
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "error: l'empremta digital és invàlida\n"
  
- #: g10/keyedit.c:3112
++#: g10/keyedit.c:3113
  #, 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:3248 g10/keyedit.c:3251
++#: g10/keyedit.c:3249 g10/keyedit.c:3252
  #, 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:3254
++#: g10/keyedit.c:3255
  #, fuzzy
  #| msgid "No such user ID.\n"
  msgid "No matching user IDs."
  msgstr "Usuari inexistent.\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  #, fuzzy
  msgid "Nothing to sign.\n"
  msgstr "No hi ha res que signar amb la clau %08lX\n"
  
- #: g10/keyedit.c:3427
++#: g10/keyedit.c:3388
+ #, 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:3508
  msgid "Digest: "
  msgstr "Resum: "
  
- #: g10/keyedit.c:3484
++#: g10/keyedit.c:3565
  msgid "Features: "
  msgstr "Funcionalitats: "
  
- #: g10/keyedit.c:3495
++#: g10/keyedit.c:3576
  msgid "Keyserver no-modify"
  msgstr ""
  
- #: g10/keyedit.c:3510 g10/keylist.c:377
++#: g10/keyedit.c:3591 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr ""
  
- #: g10/keyedit.c:3518 g10/keyedit.c:3519
++#: g10/keyedit.c:3599 g10/keyedit.c:3600
  #, fuzzy
  msgid "Notations: "
  msgstr "Notació: "
  
- #: g10/keyedit.c:3764
++#: g10/keyedit.c:3845
  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:3836
++#: g10/keyedit.c:3917
  #, 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:3860
++#: g10/keyedit.c:3941
  #, 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:3866
++#: g10/keyedit.c:3947
  #, fuzzy
  msgid "(sensitive)"
  msgstr " (sensible)"
  
- #: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3989 g10/keyedit.c:4131 g10/keylist.c:262 g10/keyserver.c:538
  #, fuzzy, c-format
  msgid "created: %s"
  msgstr "no s'ha pogut creat %s: %s\n"
  
- #: g10/keyedit.c:3911 g10/keylist.c:1852
++#: g10/keyedit.c:3992 g10/keylist.c:1852
  #, fuzzy, c-format
  msgid "revoked: %s"
  msgstr "[revocada]"
  
- #: g10/keyedit.c:3913 g10/keylist.c:1858
++#: g10/keyedit.c:3994 g10/keylist.c:1858
  #, fuzzy, c-format
  msgid "expired: %s"
  msgstr " [caduca: %s]"
  
- #: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyedit.c:3996 g10/keyedit.c:4133 g10/keylist.c:264 g10/keylist.c:1864
 +#: g10/keyserver.c:544
  #, fuzzy, c-format
  msgid "expires: %s"
  msgstr " [caduca: %s]"
  
- #: g10/keyedit.c:3917
++#: g10/keyedit.c:3998
  #, c-format
  msgid "usage: %s"
  msgstr ""
  
- #: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
++#: g10/keyedit.c:4006 g10/keyedit.c:4026 g10/keylist.c:267
  msgid "card-no: "
  msgstr ""
  
- #: g10/keyedit.c:3984
++#: g10/keyedit.c:4065
  #, fuzzy, c-format
  msgid "trust: %s"
  msgstr " confiança: %c/%c"
  
- #: g10/keyedit.c:3988
++#: g10/keyedit.c:4069
  #, c-format
  msgid "validity: %s"
  msgstr ""
  
- #: g10/keyedit.c:3995
++#: g10/keyedit.c:4076
  msgid "This key has been disabled"
  msgstr "Aquesta clau ha estat desactivada"
  
- #: g10/keyedit.c:4013
++#: g10/keyedit.c:4094
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4739,20 -3736,14 +4697,20 @@@ 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:4069 g10/keyedit.c:4500 g10/keyserver.c:548
- #: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: g10/keyedit.c:4150 g10/keyedit.c:4581 g10/keyserver.c:548
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:712
 +#: dirmngr/ocsp.c:703
  #, fuzzy
  msgid "revoked"
  msgstr "[revocada]"
  
- #: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
- #: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4152 g10/keyedit.c:4583 g10/keyserver.c:552
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:714
  #, fuzzy
  msgid "expired"
  msgstr "expire"
  
- #: g10/keyedit.c:4188
++#: g10/keyedit.c:4269
  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"
@@@ -4761,18 -3752,15 +4719,18 @@@ msgstr "
  "      causar que una ID d'usuari diferent esdevinga en la primària "
  "assumida.\n"
  
- #: g10/keyedit.c:4240
++#: g10/keyedit.c:4321
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr ""
  
- #: g10/keyedit.c:4241
++#: g10/keyedit.c:4322
  #, fuzzy
  #| 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:4300
++#: g10/keyedit.c:4381
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4781,38 -3769,30 +4739,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:4305 g10/keyedit.c:4595
++#: g10/keyedit.c:4386 g10/keyedit.c:4676
  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:4311
++#: g10/keyedit.c:4392
  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:4326 g10/keygen.c:2697
++#: g10/keyedit.c:4407 g10/keygen.c:2719
  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:4428
++#: g10/keyedit.c:4509
  msgid "Delete this good signature? (y/N/q)"
  msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)"
  
- #: g10/keyedit.c:4438
++#: g10/keyedit.c:4519
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "Voleu esborrar aquesta signatura invàlida? (s/N/x)"
  
- #: g10/keyedit.c:4442
++#: g10/keyedit.c:4523
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "Voleu esborrar aquesta signatura desconeguda? (s/N/x)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4530
  msgid "Really delete this self-signature? (y/N)"
  msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
  
  # Werner FIXME: use ngettext. jm
- #: g10/keyedit.c:4465
++#: g10/keyedit.c:4546
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
@@@ -4820,37 -3800,30 +4778,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:4469
++#: g10/keyedit.c:4550
  msgid "Nothing deleted.\n"
  msgstr "No s'hi ha eliminat res.\n"
  
- #: g10/keyedit.c:4504 g10/trust.c:693
++#: g10/keyedit.c:4585 g10/trust.c:716
  msgid "invalid"
  msgstr "invàlida"
  
- #: g10/keyedit.c:4506
++#: g10/keyedit.c:4587
  #, fuzzy, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "L'ID d'usuari «%s» està revocat."
  
- #: g10/keyedit.c:4512
++#: g10/keyedit.c:4593
  #, 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:4520
++#: g10/keyedit.c:4601
  #, fuzzy, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "l'ID d'usuari «%s» ja està revocat\n"
  
- #: g10/keyedit.c:4521
++#: g10/keyedit.c:4602
  #, fuzzy, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "l'ID d'usuari «%s» ja està revocat\n"
  
- #: g10/keyedit.c:4590
++#: g10/keyedit.c:4671
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4859,41 -3832,33 +4817,41 @@@ 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:4601
++#: g10/keyedit.c:4682
  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:4618
++#: g10/keyedit.c:4699
  msgid "Enter the user ID of the designated revoker: "
  msgstr "Introduïu l'ID d'usuari del revocador designat: "
  
- #: g10/keyedit.c:4643
++#: g10/keyedit.c:4724
  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:4658
++#: g10/keyedit.c:4739
  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:4680
++#: g10/keyedit.c:4761
  #, fuzzy
  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:4698
++#: g10/keyedit.c:4779
  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:4704
++#: g10/keyedit.c:4785
  #, 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:4755
++#: g10/keyedit.c:4848
  #, fuzzy
  msgid ""
  "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@@ -4901,245 -3866,194 +4859,245 @@@
  msgstr ""
  "Esteu segur que voleu nominar aquesta clau com a revocador designat? (s/N): "
  
- #: g10/keyedit.c:4760
++#: g10/keyedit.c:4853
  #, 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:4763
++#: g10/keyedit.c:4856
  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:4814
++#: g10/keyedit.c:4910
  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:4987
++#: g10/keyedit.c:5085
  #, 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:4993
++#: g10/keyedit.c:5091
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr ""
  
- #: g10/keyedit.c:5108
++#: g10/keyedit.c:5206
  msgid "Please select exactly one user ID.\n"
  msgstr "Heu de seleccionar exactament un ID.\n"
  
- #: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
++#: g10/keyedit.c:5247 g10/keyedit.c:5361 g10/keyedit.c:5474 g10/keyedit.c:5611
  #, 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:5320
++#: g10/keyedit.c:5418
  msgid "Enter your preferred keyserver URL: "
  msgstr ""
  
- #: g10/keyedit.c:5399
++#: g10/keyedit.c:5497
  #, fuzzy
  msgid "Are you sure you want to replace it? (y/N) "
  msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
  
- #: g10/keyedit.c:5400
++#: g10/keyedit.c:5498
  #, fuzzy
  msgid "Are you sure you want to delete it? (y/N) "
  msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
  
- #: g10/keyedit.c:5459
++#: g10/keyedit.c:5557
  #, fuzzy
  msgid "Enter the notation: "
  msgstr "Notació de signatura: "
  
- #: g10/keyedit.c:5606
++#: g10/keyedit.c:5704
  #, fuzzy
  msgid "Proceed? (y/N) "
  msgstr "Voleu sobreescriure? (s/N) "
  
- #: g10/keyedit.c:5676
++#: g10/keyedit.c:5774
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "No hi ha cap ID amb l'índex %d\n"
  
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5836
  #, 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:5839
++#: g10/keyedit.c:5937
  #, 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:5861
++#: g10/keyedit.c:5959
  #, fuzzy, c-format
  msgid "No subkey with index %d\n"
  msgstr "No hi ha cap ID amb l'índex %d\n"
  
- #: g10/keyedit.c:6002
++#: g10/keyedit.c:6100
  #, fuzzy, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "ID d'usuari: «"
  
- #: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
++#: g10/keyedit.c:6103 g10/keyedit.c:6205 g10/keyedit.c:6253
  #, 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:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
++#: g10/keyedit.c:6105 g10/keyedit.c:6207 g10/keyedit.c:6255
  msgid " (non-exportable)"
  msgstr " (no-exportable)"
  
- #: g10/keyedit.c:6011
++#: g10/keyedit.c:6109
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "Aquesta signatura va caducar el %s.\n"
  
- #: g10/keyedit.c:6016
++#: g10/keyedit.c:6114
  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:6021
++#: g10/keyedit.c:6119
  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:6075
++#: g10/keyedit.c:6173
  msgid "Not signed by you.\n"
  msgstr ""
  
- #: g10/keyedit.c:6081
++#: g10/keyedit.c:6179
  #, 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:6110
++#: g10/keyedit.c:6208
  #, fuzzy
  msgid " (non-revocable)"
  msgstr " (no-exportable)"
  
- #: g10/keyedit.c:6117
++#: g10/keyedit.c:6215
  #, fuzzy, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "   revocat per %08lX el %s\n"
  
- #: g10/keyedit.c:6142
++#: g10/keyedit.c:6240
  msgid "You are about to revoke these signatures:\n"
  msgstr "Esteu a punt de revocar aquestes signatures:\n"
  
  # (s/N)?  ivb
- #: g10/keyedit.c:6165
++#: g10/keyedit.c:6263
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "Realment voleu crear els certificats de revocació? (s/N) "
  
- #: g10/keyedit.c:6198
++#: g10/keyedit.c:6296
  msgid "no secret key\n"
  msgstr "ho hi ha clau secreta\n"
  
- #: g10/keyedit.c:6246
++#: g10/keyedit.c:6344
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6256
++#: g10/keyedit.c:6354
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "l'ID d'usuari «%s» ja està revocat\n"
  
- #: g10/keyedit.c:6273
++#: g10/keyedit.c:6371
  #, 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:6386
++#: g10/keyedit.c:6485
  #, fuzzy, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "l'ID d'usuari «%s» ja està revocat\n"
  
- #: g10/keyedit.c:6448
++#: g10/keyedit.c:6547
  #, fuzzy, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "l'ID d'usuari «%s» ja està revocat\n"
  
- #: g10/keyedit.c:6545
++#: g10/keyedit.c:6644
  #, fuzzy, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr ""
  "S'està mostrant el photo ID %s de mida %ld per a la clau 0x%08lX (uid %d)\n"
  
- #: g10/keygen.c:305
++#: g10/keygen.c:316
  #, fuzzy, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "la preferència %c%lu és duplicada\n"
  
- #: g10/keygen.c:312
++#: g10/keygen.c:323
  #, fuzzy
  msgid "too many cipher preferences\n"
  msgstr "hi ha massa preferències «%c»\n"
  
- #: g10/keygen.c:314
++#: g10/keygen.c:325
  #, fuzzy
  msgid "too many digest preferences\n"
  msgstr "hi ha massa preferències «%c»\n"
  
- #: g10/keygen.c:316
++#: g10/keygen.c:327
  #, fuzzy
  msgid "too many compression preferences\n"
  msgstr "hi ha massa preferències «%c»\n"
  
- #: g10/keygen.c:457
++#: g10/keygen.c:468
  #, fuzzy, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
  
- #: g10/keygen.c:936
++#: g10/keygen.c:947
  msgid "writing direct signature\n"
  msgstr "s'està escrivint una signatura directa\n"
  
- #: g10/keygen.c:982
++#: g10/keygen.c:993
  msgid "writing self signature\n"
  msgstr "s'està escrivint l'autosignatura\n"
  
- #: g10/keygen.c:1038
++#: g10/keygen.c:1049
  msgid "writing key binding signature\n"
  msgstr "s'està escrivint la signatura de comprovació de la clau\n"
  
- #: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
- #: g10/keygen.c:1610 g10/keygen.c:1615
++#: g10/keygen.c:1413 g10/keygen.c:1418 g10/keygen.c:1470 g10/keygen.c:1475
++#: g10/keygen.c:1622 g10/keygen.c:1627
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "la mida de la clau és invàlida; s'hi usaran %u bits\n"
  
- #: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
++#: g10/keygen.c:1424 g10/keygen.c:1481 g10/keygen.c:1489 g10/keygen.c:1633
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "la mida de la clau ha estat arrodonida fins a %u bits\n"
  
- #: g10/keygen.c:1503
++#: g10/keygen.c:1515
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1677
++#: g10/keygen.c:1689
  #, fuzzy
  msgid "Sign"
  msgstr "sign"
  
- #: g10/keygen.c:1680
++#: g10/keygen.c:1692
  msgid "Certify"
  msgstr ""
  
- #: g10/keygen.c:1683
++#: g10/keygen.c:1695
  #, fuzzy
  msgid "Encrypt"
  msgstr "xifra dades"
  
- #: g10/keygen.c:1686
++#: g10/keygen.c:1698
  msgid "Authenticate"
  msgstr ""
  
@@@ -5153,157 -4067,126 +5111,157 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1705
++#: g10/keygen.c:1717
  msgid "SsEeAaQq"
  msgstr ""
  
- #: g10/keygen.c:1732
++#: g10/keygen.c:1744
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr ""
  
- #: g10/keygen.c:1738
++#: g10/keygen.c:1750
  msgid "Current allowed actions: "
  msgstr ""
  
- #: g10/keygen.c:1743
++#: g10/keygen.c:1755
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr ""
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr ""
  
- #: g10/keygen.c:1749
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr ""
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr ""
  
- #: g10/keygen.c:1881 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1893 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Seleccioneu quin tipus de clau voleu:\n"
  
- #: g10/keygen.c:1885
++#: g10/keygen.c:1897
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) DSA i ElGamal (predeterminat)\n"
  
- #: g10/keygen.c:1889
++#: g10/keygen.c:1901
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA i ElGamal (predeterminat)\n"
  
- #: g10/keygen.c:1892
++#: g10/keygen.c:1904
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (només signar)\n"
  
- #: g10/keygen.c:1894
++#: g10/keygen.c:1906
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (només signar)\n"
  
- #: g10/keygen.c:1900
++#: g10/keygen.c:1912
  #, fuzzy, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) ElGamal (només xifrar)\n"
  
- #: g10/keygen.c:1902
++#: g10/keygen.c:1914
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (només xifrar)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1920
  #, fuzzy, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (només signar)\n"
  
- #: g10/keygen.c:1910
++#: g10/keygen.c:1922
  #, fuzzy, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (només xifrar)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1928
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA i ElGamal (predeterminat)\n"
  
- #: g10/keygen.c:1918
++#: g10/keygen.c:1930
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (només signar)\n"
  
- #: g10/keygen.c:1920
++#: g10/keygen.c:1932
  #, fuzzy, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) DSA (només signar)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1934
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) RSA (només xifrar)\n"
  
- #: g10/keygen.c:1926
++#: g10/keygen.c:1938
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) RSA (només xifrar)\n"
  
- #: g10/keygen.c:2022 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:206
  #, fuzzy
  msgid "Enter the keygrip: "
  msgstr "Notació de signatura: "
  
- #: g10/keygen.c:2035 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2047 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2049 sm/certreqgen-ui.c:216
  #, fuzzy
  msgid "No key with this keygrip\n"
  msgstr "No hi ha cap ID amb l'índex %d\n"
  
- #: g10/keygen.c:2111 g10/keygen.c:2125
++#: g10/keygen.c:2133 g10/keygen.c:2147
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
  msgstr "arrodonida fins a %u bits\n"
  
- #: g10/keygen.c:2166
++#: g10/keygen.c:2188
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr ""
  
- #: g10/keygen.c:2174
++#: g10/keygen.c:2196
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Quina grandària voleu? (1024) "
  
- #: g10/keygen.c:2177 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2199 sm/certreqgen-ui.c:183
  #, fuzzy, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Quina grandària voleu? (1024) "
  
- #: g10/keygen.c:2191 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2213 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "La grandària sol·licitada és %u bits\n"
  
- #: g10/keygen.c:2237
++#: g10/keygen.c:2259
  #, fuzzy
  #| msgid "Please select what kind of key you want:\n"
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Seleccioneu quin tipus de clau voleu:\n"
  
- #: g10/keygen.c:2409
++#: g10/keygen.c:2431
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5319,7 -4202,6 +5277,7 @@@ msgstr "
  "      <n>m = la clau caduca als n mesos\n"
  "      <n>y = la clau caduca als n anys\n"
  
- #: g10/keygen.c:2420
++#: g10/keygen.c:2442
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5335,42 -4217,34 +5293,42 @@@ msgstr "
  "      <n>m = la signatura caduca als n mesos\n"
  "      <n>y = la signatura caduca als n anys\n"
  
- #: g10/keygen.c:2443
++#: g10/keygen.c:2465
  msgid "Key is valid for? (0) "
  msgstr "Indiqueu la validesa de la clau (0) "
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2470
  #, fuzzy, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Indiqueu la validesa de la signatura (0) "
  
- #: g10/keygen.c:2461 g10/keygen.c:2486
++#: g10/keygen.c:2483 g10/keygen.c:2508
  msgid "invalid value\n"
  msgstr "el valor no és vàlid\n"
  
- #: g10/keygen.c:2468
++#: g10/keygen.c:2490
  #, fuzzy
  msgid "Key does not expire at all\n"
  msgstr "%s no caduca en absolut\n"
  
- #: g10/keygen.c:2469
++#: g10/keygen.c:2491
  #, fuzzy
  msgid "Signature does not expire at all\n"
  msgstr "%s no caduca en absolut\n"
  
- #: g10/keygen.c:2474
++#: g10/keygen.c:2496
  #, fuzzy, c-format
  msgid "Key expires at %s\n"
  msgstr "%s caduca el %s\n"
  
- #: g10/keygen.c:2475
++#: g10/keygen.c:2497
  #, fuzzy, c-format
  msgid "Signature expires at %s\n"
  msgstr "Aquesta signatura caduca el %s\n"
  
  # Amb «it» es refereix a les dates?  ivb
  # Això vaig entendre jo. jm
- #: g10/keygen.c:2479
++#: g10/keygen.c:2501
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5378,12 -4252,10 +5336,12 @@@ msgstr "
  "El vostre sistema no pot representar dates posteriors a l'any 2038.\n"
  "Tanmateix, les tractarà bé fins l'any 2106.\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2514
  #, fuzzy
  msgid "Is this correct? (y/N) "
  msgstr "És correcte? (s/n)"
  
- #: g10/keygen.c:2560
++#: g10/keygen.c:2582
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5394,7 -4266,6 +5352,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2575
++#: g10/keygen.c:2597
  #, fuzzy
  msgid ""
  "\n"
@@@ -5411,50 -4282,39 +5369,50 @@@ msgstr "
  "    \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
  "\n"
  
- #: g10/keygen.c:2594
++#: g10/keygen.c:2616
  msgid "Real name: "
  msgstr "Nom i cognoms: "
  
- #: g10/keygen.c:2603
++#: g10/keygen.c:2625
  msgid "Invalid character in name\n"
  msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
  
- #: g10/keygen.c:2604
++#: g10/keygen.c:2626
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2608
++#: g10/keygen.c:2630
  msgid "Name may not start with a digit\n"
  msgstr "El nom no pot començar amb un dígit\n"
  
- #: g10/keygen.c:2611
++#: g10/keygen.c:2633
  msgid "Name must be at least 5 characters long\n"
  msgstr "El nom ha de tenir, si més no, 5 caràcters\n"
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2643
  msgid "Email address: "
  msgstr "Adreça electrònica: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2649
  msgid "Not a valid email address\n"
  msgstr "No és una adreça vàlida\n"
  
- #: g10/keygen.c:2636
++#: g10/keygen.c:2658
  msgid "Comment: "
  msgstr "Comentari: "
  
- #: g10/keygen.c:2642
++#: g10/keygen.c:2664
  msgid "Invalid character in comment\n"
  msgstr "Hi ha un caràcter invàlid en el camp *comentari*\n"
  
- #: g10/keygen.c:2678
++#: g10/keygen.c:2700
  #, fuzzy, c-format
  #| msgid "You are using the `%s' character set.\n"
  msgid "You are using the '%s' character set.\n"
  msgstr "Esteu usant el joc de caràcters `%s'.\n"
  
- #: g10/keygen.c:2684
++#: g10/keygen.c:2706
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5465,7 -4325,6 +5423,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2689
++#: g10/keygen.c:2711
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr "No inclogueu l'adreça ni en el camp *nom* ni en el camp *comentari*\n"
  
@@@ -5482,35 -4341,28 +5440,35 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2714
++#: g10/keygen.c:2736
  msgid "NnCcEeOoQq"
  msgstr "NnCcEeOoXx"
  
- #: g10/keygen.c:2724
++#: g10/keygen.c:2746
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "Canvia (N)om, (C)omentari, (E)mail o (X) ix "
  
- #: g10/keygen.c:2725
++#: g10/keygen.c:2747
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr "Canvia (N)om, (C)omentari, (E)mail o (O) d'acord / (X) ix"
  
- #: g10/keygen.c:2730
++#: g10/keygen.c:2752
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "Canvia (N)om, (C)omentari, (E)mail o (X) ix "
  
- #: g10/keygen.c:2731
++#: g10/keygen.c:2753
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "Canvia (N)om, (C)omentari, (E)mail o (O) d'acord / (X) ix"
  
- #: g10/keygen.c:2750
++#: g10/keygen.c:2772
  msgid "Please correct the error first\n"
  msgstr "Corregiu l'error primer\n"
  
- #: g10/keygen.c:2796
++#: g10/keygen.c:2818
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5522,13 -4374,10 +5480,13 @@@ msgstr "
  "nombres primers; açò dóna oportunitat al generador de nombres aleatoris\n"
  "d'aconseguir prou entropia.\n"
  
- #: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
- #: g10/keygen.c:4777 g10/keygen.c:4882
++#: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
++#: g10/keygen.c:4330 g10/keygen.c:4803 g10/keygen.c:5064 g10/keygen.c:5169
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "La generació de claus ha fallat: %s\n"
  
- #: g10/keygen.c:3598
++#: g10/keygen.c:3922
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5536,69 -4385,56 +5494,69 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3924
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3621
++#: g10/keygen.c:3945
  #, fuzzy, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "«%s» ja està comprimida\n"
  
- #: g10/keygen.c:3626
++#: g10/keygen.c:3950
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "Create anyway? (y/N) "
  msgstr "Voleu crear la clau de tota manera? "
  
- #: g10/keygen.c:3632
++#: g10/keygen.c:3956
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "creating anyway\n"
  msgstr "Voleu crear la clau de tota manera? "
  
- #: g10/keygen.c:3981
++#: g10/keygen.c:4315
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:4013
++#: g10/keygen.c:4358
  msgid "Key generation canceled.\n"
  msgstr "La generació de claus ha estat cancel·lada.\n"
  
- #: g10/keygen.c:4073
++#: g10/keygen.c:4418
  #, fuzzy, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "no s'ha pogut crear «%s»: %s\n"
  
- #: g10/keygen.c:4093
++#: g10/keygen.c:4438
  #, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr ""
  
- #: g10/keygen.c:4244 g10/keygen.c:4393
++#: g10/keygen.c:4589 g10/keygen.c:4738
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
  msgstr "s'està escrivint la clau pública a «%s»\n"
  
  # Potser no hi haja cap anell! ivb
- #: g10/keygen.c:4387
++#: g10/keygen.c:4732
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "no s'ha trobat cap anell públic escrivible: %s\n"
  
- #: g10/keygen.c:4401
++#: g10/keygen.c:4746
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error writing public keyring '%s': %s\n"
  msgstr "s'ha produït un error mentre s'escrivia l'anell públic «%s»: %s\n"
  
- #: g10/keygen.c:4433
++#: g10/keygen.c:4778
  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:4445
++#: g10/keygen.c:4790
  #, fuzzy
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
@@@ -5608,7 -4444,6 +5566,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:4649 g10/keygen.c:4833
++#: g10/keygen.c:4936 g10/keygen.c:5120
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5617,7 -4452,6 +5575,7 @@@ msgstr "
  "amb el rellotge)\n"
  
  # Werner FIXME: use ngettext. jm
- #: g10/keygen.c:4651 g10/keygen.c:4835
++#: g10/keygen.c:4938 g10/keygen.c:5122
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5625,22 -4459,18 +5583,22 @@@ 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:4662 g10/keygen.c:4846
++#: g10/keygen.c:4949 g10/keygen.c:5133
  #, fuzzy
  #| 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:4674 g10/keygen.c:4676
++#: g10/keygen.c:4961 g10/keygen.c:4963
  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:4683 g10/keygen.c:4685
++#: g10/keygen.c:4970 g10/keygen.c:4972
  #, fuzzy
  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:4704 g10/keygen.c:4860
++#: g10/keygen.c:4991 g10/keygen.c:5147
  #, fuzzy
  msgid "Really create? (y/N) "
  msgstr "Crear realment? "
@@@ -5973,129 -4738,103 +5931,129 @@@ msgstr "
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
  msgstr "revocació autònoma: useu \"gpg --import\" per a aplicar-la\n"
  
- #: g10/mainproc.c:1233 g10/mainproc.c:1276
++#: g10/mainproc.c:1238 g10/mainproc.c:1281
  #, fuzzy
  msgid "no signature found\n"
  msgstr "Signatura correcta de \""
  
- #: g10/mainproc.c:1607
++#: g10/mainproc.c:1612
  #, fuzzy, c-format
  msgid "BAD signature from \"%s\""
  msgstr "Signatura INCORRECTA de \""
  
- #: g10/mainproc.c:1609
++#: g10/mainproc.c:1614
  #, fuzzy, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Signatura caducada de \""
  
- #: g10/mainproc.c:1611
++#: g10/mainproc.c:1616
  #, fuzzy, c-format
  msgid "Good signature from \"%s\""
  msgstr "Signatura correcta de \""
  
- #: g10/mainproc.c:1630
++#: g10/mainproc.c:1635
  msgid "signature verification suppressed\n"
  msgstr "s'ha eliminat la verificació de signatura\n"
  
- #: g10/mainproc.c:1739
++#: g10/mainproc.c:1744
  #, fuzzy
  msgid "can't handle this ambiguous signature data\n"
  msgstr "no es poden tractar aquestes signatures múltiples\n"
  
- #: g10/mainproc.c:1753 g10/mainproc.c:1761
++#: g10/mainproc.c:1758 g10/mainproc.c:1766
  #, fuzzy, c-format
  msgid "Signature made %s\n"
  msgstr "Aquesta signatura va caducar el %s\n"
  
- #: g10/mainproc.c:1754 g10/mainproc.c:1762
++#: g10/mainproc.c:1759 g10/mainproc.c:1767
  #, fuzzy, c-format
  msgid "               using %s key %s\n"
  msgstr "              alias \""
  
  # «%.*s» no serà una data?  Caldrà «el» al davant.  ivb
- #: g10/mainproc.c:1766
++#: g10/mainproc.c:1771
  #, 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:1772
++#: g10/mainproc.c:1777
  #, fuzzy, c-format
  msgid "               issuer \"%s\"\n"
  msgstr "              alias \""
  
- #: g10/mainproc.c:1789
++#: g10/mainproc.c:1794
  msgid "Key available at: "
  msgstr "La clau és disponible en: "
  
- #: g10/mainproc.c:2024
++#: g10/mainproc.c:2029
  msgid "[uncertain]"
  msgstr "[incert]"
  
- #: g10/mainproc.c:2062
++#: g10/mainproc.c:2067
  #, fuzzy, c-format
  msgid "                aka \"%s\""
  msgstr "              alias \""
  
- #: g10/mainproc.c:2145
++#: g10/mainproc.c:2150
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "Aquesta signatura va caducar el %s\n"
  
- #: g10/mainproc.c:2149
++#: g10/mainproc.c:2154
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "Aquesta signatura caduca el %s\n"
  
- #: g10/mainproc.c:2160
++#: g10/mainproc.c:2165
  #, 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:2161
++#: g10/mainproc.c:2166
  msgid "binary"
  msgstr "binari"
  
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2167
  msgid "textmode"
  msgstr "mode text"
  
- #: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "desconeguda"
  
- #: g10/mainproc.c:2164
++#: g10/mainproc.c:2169
  #, fuzzy
  #| msgid "unknown pubkey algorithm"
  msgid ", key algorithm "
  msgstr "l'algoritme de clau pública és desconegut"
  
- #: g10/mainproc.c:2199
++#: g10/mainproc.c:2204
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2229
++#: g10/mainproc.c:2234
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "No s'ha pogut comprovar la signatura: %s\n"
  
- #: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
++#: g10/mainproc.c:2327 g10/mainproc.c:2346 g10/mainproc.c:2470
  msgid "not a detached signature\n"
  msgstr "no és una signatura separada\n"
  
- #: g10/mainproc.c:2375
++#: g10/mainproc.c:2380
  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:2384
++#: g10/mainproc.c:2389
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "signatura autònoma de classe 0x%02x\n"
  
- #: g10/mainproc.c:2469
++#: g10/mainproc.c:2474
  msgid "old style (PGP 2.x) signature\n"
  msgstr "signatura de l'estil antic (PGP 2.x)\n"
  
@@@ -6389,23 -5074,18 +6347,23 @@@ msgstr "És aquesta foto correcta (s/N/
  msgid "unable to display photo ID!\n"
  msgstr "no s'ha pogut mostrar el photo ID!\n"
  
- #: g10/pkclist.c:72 g10/revoke.c:757
++#: g10/pkclist.c:72 g10/revoke.c:758
  msgid "No reason specified"
  msgstr "No s'ha especificat cap raó"
  
- #: g10/pkclist.c:74 g10/revoke.c:759
++#: g10/pkclist.c:74 g10/revoke.c:760
  msgid "Key is superseded"
  msgstr "La clau ha estat substituïda"
  
- #: g10/pkclist.c:76 g10/revoke.c:758
++#: g10/pkclist.c:76 g10/revoke.c:759
  msgid "Key has been compromised"
  msgstr "La clau ha estat compromesa"
  
- #: g10/pkclist.c:78 g10/revoke.c:760
++#: g10/pkclist.c:78 g10/revoke.c:761
  msgid "Key is no longer used"
  msgstr "La clau ja no s'usa"
  
- #: g10/pkclist.c:80 g10/revoke.c:761
++#: g10/pkclist.c:80 g10/revoke.c:762
  msgid "User ID is no longer valid"
  msgstr "L'ID d'usuari ja no és vàlid"
  
@@@ -6487,7 -5154,6 +6445,7 @@@ msgid "
  "\n"
  msgstr ""
  
- #: g10/pkclist.c:310 g10/revoke.c:786
++#: g10/pkclist.c:310 g10/revoke.c:787
  msgid "Your decision? "
  msgstr "La vostra decisió? "
  
@@@ -6528,10 -5187,9 +6486,10 @@@ msgstr "
  "No s'han trobat certificats amb confiança no definida.\n"
  "\n"
  
 +#: g10/pkclist.c:484
  #, fuzzy
  msgid ""
- "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "This key is bad!  It has been marked as untrusted!  If you\n"
  "*really* know what you are doing, you may answer the next\n"
  "question with yes.\n"
  msgstr ""
@@@ -6690,33 -5318,26 +6648,33 @@@ msgstr "
  msgid "No such user ID.\n"
  msgstr "Usuari inexistent.\n"
  
- #: g10/pkclist.c:1197 g10/pkclist.c:1273
++#: g10/pkclist.c:1197 g10/pkclist.c:1274
  msgid "skipped: public key already set as default recipient\n"
  msgstr "es descarta: la clau pública ja s'ha especificat com a destinatari\n"
  
- #: g10/pkclist.c:1218
++#: g10/pkclist.c:1219
  msgid "Public key is disabled.\n"
  msgstr "La clau pública està desactivada.\n"
  
- #: g10/pkclist.c:1228
++#: g10/pkclist.c:1229
  msgid "skipped: public key already set\n"
  msgstr "es descarta: la clau pública ja està establida\n"
  
- #: g10/pkclist.c:1263
++#: g10/pkclist.c:1264
  #, fuzzy, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "el destinatari predeterminat és desconegut «%s»\n"
  
- #: g10/pkclist.c:1312
++#: g10/pkclist.c:1313
  msgid "no valid addressees\n"
  msgstr "no hi ha adreces vàlides\n"
  
- #: g10/pkclist.c:1665
++#: g10/pkclist.c:1666
  #, fuzzy, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "clau %08lX: sense ID\n"
  
- #: g10/pkclist.c:1690
++#: g10/pkclist.c:1691
  #, fuzzy, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "clau %08lX: sense ID\n"
@@@ -6727,29 -5347,23 +6685,29 @@@ msgstr "les dades no s'han desat; useu 
  
  # Indi? ivb
  # Em pense que no. jm
- #: g10/plaintext.c:598
++#: g10/plaintext.c:614
  msgid "Detached signature.\n"
  msgstr "Signatura separada.\n"
  
- #: g10/plaintext.c:606
++#: g10/plaintext.c:622
  msgid "Please enter name of data file: "
  msgstr "Introduïu el nom del fitxer de dades: "
  
- #: g10/plaintext.c:643
++#: g10/plaintext.c:659
  msgid "reading stdin ...\n"
  msgstr "s'està llegint d'stdin...\n"
  
- #: g10/plaintext.c:688
++#: g10/plaintext.c:704
  msgid "no signed data\n"
  msgstr "no hi ha dades signades\n"
  
- #: g10/plaintext.c:706
++#: g10/plaintext.c:722
  #, fuzzy, c-format
  #| msgid "can't open signed data `%s'\n"
  msgid "can't open signed data '%s'\n"
  msgstr "no s'han pogut obrir les dades signades `%s'\n"
  
- #: g10/plaintext.c:741
++#: g10/plaintext.c:757
  #, fuzzy, c-format
  msgid "can't open signed data fd=%d: %s\n"
  msgstr "no s'han pogut obrir les dades signades `%s'\n"
@@@ -6820,7 -5420,6 +6778,7 @@@ msgstr "La clau secreta està disponibl
  msgid "Create a designated revocation certificate for this key? (y/N) "
  msgstr "Voleu crear un certificat de revocació per a aquesta clau? "
  
- #: g10/revoke.c:336 g10/revoke.c:727
++#: g10/revoke.c:336 g10/revoke.c:728
  msgid "ASCII armored output forced.\n"
  msgstr "s'ha forçat l'eixida d'armadura ASCII.\n"
  
@@@ -6856,23 -5449,20 +6814,23 @@@ msgid "
  "the secret key.  However, if the secret key is still accessible,\n"
  "it is better to generate a new revocation certificate and give\n"
  "a reason for the revocation.  For details see the description of\n"
- "of the gpg command \"--gen-revoke\" in the GnuPG manual."
+ "of the gpg command \"--generate-revocation\" in the GnuPG manual."
  msgstr ""
  
- #: g10/revoke.c:575
++#: g10/revoke.c:576
  msgid ""
  "To avoid an accidental use of this file, a colon has been inserted\n"
  "before the 5 dashes below.  Remove this colon with a text editor\n"
  "before importing and publishing this revocation certificate."
  msgstr ""
  
- #: g10/revoke.c:590
++#: g10/revoke.c:591
  #, fuzzy, c-format
  #| msgid "Revocation certificate created.\n"
  msgid "revocation certificate stored as '%s.rev'\n"
  msgstr "S'ha creat el certificat de revocació.\n"
  
- #: g10/revoke.c:634
++#: g10/revoke.c:635
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found\n"
  msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
@@@ -6880,23 -5470,19 +6838,23 @@@
  #. TRANSLATORS: The %s prints a key specification which
  #. for example has been given at the command line.  Several lines
  #. lines with secret key infos are printed after this message.
- #: g10/revoke.c:661
++#: g10/revoke.c:662
  #, c-format
  msgid "'%s' matches multiple secret keys:\n"
  msgstr ""
  
- #: g10/revoke.c:688
++#: g10/revoke.c:689
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error searching the keyring: %s\n"
  msgstr "error en crear l'anell «%s»: %s\n"
  
- #: g10/revoke.c:711
++#: g10/revoke.c:712
  #, fuzzy
  msgid "Create a revocation certificate for this key? (y/N) "
  msgstr "Voleu crear un certificat de revocació per a aquesta clau? "
  
- #: g10/revoke.c:735
++#: g10/revoke.c:736
  msgid ""
  "Revocation certificate created.\n"
  "\n"
@@@ -6915,34 -5501,27 +6873,34 @@@ msgstr "
  "d'impressió de la vostra màquina podria emmagatzemar les dades i fer-les\n"
  "disponibles a altres!\n"
  
- #: g10/revoke.c:769
++#: g10/revoke.c:770
  msgid "Please select the reason for the revocation:\n"
  msgstr "Seleccioneu la raó de la revocació:\n"
  
- #: g10/revoke.c:779
++#: g10/revoke.c:780
  msgid "Cancel"
  msgstr "Cancel·la"
  
- #: g10/revoke.c:781
++#: g10/revoke.c:782
  #, c-format
  msgid "(Probably you want to select %d here)\n"
  msgstr "(Segurament voleu seleccionar %d ací)\n"
  
- #: g10/revoke.c:822
++#: g10/revoke.c:823
  msgid "Enter an optional description; end it with an empty line:\n"
  msgstr ""
  "Introduïu una descripció opcional; finalitzeu amb una línia en blanc:\n"
  
- #: g10/revoke.c:850
++#: g10/revoke.c:851
  #, c-format
  msgid "Reason for revocation: %s\n"
  msgstr "Raó de la revocació: %s\n"
  
- #: g10/revoke.c:852
++#: g10/revoke.c:853
  msgid "(No description given)\n"
  msgstr "(No es va donar una descripció)\n"
  
- #: g10/revoke.c:857
++#: g10/revoke.c:858
  #, fuzzy
  msgid "Is this okay? (y/N) "
  msgstr "És açò correcte? "
@@@ -7084,23 -5643,19 +7042,23 @@@ msgstr "
  "AVÍS: no s'ha pogut %%-expandir l'url de política (massa gran). S'utilitza "
  "no expandida.\n"
  
- #: g10/sign.c:329
++#: g10/sign.c:331
  #, fuzzy, c-format
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s signatura de: «%s»\n"
  
- #: g10/sign.c:878
++#: g10/sign.c:880
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
  msgstr ""
  "forçar l'algoritme de digest %s (%d) viola les preferències del destinatari\n"
  
- #: g10/sign.c:1009
++#: g10/sign.c:1011
  msgid "signing:"
  msgstr "signatura:"
  
- #: g10/sign.c:1286
++#: g10/sign.c:1288
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "s'utilitzarà xifratge %s\n"
@@@ -7127,7 -5678,6 +7085,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:362
++#: g10/tdbdump.c:57 g10/trustdb.c:369
  #, 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"
@@@ -7175,7 -5717,6 +7133,7 @@@ msgstr "error en trobar el registre de 
  msgid "read error in '%s': %s\n"
  msgstr "error de lectura: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "base de dades de confiança: no s'ha pogut sincronitzar: %s\n"
@@@ -7324,17 -5836,14 +7282,17 @@@ msgstr "no es poden tractar línies mé
  msgid "input line longer than %d characters\n"
  msgstr "la línia d'entrada és superior a %d caràcters\n"
  
- #: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
++#: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
  #, fuzzy, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "error mentre s'enviava a «%s»: %s\n"
  
- #: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
++#: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:357 g10/tofu.c:699
++#: g10/tofu.c:355 g10/tofu.c:888
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
@@@ -7344,284 -5853,295 +7302,358 @@@
  # 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/tofu.c:501
++#: g10/tofu.c:505
  #, fuzzy, c-format
  msgid "unsupported TOFU database version: %s\n"
  msgstr ""
  "\n"
  "Algoritmes suportats:\n"
  
- #: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
- #: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
- #: g10/tofu.c:3056
++#: g10/tofu.c:538
+ #, fuzzy, c-format
+ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
+ msgstr "error en la creació de la contrasenya: %s\n"
+ 
++#: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
+ msgid "TOFU DB error"
+ msgstr ""
+ 
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2340 g10/tofu.c:2359
++#: g10/tofu.c:2372 g10/tofu.c:2384 g10/tofu.c:2399 g10/tofu.c:2411
++#: g10/tofu.c:2980 g10/tofu.c:2997 g10/tofu.c:3033 g10/tofu.c:3050
++#: g10/tofu.c:3353
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "error mentre s'enviava a «%s»: %s\n"
  
- #: g10/tofu.c:566 g10/tofu.c:574
++#: g10/tofu.c:716 g10/tofu.c:724
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error determining TOFU database's version: %s\n"
  msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
  
- #: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
++#: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing TOFU database: %s\n"
  msgstr "%s: error en escriure el registre de directoris: %s\n"
  
- #: g10/tofu.c:765
++#: g10/tofu.c:844
+ #, fuzzy, c-format
+ msgid "error creating 'encryptions' TOFU table: %s\n"
+ msgstr "error mentre s'enviava a «%s»: %s\n"
+ 
++#: g10/tofu.c:874
+ #, c-format
+ msgid "adding column effective_policy to bindings DB: %s\n"
+ msgstr ""
+ 
++#: g10/tofu.c:956
  #, fuzzy, c-format
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "error en la lectura de «%s»: %s\n"
  
- #: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
++#: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "error mentre s'enviava a «%s»: %s\n"
  
- #: g10/tofu.c:1239
++#: g10/tofu.c:1328
  #, c-format
  msgid ""
  "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1247
++#: g10/tofu.c:1337
  #, c-format
- msgid "The email address \"%s\" is associated with %d keys!"
- msgstr ""
+ msgid "The email address \"%s\" is associated with %d key!"
+ msgid_plural "The email address \"%s\" is associated with %d keys!"
+ msgstr[0] ""
+ msgstr[1] ""
  
- #: g10/tofu.c:1251
++#: g10/tofu.c:1343
  msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  
- #: g10/tofu.c:1257
++#: g10/tofu.c:1349
  #, c-format
  msgid ""
  "Please indicate whether this email address should be associated with key %s "
  "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1513
++#: g10/tofu.c:1605
  #, fuzzy, c-format
  msgid "error gathering other user IDs: %s\n"
  msgstr "error en crear «%s»: %s\n"
  
- #: g10/tofu.c:1523
++#: g10/tofu.c:1615
  #, fuzzy
  #| msgid "list key and user IDs"
  msgid "This key's user IDs:\n"
  msgstr "llista claus i ID"
  
- #: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
++#: g10/tofu.c:1631 g10/tofu.c:1796
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "policy: %s"
  msgstr "Política: "
  
- #: g10/tofu.c:1630
++#: g10/tofu.c:1722
  #, fuzzy, c-format
  msgid "error gathering signature stats: %s\n"
  msgstr "error en crear «%s»: %s\n"
  
- #: g10/tofu.c:1634
++#: g10/tofu.c:1726
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1651
++#: g10/tofu.c:1744
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1684 g10/tofu.c:1689
++#: g10/tofu.c:1785 g10/tofu.c:1790
  msgid ", "
  msgstr ""
  
- #: g10/tofu.c:1693
++#: g10/tofu.c:1794
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
  msgstr "llista claus"
  
- #: g10/tofu.c:1715
++#: g10/tofu.c:1820
+ #, fuzzy, c-format
+ msgid "Verified %d message."
+ msgid_plural "Verified %d messages."
+ msgstr[0] "|algo [fitxers]|imprimeix resums de missatges"
+ msgstr[1] "|algo [fitxers]|imprimeix resums de missatges"
+ 
++#: g10/tofu.c:1824
  #, fuzzy, c-format
- msgid "Verified %d message"
- msgid_plural "Verified %d messages"
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid "Encrypted %d message."
+ msgid_plural "Encrypted %d messages."
+ msgstr[0] "xifrat amb %lu contrasenyes\n"
+ msgstr[1] "xifrat amb %lu contrasenyes\n"
+ 
++#: g10/tofu.c:1831
+ #, fuzzy, c-format
+ msgid "Verified %d message in the future."
+ msgid_plural "Verified %d messages in the future."
+ msgstr[0] "|algo [fitxers]|imprimeix resums de missatges"
+ msgstr[1] "|algo [fitxers]|imprimeix resums de missatges"
+ 
++#: g10/tofu.c:1835
+ #, fuzzy, c-format
+ msgid "Encrypted %d message in the future."
+ msgid_plural "Encrypted %d messages in the future."
  msgstr[0] "|algo [fitxers]|imprimeix resums de missatges"
  msgstr[1] "|algo [fitxers]|imprimeix resums de missatges"
  
- #: g10/tofu.c:1719
++#: g10/tofu.c:1849
  #, c-format
- msgid "Encrypted %d message"
- msgid_plural "Encrypted %d messages"
+ msgid "Messages verified over the past %d day: %d."
+ msgid_plural "Messages verified over the past %d days: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1734
++#: g10/tofu.c:1855
  #, c-format
- msgid " over the past day."
- msgid_plural " over the past %d days."
+ msgid "Messages encrypted over the past %d day: %d."
+ msgid_plural "Messages encrypted over the past %d days: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1740
++#: g10/tofu.c:1865
  #, c-format
- msgid " over the past month."
- msgid_plural " over the past %d months."
+ msgid "Messages verified over the past %d month: %d."
+ msgid_plural "Messages verified over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1746
++#: g10/tofu.c:1871
  #, c-format
- msgid " over the past year."
- msgid_plural " over the past %d years."
+ msgid "Messages encrypted over the past %d month: %d."
+ msgid_plural "Messages encrypted over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1752
- msgid " in the past."
++#: g10/tofu.c:1881
+ #, c-format
+ msgid "Messages verified over the past %d year: %d."
+ msgid_plural "Messages verified over the past %d years: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1887
+ #, c-format
+ msgid "Messages encrypted over the past %d year: %d."
+ msgid_plural "Messages encrypted over the past %d years: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1895
+ #, c-format
+ msgid "Messages verified in the past: %d."
  msgstr ""
  
++#: g10/tofu.c:1899
+ #, fuzzy, c-format
+ msgid "Messages encrypted in the past: %d."
+ msgstr "|algo [fitxers]|imprimeix resums de missatges"
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1767
++#: g10/tofu.c:1916
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1809
++#: g10/tofu.c:1958
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1815
++#: g10/tofu.c:1964
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1823
++#: g10/tofu.c:1972
  msgid "Defaulting to unknown."
  msgstr ""
  
- #: g10/tofu.c:1938 g10/tofu.c:2074
++#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
- #: g10/tofu.c:1994
++#: g10/tofu.c:2143
  #, fuzzy, c-format
  msgid "resetting keydb: %s\n"
  msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
  
- #: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
- #: g10/tofu.c:2425
++#: g10/tofu.c:2601
  #, fuzzy, c-format
- msgid "error setting TOFU binding's trust level to %s\n"
+ msgid "error setting TOFU binding's policy to %s\n"
  msgstr "error en la lectura de «%s»: %s\n"
  
- #: g10/tofu.c:2473
++#: g10/tofu.c:2794
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "error en la creació de la contrasenya: %s\n"
  
- #. TRANSLATORS: The tilde ('~') is used here to indicate a
- #. * non-breakable space
- #: g10/tofu.c:2574
++#: g10/tofu.c:2839
  #, c-format
- msgid "%d~year"
- msgid_plural "%d~years"
+ msgid "%lld~year"
+ msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2583
++#: g10/tofu.c:2844
  #, c-format
- msgid "%d~month"
- msgid_plural "%d~months"
+ msgid "%lld~month"
+ msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2592
++#: g10/tofu.c:2849
  #, c-format
- msgid "%d~day"
- msgid_plural "%d~days"
+ msgid "%lld~week"
+ msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2854
  #, c-format
- msgid "%d~hour"
- msgid_plural "%d~hours"
+ msgid "%lld~day"
+ msgid_plural "%lld~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2610
++#: g10/tofu.c:2859
  #, c-format
- msgid "%d~minute"
- msgid_plural "%d~minutes"
+ msgid "%lld~hour"
+ msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2619
++#: g10/tofu.c:2864
  #, c-format
- msgid "%d~second"
- msgid_plural "%d~seconds"
+ msgid "%lld~minute"
+ msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2802
++#: g10/tofu.c:2866
  #, c-format
- msgid "%s: "
+ msgid "%lld~second"
+ msgid_plural "%lld~seconds"
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:3103
+ #, c-format
+ msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
  # Werner FIXME: use ngettext. jm
- #: g10/tofu.c:2806
++#: g10/tofu.c:3109
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
- msgid "Verified %ld signatures"
+ msgid "%s: Verified 0 signatures."
  msgstr "S'han esborrat %d signatures.\n"
  
- #: g10/tofu.c:2816
++#: g10/tofu.c:3117
  #, fuzzy, c-format
- msgid "Verified %ld signature in the past %s"
- msgid_plural "Verified %ld signatures in the past %s"
+ msgid "%s: Verified %ld~signature in the past %s."
+ msgid_plural "%s: Verified %ld~signatures in the past %s."
  msgstr[0] "|algo [fitxers]|imprimeix resums de missatges"
  msgstr[1] "|algo [fitxers]|imprimeix resums de missatges"
  
- #: g10/tofu.c:2826
- #, fuzzy, c-format
++#: g10/tofu.c:3127
+ #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
- msgid ", and encrypted %ld messages"
+ msgid "Encrypted 0 messages."
  msgstr "xifrat amb %lu contrasenyes\n"
  
- #: g10/tofu.c:2835
++#: g10/tofu.c:3135
  #, fuzzy, c-format
- msgid ", and encrypted %ld message in the past %s"
- msgid_plural ", and encrypted %ld messages in the past %s"
+ msgid "Encrypted %ld~message in the past %s."
+ msgid_plural "Encrypted %ld~messages in the past %s."
  msgstr[0] "|algo [fitxers]|imprimeix resums de missatges"
  msgstr[1] "|algo [fitxers]|imprimeix resums de missatges"
  
- #: g10/tofu.c:2880
++#: g10/tofu.c:3146
+ #, fuzzy, c-format
+ #| msgid "Policy: "
+ msgid "(policy: %s)"
+ msgstr "Política: "
+ 
++#: g10/tofu.c:3177
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2883
++#: g10/tofu.c:3180
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2887
++#: g10/tofu.c:3184
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2890
++#: g10/tofu.c:3187
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2919
++#: g10/tofu.c:3216
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7638,18 -6158,14 +7670,18 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
- #: g10/tofu.c:3480 g10/tofu.c:3572
++#: g10/tofu.c:3298 g10/tofu.c:3449 g10/tofu.c:3627 g10/tofu.c:3670
++#: g10/tofu.c:3784 g10/tofu.c:3859 g10/tofu.c:3894
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "error mentre s'enviava a «%s»: %s\n"
  
- #: g10/tofu.c:3185
++#: g10/tofu.c:3482
  #, c-format
- msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
  msgstr ""
  
- #: g10/tofu.c:3515
++#: g10/tofu.c:3819
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7683,80 -6194,65 +7715,80 @@@ msgstr "
  msgid "key %s marked as ultimately trusted\n"
  msgstr "s'ha marcat la clau com a de confiança absoluta.\n"
  
- #: g10/trustdb.c:341
++#: g10/trustdb.c:348
  #, 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:347
++#: g10/trustdb.c:354
  #, 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:422
++#: g10/trustdb.c:429
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr ""
  
- #: g10/trustdb.c:431
++#: g10/trustdb.c:438
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:468
++#: g10/trustdb.c:475
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:474
++#: g10/trustdb.c:481
  #, c-format
  msgid "using %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:511
++#: g10/trustdb.c:518
  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:517 g10/trustdb.c:2160
++#: g10/trustdb.c:524 g10/trustdb.c:2187
  #, 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:526
++#: g10/trustdb.c:533
  #, 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:542
++#: g10/trustdb.c:549
  #, 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:749 g10/trustdb.c:1313
++#: g10/trustdb.c:756 g10/trustdb.c:1340
  #, 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:966
++#: g10/trustdb.c:973
  msgid "please do a --check-trustdb\n"
  msgstr "si us plau, feu un --check-trustdb\n"
  
- #: g10/trustdb.c:971
++#: g10/trustdb.c:978
  msgid "checking the trustdb\n"
  msgstr "s'està comprovant la base de dades de confiança\n"
  
- #: g10/trustdb.c:1883
++#: g10/trustdb.c:1910
  #, 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:1886
++#: g10/trustdb.c:1913
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7764,23 -6260,19 +7796,23 @@@ msgid_plural " (%d validity counts clea
  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:1956
++#: g10/trustdb.c:1983
  msgid "no ultimately trusted keys found\n"
  msgstr "no s'han trobat claus amb confiança absoluta\n"
  
- #: g10/trustdb.c:1970
++#: g10/trustdb.c:1997
  #, 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:2087
++#: g10/trustdb.c:2114
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr ""
  
- #: g10/trustdb.c:2167
++#: g10/trustdb.c:2194
  #, 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"
@@@ -7895,19 -6366,14 +7927,19 @@@ msgid "
  "List, export, import Keybox data\n"
  msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3208
++#: scd/app-nks.c:718 scd/app-openpgp.c:3221
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3220
++#: scd/app-nks.c:726 scd/app-openpgp.c:3233
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
- #: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
- #: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1965 scd/app-openpgp.c:1984
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2166 scd/app-openpgp.c:2430
++#: scd/app-openpgp.c:2477 scd/app-openpgp.c:2582 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr ""
@@@ -7956,84 -6413,66 +7988,84 @@@ msgid "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2511 scd/app-dinsig.c:532
  #, fuzzy, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "error en crear «%s»: %s\n"
  
- #: scd/app-openpgp.c:806
++#: scd/app-openpgp.c:801
  #, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
  
- #: scd/app-openpgp.c:819
++#: scd/app-openpgp.c:814
  #, fuzzy, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
  
- #: scd/app-openpgp.c:1236
++#: scd/app-openpgp.c:1247
  msgid "response does not contain the RSA modulus\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1243
++#: scd/app-openpgp.c:1254
  msgid "response does not contain the RSA public exponent\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1353
++#: scd/app-openpgp.c:1364
  #, fuzzy
  #| msgid "remove keys from the public keyring"
  msgid "response does not contain the EC public key\n"
  msgstr "elimina claus de l'anell públic"
  
- #: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:1464 scd/app-openpgp.c:3825
  msgid "response does not contain the public key data\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1551
++#: scd/app-openpgp.c:1564
  #, fuzzy, c-format
  msgid "reading public key failed: %s\n"
  msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
  
- #: scd/app-openpgp.c:1903
++#: scd/app-openpgp.c:1916
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1910
++#: scd/app-openpgp.c:1923
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1925
++#: scd/app-openpgp.c:1938
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr ""
  
- #: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
++#: scd/app-openpgp.c:1949 scd/app-openpgp.c:2424
  #, fuzzy
  msgid "||Please enter the PIN"
  msgstr "canvia la contrasenya"
  
- #: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2173 scd/app-openpgp.c:2437
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
- #: scd/app-openpgp.c:4114
++#: scd/app-openpgp.c:2004 scd/app-openpgp.c:2043 scd/app-openpgp.c:2185
++#: scd/app-openpgp.c:4126
  #, fuzzy, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "l'enviament al servidor de claus ha fallat: %s\n"
  
- #: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
++#: scd/app-openpgp.c:2072 scd/app-openpgp.c:2458 scd/app-openpgp.c:4556
  msgid "error retrieving CHV status from card\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
++#: scd/app-openpgp.c:2078 scd/app-openpgp.c:4565
  msgid "card is permanently locked!\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2072
++#: scd/app-openpgp.c:2085
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -8043,26 -6482,21 +8075,26 @@@ msgstr[1] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:2082
++#: scd/app-openpgp.c:2095
  #, fuzzy, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "canvia la contrasenya"
  
- #: scd/app-openpgp.c:2086
++#: scd/app-openpgp.c:2099
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
  msgstr "canvia la contrasenya"
  
- #: scd/app-openpgp.c:2107
++#: scd/app-openpgp.c:2120
  msgid "access to admin commands is not configured\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2460
++#: scd/app-openpgp.c:2473
  #, fuzzy
  msgid "||Please enter the Reset Code for the card"
  msgstr "Seleccioneu la raó de la revocació:\n"
  
- #: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
++#: scd/app-openpgp.c:2483 scd/app-openpgp.c:2537
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr ""
@@@ -8070,118 -6504,94 +8102,118 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2493
++#: scd/app-openpgp.c:2506
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|AN|New Admin PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|N|New PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2565
++#: scd/app-openpgp.c:2578
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "canvia la contrasenya"
  
- #: scd/app-openpgp.c:2566
++#: scd/app-openpgp.c:2579
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
  msgstr "canvia la contrasenya"
  
- #: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
++#: scd/app-openpgp.c:2635 scd/app-openpgp.c:3885
  #, fuzzy
  msgid "error reading application data\n"
  msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
  
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
++#: scd/app-openpgp.c:2641 scd/app-openpgp.c:3892
  #, fuzzy
  msgid "error reading fingerprint DO\n"
  msgstr "error: l'empremta digital és invàlida\n"
  
- #: scd/app-openpgp.c:2638
++#: scd/app-openpgp.c:2651
  #, fuzzy
  msgid "key already exists\n"
  msgstr "«%s» ja està comprimida\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2655
  msgid "existing key will be replaced\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2644
++#: scd/app-openpgp.c:2657
  #, fuzzy
  msgid "generating new key\n"
  msgstr "genera un nou parell de claus"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2659
  #, fuzzy
  msgid "writing new key\n"
  msgstr "genera un nou parell de claus"
  
- #: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
++#: scd/app-openpgp.c:3201 scd/app-openpgp.c:3553
  msgid "creation timestamp missing\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
++#: scd/app-openpgp.c:3243 scd/app-openpgp.c:3251
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
++#: scd/app-openpgp.c:3384 scd/app-openpgp.c:3647
  #, fuzzy, c-format
  msgid "failed to store the key: %s\n"
  msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
  
  # Ídem.  ivb
- #: scd/app-openpgp.c:3534
++#: scd/app-openpgp.c:3547
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "l'URI no és suportada"
  
- #: scd/app-openpgp.c:3790
++#: scd/app-openpgp.c:3802
  msgid "please wait while key is being generated ...\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3798
++#: scd/app-openpgp.c:3810
  #, fuzzy
  msgid "generating key failed\n"
  msgstr "La generació de claus ha fallat: %s\n"
  
- #: scd/app-openpgp.c:3804
++#: scd/app-openpgp.c:3816
  #, fuzzy, c-format
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
  msgstr[0] "La generació de claus ha fallat: %s\n"
  msgstr[1] "La generació de claus ha fallat: %s\n"
  
- #: scd/app-openpgp.c:3838
++#: scd/app-openpgp.c:3850
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:3900
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4004
++#: scd/app-openpgp.c:4016
  #, fuzzy, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "signatura %s, algorisme de resum %s\n"
  
- #: scd/app-openpgp.c:4089
++#: scd/app-openpgp.c:4101
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4551
++#: scd/app-openpgp.c:4570
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
++#: scd/app-openpgp.c:4871 scd/app-openpgp.c:4882
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr ""
@@@ -8203,7 -6610,6 +8235,7 @@@ msgstr "Introduïu el nom d'usuari: 
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
@@@ -8248,27 -6645,22 +8280,27 @@@ msgstr "les ordres entren en conflicte\
  msgid "use variable length input for pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:287
++#: scd/scdaemon.c:286
  #, fuzzy
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
  
- #: scd/scdaemon.c:289
++#: scd/scdaemon.c:288
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
  msgstr ""
  
- #: scd/scdaemon.c:786
++#: scd/scdaemon.c:784
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1904
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
++#: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1909
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
@@@ -8348,9 -6724,6 +8380,9 @@@ msgstr "error en la creació de la cont
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
  
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
 +#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  #, fuzzy
  msgid "failed to allocate keyDB handle\n"
  msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
@@@ -8870,11 -7141,9 +8902,11 @@@ msgstr "
  msgid "resource problem: out of core\n"
  msgstr ""
  
- #: sm/decrypt.c:330
++#: sm/decrypt.c:332
  msgid "(this is the RC2 algorithm)\n"
  msgstr ""
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:334
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr ""
  
@@@ -8918,125 -7179,97 +8950,125 @@@ msgstr "llista claus secretes
  msgid "list certificate chain"
  msgstr "Certificat de revocació vàlid"
  
- #: sm/gpgsm.c:218
++#: sm/gpgsm.c:219
  #, fuzzy
  msgid "import certificates"
  msgstr "Certificat correcte"
  
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
  #, fuzzy
  msgid "export certificates"
  msgstr "Certificat correcte"
  
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:228
  msgid "register a smartcard"
  msgstr ""
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:231
  msgid "pass a command to the dirmngr"
  msgstr ""
  
- #: sm/gpgsm.c:232
++#: sm/gpgsm.c:233
  msgid "invoke gpg-protect-tool"
  msgstr ""
  
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:250
  #, fuzzy
  msgid "create base-64 encoded output"
  msgstr "crea eixida amb armadura ascii"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in PEM format"
  msgstr ""
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in base-64 format"
  msgstr ""
  
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:262
  msgid "assume input is in binary format"
  msgstr ""
  
- #: sm/gpgsm.c:267
++#: sm/gpgsm.c:269
  msgid "never consult a CRL"
  msgstr ""
  
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:279
  msgid "check validity using OCSP"
  msgstr ""
  
- #: sm/gpgsm.c:282
++#: sm/gpgsm.c:284
  msgid "|N|number of certificates to include"
  msgstr ""
  
- #: sm/gpgsm.c:285
++#: sm/gpgsm.c:287
  msgid "|FILE|take policy information from FILE"
  msgstr ""
  
- #: sm/gpgsm.c:288
++#: sm/gpgsm.c:290
  msgid "do not check certificate policies"
  msgstr ""
  
- #: sm/gpgsm.c:292
++#: sm/gpgsm.c:294
  msgid "fetch missing issuer certificates"
  msgstr ""
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "don't use the terminal at all"
  msgstr "no usa el terminal en absolut"
  
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:307
  msgid "|FILE|write a server mode log to FILE"
  msgstr ""
  
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:312
  #, fuzzy
  msgid "|FILE|write an audit log to FILE"
  msgstr "|FITXER|carrega el mòdul d'extensió especificat"
  
  # Mode desatès (SC)  ivb
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "batch mode: never ask"
  msgstr "mode desatès: no pregunta mai"
  
- #: sm/gpgsm.c:314
++#: sm/gpgsm.c:316
  msgid "assume yes on most questions"
  msgstr "suposa «sí» en la majoria de les preguntes"
  
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:317
  msgid "assume no on most questions"
  msgstr "suposa «no» en la majoria de les preguntes"
  
- #: sm/gpgsm.c:318
++#: sm/gpgsm.c:320
  #, fuzzy
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "afegeix aquest anell a la llista"
  
- #: sm/gpgsm.c:321
++#: sm/gpgsm.c:323
  #, fuzzy
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|NOM|usa NOM com a clau secreta predeterminada"
  
- #: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
  #, fuzzy
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|HOST|usa aquest servidor per a cercar claus"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|NOM|usa l'algoritme de xifratge NOM"
  
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:352
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|NOM|usa l'algoritme de resum de missatges NOM"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:559
  #, 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:570
++#: sm/gpgsm.c:562
  #, fuzzy
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
@@@ -9047,48 -7280,39 +9079,48 @@@ msgstr "
  "signa, comprova, xifra o desxifra\n"
  "l'operació predeterminada depén de les dades introduïdes\n"
  
- #: sm/gpgsm.c:774
++#: sm/gpgsm.c:766
  #, 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:785
++#: sm/gpgsm.c:777
  #, fuzzy, c-format
  msgid "unknown validation model '%s'\n"
  msgstr "el destinatari predeterminat és desconegut «%s»\n"
  
- #: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
  #, fuzzy, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "(No es va donar una descripció)\n"
  
- #: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr ""
  
- #: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
  #, fuzzy, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr " o = omet aquesta clau\n"
  
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1427
  #, fuzzy
  msgid "could not parse keyserver\n"
  msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
  
- #: sm/gpgsm.c:1636
++#: sm/gpgsm.c:1630
  #, 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:1677
++#: sm/gpgsm.c:1671
  #, fuzzy, c-format
  msgid "can't sign using '%s': %s\n"
  msgstr "no s'ha pogut tancar «%s»: %s\n"
  
- #: sm/gpgsm.c:2033
++#: sm/gpgsm.c:2028
  msgid "invalid command (there is no implicit command)\n"
  msgstr ""
  
@@@ -9853,8 -7926,6 +9885,8 @@@ msgstr "
  msgid "CRL access not possible due to disabled %s\n"
  msgstr ""
  
 +#: dirmngr/crlfetch.c:223 dirmngr/ldap-wrapper-ce.c:488
- #: dirmngr/ldap-wrapper.c:742 dirmngr/misc.c:563
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:563
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
@@@ -10046,116 -8081,88 +10078,116 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:160
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:158
++#: dirmngr/dirmngr.c:161
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|FITXER|carrega el mòdul d'extensió especificat"
  
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:162
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:163
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:164
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
- #: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
++#: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:177
++#: dirmngr/dirmngr.c:180
  #, fuzzy
  msgid "run without asking a user"
  msgstr "Voleu eixir sense desar? "
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:181
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:182
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:184
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:185
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:186
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:188
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:192
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:202
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FITXER|carrega el mòdul d'extensió especificat"
  
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:210
  #, 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:209
++#: dirmngr/dirmngr.c:212
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:218
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:220
++#: dirmngr/dirmngr.c:223
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:225
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:240
++#: dirmngr/dirmngr.c:246
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -10168,77 -8175,61 +10200,77 @@@ msgstr "
  "@\n"
  "(En la pàgina del man hi ha una llista completa d'ordres i d'opcions)\n"
  
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:361
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
  
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:363
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:443
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
- #: tools/gpgconf.c:648
++#: dirmngr/dirmngr.c:496 tools/gpgconf.c:550 tools/gpgconf.c:585
++#: tools/gpgconf.c:656
  #, fuzzy, c-format
  msgid "usage: %s [options] "
  msgstr "forma d'ús: gpg [opcions] "
  
- #: dirmngr/dirmngr.c:1062
++#: dirmngr/dirmngr.c:1074
  #, fuzzy
  #| 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:1301 dirmngr/server.c:1585
++#: dirmngr/dirmngr.c:1300 dirmngr/server.c:1585
  #, fuzzy, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "no s'ha pogut crear l'armadura: %s\n"
  
- #: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
++#: dirmngr/dirmngr.c:1306 dirmngr/server.c:1591
  #, fuzzy, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "no s'ha pogut crear l'armadura: %s\n"
  
- #: dirmngr/dirmngr.c:1484
++#: dirmngr/dirmngr.c:1487
  #, fuzzy, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "la línia és massa llarga\n"
  
- #: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
++#: dirmngr/dirmngr.c:1542 dirmngr/dirmngr.c:1626
  #, fuzzy, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "error: l'empremta digital és invàlida\n"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
++#: dirmngr/dirmngr.c:1578 dirmngr/dirmngr.c:1604 tools/gpgconf-comp.c:4032
  #, fuzzy, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "error de lectura: %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1633
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1700
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1734
++#: dirmngr/dirmngr.c:1738
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1739
++#: dirmngr/dirmngr.c:1743
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1745
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
@@@ -10247,17 -8238,14 +10279,17 @@@
  # 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:1746
++#: dirmngr/dirmngr.c:1750
  #, fuzzy
  #| msgid "not forced"
  msgid "shutdown forced\n"
  msgstr "no forçat"
  
- #: dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1758
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1761
++#: dirmngr/dirmngr.c:1765
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10740,33 -8629,27 +10772,33 @@@ msgstr "no s'ha pogut eliminar el bloc 
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2463
++#: dirmngr/server.c:2469
  #, fuzzy, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "no s'ha pogut crear «%s»: %s\n"
  
- #: dirmngr/server.c:2474
++#: dirmngr/server.c:2480
  #, 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:2495
++#: dirmngr/server.c:2501
  #, 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:2503
++#: dirmngr/server.c:2509
  #, 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:2534
++#: dirmngr/server.c:2540
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2553
++#: dirmngr/server.c:2559
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
@@@ -10814,7 -8688,6 +10846,7 @@@ msgstr "DSA requereix l'ús d'un algori
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:167
  #, fuzzy
  msgid "quiet"
  msgstr "ix"
@@@ -10907,22 -8760,15 +10939,22 @@@ msgstr "Ha fallat el procés de signatu
  msgid "error sending standard options: %s\n"
  msgstr "error mentre s'enviava a «%s»: %s\n"
  
 +#: tools/gpgconf-comp.c:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
- #: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
++#: tools/gpgconf-comp.c:766 tools/gpgconf-comp.c:865
  msgid "Options controlling the diagnostic output"
  msgstr ""
  
 +#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
- #: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
++#: tools/gpgconf-comp.c:779 tools/gpgconf-comp.c:888
  msgid "Options controlling the configuration"
  msgstr ""
  
- #: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
- #: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
++#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:723
++#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:901
  msgid "Options useful for debugging"
  msgstr ""
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
  msgid "Options controlling the security"
  msgstr ""
  
@@@ -10972,11 -8807,9 +11004,11 @@@ msgstr "error en la creació de la cont
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
++#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
  msgid "|NAME|use NAME as default secret key"
  msgstr "|NOM|usa NOM com a clau secreta predeterminada"
  
- #: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
++#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:784
  #, fuzzy
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NOM|xifra per a NOM"
@@@ -10985,194 -8817,161 +11017,208 @@@
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
++#: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
  msgid "Configuration for Keyservers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
++#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
  #, 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:735
++#: tools/gpgconf-comp.c:741
  msgid "allow PKA lookups (DNS requests)"
  msgstr ""
  
- #: tools/gpgconf-comp.c:738
++#: tools/gpgconf-comp.c:744
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr ""
  
- #: tools/gpgconf-comp.c:787
++#: tools/gpgconf-comp.c:793
  msgid "disable all access to the dirmngr"
  msgstr ""
  
- #: tools/gpgconf-comp.c:790
++#: tools/gpgconf-comp.c:796
  #, 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:820
++#: tools/gpgconf-comp.c:829
  msgid "do not check CRLs for root certificates"
  msgstr ""
  
- #: tools/gpgconf-comp.c:869
++#: tools/gpgconf-comp.c:878
  msgid "Options controlling the format of the output"
  msgstr ""
  
- #: tools/gpgconf-comp.c:905
++#: tools/gpgconf-comp.c:920
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:918
++#: tools/gpgconf-comp.c:933
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:947
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:958
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:948
++#: tools/gpgconf-comp.c:963
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:977
++#: tools/gpgconf-comp.c:992
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:985
++#: tools/gpgconf-comp.c:1000
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1066
++#: tools/gpgconf-comp.c:1081
  msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1067
++#: tools/gpgconf-comp.c:1082
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1083
  msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1069
++#: tools/gpgconf-comp.c:1084
  msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1070
++#: tools/gpgconf-comp.c:1085
  #, fuzzy
  #| msgid "network error"
  msgid "Network"
  msgstr "error de la xarxa"
  
- #: tools/gpgconf-comp.c:1071
++#: tools/gpgconf-comp.c:1086
  #, fuzzy
  msgid "Passphrase Entry"
  msgstr "la contrasenya és errònia"
  
- #: tools/gpgconf-comp.c:1225
++#: tools/gpgconf-comp.c:1240
  #, fuzzy
  msgid "Component not suitable for launching"
  msgstr "no s'ha trobat la clau pública"
  
- #: tools/gpgconf-comp.c:3283
++#: tools/gpgconf-comp.c:3311
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3434
++#: tools/gpgconf-comp.c:3462
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf-comp.c:4036
+ #, fuzzy, c-format
+ msgid "error closing '%s'\n"
+ msgstr "error en la lectura de «%s»: %s\n"
+ 
++#: tools/gpgconf-comp.c:4038
+ #, fuzzy, c-format
+ msgid "error parsing '%s'\n"
+ msgstr "error en la lectura de «%s»: %s\n"
+ 
++#: tools/gpgconf.c:73
  msgid "list all components"
  msgstr ""
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "check all programs"
  msgstr ""
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|list options"
  msgstr ""
  
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
  msgid "|COMPONENT|change options"
  msgstr ""
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "|COMPONENT|check options"
  msgstr ""
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "apply global default values"
  msgstr ""
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
+ msgid "|FILE|update configuration files using FILE"
+ msgstr ""
+ 
++#: tools/gpgconf.c:83
  msgid "get the configuration directories for @GPGCONF@"
  msgstr ""
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:85
  #, fuzzy
  msgid "list global configuration file"
  msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  #, fuzzy
  msgid "check global configuration file"
  msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
  
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:89
  #, fuzzy
  #| msgid "update the trust database"
  msgid "query the software version database"
  msgstr "actualitza la base de dades de confiança"
  
- #: tools/gpgconf.c:86
++#: tools/gpgconf.c:90
  msgid "reload all or a given component"
  msgstr ""
  
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:91
  msgid "launch a given component"
  msgstr ""
  
- #: tools/gpgconf.c:88
++#: tools/gpgconf.c:92
  msgid "kill a given component"
  msgstr ""
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "use as output file"
  msgstr "fitxer d'eixida"
  
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:102
  msgid "activate changes at runtime, if possible"
  msgstr ""
  
- #: tools/gpgconf.c:122
++#: tools/gpgconf.c:127
  #, fuzzy
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
  
- #: tools/gpgconf.c:125
++#: tools/gpgconf.c:130
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
  msgstr ""
  
- #: tools/gpgconf.c:545 tools/gpgconf.c:579
++#: tools/gpgconf.c:552 tools/gpgconf.c:587
  msgid "Need one component argument"
  msgstr ""
  
- #: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
++#: tools/gpgconf.c:561 tools/gpgconf.c:599 tools/gpgconf.c:632
  #, fuzzy
  msgid "Component not found"
  msgstr "no s'ha trobat la clau pública"
  
- #: tools/gpgconf.c:650
++#: tools/gpgconf.c:658
  msgid "No argument allowed"
  msgstr ""
  
diff --cc po/cs.po
index 6505c59,47611b3..055df14
--- a/po/cs.po
+++ b/po/cs.po
@@@ -35,7 -35,6 +35,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg2 2.1.10\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-11-18 16:54+0100\n"
++"POT-Creation-Date: 2016-12-20 11:28+0100\n"
  "PO-Revision-Date: 2015-12-07 20:45+0100\n"
  "Last-Translator: Petr Pisar <petr.pisar at atlas.cz>\n"
  "Language-Team: Czech <gnupg-i18n at gnupg.org>\n"
@@@ -179,24 -150,10 +179,24 @@@ msgstr "Špatné heslo
  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:838 common/dotlock.c:839 g10/card-util.c:839
- #: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1306 g10/keygen.c:4577
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
++#: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
  #, c-format
  msgid "can't create '%s': %s\n"
  msgstr "nelze vytvořit „%s“: %s\n"
  
 +#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
- #: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1307
++#: g10/import.c:305 g10/import.c:448 g10/import.c:621 g10/keygen.c:3681
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
- #: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
- #: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:825 g10/sign.c:1025
++#: g10/sign.c:1130 g10/sign.c:1275 g10/tdbdump.c:143 g10/tdbdump.c:151
++#: g10/tdbio.c:720 g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161
++#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
++#: dirmngr/certcache.c:368 dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1564
  #, c-format
  msgid "can't open '%s': %s\n"
  msgstr "nelze otevřít „%s“: %s\n"
@@@ -261,11 -207,9 +261,11 @@@ msgstr "
  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:92 g10/call-agent.c:1100
++#: agent/divert-scd.c:92 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr "Prosím, vložte kartu se sériovým číslem"
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1101
++#: agent/divert-scd.c:93 g10/call-agent.c:1102
  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"
  
@@@ -400,47 -318,32 +400,47 @@@ msgstr "
  "@Volby:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
  msgid "run in daemon mode (background)"
  msgstr "poběží v režimu démona (na pozadí)"
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
  msgid "run in server mode (foreground)"
  msgstr "poběží v režimu serveru (na popředí)"
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
  #, fuzzy
  #| msgid "run in server mode"
  msgid "run in supervised mode"
  msgstr "pracovat v režimu serveru"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:170 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "upovídaný režim"
  
 +#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "být o trochu víc tichý"
  
- #: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
  msgid "sh-style command output"
  msgstr "vypisovat příkazy ve stylu sh"
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
  msgid "csh-style command output"
  msgstr "vypisovat příkazy ve stylu csh"
  
- #: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
- #: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
++#: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
  msgid "|FILE|read options from FILE"
  msgstr "|SOUBOR|načíst volby ze SOUBORU"
  
- #: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:177
  msgid "do not detach from the console"
  msgstr "neodpojovat se od konzole"
  
@@@ -517,21 -403,14 +517,21 @@@ msgstr "zapnout podporu pro PuTTY
  #. 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:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:481 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1025 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:358
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:124 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  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 at gnupg.org>.\n"
  
- #: agent/gpg-agent.c:491
++#: agent/gpg-agent.c:490
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "Použití: @GPG_AGENT@ [volby] (-h pro nápovědu)"
  
- #: agent/gpg-agent.c:493
++#: agent/gpg-agent.c:492
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
@@@ -539,137 -418,102 +539,137 @@@ msgstr "
  "Syntaxe: @GPG_AGENT@ [volby] [příkaz [argumenty]]\n"
  "Správa tajných klíčů pro @GNUPG@\n"
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:537 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:442
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr "zadána neplatná úroveň ladění „%s“\n"
  
- #: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:793
++#: agent/gpg-agent.c:1082 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:812
  #, c-format
  msgid "Note: no default option file '%s'\n"
  msgstr "Poznámka: neexistuje implicitní soubor s možnostmi „%s“\n"
  
- #: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
- #: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1093 agent/gpg-agent.c:1935 g10/gpg.c:2510
++#: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:817
++#: dirmngr/dirmngr.c:1670 tools/symcryptrun.c:932
  #, c-format
  msgid "option file '%s': %s\n"
  msgstr "soubor s možnostmi „%s“: %s\n"
  
- #: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:806
++#: agent/gpg-agent.c:1101 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:825
  #, c-format
  msgid "reading options from '%s'\n"
  msgstr "čtou se možnosti z „%s“\n"
  
- #: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
- #: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
++#: agent/gpg-agent.c:1223 g10/gpg.c:3643 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:936 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:527
  #, 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:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
++#: agent/gpg-agent.c:2080 scd/scdaemon.c:1073 dirmngr/dirmngr.c:1081
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "socket nelze vytvořit: %s\n"
  
- #: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
++#: agent/gpg-agent.c:2097 scd/scdaemon.c:1086 dirmngr/dirmngr.c:1094
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr "název socketu „%s“ je příliš dlouhý\n"
  
- #: agent/gpg-agent.c:2134
++#: agent/gpg-agent.c:2135
  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:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
++#: agent/gpg-agent.c:2145 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1126
  msgid "error getting nonce for the socket\n"
  msgstr "chyba při získávání soli pro socket\n"
  
- #: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
++#: agent/gpg-agent.c:2150 scd/scdaemon.c:1113 dirmngr/dirmngr.c:1129
  #, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "chyba při přilepování socketu na „%s“: %s\n"
  
  # TODO: i18n of first %s
- #: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
- #: dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2160 agent/gpg-agent.c:2197 scd/scdaemon.c:1121
++#: dirmngr/dirmngr.c:1138
  #, fuzzy, c-format
  #| msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgid "can't set permissions of '%s': %s\n"
  msgstr "Varování: přístupová práva %s „%s“ nejsou bezpečná\n"
  
- #: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:2165 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1143
  #, c-format
  msgid "listen() failed: %s\n"
  msgstr "volání listen() selhalo: %s\n"
  
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
++#: agent/gpg-agent.c:2172 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1149
  #, c-format
  msgid "listening on socket '%s'\n"
  msgstr "naslouchá se na socketu „%s“\n"
  
- #: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: agent/gpg-agent.c:2191 agent/gpg-agent.c:2234 g10/exec.c:199
 +#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, c-format
  msgid "can't create directory '%s': %s\n"
  msgstr "nelze vytvořit adresář „%s“: %s\n"
  
- #: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: agent/gpg-agent.c:2194 agent/gpg-agent.c:2239 g10/openfile.c:491
 +#: g10/openfile.c:520 sm/keydb.c:103
  #, c-format
  msgid "directory '%s' created\n"
  msgstr "adresář „%s“ vytvořen\n"
  
- #: agent/gpg-agent.c:2244
++#: agent/gpg-agent.c:2245
  #, c-format
  msgid "stat() failed for '%s': %s\n"
  msgstr "volání stat() na „%s“ selhalo: %s\n"
  
- #: agent/gpg-agent.c:2248
++#: agent/gpg-agent.c:2249
  #, c-format
  msgid "can't use '%s' as home directory\n"
  msgstr "„%s“ nelze použít jako domovský adresář\n"
  
- #: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
++#: agent/gpg-agent.c:2392 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1871
  #, 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:2598
++#: agent/gpg-agent.c:2599
  #, 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:2603
++#: agent/gpg-agent.c:2604
  #, 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:2678
++#: agent/gpg-agent.c:2679
  #, 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:2683
++#: agent/gpg-agent.c:2684
  #, 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:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
++#: agent/gpg-agent.c:2881 scd/scdaemon.c:1272 dirmngr/dirmngr.c:2075
  #, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "npth_pselect selhala: %s – čeká se 1 s\n"
  
- #: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2954 scd/scdaemon.c:1321
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s pozastaveno\n"
  
- #: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
++#: agent/gpg-agent.c:3092 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  msgid "no gpg-agent running in this session\n"
  msgstr "v této relaci neběží žádný gpg-agent\n"
  
@@@ -685,8 -527,6 +685,8 @@@ msgstr "
  "Syntaxe: gpg-preset-passphrase [volby] KEYGRIP\n"
  "Správa dočasné paměti pro hesla\n"
  
- #: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
++#: agent/protect-tool.c:106 g10/gpg.c:424 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:153 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -694,9 -534,6 +694,9 @@@ msgstr "
  "@Příkazy:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
- #: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:92 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:168 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -751,8 -580,6 +751,8 @@@ 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:362 dirmngr/dirmngr.c:1469
- #: tools/gpgconf.c:323
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1472
++#: tools/gpgconf.c:328
  #, c-format
  msgid "error opening '%s': %s\n"
  msgstr "chyba při otevírání „%s“: %s\n"
@@@ -922,9 -720,6 +922,9 @@@ msgstr "ochranný algoritmus %d (%s) ne
  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:438
 +#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
- #: dirmngr/ldap-wrapper.c:710
++#: dirmngr/ldap-wrapper.c:711
  #, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "chyba při vytváření roury: %s\n"
@@@ -936,8 -728,6 +936,8 @@@
  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:848 dirmngr/dirmngr.c:1155
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1167
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "chyba při rozdvojování procesu: %s\n"
@@@ -983,30 -764,25 +983,30 @@@ msgstr "nelze se připojit k „%s“
  msgid "problem setting the gpg-agent options\n"
  msgstr "problém v nastavování voleb gpg-agenta\n"
  
- #: common/sysutils.c:144
++#: common/sysutils.c:148
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "nemohu vypnout vytváření core souborů: %s\n"
  
  # TODO: i18n of first %s
- #: common/sysutils.c:239
++#: common/sysutils.c:250
  #, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "Varování: vlastnictví %s „%s“ není nastaveno bezpečně\n"
  
  # TODO: i18n of first %s
- #: common/sysutils.c:271
++#: common/sysutils.c:282
  #, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "Varování: přístupová práva %s „%s“ nejsou bezpečná\n"
  
- #: common/sysutils.c:659
++#: common/sysutils.c:693
  #, fuzzy, c-format
  #| msgid "waiting for the agent to come up ... (%ds)\n"
  msgid "waiting for file '%s' to become accessible ...\n"
  msgstr "čeká se na agenta… (%d s)\n"
  
- #: common/sysutils.c:685
++#: common/sysutils.c:719
  #, c-format
  msgid "renaming '%s' to '%s' failed: %s\n"
  msgstr "přejmenování „%s“ na „%s“ se nezdařilo: %s\n"
@@@ -1081,7 -842,6 +1081,7 @@@ msgstr "%s:%u: zastaralý parametr „%
  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:554
++#: common/miscellaneous.c:556
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr "neznámý ladicí příznak „%s“ se ignoruje\n"
@@@ -1185,8 -922,6 +1185,8 @@@ msgstr "Vytvořen klíč relace
  msgid "algorithm: %s"
  msgstr "algoritmus: %s"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3098
++#: scd/app-openpgp.c:3111
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "nepodporovaný algoritmus: %s"
@@@ -1373,7 -1066,6 +1373,7 @@@ msgid "command \"%.50s\" is ambiguous\n
  msgstr "příkaz „%.50s“ není jednoznačný\n"
  
  # Yet another expression for `not enough memory' :)
- #: common/argparse.c:401 dirmngr/dirmngr.c:1173
++#: common/argparse.c:401 dirmngr/dirmngr.c:1185
  msgid "out of core\n"
  msgstr "nedostatek paměti\n"
  
@@@ -1432,8 -1113,6 +1432,8 @@@ msgid "waiting for lock %s...\n
  msgstr "čekám na zámek %s…\n"
  
  # První argument je název knihovny
- #: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
- #: dirmngr/dirmngr.c:715
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:725
++#: dirmngr/dirmngr.c:734
  #, 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"
@@@ -1471,7 -1142,6 +1471,7 @@@ msgstr "neočekávaný ASCII armor: 
  msgid "invalid dash escaped line: "
  msgstr "nesprávné označení řádku mínusy: "
  
- #: g10/armor.c:873 g10/armor.c:1490
++#: g10/armor.c:873 g10/armor.c:1493
  #, c-format
  msgid "invalid radix64 character %02X skipped\n"
  msgstr "neplatný radix64 znak %02X byl přeskočen\n"
@@@ -1488,7 -1155,6 +1488,7 @@@ msgstr "předčasný konec souboru (ž�
  msgid "malformed CRC\n"
  msgstr "špatný formát CRC\n"
  
- #: g10/armor.c:962 g10/armor.c:1527
++#: g10/armor.c:962 g10/armor.c:1530
  #, c-format
  msgid "CRC error; %06lX - %06lX\n"
  msgstr "Chyba CRC; %06lX - %06lX\n"
@@@ -1501,16 -1165,13 +1501,16 @@@ msgstr "předčasný konec souboru (v p
  msgid "error in trailer line\n"
  msgstr "chyba v patičce\n"
  
- #: g10/armor.c:1303
++#: g10/armor.c:1306
  msgid "no valid OpenPGP data found.\n"
  msgstr "nenalezena žádná platná data ve formátu OpenPGP.\n"
  
- #: g10/armor.c:1308
++#: g10/armor.c:1311
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
  msgstr "neplatné kódování ASCII: řádek je delší než %d znaků\n"
  
- #: g10/armor.c:1312
++#: g10/armor.c:1315
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr ""
@@@ -1599,8 -1245,6 +1599,8 @@@ msgstr "OpenPGP karta není dostupná: 
  msgid "OpenPGP card no. %s detected\n"
  msgstr "Nalezena OpenPGP karta číslo %s\n"
  
- #: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
- #: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2030
++#: g10/keygen.c:4087 g10/revoke.c:215 g10/revoke.c:618
  msgid "can't do this in batch mode\n"
  msgstr "nelze provést v dávkovém módu\n"
  
@@@ -1608,14 -1251,9 +1608,14 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "Tento příkaz je dostupný pouze pro karty verze 2\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2454
++#: g10/card-util.c:109 scd/app-openpgp.c:2467
  msgid "Reset Code not or not anymore available\n"
  msgstr "Resetační kód není nebo už není dostupný\n"
  
 +#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
- #: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
- #: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1768
++#: g10/keygen.c:1945 g10/keygen.c:2313 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "Váš výběr? "
  
@@@ -1677,10 -1301,6 +1677,10 @@@ msgstr "URL pro získání veřejného 
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr "Chyba: URL je příliš dlouhé (limit je %d znaků).\n"
  
- #: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
- #: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:334
++#: g10/import.c:592 g10/import.c:640 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
++#: dirmngr/dirmngr.c:1510 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, c-format
  msgid "error reading '%s': %s\n"
  msgstr "chyba při čtení „%s“: %s\n"
@@@ -1746,7 -1351,6 +1746,7 @@@ msgstr "operace s klíčem není možn�
  msgid "not an OpenPGP card"
  msgstr "toto není OpenPGP karta"
  
- #: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
++#: g10/card-util.c:1173 g10/keygen.c:4106 g10/keygen.c:5092
  #, 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"
@@@ -1781,13 -1380,10 +1781,13 @@@ msgstr "Jakou délku klíče pro šifro
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "Jakou délku klíče pro autentizaci si přejete? (%u) "
  
- #: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
++#: g10/card-util.c:1316 g10/keygen.c:2122 g10/keygen.c:2154
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "zaokrouhleno na %u bitů\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2207 sm/certreqgen-ui.c:188
  #, 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"
@@@ -1841,9 -1427,6 +1841,9 @@@ msgstr "   (2) Šifrovací klíč\n
  msgid "   (3) Authentication key\n"
  msgstr "   (3) Autentizační klíč\n"
  
- #: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
- #: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
- #: g10/keygen.c:2314 g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1508
++#: g10/keygen.c:1794 g10/keygen.c:1822 g10/keygen.c:1952 g10/keygen.c:2060
++#: g10/keygen.c:2336 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Neplatný výběr.\n"
  
@@@ -1873,7 -1450,6 +1873,7 @@@ msgstr "Pokračovat (a/N) 
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr "Opravdu obnovit tovární nastavení (zadejte „yes“) "
  
- #: g10/card-util.c:1816 g10/keyedit.c:1867
++#: g10/card-util.c:1816 g10/keyedit.c:1868
  msgid "quit this menu"
  msgstr "ukončit toto menu"
  
@@@ -1881,7 -1456,6 +1881,7 @@@
  msgid "show admin commands"
  msgstr "zobraz administrátorské příkazy"
  
- #: g10/card-util.c:1819 g10/keyedit.c:1870
++#: g10/card-util.c:1819 g10/keyedit.c:1871
  msgid "show this help"
  msgstr "ukázat tuto pomoc"
  
@@@ -1957,30 -1513,20 +1957,30 @@@ msgstr "administrátorské příkazy js
  msgid "Admin commands are not allowed\n"
  msgstr "administrátorské příkazy nejsou povoleny\n"
  
- #: g10/card-util.c:2127 g10/keyedit.c:2816
++#: g10/card-util.c:2127 g10/keyedit.c:2817
  msgid "Invalid command  (try \"help\")\n"
  msgstr "Neplatný příkaz (zkuste „help“)\n"
  
- #: g10/decrypt.c:191 g10/encrypt.c:955
++#: g10/decrypt.c:190 g10/encrypt.c:955
  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:4851 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4904 g10/keyring.c:398 g10/keyring.c:771
  #, c-format
  msgid "can't open '%s'\n"
  msgstr "„%s“ nelze otevřít\n"
  
 +#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
- #: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
- #: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4858 g10/keyedit.c:2051
++#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2163
  #, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "klíč „%s“ nenalezen: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
- #: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
- #: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4866 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:645 g10/tofu.c:2171
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "chyba při čtení bloku klíče: %s\n"
@@@ -2041,7 -1575,6 +2041,7 @@@ msgid "use option \"--delete-secret-key
  msgstr ""
  "abyste ho smazal(a), použijte nejprve parametr „--delete-secret-key“.\n"
  
- #: g10/encrypt.c:232 g10/sign.c:1292
++#: g10/encrypt.c:232 g10/sign.c:1294
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "chyba při vytváření hesla: %s\n"
@@@ -2060,7 -1590,6 +2060,7 @@@ msgstr "použití šifry: %s\n
  msgid "'%s' already compressed\n"
  msgstr "„%s“ je již zkomprimován\n"
  
- #: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:610
  #, c-format
  msgid "WARNING: '%s' is an empty file\n"
  msgstr "VAROVÁNÍ: soubor „%s“ je prázdný\n"
@@@ -2077,7 -1604,6 +2077,7 @@@ msgid "
  msgstr ""
  "VAROVÁNÍ: vyžádaná symetrická šifra %s (%d) nevyhovuje předvolbám příjemce\n"
  
- #: g10/encrypt.c:707 g10/sign.c:984
++#: g10/encrypt.c:707 g10/sign.c:986
  #, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2111,7 -1632,6 +2111,7 @@@ msgstr "%s zašifrovaná data\n
  msgid "encrypted with unknown algorithm %d\n"
  msgstr "zašifrováno neznámým algoritmem %d\n"
  
- #: g10/decrypt-data.c:164 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:129
  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"
@@@ -2200,8 -1702,6 +2200,8 @@@ msgid " - skipped
  msgstr " – přeskočeno"
  
  # g10/import.c:766 g10/openfile.c:261#, c-format
- #: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:845 g10/sign.c:1148
++#: g10/export.c:1251 g10/import.c:1543 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:847 g10/sign.c:1150
  #, c-format
  msgid "writing to '%s'\n"
  msgstr "zapisuje se do „%s“\n"
@@@ -2224,8 -1720,6 +2224,8 @@@ msgstr "klíč %s: PGP 2.x klíč – 
  msgid "WARNING: nothing exported\n"
  msgstr "VAROVÁNÍ: nebylo nic vyexportováno\n"
  
- #: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
- #: g10/plaintext.c:151 g10/plaintext.c:174
++#: g10/export.c:2283 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/plaintext.c:167 g10/plaintext.c:190
  #, c-format
  msgid "error creating '%s': %s\n"
  msgstr "chyba při vytváření „%s“: %s\n"
@@@ -2276,8 -1761,6 +2276,8 @@@ msgstr "chyba při získávání „%s�
  msgid "No fingerprint"
  msgstr "Chybí otisk"
  
- #: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
- #: g10/revoke.c:701
++#: g10/getkey.c:1873 g10/keyedit.c:2929 g10/keyedit.c:3016 g10/revoke.c:637
++#: g10/revoke.c:702
  #, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "tajný klíč „%s“ nenalezen: %s\n"
@@@ -2310,161 -1788,127 +2310,167 @@@ msgstr "Neplatný klíč %s změněn n
  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/gpg.c:424 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:200
  msgid "make a signature"
  msgstr "vytvořit podpis"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:427
  msgid "make a clear text signature"
  msgstr "vytvořit podpis v čitelném dokumentu"
  
- #: g10/gpg.c:426 sm/gpgsm.c:202
++#: g10/gpg.c:429 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "vytvořit podpis oddělený od dokumentu"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:430 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "šifrovat data"
  
- #: g10/gpg.c:429
++#: g10/gpg.c:432
  msgid "encryption only with symmetric cipher"
  msgstr "šifrování pouze se symetrickou šifrou"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:434 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "dešifrovat data (implicitně)"
  
- #: g10/gpg.c:433 sm/gpgsm.c:206
++#: g10/gpg.c:436 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "verifikovat podpis"
  
- #: g10/gpg.c:435 sm/gpgsm.c:207
++#: g10/gpg.c:438 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "vypsat seznam klíčů"
  
- #: g10/gpg.c:437
++#: g10/gpg.c:440
  msgid "list keys and signatures"
  msgstr "vypsat seznam klíčů a podpisů"
  
- #: g10/gpg.c:438
++#: g10/gpg.c:443
  msgid "list and check key signatures"
  msgstr "vypsat a zkontrolovat podpisy klíčů"
  
- #: g10/gpg.c:439 sm/gpgsm.c:212
++#: g10/gpg.c:445 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "vypsat seznam klíčů a otisků"
  
- #: g10/gpg.c:440 sm/gpgsm.c:210
++#: g10/gpg.c:446 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "vypsat seznam tajných klíčů"
  
- #: g10/gpg.c:442 sm/gpgsm.c:213
++#: g10/gpg.c:448 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "vytvořit nový pár klíčů"
  
- #: g10/gpg.c:444
++#: g10/gpg.c:451
  msgid "quickly generate a new key pair"
  msgstr "rychle vytvořit nový pár klíčů"
  
- #: g10/gpg.c:446
++#: g10/gpg.c:454
  msgid "quickly add a new user-id"
  msgstr "rychle přidat novou identitu uživatele"
  
- #: g10/gpg.c:449
++#: g10/gpg.c:459
  #, fuzzy
  #| msgid "quickly add a new user-id"
  msgid "quickly revoke a user-id"
  msgstr "rychle přidat novou identitu uživatele"
  
- #: g10/gpg.c:451
++#: g10/gpg.c:462
+ #, fuzzy
+ #| msgid "quickly generate a new key pair"
+ msgid "quickly set a new expiration date"
+ msgstr "rychle vytvořit nový pár klíčů"
+ 
++#: g10/gpg.c:464
  msgid "full featured key pair generation"
  msgstr "komplexní vytvoření páru klíčů"
  
- #: g10/gpg.c:452
++#: g10/gpg.c:467
  msgid "generate a revocation certificate"
  msgstr "vytvořit revokační certifikát"
  
- #: g10/gpg.c:454 sm/gpgsm.c:215
++#: g10/gpg.c:470 sm/gpgsm.c:216
  msgid "remove keys from the public keyring"
  msgstr "odstranit klíč ze souboru veřejných klíčů"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:472
  msgid "remove keys from the secret keyring"
  msgstr "odstranit klíč ze souboru tajných klíčů"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:474
  msgid "quickly sign a key"
  msgstr "rychle podepsat klíč"
  
- #: g10/gpg.c:460
++#: g10/gpg.c:476
  msgid "quickly sign a key locally"
  msgstr "rychle lokálně podepsat klíč"
  
- #: g10/gpg.c:461
++#: g10/gpg.c:477
  msgid "sign a key"
  msgstr "podepsat klíč"
  
- #: g10/gpg.c:462
++#: g10/gpg.c:478
  msgid "sign a key locally"
  msgstr "podepsat klíč lokálně"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:479
  msgid "sign or edit a key"
  msgstr "podepsat nebo modifikovat klíč"
  
- #: g10/gpg.c:465 sm/gpgsm.c:233
++#: g10/gpg.c:481 sm/gpgsm.c:234
  msgid "change a passphrase"
  msgstr "změnit heslo"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:485
  msgid "export keys"
  msgstr "exportovat klíče"
  
- #: g10/gpg.c:468
++#: g10/gpg.c:486
  msgid "export keys to a keyserver"
  msgstr "exportovat klíče na server klíčů"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:487
  msgid "import keys from a keyserver"
  msgstr "importovat klíče ze serveru klíčů"
  
- #: g10/gpg.c:471
++#: g10/gpg.c:490
  msgid "search for keys on a keyserver"
  msgstr "vyhledat klíče na serveru klíčů"
  
- #: g10/gpg.c:473
++#: g10/gpg.c:492
  msgid "update all keys from a keyserver"
  msgstr "aktualizovat všechny klíče ze serveru klíčů"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:498
  msgid "import/merge keys"
  msgstr "importovat/sloučit klíče"
  
- #: g10/gpg.c:482
++#: g10/gpg.c:501
  msgid "print the card status"
  msgstr "vytisknout stav karty"
  
- #: g10/gpg.c:483
++#: g10/gpg.c:502
  msgid "change data on a card"
  msgstr "změnit data na kartě"
  
- #: g10/gpg.c:484
++#: g10/gpg.c:504
  msgid "change a card's PIN"
  msgstr "změnit PIN karty"
  
- #: g10/gpg.c:496
++#: g10/gpg.c:516
  msgid "update the trust database"
  msgstr "aktualizovat databázi důvěry"
  
- #: g10/gpg.c:505
++#: g10/gpg.c:525
  msgid "print message digests"
  msgstr "vypsat hash zprávy"
  
- #: g10/gpg.c:508 sm/gpgsm.c:228
++#: g10/gpg.c:528 sm/gpgsm.c:229
  msgid "run in server mode"
  msgstr "pracovat v režimu serveru"
  
- #: g10/gpg.c:510
++#: g10/gpg.c:530
  #, fuzzy
  #| msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
  msgid "|VALUE|set the TOFU policy for a key"
@@@ -2472,43 -1916,33 +2478,43 @@@ msgstr "
  "|HODNOTA|nastavit TOFU politiku klíči (good [dobrý], unknown [neznámý], bad "
  "[špatný], ask [zeptat se], auto)"
  
- #: g10/gpg.c:514 sm/gpgsm.c:246
++#: g10/gpg.c:534 sm/gpgsm.c:248
  msgid "create ascii armored output"
  msgstr "vytvoř výstup zakódovaný pomocí ASCII"
  
- #: g10/gpg.c:517 sm/gpgsm.c:262
++#: g10/gpg.c:537 sm/gpgsm.c:264
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|ID_UŽIVATELE|šifrovat pro ID_UŽIVATELE"
  
- #: g10/gpg.c:533 sm/gpgsm.c:298
++#: g10/gpg.c:553 sm/gpgsm.c:300
  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:539
++#: g10/gpg.c:559
  msgid "|N|set compress level to N (0 disables)"
  msgstr "|N|nastavit úroveň komprese na N (0 – žádná)"
  
- #: g10/gpg.c:546
++#: g10/gpg.c:566
  msgid "use canonical text mode"
  msgstr "použít kanonický textový mód"
  
- #: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
++#: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
  msgid "|FILE|write output to FILE"
  msgstr "|SOUBOR|zapsat výstup do SOUBORU"
  
- #: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
++#: g10/gpg.c:598 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
  msgid "do not make any changes"
  msgstr "neprovádět žádné změny"
  
- #: g10/gpg.c:579
++#: g10/gpg.c:599
  msgid "prompt before overwriting"
  msgstr "vyžádat potvrzení před přepsáním"
  
- #: g10/gpg.c:628
++#: g10/gpg.c:648
  msgid "use strict OpenPGP behavior"
  msgstr "použít chování striktně podle OpenPGP"
  
- #: g10/gpg.c:654 sm/gpgsm.c:355
++#: g10/gpg.c:674 sm/gpgsm.c:357
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2516,7 -1950,16 +2522,17 @@@ msgstr "
  "@\n"
  "(Pro kompletní seznam všech příkazů a možností použijte manuálové stránky.)\n"
  
- #: g10/gpg.c:657 sm/gpgsm.c:358
++#: g10/gpg.c:677
+ #, fuzzy
+ #| msgid ""
+ #| "@\n"
+ #| "Examples:\n"
+ #| "\n"
+ #| " -se -r Bob [file]          sign and encrypt for user Bob\n"
+ #| " --clear-sign [file]         make a clear text signature\n"
+ #| " --detach-sign [file]       make a detached signature\n"
+ #| " --list-keys [names]        show keys\n"
+ #| " --fingerprint [names]      show fingerprints\n"
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2534,11 -1977,9 +2550,11 @@@ msgstr "
  " --list-keys [jména]        vypsat klíče\n"
  " --fingerprint [jména]      vypsat otisky\n"
  
- #: g10/gpg.c:1026
++#: g10/gpg.c:1047
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
  msgstr "Použití: @GPG@ [možnosti] [soubory] (-h pro nápovědu)"
  
- #: g10/gpg.c:1029
++#: g10/gpg.c:1050
  msgid ""
  "Syntax: @GPG@ [options] [files]\n"
  "Sign, check, encrypt or decrypt\n"
@@@ -2548,7 -1989,6 +2564,7 @@@ msgstr "
  "Podepisuje, ověřuje, šifruje nebo dešifruje.\n"
  "Výchozí operace závisí na vstupních datech.\n"
  
- #: g10/gpg.c:1040 sm/gpgsm.c:588
++#: g10/gpg.c:1061 sm/gpgsm.c:580
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2556,78 -1996,63 +2572,78 @@@ msgstr "
  "\n"
  "Podporované algoritmy:\n"
  
- #: g10/gpg.c:1043
++#: g10/gpg.c:1064
  msgid "Pubkey: "
  msgstr "Veřejný klíč: "
  
- #: g10/gpg.c:1050 g10/keyedit.c:3402
++#: g10/gpg.c:1071 g10/keyedit.c:3483
  msgid "Cipher: "
  msgstr "Šifra: "
  
- #: g10/gpg.c:1057
++#: g10/gpg.c:1078
  msgid "Hash: "
  msgstr "Hash: "
  
- #: g10/gpg.c:1064 g10/keyedit.c:3451
++#: g10/gpg.c:1085 g10/keyedit.c:3532
  msgid "Compression: "
  msgstr "Komprese: "
  
- #: g10/gpg.c:1133 sm/gpgsm.c:662
++#: g10/gpg.c:1154 sm/gpgsm.c:654
  #, c-format
  msgid "usage: %s [options] %s\n"
  msgstr "použití: %s [přepínače] %s\n"
  
- #: g10/gpg.c:1321 sm/gpgsm.c:751
++#: g10/gpg.c:1342 sm/gpgsm.c:743
  msgid "conflicting commands\n"
  msgstr "konfliktní příkazy\n"
  
- #: g10/gpg.c:1339
++#: g10/gpg.c:1360
  #, c-format
  msgid "no = sign found in group definition '%s'\n"
  msgstr "no = podpis nalezen v definici skupiny „%s“\n"
  
- #: g10/gpg.c:1537
++#: g10/gpg.c:1558
  #, 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:1540
++#: g10/gpg.c:1561
  #, 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:1543
++#: g10/gpg.c:1564
  #, 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:1549
++#: g10/gpg.c:1570
  #, 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:1552
++#: g10/gpg.c:1573
  #, 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:1555
++#: g10/gpg.c:1576
  #, 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:1561
++#: g10/gpg.c:1582
  #, 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:1564
++#: g10/gpg.c:1585
  #, c-format
  msgid ""
  "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@@ -2635,21 -2060,18 +2651,21 @@@ msgstr "
  "VAROVÁNÍ: vlastnictví adresáře „%s“ s konfiguračním souborem není nastaveno "
  "nebezpečně\n"
  
- #: g10/gpg.c:1567
++#: g10/gpg.c:1588
  #, 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:1573
++#: g10/gpg.c:1594
  #, 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:1576
++#: g10/gpg.c:1597
  #, c-format
  msgid ""
  "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2657,7 -2079,6 +2673,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:1579
++#: g10/gpg.c:1600
  #, c-format
  msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
  msgstr ""
@@@ -2665,498 -2086,342 +2681,438 @@@
  "nastavena bezpečně\n"
  
  # c-format
- #: g10/gpg.c:1786
++#: g10/gpg.c:1816
  #, c-format
  msgid "unknown configuration item '%s'\n"
  msgstr "neznámá konfigurační položka „%s“\n"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1925
  msgid "display photo IDs during key listings"
  msgstr "zobrazovat ID fotografií během výpisu klíčů"
  
- #: g10/gpg.c:1895
++#: g10/gpg.c:1927
  msgid "show key usage information during key listings"
  msgstr "ukazovat údaje o účelu klíče při výpisu klíčů"
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1929
  msgid "show policy URLs during signature listings"
  msgstr "ukazovat URL politik během výpisu podpisů"
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1931
  msgid "show all notations during signature listings"
  msgstr "ukazovat všechny poznámky během výpisu podpisů"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1933
  msgid "show IETF standard notations during signature listings"
  msgstr "ukazovat poznámky IETF standardu během vypisování podpisů"
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1937
  msgid "show user-supplied notations during signature listings"
  msgstr "ukazovat uživatelské poznámky během výpisu podpisů"
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1939
  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:1909
++#: g10/gpg.c:1941
  msgid "show user ID validity during key listings"
  msgstr "ukazovat platnost ID uživatelů při výpisu klíčů"
  
- #: g10/gpg.c:1911
++#: g10/gpg.c:1943
  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:1913
++#: g10/gpg.c:1945
  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:1915
++#: g10/gpg.c:1947
  msgid "show the keyring name in key listings"
  msgstr "ukazovat název souboru s klíči při výpisu klíčů"
  
- #: g10/gpg.c:1917
++#: g10/gpg.c:1949
  msgid "show expiration dates during signature listings"
  msgstr "ukazovat data expirace během výpisu podpisů"
  
- #: g10/gpg.c:2019 g10/gpg.c:2056
++#: g10/gpg.c:2051 g10/gpg.c:2088
  #, fuzzy, c-format
  #| msgid "invalid argument for option \"%.50s\"\n"
  msgid "valid values for option '%s':\n"
  msgstr "neplatný argument u volby „%.50s“\n"
  
- #: g10/gpg.c:2030
++#: g10/gpg.c:2062
  #, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "neznámá TOFU politika „%s“\n"
  
- #: g10/gpg.c:2032 g10/gpg.c:2068
++#: g10/gpg.c:2064 g10/gpg.c:2100
  msgid "(use \"help\" to list choices)\n"
  msgstr "(možnosti lze vypsat příkazem „help“)\n"
  
- #: g10/gpg.c:2066
++#: g10/gpg.c:2098 g10/keygen.c:167
  #, fuzzy, c-format
  #| msgid "invalid argument for option \"%.50s\"\n"
  msgid "invalid value for option '%s'\n"
  msgstr "neplatný argument u volby „%.50s“\n"
  
- #: g10/gpg.c:2203
++#: g10/gpg.c:2235
  #, c-format
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "Poznámka: starý implicitní soubor s možnostmi „%s“ ignorován\n"
  
- #: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
++#: g10/gpg.c:2839 g10/gpg.c:3610 g10/gpg.c:3622
  #, 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:2978 g10/gpg.c:2990
++#: g10/gpg.c:3011 g10/gpg.c:3023
  #, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "„%s“ není platná doba expirace podpisu\n"
  
- #: g10/gpg.c:3012
++#: g10/gpg.c:3045
  #, fuzzy, c-format
  #| msgid "line %d: not a valid email address\n"
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "řádek %d: neplatná e-mailová adresa\n"
  
- #: g10/gpg.c:3044 sm/gpgsm.c:1166
++#: g10/gpg.c:3077 sm/gpgsm.c:1158
  #, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "neplatný režim pinentry „%s“\n"
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3130
  #, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "„%s“ není platná znaková sada\n"
  
- #: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
++#: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
  msgid "could not parse keyserver URL\n"
  msgstr "nelze zpracovat URL serveru klíčů\n"
  
- #: g10/gpg.c:3137
++#: g10/gpg.c:3170
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: neplatný parametr pro server klíčů\n"
  
- #: g10/gpg.c:3140
++#: g10/gpg.c:3173
  msgid "invalid keyserver options\n"
  msgstr "neplatný parametr pro server klíčů\n"
  
- #: g10/gpg.c:3147
++#: g10/gpg.c:3180
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: neplatný parametr pro import\n"
  
- #: g10/gpg.c:3150
++#: g10/gpg.c:3183
  msgid "invalid import options\n"
  msgstr "neplatný parametr pro import\n"
  
- #: g10/gpg.c:3156 g10/gpg.c:3171
++#: g10/gpg.c:3189 g10/gpg.c:3204
  #, fuzzy, c-format
  #| msgid "invalid list options\n"
  msgid "invalid filter option: %s\n"
  msgstr "neplatný parametr pro výpis\n"
  
- #: g10/gpg.c:3162
++#: g10/gpg.c:3195
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: neplatný parametr pro export\n"
  
- #: g10/gpg.c:3165
++#: g10/gpg.c:3198
  msgid "invalid export options\n"
  msgstr "neplatný parametr pro export\n"
  
- #: g10/gpg.c:3177
++#: g10/gpg.c:3210
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: neplatný parametr pro výpis\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3213
  msgid "invalid list options\n"
  msgstr "neplatný parametr pro výpis\n"
  
- #: g10/gpg.c:3188
++#: g10/gpg.c:3221
  msgid "display photo IDs during signature verification"
  msgstr "zobrazovat ID fotografií při ověřování podpisu"
  
- #: g10/gpg.c:3190
++#: g10/gpg.c:3223
  msgid "show policy URLs during signature verification"
  msgstr "ukazovat URL politik při ověřování podpisu"
  
- #: g10/gpg.c:3192
++#: g10/gpg.c:3225
  msgid "show all notations during signature verification"
  msgstr "ukazovat všechny poznámky při ověřování podpisu"
  
- #: g10/gpg.c:3194
++#: g10/gpg.c:3227
  msgid "show IETF standard notations during signature verification"
  msgstr "ukazovat poznámky IETF standardu při ověřování podpisu"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3231
  msgid "show user-supplied notations during signature verification"
  msgstr "ukazovat uživatelské poznámky při ověřování podpisu"
  
- #: g10/gpg.c:3200
++#: g10/gpg.c:3233
  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:3202
++#: g10/gpg.c:3235
  msgid "show user ID validity during signature verification"
  msgstr "ukazovat platnost ID uživatele při ověřování podpisu"
  
- #: g10/gpg.c:3204
++#: g10/gpg.c:3237
  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:3206
++#: g10/gpg.c:3239
  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:3208
++#: g10/gpg.c:3241
  msgid "validate signatures with PKA data"
  msgstr "ověřovat podpisy s daty PKA"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3243
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr "vyzvednout důvěru podpisů s platnými daty PKA"
  
- #: g10/gpg.c:3217
++#: g10/gpg.c:3250
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: neplatný parametr pro ověření\n"
  
- #: g10/gpg.c:3220
++#: g10/gpg.c:3253
  msgid "invalid verify options\n"
  msgstr "neplatný parametr pro ověření\n"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3260
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "nelze nastavit exec-path na %s\n"
  
- #: g10/gpg.c:3417
++#: g10/gpg.c:3452
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: neplatný seznam auto-key-locate\n"
  
- #: g10/gpg.c:3420
++#: g10/gpg.c:3455
  msgid "invalid auto-key-locate list\n"
  msgstr "neplatný seznam auto-key-locate\n"
  
- #: g10/gpg.c:3553 sm/gpgsm.c:1507
++#: g10/gpg.c:3592 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
  msgstr "VAROVÁNÍ: program může vytvořit soubor core!\n"
  
- #: g10/gpg.c:3564
++#: g10/gpg.c:3603
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "VAROVÁNÍ: %s přepíše %s\n"
  
- #: g10/gpg.c:3573
++#: g10/gpg.c:3612
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "Není dovoleno používat %s s %s!\n"
  
- #: g10/gpg.c:3576
++#: g10/gpg.c:3615
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s nedává s %s smysl!\n"
  
- #: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
++#: g10/gpg.c:3630 sm/gpgsm.c:1518 dirmngr/dirmngr.c:951
  msgid "WARNING: running with faked system time: "
  msgstr "VAROVÁNÍ: pracuji s podvrženým systémovým časem: "
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3651
  #, 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:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
++#: g10/gpg.c:3686 g10/gpg.c:3710 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "vybraný šifrovací algoritmus je neplatný\n"
  
- #: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
++#: g10/gpg.c:3692 g10/gpg.c:3716 sm/gpgsm.c:1591 sm/gpgsm.c:1597
  msgid "selected digest algorithm is invalid\n"
  msgstr "vybraný hashovací algoritmus je neplatný\n"
  
- #: g10/gpg.c:3659
++#: g10/gpg.c:3698
  msgid "selected compression algorithm is invalid\n"
  msgstr "vybraný kompresní algoritmus je neplatný\n"
  
- #: g10/gpg.c:3665
++#: g10/gpg.c:3704
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "vybraný hashovací algoritmus je neplatný\n"
  
- #: g10/gpg.c:3680
++#: g10/gpg.c:3719
  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:3682
++#: g10/gpg.c:3721
  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:3684
++#: g10/gpg.c:3723
  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:3686
++#: g10/gpg.c:3725
  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:3688
++#: g10/gpg.c:3727
  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:3691
++#: g10/gpg.c:3730
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
  msgstr "Poznámka: jednoduchý mód S2K (0) je důrazně nedoporučován\n"
  
- #: g10/gpg.c:3695
++#: g10/gpg.c:3734
  msgid "invalid S2K mode; must be 0, 1 or 3\n"
  msgstr "neplatný mód S2K; musí být 0, 1 nebo 3\n"
  
- #: g10/gpg.c:3702
++#: g10/gpg.c:3741
  msgid "invalid default preferences\n"
  msgstr "neplatné implicitní předvolby\n"
  
- #: g10/gpg.c:3706
++#: g10/gpg.c:3745
  msgid "invalid personal cipher preferences\n"
  msgstr "neplatné uživatelské předvolby pro šifrování\n"
  
- #: g10/gpg.c:3710
++#: g10/gpg.c:3749
  msgid "invalid personal digest preferences\n"
  msgstr "neplatné uživatelské předvolby pro hashování\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3753
  msgid "invalid personal compress preferences\n"
  msgstr "neplatné uživatelské předvolby pro komprimaci\n"
  
- #: g10/gpg.c:3750
++#: g10/gpg.c:3789
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s dosud není funkční s %s\n"
  
- #: g10/gpg.c:3797
++#: g10/gpg.c:3836
  #, c-format
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr "použití šifrovacího algoritmu „%s“ v módu %s není dovoleno\n"
  
- #: g10/gpg.c:3802
++#: g10/gpg.c:3841
  #, c-format
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr "použití hashovacího algoritmu „%s“ v módu %s není dovoleno\n"
  
- #: g10/gpg.c:3807
++#: g10/gpg.c:3846
  #, c-format
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr "použití kompresního algoritmu „%s“ v módu %s není dovoleno\n"
  
- #: g10/gpg.c:3906
++#: g10/gpg.c:3945
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "nemohu inicializovat databázi důvěry: %s\n"
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:3957
  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:3975
- msgid "--store [filename]"
- msgstr "--store [jméno souboru]"
- 
- #: g10/gpg.c:3985
- msgid "--symmetric [filename]"
- msgstr "--symmetric [jméno souboru]"
- 
- #: g10/gpg.c:3989
++#: g10/gpg.c:4028
  #, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "symetrické šifrování „%s“ se nepovedlo: %s\n"
  
- #: g10/gpg.c:4000
- msgid "--encrypt [filename]"
- msgstr "--encrypt [jméno souboru]"
- 
- #: g10/gpg.c:4016
- msgid "--symmetric --encrypt [filename]"
- msgstr "--symmetric --encrypt [jméno souboru]"
- 
- #: g10/gpg.c:4018
++#: g10/gpg.c:4057
  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:4021
++#: g10/gpg.c:4060
  #, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr "nelze použít --symmetric --encrypt v módu %s\n"
  
- #: g10/gpg.c:4042
- msgid "--sign [filename]"
- msgstr "--sign [jméno souboru]"
- 
- #: g10/gpg.c:4058
- msgid "--sign --encrypt [filename]"
- msgstr "--sign --encrypt [jméno souboru]"
- 
- #: g10/gpg.c:4076
- msgid "--symmetric --sign --encrypt [filename]"
- msgstr "--symmetric --sign --encrypt [jméno souboru]"
- 
- #: g10/gpg.c:4078
++#: g10/gpg.c:4117
  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:4081
++#: g10/gpg.c:4120
  #, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr "nelze použít --symmetric --sign --encrypt v módu %s\n"
  
- #: g10/gpg.c:4105
- msgid "--sign --symmetric [filename]"
- msgstr "--sign --symmetric [jméno souboru]"
- 
- #: g10/gpg.c:4117
- msgid "--clearsign [filename]"
- msgstr "--clearsign [jméno souboru]"
- 
- #: g10/gpg.c:4147
- msgid "--decrypt [filename]"
- msgstr "--decrypt [jméno souboru]"
- 
- #: g10/gpg.c:4174
- msgid "--sign-key user-id"
- msgstr "--sign-key id_uživatele"
- 
- #: g10/gpg.c:4178
- msgid "--lsign-key user-id"
- msgstr "--lsign-key id_uživatele"
- 
- #: g10/gpg.c:4199
- msgid "--edit-key user-id [commands]"
- msgstr "--edit-key id_uživatele [příkazy]"
- 
- #: g10/gpg.c:4215
- msgid "--passwd <user-id>"
- msgstr "--passwd <id-uživatele>"
- 
- #: g10/gpg.c:4411 g10/keyserver.c:1837
++#: g10/gpg.c:4462 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "odeslání na keyserver se nezdařilo: %s\n"
  
- #: g10/gpg.c:4416
++#: g10/gpg.c:4467
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "získání dat z serveru klíčů se nezdařilo: %s\n"
  
- #: g10/gpg.c:4422
++#: g10/gpg.c:4473
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "export klíče se nepodařil: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4486
  #, fuzzy, c-format
  #| msgid "key export failed: %s\n"
  msgid "export as ssh key failed: %s\n"
  msgstr "export klíče se nepodařil: %s\n"
  
- #: g10/gpg.c:4447
++#: g10/gpg.c:4498
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "hledání na serveru klíčů se nezdařilo: %s\n"
  
- #: g10/gpg.c:4460
++#: g10/gpg.c:4511
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "obnovení dat na serveru klíčů se nezdařilo: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4578
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "dekódování z ASCII formátu selhalo: %s\n"
  
- #: g10/gpg.c:4538
++#: g10/gpg.c:4589
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "kódování do ASCII formátu selhalo: %s\n"
  
- #: g10/gpg.c:4630
++#: g10/gpg.c:4681
  #, c-format
  msgid "invalid hash algorithm '%s'\n"
  msgstr "neplatný hashovací algoritmus „%s“\n"
  
- #: g10/gpg.c:4776 g10/tofu.c:2002
++#: g10/gpg.c:4827 g10/tofu.c:2151
  #, 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:4788
++#: g10/gpg.c:4839
  #, 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:4835
- msgid "[filename]"
- msgstr "[jméno souboru]"
- 
- #: g10/gpg.c:4841
++#: g10/gpg.c:4894
  msgid "Go ahead and type your message ...\n"
  msgstr "Začněte psát svou zprávu…\n"
  
- #: g10/gpg.c:5179
++#: g10/gpg.c:5232
  msgid "the given certification policy URL is invalid\n"
  msgstr "zadané URL pro certifikační politiku je neplatné\n"
  
- #: g10/gpg.c:5181
++#: g10/gpg.c:5234
  msgid "the given signature policy URL is invalid\n"
  msgstr "zadané URL pro podepisovací politiku je neplatné\n"
  
- #: g10/gpg.c:5214
++#: g10/gpg.c:5267
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "zadané URL preferovaného serveru klíčů je neplatné\n"
  
@@@ -3168,7 -2431,6 +3124,7 @@@ msgstr "|SOUBOR|brát klíče z klíč
  msgid "make timestamp conflicts only a warning"
  msgstr "pouze varování při konfliktu časového razítka"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:345
++#: g10/gpgv.c:82 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|zapsat informace o stavu do tohoto FD"
  
@@@ -3197,135 -2454,107 +3153,135 @@@ msgstr "Nápověda není k dispozici
  msgid "No help available for '%s'"
  msgstr "Pro „%s“ není dostupná žádná nápověda"
  
- #: g10/import.c:151
++#: g10/import.c:152
  msgid "import signatures that are marked as local-only"
  msgstr "importovat podpisy, které jsou označeny jen jako místní"
  
- #: g10/import.c:154
++#: g10/import.c:155
  msgid "repair damage from the pks keyserver during import"
  msgstr "opravit poškození vzniklá při importu z PKS serveru"
  
- #: g10/import.c:157
++#: g10/import.c:158
  msgid "do not clear the ownertrust values during import"
  msgstr "nemazat údaje o důvěře během importu"
  
- #: g10/import.c:160
++#: g10/import.c:161
  msgid "do not update the trustdb after import"
  msgstr "neaktualizovat databázi důvěry po importu"
  
- #: g10/import.c:163
++#: g10/import.c:164
  #, fuzzy
  #| msgid "show key fingerprint"
  msgid "show key during import"
  msgstr "vypsat otisk klíče"
  
- #: g10/import.c:166
++#: g10/import.c:167
  msgid "only accept updates to existing keys"
  msgstr "přijímat aktualizace pouze u existujících klíčů"
  
- #: g10/import.c:169
++#: g10/import.c:170
  msgid "remove unusable parts from key after import"
  msgstr "odstranit z klíče po importu nepoužitelné části"
  
- #: g10/import.c:172
++#: g10/import.c:173
  msgid "remove as much as possible from key after import"
  msgstr "odstranit po importu z klíče vše, co lze"
  
- #: g10/import.c:175
++#: g10/import.c:176
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:326 g10/import.c:568
++#: g10/import.c:327 g10/import.c:569
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "blok typu %d byl přeskočen\n"
  
- #: g10/import.c:585
++#: g10/import.c:586
  #, c-format
  msgid "%lu keys processed so far\n"
  msgstr "%lu klíče byly doposud zpracovány\n"
  
- #: g10/import.c:655
++#: g10/import.c:656
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "Celkový počet zpracovaných klíčů: %lu\n"
  
- #: g10/import.c:658
++#: g10/import.c:659
  #, c-format
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "           přeskočeny klíče PGP2: %lu\n"
  
- #: g10/import.c:660
++#: g10/import.c:661
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "           přeskočeny nové klíče: %lu\n"
  
- #: g10/import.c:663
++#: g10/import.c:664
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "                bez ID uživatele: %lu\n"
  
- #: g10/import.c:666 sm/import.c:130
++#: g10/import.c:667 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "                     importováno: %lu"
  
- #: g10/import.c:670 sm/import.c:134
++#: g10/import.c:671 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "                       beze změn: %lu\n"
  
- #: g10/import.c:672
++#: g10/import.c:673
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "               nové ID uživatelů: %lu\n"
  
- #: g10/import.c:674
++#: g10/import.c:675
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "                   nové podklíče: %lu\n"
  
- #: g10/import.c:676
++#: g10/import.c:677
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "                    nové podpisy: %lu\n"
  
- #: g10/import.c:678
++#: g10/import.c:679
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "             nové revokace klíčů: %lu\n"
  
- #: g10/import.c:680 sm/import.c:136
++#: g10/import.c:681 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "            přečtené tajné klíče: %lu\n"
  
- #: g10/import.c:682 sm/import.c:138
++#: g10/import.c:683 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "         importované tajné klíče: %lu\n"
  
- #: g10/import.c:684 sm/import.c:140
++#: g10/import.c:685 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr "           tajné klíče nezměněny: %lu\n"
  
- #: g10/import.c:686 sm/import.c:142
++#: g10/import.c:687 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "                   neimportováno: %lu\n"
  
- #: g10/import.c:688
++#: g10/import.c:689
  #, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "              odstraněné podpisy: %lu\n"
  
- #: g10/import.c:690
++#: g10/import.c:691
  #, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "       odstraněné uživatelské ID: %lu\n"
  
- #: g10/import.c:1034
++#: g10/import.c:1035
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
@@@ -3334,189 -2563,151 +3290,189 @@@ msgstr "
  "VAROVÁNÍ: klíč %s obsahuje předvolby pro nedostupné\n"
  "algoritmy na těchto ID uživatelů:\n"
  
- #: g10/import.c:1076
++#: g10/import.c:1077
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr "         \"%s\": předvolby pro šifrovací algoritmus %s\n"
  
- #: g10/import.c:1091
++#: g10/import.c:1092
  #, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "         \"%s\": předvolby pro podepisovací algoritmus %s\n"
  
- #: g10/import.c:1103
++#: g10/import.c:1104
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr "         \"%s\": předvolby pro komprimační algoritmus %s\n"
  
- #: g10/import.c:1116
++#: g10/import.c:1117
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr "velmi doporučujeme aktualizaci nastavení vašich preferencí a\n"
  
- #: g10/import.c:1118
++#: g10/import.c:1119
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  "distribuci tohoto klíče aby jste předešel problémům s neshodou algoritmů\n"
  
- #: g10/import.c:1143
++#: g10/import.c:1144
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr "nelze aktualizovat předvolby s: gpg --edit-key %s updpref save\n"
  
- #: g10/import.c:1379 g10/import.c:2167
++#: g10/import.c:1380 g10/import.c:2168
  #, c-format
  msgid "key %s: no user ID\n"
  msgstr "klíč %s: chybí identifikátor uživatele\n"
  
- #: g10/import.c:1385
++#: g10/import.c:1386
  #, c-format
  msgid "key %s: %s\n"
  msgstr "klíč %s: %s\n"
  
- #: g10/import.c:1386 g10/import.c:2141
++#: g10/import.c:1387 g10/import.c:2142
  msgid "rejected by import screener"
  msgstr "zamítnut kontrolou při importu"
  
- #: g10/import.c:1416
++#: g10/import.c:1417
  #, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "klíč %s: poškození PKS podklíče opraveno\n"
  
  # c-format
- #: g10/import.c:1434
++#: g10/import.c:1435
  #, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "klíč %s: přijat id uživatele \"%s\",který není podepsán jím samým\n"
  
- #: g10/import.c:1444 g10/import.c:1475
++#: g10/import.c:1445 g10/import.c:1476
  #, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "klíč %s: chybí platný identifikátor uživatele\n"
  
- #: g10/import.c:1446
++#: g10/import.c:1447
  msgid "this may be caused by a missing self-signature\n"
  msgstr "může to být způsobeno chybějícím podpisem klíče jím samým\n"
  
- #: g10/import.c:1516 g10/import.c:2318
++#: g10/import.c:1517 g10/import.c:2319
  #, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "klíč %s: veřejný klíč nenalezen: %s\n"
  
- #: g10/import.c:1522
++#: g10/import.c:1523
  #, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "klíč %s: nový klíč - přeskočen\n"
  
- #: g10/import.c:1537
++#: g10/import.c:1538
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "nenalezen zapisovatelný soubor klíčů (keyring): %s\n"
  
- #: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
++#: g10/import.c:1547 g10/import.c:1648 g10/import.c:2385
  #, c-format
  msgid "error writing keyring '%s': %s\n"
  msgstr "chyba při zápisu souboru klíčů (keyring) „%s“: %s\n"
  
- #: g10/import.c:1566
++#: g10/import.c:1567
  #, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "klíč %s: veřejný klíč „%s“ importován\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1591
  #, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "klíč %s: neodpovídá naší kopii\n"
  
- #: g10/import.c:1606 g10/import.c:2342
++#: g10/import.c:1607 g10/import.c:2343
  #, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "klíč %s: nemohu najít originální blok klíče: %s\n"
  
- #: g10/import.c:1614 g10/import.c:2349
++#: g10/import.c:1615 g10/import.c:2350
  #, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "klíč %s: nemohu číst originální blok klíče: %s\n"
  
- #: g10/import.c:1657
++#: g10/import.c:1658
  #, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "klíč %s: „%s“ 1 nový identifikátor uživatele\n"
  
- #: g10/import.c:1660
++#: g10/import.c:1661
  #, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "klíč %s: „%s“ %d nových identifikátorů uživatele\n"
  
- #: g10/import.c:1663
++#: g10/import.c:1664
  #, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "klíč %s: „%s“ 1 nový podpis\n"
  
- #: g10/import.c:1666
++#: g10/import.c:1667
  #, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "klíč %s: „%s“ %d nových podpisů\n"
  
- #: g10/import.c:1669
++#: g10/import.c:1670
  #, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "klíč %s: „%s“ 1 nový podklíč\n"
  
- #: g10/import.c:1672
++#: g10/import.c:1673
  #, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "klíč %s: „%s“ %d nových podklíčů\n"
  
- #: g10/import.c:1675
++#: g10/import.c:1676
  #, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "klíč %s: „%s“ %d podpisů odstraněno\n"
  
- #: g10/import.c:1678
++#: g10/import.c:1679
  #, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "klíč %s: „%s“ %d podpisů odstraněno\n"
  
- #: g10/import.c:1681
++#: g10/import.c:1682
  #, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "klíč %s: „%s“ %d ID uživatele odstraněno\n"
  
- #: g10/import.c:1684
++#: g10/import.c:1685
  #, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "klíč %s: „%s“ %d ID uživatele odstraněno\n"
  
- #: g10/import.c:1707
++#: g10/import.c:1708
  #, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "klíč %s: „%s“ beze změn\n"
  
- #: g10/import.c:2019 g10/import.c:2264
++#: g10/import.c:2020 g10/import.c:2265
  #, c-format
  msgid "key %s: secret key imported\n"
  msgstr "klíč %s: tajný klíč importován\n"
  
- #: g10/import.c:2027
++#: g10/import.c:2028
  #, c-format
  msgid "key %s: secret key already exists\n"
  msgstr "klíč %s: tajný klíč již existuje\n"
  
- #: g10/import.c:2035
++#: g10/import.c:2036
  #, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "klíč %s: chyba při odesílání dat agentovi: %s\n"
  
- #: g10/import.c:2140
++#: g10/import.c:2141
  #, c-format
  msgid "secret key %s: %s\n"
  msgstr "tajný klíč %s: %s\n"
  
- #: g10/import.c:2160 g10/import.c:2195
++#: g10/import.c:2161 g10/import.c:2196
  msgid "importing secret keys not allowed\n"
  msgstr "import tajných klíčů není povolen\n"
  
- #: g10/import.c:2184
++#: g10/import.c:2185
  #, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr "klíč %s: tajný klíč s neplatnou šifrou %d – přeskočeno\n"
@@@ -3531,139 -2722,112 +3487,139 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2256
++#: g10/import.c:2257
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr "Pro migraci „%s“ u každé karty spusťte: %s\n"
  
- #: g10/import.c:2311
++#: g10/import.c:2312
  #, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr "klíč %s: chybí veřejný klíč – nemohu aplikovat revokační certifikát\n"
  
- #: g10/import.c:2360
++#: g10/import.c:2361
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "klíč %s: neplatný revokační certifikát: %s – zamítnuto\n"
  
- #: g10/import.c:2393
++#: g10/import.c:2394
  #, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "klíč %s: „%s“ revokační certifikát importován\n"
  
- #: g10/import.c:2469
++#: g10/import.c:2470
  #, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "klíč %s: neexistuje id uživatele pro podpis\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2487
  #, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr ""
  "klíč %s: nepodporovaný algoritmus veřejného klíče u uživatelského ID „%s“\n"
  
- #: g10/import.c:2488
++#: g10/import.c:2489
  #, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "klíč %s neplatný podpis klíče jím samým u uživatelského ID „%s“\n"
  
- #: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
++#: g10/import.c:2506 g10/import.c:2532 g10/import.c:2583
  #, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "klíč %s: nepodporovaný algoritmus veřejného klíče\n"
  
- #: g10/import.c:2506
++#: g10/import.c:2507
  #, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "klíč %s: neplatný podpis klíče jím samým (direct key signature)\n"
  
- #: g10/import.c:2520
++#: g10/import.c:2521
  #, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "klíč %s: neexistuje podklíč pro vázání klíčů\n"
  
- #: g10/import.c:2533
++#: g10/import.c:2534
  #, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "klíč %s: neplatná vazba podklíče\n"
  
- #: g10/import.c:2549
++#: g10/import.c:2550
  #, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "klíč %s: smazána vícenásobná vazba podklíče\n"
  
- #: g10/import.c:2571
++#: g10/import.c:2572
  #, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "klíč %s: neexistuje podklíč pro revokaci klíče\n"
  
- #: g10/import.c:2584
++#: g10/import.c:2585
  #, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "klíč %s: neplatný revokační podklíč\n"
  
- #: g10/import.c:2599
++#: g10/import.c:2600
  #, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "klíč %s: smazána vícenásobná revokace podklíče\n"
  
- #: g10/import.c:2641
++#: g10/import.c:2642
  #, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "klíč %s: přeskočen identifikátor uživatele „%s“\n"
  
- #: g10/import.c:2665
++#: g10/import.c:2666
  #, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "klíč %s: podklíč přeskočen\n"
  
- #: g10/import.c:2694
++#: g10/import.c:2695
  #, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "klíč %s: podpis není exportovatelný (třída %02X) - přeskočeno\n"
  
- #: g10/import.c:2705
++#: g10/import.c:2706
  #, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "klíč %s: revokační certifikát na špatném místě - přeskočeno \n"
  
- #: g10/import.c:2723
++#: g10/import.c:2724
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "klíč %s: neplatný revokační certifikát: %s - přeskočen\n"
  
- #: g10/import.c:2737
++#: g10/import.c:2738
  #, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "klíč %s: podpis podklíče na špatném místě - přeskočeno \n"
  
- #: g10/import.c:2745
++#: g10/import.c:2746
  #, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "klíč %s: neočekávaná podpisová třída (0x%02X) - přeskočeno\n"
  
- #: g10/import.c:2887
++#: g10/import.c:2888
  #, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "klíč %s: objeven duplikovaný identifikátor uživatele - sloučen\n"
  
- #: g10/import.c:2951
++#: g10/import.c:2952
  #, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr ""
  "VAROVÁNÍ: klíč %s může být revokován: zkouším získat revokační klíč %s\n"
  
- #: g10/import.c:2967
++#: g10/import.c:2968
  #, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr "VAROVÁNÍ: klíč %s může být revokován: revokační klíč %s nenalezen.\n"
  
- #: g10/import.c:3031
++#: g10/import.c:3032
  #, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "klíč %s: „%s“ přidán revokační certifikát\n"
  
- #: g10/import.c:3069
++#: g10/import.c:3070
  #, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "klíč %s: podpis klíče jím samým (direct key signature) přidán\n"
@@@ -3698,51 -2856,41 +3654,51 @@@ msgstr "zdroj bloku klíče „%s“: %
  msgid "error opening key DB: %s\n"
  msgstr "chyba při otevírání databáze klíčů: %s\n"
  
- #: g10/keydb.c:1782
++#: g10/keydb.c:1786
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "selhalo obnovení vyrovnávací paměti klíčů: %s\n"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[revocation]"
  msgstr "[revokace]"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[self-signature]"
  msgstr "[podpis klíče jím samým]"
  
- #: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
++#: g10/keyedit.c:433 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: dirmngr/ldap-wrapper.c:694
  #, c-format
  msgid "error allocating memory: %s\n"
  msgstr "chyba při alokování paměti: %s\n"
  
- #: g10/keyedit.c:629
++#: g10/keyedit.c:630
  #, fuzzy, c-format
  #| msgid "key %s: unsupported public key algorithm\n"
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr "klíč %s: nepodporovaný algoritmus veřejného klíče\n"
  
- #: g10/keyedit.c:638
++#: g10/keyedit.c:639
  #, fuzzy, c-format
  #| msgid "card does not support digest algorithm %s\n"
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "karta nepodporuje hashovací algoritmus %s\n"
  
- #: g10/keyedit.c:800
++#: g10/keyedit.c:801
  #, fuzzy
  #| msgid "Good signature from"
  msgid " (reordered signatures follow)"
  msgstr "Dobrý podpis od"
  
- #: g10/keyedit.c:913
++#: g10/keyedit.c:914
  #, fuzzy, c-format
  #| msgid "key %s: %s\n"
  msgid "key %s:\n"
  msgstr "klíč %s: %s\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:917
  #, fuzzy, c-format
  #| msgid "User ID \"%s\": %d signature removed\n"
  msgid "%d duplicate signature removed\n"
@@@ -3751,7 -2899,6 +3707,7 @@@ msgstr[0] "Uživatelské ID „%s“: %
  msgstr[1] "Uživatelské ID „%s“: %d podpisů odstraněno\n"
  msgstr[2] "Uživatelské ID „%s“: %d podpisů odstraněno\n"
  
- #: g10/keyedit.c:919 g10/keylist.c:480
++#: g10/keyedit.c:920 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
@@@ -3760,7 -2907,6 +3716,7 @@@ msgstr[0] "1 podpis neověřen, protož
  msgstr[1] "1 podpis neověřen, protože chybí klíč\n"
  msgstr[2] "1 podpis neověřen, protože chybí klíč\n"
  
- #: g10/keyedit.c:923 g10/keylist.c:476
++#: g10/keyedit.c:924 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
@@@ -3769,7 -2915,6 +3725,7 @@@ msgstr[0] "%d špatných podpisů\n
  msgstr[1] "%d špatných podpisů\n"
  msgstr[2] "%d špatných podpisů\n"
  
- #: g10/keyedit.c:927
++#: g10/keyedit.c:928
  #, fuzzy, c-format
  #| msgid "Good signature from"
  msgid "%d signature reordered\n"
@@@ -3778,14 -2923,12 +3734,14 @@@ msgstr[0] "Dobrý podpis od
  msgstr[1] "Dobrý podpis od"
  msgstr[2] "Dobrý podpis od"
  
- #: g10/keyedit.c:932
++#: g10/keyedit.c:933
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:992 g10/pkclist.c:274
++#: g10/keyedit.c:993 g10/pkclist.c:274
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
  "keys\n"
@@@ -3797,17 -2940,14 +3753,17 @@@ msgstr "
  "kontrolou otisků z různých zdrojů…)?\n"
  "\n"
  
- #: g10/keyedit.c:996 g10/pkclist.c:286
++#: g10/keyedit.c:997 g10/pkclist.c:286
  #, c-format
  msgid "  %d = I trust marginally\n"
  msgstr "  %d = Důvěřuji částečně\n"
  
- #: g10/keyedit.c:997 g10/pkclist.c:288
++#: g10/keyedit.c:998 g10/pkclist.c:288
  #, c-format
  msgid "  %d = I trust fully\n"
  msgstr "  %d = Důvěřuji úplně\n"
  
- #: g10/keyedit.c:1015
++#: g10/keyedit.c:1016
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
@@@ -3817,52 -2957,40 +3773,52 @@@ msgstr "
  "Hloubka větší než 1 umožňuje klíčům, které jste podepsal\n"
  "podepsat jiný klíč, který bude pro Vás důvěryhodný.\n"
  
- #: g10/keyedit.c:1032
++#: g10/keyedit.c:1033
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  "Prosím vložte doménu, pro kterou je podpis omezen nebo stiskněte enter pro "
  "podpis bez omezení na doménu.\n"
  
- #: g10/keyedit.c:1160
++#: g10/keyedit.c:1161
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr "Přeskakuje se ID uživatele „%s“, což není textové ID.\n"
  
- #: g10/keyedit.c:1168
++#: g10/keyedit.c:1169
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "Uživatelské ID „%s“ je revokováno."
  
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
- #: g10/keyedit.c:2246
++#: g10/keyedit.c:1178 g10/keyedit.c:1206 g10/keyedit.c:1233 g10/keyedit.c:1417
++#: g10/keyedit.c:2247
  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:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
- #: g10/keyedit.c:2251 g10/keyedit.c:3177
++#: g10/keyedit.c:1192 g10/keyedit.c:1220 g10/keyedit.c:1247 g10/keyedit.c:1423
++#: g10/keyedit.c:2252 g10/keyedit.c:3178
  msgid "  Unable to sign.\n"
  msgstr "  Nelze podepsat.\n"
  
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1197
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "Vypršela platnost uživatelského ID „%s“."
  
- #: g10/keyedit.c:1224
++#: g10/keyedit.c:1225
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "ID uživatele „%s“ není podepsáno jím samým."
  
- #: g10/keyedit.c:1253
++#: g10/keyedit.c:1254
  #, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "ID uživatele „%s“ je připraveno k podpisu."
  
- #: g10/keyedit.c:1255
++#: g10/keyedit.c:1256
  msgid "Sign it? (y/N) "
  msgstr "Podepsat? (a/N) "
  
- #: g10/keyedit.c:1282
++#: g10/keyedit.c:1283
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -3871,11 -2999,9 +3827,11 @@@ msgstr "
  "Podpis klíče „%s“ jím samým je\n"
  "podpis formátu PGP 2.x.\n"
  
- #: g10/keyedit.c:1291
++#: g10/keyedit.c:1292
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr "Přejete si jej změnit na formát OpenPGP? (a/N) "
  
- #: g10/keyedit.c:1304
++#: g10/keyedit.c:1305
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3884,13 -3010,11 +3840,13 @@@ msgstr "
  "Platnost vašeho podpisu na „%s“\n"
  "vypršela.\n"
  
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:1310
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr ""
  "Chcete vytvořit nový podpis a nahradit jím ten, jehož platnost vypršela? (a/"
  "N) "
  
- #: g10/keyedit.c:1330
++#: g10/keyedit.c:1331
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3899,43 -3023,34 +3855,43 @@@ msgstr "
  "Váš současný podpis na „%s“\n"
  "je pouze lokální.\n"
  
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:1336
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr "Přejete si jej změnit na plně exportovatelný podpise? (a/N) "
  
- #: g10/keyedit.c:1355
++#: g10/keyedit.c:1356
  #, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "„%s“ je již lokálně podepsán klíčem %s\n"
  
- #: g10/keyedit.c:1359
++#: g10/keyedit.c:1360
  #, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "„%s“ je již podepsán klíčem %s\n"
  
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:1365
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "Chcete klíč přesto znova podepsat? (a/N) "
  
- #: g10/keyedit.c:1386
++#: g10/keyedit.c:1387
  #, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "Nic k podepsání klíčem %s\n"
  
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1411
  msgid "This key has expired!"
  msgstr "Platnost klíče vypršela!"
  
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1429
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "Platnost klíče vyprší %s.\n"
  
- #: g10/keyedit.c:1434
++#: g10/keyedit.c:1435
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr "Chcete, aby platnost Vašeho podpisu vypršela ve stejnou dobu? (A/n) "
  
- #: g10/keyedit.c:1475
++#: g10/keyedit.c:1476
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -3945,31 -3060,25 +3901,31 @@@ msgstr "
  "patří výše uvedené osobě.\n"
  "Pokud neznáte odpověď, zadejte „0“.\n"
  
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1481
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) Neodpovím.%s\n"
  
- #: g10/keyedit.c:1482
++#: g10/keyedit.c:1483
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) Nijak jsem to nekontroloval(a).%s\n"
  
- #: g10/keyedit.c:1484
++#: g10/keyedit.c:1485
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) Částečně jsem to ověřil(a).%s\n"
  
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:1488
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) Velmi pečlivě jsem to ověřil(a).%s\n"
  
- #: g10/keyedit.c:1494
++#: g10/keyedit.c:1495
  msgid "Your selection? (enter '?' for more information): "
  msgstr "Váš výběr? (pro podrobnosti zadejte „?“): "
  
- #: g10/keyedit.c:1521
++#: g10/keyedit.c:1522
  #, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -3978,221 -3087,167 +3934,221 @@@ msgstr "
  "Jste si jistý(á), že chcete podepsat tento klíč\n"
  "svým klíčem „%s“ (%s)\n"
  
- #: g10/keyedit.c:1529
++#: g10/keyedit.c:1530
  msgid "This will be a self-signature.\n"
  msgstr "Jedná se o podpis klíče jím samým.\n"
  
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:1535
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr "VAROVÁNÍ: podpis nebude označen jako neexportovatelný.\n"
  
- #: g10/keyedit.c:1541
++#: g10/keyedit.c:1542
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr "VAROVÁNÍ: podpis nebude označen jako neodvolatelný (non-revocable).\n"
  
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1552
  msgid "The signature will be marked as non-exportable.\n"
  msgstr "Podpis bude označen jako neexportovatelný.\n"
  
- #: g10/keyedit.c:1558
++#: g10/keyedit.c:1559
  msgid "The signature will be marked as non-revocable.\n"
  msgstr "Podpis bude označen jako neodvolatelný (non-revocable).\n"
  
- #: g10/keyedit.c:1565
++#: g10/keyedit.c:1566
  msgid "I have not checked this key at all.\n"
  msgstr "Nijak jsem tento klíč neověřil.\n"
  
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:1571
  msgid "I have checked this key casually.\n"
  msgstr "Částečně jsem ověřil tento klíč.\n"
  
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:1576
  msgid "I have checked this key very carefully.\n"
  msgstr "Velmi pečlivě jsem ověřil tento klíč.\n"
  
- #: g10/keyedit.c:1587
++#: g10/keyedit.c:1588
  msgid "Really sign? (y/N) "
  msgstr "Skutečně podepsat? (a/N) "
  
- #: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
- #: g10/keyedit.c:6463 g10/sign.c:323
++#: g10/keyedit.c:1639 g10/keyedit.c:6308 g10/keyedit.c:6391 g10/keyedit.c:6500
++#: g10/keyedit.c:6562 g10/sign.c:325
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "podepsání selhalo: %s\n"
  
- #: g10/keyedit.c:1725
++#: g10/keyedit.c:1726
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  "K dispozici je jen kontrolní součet klíče nebo je klíč na kartě - passphrase "
  "nelze změnit.\n"
  
- #: g10/keyedit.c:1755
++#: g10/keyedit.c:1756
  #, c-format
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "klíč %s: chyba při měnění hesla: %s\n"
  
- #: g10/keyedit.c:1869
++#: g10/keyedit.c:1870
  msgid "save and quit"
  msgstr "uložit a ukončit"
  
- #: g10/keyedit.c:1872
++#: g10/keyedit.c:1873
  msgid "show key fingerprint"
  msgstr "vypsat otisk klíče"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1874
  msgid "show the keygrip"
  msgstr "ukázat keygrip"
  
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1875
  msgid "list key and user IDs"
  msgstr "vypsat seznam klíčů a id uživatelů"
  
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1877
  msgid "select user ID N"
  msgstr "vyberte identifikátor uživatele N"
  
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1878
  msgid "select subkey N"
  msgstr "vyberte podklíč N"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1879
  msgid "check signatures"
  msgstr "kontrolovat podpisy"
  
- #: g10/keyedit.c:1884
++#: g10/keyedit.c:1885
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr "podepsat vybrané ID uživatele [* níže jsou uvedeny relevantní příkazy]"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1890
  msgid "sign selected user IDs locally"
  msgstr "podepsat vybrané uživatelské ID lokálně"
  
- #: g10/keyedit.c:1890
++#: g10/keyedit.c:1891
  msgid "sign selected user IDs with a trust signature"
  msgstr "podepsat vybrané uživatelské ID důvěryhodným podpisem"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1893
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr "podepsat vybraná uživatelská ID neodvolatelným podpisem"
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1895
  msgid "add a user ID"
  msgstr "přidat identifikátor uživatele"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1897
  msgid "add a photo ID"
  msgstr "přidat fotografický ID"
  
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1898
  msgid "delete selected user IDs"
  msgstr "smazat vybrané ID uživatele"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1901
  msgid "add a subkey"
  msgstr "přidat podklíč"
  
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1904
  msgid "add a key to a smartcard"
  msgstr "přidat klíč na kartu"
  
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1906
  msgid "move a key to a smartcard"
  msgstr "přesunout klíč na kartu"
  
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1908
  msgid "move a backup key to a smartcard"
  msgstr "přesunout záložní klíč na kartu"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1910
  msgid "delete selected subkeys"
  msgstr "smazat vybrané podklíče"
  
- #: g10/keyedit.c:1911
++#: g10/keyedit.c:1912
  msgid "add a revocation key"
  msgstr "přidat revokační klíč"
  
- #: g10/keyedit.c:1913
++#: g10/keyedit.c:1914
  msgid "delete signatures from the selected user IDs"
  msgstr "smazat podpisy z vybraných uživatelských ID"
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1916
  msgid "change the expiration date for the key or selected subkeys"
  msgstr "změnit datum expirace pro klíč nebo vybrané podklíče"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1918
  msgid "flag the selected user ID as primary"
  msgstr "označit vybrané uživatelské ID jako primární"
  
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1921
  msgid "list preferences (expert)"
  msgstr "vypsat seznam předvoleb (pro experty)"
  
- #: g10/keyedit.c:1921
++#: g10/keyedit.c:1922
  msgid "list preferences (verbose)"
  msgstr "vypsat seznam předvoleb (podrobně)"
  
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:1924
  msgid "set preference list for the selected user IDs"
  msgstr "nastavit sadu preferencí pro vybrané uživatelské ID"
  
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1927
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr "nastavit URL preferovaného serveru klíčů pro vybraná uživatelská ID"
  
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1929
  msgid "set a notation for the selected user IDs"
  msgstr "zadat poznámku pro vybraná uživatelská ID"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1931
  msgid "change the passphrase"
  msgstr "změnit heslo"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1934
  msgid "change the ownertrust"
  msgstr "změnit důvěryhodnost vlastníka klíče"
  
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1937
  msgid "revoke signatures on the selected user IDs"
  msgstr "revokovat podpisu na vybraných uživatelských ID"
  
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1939
  msgid "revoke selected user IDs"
  msgstr "revokovat vybrané uživatelské ID"
  
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1942
  msgid "revoke key or selected subkeys"
  msgstr "revokovat klíč nebo vybrané podklíče"
  
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1944
  msgid "enable key"
  msgstr "nastavit klíč jako platný (enable)"
  
- #: g10/keyedit.c:1944
++#: g10/keyedit.c:1945
  msgid "disable key"
  msgstr "nastavit klíč jako neplatný (disable)"
  
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1947
  msgid "show selected photo IDs"
  msgstr "ukázat vybrané fotografické ID"
  
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1949
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  "směstnat nepoužitelná ID uživatelů a odstranit z klíče nepoužitelné podpisy"
  
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:1951
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr "směstnat nepoužitelná ID uživatelů a odstranit z klíče všechny podpisy"
  
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2063
  msgid "Secret key is available.\n"
  msgstr "Tajný klíč je dostupný.\n"
  
- #: g10/keyedit.c:2162
++#: g10/keyedit.c:2163
  msgid "Need the secret key to do this.\n"
  msgstr "Pro provedení této operace je potřeba tajný klíč.\n"
  
- #: g10/keyedit.c:2183
++#: g10/keyedit.c:2184
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4203,258 -3258,204 +4159,264 @@@ 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:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
++#: g10/keyedit.c:2240 g10/keyedit.c:3178 g10/keyedit.c:3317 g10/keyedit.c:3379
  msgid "Key is revoked."
  msgstr "Klíč revokován."
  
- #: g10/keyedit.c:2262
++#: g10/keyedit.c:2263
  msgid "Really sign all user IDs? (y/N) "
  msgstr "Opravdu podepsat všechny id uživatele? (a/N) "
  
- #: g10/keyedit.c:2266
++#: g10/keyedit.c:2267
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "Opravdu podepsat všechna textová ID uživatele? (a/N) "
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2275
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Nápověda: Vyberte id uživatele k podepsání\n"
  
- #: g10/keyedit.c:2285
++#: g10/keyedit.c:2286
  #, c-format
  msgid "Unknown signature type '%s'\n"
  msgstr "Neznámý typ podpisu „%s“\n"
  
- #: g10/keyedit.c:2309
++#: g10/keyedit.c:2310
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
  msgstr "Tento příkaz není v módů %s dovolený.\n"
  
- #: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
++#: g10/keyedit.c:2332 g10/keyedit.c:2356 g10/keyedit.c:2550
  msgid "You must select at least one user ID.\n"
  msgstr "Musíte vybrat alespoň jeden id uživatele.\n"
  
- #: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
++#: g10/keyedit.c:2334 g10/keyedit.c:2358 g10/keyedit.c:2512 g10/keyedit.c:2552
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr "(Použijte příkaz „%s“.)\n"
  
- #: g10/keyedit.c:2336
++#: g10/keyedit.c:2337
  msgid "You can't delete the last user ID!\n"
  msgstr "Nemůžete smazat poslední id uživatele!\n"
  
- #: g10/keyedit.c:2339
++#: g10/keyedit.c:2340
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "Opravdu odstranit všechny vybrané id uživatele? (a/N) "
  
- #: g10/keyedit.c:2340
++#: g10/keyedit.c:2341
  msgid "Really remove this user ID? (y/N) "
  msgstr "Opravdu odstranit tento id uživatele? (a/N) "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2397
++#: g10/keyedit.c:2398
  msgid "Really move the primary key? (y/N) "
  msgstr "Opravdu přesunout primární klíč? (a/N) "
  
- #: g10/keyedit.c:2409 g10/keyedit.c:4866
++#: g10/keyedit.c:2410 g10/keyedit.c:4964
  msgid "You must select exactly one key.\n"
  msgstr "Musíte vybrat právě jeden klíč.\n"
  
- #: g10/keyedit.c:2436
++#: g10/keyedit.c:2437
  msgid "Command expects a filename argument\n"
  msgstr "Příkaz očekává jméno souboru jako argument\n"
  
- #: g10/keyedit.c:2457
++#: g10/keyedit.c:2458
  #, c-format
  msgid "Can't open '%s': %s\n"
  msgstr "Nelze otevřít „%s“: %s\n"
  
- #: g10/keyedit.c:2474
++#: g10/keyedit.c:2475
  #, c-format
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "Chyba při čtení záložního klíče z „%s“: %s\n"
  
- #: g10/keyedit.c:2509
++#: g10/keyedit.c:2510
  msgid "You must select at least one key.\n"
  msgstr "Musíte vybrat alespoň jeden klíč.\n"
  
- #: g10/keyedit.c:2515
++#: g10/keyedit.c:2516
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "Opravdu chcete smazat vybrané klíče? (a/N) "
  
- #: g10/keyedit.c:2517
++#: g10/keyedit.c:2518
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "Opravdu chcete smazat tento klíč? (a/N) "
  
- #: g10/keyedit.c:2555
++#: g10/keyedit.c:2556
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr "Opravdu revokovat všechny vybrané id uživatele? (a/N) "
  
- #: g10/keyedit.c:2556
++#: g10/keyedit.c:2557
  msgid "Really revoke this user ID? (y/N) "
  msgstr "Opravdu revokovat tento id uživatele? (a/N) "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2575
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "Opravdu chcete revokovat celý klíč? (a/N) "
  
- #: g10/keyedit.c:2585
++#: g10/keyedit.c:2586
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "Opravdu chcete revokovat vybrané podklíče? (a/N) "
  
- #: g10/keyedit.c:2587
++#: g10/keyedit.c:2588
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "Opravdu chcete revokovat tento podklíč? (a/N) "
  
- #: g10/keyedit.c:2645
++#: g10/keyedit.c:2646
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  "Důvěryhodnost vlastníka nelze měnit je-li používána databáze důvěry "
  "poskytnutá uživatelem\n"
  
- #: g10/keyedit.c:2690
++#: g10/keyedit.c:2691
  msgid "Set preference list to:\n"
  msgstr "Nastavit seznam předvoleb:\n"
  
- #: g10/keyedit.c:2697
++#: g10/keyedit.c:2698
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr "Opravdu aktualizovat předvolby pro vybraný id uživatele? (a/N) "
  
- #: g10/keyedit.c:2699
++#: g10/keyedit.c:2700
  msgid "Really update the preferences? (y/N) "
  msgstr "Opravdu aktualizovat předvolby? (a/N) "
  
- #: g10/keyedit.c:2773
++#: g10/keyedit.c:2774
  msgid "Save changes? (y/N) "
  msgstr "Uložit změny? (a/N) "
  
- #: g10/keyedit.c:2777
++#: g10/keyedit.c:2778
  msgid "Quit without saving? (y/N) "
  msgstr "Ukončit bez uložení? (a/N) "
  
- #: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
- #: g10/keyedit.c:3267 g10/keyedit.c:3332
++#: g10/keyedit.c:2789 g10/keyedit.c:2799 g10/keyedit.c:2943 g10/keyedit.c:3046
++#: g10/keyedit.c:3268 g10/keyedit.c:3333 g10/keyedit.c:3409
  #, c-format
  msgid "update failed: %s\n"
  msgstr "aktualizace selhala: %s\n"
  
- #: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
++#: g10/keyedit.c:2805 g10/keyedit.c:3273 g10/keyedit.c:3338 g10/keyedit.c:3416
  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:3038
++#: g10/keyedit.c:3039
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
  msgstr "Vytvoření klíče se nepodařilo: %s\n"
  
- #: g10/keyedit.c:3083
++#: g10/keyedit.c:3084
  #, c-format
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "„%s“ není otisk\n"
  
- #: g10/keyedit.c:3112
++#: g10/keyedit.c:3113
  #, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "„%s“ není primární otisk\n"
  
- #: g10/keyedit.c:3248 g10/keyedit.c:3251
++#: g10/keyedit.c:3249 g10/keyedit.c:3252
  #, fuzzy, c-format
  #| msgid "read error in '%s': %s\n"
  msgid "Invalid user ID '%s': %s\n"
  msgstr "chyba při čtení v „%s“: %s\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  msgid "No matching user IDs."
  msgstr "Žádný identifikátor uživatele neodpovídá."
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  msgid "Nothing to sign.\n"
  msgstr "Nic na podepsání.\n"
  
- #: g10/keyedit.c:3427
++#: g10/keyedit.c:3388
+ #, fuzzy, c-format
+ #| msgid "'%s' is not a valid signature expiration\n"
+ msgid "'%s' is not a valid expiration time\n"
+ msgstr "„%s“ není platná doba expirace podpisu\n"
+ 
++#: g10/keyedit.c:3508
  msgid "Digest: "
  msgstr "Hash: "
  
- #: g10/keyedit.c:3484
++#: g10/keyedit.c:3565
  msgid "Features: "
  msgstr "Vlastnosti: "
  
- #: g10/keyedit.c:3495
++#: g10/keyedit.c:3576
  msgid "Keyserver no-modify"
  msgstr "Keyserver bez modifikace"
  
- #: g10/keyedit.c:3510 g10/keylist.c:377
++#: g10/keyedit.c:3591 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr "Preferovaný keyserver: "
  
- #: g10/keyedit.c:3518 g10/keyedit.c:3519
++#: g10/keyedit.c:3599 g10/keyedit.c:3600
  msgid "Notations: "
  msgstr "Poznámky: "
  
- #: g10/keyedit.c:3764
++#: g10/keyedit.c:3845
  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:3836
++#: g10/keyedit.c:3917
  #, c-format
  msgid "The following key was revoked on %s by %s key %s\n"
  msgstr "V %s byl následující klíč revokován %s klíčem %s\n"
  
- #: g10/keyedit.c:3860
++#: g10/keyedit.c:3941
  #, c-format
  msgid "This key may be revoked by %s key %s"
  msgstr "Tento klíč může být revokován %s klíčem %s "
  
- #: g10/keyedit.c:3866
++#: g10/keyedit.c:3947
  msgid "(sensitive)"
  msgstr "(citlivá informace)"
  
- #: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3989 g10/keyedit.c:4131 g10/keylist.c:262 g10/keyserver.c:538
  #, c-format
  msgid "created: %s"
  msgstr "vytvořen: %s"
  
- #: g10/keyedit.c:3911 g10/keylist.c:1852
++#: g10/keyedit.c:3992 g10/keylist.c:1852
  #, c-format
  msgid "revoked: %s"
  msgstr "revokován: %s"
  
- #: g10/keyedit.c:3913 g10/keylist.c:1858
++#: g10/keyedit.c:3994 g10/keylist.c:1858
  #, c-format
  msgid "expired: %s"
  msgstr "platnost skončila: %s"
  
- #: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyedit.c:3996 g10/keyedit.c:4133 g10/keylist.c:264 g10/keylist.c:1864
 +#: g10/keyserver.c:544
  #, c-format
  msgid "expires: %s"
  msgstr "platnost skončí: %s"
  
- #: g10/keyedit.c:3917
++#: g10/keyedit.c:3998
  #, c-format
  msgid "usage: %s"
  msgstr "použití: %s"
  
- #: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
++#: g10/keyedit.c:4006 g10/keyedit.c:4026 g10/keylist.c:267
  msgid "card-no: "
  msgstr "číslo karty: "
  
- #: g10/keyedit.c:3984
++#: g10/keyedit.c:4065
  #, c-format
  msgid "trust: %s"
  msgstr "důvěra: %s"
  
- #: g10/keyedit.c:3988
++#: g10/keyedit.c:4069
  #, c-format
  msgid "validity: %s"
  msgstr "platnost: %s"
  
- #: g10/keyedit.c:3995
++#: g10/keyedit.c:4076
  msgid "This key has been disabled"
  msgstr "Tento klíč byl označen za neplatný (disabled)"
  
- #: g10/keyedit.c:4013
++#: g10/keyedit.c:4094
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4463,18 -3464,12 +4425,18 @@@ msgstr "
  "být nutně správné, dokud znova nespustíte program.\n"
  
  # status
- #: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
- #: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: g10/keyedit.c:4150 g10/keyedit.c:4581 g10/keyserver.c:548
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:712
 +#: dirmngr/ocsp.c:703
  msgid "revoked"
  msgstr "odvolán"
  
- #: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
- #: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4152 g10/keyedit.c:4583 g10/keyserver.c:552
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:714
  msgid "expired"
  msgstr "platnost skončila"
  
- #: g10/keyedit.c:4188
++#: g10/keyedit.c:4269
  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"
@@@ -4482,15 -3477,12 +4444,15 @@@ 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:4240
++#: g10/keyedit.c:4321
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr "POZOR: Vašemu šifrovacímu podklíči brzy vyprší platnost.\n"
  
- #: g10/keyedit.c:4241
++#: g10/keyedit.c:4322
  msgid "You may want to change its expiration date too.\n"
  msgstr "Dobu platnosti také můžete změnit.\n"
  
- #: g10/keyedit.c:4300
++#: g10/keyedit.c:4381
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4499,35 -3491,27 +4461,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:4305 g10/keyedit.c:4595
++#: g10/keyedit.c:4386 g10/keyedit.c:4676
  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:4311
++#: g10/keyedit.c:4392
  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:4326 g10/keygen.c:2697
++#: g10/keyedit.c:4407 g10/keygen.c:2719
  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:4428
++#: g10/keyedit.c:4509
  msgid "Delete this good signature? (y/N/q)"
  msgstr "Smazat tento dobrý podpis? (a/N/u)"
  
- #: g10/keyedit.c:4438
++#: g10/keyedit.c:4519
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "Smazat tento neplatný podpis? (a/N/u)"
  
- #: g10/keyedit.c:4442
++#: g10/keyedit.c:4523
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "Smazat tento neznámý podpis? (a/N/u)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4530
  msgid "Really delete this self-signature? (y/N)"
  msgstr "Opravdu smazat tento podpis podepsaný sebou samým? (a/N)"
  
- #: g10/keyedit.c:4465
++#: g10/keyedit.c:4546
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
@@@ -4536,20 -3520,16 +4498,20 @@@ msgstr[0] "Smazán %d podpis.\n
  msgstr[1] "Smazán %d podpis.\n"
  msgstr[2] "Smazán %d podpis.\n"
  
- #: g10/keyedit.c:4469
++#: g10/keyedit.c:4550
  msgid "Nothing deleted.\n"
  msgstr "Nic nebylo smazáno.\n"
  
- #: g10/keyedit.c:4504 g10/trust.c:693
++#: g10/keyedit.c:4585 g10/trust.c:716
  msgid "invalid"
  msgstr "neplatný"
  
- #: g10/keyedit.c:4506
++#: g10/keyedit.c:4587
  #, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "Uživatelské ID „%s“ směstnáno: %s\n"
  
- #: g10/keyedit.c:4512
++#: g10/keyedit.c:4593
  #, fuzzy, c-format
  #| msgid "User ID \"%s\": %d signature removed\n"
  msgid "User ID \"%s\": %d signature removed\n"
@@@ -4558,17 -3538,14 +4520,17 @@@ msgstr[0] "Uživatelské ID „%s“: %
  msgstr[1] "Uživatelské ID „%s“: %d podpisů odstraněno\n"
  msgstr[2] "Uživatelské ID „%s“: %d podpisů odstraněno\n"
  
- #: g10/keyedit.c:4520
++#: g10/keyedit.c:4601
  #, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "Uživatelské ID „%s“: je již minimalizované\n"
  
- #: g10/keyedit.c:4521
++#: g10/keyedit.c:4602
  #, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "Uživatelské ID „%s“: je již odstraněné\n"
  
- #: g10/keyedit.c:4590
++#: g10/keyedit.c:4671
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4577,265 -3554,206 +4539,265 @@@ msgstr "
  "VAROVÁNÍ: Toto je PGP2 klíč. Přidání 'pověření revokace' může v některých\n"
  "          verzích PGP vést k odmítnutí tohoto klíče.\n"
  
- #: g10/keyedit.c:4601
++#: g10/keyedit.c:4682
  msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
  msgstr "Neměli by jste přidávat 'pověření revokace' k PGP2 klíči.\n"
  
- #: g10/keyedit.c:4618
++#: g10/keyedit.c:4699
  msgid "Enter the user ID of the designated revoker: "
  msgstr "Vložte identifikátor uživatele pověřeného revokací: "
  
- #: g10/keyedit.c:4643
++#: g10/keyedit.c:4724
  msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
  msgstr "klíč formátu PGP 2.x nelze pověřit revokací\n"
  
- #: g10/keyedit.c:4658
++#: g10/keyedit.c:4739
  msgid "you cannot appoint a key as its own designated revoker\n"
  msgstr "klíč nelze pověřit revokací jím samým\n"
  
- #: g10/keyedit.c:4680
++#: g10/keyedit.c:4761
  msgid "this key has already been designated as a revoker\n"
  msgstr "tento klíč již byl pověřen revokací\n"
  
- #: g10/keyedit.c:4698
++#: g10/keyedit.c:4779
  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:4704
++#: g10/keyedit.c:4785
  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 revokací? (a/N) "
  
- #: g10/keyedit.c:4755
++#: g10/keyedit.c:4848
  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:4760
++#: g10/keyedit.c:4853
  msgid "Changing expiration time for a subkey.\n"
  msgstr "Měním dobu expirace podklíče.\n"
  
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:4856
  msgid "Changing expiration time for the primary key.\n"
  msgstr "Měním dobu expirace primárního klíče.\n"
  
- #: g10/keyedit.c:4814
++#: g10/keyedit.c:4910
  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:4987
++#: g10/keyedit.c:5085
  #, 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:4993
++#: g10/keyedit.c:5091
  #, 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:5108
++#: g10/keyedit.c:5206
  msgid "Please select exactly one user ID.\n"
  msgstr "Prosím, vyberte právě jeden id uživatele .\n"
  
- #: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
++#: g10/keyedit.c:5247 g10/keyedit.c:5361 g10/keyedit.c:5474 g10/keyedit.c:5611
  #, 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:5320
++#: g10/keyedit.c:5418
  msgid "Enter your preferred keyserver URL: "
  msgstr "Vložte URL preferovaného serveru klíčů: "
  
- #: g10/keyedit.c:5399
++#: g10/keyedit.c:5497
  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:5400
++#: g10/keyedit.c:5498
  msgid "Are you sure you want to delete it? (y/N) "
  msgstr "Jste si jistý(á), že jej chcete smazat? (a/N) "
  
- #: g10/keyedit.c:5459
++#: g10/keyedit.c:5557
  msgid "Enter the notation: "
  msgstr "Vložte poznámku: "
  
- #: g10/keyedit.c:5606
++#: g10/keyedit.c:5704
  msgid "Proceed? (y/N) "
  msgstr "Pokračovat (a/N)? "
  
- #: g10/keyedit.c:5676
++#: g10/keyedit.c:5774
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "Neexistuje identifikátor uživatele s indexem %d\n"
  
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5836
  #, c-format
  msgid "No user ID with hash %s\n"
  msgstr "Neexistuje uživatelské ID s hashem %s\n"
  
- #: g10/keyedit.c:5839
++#: g10/keyedit.c:5937
  #, c-format
  msgid "No subkey with key ID '%s'.\n"
  msgstr "Neexistuje podklíč s ID klíče „%s“.\n"
  
- #: g10/keyedit.c:5861
++#: g10/keyedit.c:5959
  #, c-format
  msgid "No subkey with index %d\n"
  msgstr "Neexistuje podklíč s indexem %d\n"
  
- #: g10/keyedit.c:6002
++#: g10/keyedit.c:6100
  #, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "ID uživatele: „%s“\n"
  
- #: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
++#: g10/keyedit.c:6103 g10/keyedit.c:6205 g10/keyedit.c:6253
  #, 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:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
++#: g10/keyedit.c:6105 g10/keyedit.c:6207 g10/keyedit.c:6255
  msgid " (non-exportable)"
  msgstr " (neexportovatelné)"
  
- #: g10/keyedit.c:6011
++#: g10/keyedit.c:6109
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "Platnost podpisu vyprší %s.\n"
  
- #: g10/keyedit.c:6016
++#: g10/keyedit.c:6114
  msgid "Are you sure you still want to revoke it? (y/N) "
  msgstr "Jste si jistý, že jej chcete stále revokovat? (a/N) "
  
- #: g10/keyedit.c:6021
++#: g10/keyedit.c:6119
  msgid "Create a revocation certificate for this signature? (y/N) "
  msgstr "Vytvořit pro tento podpis revokační certifikát? (a/N)"
  
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6173
  msgid "Not signed by you.\n"
  msgstr "Nepodepsáno vámi.\n"
  
- #: g10/keyedit.c:6081
++#: g10/keyedit.c:6179
  #, 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:6110
++#: g10/keyedit.c:6208
  msgid " (non-revocable)"
  msgstr " (neodvolatelné)"
  
- #: g10/keyedit.c:6117
++#: g10/keyedit.c:6215
  #, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "revokováno vaším klíčem %s v %s\n"
  
- #: g10/keyedit.c:6142
++#: g10/keyedit.c:6240
  msgid "You are about to revoke these signatures:\n"
  msgstr "Chystáte se revokovat tyto podpisy:\n"
  
- #: g10/keyedit.c:6165
++#: g10/keyedit.c:6263
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "Opravdu vytvořit revokační certifikáty? (a/N) "
  
- #: g10/keyedit.c:6198
++#: g10/keyedit.c:6296
  msgid "no secret key\n"
  msgstr "neexistuje tajný klíč\n"
  
- #: g10/keyedit.c:6246
++#: g10/keyedit.c:6344
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6256
++#: g10/keyedit.c:6354
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "uživatelské ID „%s“ je již revokováno\n"
  
- #: g10/keyedit.c:6273
++#: g10/keyedit.c:6371
  #, 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:6386
++#: g10/keyedit.c:6485
  #, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "Klíč %s je již revokován.\n"
  
- #: g10/keyedit.c:6448
++#: g10/keyedit.c:6547
  #, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "Podklíč %s je již revokován.\n"
  
- #: g10/keyedit.c:6545
++#: g10/keyedit.c:6644
  #, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr "Zobrazuji %s fotografický ID o velikosti %ld pro klíč %s (uid %d)\n"
  
- #: g10/keygen.c:305
++#: g10/keygen.c:316
  #, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "duplicita předvolby „%s“\n"
  
- #: g10/keygen.c:312
++#: g10/keygen.c:323
  msgid "too many cipher preferences\n"
  msgstr "příliš mnoho předvoleb pro šifrování\n"
  
- #: g10/keygen.c:314
++#: g10/keygen.c:325
  msgid "too many digest preferences\n"
  msgstr "příliš mnoho předvoleb pro vzorkování\n"
  
- #: g10/keygen.c:316
++#: g10/keygen.c:327
  msgid "too many compression preferences\n"
  msgstr "příliš mnoho předvoleb pro komprimaci\n"
  
- #: g10/keygen.c:457
++#: g10/keygen.c:468
  #, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "neplatná položka „%s“ v řetězci s předvolbami\n"
  
- #: g10/keygen.c:936
++#: g10/keygen.c:947
  msgid "writing direct signature\n"
  msgstr "zapisuji podpis klíče jím samým (direct signature)\n"
  
- #: g10/keygen.c:982
++#: g10/keygen.c:993
  msgid "writing self signature\n"
  msgstr "zapisuji podpis klíče sebou samým\n"
  
- #: g10/keygen.c:1038
++#: g10/keygen.c:1049
  msgid "writing key binding signature\n"
  msgstr "zapisuji „key-binding“ podpis\n"
  
- #: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
- #: g10/keygen.c:1610 g10/keygen.c:1615
++#: g10/keygen.c:1413 g10/keygen.c:1418 g10/keygen.c:1470 g10/keygen.c:1475
++#: g10/keygen.c:1622 g10/keygen.c:1627
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "neplatná délka klíče; použiji %u bitů\n"
  
- #: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
++#: g10/keygen.c:1424 g10/keygen.c:1481 g10/keygen.c:1489 g10/keygen.c:1633
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "délka klíče zaokrouhlena na %u bitů\n"
  
- #: g10/keygen.c:1503
++#: g10/keygen.c:1515
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  "VAROVÁNÍ: některé OpenPGP programy nedokáží zacházet s DSA klíčem s takto "
  "dlouhým hashem\n"
  
- #: g10/keygen.c:1677
++#: g10/keygen.c:1689
  msgid "Sign"
  msgstr "Podepisování"
  
- #: g10/keygen.c:1680
++#: g10/keygen.c:1692
  msgid "Certify"
  msgstr "Certifikování"
  
- #: g10/keygen.c:1683
++#: g10/keygen.c:1695
  msgid "Encrypt"
  msgstr "Šifrování"
  
- #: g10/keygen.c:1686
++#: g10/keygen.c:1698
  msgid "Authenticate"
  msgstr "Autentizace"
  
@@@ -4849,150 -3767,119 +4811,150 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1705
++#: g10/keygen.c:1717
  msgid "SsEeAaQq"
  msgstr "SsEeAaQq"
  
- #: g10/keygen.c:1732
++#: g10/keygen.c:1744
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "Pro klíč %s lze provést: "
  
- #: g10/keygen.c:1738
++#: g10/keygen.c:1750
  msgid "Current allowed actions: "
  msgstr "Aktuálně povolené akce: "
  
- #: g10/keygen.c:1743
++#: g10/keygen.c:1755
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) Zapnout/vypnout schopnost podepisovat\n"
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) Zapnout/vypnout schopnost šifrovat\n"
  
- #: g10/keygen.c:1749
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) Zapnout/vypnout schopnost autentizovat\n"
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) Konec\n"
  
- #: g10/keygen.c:1881 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1893 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Prosím, vyberte druh klíče, který chcete:\n"
  
- #: g10/keygen.c:1885
++#: g10/keygen.c:1897
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) RSA a RSA (implicitní)\n"
  
- #: g10/keygen.c:1889
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA a Elgamal\n"
  
- #: g10/keygen.c:1892
++#: g10/keygen.c:1904
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (pouze pro podpis)\n"
  
- #: g10/keygen.c:1894
++#: g10/keygen.c:1906
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (pouze pro podpis)\n"
  
- #: g10/keygen.c:1900
++#: g10/keygen.c:1912
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) Elgamal (pouze pro šifrování)\n"
  
- #: g10/keygen.c:1902
++#: g10/keygen.c:1914
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (pouze pro šifrování)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1920
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (nastavit si vlastní použití)\n"
  
- #: g10/keygen.c:1910
++#: g10/keygen.c:1922
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (nastavit si vlastní použití)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1928
  #, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) ECC a ECC\n"
  
- #: g10/keygen.c:1918
++#: g10/keygen.c:1930
  #, c-format
  msgid "  (%d) ECC (sign only)\n"
  msgstr "  (%d) ECC (pouze pro podpis)\n"
  
- #: g10/keygen.c:1920
++#: g10/keygen.c:1932
  #, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "  (%d) ECC (nastavit si vlastní použití)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1934
  #, c-format
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "  (%d) ECC (pouze pro šifrování)\n"
  
- #: g10/keygen.c:1926
++#: g10/keygen.c:1938
  #, c-format
  msgid "  (%d) Existing key\n"
  msgstr "  (%d) Existující klíč\n"
  
- #: g10/keygen.c:2022 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:206
  msgid "Enter the keygrip: "
  msgstr "Vložte keygrip: "
  
- #: g10/keygen.c:2035 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2047 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr "Není platným keygripem (očekáváno 40 šestnáctkových číslic)\n"
  
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2049 sm/certreqgen-ui.c:216
  msgid "No key with this keygrip\n"
  msgstr "Klíč s takovým keygripem neexistuje\n"
  
- #: g10/keygen.c:2111 g10/keygen.c:2125
++#: g10/keygen.c:2133 g10/keygen.c:2147
  #, c-format
  msgid "rounded to %u bits\n"
  msgstr "zaokrouhleno na %u bitů\n"
  
- #: g10/keygen.c:2166
++#: g10/keygen.c:2188
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr "klíč %s může mít délku v intervalu %u až %u bitů.\n"
  
- #: g10/keygen.c:2174
++#: g10/keygen.c:2196
  #, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Jakou délku podklíče si přejete? (%u) "
  
- #: g10/keygen.c:2177 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2199 sm/certreqgen-ui.c:183
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Jakou délku klíče si přejete? (%u) "
  
- #: g10/keygen.c:2191 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2213 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Požadovaná délka klíče je %u bitů.\n"
  
- #: g10/keygen.c:2237
++#: g10/keygen.c:2259
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Prosím, vyberte, kterou eliptickou křivku chcete:\n"
  
- #: g10/keygen.c:2409
++#: g10/keygen.c:2431
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5008,7 -3895,6 +4970,7 @@@ msgstr "
  "      <n>m = doba platnosti klíče skončí za n měsíců\n"
  "      <n>y = doba platnosti klíče skončí za n let\n"
  
- #: g10/keygen.c:2420
++#: g10/keygen.c:2442
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5024,38 -3910,30 +4986,38 @@@ msgstr "
  "      <n>m = doba platnosti podpisu skončí za n měsíců\n"
  "      <n>y = doba platnosti podpisu skončí za n let\n"
  
- #: g10/keygen.c:2443
++#: g10/keygen.c:2465
  msgid "Key is valid for? (0) "
  msgstr "Klíč je platný pro? (0) "
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2470
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Podpis je platný pro? (%s) "
  
- #: g10/keygen.c:2461 g10/keygen.c:2486
++#: g10/keygen.c:2483 g10/keygen.c:2508
  msgid "invalid value\n"
  msgstr "neplatná hodnota\n"
  
- #: g10/keygen.c:2468
++#: g10/keygen.c:2490
  msgid "Key does not expire at all\n"
  msgstr "Platnost klíče nikdy neskončí\n"
  
- #: g10/keygen.c:2469
++#: g10/keygen.c:2491
  msgid "Signature does not expire at all\n"
  msgstr "Platnost podpisu nikdy neskončí\n"
  
- #: g10/keygen.c:2474
++#: g10/keygen.c:2496
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "Platnost klíče skončí v %s\n"
  
- #: g10/keygen.c:2475
++#: g10/keygen.c:2497
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "Platnost podpisu skončí v %s\n"
  
- #: g10/keygen.c:2479
++#: g10/keygen.c:2501
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5063,11 -3941,9 +5025,11 @@@ msgstr "
  "Váš systém neumí zobrazit data po roce 2038.\n"
  "V každém případě budou data korektně zpracovávána do roku 2106.\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2514
  msgid "Is this correct? (y/N) "
  msgstr "Je to správně (a/N)? "
  
- #: g10/keygen.c:2560
++#: g10/keygen.c:2582
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5082,7 -3958,6 +5044,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2575
++#: g10/keygen.c:2597
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -5098,49 -3973,38 +5060,49 @@@ msgstr "
  "    „Magda Prochazkova (student) <magda at domena.cz>“\n"
  "\n"
  
- #: g10/keygen.c:2594
++#: g10/keygen.c:2616
  msgid "Real name: "
  msgstr "Jméno a příjmení: "
  
- #: g10/keygen.c:2603
++#: g10/keygen.c:2625
  msgid "Invalid character in name\n"
  msgstr "Neplatný znak ve jméně\n"
  
- #: g10/keygen.c:2604
++#: g10/keygen.c:2626
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr "Znaky „%s“ a „%s“ se ve jméně nesmí objevit\n"
  
- #: g10/keygen.c:2608
++#: g10/keygen.c:2630
  msgid "Name may not start with a digit\n"
  msgstr "Jméno nemůže začínat číslicí\n"
  
- #: g10/keygen.c:2611
++#: g10/keygen.c:2633
  msgid "Name must be at least 5 characters long\n"
  msgstr "Jméno musí být dlouhé alespoň 5 znaků\n"
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2643
  msgid "Email address: "
  msgstr "E-mailová adresa: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2649
  msgid "Not a valid email address\n"
  msgstr "Neplatná e-mailová adresa\n"
  
- #: g10/keygen.c:2636
++#: g10/keygen.c:2658
  msgid "Comment: "
  msgstr "Komentář: "
  
- #: g10/keygen.c:2642
++#: g10/keygen.c:2664
  msgid "Invalid character in comment\n"
  msgstr "Neplatný znak v komentáři\n"
  
- #: g10/keygen.c:2678
++#: g10/keygen.c:2700
  #, c-format
  msgid "You are using the '%s' character set.\n"
  msgstr "Používáte znakovou sadu „%s“.\n"
  
- #: g10/keygen.c:2684
++#: g10/keygen.c:2706
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5151,7 -4015,6 +5113,7 @@@ msgstr "
  "    „%s“\n"
  "\n"
  
- #: g10/keygen.c:2689
++#: g10/keygen.c:2711
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr "Do pole jméno nebo komentář nepište, prosím, e-mailovou adresu.\n"
  
@@@ -5166,33 -4029,26 +5128,33 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2714
++#: g10/keygen.c:2736
  msgid "NnCcEeOoQq"
  msgstr "jJkKeEPpUu"
  
- #: g10/keygen.c:2724
++#: g10/keygen.c:2746
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "Změnit (J)méno, (K)omentář, (E)-mail nebo (U)končit? "
  
- #: g10/keygen.c:2725
++#: g10/keygen.c:2747
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr ""
  "Změnit (J)méno, (K)omentář, (E)-mail, (P)okračovat dál nebo (U)končit "
  "program? "
  
- #: g10/keygen.c:2730
++#: g10/keygen.c:2752
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "Změnit (J)méno, (E)-mail nebo (U)končit? "
  
- #: g10/keygen.c:2731
++#: g10/keygen.c:2753
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "Změnit (J)méno, (E)-mail, (P)okračovat dál nebo (U)končit? "
  
- #: g10/keygen.c:2750
++#: g10/keygen.c:2772
  msgid "Please correct the error first\n"
  msgstr "Nejdřív, prosím, opravte chybu\n"
  
- #: g10/keygen.c:2796
++#: g10/keygen.c:2818
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5205,13 -4061,10 +5167,13 @@@ msgstr "
  "používat disky); díky tomu má generátor lepší šanci získat dostatek "
  "entropie.\n"
  
- #: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
- #: g10/keygen.c:4777 g10/keygen.c:4882
++#: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
++#: g10/keygen.c:4330 g10/keygen.c:4803 g10/keygen.c:5064 g10/keygen.c:5169
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Vytvoření klíče se nepodařilo: %s\n"
  
- #: g10/keygen.c:3598
++#: g10/keygen.c:3922
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5222,62 -4075,49 +5184,62 @@@ msgstr "
  "    „%s“\n"
  "\n"
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3924
  msgid "Continue? (Y/n) "
  msgstr "Pokračovat (A/n) "
  
- #: g10/keygen.c:3621
++#: g10/keygen.c:3945
  #, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "Klíč pro „%s“ již existuje\n"
  
- #: g10/keygen.c:3626
++#: g10/keygen.c:3950
  msgid "Create anyway? (y/N) "
  msgstr "Přesto vytvořit? (a/N) "
  
- #: g10/keygen.c:3632
++#: g10/keygen.c:3956
  msgid "creating anyway\n"
  msgstr "přesto se vytváří\n"
  
- #: g10/keygen.c:3981
++#: g10/keygen.c:4315
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr "Poznámka: Pro komplexní tvorbu klíče použijte „%s %s“.\n"
  
- #: g10/keygen.c:4013
++#: g10/keygen.c:4358
  msgid "Key generation canceled.\n"
  msgstr "Vytváření klíče bylo zrušeno.\n"
  
- #: g10/keygen.c:4073
++#: g10/keygen.c:4418
  #, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "záložní soubor „%s“ nelze vytvořit: %s\n"
  
- #: g10/keygen.c:4093
++#: g10/keygen.c:4438
  #, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "Poznámka: záloha klíče z karty uložena do „%s“\n"
  
- #: g10/keygen.c:4244 g10/keygen.c:4393
++#: g10/keygen.c:4589 g10/keygen.c:4738
  #, c-format
  msgid "writing public key to '%s'\n"
  msgstr "veřejný klíč se zapisuje do „%s“\n"
  
- #: g10/keygen.c:4387
++#: g10/keygen.c:4732
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "nenalezen zapisovatelný soubor veřejných klíčů (pubring): %s\n"
  
- #: g10/keygen.c:4401
++#: g10/keygen.c:4746
  #, c-format
  msgid "error writing public keyring '%s': %s\n"
  msgstr "chyba při zápisu do souboru veřejných klíčů „%s“: %s\n"
  
- #: g10/keygen.c:4433
++#: g10/keygen.c:4778
  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:4445
++#: g10/keygen.c:4790
  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"
@@@ -5285,7 -4125,6 +5247,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:4649 g10/keygen.c:4833
++#: g10/keygen.c:4936 g10/keygen.c:5120
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5293,7 -4132,6 +5255,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:4651 g10/keygen.c:4835
++#: g10/keygen.c:4938 g10/keygen.c:5122
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5301,19 -4139,15 +5263,19 @@@ 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:4662 g10/keygen.c:4846
++#: g10/keygen.c:4949 g10/keygen.c:5133
  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:4674 g10/keygen.c:4676
++#: g10/keygen.c:4961 g10/keygen.c:4963
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Tajné části primárního klíče nejsou dostupné.\n"
  
- #: g10/keygen.c:4683 g10/keygen.c:4685
++#: g10/keygen.c:4970 g10/keygen.c:4972
  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:4704 g10/keygen.c:4860
++#: g10/keygen.c:4991 g10/keygen.c:5147
  msgid "Really create? (y/N) "
  msgstr "Opravdu vytvořit? (a/N) "
  
@@@ -5648,124 -4417,98 +5610,124 @@@ msgstr "
  "samostatný revokační certifikát – použijte „gpg --import“, chcete-li jej "
  "užít\n"
  
- #: g10/mainproc.c:1233 g10/mainproc.c:1276
++#: g10/mainproc.c:1238 g10/mainproc.c:1281
  msgid "no signature found\n"
  msgstr "nenalezen žádná podpis\n"
  
- #: g10/mainproc.c:1607
++#: g10/mainproc.c:1612
  #, c-format
  msgid "BAD signature from \"%s\""
  msgstr "ŠPATNÝ podpis od „%s“"
  
- #: g10/mainproc.c:1609
++#: g10/mainproc.c:1614
  #, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Podpis s vypršenou platností od „%s“"
  
- #: g10/mainproc.c:1611
++#: g10/mainproc.c:1616
  #, c-format
  msgid "Good signature from \"%s\""
  msgstr "Dobrý podpis od „%s“"
  
- #: g10/mainproc.c:1630
++#: g10/mainproc.c:1635
  msgid "signature verification suppressed\n"
  msgstr "verifikace podpisu potlačena\n"
  
- #: g10/mainproc.c:1739
++#: g10/mainproc.c:1744
  msgid "can't handle this ambiguous signature data\n"
  msgstr "neumím pracovat s těmito nejednoznačnými daty\n"
  
- #: g10/mainproc.c:1753 g10/mainproc.c:1761
++#: g10/mainproc.c:1758 g10/mainproc.c:1766
  #, c-format
  msgid "Signature made %s\n"
  msgstr "Podpis vytvořen %s\n"
  
- #: g10/mainproc.c:1754 g10/mainproc.c:1762
++#: g10/mainproc.c:1759 g10/mainproc.c:1767
  #, 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:1766
++#: g10/mainproc.c:1771
  #, 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:1772
++#: g10/mainproc.c:1777
  #, fuzzy, c-format
  #| msgid "                aka \"%s\""
  msgid "               issuer \"%s\"\n"
  msgstr "                alias „%s“"
  
- #: g10/mainproc.c:1789
++#: g10/mainproc.c:1794
  msgid "Key available at: "
  msgstr "Klíč k dispozici na: "
  
- #: g10/mainproc.c:2024
++#: g10/mainproc.c:2029
  msgid "[uncertain]"
  msgstr "[nejistý]"
  
- #: g10/mainproc.c:2062
++#: g10/mainproc.c:2067
  #, c-format
  msgid "                aka \"%s\""
  msgstr "                alias „%s“"
  
- #: g10/mainproc.c:2145
++#: g10/mainproc.c:2150
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "Platnost podpisu skončila %s\n"
  
- #: g10/mainproc.c:2149
++#: g10/mainproc.c:2154
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "Platnost podpisu skončí %s\n"
  
- #: g10/mainproc.c:2160
++#: g10/mainproc.c:2165
  #, c-format
  msgid "%s signature, digest algorithm %s%s%s\n"
  msgstr "podpis %s, hashovací algoritmus %s%s%s\n"
  
- #: g10/mainproc.c:2161
++#: g10/mainproc.c:2166
  msgid "binary"
  msgstr "binární formát"
  
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2167
  msgid "textmode"
  msgstr "textový formát"
  
- #: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "neznámý formát"
  
- #: g10/mainproc.c:2164
++#: g10/mainproc.c:2169
  msgid ", key algorithm "
  msgstr ", algoritmus klíče"
  
- #: g10/mainproc.c:2199
++#: g10/mainproc.c:2204
  #, 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:2229
++#: g10/mainproc.c:2234
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "Nemohu ověřit podpis: %s\n"
  
- #: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
++#: g10/mainproc.c:2327 g10/mainproc.c:2346 g10/mainproc.c:2470
  msgid "not a detached signature\n"
  msgstr "toto není podpis oddělený od dokumentu\n"
  
- #: g10/mainproc.c:2375
++#: g10/mainproc.c:2380
  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:2384
++#: g10/mainproc.c:2389
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "samostatný podpis třídy 0x%02x\n"
  
- #: g10/mainproc.c:2469
++#: g10/mainproc.c:2474
  msgid "old style (PGP 2.x) signature\n"
  msgstr "podpis starého typu (PGP 2.x)\n"
  
@@@ -6043,23 -4732,18 +6005,23 @@@ msgstr "Je tato fotografie správná (a
  msgid "unable to display photo ID!\n"
  msgstr "nelze zobrazit photo ID!\n"
  
- #: g10/pkclist.c:72 g10/revoke.c:757
++#: g10/pkclist.c:72 g10/revoke.c:758
  msgid "No reason specified"
  msgstr "Důvod nebyl specifikován"
  
- #: g10/pkclist.c:74 g10/revoke.c:759
++#: g10/pkclist.c:74 g10/revoke.c:760
  msgid "Key is superseded"
  msgstr "Klíč je nahrazen"
  
- #: g10/pkclist.c:76 g10/revoke.c:758
++#: g10/pkclist.c:76 g10/revoke.c:759
  msgid "Key has been compromised"
  msgstr "Klíč byl zkompromitován"
  
- #: g10/pkclist.c:78 g10/revoke.c:760
++#: g10/pkclist.c:78 g10/revoke.c:761
  msgid "Key is no longer used"
  msgstr "Klíč se již nepoužívá"
  
- #: g10/pkclist.c:80 g10/revoke.c:761
++#: g10/pkclist.c:80 g10/revoke.c:762
  msgid "User ID is no longer valid"
  msgstr "Identifikátor uživatele již neplatí"
  
@@@ -6135,7 -4806,6 +6097,7 @@@ msgstr "
  "Minimální úroveň důvěry tohoto klíče je: %s\n"
  "\n"
  
- #: g10/pkclist.c:310 g10/revoke.c:786
++#: g10/pkclist.c:310 g10/revoke.c:787
  msgid "Your decision? "
  msgstr "Vaše rozhodnutí? "
  
@@@ -6332,33 -4964,26 +6294,33 @@@ msgstr "
  msgid "No such user ID.\n"
  msgstr "Takový identifikátor uživatele neexistuje.\n"
  
- #: g10/pkclist.c:1197 g10/pkclist.c:1273
++#: g10/pkclist.c:1197 g10/pkclist.c:1274
  msgid "skipped: public key already set as default recipient\n"
  msgstr "přeskočeno: veřejný klíč je už nastaven podle implicitního adresáta\n"
  
- #: g10/pkclist.c:1218
++#: g10/pkclist.c:1219
  msgid "Public key is disabled.\n"
  msgstr "Veřejný klíč je neplatný (disabled).\n"
  
- #: g10/pkclist.c:1228
++#: g10/pkclist.c:1229
  msgid "skipped: public key already set\n"
  msgstr "přeskočeno: veřejný klíč je již nastaven\n"
  
- #: g10/pkclist.c:1263
++#: g10/pkclist.c:1264
  #, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "neznámý implicitní adresát „%s“\n"
  
- #: g10/pkclist.c:1312
++#: g10/pkclist.c:1313
  msgid "no valid addressees\n"
  msgstr "žádné platné adresy\n"
  
- #: g10/pkclist.c:1665
++#: g10/pkclist.c:1666
  #, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "Poznámka: klíči %s chybí vlastnost %s\n"
  
- #: g10/pkclist.c:1690
++#: g10/pkclist.c:1691
  #, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "Poznámka: klíči %s chybí předvolby pro %s\n"
@@@ -6368,28 -4992,22 +6330,28 @@@ msgid "data not saved; use option \"--o
  msgstr ""
  "data nebyla uložena; k jejich uložení použijte parametr příkazu „--output“\n"
  
- #: g10/plaintext.c:598
++#: g10/plaintext.c:614
  msgid "Detached signature.\n"
  msgstr "Podpis oddělený od dokumentu.\n"
  
- #: g10/plaintext.c:606
++#: g10/plaintext.c:622
  msgid "Please enter name of data file: "
  msgstr "Prosím, vložte název datového souboru: "
  
- #: g10/plaintext.c:643
++#: g10/plaintext.c:659
  msgid "reading stdin ...\n"
  msgstr "čtu standardní vstup…\n"
  
- #: g10/plaintext.c:688
++#: g10/plaintext.c:704
  msgid "no signed data\n"
  msgstr "chybí podepsaná data\n"
  
- #: g10/plaintext.c:706
++#: g10/plaintext.c:722
  #, c-format
  msgid "can't open signed data '%s'\n"
  msgstr "nelze otevřít podepsaná data „%s“\n"
  
- #: g10/plaintext.c:741
++#: g10/plaintext.c:757
  #, c-format
  msgid "can't open signed data fd=%d: %s\n"
  msgstr "nelze otevřít podepsaná data na deskriptoru=%d: %s\n"
@@@ -6453,7 -5057,6 +6415,7 @@@ msgstr "Tajný klíč není dostupný.\
  msgid "Create a designated revocation certificate for this key? (y/N) "
  msgstr "Vytvořit pro tento klíč pověřený revokační certifikát? (a/N)"
  
- #: g10/revoke.c:336 g10/revoke.c:727
++#: g10/revoke.c:336 g10/revoke.c:728
  msgid "ASCII armored output forced.\n"
  msgstr "nařízen výstup do formátu ASCII.\n"
  
@@@ -6500,7 -5097,6 +6462,7 @@@ msgstr "
  "soukromého klíče. Avšak bude-li soukromý klíč stále přístupný, bude\n"
  "lepší vytvořit nový revokační certifikát s vysvětlením odvolání."
  
- #: g10/revoke.c:575
++#: g10/revoke.c:576
  #, fuzzy
  #| msgid ""
  #| "To avoid an accidental use of this file, a colon has been inserted\n"
@@@ -6515,13 -5111,11 +6477,13 @@@ msgstr "
  "vložena dvojtečka. Před použitím tohoto revokačního certifikátu odstraňte\n"
  "tuto dvojtečku textovým editorem."
  
- #: g10/revoke.c:590
++#: g10/revoke.c:591
  #, fuzzy, c-format
  #| msgid "Revocation certificate created.\n"
  msgid "revocation certificate stored as '%s.rev'\n"
  msgstr "Revokační certifikát vytvořen.\n"
  
- #: g10/revoke.c:634
++#: g10/revoke.c:635
  #, c-format
  msgid "secret key \"%s\" not found\n"
  msgstr "tajný klíč „%s“ nenalezen\n"
@@@ -6529,21 -5123,17 +6491,21 @@@
  #. TRANSLATORS: The %s prints a key specification which
  #. for example has been given at the command line.  Several lines
  #. lines with secret key infos are printed after this message.
- #: g10/revoke.c:661
++#: g10/revoke.c:662
  #, c-format
  msgid "'%s' matches multiple secret keys:\n"
  msgstr "„%s“ odpovídá více tajným klíčům:\n"
  
- #: g10/revoke.c:688
++#: g10/revoke.c:689
  #, c-format
  msgid "error searching the keyring: %s\n"
  msgstr "chyba při prohledávání souboru klíčů (keyring): %s\n"
  
- #: g10/revoke.c:711
++#: g10/revoke.c:712
  msgid "Create a revocation certificate for this key? (y/N) "
  msgstr "Vytvořit pro tento klíč revokační certifikát? (a/N) "
  
- #: g10/revoke.c:735
++#: g10/revoke.c:736
  msgid ""
  "Revocation certificate created.\n"
  "\n"
@@@ -6562,33 -5152,26 +6524,33 @@@ msgstr "
  "na vašem počítači může ukládat data určená k tisku a zpřístupnit je\n"
  "jiným uživatelům!\n"
  
- #: g10/revoke.c:769
++#: g10/revoke.c:770
  msgid "Please select the reason for the revocation:\n"
  msgstr "Prosím vyberte důvod revokace:\n"
  
- #: g10/revoke.c:779
++#: g10/revoke.c:780
  msgid "Cancel"
  msgstr "Zrušit"
  
- #: g10/revoke.c:781
++#: g10/revoke.c:782
  #, c-format
  msgid "(Probably you want to select %d here)\n"
  msgstr "(Pravděpodobně zda chcete vybrat %d)\n"
  
- #: g10/revoke.c:822
++#: g10/revoke.c:823
  msgid "Enter an optional description; end it with an empty line:\n"
  msgstr "Můžete vložit další popis. Ukončete prázdným řádkem:\n"
  
- #: g10/revoke.c:850
++#: g10/revoke.c:851
  #, c-format
  msgid "Reason for revocation: %s\n"
  msgstr "Důvod revokace: %s\n"
  
- #: g10/revoke.c:852
++#: g10/revoke.c:853
  msgid "(No description given)\n"
  msgstr "(Nebyl zadán Žádný popis)\n"
  
- #: g10/revoke.c:857
++#: g10/revoke.c:858
  msgid "Is this okay? (y/N) "
  msgstr "Je důvod revokace vybrán správně? (a/N) "
  
@@@ -6736,12 -5299,10 +6698,12 @@@ msgstr "
  "VAROVÁNÍ: nemohu %%-expandovat URL preferovaného keyservery (příliš dlouhé). "
  "Použity neexpandované.\n"
  
- #: g10/sign.c:329
++#: g10/sign.c:331
  #, c-format
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s/%s podpis od: „%s“\n"
  
- #: g10/sign.c:878
++#: g10/sign.c:880
  #, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6749,11 -5310,9 +6711,11 @@@ msgstr "
  "VAROVÁNÍ: vyžádaný hashovací algoritmus %s (%d) nevyhovuje předvolbám "
  "příjemce\n"
  
- #: g10/sign.c:1009
++#: g10/sign.c:1011
  msgid "signing:"
  msgstr "podepisuji:"
  
- #: g10/sign.c:1286
++#: g10/sign.c:1288
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "bude použito šifrování %s\n"
@@@ -6779,7 -5334,6 +6741,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:362
++#: g10/tdbdump.c:57 g10/trustdb.c:369
  #, 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"
@@@ -6824,7 -5370,6 +6786,7 @@@ msgstr "chyba při hledání záznamu d
  msgid "read error in '%s': %s\n"
  msgstr "chyba při čtení v „%s“: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "databáze důvěry: synchronizace selhala %s\n"
@@@ -6967,107 -5483,107 +6929,132 @@@ msgstr "nemohu pracovat s řádky delš
  msgid "input line longer than %d characters\n"
  msgstr "vstupní řádek je delší než %d znaků\n"
  
- #: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
++#: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
  #, fuzzy, c-format
  #| msgid "error sending standard options: %s\n"
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "chyba při odesílání standardního parametru: %s\n"
  
- #: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
++#: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:357 g10/tofu.c:699
++#: g10/tofu.c:355 g10/tofu.c:888
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:501
++#: g10/tofu.c:505
  #, fuzzy, c-format
  #| msgid "unsupported algorithm: %s"
  msgid "unsupported TOFU database version: %s\n"
  msgstr "nepodporovaný algoritmus: %s"
  
- #: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
- #: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
- #: g10/tofu.c:3056
++#: g10/tofu.c:538
+ #, fuzzy, c-format
+ #| msgid "error creating temporary file: %s\n"
+ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
+ msgstr "chyba při vytváření dočasného souboru: %s\n"
+ 
++#: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
+ msgid "TOFU DB error"
+ msgstr ""
+ 
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2340 g10/tofu.c:2359
++#: g10/tofu.c:2372 g10/tofu.c:2384 g10/tofu.c:2399 g10/tofu.c:2411
++#: g10/tofu.c:2980 g10/tofu.c:2997 g10/tofu.c:3033 g10/tofu.c:3050
++#: g10/tofu.c:3353
  #, fuzzy, c-format
  #| msgid "error sending data: %s\n"
  msgid "error reading TOFU database: %s\n"
  msgstr "chyba při odesílání dat: %s\n"
  
- #: g10/tofu.c:566 g10/tofu.c:574
++#: g10/tofu.c:716 g10/tofu.c:724
  #, fuzzy, c-format
  #| msgid "error writing base64 encoding: %s\n"
  msgid "error determining TOFU database's version: %s\n"
  msgstr "chyba při zápisu kódování base64: %s\n"
  
- #: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
++#: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
  #, fuzzy, c-format
  #| msgid "error initializing reader object: %s\n"
  msgid "error initializing TOFU database: %s\n"
  msgstr "chyba při inicializaci čtecího objektu: %s\n"
  
- #: g10/tofu.c:765
++#: g10/tofu.c:844
+ #, fuzzy, c-format
+ #| msgid "error sending data: %s\n"
+ msgid "error creating 'encryptions' TOFU table: %s\n"
+ msgstr "chyba při odesílání dat: %s\n"
+ 
++#: g10/tofu.c:874
+ #, c-format
+ msgid "adding column effective_policy to bindings DB: %s\n"
+ msgstr ""
+ 
++#: g10/tofu.c:956
  #, fuzzy, c-format
  #| msgid "error opening '%s': %s\n"
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "chyba při otevírání „%s“: %s\n"
  
- #: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
++#: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
  #, fuzzy, c-format
  #| msgid "error sending data: %s\n"
  msgid "error updating TOFU database: %s\n"
  msgstr "chyba při odesílání dat: %s\n"
  
- #: g10/tofu.c:1239
++#: g10/tofu.c:1328
  #, c-format
  msgid ""
  "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1247
++#: g10/tofu.c:1337
  #, c-format
- msgid "The email address \"%s\" is associated with %d keys!"
- msgstr ""
+ msgid "The email address \"%s\" is associated with %d key!"
+ msgid_plural "The email address \"%s\" is associated with %d keys!"
+ msgstr[0] ""
+ msgstr[1] ""
+ msgstr[2] ""
  
- #: g10/tofu.c:1251
++#: g10/tofu.c:1343
  msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  
- #: g10/tofu.c:1257
++#: g10/tofu.c:1349
  #, c-format
  msgid ""
  "Please indicate whether this email address should be associated with key %s "
  "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1513
++#: g10/tofu.c:1605
  #, fuzzy, c-format
  #| msgid "error getting responder ID: %s\n"
  msgid "error gathering other user IDs: %s\n"
  msgstr "chyba při zjišťování ID odpovídače: %s\n"
  
- #: g10/tofu.c:1523
++#: g10/tofu.c:1615
  #, fuzzy
  #| msgid "list key and user IDs"
  msgid "This key's user IDs:\n"
  msgstr "vypsat seznam klíčů a id uživatelů"
  
- #: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
++#: g10/tofu.c:1631 g10/tofu.c:1796
  #, fuzzy, c-format
  #| msgid "validity: %s"
  msgid "policy: %s"
  msgstr "platnost: %s"
  
- #: g10/tofu.c:1630
++#: g10/tofu.c:1722
  #, fuzzy, c-format
  #| msgid "error getting stored flags: %s\n"
  msgid "error gathering signature stats: %s\n"
  msgstr "chyba při získání uložených příznaků: %s\n"
  
- #: g10/tofu.c:1634
++#: g10/tofu.c:1726
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
@@@ -7075,215 -5591,235 +7062,276 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:1651
++#: g10/tofu.c:1744
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1684 g10/tofu.c:1689
++#: g10/tofu.c:1785 g10/tofu.c:1790
  msgid ", "
  msgstr ""
  
- #: g10/tofu.c:1693
++#: g10/tofu.c:1794
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
  msgstr "vypsat seznam klíčů"
  
- #: g10/tofu.c:1715
++#: g10/tofu.c:1820
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid "Verified %d message."
+ msgid_plural "Verified %d messages."
+ msgstr[0] "vypsat hash zprávy"
+ msgstr[1] "vypsat hash zprávy"
+ msgstr[2] "vypsat hash zprávy"
+ 
++#: g10/tofu.c:1824
+ #, fuzzy, c-format
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid "Encrypted %d message."
+ msgid_plural "Encrypted %d messages."
+ msgstr[0] "zašifrováno s heslem %lu\n"
+ msgstr[1] "zašifrováno s heslem %lu\n"
+ msgstr[2] "zašifrováno s heslem %lu\n"
+ 
++#: g10/tofu.c:1831
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid "Verified %d message"
- msgid_plural "Verified %d messages"
+ msgid "Verified %d message in the future."
+ msgid_plural "Verified %d messages in the future."
  msgstr[0] "vypsat hash zprávy"
  msgstr[1] "vypsat hash zprávy"
  msgstr[2] "vypsat hash zprávy"
  
- #: g10/tofu.c:1719
++#: g10/tofu.c:1835
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid "Encrypted %d message in the future."
+ msgid_plural "Encrypted %d messages in the future."
+ msgstr[0] "vypsat hash zprávy"
+ msgstr[1] "vypsat hash zprávy"
+ msgstr[2] "vypsat hash zprávy"
+ 
++#: g10/tofu.c:1849
+ #, c-format
+ msgid "Messages verified over the past %d day: %d."
+ msgid_plural "Messages verified over the past %d days: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ msgstr[2] ""
+ 
++#: g10/tofu.c:1855
  #, c-format
- msgid "Encrypted %d message"
- msgid_plural "Encrypted %d messages"
+ msgid "Messages encrypted over the past %d day: %d."
+ msgid_plural "Messages encrypted over the past %d days: %d."
  msgstr[0] ""
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:1734
++#: g10/tofu.c:1865
  #, c-format
- msgid " over the past day."
- msgid_plural " over the past %d days."
+ msgid "Messages verified over the past %d month: %d."
+ msgid_plural "Messages verified over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:1740
++#: g10/tofu.c:1871
  #, c-format
- msgid " over the past month."
- msgid_plural " over the past %d months."
+ msgid "Messages encrypted over the past %d month: %d."
+ msgid_plural "Messages encrypted over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:1746
++#: g10/tofu.c:1881
  #, c-format
- msgid " over the past year."
- msgid_plural " over the past %d years."
+ msgid "Messages verified over the past %d year: %d."
+ msgid_plural "Messages verified over the past %d years: %d."
  msgstr[0] ""
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:1752
- msgid " in the past."
++#: g10/tofu.c:1887
+ #, c-format
+ msgid "Messages encrypted over the past %d year: %d."
+ msgid_plural "Messages encrypted over the past %d years: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ msgstr[2] ""
+ 
++#: g10/tofu.c:1895
+ #, c-format
+ msgid "Messages verified in the past: %d."
  msgstr ""
  
++#: g10/tofu.c:1899
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid "Messages encrypted in the past: %d."
+ msgstr "vypsat hash zprávy"
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1767
++#: g10/tofu.c:1916
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1809
++#: g10/tofu.c:1958
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1815
++#: g10/tofu.c:1964
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1823
++#: g10/tofu.c:1972
  msgid "Defaulting to unknown."
  msgstr ""
  
- #: g10/tofu.c:1938 g10/tofu.c:2074
++#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
- #: g10/tofu.c:1994
++#: g10/tofu.c:2143
  #, fuzzy, c-format
  #| msgid "error writing key: %s\n"
  msgid "resetting keydb: %s\n"
  msgstr "chyba při zápisu klíče: %s\n"
  
- #: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
- #: g10/tofu.c:2425
++#: g10/tofu.c:2601
  #, fuzzy, c-format
  #| msgid "error setting OCSP target: %s\n"
- msgid "error setting TOFU binding's trust level to %s\n"
+ msgid "error setting TOFU binding's policy to %s\n"
  msgstr "chyba při nastavování cíle OCSP: %s\n"
  
- #: g10/tofu.c:2473
++#: g10/tofu.c:2794
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "error changing TOFU policy: %s\n"
  msgstr "chyba při vytváření roury: %s\n"
  
- #. TRANSLATORS: The tilde ('~') is used here to indicate a
- #. * non-breakable space
- #: g10/tofu.c:2574
++#: g10/tofu.c:2839
  #, c-format
- msgid "%d~year"
- msgid_plural "%d~years"
+ msgid "%lld~year"
+ msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:2583
++#: g10/tofu.c:2844
  #, c-format
- msgid "%d~month"
- msgid_plural "%d~months"
+ msgid "%lld~month"
+ msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:2592
++#: g10/tofu.c:2849
  #, c-format
- msgid "%d~day"
- msgid_plural "%d~days"
+ msgid "%lld~week"
+ msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2854
  #, c-format
- msgid "%d~hour"
- msgid_plural "%d~hours"
+ msgid "%lld~day"
+ msgid_plural "%lld~days"
  msgstr[0] ""
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:2610
++#: g10/tofu.c:2859
  #, c-format
- msgid "%d~minute"
- msgid_plural "%d~minutes"
+ msgid "%lld~hour"
+ msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:2619
++#: g10/tofu.c:2864
  #, c-format
- msgid "%d~second"
- msgid_plural "%d~seconds"
+ msgid "%lld~minute"
+ msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:2802
++#: g10/tofu.c:2866
  #, c-format
- msgid "%s: "
+ msgid "%lld~second"
+ msgid_plural "%lld~seconds"
+ msgstr[0] ""
+ msgstr[1] ""
+ msgstr[2] ""
+ 
++#: g10/tofu.c:3103
+ #, c-format
+ msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:2806
++#: g10/tofu.c:3109
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
- msgid "Verified %ld signatures"
+ msgid "%s: Verified 0 signatures."
  msgstr "Smazáno %d podpisů.\n"
  
- #: g10/tofu.c:2816
++#: g10/tofu.c:3117
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid "Verified %ld signature in the past %s"
- msgid_plural "Verified %ld signatures in the past %s"
+ msgid "%s: Verified %ld~signature in the past %s."
+ msgid_plural "%s: Verified %ld~signatures in the past %s."
  msgstr[0] "vypsat hash zprávy"
  msgstr[1] "vypsat hash zprávy"
  msgstr[2] "vypsat hash zprávy"
  
- #: g10/tofu.c:2826
- #, fuzzy, c-format
++#: g10/tofu.c:3127
+ #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
- msgid ", and encrypted %ld messages"
+ msgid "Encrypted 0 messages."
  msgstr "zašifrováno s heslem %lu\n"
  
- #: g10/tofu.c:2835
++#: g10/tofu.c:3135
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid ", and encrypted %ld message in the past %s"
- msgid_plural ", and encrypted %ld messages in the past %s"
+ msgid "Encrypted %ld~message in the past %s."
+ msgid_plural "Encrypted %ld~messages in the past %s."
  msgstr[0] "vypsat hash zprávy"
  msgstr[1] "vypsat hash zprávy"
  msgstr[2] "vypsat hash zprávy"
  
- #: g10/tofu.c:2880
++#: g10/tofu.c:3146
+ #, fuzzy, c-format
+ #| msgid "validity: %s"
+ msgid "(policy: %s)"
+ msgstr "platnost: %s"
+ 
++#: g10/tofu.c:3177
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2883
++#: g10/tofu.c:3180
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2887
++#: g10/tofu.c:3184
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2890
++#: g10/tofu.c:3187
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2919
++#: g10/tofu.c:3216
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7301,19 -5837,15 +7349,19 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
- #: g10/tofu.c:3480 g10/tofu.c:3572
++#: g10/tofu.c:3298 g10/tofu.c:3449 g10/tofu.c:3627 g10/tofu.c:3670
++#: g10/tofu.c:3784 g10/tofu.c:3859 g10/tofu.c:3894
  #, fuzzy, c-format
  #| msgid "error sending data: %s\n"
  msgid "error opening TOFU database: %s\n"
  msgstr "chyba při odesílání dat: %s\n"
  
- #: g10/tofu.c:3185
++#: g10/tofu.c:3482
  #, c-format
- msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
  msgstr ""
  
- #: g10/tofu.c:3515
++#: g10/tofu.c:3819
  #, fuzzy, c-format
  #| msgid "error writing public keyring '%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7344,68 -5871,54 +7392,68 @@@ msgstr "klíč %s: nenalezen veřejný 
  msgid "key %s marked as ultimately trusted\n"
  msgstr "klíč %s označen jako absolutně důvěryhodný.\n"
  
- #: g10/trustdb.c:341
++#: g10/trustdb.c:348
  #, 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:347
++#: g10/trustdb.c:354
  #, 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:422
++#: g10/trustdb.c:429
  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:431
++#: g10/trustdb.c:438
  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:468
++#: g10/trustdb.c:475
  #, 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:474
++#: g10/trustdb.c:481
  #, c-format
  msgid "using %s trust model\n"
  msgstr "použití modelu důvěry %s\n"
  
- #: g10/trustdb.c:511
++#: g10/trustdb.c:518
  msgid "no need for a trustdb check\n"
  msgstr "není nutné kontrolovat databázi důvěry\n"
  
- #: g10/trustdb.c:517 g10/trustdb.c:2160
++#: g10/trustdb.c:524 g10/trustdb.c:2187
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "další kontrola databáze důvěry v %s\n"
  
- #: g10/trustdb.c:526
++#: g10/trustdb.c:533
  #, 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:542
++#: g10/trustdb.c:549
  #, 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:749 g10/trustdb.c:1313
++#: g10/trustdb.c:756 g10/trustdb.c:1340
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "veřejný klíč %s nebyl nalezen: %s\n"
  
- #: g10/trustdb.c:966
++#: g10/trustdb.c:973
  msgid "please do a --check-trustdb\n"
  msgstr "prosím proveďte --check-trustdb\n"
  
- #: g10/trustdb.c:971
++#: g10/trustdb.c:978
  msgid "checking the trustdb\n"
  msgstr "kontroluji databázi důvěry\n"
  
- #: g10/trustdb.c:1883
++#: g10/trustdb.c:1910
  #, fuzzy, c-format
  #| msgid "%lu keys processed so far\n"
  msgid "%d key processed"
@@@ -7414,7 -5927,6 +7462,7 @@@ msgstr[0] "%lu klíče byly doposud zpr
  msgstr[1] "%lu klíče byly doposud zpracovány\n"
  msgstr[2] "%lu klíče byly doposud zpracovány\n"
  
- #: g10/trustdb.c:1886
++#: g10/trustdb.c:1913
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7423,16 -5935,13 +7471,16 @@@ msgstr[0] "zpracováno %d klíčů (%d 
  msgstr[1] "zpracováno %d klíčů (%d validit vymazáno)\n"
  msgstr[2] "zpracováno %d klíčů (%d validit vymazáno)\n"
  
- #: g10/trustdb.c:1956
++#: g10/trustdb.c:1983
  msgid "no ultimately trusted keys found\n"
  msgstr "žádný absolutně důvěryhodný klíč nebyl nalezen\n"
  
- #: g10/trustdb.c:1970
++#: g10/trustdb.c:1997
  #, 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:2087
++#: g10/trustdb.c:2114
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7440,7 -5949,6 +7488,7 @@@ msgstr "
  "hloubka: %d  platných: %3d  podepsaných: %3d  důvěra: %d-, %dq, %dn, %dm, "
  "%df, %du\n"
  
- #: g10/trustdb.c:2167
++#: g10/trustdb.c:2194
  #, 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"
@@@ -7552,19 -6039,14 +7600,19 @@@ msgstr "
  "Syntaxe: kbxutil [volby] [soubory]\n"
  "Vypisuje, exportuje, importuje schránku na klíče (keybox).\n"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3208
++#: scd/app-nks.c:718 scd/app-openpgp.c:3221
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr "schází RSA modulus nebo nemá velikost %d bitů\n"
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3220
++#: scd/app-nks.c:726 scd/app-openpgp.c:3233
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr "schází veřejný RSA exponent nebo je delší než %d bitů\n"
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
- #: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
- #: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1965 scd/app-openpgp.c:1984
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2166 scd/app-openpgp.c:2430
++#: scd/app-openpgp.c:2477 scd/app-openpgp.c:2582 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "funkce PIN callback skončila chybou: %s\n"
@@@ -7617,85 -6090,67 +7665,85 @@@ msgstr "
  "|NP|Prosím, zadejte kód pro odblokování (PUK) klíče určeného na tvorbu "
  "kvalifikovaných podpisů."
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2511 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "chyba při získání nového PINu: %s\n"
  
- #: scd/app-openpgp.c:806
++#: scd/app-openpgp.c:801
  #, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "uložení otisku se nezdařilo: %s\n"
  
- #: scd/app-openpgp.c:819
++#: scd/app-openpgp.c:814
  #, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "uložení data vytvoření se nezdařilo: %s\n"
  
- #: scd/app-openpgp.c:1236
++#: scd/app-openpgp.c:1247
  msgid "response does not contain the RSA modulus\n"
  msgstr "odpověď neobsahuje RSA modulus\n"
  
- #: scd/app-openpgp.c:1243
++#: scd/app-openpgp.c:1254
  msgid "response does not contain the RSA public exponent\n"
  msgstr "odpověď neobsahuje veřejný RSA exponent\n"
  
- #: scd/app-openpgp.c:1353
++#: scd/app-openpgp.c:1364
  #, fuzzy
  #| msgid "response does not contain the EC public point\n"
  msgid "response does not contain the EC public key\n"
  msgstr "odpověď neobsahuje veřejný bod EC\n"
  
- #: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:1464 scd/app-openpgp.c:3825
  msgid "response does not contain the public key data\n"
  msgstr "odpověď neobsahuje veřejný klíč\n"
  
- #: scd/app-openpgp.c:1551
++#: scd/app-openpgp.c:1564
  #, c-format
  msgid "reading public key failed: %s\n"
  msgstr "čtení veřejného klíče se nezdařilo: %s\n"
  
- #: scd/app-openpgp.c:1903
++#: scd/app-openpgp.c:1916
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr "používám implicitní PIN jako %s\n"
  
- #: scd/app-openpgp.c:1910
++#: scd/app-openpgp.c:1923
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  "použití implicitního PINu jako %s selhalo: %s – vypínám jeho budoucí "
  "použití\n"
  
- #: scd/app-openpgp.c:1925
++#: scd/app-openpgp.c:1938
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr "||Prosím vložte PIN%%0A[podpis hotov: %lu]"
  
- #: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
++#: scd/app-openpgp.c:1949 scd/app-openpgp.c:2424
  msgid "||Please enter the PIN"
  msgstr "||Prosím vložte PIN"
  
- #: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2173 scd/app-openpgp.c:2437
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr "PIN pro CHV%d je příliš krátký; minimální délka je %d\n"
  
- #: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
- #: scd/app-openpgp.c:4114
++#: scd/app-openpgp.c:2004 scd/app-openpgp.c:2043 scd/app-openpgp.c:2185
++#: scd/app-openpgp.c:4126
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "ověření CHV%d se nezdařilo: %s\n"
  
- #: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
++#: scd/app-openpgp.c:2072 scd/app-openpgp.c:2458 scd/app-openpgp.c:4556
  msgid "error retrieving CHV status from card\n"
  msgstr "chyba při získání CHV z karty\n"
  
- #: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
++#: scd/app-openpgp.c:2078 scd/app-openpgp.c:4565
  msgid "card is permanently locked!\n"
  msgstr "karta je trvale uzamčena!\n"
  
- #: scd/app-openpgp.c:2072
++#: scd/app-openpgp.c:2085
  #, fuzzy, c-format
  #| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@@ -7710,24 -6165,19 +7758,24 @@@ msgstr[2] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:2082
++#: scd/app-openpgp.c:2095
  #, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "|A|Prosím, zadejte PIN správce%%0A[zbývá pokusů: %d]"
  
- #: scd/app-openpgp.c:2086
++#: scd/app-openpgp.c:2099
  msgid "|A|Please enter the Admin PIN"
  msgstr "|A|Prosím, zadejte PIN správce"
  
- #: scd/app-openpgp.c:2107
++#: scd/app-openpgp.c:2120
  msgid "access to admin commands is not configured\n"
  msgstr "přístup k administrátorským příkazům není nakonfigurován\n"
  
- #: scd/app-openpgp.c:2460
++#: scd/app-openpgp.c:2473
  msgid "||Please enter the Reset Code for the card"
  msgstr "||Prosím, zadejte resetační kód karty"
  
- #: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
++#: scd/app-openpgp.c:2483 scd/app-openpgp.c:2537
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr "Resetační kód je příliš krátký; minimální délka je %d\n"
@@@ -7735,77 -6185,59 +7783,77 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2493
++#: scd/app-openpgp.c:2506
  msgid "|RN|New Reset Code"
  msgstr "|RN|Nový resetační kód"
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|AN|New Admin PIN"
  msgstr "|AN|Nový PIN správce"
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|N|New PIN"
  msgstr "|N|Nový PIN"
  
- #: scd/app-openpgp.c:2565
++#: scd/app-openpgp.c:2578
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "||Prosím, zadejte PIN správce a nový PIN správce"
  
- #: scd/app-openpgp.c:2566
++#: scd/app-openpgp.c:2579
  msgid "||Please enter the PIN and New PIN"
  msgstr "||Prosím, zadejte PIN a nový PIN"
  
- #: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
++#: scd/app-openpgp.c:2635 scd/app-openpgp.c:3885
  msgid "error reading application data\n"
  msgstr "chyba při čtení aplikačních dat\n"
  
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
++#: scd/app-openpgp.c:2641 scd/app-openpgp.c:3892
  msgid "error reading fingerprint DO\n"
  msgstr "chyba při čtení otisku DO\n"
  
- #: scd/app-openpgp.c:2638
++#: scd/app-openpgp.c:2651
  msgid "key already exists\n"
  msgstr "klíč již existuje\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2655
  msgid "existing key will be replaced\n"
  msgstr "existující klíč bude přepsán\n"
  
- #: scd/app-openpgp.c:2644
++#: scd/app-openpgp.c:2657
  msgid "generating new key\n"
  msgstr "generování nového klíče\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2659
  msgid "writing new key\n"
  msgstr "nový klíč se zapisuje\n"
  
- #: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
++#: scd/app-openpgp.c:3201 scd/app-openpgp.c:3553
  msgid "creation timestamp missing\n"
  msgstr "chybí časové razítko vytvoření\n"
  
- #: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
++#: scd/app-openpgp.c:3243 scd/app-openpgp.c:3251
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr "schází RSA prime %s nebo nemá velikost %d bitů\n"
  
- #: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
++#: scd/app-openpgp.c:3384 scd/app-openpgp.c:3647
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "nelze uložit klíč: %s\n"
  
- #: scd/app-openpgp.c:3534
++#: scd/app-openpgp.c:3547
  msgid "unsupported curve\n"
  msgstr "nepodporovaná křivka\n"
  
- #: scd/app-openpgp.c:3790
++#: scd/app-openpgp.c:3802
  msgid "please wait while key is being generated ...\n"
  msgstr "prosím počkejte než bude klíč vygenerován…\n"
  
- #: scd/app-openpgp.c:3798
++#: scd/app-openpgp.c:3810
  msgid "generating key failed\n"
  msgstr "generování klíče se nezdařilo\n"
  
- #: scd/app-openpgp.c:3804
++#: scd/app-openpgp.c:3816
  #, fuzzy, c-format
  #| msgid "key generation completed (%d seconds)\n"
  msgid "key generation completed (%d second)\n"
@@@ -7814,30 -6246,24 +7862,30 @@@ msgstr[0] "generování klíče dokonč
  msgstr[1] "generování klíče dokončeno (%d sekund)\n"
  msgstr[2] "generování klíče dokončeno (%d sekund)\n"
  
- #: scd/app-openpgp.c:3838
++#: scd/app-openpgp.c:3850
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "neplatná struktura OpenPGP karty (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:3900
  msgid "fingerprint on card does not match requested one\n"
  msgstr "otisk na kartě se neshoduje s požadovaným\n"
  
- #: scd/app-openpgp.c:4004
++#: scd/app-openpgp.c:4016
  #, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "karta nepodporuje hashovací algoritmus %s\n"
  
- #: scd/app-openpgp.c:4089
++#: scd/app-openpgp.c:4101
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "dosud vytvořené podpisy: %lu\n"
  
- #: scd/app-openpgp.c:4551
++#: scd/app-openpgp.c:4570
  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:4854 scd/app-openpgp.c:4865
++#: scd/app-openpgp.c:4871 scd/app-openpgp.c:4882
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "přístup na %s se nezdařil – vadná OpenPGP karta?\n"
@@@ -7857,7 -6280,6 +7905,7 @@@ msgstr "|N|Prvotní nový PIN
  msgid "run in multi server mode (foreground)"
  msgstr "pracovat ve více serverové režimu (na popředí)"
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|ÚROVEŇ|nastaví ladicí úroveň na ÚROVEŇ"
  
@@@ -7897,11 -6310,9 +7945,11 @@@ msgstr "zakázat používání správco
  msgid "use variable length input for pinpad"
  msgstr "používat vstup o proměnné délce na klávesnici čtečky"
  
- #: scd/scdaemon.c:287
++#: scd/scdaemon.c:286
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Použití: @SCDAEMON@ [volby] (-h pro nápovědu)"
  
- #: scd/scdaemon.c:289
++#: scd/scdaemon.c:288
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
@@@ -7909,17 -6320,14 +7957,17 @@@ msgstr "
  "Syntaxe: scdaemon [volby] [příkaz [argumenty]]\n"
  "Démon pro čipové karty (smartcard) pro @GNUPG@\n"
  
- #: scd/scdaemon.c:786
++#: scd/scdaemon.c:784
  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:1160 dirmngr/dirmngr.c:1900
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1904
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "obsluha pro deskriptor %d spuštěna\n"
  
- #: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
++#: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1909
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "obsluha pro deskriptor %d ukončena\n"
@@@ -7995,9 -6387,6 +8043,9 @@@ msgstr "počet odpovídajících certif
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "hledání klíče pouze ve vyrovnávací paměti dirmngr neuspělo: %s\n"
  
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
 +#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  msgid "failed to allocate keyDB handle\n"
  msgstr "alokace popisovače keyDB se nezdařila\n"
  
@@@ -8472,11 -6759,9 +8520,11 @@@ msgstr "Hotovo. Nyní byste měli tuto 
  msgid "resource problem: out of core\n"
  msgstr "problém se zdroji: nedostatek paměti\n"
  
- #: sm/decrypt.c:330
++#: sm/decrypt.c:332
  msgid "(this is the RC2 algorithm)\n"
  msgstr "(toto je algoritmus RC2)\n"
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:334
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr "(toto nevypadá jako zašifrovaná zpráva)\n"
  
@@@ -8517,115 -6794,87 +8565,115 @@@ msgstr "vypsat seznam externích klíč
  msgid "list certificate chain"
  msgstr "vypsat řetěz certifikátů"
  
- #: sm/gpgsm.c:218
++#: sm/gpgsm.c:219
  msgid "import certificates"
  msgstr "importovat certifikáty"
  
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
  msgid "export certificates"
  msgstr "exportovat certifikáty"
  
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:228
  msgid "register a smartcard"
  msgstr "zaregistrovat čipovou kartu"
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:231
  msgid "pass a command to the dirmngr"
  msgstr "předat příkaz do dirmngr"
  
- #: sm/gpgsm.c:232
++#: sm/gpgsm.c:233
  msgid "invoke gpg-protect-tool"
  msgstr "vyvolat gpg-protect-tool"
  
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:250
  msgid "create base-64 encoded output"
  msgstr "vytvářet výstup zakódovaný pomocí Base-64"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in PEM format"
  msgstr "předpokládat vstup ve formátu PEM"
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in base-64 format"
  msgstr "předpokládat vstup ve formátu Base-64"
  
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:262
  msgid "assume input is in binary format"
  msgstr "předpokládat vstup v binárním formátu"
  
- #: sm/gpgsm.c:267
++#: sm/gpgsm.c:269
  msgid "never consult a CRL"
  msgstr "nikdy nenahlížet do CRL"
  
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:279
  msgid "check validity using OCSP"
  msgstr "kontrolovat platnost pomocí OCSP"
  
- #: sm/gpgsm.c:282
++#: sm/gpgsm.c:284
  msgid "|N|number of certificates to include"
  msgstr "|N|počet certifikátů, které zahrnout"
  
- #: sm/gpgsm.c:285
++#: sm/gpgsm.c:287
  msgid "|FILE|take policy information from FILE"
  msgstr "|SOUBOR|vzít politiky ze SOUBORU"
  
- #: sm/gpgsm.c:288
++#: sm/gpgsm.c:290
  msgid "do not check certificate policies"
  msgstr "nekontrolovat politiky certifikátu"
  
- #: sm/gpgsm.c:292
++#: sm/gpgsm.c:294
  msgid "fetch missing issuer certificates"
  msgstr "stahovat chybějící certifikáty vydavatelů"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "don't use the terminal at all"
  msgstr "vůbec nepoužívat terminál"
  
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:307
  msgid "|FILE|write a server mode log to FILE"
  msgstr "|SOUBOR|zapisovat protokol režimu server do SOUBORU"
  
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:312
  msgid "|FILE|write an audit log to FILE"
  msgstr "|SOUBOR|zapisovat auditní protokol do SOUBORU"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "batch mode: never ask"
  msgstr "dávkový režim: nikdy se neptat"
  
- #: sm/gpgsm.c:314
++#: sm/gpgsm.c:316
  msgid "assume yes on most questions"
  msgstr "předpokládat ano na většinu otázek"
  
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:317
  msgid "assume no on most questions"
  msgstr "předpokládat ne na většinu otázek"
  
- #: sm/gpgsm.c:318
++#: sm/gpgsm.c:320
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "|SOUBOR|přidat klíčenku na seznam klíčenek"
  
- #: sm/gpgsm.c:321
++#: sm/gpgsm.c:323
  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:331 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|SPEC|použít tento server pro dohledávání klíčů"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|NÁZEV|použít šifrovací algoritmus NÁZEV"
  
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:352
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|NÁZEV|použít hashovací algoritmus NÁZEV"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:559
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
  msgstr "Použití: @GPGSM@ [možnosti] [soubory] (-h pro pomoc)"
  
- #: sm/gpgsm.c:570
++#: sm/gpgsm.c:562
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
  "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@@ -8635,46 -6884,37 +8683,46 @@@ 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:774
++#: sm/gpgsm.c:766
  #, 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:785
++#: sm/gpgsm.c:777
  #, c-format
  msgid "unknown validation model '%s'\n"
  msgstr "neznámý model ověřování „%s“\n"
  
- #: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
  #, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "%s:%u: nebyl zadán název stroje\n"
  
- #: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr "%s:%u: zadáno heslo bez uživatele\n"
  
- #: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
  #, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr "%s:%u: přeskakuji tento řádek\n"
  
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1427
  msgid "could not parse keyserver\n"
  msgstr "nelze rozebrat serveru klíčů\n"
  
- #: sm/gpgsm.c:1636
++#: sm/gpgsm.c:1630
  #, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "importují se běžné certifikáty „%s“\n"
  
- #: sm/gpgsm.c:1677
++#: sm/gpgsm.c:1671
  #, c-format
  msgid "can't sign using '%s': %s\n"
  msgstr "nelze podepsat pomocí „%s“: %s\n"
  
- #: sm/gpgsm.c:2033
++#: sm/gpgsm.c:2028
  msgid "invalid command (there is no implicit command)\n"
  msgstr "neplatný příkaz (neexistuje žádný implicitní příkaz)\n"
  
@@@ -9441,8 -7530,6 +9489,8 @@@ msgstr "namísto „https“ se použij
  msgid "CRL access not possible due to disabled %s\n"
  msgstr "Přístup k CRL není možný kvůli vypnutému %s\n"
  
 +#: dirmngr/crlfetch.c:223 dirmngr/ldap-wrapper-ce.c:488
- #: dirmngr/ldap-wrapper.c:742 dirmngr/misc.c:563
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:563
  #, c-format
  msgid "error initializing reader object: %s\n"
  msgstr "chyba při inicializaci čtecího objektu: %s\n"
@@@ -9612,112 -7663,84 +9660,112 @@@ msgstr "očekáván absolutní název s
  msgid "looking up '%s'\n"
  msgstr "hledá se „%s“\n"
  
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:160
  msgid "list the contents of the CRL cache"
  msgstr "vypíše obsah CRL keše"
  
- #: dirmngr/dirmngr.c:158
++#: dirmngr/dirmngr.c:161
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|SOUBOR|zavede CRL ze SOUBORU do keše"
  
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:162
  msgid "|URL|fetch a CRL from URL"
  msgstr "|URL|stáhne CRL z URL"
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:163
  msgid "shutdown the dirmngr"
  msgstr "vypne dirmngr"
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:164
  msgid "flush the cache"
  msgstr "vyprázdní keš"
  
- #: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
- #: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
++#: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|SOUBOR|protokol z režimu serveru se zapíše do SOUBORU"
  
- #: dirmngr/dirmngr.c:177
++#: dirmngr/dirmngr.c:180
  msgid "run without asking a user"
  msgstr "běží bez dotazování se uživatele"
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:181
  msgid "force loading of outdated CRLs"
  msgstr "vynutí zavedení zastaralých CRL"
  
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:182
  msgid "allow sending OCSP requests"
  msgstr "povolí odesílání OCSP dotazů"
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:184
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:185
  msgid "inhibit the use of HTTP"
  msgstr "zakáže použití HTTP"
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:186
  msgid "inhibit the use of LDAP"
  msgstr "zakáže použití LDAP"
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:188
  msgid "ignore HTTP CRL distribution points"
  msgstr "ignoruje HTTP distribuční místa CRL "
  
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
  msgid "ignore LDAP CRL distribution points"
  msgstr "ignoruje LDAP distribuční místa CRL"
  
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:192
  msgid "ignore certificate contained OCSP service URLs"
  msgstr "ignoruje URL služby OCSP uvedené v certifikátu"
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr "|URL|všechny HTTP požadavky přesměruje na URL"
  
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
  msgid "|HOST|use HOST for LDAP queries"
  msgstr "|STROJ|pro LDAP dotazy použije STROJ"
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr "nepoužije náhradní stroje s --ldap-proxy"
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:202
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|SOUBOR|načte seznam LDAP serverů ze SOUBORU"
  
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
  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:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr "|N|nastaví časový limit pro LDAP na N sekund"
  
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:210
  msgid "|URL|use OCSP responder at URL"
  msgstr "|URL|použije OCSP odpovídače na URL"
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:212
  msgid "|FPR|OCSP response signed by FPR"
  msgstr "|OTISK|OCSP odpovědi podepsané podle OTISKU"
  
- #: dirmngr/dirmngr.c:215
++#: 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:220
++#: dirmngr/dirmngr.c:223
  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:222
++#: dirmngr/dirmngr.c:225
  msgid "route all network traffic via Tor"
  msgstr "směrovat veškerý síťový provoz skrz Tor"
  
- #: dirmngr/dirmngr.c:240
++#: dirmngr/dirmngr.c:246
  msgid ""
  "@\n"
  "(See the \"info\" manual for a complete listing of all commands and "
@@@ -9726,11 -7749,9 +9774,11 @@@ msgstr "
  "@\n"
  "(Úplný seznam příkazů a voleb naleznete v „info“ manuálu.)\n"
  
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:361
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Použití: @DIRMNGR@ [volby] (-h pro nápovědu)"
  
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:363
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9738,78 -7759,61 +9786,78 @@@ msgstr "
  "Syntaxe: @DIRMNGR@ [volby] [příkaz [argumenty]]\n"
  "Přístup k serveru s klíči, CRL a OCSP z @GNUPG@\n"
  
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:443
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr "platné úrovně ladění jsou: %s\n"
  
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
- #: tools/gpgconf.c:648
++#: dirmngr/dirmngr.c:496 tools/gpgconf.c:550 tools/gpgconf.c:585
++#: tools/gpgconf.c:656
  #, c-format
  msgid "usage: %s [options] "
  msgstr "použití: %s [volby] "
  
- #: dirmngr/dirmngr.c:1062
++#: dirmngr/dirmngr.c:1074
  msgid "colons are not allowed in the socket name\n"
  msgstr "dvojtečky v názvu socketu jsou nepřípustné\n"
  
- #: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
++#: dirmngr/dirmngr.c:1300 dirmngr/server.c:1585
  #, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "stahování CRL z „%s“ selhalo: %s\n"
  
- #: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
++#: dirmngr/dirmngr.c:1306 dirmngr/server.c:1591
  #, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "zpracování CRL z „%s“ selhalo: %s\n"
  
- #: dirmngr/dirmngr.c:1484
++#: dirmngr/dirmngr.c:1487
  #, 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:1539 dirmngr/dirmngr.c:1623
++#: dirmngr/dirmngr.c:1542 dirmngr/dirmngr.c:1626
  #, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "%s:%u: zjištěn neplatný otisk\n"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
++#: dirmngr/dirmngr.c:1578 dirmngr/dirmngr.c:1604 tools/gpgconf-comp.c:4032
  #, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "%s:%u: chyba čtení: %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1633
  #, 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:1697
++#: dirmngr/dirmngr.c:1700
  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:1734
++#: dirmngr/dirmngr.c:1738
  msgid "SIGUSR2 received - no action defined\n"
  msgstr "přijat SIGUSR2 – žádná akce nedefinována\n"
  
- #: dirmngr/dirmngr.c:1739
++#: dirmngr/dirmngr.c:1743
  msgid "SIGTERM received - shutting down ...\n"
  msgstr "přijat SIGTERM – vypíná se…\n"
  
  # TODO: plural
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1745
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr "přijat SIGTERM – stále aktivních spojení: %d\n"
  
- #: dirmngr/dirmngr.c:1746
++#: dirmngr/dirmngr.c:1750
  msgid "shutdown forced\n"
  msgstr "vypnutí vynuceno\n"
  
- #: dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1758
  msgid "SIGINT received - immediate shutdown\n"
  msgstr "přijat SIGINT – okamžité vypnutí\n"
  
- #: dirmngr/dirmngr.c:1761
++#: dirmngr/dirmngr.c:1765
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr "přijat signál č. %d – žádná akce nedefinována\n"
@@@ -10273,32 -8178,26 +10321,32 @@@ msgstr "volání fetch_next_cert selhal
  msgid "max_replies %d exceeded\n"
  msgstr "max_replies (max. odpovědí) %d překročeno\n"
  
- #: dirmngr/server.c:2463
++#: dirmngr/server.c:2469
  #, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "řídící strukturu nelze alokovat: %s\n"
  
- #: dirmngr/server.c:2474
++#: dirmngr/server.c:2480
  #, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "alokace kontextu assuan selhala: %s\n"
  
- #: dirmngr/server.c:2495
++#: dirmngr/server.c:2501
  #, c-format
  msgid "failed to initialize the server: %s\n"
  msgstr "inicializace serveru selhala: %s\n"
  
- #: dirmngr/server.c:2503
++#: dirmngr/server.c:2509
  #, c-format
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "registrace příkazu u Assuanu selhala: %s\n"
  
- #: dirmngr/server.c:2534
++#: dirmngr/server.c:2540
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr "problém příjmu Assuanu: %s\n"
  
- #: dirmngr/server.c:2553
++#: dirmngr/server.c:2559
  #, c-format
  msgid "Assuan processing failed: %s\n"
  msgstr "zpracování Assuanu se nezdařilo: %s\n"
@@@ -10340,7 -8230,6 +10388,7 @@@ msgstr "DSA požaduje použití 160bito
  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:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:167
  msgid "quiet"
  msgstr "stručný výstup"
  
@@@ -10431,22 -8300,15 +10479,22 @@@ msgstr "odesílání řádku selhalo: %
  msgid "error sending standard options: %s\n"
  msgstr "chyba při odesílání standardního parametru: %s\n"
  
 +#: tools/gpgconf-comp.c:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
- #: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
++#: tools/gpgconf-comp.c:766 tools/gpgconf-comp.c:865
  msgid "Options controlling the diagnostic output"
  msgstr "Volby ovlivňující diagnostický výstup"
  
 +#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
- #: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
++#: tools/gpgconf-comp.c:779 tools/gpgconf-comp.c:888
  msgid "Options controlling the configuration"
  msgstr "Volby ovlivňující nastavení"
  
- #: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
- #: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
++#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:723
++#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:901
  msgid "Options useful for debugging"
  msgstr "Volby užitečné při ladění"
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
  msgid "Options controlling the security"
  msgstr "Volby ovlivňující bezpečnost"
  
@@@ -10496,11 -8347,9 +10544,11 @@@ msgstr "nedovolit opakovat stará hesla
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr "|N|nastaví časový limit pro LDAP na N sekund"
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
++#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
  msgid "|NAME|use NAME as default secret key"
  msgstr "|NÁZEV|použít NÁZEV jako implicitní tajný klíč"
  
- #: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
++#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:784
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|JMÉNO|šifrovat rovněž pro uživatele s ID JMÉNO"
  
@@@ -10508,180 -8356,154 +10556,198 @@@
  msgid "|SPEC|set up email aliases"
  msgstr "|SPEC|nastavit e-mailový alias"
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
++#: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
  msgid "Configuration for Keyservers"
  msgstr "Nastavení serverů klíčů"
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
++#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
  msgid "|URL|use keyserver at URL"
  msgstr "|URL|používat server klíčů na URL"
  
- #: tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:741
  msgid "allow PKA lookups (DNS requests)"
  msgstr "povolit dohledávání PKA (dotazy na DNS)"
  
- #: tools/gpgconf-comp.c:738
++#: tools/gpgconf-comp.c:744
  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:787
++#: tools/gpgconf-comp.c:793
  msgid "disable all access to the dirmngr"
  msgstr "zakázat veškerý přístup k dirmngr"
  
- #: tools/gpgconf-comp.c:790
++#: tools/gpgconf-comp.c:796
  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:820
++#: tools/gpgconf-comp.c:829
  msgid "do not check CRLs for root certificates"
  msgstr "neprověřovat kořenové certifikáty proti CRL"
  
- #: tools/gpgconf-comp.c:869
++#: tools/gpgconf-comp.c:878
  msgid "Options controlling the format of the output"
  msgstr "Volby ovlivňující podobu výstupu"
  
- #: tools/gpgconf-comp.c:905
++#: tools/gpgconf-comp.c:920
  msgid "Options controlling the interactivity and enforcement"
  msgstr "Volby ovlivňující interaktivitu a vymáhání"
  
- #: tools/gpgconf-comp.c:918
++#: tools/gpgconf-comp.c:933
  msgid "Options controlling the use of Tor"
  msgstr "Volby ovlivňující použití Toru"
  
- #: tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:947
  msgid "Configuration for HTTP servers"
  msgstr "Nastavení HTTP serverů"
  
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:958
  msgid "use system's HTTP proxy setting"
  msgstr "používat systémové nastavení HTTP proxy"
  
- #: tools/gpgconf-comp.c:948
++#: tools/gpgconf-comp.c:963
  msgid "Configuration of LDAP servers to use"
  msgstr "Nastavení používaných LDAP serverů"
  
- #: tools/gpgconf-comp.c:977
++#: tools/gpgconf-comp.c:992
  msgid "LDAP server list"
  msgstr "Seznam LDAP serverů"
  
- #: tools/gpgconf-comp.c:985
++#: tools/gpgconf-comp.c:1000
  msgid "Configuration for OCSP"
  msgstr "Nastavení OCSP"
  
- #: tools/gpgconf-comp.c:1066
++#: tools/gpgconf-comp.c:1081
  #, fuzzy
  #| msgid "GPG for OpenPGP"
  msgid "OpenPGP"
  msgstr "GPG pro OpenPGP"
  
- #: tools/gpgconf-comp.c:1067
++#: tools/gpgconf-comp.c:1082
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1083
  #, fuzzy
  #| msgid "Smartcard Daemon"
  msgid "Smartcards"
  msgstr "Démon pro čipové karty"
  
- #: tools/gpgconf-comp.c:1069
++#: tools/gpgconf-comp.c:1084
  #, fuzzy
  #| msgid "GPG for S/MIME"
  msgid "S/MIME"
  msgstr "GPG pro S/MIME"
  
- #: tools/gpgconf-comp.c:1070
++#: tools/gpgconf-comp.c:1085
  #, fuzzy
  #| msgid "network error"
  msgid "Network"
  msgstr "chyba sítě"
  
- #: tools/gpgconf-comp.c:1071
++#: tools/gpgconf-comp.c:1086
  #, fuzzy
  #| msgid "PIN and Passphrase Entry"
  msgid "Passphrase Entry"
  msgstr "Zadávání kódu PIN a hesla"
  
- #: tools/gpgconf-comp.c:1225
++#: tools/gpgconf-comp.c:1240
  msgid "Component not suitable for launching"
  msgstr "Komponenta není vhodná pro spuštění"
  
- #: tools/gpgconf-comp.c:3283
++#: tools/gpgconf-comp.c:3311
  #, c-format
  msgid "External verification of component %s failed"
  msgstr "Selhalo externí ověření komponenty %s"
  
- #: tools/gpgconf-comp.c:3434
++#: tools/gpgconf-comp.c:3462
  msgid "Note that group specifications are ignored\n"
  msgstr "Vezměte na vědomí, že určení skupiny se ignoruje\n"
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf-comp.c:4036
+ #, fuzzy, c-format
+ #| msgid "error closing '%s': %s\n"
+ msgid "error closing '%s'\n"
+ msgstr "chyba při uzavírání „%s“: %s\n"
+ 
++#: tools/gpgconf-comp.c:4038
+ #, fuzzy, c-format
+ #| msgid "error hashing '%s': %s\n"
+ msgid "error parsing '%s'\n"
+ msgstr "chyba při výpočtu haše „%s“: %s\n"
+ 
++#: tools/gpgconf.c:73
  msgid "list all components"
  msgstr "vypsat všechny komponenty"
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "check all programs"
  msgstr "zkontrolovat všechny programy"
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|list options"
  msgstr "|KOMPONENTA|vypsat volby"
  
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
  msgid "|COMPONENT|change options"
  msgstr "|KOMPONENTA|změnit volby"
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "|COMPONENT|check options"
  msgstr "|KOMPONENTA|zkontrolovat volby"
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "apply global default values"
  msgstr "aplikovat globální implicitní hodnoty"
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
+ #, fuzzy
+ #| msgid "|FILE|take policy information from FILE"
+ msgid "|FILE|update configuration files using FILE"
+ msgstr "|SOUBOR|vzít politiky ze SOUBORU"
+ 
++#: tools/gpgconf.c:83
  msgid "get the configuration directories for @GPGCONF@"
  msgstr "získat adresáře s nastavením @GPGCONF@"
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:85
  msgid "list global configuration file"
  msgstr "vypsat globální konfigurační soubor"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  msgid "check global configuration file"
  msgstr "zkontrolovat globální konfigurační soubor"
  
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:89
  #, fuzzy
  #| msgid "update the trust database"
  msgid "query the software version database"
  msgstr "aktualizovat databázi důvěry"
  
- #: tools/gpgconf.c:86
++#: tools/gpgconf.c:90
  msgid "reload all or a given component"
  msgstr "znovu načíst všechny nebo zadané komponenty"
  
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:91
  msgid "launch a given component"
  msgstr "spustit zadanou komponentu"
  
- #: tools/gpgconf.c:88
++#: tools/gpgconf.c:92
  msgid "kill a given component"
  msgstr "zabít zadanou komponentu"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "use as output file"
  msgstr "použít jako výstupní soubor"
  
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:102
  msgid "activate changes at runtime, if possible"
  msgstr "provést změny za běhu, pokud to lze"
  
- #: tools/gpgconf.c:122
++#: tools/gpgconf.c:127
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "Použití: @GPGCONF@ [volby] (-h pro nápovědu)"
  
- #: tools/gpgconf.c:125
++#: tools/gpgconf.c:130
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10689,15 -8511,12 +10755,15 @@@ msgstr "
  "Syntaxe: @GPGCONF@ [volby]\n"
  "Spravuje konfigurační volby nástrojů, které patří do systému @GNUPG@\n"
  
- #: tools/gpgconf.c:545 tools/gpgconf.c:579
++#: tools/gpgconf.c:552 tools/gpgconf.c:587
  msgid "Need one component argument"
  msgstr "Potřebuji jeden argument určující komponentu"
  
- #: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
++#: tools/gpgconf.c:561 tools/gpgconf.c:599 tools/gpgconf.c:632
  msgid "Component not found"
  msgstr "Komponenta nenalezena"
  
- #: tools/gpgconf.c:650
++#: tools/gpgconf.c:658
  msgid "No argument allowed"
  msgstr "Žádné argumenty nejsou povoleny"
  
diff --cc po/da.po
index 96dd231,5185534..e1edb45
--- a/po/da.po
+++ b/po/da.po
@@@ -14,7 -14,6 +14,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-11-18 16:54+0100\n"
++"POT-Creation-Date: 2016-12-20 11:28+0100\n"
  "PO-Revision-Date: 2012-11-01 20:27+0200\n"
  "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
  "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@@ -173,25 -144,11 +173,25 @@@ msgstr "Ugyldig adgangsfrase
  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:838 common/dotlock.c:839 g10/card-util.c:839
- #: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1306 g10/keygen.c:4577
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
++#: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't create '%s': %s\n"
  msgstr "kan ikke oprette »%s«: %s\n"
  
 +#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
- #: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1307
++#: g10/import.c:305 g10/import.c:448 g10/import.c:621 g10/keygen.c:3681
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
- #: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
- #: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:825 g10/sign.c:1025
++#: g10/sign.c:1130 g10/sign.c:1275 g10/tdbdump.c:143 g10/tdbdump.c:151
++#: g10/tdbio.c:720 g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161
++#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
++#: dirmngr/certcache.c:368 dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1564
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
@@@ -258,11 -204,9 +258,11 @@@ msgstr "
  msgid "failed to create stream from socket: %s\n"
  msgstr "kunne ikke oprette strøm fra sokkel: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1100
++#: agent/divert-scd.c:92 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr "Indsæt venligst kortet med serielnummeret"
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1101
++#: agent/divert-scd.c:93 g10/call-agent.c:1102
  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"
  
@@@ -419,47 -337,32 +419,47 @@@ msgstr "
  "@Indstillinger:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
  msgid "run in daemon mode (background)"
  msgstr "kør i dæmontilstand (baggrunden)"
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
  msgid "run in server mode (foreground)"
  msgstr "kør i servertilstand (forgrunden)"
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
  #, fuzzy
  #| msgid "run in server mode"
  msgid "run in supervised mode"
  msgstr "kør i servertilstand"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:170 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "uddybende"
  
 +#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "vær mindre uddybende"
  
- #: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
  msgid "sh-style command output"
  msgstr "kommandoresultat i sh-stil"
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
  msgid "csh-style command output"
  msgstr "kommandoresultat i csh-stil"
  
- #: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
- #: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
++#: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
  msgid "|FILE|read options from FILE"
  msgstr "|FIL|læs tilvalg fra FIL"
  
- #: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:177
  msgid "do not detach from the console"
  msgstr "frakobl ikke fra konsollen"
  
@@@ -542,21 -428,14 +542,21 @@@ msgstr "
  #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
  #. reporting address.  This is so that we can change the
  #. reporting address without breaking the translations.
- #: agent/gpg-agent.c:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:481 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1025 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:358
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:124 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr "Rapporter venligst fejl til <@EMAIL@>.\n"
  
- #: agent/gpg-agent.c:491
++#: agent/gpg-agent.c:490
  #, 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:493
++#: agent/gpg-agent.c:492
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -568,149 -447,114 +568,149 @@@ msgstr "
  "Syntaks: gpg-agent [tilvalg] [kommando [parametre]]\n"
  "Hemmelig nøglehåndtering for GnuPG\n"
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:537 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:442
  #, 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:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:793
++#: agent/gpg-agent.c:1082 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:812
  #, 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"
  
- #: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
- #: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1093 agent/gpg-agent.c:1935 g10/gpg.c:2510
++#: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:817
++#: dirmngr/dirmngr.c:1670 tools/symcryptrun.c:932
  #, fuzzy, c-format
  #| msgid "option file `%s': %s\n"
  msgid "option file '%s': %s\n"
  msgstr "tilvalgsfil »%s«: %s\n"
  
- #: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:806
++#: agent/gpg-agent.c:1101 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:825
  #, 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:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
- #: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
++#: agent/gpg-agent.c:1223 g10/gpg.c:3643 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:936 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:527
  #, 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:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
++#: agent/gpg-agent.c:2080 scd/scdaemon.c:1073 dirmngr/dirmngr.c:1081
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "kan ikke oprette sokkel: %s\n"
  
- #: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
++#: agent/gpg-agent.c:2097 scd/scdaemon.c:1086 dirmngr/dirmngr.c:1094
  #, 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:2134
++#: agent/gpg-agent.c:2135
  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:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
++#: agent/gpg-agent.c:2145 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1126
  msgid "error getting nonce for the socket\n"
  msgstr "fejl ved indhentelse af nonce for soklen\n"
  
- #: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
++#: agent/gpg-agent.c:2150 scd/scdaemon.c:1113 dirmngr/dirmngr.c:1129
  #, 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:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
- #: dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2160 agent/gpg-agent.c:2197 scd/scdaemon.c:1121
++#: dirmngr/dirmngr.c:1138
  #, 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:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:2165 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1143
  #, c-format
  msgid "listen() failed: %s\n"
  msgstr "listen() mislykkedes: %s\n"
  
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
++#: agent/gpg-agent.c:2172 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1149
  #, 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:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: agent/gpg-agent.c:2191 agent/gpg-agent.c:2234 g10/exec.c:199
 +#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, 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:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: agent/gpg-agent.c:2194 agent/gpg-agent.c:2239 g10/openfile.c:491
 +#: g10/openfile.c:520 sm/keydb.c:103
  #, fuzzy, c-format
  #| msgid "directory `%s' created\n"
  msgid "directory '%s' created\n"
  msgstr "mappe »%s« oprettet\n"
  
- #: agent/gpg-agent.c:2244
++#: agent/gpg-agent.c:2245
  #, 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:2248
++#: agent/gpg-agent.c:2249
  #, 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:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
++#: agent/gpg-agent.c:2392 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1871
  #, 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:2598
++#: agent/gpg-agent.c:2599
  #, 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:2603
++#: agent/gpg-agent.c:2604
  #, 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:2678
++#: agent/gpg-agent.c:2679
  #, 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:2683
++#: agent/gpg-agent.c:2684
  #, 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:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
++#: agent/gpg-agent.c:2881 scd/scdaemon.c:1272 dirmngr/dirmngr.c:2075
  #, 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:2942 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2954 scd/scdaemon.c:1321
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s stoppet\n"
  
- #: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
++#: agent/gpg-agent.c:3092 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  msgid "no gpg-agent running in this session\n"
  msgstr "ingen gpg-agent kører i denne session\n"
  
@@@ -726,8 -568,6 +726,8 @@@ msgstr "
  "Syntaks: gpg-preset-passphrase [tilvalg] KEYGRIP\n"
  "Adgangskode for mellemlagervedligeholdelse\n"
  
- #: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
++#: agent/protect-tool.c:106 g10/gpg.c:424 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:153 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -735,9 -575,6 +735,9 @@@ msgstr "
  "@Kommandoer:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
- #: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:92 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:168 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -794,8 -623,6 +794,8 @@@ 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:362 dirmngr/dirmngr.c:1469
- #: tools/gpgconf.c:323
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1472
++#: tools/gpgconf.c:328
  #, fuzzy, c-format
  #| msgid "error opening `%s': %s\n"
  msgid "error opening '%s': %s\n"
@@@ -979,9 -777,6 +979,9 @@@ msgstr "beskyttelsesalgoritme %d%s er i
  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:438
 +#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
- #: dirmngr/ldap-wrapper.c:710
++#: dirmngr/ldap-wrapper.c:711
  #, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "fejl ved oprettelse af datakanal: %s\n"
@@@ -994,8 -786,6 +994,8 @@@
  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:848 dirmngr/dirmngr.c:1155
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1167
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "fejl ved forgrening af proces: %s\n"
@@@ -1045,28 -826,23 +1045,28 @@@ msgstr "kan ikke forbinde til »%s«: %
  msgid "problem setting the gpg-agent options\n"
  msgstr "problem ved angivelse af indstillinger for gpg-agent\n"
  
- #: common/sysutils.c:144
++#: common/sysutils.c:148
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "kan ikke slå kernedump fra: %s\n"
  
- #: common/sysutils.c:239
++#: common/sysutils.c:250
  #, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "Advarsel: usikker ejerskab på %s »%s«\n"
  
- #: common/sysutils.c:271
++#: common/sysutils.c:282
  #, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "Advarsel: usikre rettigheder på %s »%s«\n"
  
- #: common/sysutils.c:659
++#: common/sysutils.c:693
  #, 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:685
++#: common/sysutils.c:719
  #, fuzzy, c-format
  #| msgid "renaming `%s' to `%s' failed: %s\n"
  msgid "renaming '%s' to '%s' failed: %s\n"
@@@ -1143,7 -904,6 +1143,7 @@@ msgstr "%s:%u: forældet indstilling »
  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:554
++#: common/miscellaneous.c:556
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
@@@ -1255,8 -992,6 +1255,8 @@@ msgstr "Sessionsnøgle oprettet
  msgid "algorithm: %s"
  msgstr "algoritme: %s"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3098
++#: scd/app-openpgp.c:3111
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "ikke understøttet algoritme: %s"
@@@ -1446,7 -1139,6 +1446,7 @@@ msgstr "tilvalg »%.50s« er tvetydigt\
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr "kommando »%.50s« er tvetydig\n"
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1173
++#: common/argparse.c:401 dirmngr/dirmngr.c:1185
  msgid "out of core\n"
  msgstr "uden for kerne\n"
  
@@@ -1509,8 -1190,6 +1509,8 @@@ msgstr "lås »%s« er ikke udført: %s
  msgid "waiting for lock %s...\n"
  msgstr "venter på lås %s ...\n"
  
- #: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
- #: dirmngr/dirmngr.c:715
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:725
++#: dirmngr/dirmngr.c:734
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr "%s er for gammel (kræver %s, har %s)\n"
@@@ -1548,7 -1219,6 +1548,7 @@@ msgstr "uventet panser: 
  msgid "invalid dash escaped line: "
  msgstr "ugyldig striplet undvegen linje: "
  
- #: g10/armor.c:873 g10/armor.c:1490
++#: g10/armor.c:873 g10/armor.c:1493
  #, c-format
  msgid "invalid radix64 character %02X skipped\n"
  msgstr "ugyldigt radix64-tegn %02x udeladt\n"
@@@ -1565,7 -1232,6 +1565,7 @@@ msgstr "for tidlig eof (i CRC)\n
  msgid "malformed CRC\n"
  msgstr "ugyldig udformet CRC\n"
  
- #: g10/armor.c:962 g10/armor.c:1527
++#: g10/armor.c:962 g10/armor.c:1530
  #, c-format
  msgid "CRC error; %06lX - %06lX\n"
  msgstr "CRC-fejl; %06lx - %06lx\n"
@@@ -1578,16 -1242,13 +1578,16 @@@ msgstr "for tidlig eof (i trailer)\n
  msgid "error in trailer line\n"
  msgstr "fejl i trailerlinje\n"
  
- #: g10/armor.c:1303
++#: g10/armor.c:1306
  msgid "no valid OpenPGP data found.\n"
  msgstr "ingen gyldige OpenPGP-data fundet.\n"
  
- #: g10/armor.c:1308
++#: g10/armor.c:1311
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
  msgstr "ugyldigt panser: linje længere end %d tegn\n"
  
- #: g10/armor.c:1312
++#: g10/armor.c:1315
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr ""
@@@ -1677,8 -1323,6 +1677,8 @@@ msgstr "OpenPGP-kort er ikke tilgængel
  msgid "OpenPGP card no. %s detected\n"
  msgstr "OpenPGP-kortnr. %s detekteret\n"
  
- #: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
- #: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2030
++#: g10/keygen.c:4087 g10/revoke.c:215 g10/revoke.c:618
  msgid "can't do this in batch mode\n"
  msgstr "kan ikke udføre dette i jobtilstand\n"
  
@@@ -1686,14 -1329,9 +1686,14 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "Denne kommando er kun tilgængelig for version 2-kort\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2454
++#: g10/card-util.c:109 scd/app-openpgp.c:2467
  msgid "Reset Code not or not anymore available\n"
  msgstr "Nulstillingskode er ikke eller ikke mere tilgængelig\n"
  
 +#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
- #: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
- #: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1768
++#: g10/keygen.c:1945 g10/keygen.c:2313 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "Dit valg? "
  
@@@ -1755,10 -1379,6 +1755,10 @@@ msgstr "Adresse hvor offentlig nøgle s
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr "Fejl: Adresse er for lang (begrænsningen er %d tegn).\n"
  
- #: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
- #: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:334
++#: g10/import.c:592 g10/import.c:640 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
++#: dirmngr/dirmngr.c:1510 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
@@@ -1826,7 -1431,6 +1826,7 @@@ msgstr "nøglehandling er ikke mulig: %
  msgid "not an OpenPGP card"
  msgstr "ikke et OpenPGP-kort"
  
- #: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
++#: g10/card-util.c:1173 g10/keygen.c:4106 g10/keygen.c:5092
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr "fejl ved indhentelse af aktuel nøgleinformation: %s\n"
@@@ -1866,13 -1465,10 +1866,13 @@@ msgstr "Hvilken nøglestørrelse ønske
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "Hvilken nøglestørrelse ønsker du for godkendelsesnøglen? (%u) "
  
- #: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
++#: g10/card-util.c:1316 g10/keygen.c:2122 g10/keygen.c:2154
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "afrundet op til %u bit\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2207 sm/certreqgen-ui.c:188
  #, 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"
@@@ -1933,9 -1519,6 +1933,9 @@@ msgstr "   (2) Krypteringsnøgle\n
  msgid "   (3) Authentication key\n"
  msgstr "   (3) Godkendelsesnøgle\n"
  
- #: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
- #: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
- #: g10/keygen.c:2314 g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1508
++#: g10/keygen.c:1794 g10/keygen.c:1822 g10/keygen.c:1952 g10/keygen.c:2060
++#: g10/keygen.c:2336 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Ugyldigt valg.\n"
  
@@@ -1971,7 -1548,6 +1971,7 @@@ msgstr "Underskriv? (j/N) 
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1816 g10/keyedit.c:1867
++#: g10/card-util.c:1816 g10/keyedit.c:1868
  msgid "quit this menu"
  msgstr "afslut denne menu"
  
@@@ -1979,7 -1554,6 +1979,7 @@@
  msgid "show admin commands"
  msgstr "vis administratorkommandoer"
  
- #: g10/card-util.c:1819 g10/keyedit.c:1870
++#: g10/card-util.c:1819 g10/keyedit.c:1871
  msgid "show this help"
  msgstr "vis denne hjælpetekst"
  
@@@ -2055,31 -1611,21 +2055,31 @@@ msgstr "Administratorkommandoer er till
  msgid "Admin commands are not allowed\n"
  msgstr "Administratorkommandoer er ikke tilladt\n"
  
- #: g10/card-util.c:2127 g10/keyedit.c:2816
++#: g10/card-util.c:2127 g10/keyedit.c:2817
  msgid "Invalid command  (try \"help\")\n"
  msgstr "Ugyldig kommando (prøv »help«)\n"
  
- #: g10/decrypt.c:191 g10/encrypt.c:955
++#: g10/decrypt.c:190 g10/encrypt.c:955
  msgid "--output doesn't work for this command\n"
  msgstr "--output virker ikke for denne kommando\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4904 g10/keyring.c:398 g10/keyring.c:771
  #, fuzzy, c-format
  #| msgid "can't open `%s'\n"
  msgid "can't open '%s'\n"
  msgstr "kan ikke åbne »%s«\n"
  
 +#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
- #: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
- #: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4858 g10/keyedit.c:2051
++#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2163
  #, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "nøglen »%s« blev ikke fundet: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
- #: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
- #: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4866 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:645 g10/tofu.c:2171
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "fejl ved læsning af nøgleblok: %s\n"
@@@ -2140,7 -1674,6 +2140,7 @@@ msgstr "der er en hemmelig nøgle for o
  msgid "use option \"--delete-secret-keys\" to delete it first.\n"
  msgstr "brug tilvalget »--delete-secret-keys« for at slette den først.\n"
  
- #: g10/encrypt.c:232 g10/sign.c:1292
++#: g10/encrypt.c:232 g10/sign.c:1294
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "fejl ved oprettelse af adgangsfrase: %s\n"
@@@ -2160,7 -1690,6 +2160,7 @@@ msgstr "bruger chiffer %s\n
  msgid "'%s' already compressed\n"
  msgstr "»%s« allerede komprimeret\n"
  
- #: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:610
  #, fuzzy, c-format
  #| msgid "WARNING: `%s' is an empty file\n"
  msgid "WARNING: '%s' is an empty file\n"
@@@ -2180,7 -1707,6 +2180,7 @@@ msgstr "
  "ADVARSEL: Tvang for symmetrisk chiffer %s (%d) overtræder modtagerens "
  "præferencer\n"
  
- #: g10/encrypt.c:707 g10/sign.c:984
++#: g10/encrypt.c:707 g10/sign.c:986
  #, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2215,7 -1736,6 +2215,7 @@@ msgstr "%s krypterede data\n
  msgid "encrypted with unknown algorithm %d\n"
  msgstr "krypteret med ukendt algoritme %d\n"
  
- #: g10/decrypt-data.c:164 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:129
  msgid ""
  "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
  msgstr ""
@@@ -2310,8 -1812,6 +2310,8 @@@ msgstr "fjern så meget som muligt fra 
  msgid " - skipped"
  msgstr "%s: udelod: %s\n"
  
- #: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:845 g10/sign.c:1148
++#: g10/export.c:1251 g10/import.c:1543 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:847 g10/sign.c:1150
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
@@@ -2335,8 -1831,6 +2335,8 @@@ msgstr "nøgle %s: nøgle i PGP 2.x-sti
  msgid "WARNING: nothing exported\n"
  msgstr "ADVARSEL: intet blev eksporteret\n"
  
- #: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
- #: g10/plaintext.c:151 g10/plaintext.c:174
++#: g10/export.c:2283 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/plaintext.c:167 g10/plaintext.c:190
  #, fuzzy, c-format
  #| msgid "error creating `%s': %s\n"
  msgid "error creating '%s': %s\n"
@@@ -2386,8 -1871,6 +2386,8 @@@ msgstr "fejl ved indhentelse af »%s« 
  msgid "No fingerprint"
  msgstr "Ingen fingeraftryk"
  
- #: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
- #: g10/revoke.c:701
++#: g10/getkey.c:1873 g10/keyedit.c:2929 g10/keyedit.c:3016 g10/revoke.c:637
++#: g10/revoke.c:702
  #, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "hemmelig nøgle »%s« blev ikke fundet: %s\n"
@@@ -2419,209 -1897,165 +2419,215 @@@ msgstr "Ugyldig nøgle %s gjort gyldig 
  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/gpg.c:424 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:200
  msgid "make a signature"
  msgstr "opret en underskrift"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:427
  msgid "make a clear text signature"
  msgstr "opret en underskrift i klartekst"
  
- #: g10/gpg.c:426 sm/gpgsm.c:202
++#: g10/gpg.c:429 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "opret en separat underskrift"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:430 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "krypter data"
  
- #: g10/gpg.c:429
++#: g10/gpg.c:432
  msgid "encryption only with symmetric cipher"
  msgstr "krypter kun med symmetrisk chiffer"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:434 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "afkrypter data (standard)"
  
- #: g10/gpg.c:433 sm/gpgsm.c:206
++#: g10/gpg.c:436 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "godkend en underskrift"
  
- #: g10/gpg.c:435 sm/gpgsm.c:207
++#: g10/gpg.c:438 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "vis nøgler"
  
- #: g10/gpg.c:437
++#: g10/gpg.c:440
  msgid "list keys and signatures"
  msgstr "vis nøgler og underskrifter"
  
- #: g10/gpg.c:438
++#: g10/gpg.c:443
  msgid "list and check key signatures"
  msgstr "vis og kontroller nøgleunderskrifter"
  
- #: g10/gpg.c:439 sm/gpgsm.c:212
++#: g10/gpg.c:445 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "vis nøgler og fingeraftryk"
  
- #: g10/gpg.c:440 sm/gpgsm.c:210
++#: g10/gpg.c:446 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "vis hemmelige nøgler"
  
- #: g10/gpg.c:442 sm/gpgsm.c:213
++#: g10/gpg.c:448 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "opret et nyt nøglepar"
  
- #: g10/gpg.c:444
++#: g10/gpg.c:451
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly generate a new key pair"
  msgstr "opret et nyt nøglepar"
  
- #: g10/gpg.c:446
++#: g10/gpg.c:454
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly add a new user-id"
  msgstr "opret et nyt nøglepar"
  
- #: g10/gpg.c:449
++#: g10/gpg.c:459
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly revoke a user-id"
  msgstr "opret et nyt nøglepar"
  
- #: g10/gpg.c:451
++#: g10/gpg.c:462
+ #, fuzzy
+ #| msgid "generate a new key pair"
+ msgid "quickly set a new expiration date"
+ msgstr "opret et nyt nøglepar"
+ 
++#: g10/gpg.c:464
  msgid "full featured key pair generation"
  msgstr ""
  
- #: g10/gpg.c:452
++#: g10/gpg.c:467
  msgid "generate a revocation certificate"
  msgstr "opret et tilbagekaldscertifikat"
  
- #: g10/gpg.c:454 sm/gpgsm.c:215
++#: g10/gpg.c:470 sm/gpgsm.c:216
  msgid "remove keys from the public keyring"
  msgstr "fjern nøgler fra den offentlige nøglering"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:472
  msgid "remove keys from the secret keyring"
  msgstr "fjern nøgler fra den hemmelige nøglering"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:474
  #, fuzzy
  #| msgid "sign a key"
  msgid "quickly sign a key"
  msgstr "underskriv en nøgle"
  
- #: g10/gpg.c:460
++#: g10/gpg.c:476
  #, fuzzy
  #| msgid "sign a key locally"
  msgid "quickly sign a key locally"
  msgstr "underskriv en nøgle lokalt"
  
- #: g10/gpg.c:461
++#: g10/gpg.c:477
  msgid "sign a key"
  msgstr "underskriv en nøgle"
  
- #: g10/gpg.c:462
++#: g10/gpg.c:478
  msgid "sign a key locally"
  msgstr "underskriv en nøgle lokalt"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:479
  msgid "sign or edit a key"
  msgstr "underskriv eller rediger en nøgle"
  
- #: g10/gpg.c:465 sm/gpgsm.c:233
++#: g10/gpg.c:481 sm/gpgsm.c:234
  msgid "change a passphrase"
  msgstr "ændr en adgangsfrase"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:485
  msgid "export keys"
  msgstr "eksporter nøgler"
  
- #: g10/gpg.c:468
++#: g10/gpg.c:486
  msgid "export keys to a keyserver"
  msgstr "eksporter nøgler til en nøgletjener"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:487
  msgid "import keys from a keyserver"
  msgstr "importer nøgler fra en nøgleserver"
  
- #: g10/gpg.c:471
++#: g10/gpg.c:490
  msgid "search for keys on a keyserver"
  msgstr "søg efter nøgler på en nøgleserver"
  
- #: g10/gpg.c:473
++#: g10/gpg.c:492
  msgid "update all keys from a keyserver"
  msgstr "opdater alle nøgler fra en nøgleserver"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:498
  msgid "import/merge keys"
  msgstr "importer/sammenføj nøgler"
  
- #: g10/gpg.c:482
++#: g10/gpg.c:501
  msgid "print the card status"
  msgstr "udskriv kortstatus"
  
- #: g10/gpg.c:483
++#: g10/gpg.c:502
  msgid "change data on a card"
  msgstr "ændr data på et kort"
  
- #: g10/gpg.c:484
++#: g10/gpg.c:504
  msgid "change a card's PIN"
  msgstr "ændr et korts PIN"
  
- #: g10/gpg.c:496
++#: g10/gpg.c:516
  msgid "update the trust database"
  msgstr "opdater troværdighedsdatabasen"
  
- #: g10/gpg.c:505
++#: g10/gpg.c:525
  msgid "print message digests"
  msgstr "vis beskedsammendrag"
  
- #: g10/gpg.c:508 sm/gpgsm.c:228
++#: g10/gpg.c:528 sm/gpgsm.c:229
  msgid "run in server mode"
  msgstr "kør i servertilstand"
  
- #: g10/gpg.c:510
++#: g10/gpg.c:530
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:514 sm/gpgsm.c:246
++#: g10/gpg.c:534 sm/gpgsm.c:248
  msgid "create ascii armored output"
  msgstr "opret ascii-pansrede uddata"
  
- #: g10/gpg.c:517 sm/gpgsm.c:262
++#: g10/gpg.c:537 sm/gpgsm.c:264
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|USER-ID|krypter for BRUGER-ID"
  
- #: g10/gpg.c:533 sm/gpgsm.c:298
++#: g10/gpg.c:553 sm/gpgsm.c:300
  msgid "|USER-ID|use USER-ID to sign or decrypt"
  msgstr "|USER-ID|brug BRUGER-ID til at underskrive eller afkryptere"
  
- #: g10/gpg.c:539
++#: g10/gpg.c:559
  msgid "|N|set compress level to N (0 disables)"
  msgstr "|N|sæt komprimeringsniveauet til N (0 deaktiverer)"
  
- #: g10/gpg.c:546
++#: g10/gpg.c:566
  msgid "use canonical text mode"
  msgstr "brug kanonisk teksttilstand"
  
- #: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
++#: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
  msgid "|FILE|write output to FILE"
  msgstr "|FILE|skriv resultat til FIL"
  
- #: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
++#: g10/gpg.c:598 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
  msgid "do not make any changes"
  msgstr "lav ingen ændringer"
  
- #: g10/gpg.c:579
++#: g10/gpg.c:599
  msgid "prompt before overwriting"
  msgstr "spørg før overskrivning"
  
- #: g10/gpg.c:628
++#: g10/gpg.c:648
  msgid "use strict OpenPGP behavior"
  msgstr "brug streng OpenPGP-opførsel"
  
- #: g10/gpg.c:654 sm/gpgsm.c:355
++#: g10/gpg.c:674 sm/gpgsm.c:357
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2629,7 -2063,16 +2635,17 @@@ msgstr "
  "@\n"
  "(Se manualsiden for en fuldstændig liste over alle kommandoer og tilvalg)\n"
  
- #: g10/gpg.c:657 sm/gpgsm.c:358
++#: g10/gpg.c:677
+ #, fuzzy
+ #| msgid ""
+ #| "@\n"
+ #| "Examples:\n"
+ #| "\n"
+ #| " -se -r Bob [file]          sign and encrypt for user Bob\n"
+ #| " --clear-sign [file]         make a clear text signature\n"
+ #| " --detach-sign [file]       make a detached signature\n"
+ #| " --list-keys [names]        show keys\n"
+ #| " --fingerprint [names]      show fingerprints\n"
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2649,14 -2092,12 +2665,14 @@@ msgstr "
  " --list-keys [navne]        vis nøgler\n"
  " --fingerprint [navne]      vis fingeraftryk\n"
  
- #: g10/gpg.c:1026
++#: g10/gpg.c:1047
  #, 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:1029
++#: g10/gpg.c:1050
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg [options] [files]\n"
@@@ -2671,7 -2112,6 +2687,7 @@@ msgstr "
  "Sign, check, encrypt eller decrypt\n"
  "standardhandling afhænger af inddata\n"
  
- #: g10/gpg.c:1040 sm/gpgsm.c:588
++#: g10/gpg.c:1061 sm/gpgsm.c:580
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2679,81 -2119,66 +2695,81 @@@ msgstr "
  "\n"
  "Understøttede algoritmer:\n"
  
- #: g10/gpg.c:1043
++#: g10/gpg.c:1064
  msgid "Pubkey: "
  msgstr "Pubkey: "
  
- #: g10/gpg.c:1050 g10/keyedit.c:3402
++#: g10/gpg.c:1071 g10/keyedit.c:3483
  msgid "Cipher: "
  msgstr "Chiffer: "
  
- #: g10/gpg.c:1057
++#: g10/gpg.c:1078
  msgid "Hash: "
  msgstr "Hash: "
  
- #: g10/gpg.c:1064 g10/keyedit.c:3451
++#: g10/gpg.c:1085 g10/keyedit.c:3532
  msgid "Compression: "
  msgstr "Komprimering: "
  
- #: g10/gpg.c:1133 sm/gpgsm.c:662
++#: g10/gpg.c:1154 sm/gpgsm.c:654
  #, fuzzy, c-format
  #| msgid "usage: gpgsm [options] "
  msgid "usage: %s [options] %s\n"
  msgstr "brug: gpgsm [tilvalg] "
  
- #: g10/gpg.c:1321 sm/gpgsm.c:751
++#: g10/gpg.c:1342 sm/gpgsm.c:743
  msgid "conflicting commands\n"
  msgstr "kommandoer er i konflikt\n"
  
- #: g10/gpg.c:1339
++#: g10/gpg.c:1360
  #, 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:1537
++#: g10/gpg.c:1558
  #, 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:1540
++#: g10/gpg.c:1561
  #, 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:1543
++#: g10/gpg.c:1564
  #, 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:1549
++#: g10/gpg.c:1570
  #, 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:1552
++#: g10/gpg.c:1573
  #, 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:1555
++#: g10/gpg.c:1576
  #, 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:1561
++#: g10/gpg.c:1582
  #, 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:1564
++#: g10/gpg.c:1585
  #, fuzzy, c-format
  #| msgid ""
  #| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2762,19 -2187,16 +2778,19 @@@ msgid "
  msgstr ""
  "ADVARSEL: Usikkert indelukket mappeejerskab på konfigurationsfil »%s«\n"
  
- #: g10/gpg.c:1567
++#: g10/gpg.c:1588
  #, 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:1573
++#: g10/gpg.c:1594
  #, 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:1576
++#: g10/gpg.c:1597
  #, fuzzy, c-format
  #| msgid ""
  #| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2784,517 -2206,360 +2800,457 @@@ msgid "
  msgstr ""
  "ADVARSEL: Usikre indelukkede mapperettigheder på konfigurationsfil »%s«\n"
  
- #: g10/gpg.c:1579
++#: g10/gpg.c:1600
  #, 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:1786
++#: g10/gpg.c:1816
  #, fuzzy, c-format
  #| msgid "unknown configuration item `%s'\n"
  msgid "unknown configuration item '%s'\n"
  msgstr "ukendt konfigurationspunkt »%s«\n"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1925
  msgid "display photo IDs during key listings"
  msgstr "vis billed-id'er under nøglevisninger"
  
- #: g10/gpg.c:1895
++#: g10/gpg.c:1927
  #, 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:1897
++#: g10/gpg.c:1929
  msgid "show policy URLs during signature listings"
  msgstr "vil politikadresser under underskriftvisninger"
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1931
  msgid "show all notations during signature listings"
  msgstr "vis alle notationer under underskriftvisninger"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1933
  msgid "show IETF standard notations during signature listings"
  msgstr "vis IETF-standardnotationer under underskriftvisninger"
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1937
  msgid "show user-supplied notations during signature listings"
  msgstr "vis brugerangivne notationer under underskriftvisninger"
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1939
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "vis foretrukne nøgleserveradresser under underskriftvisninger"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1941
  msgid "show user ID validity during key listings"
  msgstr "vis bruger-id-validitet under nøglevisninger"
  
- #: g10/gpg.c:1911
++#: g10/gpg.c:1943
  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:1913
++#: g10/gpg.c:1945
  msgid "show revoked and expired subkeys in key listings"
  msgstr "vis tilbagekaldte og udløbne undernøgler i nøglevisninger"
  
- #: g10/gpg.c:1915
++#: g10/gpg.c:1947
  msgid "show the keyring name in key listings"
  msgstr "vis nøgleringsnavnet i nøglevisninger"
  
- #: g10/gpg.c:1917
++#: g10/gpg.c:1949
  msgid "show expiration dates during signature listings"
  msgstr "vis udløbsdatoer under underskriftvisninger"
  
- #: g10/gpg.c:2019 g10/gpg.c:2056
++#: g10/gpg.c:2051 g10/gpg.c:2088
  #, 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:2030
++#: g10/gpg.c:2062
  #, fuzzy, c-format
  #| msgid "unknown option `%s'\n"
  msgid "unknown TOFU policy '%s'\n"
  msgstr "ukendt tilvalg »%s«\n"
  
- #: g10/gpg.c:2032 g10/gpg.c:2068
++#: g10/gpg.c:2064 g10/gpg.c:2100
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2066
++#: g10/gpg.c:2098 g10/keygen.c:167
  #, fuzzy, c-format
  #| msgid "missing argument for option \"%.50s\"\n"
  msgid "invalid value for option '%s'\n"
  msgstr "manglende parameter for indstilling »%.50s«\n"
  
- #: g10/gpg.c:2203
++#: g10/gpg.c:2235
  #, fuzzy, c-format
  #| msgid "NOTE: old default options file `%s' ignored\n"
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "BEMÆRK: Gammel standardfil for tilvalg »%s« blev ignoreret\n"
  
- #: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
++#: g10/gpg.c:2839 g10/gpg.c:3610 g10/gpg.c:3622
  #, 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:2978 g10/gpg.c:2990
++#: g10/gpg.c:3011 g10/gpg.c:3023
  #, 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:3012
++#: g10/gpg.c:3045
  #, 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:3044 sm/gpgsm.c:1166
++#: g10/gpg.c:3077 sm/gpgsm.c:1158
  #, 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:3097
++#: g10/gpg.c:3130
  #, 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:3119 g10/gpg.c:3322 g10/keyedit.c:5338
++#: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
  msgid "could not parse keyserver URL\n"
  msgstr "kunne ikke fortolke nøgleserveradresse\n"
  
- #: g10/gpg.c:3137
++#: g10/gpg.c:3170
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: ugyldige indstillinger for nøgleserver\n"
  
- #: g10/gpg.c:3140
++#: g10/gpg.c:3173
  msgid "invalid keyserver options\n"
  msgstr "ugyldige indstillinger for nøgleserver\n"
  
- #: g10/gpg.c:3147
++#: g10/gpg.c:3180
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: ugyldige importindstillinger\n"
  
- #: g10/gpg.c:3150
++#: g10/gpg.c:3183
  msgid "invalid import options\n"
  msgstr "ugyldige importindstillinger\n"
  
- #: g10/gpg.c:3156 g10/gpg.c:3171
++#: g10/gpg.c:3189 g10/gpg.c:3204
  #, fuzzy, c-format
  #| msgid "invalid list options\n"
  msgid "invalid filter option: %s\n"
  msgstr "ugyldige listeindstillinger\n"
  
- #: g10/gpg.c:3162
++#: g10/gpg.c:3195
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: ugyldige eksportindstillinger\n"
  
- #: g10/gpg.c:3165
++#: g10/gpg.c:3198
  msgid "invalid export options\n"
  msgstr "ugyldige eksportindstillinger\n"
  
- #: g10/gpg.c:3177
++#: g10/gpg.c:3210
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: ugyldige listeindstillinger\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3213
  msgid "invalid list options\n"
  msgstr "ugyldige listeindstillinger\n"
  
- #: g10/gpg.c:3188
++#: g10/gpg.c:3221
  msgid "display photo IDs during signature verification"
  msgstr "vis billed-id'er under underskriftverificering"
  
- #: g10/gpg.c:3190
++#: g10/gpg.c:3223
  msgid "show policy URLs during signature verification"
  msgstr "vis politikadresser under underskriftverificering"
  
- #: g10/gpg.c:3192
++#: g10/gpg.c:3225
  msgid "show all notations during signature verification"
  msgstr "vis alle notationer under underskriftverificering"
  
- #: g10/gpg.c:3194
++#: g10/gpg.c:3227
  msgid "show IETF standard notations during signature verification"
  msgstr "vis IETF-standardnotationer under underskriftverificering"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3231
  msgid "show user-supplied notations during signature verification"
  msgstr "vis brugerangivne notationer under underskriftverificering"
  
- #: g10/gpg.c:3200
++#: g10/gpg.c:3233
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "vis foretrukne nøgleserveradresser under underskriftverificering"
  
- #: g10/gpg.c:3202
++#: g10/gpg.c:3235
  msgid "show user ID validity during signature verification"
  msgstr "vis bruger-id-validitet under underskriftverificering"
  
- #: g10/gpg.c:3204
++#: g10/gpg.c:3237
  msgid "show revoked and expired user IDs in signature verification"
  msgstr "vis tilbagekaldte og udløbne bruger-id'er i underskriftverificering"
  
- #: g10/gpg.c:3206
++#: g10/gpg.c:3239
  msgid "show only the primary user ID in signature verification"
  msgstr "vis kun den primære bruger-id i underskriftverificering"
  
- #: g10/gpg.c:3208
++#: g10/gpg.c:3241
  msgid "validate signatures with PKA data"
  msgstr "valider underskrifter med PKA-data"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3243
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr "hæv troværdigheden for underskrifter med gyldige PKA-data"
  
- #: g10/gpg.c:3217
++#: g10/gpg.c:3250
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: ugyldige verificeringsindstillinger\n"
  
- #: g10/gpg.c:3220
++#: g10/gpg.c:3253
  msgid "invalid verify options\n"
  msgstr "ugyldige verificeringsindstillinger\n"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3260
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "kunne ikke angive kørselssti til %s\n"
  
- #: g10/gpg.c:3417
++#: g10/gpg.c:3452
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: ugyldig liste for auto-key-locate\n"
  
- #: g10/gpg.c:3420
++#: g10/gpg.c:3455
  msgid "invalid auto-key-locate list\n"
  msgstr "ugyldig liste for auto-key-locate\n"
  
- #: g10/gpg.c:3553 sm/gpgsm.c:1507
++#: g10/gpg.c:3592 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
  msgstr "ADVARSEL: program kan oprette en kernefil!\n"
  
- #: g10/gpg.c:3564
++#: g10/gpg.c:3603
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "ADVARSEL: %s overskriver %s\n"
  
- #: g10/gpg.c:3573
++#: g10/gpg.c:3612
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s ikke tilladt med %s!\n"
  
- #: g10/gpg.c:3576
++#: g10/gpg.c:3615
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s er meningsløs sammen med %s!\n"
  
- #: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
++#: g10/gpg.c:3630 sm/gpgsm.c:1518 dirmngr/dirmngr.c:951
  msgid "WARNING: running with faked system time: "
  msgstr "ADVARSEL: kører med forfalsket systemtid: "
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3651
  #, 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:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
++#: g10/gpg.c:3686 g10/gpg.c:3710 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "valgt chifferalgoritme er ugyldig\n"
  
- #: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
++#: g10/gpg.c:3692 g10/gpg.c:3716 sm/gpgsm.c:1591 sm/gpgsm.c:1597
  msgid "selected digest algorithm is invalid\n"
  msgstr "valgt sammendragsalgoritme er ugyldig\n"
  
- #: g10/gpg.c:3659
++#: g10/gpg.c:3698
  msgid "selected compression algorithm is invalid\n"
  msgstr "valgt komprimeringsalgoritme er ugyldig\n"
  
- #: g10/gpg.c:3665
++#: g10/gpg.c:3704
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "valgt algoritme for certifikationssammendrag er ugyldig\n"
  
- #: g10/gpg.c:3680
++#: g10/gpg.c:3719
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed skal være større end 0\n"
  
- #: g10/gpg.c:3682
++#: g10/gpg.c:3721
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed skal være større end 1\n"
  
- #: g10/gpg.c:3684
++#: g10/gpg.c:3723
  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:3686
++#: g10/gpg.c:3725
  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:3688
++#: g10/gpg.c:3727
  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:3691
++#: g10/gpg.c:3730
  #, fuzzy
  #| 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:3695
++#: g10/gpg.c:3734
  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:3702
++#: g10/gpg.c:3741
  msgid "invalid default preferences\n"
  msgstr "ugyldige standardpræferencer\n"
  
- #: g10/gpg.c:3706
++#: g10/gpg.c:3745
  msgid "invalid personal cipher preferences\n"
  msgstr "ugyldige præferencer for personlig chiffer\n"
  
- #: g10/gpg.c:3710
++#: g10/gpg.c:3749
  msgid "invalid personal digest preferences\n"
  msgstr "ugyldige præferencer for personlig sammendrag\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3753
  msgid "invalid personal compress preferences\n"
  msgstr "ugyldige præferencer for personlig komprimering\n"
  
- #: g10/gpg.c:3750
++#: g10/gpg.c:3789
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s virker endnu ikke med %s\n"
  
- #: g10/gpg.c:3797
++#: g10/gpg.c:3836
  #, fuzzy, c-format
  #| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr "du må ikke bruge chifferalgoritmen »%s« i tilstanden %s\n"
  
- #: g10/gpg.c:3802
++#: g10/gpg.c:3841
  #, fuzzy, c-format
  #| msgid "you may not use digest algorithm `%s' while in %s mode\n"
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr "du må ikke bruge sammendragsalgoritmen »%s« i tilstanden %s\n"
  
- #: g10/gpg.c:3807
++#: g10/gpg.c:3846
  #, fuzzy, c-format
  #| msgid "you may not use compression algorithm `%s' while in %s mode\n"
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr "du må ikke bruge komprimeringsalgoritmen »%s« i tilstanden %s\n"
  
- #: g10/gpg.c:3906
++#: g10/gpg.c:3945
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "kunne ikke initialisere TrustDB: %s\n"
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:3957
  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:3975
- msgid "--store [filename]"
- msgstr "--store [filnavn]"
- 
- #: g10/gpg.c:3985
- msgid "--symmetric [filename]"
- msgstr "--symmetric [filnavn]"
- 
- #: g10/gpg.c:3989
++#: g10/gpg.c:4028
  #, 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:4000
- msgid "--encrypt [filename]"
- msgstr "--encrypt [filnavn]"
- 
- #: g10/gpg.c:4016
- msgid "--symmetric --encrypt [filename]"
- msgstr "--symmetric --encrypt [filnavn]"
- 
- #: g10/gpg.c:4018
++#: g10/gpg.c:4057
  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:4021
++#: g10/gpg.c:4060
  #, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr "du kan ikke bruge --symmetric --encrypt i tilstanden %s\n"
  
- #: g10/gpg.c:4042
- msgid "--sign [filename]"
- msgstr "--sign [filnavn]"
- 
- #: g10/gpg.c:4058
- msgid "--sign --encrypt [filename]"
- msgstr "--sign --encrypt [filnavn]"
- 
- #: g10/gpg.c:4076
- msgid "--symmetric --sign --encrypt [filename]"
- msgstr "--symmetric --sign --encrypt [filnavn]"
- 
- #: g10/gpg.c:4078
++#: g10/gpg.c:4117
  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:4081
++#: g10/gpg.c:4120
  #, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr "du kan ikke bruge --symmetric --sign --encrypt i tilstanden %s\n"
  
- #: g10/gpg.c:4105
- msgid "--sign --symmetric [filename]"
- msgstr "--sign --symmetric [filnavn]"
- 
- #: g10/gpg.c:4117
- msgid "--clearsign [filename]"
- msgstr "--clearsign [filnavn]"
- 
- #: g10/gpg.c:4147
- msgid "--decrypt [filename]"
- msgstr "--decrypt [filnavn]"
- 
- #: g10/gpg.c:4174
- msgid "--sign-key user-id"
- msgstr "--sign-key bruger-id"
- 
- #: g10/gpg.c:4178
- msgid "--lsign-key user-id"
- msgstr "--lsign-key bruger-id"
- 
- #: g10/gpg.c:4199
- msgid "--edit-key user-id [commands]"
- msgstr "--edit-key bruger-id [kommandoer]"
- 
- #: g10/gpg.c:4215
- msgid "--passwd <user-id>"
- msgstr "--passwd <bruger-id>"
- 
- #: g10/gpg.c:4411 g10/keyserver.c:1837
++#: g10/gpg.c:4462 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "nøgleserver send mislykkedes: %s\n"
  
- #: g10/gpg.c:4416
++#: g10/gpg.c:4467
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "nøgleserver modtag mislykkedes: %s\n"
  
- #: g10/gpg.c:4422
++#: g10/gpg.c:4473
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "nøgleeksport mislykkedes: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4486
  #, 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:4447
++#: g10/gpg.c:4498
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "nøgleserver søg mislykkedes: %s\n"
  
- #: g10/gpg.c:4460
++#: g10/gpg.c:4511
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "nøgleserver opdater mislykkedes: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4578
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "fjernelse af panser mislykkedes: %s\n"
  
- #: g10/gpg.c:4538
++#: g10/gpg.c:4589
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "påklædning af panser mislykkedes: %s\n"
  
- #: g10/gpg.c:4630
++#: g10/gpg.c:4681
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
  msgstr "ugyldig hash-algoritme »%s«\n"
  
- #: g10/gpg.c:4776 g10/tofu.c:2002
++#: g10/gpg.c:4827 g10/tofu.c:2151
  #, 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:4788
++#: g10/gpg.c:4839
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4835
- msgid "[filename]"
- msgstr "[filnavn]"
- 
- #: g10/gpg.c:4841
++#: g10/gpg.c:4894
  msgid "Go ahead and type your message ...\n"
  msgstr "Gå til sagen og skriv meddelelsen ...\n"
  
- #: g10/gpg.c:5179
++#: g10/gpg.c:5232
  msgid "the given certification policy URL is invalid\n"
  msgstr "den angivne adresse for certifikatpolitik er ugyldig\n"
  
- #: g10/gpg.c:5181
++#: g10/gpg.c:5234
  msgid "the given signature policy URL is invalid\n"
  msgstr "den angivne adresse for underskriftpolitik er ugyldig\n"
  
- #: g10/gpg.c:5214
++#: g10/gpg.c:5267
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "den angivne adresse for foretrukken nøgleserver er ugyldig\n"
  
@@@ -3306,7 -2569,6 +3262,7 @@@ msgstr "|FILE|tag nøglerne fra nøgler
  msgid "make timestamp conflicts only a warning"
  msgstr "giv kun tidsstempelkonflikter en advarsel"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:345
++#: g10/gpgv.c:82 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|skriv statusinformation til denne FD"
  
@@@ -3336,138 -2593,110 +3292,138 @@@ msgstr "Ingen hjælp tilgængelig
  msgid "No help available for '%s'"
  msgstr "Ingen hjælp tilgængelig for »%s«"
  
- #: g10/import.c:151
++#: g10/import.c:152
  msgid "import signatures that are marked as local-only"
  msgstr "importer underskrifter som er markeret som local-only"
  
- #: g10/import.c:154
++#: g10/import.c:155
  msgid "repair damage from the pks keyserver during import"
  msgstr "reparer skade fra pks-nøgleserveren under import"
  
- #: g10/import.c:157
++#: g10/import.c:158
  #, fuzzy
  #| msgid "do not update the trustdb after import"
  msgid "do not clear the ownertrust values during import"
  msgstr "opdater ikke trustdb efter import"
  
- #: g10/import.c:160
++#: g10/import.c:161
  msgid "do not update the trustdb after import"
  msgstr "opdater ikke trustdb efter import"
  
- #: g10/import.c:163
++#: g10/import.c:164
  #, fuzzy
  #| msgid "show key fingerprint"
  msgid "show key during import"
  msgstr "vis nøglefingeraftryk"
  
- #: g10/import.c:166
++#: g10/import.c:167
  msgid "only accept updates to existing keys"
  msgstr "accepter kun opdateringer til eksisterende nøgler"
  
- #: g10/import.c:169
++#: g10/import.c:170
  msgid "remove unusable parts from key after import"
  msgstr "fjern ubrugelige dele fra nøgle efter import"
  
- #: g10/import.c:172
++#: g10/import.c:173
  msgid "remove as much as possible from key after import"
  msgstr "fjern så meget som muligt fra nøgle efter import"
  
- #: g10/import.c:175
++#: g10/import.c:176
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:326 g10/import.c:568
++#: g10/import.c:327 g10/import.c:569
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "     udelader bloktype %d\n"
  
- #: g10/import.c:585
++#: g10/import.c:586
  #, c-format
  msgid "%lu keys processed so far\n"
  msgstr "     %lu-nøgler behandlet\n"
  
- #: g10/import.c:655
++#: g10/import.c:656
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr " Totalt antal behandl.: %lu\n"
  
- #: g10/import.c:658
++#: g10/import.c:659
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "   udeladte nye nøgler: %lu\n"
  
- #: g10/import.c:660
++#: g10/import.c:661
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "   udeladte nye nøgler: %lu\n"
  
- #: g10/import.c:663
++#: g10/import.c:664
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "      w/o bruger-id'er: %lu\n"
  
- #: g10/import.c:666 sm/import.c:130
++#: g10/import.c:667 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "           importerede: %lu"
  
- #: g10/import.c:670 sm/import.c:134
++#: g10/import.c:671 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "              uændrede: %lu\n"
  
- #: g10/import.c:672
++#: g10/import.c:673
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "       nye bruger-id'er: %lu\n"
  
- #: g10/import.c:674
++#: g10/import.c:675
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "       nye undernøgler: %lu\n"
  
- #: g10/import.c:676
++#: g10/import.c:677
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "     nye underskrifter: %lu\n"
  
- #: g10/import.c:678
++#: g10/import.c:679
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "  nye nøgletilbagekald: %lu\n"
  
- #: g10/import.c:680 sm/import.c:136
++#: g10/import.c:681 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr " hemmelige nøgler læst: %lu\n"
  
- #: g10/import.c:682 sm/import.c:138
++#: g10/import.c:683 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr " hemmel. nøgler import: %lu\n"
  
- #: g10/import.c:684 sm/import.c:140
++#: g10/import.c:685 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr "hemmel. nøgler uændret: %lu\n"
  
- #: g10/import.c:686 sm/import.c:142
++#: g10/import.c:687 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "      ikke importerede: %lu\n"
  
- #: g10/import.c:688
++#: g10/import.c:689
  #, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "  underskrifter ryddet: %lu\n"
  
- #: g10/import.c:690
++#: g10/import.c:691
  #, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "   bruger-id'er ryddet: %lu\n"
  
- #: g10/import.c:1034
++#: g10/import.c:1035
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
@@@ -3476,194 -2705,156 +3432,194 @@@ msgstr "
  "ADVARSEL: nøgle %s indeholder præferencer for utilgængelige\n"
  "algoritmer på disse bruger-id'er:\n"
  
- #: g10/import.c:1076
++#: g10/import.c:1077
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr "        »%s«: præference for chifferalgoritme %s\n"
  
- #: g10/import.c:1091
++#: g10/import.c:1092
  #, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "        »%s«: præference for sammendragsalgortime %s\n"
  
- #: g10/import.c:1103
++#: g10/import.c:1104
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr "        »%s«: præference for komprimeringsalgortime %s\n"
  
- #: g10/import.c:1116
++#: g10/import.c:1117
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr "det anbefales på det stærkeste, at du opdaterer dine præferencer og\n"
  
- #: g10/import.c:1118
++#: g10/import.c:1119
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  "gendistribuerer denne nøgle for at undgå potentielle problemer med rod i\n"
  "algoritmen\n"
  
- #: g10/import.c:1143
++#: g10/import.c:1144
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr "du kan opdatere dine præferencer med: gpg --edit-key %s updpref save\n"
  
- #: g10/import.c:1379 g10/import.c:2167
++#: g10/import.c:1380 g10/import.c:2168
  #, c-format
  msgid "key %s: no user ID\n"
  msgstr "nøgle %s: ingen bruger-id\n"
  
- #: g10/import.c:1385
++#: g10/import.c:1386
  #, fuzzy, c-format
  #| msgid "skipped \"%s\": %s\n"
  msgid "key %s: %s\n"
  msgstr "udelod »%s«: %s\n"
  
- #: g10/import.c:1386 g10/import.c:2141
++#: g10/import.c:1387 g10/import.c:2142
  msgid "rejected by import screener"
  msgstr ""
  
- #: g10/import.c:1416
++#: g10/import.c:1417
  #, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "nøgle %s: korruption af PKS-undernøgle er repareret!\n"
  
- #: g10/import.c:1434
++#: g10/import.c:1435
  #, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "nøgle %s: accepteret ikke egenunderskrevet bruger-id »%s«\n"
  
- #: g10/import.c:1444 g10/import.c:1475
++#: g10/import.c:1445 g10/import.c:1476
  #, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "nøgle %s: ingen gyldige bruger-id'er\n"
  
- #: g10/import.c:1446
++#: g10/import.c:1447
  msgid "this may be caused by a missing self-signature\n"
  msgstr "dette kan skyldes en manglende egenunderskrift\n"
  
- #: g10/import.c:1516 g10/import.c:2318
++#: g10/import.c:1517 g10/import.c:2319
  #, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "nøgle %s: offentlig nøgle blev ikke fundet: %s\n"
  
- #: g10/import.c:1522
++#: g10/import.c:1523
  #, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "nøgle %s: ny nøgle - udeladt\n"
  
- #: g10/import.c:1537
++#: g10/import.c:1538
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "ingen skrivbar nøglering fundet: %s\n"
  
- #: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
++#: g10/import.c:1547 g10/import.c:1648 g10/import.c:2385
  #, fuzzy, c-format
  #| msgid "error writing keyring `%s': %s\n"
  msgid "error writing keyring '%s': %s\n"
  msgstr "fejl ved skrivning af nøglering »%s«: %s\n"
  
- #: g10/import.c:1566
++#: g10/import.c:1567
  #, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "nøgle %s: offentlig nøgle »%s« importeret\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1591
  #, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "nøgle %s: stemmer ikke med vores kopi\n"
  
- #: g10/import.c:1606 g10/import.c:2342
++#: g10/import.c:1607 g10/import.c:2343
  #, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "nøgle %s: kan ikke lokalisere original nøgleblok: %s\n"
  
- #: g10/import.c:1614 g10/import.c:2349
++#: g10/import.c:1615 g10/import.c:2350
  #, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "nøgle %s: kan ikke læse original nøgleblok: %s\n"
  
- #: g10/import.c:1657
++#: g10/import.c:1658
  #, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "nøgle %s: »%s« 1 ny bruger-id\n"
  
- #: g10/import.c:1660
++#: g10/import.c:1661
  #, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "nøgle %s: »%s« %d nye bruger-id'er\n"
  
- #: g10/import.c:1663
++#: g10/import.c:1664
  #, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "nøgle %s: »%s« 1 ny underskrift\n"
  
- #: g10/import.c:1666
++#: g10/import.c:1667
  #, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "nøgle %s: »%s« %d nye underskrifter\n"
  
- #: g10/import.c:1669
++#: g10/import.c:1670
  #, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "nøgle %s: »%s« 1 ny undernøgle\n"
  
- #: g10/import.c:1672
++#: g10/import.c:1673
  #, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "nøgle %s: »%s« %d nye undernøgler\n"
  
- #: g10/import.c:1675
++#: g10/import.c:1676
  #, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "nøgle %s: »%s« %d underskrift renset\n"
  
- #: g10/import.c:1678
++#: g10/import.c:1679
  #, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "nøgle %s: »%s« %d underskrifter renset\n"
  
- #: g10/import.c:1681
++#: g10/import.c:1682
  #, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "nøgle %s: »%s« %d bruger-id renset\n"
  
- #: g10/import.c:1684
++#: g10/import.c:1685
  #, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "nøgle %s: »%s« %d bruger-id'er renset\n"
  
- #: g10/import.c:1707
++#: g10/import.c:1708
  #, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "nøgle %s: »%s« ikke ændret\n"
  
- #: g10/import.c:2019 g10/import.c:2264
++#: g10/import.c:2020 g10/import.c:2265
  #, c-format
  msgid "key %s: secret key imported\n"
  msgstr "nøgle %s: hemmelig nøgle importeret\n"
  
- #: g10/import.c:2027
++#: g10/import.c:2028
  #, fuzzy, c-format
  #| msgid "skipped: secret key already present\n"
  msgid "key %s: secret key already exists\n"
  msgstr "udelod: hemmelig nøgle er allerede til stede\n"
  
- #: g10/import.c:2035
++#: g10/import.c:2036
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "key %s: error sending to agent: %s\n"
  msgstr "fejl under afsendelse af %s-kommando: %s\n"
  
- #: g10/import.c:2140
++#: g10/import.c:2141
  #, fuzzy, c-format
  #| msgid "secret key \"%s\" not found: %s\n"
  msgid "secret key %s: %s\n"
  msgstr "hemmelig nøgle »%s« blev ikke fundet: %s\n"
  
- #: g10/import.c:2160 g10/import.c:2195
++#: g10/import.c:2161 g10/import.c:2196
  msgid "importing secret keys not allowed\n"
  msgstr "import af hemmelige nøgler er ikke tilladt\n"
  
- #: g10/import.c:2184
++#: g10/import.c:2185
  #, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr "nøgle %s: hemmelig nøgle med ugyldig chiffer %d - udeladt\n"
@@@ -3678,142 -2869,115 +3634,142 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2256
++#: g10/import.c:2257
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2311
++#: g10/import.c:2312
  #, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
  "nøgle %s: ingen offentlig nøgle - kan ikke anvende tilbagekaldscertifikat\n"
  
- #: g10/import.c:2360
++#: g10/import.c:2361
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "nøgle %s: ugyldigt tilbagekaldscertifikat: %s - afvist\n"
  
- #: g10/import.c:2393
++#: g10/import.c:2394
  #, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "nøgle %s: »%s« tilbagekaldscertifikat importeret\n"
  
- #: g10/import.c:2469
++#: g10/import.c:2470
  #, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "nøgle %s: ingen bruger-id for underskrift\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2487
  #, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr ""
  "nøgle %s: ikke understøttet offentlig nøglealgoritme på bruger-id »%s«\n"
  
- #: g10/import.c:2488
++#: g10/import.c:2489
  #, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "nøgle %s: ugyldig egenunderskrift på bruger-id »%s«\n"
  
- #: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
++#: g10/import.c:2506 g10/import.c:2532 g10/import.c:2583
  #, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "nøgle %s: ikke understøttet offentlig nøglealgoritme\n"
  
- #: g10/import.c:2506
++#: g10/import.c:2507
  #, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "nøgle %s: ugyldig direkte nøgleunderskrift\n"
  
- #: g10/import.c:2520
++#: g10/import.c:2521
  #, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "nøgle %s: ingen undernøgle for nøglebinding\n"
  
- #: g10/import.c:2533
++#: g10/import.c:2534
  #, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "nøgle %s: ugyldig undernøglebinding\n"
  
- #: g10/import.c:2549
++#: g10/import.c:2550
  #, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "nøgle %s: fjernet flerundernøglebinding\n"
  
- #: g10/import.c:2571
++#: g10/import.c:2572
  #, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "nøgle %s: ingen undernøgle for nøgletilbagekald\n"
  
- #: g10/import.c:2584
++#: g10/import.c:2585
  #, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "nøgle %s: ugyldig undernøgletilbagekald\n"
  
- #: g10/import.c:2599
++#: g10/import.c:2600
  #, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "nøgle %s: fjernet flerundernøgletilbagekald\n"
  
- #: g10/import.c:2641
++#: g10/import.c:2642
  #, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "nøgle %s: udeladt bruger-id »%s«\n"
  
- #: g10/import.c:2665
++#: g10/import.c:2666
  #, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "nøgle %s: udeladt undernøgle\n"
  
- #: g10/import.c:2694
++#: g10/import.c:2695
  #, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr ""
  "nøgle %s: underskrift der ikke kan eksporteres (klasse 0x%02X) - udeladt\n"
  
- #: g10/import.c:2705
++#: g10/import.c:2706
  #, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "nøgle %s: tilbagekaldscertifikat på forkert sted - udeladt\n"
  
- #: g10/import.c:2723
++#: g10/import.c:2724
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "nøgle %s: ugyldigt tilbagekaldscertifikat: %s - udeladt\n"
  
- #: g10/import.c:2737
++#: g10/import.c:2738
  #, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "nøgle %s: undernøgleunderskrift på forkert sted - udeladt\n"
  
- #: g10/import.c:2745
++#: g10/import.c:2746
  #, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "nøgle %s: uventet underskriftklasse (0x%02X) - udeladt\n"
  
- #: g10/import.c:2887
++#: g10/import.c:2888
  #, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "nøgle %s: duplikeret bruger-id detekteret - sammenføjet\n"
  
- #: g10/import.c:2951
++#: g10/import.c:2952
  #, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr "ADVARSEL: nøgle %s kan tilbagekaldes: henter tilbagekaldsnøgle %s\n"
  
- #: g10/import.c:2967
++#: g10/import.c:2968
  #, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr ""
  "ADVARSEL: nøgle %s kan tilbagekaldes: tilbagekaldsnøgle %s er ikke til "
  "stede.\n"
  
- #: g10/import.c:3031
++#: g10/import.c:3032
  #, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "nøgle %s: »%s« tilbagekaldscertifikat tilføjet\n"
  
- #: g10/import.c:3069
++#: g10/import.c:3070
  #, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "nøgle %s: direkte nøgleunderskrift tilføjet\n"
@@@ -3854,52 -3012,42 +3810,52 @@@ msgstr "nøgleblokressource »%s«: %s\
  msgid "error opening key DB: %s\n"
  msgstr "fejl ved åbning af »%s«: %s\n"
  
- #: g10/keydb.c:1782
++#: g10/keydb.c:1786
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "kunne ikke genbygge nøgleringsmellemlager: %s\n"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[revocation]"
  msgstr "[tilbagekald]"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[self-signature]"
  msgstr "[egenunderskrift]"
  
- #: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
++#: g10/keyedit.c:433 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: dirmngr/ldap-wrapper.c:694
  #, fuzzy, c-format
  #| msgid "error allocating enough memory: %s\n"
  msgid "error allocating memory: %s\n"
  msgstr "fejl ved allokering af nok hukommelse: %s\n"
  
- #: g10/keyedit.c:629
++#: g10/keyedit.c:630
  #, fuzzy, c-format
  #| msgid "key %s: unsupported public key algorithm\n"
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr "nøgle %s: ikke understøttet offentlig nøglealgoritme\n"
  
- #: g10/keyedit.c:638
++#: g10/keyedit.c:639
  #, fuzzy, c-format
  #| msgid "card does not support digest algorithm %s\n"
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "kort understøtter ikke sammendragsalgoritme %s\n"
  
- #: g10/keyedit.c:800
++#: g10/keyedit.c:801
  #, fuzzy
  #| msgid "Good signature from"
  msgid " (reordered signatures follow)"
  msgstr "God underskrift fra"
  
- #: g10/keyedit.c:913
++#: g10/keyedit.c:914
  #, fuzzy, c-format
  #| msgid "skipped \"%s\": %s\n"
  msgid "key %s:\n"
  msgstr "udelod »%s«: %s\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:917
  #, fuzzy, c-format
  #| msgid "User ID \"%s\": %d signature removed\n"
  msgid "%d duplicate signature removed\n"
@@@ -3907,7 -3055,6 +3863,7 @@@ msgid_plural "%d duplicate signatures r
  msgstr[0] "Bruger-id »%s«: %d underskrift fjernet\n"
  msgstr[1] "Bruger-id »%s«: %d underskrift fjernet\n"
  
- #: g10/keyedit.c:919 g10/keylist.c:480
++#: g10/keyedit.c:920 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
@@@ -3915,7 -3062,6 +3871,7 @@@ msgid_plural "%d signatures not checke
  msgstr[0] "1 underskrift er ikke kontrolleret på grund af en manglende nøgle\n"
  msgstr[1] "1 underskrift er ikke kontrolleret på grund af en manglende nøgle\n"
  
- #: g10/keyedit.c:923 g10/keylist.c:476
++#: g10/keyedit.c:924 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
@@@ -3923,7 -3069,6 +3879,7 @@@ msgid_plural "%d bad signatures\n
  msgstr[0] "%d ugyldige underskrifter\n"
  msgstr[1] "%d ugyldige underskrifter\n"
  
- #: g10/keyedit.c:927
++#: g10/keyedit.c:928
  #, fuzzy, c-format
  #| msgid "Good signature from"
  msgid "%d signature reordered\n"
@@@ -3931,14 -3076,12 +3887,14 @@@ msgid_plural "%d signatures reordered\n
  msgstr[0] "God underskrift fra"
  msgstr[1] "God underskrift fra"
  
- #: g10/keyedit.c:932
++#: g10/keyedit.c:933
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:992 g10/pkclist.c:274
++#: g10/keyedit.c:993 g10/pkclist.c:274
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
  "keys\n"
@@@ -3949,17 -3092,14 +3905,17 @@@ msgstr "
  "andre brugers nøgler\n"
  "(ved at kigge på pas, kontrollere fingeraftryk fra andre kilder etc.)\n"
  
- #: g10/keyedit.c:996 g10/pkclist.c:286
++#: g10/keyedit.c:997 g10/pkclist.c:286
  #, c-format
  msgid "  %d = I trust marginally\n"
  msgstr "  %d = Marginal troværdighed\n"
  
- #: g10/keyedit.c:997 g10/pkclist.c:288
++#: g10/keyedit.c:998 g10/pkclist.c:288
  #, c-format
  msgid "  %d = I trust fully\n"
  msgstr "  %d = Fuld troværdighed\n"
  
- #: g10/keyedit.c:1015
++#: g10/keyedit.c:1016
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
@@@ -3969,52 -3109,40 +3925,52 @@@ msgstr "
  "En dybde større end 1 giver nøglen du underskriver mulighed for\n"
  "at lavet troværdighedsunderskrifter på dine vegne.\n"
  
- #: g10/keyedit.c:1032
++#: g10/keyedit.c:1033
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  "Indtast venligst et domæne for at begrænse denne underskrift, eller retur "
  "for ingen.\n"
  
- #: g10/keyedit.c:1160
++#: g10/keyedit.c:1161
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1168
++#: g10/keyedit.c:1169
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "Bruger-id »%s« er tilbagekaldt."
  
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
- #: g10/keyedit.c:2246
++#: g10/keyedit.c:1178 g10/keyedit.c:1206 g10/keyedit.c:1233 g10/keyedit.c:1417
++#: g10/keyedit.c:2247
  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:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
- #: g10/keyedit.c:2251 g10/keyedit.c:3177
++#: g10/keyedit.c:1192 g10/keyedit.c:1220 g10/keyedit.c:1247 g10/keyedit.c:1423
++#: g10/keyedit.c:2252 g10/keyedit.c:3178
  msgid "  Unable to sign.\n"
  msgstr "  Kunne ikke underskrive.\n"
  
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1197
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "Bruger-id »%s« er udløbet."
  
- #: g10/keyedit.c:1224
++#: g10/keyedit.c:1225
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "Bruger-id »%s« er ikke egenunderskrevet."
  
- #: g10/keyedit.c:1253
++#: g10/keyedit.c:1254
  #, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "Bruger-id »%s« kan underskrives.  "
  
- #: g10/keyedit.c:1255
++#: g10/keyedit.c:1256
  msgid "Sign it? (y/N) "
  msgstr "Underskriv? (j/N) "
  
- #: g10/keyedit.c:1282
++#: g10/keyedit.c:1283
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -4023,11 -3151,9 +3979,11 @@@ msgstr "
  "Egenunderskriften på »%s«\n"
  "er en underskrift i PGP 2.x-stil.\n"
  
- #: g10/keyedit.c:1291
++#: g10/keyedit.c:1292
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr "Ønsker du at forfremme den til en OpenPGP-egenunderskrift? (j/N) "
  
- #: g10/keyedit.c:1304
++#: g10/keyedit.c:1305
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -4036,12 -3162,10 +3992,12 @@@ msgstr "
  "Din aktuelle underskrift på »%s«\n"
  "er udløbet.\n"
  
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:1310
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr ""
  "Ønsker du at udstede en ny underskrift for at erstatte den udløbne? (j/N) "
  
- #: g10/keyedit.c:1330
++#: g10/keyedit.c:1331
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -4050,45 -3174,36 +4006,45 @@@ msgstr "
  "Din aktuelle underskrift på »%s«\n"
  "er en lokal underskrift.\n"
  
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:1336
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr ""
  "Ønsker du at forfremme den til en fuld underskrift, der kan eksporteres (j/"
  "N) "
  
- #: g10/keyedit.c:1355
++#: g10/keyedit.c:1356
  #, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "»%s« var allerede underskrevet lokalt af nøgle %s\n"
  
- #: g10/keyedit.c:1359
++#: g10/keyedit.c:1360
  #, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "»%s« var allerede underskrevet af nøgle %s\n"
  
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:1365
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "Ønsker du at underskrive den igen alligevel? (j/N) "
  
- #: g10/keyedit.c:1386
++#: g10/keyedit.c:1387
  #, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "Intet at underskrive med nøgle %s\n"
  
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1411
  msgid "This key has expired!"
  msgstr "Denne nøgle er udløbet!"
  
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1429
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "Denne nøgle er ved at udløbe på %s.\n"
  
- #: g10/keyedit.c:1434
++#: g10/keyedit.c:1435
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr "Ønsker du at dine underskrifter skal udløbe på samme tidspunkt? (J/n) "
  
- #: g10/keyedit.c:1475
++#: g10/keyedit.c:1476
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -4099,33 -3214,27 +4055,33 @@@ msgstr "
  "faktisk tilhører personen navngivet ovenfor? Hvis du ikke kender svaret, så "
  "indtast »0«.\n"
  
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1481
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) Jeg vil ikke svare.%s\n"
  
- #: g10/keyedit.c:1482
++#: g10/keyedit.c:1483
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) Jeg har ingen kontrol udført.%s\n"
  
- #: g10/keyedit.c:1484
++#: g10/keyedit.c:1485
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) Jeg har udført en overfladisk kontrol.%s\n"
  
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:1488
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) Jeg har foretaget en meget omhyggelig kontrol.%s\n"
  
- #: g10/keyedit.c:1494
++#: g10/keyedit.c:1495
  #, fuzzy
  #| msgid "Your selection? (enter `?' for more information): "
  msgid "Your selection? (enter '?' for more information): "
  msgstr "Dit valg? (indtast »?« for yderligere information): "
  
- #: g10/keyedit.c:1521
++#: g10/keyedit.c:1522
  #, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -4134,233 -3243,179 +4090,233 @@@ msgstr "
  "Er du sikker på, at du ønsker at underskrive denne nøgle\n"
  "med din nøgle »%s« (%s)\n"
  
- #: g10/keyedit.c:1529
++#: g10/keyedit.c:1530
  msgid "This will be a self-signature.\n"
  msgstr "Dette vil være en egenunderskrift.\n"
  
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:1535
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr ""
  "ADVARSEL: Underskriften vil ikke blive markeret som ikke at kunne "
  "eksporteres.\n"
  
- #: g10/keyedit.c:1541
++#: g10/keyedit.c:1542
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr ""
  "ADVARSEL: Underskriften vil ikke blive markereret som ikke at kunne "
  "tilbagekaldes.\n"
  
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1552
  msgid "The signature will be marked as non-exportable.\n"
  msgstr "Underskriften vil blive markeret som ikke at kunne eksporteres.\n"
  
- #: g10/keyedit.c:1558
++#: g10/keyedit.c:1559
  msgid "The signature will be marked as non-revocable.\n"
  msgstr "Underskriften vil blive markeret som ikke at kunne tilbagekaldes.\n"
  
- #: g10/keyedit.c:1565
++#: g10/keyedit.c:1566
  msgid "I have not checked this key at all.\n"
  msgstr "Jeg har overhovedet ikke kontrolleret denne nøgle.\n"
  
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:1571
  msgid "I have checked this key casually.\n"
  msgstr "Jeg har overfladisk kontrolleret denne nøgle.\n"
  
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:1576
  msgid "I have checked this key very carefully.\n"
  msgstr "Jeg har omhyggeligt kontrolleret denne nøgle.\n"
  
- #: g10/keyedit.c:1587
++#: g10/keyedit.c:1588
  msgid "Really sign? (y/N) "
  msgstr "Underskriv? (j/N) "
  
- #: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
- #: g10/keyedit.c:6463 g10/sign.c:323
++#: g10/keyedit.c:1639 g10/keyedit.c:6308 g10/keyedit.c:6391 g10/keyedit.c:6500
++#: g10/keyedit.c:6562 g10/sign.c:325
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "underskrift mislykkedes: %s\n"
  
- #: g10/keyedit.c:1725
++#: g10/keyedit.c:1726
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  "Nøgle har kun stump eller ikkekort nøgleposter - ingen adgangsfrase at "
  "ændre.\n"
  
- #: g10/keyedit.c:1755
++#: g10/keyedit.c:1756
  #, fuzzy, c-format
  #| msgid "error creating passphrase: %s\n"
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "fejl ved oprettelse af adgangsfrase: %s\n"
  
- #: g10/keyedit.c:1869
++#: g10/keyedit.c:1870
  msgid "save and quit"
  msgstr "gem og afslut"
  
- #: g10/keyedit.c:1872
++#: g10/keyedit.c:1873
  msgid "show key fingerprint"
  msgstr "vis nøglefingeraftryk"
  
  # key grip
  # chiefly  ( US ) See also grip the person in charge of moving and setting up camera
  # tracks and scenery in a film or television studio
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1874
  #, fuzzy
  #| msgid "Enter the keygrip: "
  msgid "show the keygrip"
  msgstr "Indtst nøglegrebet: "
  
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1875
  msgid "list key and user IDs"
  msgstr "vis nøgle og bruger-id'er"
  
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1877
  msgid "select user ID N"
  msgstr "vælg bruger-id N"
  
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1878
  msgid "select subkey N"
  msgstr "vælg undernøgle N"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1879
  msgid "check signatures"
  msgstr "kontroller underskrifter"
  
- #: g10/keyedit.c:1884
++#: g10/keyedit.c:1885
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr ""
  "underskriv valgte bruger-id'er [* se nedenfor for relaterede kommandoer]"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1890
  msgid "sign selected user IDs locally"
  msgstr "underskriv valgte bruger-id'er lokalt"
  
- #: g10/keyedit.c:1890
++#: g10/keyedit.c:1891
  msgid "sign selected user IDs with a trust signature"
  msgstr "underskriv valgte bruger-id'er med en troværdighedsunderskrift"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1893
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr "underskriv bruger-id'er md en underskrift der ikke kan kaldes tilbage"
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1895
  msgid "add a user ID"
  msgstr "tilføj bruger-id"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1897
  msgid "add a photo ID"
  msgstr "tilføj billed-id"
  
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1898
  msgid "delete selected user IDs"
  msgstr "slet valgte bruger-id'er"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1901
  msgid "add a subkey"
  msgstr "tilføj en undernøgle"
  
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1904
  msgid "add a key to a smartcard"
  msgstr "tilføj en nøgle til et smartkort"
  
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1906
  msgid "move a key to a smartcard"
  msgstr "flyt en nøgle til et smartkort"
  
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1908
  msgid "move a backup key to a smartcard"
  msgstr "flyt en sikkerhedskopinøgle til et smartkort"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1910
  msgid "delete selected subkeys"
  msgstr "slet valgte undernøgler"
  
- #: g10/keyedit.c:1911
++#: g10/keyedit.c:1912
  msgid "add a revocation key"
  msgstr "tilføj en tilbagekaldsnøgle"
  
- #: g10/keyedit.c:1913
++#: g10/keyedit.c:1914
  msgid "delete signatures from the selected user IDs"
  msgstr "slet underskrifter fra de valgte bruger-id'er"
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1916
  msgid "change the expiration date for the key or selected subkeys"
  msgstr "ændr udløbsdatoen for nøglen eller valgte undernøgler"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1918
  msgid "flag the selected user ID as primary"
  msgstr "marker den valgte bruger-id som primær"
  
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1921
  msgid "list preferences (expert)"
  msgstr "vis præferencer (ekspert)"
  
- #: g10/keyedit.c:1921
++#: g10/keyedit.c:1922
  msgid "list preferences (verbose)"
  msgstr "vis præferencer (uddybende)"
  
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:1924
  msgid "set preference list for the selected user IDs"
  msgstr "angiv præferenceliste for de valgte bruger-id'er"
  
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1927
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr "angiv den foretrukne nøgleserveradresse for de valgte bruger-id'er"
  
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1929
  msgid "set a notation for the selected user IDs"
  msgstr "angiv en notation for de valgte bruger-id'er"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1931
  msgid "change the passphrase"
  msgstr "ændr adgangsfrasen"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1934
  msgid "change the ownertrust"
  msgstr "ændr ejertroværdigheden"
  
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1937
  msgid "revoke signatures on the selected user IDs"
  msgstr "tilbagekald underskrifter på de valgte bruger-id'er"
  
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1939
  msgid "revoke selected user IDs"
  msgstr "tilbagekald valgte bruger-id'er"
  
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1942
  msgid "revoke key or selected subkeys"
  msgstr "tilbagekald nøgle eller valgte undernøgler"
  
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1944
  msgid "enable key"
  msgstr "aktiver nøgle"
  
- #: g10/keyedit.c:1944
++#: g10/keyedit.c:1945
  msgid "disable key"
  msgstr "deaktiver nøgle"
  
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1947
  msgid "show selected photo IDs"
  msgstr "vis valgte billed-id'er"
  
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1949
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  "komprimer ubrugelige bruger-id'er og fjern ubrugelige underskrifter fra nøgle"
  
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:1951
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  "komprimer ubrugelige bruger-id'er og fjern alle underskrifter fra nøgle"
  
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2063
  msgid "Secret key is available.\n"
  msgstr "Hemmelig nøgle er tilgængelig.\n"
  
- #: g10/keyedit.c:2162
++#: g10/keyedit.c:2163
  msgid "Need the secret key to do this.\n"
  msgstr "Har brug for den hemmelige nøgle for dette.\n"
  
- #: g10/keyedit.c:2183
++#: g10/keyedit.c:2184
  #, fuzzy
  #| msgid ""
  #| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4381,269 -3436,215 +4337,275 @@@ msgstr "
  "tnrsign\n"
  "  etc.).\n"
  
- #: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
++#: g10/keyedit.c:2240 g10/keyedit.c:3178 g10/keyedit.c:3317 g10/keyedit.c:3379
  msgid "Key is revoked."
  msgstr "Nøglen er tilbagekaldt."
  
- #: g10/keyedit.c:2262
++#: g10/keyedit.c:2263
  msgid "Really sign all user IDs? (y/N) "
  msgstr "Vil du gerne underskrive alle bruger-id'er (j/N) "
  
- #: g10/keyedit.c:2266
++#: g10/keyedit.c:2267
  #, fuzzy
  #| msgid "Really sign all user IDs? (y/N) "
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "Vil du gerne underskrive alle bruger-id'er (j/N) "
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2275
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Fif: Vælg bruger-id'erne at underskrive\n"
  
- #: g10/keyedit.c:2285
++#: g10/keyedit.c:2286
  #, fuzzy, c-format
  #| msgid "Unknown signature type `%s'\n"
  msgid "Unknown signature type '%s'\n"
  msgstr "Ukendt underskrifttype »%s«\n"
  
- #: g10/keyedit.c:2309
++#: g10/keyedit.c:2310
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
  msgstr "Denne kommando er ikke tilladt i tilstanden %s.\n"
  
- #: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
++#: g10/keyedit.c:2332 g10/keyedit.c:2356 g10/keyedit.c:2550
  msgid "You must select at least one user ID.\n"
  msgstr "Du skal vælge mindst en bruger-id.\n"
  
- #: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
++#: g10/keyedit.c:2334 g10/keyedit.c:2358 g10/keyedit.c:2512 g10/keyedit.c:2552
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2336
++#: g10/keyedit.c:2337
  msgid "You can't delete the last user ID!\n"
  msgstr "Du kan ikke slette den sidste bruger-id!\n"
  
- #: g10/keyedit.c:2339
++#: g10/keyedit.c:2340
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "Vil du virkelig fjerne alle valgte bruger-id'er? (j/N) "
  
- #: g10/keyedit.c:2340
++#: g10/keyedit.c:2341
  msgid "Really remove this user ID? (y/N) "
  msgstr "Vil du virkelig fjerne denne bruger-id? (j/N) "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2397
++#: g10/keyedit.c:2398
  msgid "Really move the primary key? (y/N) "
  msgstr "Vil du virkelig flytte den primære nøgle? (j/N) "
  
- #: g10/keyedit.c:2409 g10/keyedit.c:4866
++#: g10/keyedit.c:2410 g10/keyedit.c:4964
  msgid "You must select exactly one key.\n"
  msgstr "Du skal vælge præcis en nøgle.\n"
  
- #: g10/keyedit.c:2436
++#: g10/keyedit.c:2437
  msgid "Command expects a filename argument\n"
  msgstr "Kommando forventer en filnavnsparameter\n"
  
- #: g10/keyedit.c:2457
++#: g10/keyedit.c:2458
  #, fuzzy, c-format
  #| msgid "Can't open `%s': %s\n"
  msgid "Can't open '%s': %s\n"
  msgstr "Kan ikke åbne »%s«: %s\n"
  
- #: g10/keyedit.c:2474
++#: g10/keyedit.c:2475
  #, fuzzy, c-format
  #| msgid "Error reading backup key from `%s': %s\n"
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "Fejl ved læsning af sikkerhedskopinøgle fra »%s«: %s\n"
  
- #: g10/keyedit.c:2509
++#: g10/keyedit.c:2510
  msgid "You must select at least one key.\n"
  msgstr "Du skal vælge mindst en nøgle.\n"
  
- #: g10/keyedit.c:2515
++#: g10/keyedit.c:2516
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "Vil du virkelig slette de valgte nøgler? (j/N) "
  
- #: g10/keyedit.c:2517
++#: g10/keyedit.c:2518
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "Vil du virkelig slette denne nøgle? (j/N) "
  
- #: g10/keyedit.c:2555
++#: g10/keyedit.c:2556
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr "Vil du virkelig tilbagekalde alle valgte bruger-id'er? (j/N) "
  
- #: g10/keyedit.c:2556
++#: g10/keyedit.c:2557
  msgid "Really revoke this user ID? (y/N) "
  msgstr "Vil du virkelig tilbagekalde dette bruger-id? (j/N) "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2575
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "Vil du virkelig tilbagekalde hele nøglen? (j/N) "
  
- #: g10/keyedit.c:2585
++#: g10/keyedit.c:2586
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "Vil du virkelig tilbagekalde de valgte undernøgler? (j/N) "
  
- #: g10/keyedit.c:2587
++#: g10/keyedit.c:2588
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "Vil du virkelig tilbagekalde denne undernøgle? (j/N) "
  
- #: g10/keyedit.c:2645
++#: g10/keyedit.c:2646
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  "Ejertroværdighed kan ikke indstilles, når der bruges en brugerleveret "
  "troværdighedsdatabase\n"
  
- #: g10/keyedit.c:2690
++#: g10/keyedit.c:2691
  msgid "Set preference list to:\n"
  msgstr "Angiv præferenceliste til:\n"
  
- #: g10/keyedit.c:2697
++#: g10/keyedit.c:2698
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr "Opdater præferencerne for de valgte bruger-id'er (j/N) "
  
- #: g10/keyedit.c:2699
++#: g10/keyedit.c:2700
  msgid "Really update the preferences? (y/N) "
  msgstr "Opdater præferencerne? (j/N) "
  
- #: g10/keyedit.c:2773
++#: g10/keyedit.c:2774
  msgid "Save changes? (y/N) "
  msgstr "Gem ændringer? (j/N) "
  
- #: g10/keyedit.c:2777
++#: g10/keyedit.c:2778
  msgid "Quit without saving? (y/N) "
  msgstr "Afslut uden at gemme? (j/N) "
  
- #: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
- #: g10/keyedit.c:3267 g10/keyedit.c:3332
++#: g10/keyedit.c:2789 g10/keyedit.c:2799 g10/keyedit.c:2943 g10/keyedit.c:3046
++#: g10/keyedit.c:3268 g10/keyedit.c:3333 g10/keyedit.c:3409
  #, c-format
  msgid "update failed: %s\n"
  msgstr "opdatering mislykkedes: %s\n"
  
- #: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
++#: g10/keyedit.c:2805 g10/keyedit.c:3273 g10/keyedit.c:3338 g10/keyedit.c:3416
  msgid "Key not changed so no update needed.\n"
  msgstr "Nøgle ikke ændret så ingen opdatering krævet.\n"
  
- #: g10/keyedit.c:3038
++#: g10/keyedit.c:3039
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
  msgstr "Nøgleoprettelse mislykkedes: %s\n"
  
- #: g10/keyedit.c:3083
++#: g10/keyedit.c:3084
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "ugyldig fingeraftryk"
  
- #: g10/keyedit.c:3112
++#: g10/keyedit.c:3113
  #, 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:3248 g10/keyedit.c:3251
++#: g10/keyedit.c:3249 g10/keyedit.c:3252
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
  msgstr "ugyldig værdi\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  #, fuzzy
  #| msgid "No such user ID.\n"
  msgid "No matching user IDs."
  msgstr "Ingen sådan bruger-id.\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  #, 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:3427
++#: g10/keyedit.c:3388
+ #, 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:3508
  msgid "Digest: "
  msgstr "Sammendrag: "
  
- #: g10/keyedit.c:3484
++#: g10/keyedit.c:3565
  msgid "Features: "
  msgstr "Funktioner: "
  
- #: g10/keyedit.c:3495
++#: g10/keyedit.c:3576
  msgid "Keyserver no-modify"
  msgstr "Nøgleserver no-modify"
  
- #: g10/keyedit.c:3510 g10/keylist.c:377
++#: g10/keyedit.c:3591 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr "Fortrukken nøgleserver: "
  
- #: g10/keyedit.c:3518 g10/keyedit.c:3519
++#: g10/keyedit.c:3599 g10/keyedit.c:3600
  msgid "Notations: "
  msgstr "Notationer: "
  
- #: g10/keyedit.c:3764
++#: g10/keyedit.c:3845
  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:3836
++#: g10/keyedit.c:3917
  #, 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:3860
++#: g10/keyedit.c:3941
  #, 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:3866
++#: g10/keyedit.c:3947
  msgid "(sensitive)"
  msgstr "(sensitiv)"
  
- #: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3989 g10/keyedit.c:4131 g10/keylist.c:262 g10/keyserver.c:538
  #, c-format
  msgid "created: %s"
  msgstr "oprettet: %s"
  
- #: g10/keyedit.c:3911 g10/keylist.c:1852
++#: g10/keyedit.c:3992 g10/keylist.c:1852
  #, c-format
  msgid "revoked: %s"
  msgstr "tilbagekaldt: %s"
  
- #: g10/keyedit.c:3913 g10/keylist.c:1858
++#: g10/keyedit.c:3994 g10/keylist.c:1858
  #, c-format
  msgid "expired: %s"
  msgstr "udløbet: %s"
  
- #: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyedit.c:3996 g10/keyedit.c:4133 g10/keylist.c:264 g10/keylist.c:1864
 +#: g10/keyserver.c:544
  #, c-format
  msgid "expires: %s"
  msgstr "udløber: %s"
  
- #: g10/keyedit.c:3917
++#: g10/keyedit.c:3998
  #, c-format
  msgid "usage: %s"
  msgstr "brug: %s"
  
- #: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
++#: g10/keyedit.c:4006 g10/keyedit.c:4026 g10/keylist.c:267
  msgid "card-no: "
  msgstr "kortnr.: "
  
- #: g10/keyedit.c:3984
++#: g10/keyedit.c:4065
  #, c-format
  msgid "trust: %s"
  msgstr "troværdighed: %s"
  
- #: g10/keyedit.c:3988
++#: g10/keyedit.c:4069
  #, c-format
  msgid "validity: %s"
  msgstr "validitet: %s"
  
- #: g10/keyedit.c:3995
++#: g10/keyedit.c:4076
  msgid "This key has been disabled"
  msgstr "Denne nøgle er blevet deaktiveret"
  
- #: g10/keyedit.c:4013
++#: g10/keyedit.c:4094
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4651,18 -3652,12 +4613,18 @@@ msgstr "
  "Bemærk venligst at den viste nøglevaliditet ikke nødvendigvis er\n"
  "korrekt med mindre du genstarter programmet.\n"
  
- #: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
- #: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: g10/keyedit.c:4150 g10/keyedit.c:4581 g10/keyserver.c:548
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:712
 +#: dirmngr/ocsp.c:703
  msgid "revoked"
  msgstr "tilbagekaldt"
  
- #: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
- #: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4152 g10/keyedit.c:4583 g10/keyserver.c:552
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:714
  msgid "expired"
  msgstr "udløbet"
  
- #: g10/keyedit.c:4188
++#: g10/keyedit.c:4269
  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"
@@@ -4670,17 -3665,14 +4632,17 @@@ 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:4240
++#: g10/keyedit.c:4321
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr ""
  
- #: g10/keyedit.c:4241
++#: g10/keyedit.c:4322
  #, fuzzy
  #| 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:4300
++#: g10/keyedit.c:4381
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4690,35 -3682,27 +4652,35 @@@ msgstr "
  "medføre at\n"
  "          nogle version af PGP afviser denne nøgle.\n"
  
- #: g10/keyedit.c:4305 g10/keyedit.c:4595
++#: g10/keyedit.c:4386 g10/keyedit.c:4676
  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:4311
++#: g10/keyedit.c:4392
  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:4326 g10/keygen.c:2697
++#: g10/keyedit.c:4407 g10/keygen.c:2719
  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:4428
++#: g10/keyedit.c:4509
  msgid "Delete this good signature? (y/N/q)"
  msgstr "Slet denne gode underskrift? (j/N/a)"
  
- #: g10/keyedit.c:4438
++#: g10/keyedit.c:4519
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "Slet denne ugyldige underskrift? (j/N/a)"
  
- #: g10/keyedit.c:4442
++#: g10/keyedit.c:4523
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "Slet denne ukendte underskrift? (j/n/a)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4530
  msgid "Really delete this self-signature? (y/N)"
  msgstr "Virkelig slette denne egenunderskrift? (j/N)"
  
- #: g10/keyedit.c:4465
++#: g10/keyedit.c:4546
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
@@@ -4726,20 -3710,16 +4688,20 @@@ msgid_plural "Deleted %d signatures.\n
  msgstr[0] "Slettede %d underskrift.\n"
  msgstr[1] "Slettede %d underskrift.\n"
  
- #: g10/keyedit.c:4469
++#: g10/keyedit.c:4550
  msgid "Nothing deleted.\n"
  msgstr "Intet slettet.\n"
  
- #: g10/keyedit.c:4504 g10/trust.c:693
++#: g10/keyedit.c:4585 g10/trust.c:716
  msgid "invalid"
  msgstr "ugyldig"
  
- #: g10/keyedit.c:4506
++#: g10/keyedit.c:4587
  #, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "Bruger-id »%s« komprimeret: %s\n"
  
- #: g10/keyedit.c:4512
++#: g10/keyedit.c:4593
  #, fuzzy, c-format
  #| msgid "User ID \"%s\": %d signature removed\n"
  msgid "User ID \"%s\": %d signature removed\n"
@@@ -4747,17 -3727,14 +4709,17 @@@ msgid_plural "User ID \"%s\": %d signat
  msgstr[0] "Bruger-id »%s«: %d underskrift fjernet\n"
  msgstr[1] "Bruger-id »%s«: %d underskrift fjernet\n"
  
- #: g10/keyedit.c:4520
++#: g10/keyedit.c:4601
  #, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "Bruger-id »%s«: allerede minimeret\n"
  
- #: g10/keyedit.c:4521
++#: g10/keyedit.c:4602
  #, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "Bruger-id »%s«: allerede ryddet\n"
  
- #: g10/keyedit.c:4590
++#: g10/keyedit.c:4671
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4767,41 -3744,33 +4729,41 @@@ msgstr "
  "tilbagekalder\n"
  "          kan medføre at nogle versioner af PGP afviser denne nøgle.\n"
  
- #: g10/keyedit.c:4601
++#: g10/keyedit.c:4682
  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:4618
++#: g10/keyedit.c:4699
  msgid "Enter the user ID of the designated revoker: "
  msgstr "Indtast bruger'id for den dedikerede tilbagekalder: "
  
- #: g10/keyedit.c:4643
++#: g10/keyedit.c:4724
  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:4658
++#: g10/keyedit.c:4739
  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:4680
++#: g10/keyedit.c:4761
  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:4698
++#: g10/keyedit.c:4779
  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:4704
++#: g10/keyedit.c:4785
  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:4755
++#: g10/keyedit.c:4848
  #, fuzzy
  #| msgid ""
  #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4812,234 -3781,183 +4774,234 @@@ msgstr "
  "Er du sikker på, at du ønsker at udpege denne nøgle som en dedikeret "
  "tilbagekalder? (j/N) "
  
- #: g10/keyedit.c:4760
++#: g10/keyedit.c:4853
  msgid "Changing expiration time for a subkey.\n"
  msgstr "Ændrer udløbstidspunkt for en undernøgle.\n"
  
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:4856
  msgid "Changing expiration time for the primary key.\n"
  msgstr "Ændrer udløbstidspunkt for den primære nøgle.\n"
  
- #: g10/keyedit.c:4814
++#: g10/keyedit.c:4910
  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:4987
++#: g10/keyedit.c:5085
  #, c-format
  msgid "signing subkey %s is already cross-certified\n"
  msgstr "underskriftsundernøgle %s er allerede krydscertificeret\n"
  
- #: g10/keyedit.c:4993
++#: g10/keyedit.c:5091
  #, 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:5108
++#: g10/keyedit.c:5206
  msgid "Please select exactly one user ID.\n"
  msgstr "Vælg venligst præcis en bruger-id.\n"
  
- #: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
++#: g10/keyedit.c:5247 g10/keyedit.c:5361 g10/keyedit.c:5474 g10/keyedit.c:5611
  #, c-format
  msgid "skipping v3 self-signature on user ID \"%s\"\n"
  msgstr "udelader v3 egenunderskrift på bruger-id »%s«\n"
  
- #: g10/keyedit.c:5320
++#: g10/keyedit.c:5418
  msgid "Enter your preferred keyserver URL: "
  msgstr "Indtast din foretrukne nøglerserveradresse: "
  
- #: g10/keyedit.c:5399
++#: g10/keyedit.c:5497
  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:5400
++#: g10/keyedit.c:5498
  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:5459
++#: g10/keyedit.c:5557
  msgid "Enter the notation: "
  msgstr "Indtast notationen: "
  
- #: g10/keyedit.c:5606
++#: g10/keyedit.c:5704
  msgid "Proceed? (y/N) "
  msgstr "Fortsæt? (j/N) "
  
- #: g10/keyedit.c:5676
++#: g10/keyedit.c:5774
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "Ingen bruger-id med indeks %d\n"
  
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5836
  #, c-format
  msgid "No user ID with hash %s\n"
  msgstr "Ingen bruger-id med hash %s\n"
  
- #: g10/keyedit.c:5839
++#: g10/keyedit.c:5937
  #, 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:5861
++#: g10/keyedit.c:5959
  #, c-format
  msgid "No subkey with index %d\n"
  msgstr "Ingen undernøgle med indeks %d\n"
  
- #: g10/keyedit.c:6002
++#: g10/keyedit.c:6100
  #, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "bruger-id: »%s«\n"
  
- #: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
++#: g10/keyedit.c:6103 g10/keyedit.c:6205 g10/keyedit.c:6253
  #, 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:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
++#: g10/keyedit.c:6105 g10/keyedit.c:6207 g10/keyedit.c:6255
  msgid " (non-exportable)"
  msgstr " (kan ikke eksporteres)"
  
- #: g10/keyedit.c:6011
++#: g10/keyedit.c:6109
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "Denne underskrift udløb den %s.\n"
  
- #: g10/keyedit.c:6016
++#: g10/keyedit.c:6114
  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:6021
++#: g10/keyedit.c:6119
  msgid "Create a revocation certificate for this signature? (y/N) "
  msgstr "Opret et tilbagekaldscertifikat for denne underskrift? (j/N) "
  
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6173
  msgid "Not signed by you.\n"
  msgstr "Ikke underskrevet af dig.\n"
  
- #: g10/keyedit.c:6081
++#: g10/keyedit.c:6179
  #, 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:6110
++#: g10/keyedit.c:6208
  msgid " (non-revocable)"
  msgstr " (kan ikke tilbagekaldes)"
  
- #: g10/keyedit.c:6117
++#: g10/keyedit.c:6215
  #, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "tilbagekaldt af din nøgle %s på %s\n"
  
- #: g10/keyedit.c:6142
++#: g10/keyedit.c:6240
  msgid "You are about to revoke these signatures:\n"
  msgstr "Du er i gang med at tilbagekalde disse underskrifter:\n"
  
- #: g10/keyedit.c:6165
++#: g10/keyedit.c:6263
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "Opret tilbagekaldscertifikaterne? (j/N) "
  
- #: g10/keyedit.c:6198
++#: g10/keyedit.c:6296
  msgid "no secret key\n"
  msgstr "ingen hemmelig nøgle\n"
  
- #: g10/keyedit.c:6246
++#: g10/keyedit.c:6344
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6256
++#: g10/keyedit.c:6354
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "bruger-id »%s« er allerede tilbagekaldt\n"
  
- #: g10/keyedit.c:6273
++#: g10/keyedit.c:6371
  #, 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:6386
++#: g10/keyedit.c:6485
  #, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "Nøgle %s er allerede tilbagekaldt.\n"
  
- #: g10/keyedit.c:6448
++#: g10/keyedit.c:6547
  #, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "Undernøgle %s er allerede tilbagekaldt.\n"
  
- #: g10/keyedit.c:6545
++#: g10/keyedit.c:6644
  #, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr "Viser %s billed'id med størrelse %ld for nøgle %s (uid %d)\n"
  
- #: g10/keygen.c:305
++#: g10/keygen.c:316
  #, fuzzy, c-format
  #| msgid "preference `%s' duplicated\n"
  msgid "preference '%s' duplicated\n"
  msgstr "præference »%s« duplikeret\n"
  
- #: g10/keygen.c:312
++#: g10/keygen.c:323
  msgid "too many cipher preferences\n"
  msgstr "for mange chifferpræferencer\n"
  
- #: g10/keygen.c:314
++#: g10/keygen.c:325
  msgid "too many digest preferences\n"
  msgstr "for mange sammendragpræferencer\n"
  
- #: g10/keygen.c:316
++#: g10/keygen.c:327
  msgid "too many compression preferences\n"
  msgstr "for mange komprimeringspræferencer\n"
  
- #: g10/keygen.c:457
++#: g10/keygen.c:468
  #, fuzzy, c-format
  #| msgid "invalid item `%s' in preference string\n"
  msgid "invalid item '%s' in preference string\n"
  msgstr "ugyldigt punkt »%s« i præferencestreng\n"
  
- #: g10/keygen.c:936
++#: g10/keygen.c:947
  msgid "writing direct signature\n"
  msgstr "skriver direkte underskrift\n"
  
- #: g10/keygen.c:982
++#: g10/keygen.c:993
  msgid "writing self signature\n"
  msgstr "skriver egenunderskrift\n"
  
- #: g10/keygen.c:1038
++#: g10/keygen.c:1049
  msgid "writing key binding signature\n"
  msgstr "skriver underskrift for nøglebinding\n"
  
- #: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
- #: g10/keygen.c:1610 g10/keygen.c:1615
++#: g10/keygen.c:1413 g10/keygen.c:1418 g10/keygen.c:1470 g10/keygen.c:1475
++#: g10/keygen.c:1622 g10/keygen.c:1627
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "nøglestørrelse er ugyldig; bruger %u bit\n"
  
- #: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
++#: g10/keygen.c:1424 g10/keygen.c:1481 g10/keygen.c:1489 g10/keygen.c:1633
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "nøglestørrelse afrundet op til %u bit\n"
  
- #: g10/keygen.c:1503
++#: g10/keygen.c:1515
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  "ADVARSEL: Nogle OpenPGP-programmer kan ikke håndtere en DS-nøgle med denne\n"
  "sammendragsstørrelse\n"
  
- #: g10/keygen.c:1677
++#: g10/keygen.c:1689
  msgid "Sign"
  msgstr "Underskriv"
  
- #: g10/keygen.c:1680
++#: g10/keygen.c:1692
  msgid "Certify"
  msgstr "Certificer"
  
- #: g10/keygen.c:1683
++#: g10/keygen.c:1695
  msgid "Encrypt"
  msgstr "Krypter"
  
- #: g10/keygen.c:1686
++#: g10/keygen.c:1698
  msgid "Authenticate"
  msgstr "Godkend"
  
@@@ -5053,108 -3971,87 +5015,108 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1705
++#: g10/keygen.c:1717
  msgid "SsEeAaQq"
  msgstr "UuKkGfAa"
  
- #: g10/keygen.c:1732
++#: g10/keygen.c:1744
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "Mulige handligner for en %s-nøgle: "
  
- #: g10/keygen.c:1738
++#: g10/keygen.c:1750
  msgid "Current allowed actions: "
  msgstr "Aktuelt tilladte handlinger: "
  
- #: g10/keygen.c:1743
++#: g10/keygen.c:1755
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) Skift evnen til at underskrive\n"
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) Skift evnen til at kryptere\n"
  
- #: g10/keygen.c:1749
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) Skift evnen til at godkende\n"
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) Afsluttet\n"
  
- #: g10/keygen.c:1881 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1893 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Vælg venligst hvilken slags nøgle du vil have:\n"
  
- #: g10/keygen.c:1885
++#: g10/keygen.c:1897
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) RSA og RSA (standard)\n"
  
- #: g10/keygen.c:1889
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA og Elgamal\n"
  
- #: g10/keygen.c:1892
++#: g10/keygen.c:1904
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (kun underskriv)\n"
  
- #: g10/keygen.c:1894
++#: g10/keygen.c:1906
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (kun underskriv)\n"
  
- #: g10/keygen.c:1900
++#: g10/keygen.c:1912
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) Elgamal (kun krypter)\n"
  
- #: g10/keygen.c:1902
++#: g10/keygen.c:1914
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (kun krypter)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1920
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (angiv dine egne evner)\n"
  
- #: g10/keygen.c:1910
++#: g10/keygen.c:1922
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (angiv dine egne evner)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1928
  #, fuzzy, c-format
  #| msgid "   (%d) DSA and Elgamal\n"
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA og Elgamal\n"
  
- #: g10/keygen.c:1918
++#: g10/keygen.c:1930
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (kun underskriv)\n"
  
- #: g10/keygen.c:1920
++#: g10/keygen.c:1932
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (set your own capabilities)\n"
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) DSA (angiv dine egne evner)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1934
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) RSA (kun krypter)\n"
  
- #: g10/keygen.c:1926
++#: g10/keygen.c:1938
  #, fuzzy, c-format
  #| msgid "   (%d) Existing key\n"
  msgid "  (%d) Existing key\n"
@@@ -5163,51 -4060,41 +5125,51 @@@ msgstr "   (%d) Eksisterende nøgle\n
  # key grip
  # chiefly  ( US ) See also grip the person in charge of moving and setting up camera
  # tracks and scenery in a film or television studio
- #: g10/keygen.c:2022 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:206
  msgid "Enter the keygrip: "
  msgstr "Indtst nøglegrebet: "
  
- #: g10/keygen.c:2035 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2047 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr "Ikke et gyldigt nøglegreb (forventer 40 hex cifre)\n"
  
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2049 sm/certreqgen-ui.c:216
  msgid "No key with this keygrip\n"
  msgstr "Ingen nøgle med dette nøglegreb\n"
  
- #: g10/keygen.c:2111 g10/keygen.c:2125
++#: g10/keygen.c:2133 g10/keygen.c:2147
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
  msgstr "afrundet op til %u bit\n"
  
- #: g10/keygen.c:2166
++#: g10/keygen.c:2188
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr "%s nøgler kan være mellem %u og %u bit lange.\n"
  
- #: g10/keygen.c:2174
++#: g10/keygen.c:2196
  #, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Hvilken nøglestørrelse ønsker du for undernøglen? (%u) "
  
- #: g10/keygen.c:2177 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2199 sm/certreqgen-ui.c:183
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Hvilken nøglestørrelse ønsker du? (%u) "
  
- #: g10/keygen.c:2191 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2213 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Ønsket nøglestørrelse er %u bit\n"
  
- #: g10/keygen.c:2237
++#: g10/keygen.c:2259
  #, fuzzy
  #| msgid "Please select what kind of key you want:\n"
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Vælg venligst hvilken slags nøgle du vil have:\n"
  
- #: g10/keygen.c:2409
++#: g10/keygen.c:2431
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5223,7 -4110,6 +5185,7 @@@ msgstr "
  "      <n>m = nøgle udløber om n måneder\n"
  "      <n>y = nøgle udløber om n år\n"
  
- #: g10/keygen.c:2420
++#: g10/keygen.c:2442
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5239,38 -4125,30 +5201,38 @@@ msgstr "
  "      <n>m = underskriften udløber om n måneder\n"
  "      <n>y = underskriften udløber om n år\n"
  
- #: g10/keygen.c:2443
++#: g10/keygen.c:2465
  msgid "Key is valid for? (0) "
  msgstr "Nøgle er gyldig for? (0) "
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2470
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Underskrift er gyldig for? (%s) "
  
- #: g10/keygen.c:2461 g10/keygen.c:2486
++#: g10/keygen.c:2483 g10/keygen.c:2508
  msgid "invalid value\n"
  msgstr "ugyldig værdi\n"
  
- #: g10/keygen.c:2468
++#: g10/keygen.c:2490
  msgid "Key does not expire at all\n"
  msgstr "Nøglen udløber aldrig\n"
  
- #: g10/keygen.c:2469
++#: g10/keygen.c:2491
  msgid "Signature does not expire at all\n"
  msgstr "Underskriften udløber aldrig\n"
  
- #: g10/keygen.c:2474
++#: g10/keygen.c:2496
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "Nøglen udløber den %s\n"
  
- #: g10/keygen.c:2475
++#: g10/keygen.c:2497
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "Underskriften udløber den %s\n"
  
- #: g10/keygen.c:2479
++#: g10/keygen.c:2501
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5278,11 -4156,9 +5240,11 @@@ msgstr "
  "Dit system kan ikke vise datoer efter 2038.\n"
  "Det vil dog blive korrekt håndteret op til 2106.\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2514
  msgid "Is this correct? (y/N) "
  msgstr "Er dette korrekt? (j/N) "
  
- #: g10/keygen.c:2560
++#: g10/keygen.c:2582
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5296,7 -4172,6 +5258,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2575
++#: g10/keygen.c:2597
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -5312,50 -4187,39 +5274,50 @@@ msgstr "
  "    »Heinrich Heine (digteren) <heinrichh at duesseldorf.de>«\n"
  "\n"
  
- #: g10/keygen.c:2594
++#: g10/keygen.c:2616
  msgid "Real name: "
  msgstr "Fødselsnavn: "
  
- #: g10/keygen.c:2603
++#: g10/keygen.c:2625
  msgid "Invalid character in name\n"
  msgstr "Ugyldige bogstaver i navn\n"
  
- #: g10/keygen.c:2604
++#: g10/keygen.c:2626
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2608
++#: g10/keygen.c:2630
  msgid "Name may not start with a digit\n"
  msgstr "Navn må ikke starte med et tal\n"
  
- #: g10/keygen.c:2611
++#: g10/keygen.c:2633
  msgid "Name must be at least 5 characters long\n"
  msgstr "Navn skal være mindst 5 bogstaver langt\n"
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2643
  msgid "Email address: "
  msgstr "E-post-adresse: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2649
  msgid "Not a valid email address\n"
  msgstr "Ikke en gyldig e-post-adresse\n"
  
- #: g10/keygen.c:2636
++#: g10/keygen.c:2658
  msgid "Comment: "
  msgstr "Kommentar: "
  
- #: g10/keygen.c:2642
++#: g10/keygen.c:2664
  msgid "Invalid character in comment\n"
  msgstr "Ugyldigt tegn i kommentar\n"
  
- #: g10/keygen.c:2678
++#: g10/keygen.c:2700
  #, fuzzy, c-format
  #| msgid "You are using the `%s' character set.\n"
  msgid "You are using the '%s' character set.\n"
  msgstr "Du bruger tegnsættet »%s«.\n"
  
- #: g10/keygen.c:2684
++#: g10/keygen.c:2706
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5366,7 -4230,6 +5328,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2689
++#: g10/keygen.c:2711
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr "Placer ikke e-post-adressen i fødselsnavnet eller kommentaren\n"
  
@@@ -5381,35 -4244,28 +5343,35 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2714
++#: g10/keygen.c:2736
  msgid "NnCcEeOoQq"
  msgstr "NnCcEeOoQq"
  
- #: g10/keygen.c:2724
++#: g10/keygen.c:2746
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "Ændr (N)avn, (K)ommentar, (E)-post eller afslut(Q)? "
  
- #: g10/keygen.c:2725
++#: g10/keygen.c:2747
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr "Ændr (N)avn, (K)ommentar, (E)post eller (O)kay/afslut(Q)? "
  
- #: g10/keygen.c:2730
++#: g10/keygen.c:2752
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "Ændr (N)avn, (K)ommentar, (E)-post eller afslut(Q)? "
  
- #: g10/keygen.c:2731
++#: g10/keygen.c:2753
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "Ændr (N)avn, (K)ommentar, (E)post eller (O)kay/afslut(Q)? "
  
- #: g10/keygen.c:2750
++#: g10/keygen.c:2772
  msgid "Please correct the error first\n"
  msgstr "Ret venligst fejlen først\n"
  
- #: g10/keygen.c:2796
++#: g10/keygen.c:2818
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5421,13 -4277,10 +5383,13 @@@ msgstr "
  "under oprettelse af primtallet; dette giver det vilkårlig\n"
  "taloprettelsesprogram en bedre mulighed for at opnå nok entropi.\n"
  
- #: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
- #: g10/keygen.c:4777 g10/keygen.c:4882
++#: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
++#: g10/keygen.c:4330 g10/keygen.c:4803 g10/keygen.c:5064 g10/keygen.c:5169
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Nøgleoprettelse mislykkedes: %s\n"
  
- #: g10/keygen.c:3598
++#: g10/keygen.c:3922
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5435,71 -4288,58 +5397,71 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3924
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3621
++#: g10/keygen.c:3945
  #, fuzzy, c-format
  #| msgid "key already exists\n"
  msgid "A key for \"%s\" already exists\n"
  msgstr "nøgle findes allerede\n"
  
- #: g10/keygen.c:3626
++#: g10/keygen.c:3950
  #, fuzzy
  #| msgid "Use this key anyway? (y/N) "
  msgid "Create anyway? (y/N) "
  msgstr "Brug denne nøgle alligevel? (j/N) "
  
- #: g10/keygen.c:3632
++#: g10/keygen.c:3956
  #, fuzzy
  #| msgid "generating new key\n"
  msgid "creating anyway\n"
  msgstr "opretter ny nøgle\n"
  
- #: g10/keygen.c:3981
++#: g10/keygen.c:4315
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:4013
++#: g10/keygen.c:4358
  msgid "Key generation canceled.\n"
  msgstr "Nøgleoprettelse annulleret.\n"
  
- #: g10/keygen.c:4073
++#: g10/keygen.c:4418
  #, fuzzy, c-format
  #| msgid "can't create backup file `%s': %s\n"
  msgid "can't create backup file '%s': %s\n"
  msgstr "kan ikke oprette sikkerhedskopifil »%s«: %s\n"
  
- #: g10/keygen.c:4093
++#: g10/keygen.c:4438
  #, fuzzy, c-format
  #| msgid "NOTE: backup of card key saved to `%s'\n"
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "BEMÆRK: sikkerhedskopi af kortnøgle gemt på »%s«\n"
  
- #: g10/keygen.c:4244 g10/keygen.c:4393
++#: g10/keygen.c:4589 g10/keygen.c:4738
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
  msgstr "skriver offentlig nøgle til »%s«\n"
  
- #: g10/keygen.c:4387
++#: g10/keygen.c:4732
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "ingen skrivbar offentlig nøglering fundet: %s\n"
  
- #: g10/keygen.c:4401
++#: g10/keygen.c:4746
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error writing public keyring '%s': %s\n"
  msgstr "fejl ved skrivning af offentlig nøglering »%s«: %s\n"
  
- #: g10/keygen.c:4433
++#: g10/keygen.c:4778
  msgid "public and secret key created and signed.\n"
  msgstr "offentlig og hemmelig nøgle oprettet og underskrevet.\n"
  
- #: g10/keygen.c:4445
++#: g10/keygen.c:4790
  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"
@@@ -5507,7 -4347,6 +5469,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:4649 g10/keygen.c:4833
++#: g10/keygen.c:4936 g10/keygen.c:5120
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5515,7 -4354,6 +5477,7 @@@ msgstr "
  "nøgle er blevet oprettet %lu sekund i fremtiden (tidsforskydning eller "
  "urproblem)\n"
  
- #: g10/keygen.c:4651 g10/keygen.c:4835
++#: g10/keygen.c:4938 g10/keygen.c:5122
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5523,22 -4361,18 +5485,22 @@@ msgstr "
  "nøgle er blevet oprettet %lu sekunder i fremtiden (tidsforskydning eller "
  "urproblem)\n"
  
- #: g10/keygen.c:4662 g10/keygen.c:4846
++#: g10/keygen.c:4949 g10/keygen.c:5133
  #, fuzzy
  #| 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:4674 g10/keygen.c:4676
++#: g10/keygen.c:4961 g10/keygen.c:4963
  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:4683 g10/keygen.c:4685
++#: g10/keygen.c:4970 g10/keygen.c:4972
  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:4704 g10/keygen.c:4860
++#: g10/keygen.c:4991 g10/keygen.c:5147
  msgid "Really create? (y/N) "
  msgstr "Vil du virkelig oprette? (j/N) "
  
@@@ -5862,128 -4631,102 +5824,128 @@@ msgstr "ADVARSEL: flere klartekster set
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
  msgstr "uafhængig tilbagekald - brug »gpg --import« for at anvende\n"
  
- #: g10/mainproc.c:1233 g10/mainproc.c:1276
++#: g10/mainproc.c:1238 g10/mainproc.c:1281
  msgid "no signature found\n"
  msgstr "ingen underskrift fundet\n"
  
- #: g10/mainproc.c:1607
++#: g10/mainproc.c:1612
  #, c-format
  msgid "BAD signature from \"%s\""
  msgstr "UGYLDIG underskrift fra »%s«"
  
- #: g10/mainproc.c:1609
++#: g10/mainproc.c:1614
  #, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Udløbet underskrift fra »%s«"
  
- #: g10/mainproc.c:1611
++#: g10/mainproc.c:1616
  #, c-format
  msgid "Good signature from \"%s\""
  msgstr "God underskrift fra »%s«"
  
- #: g10/mainproc.c:1630
++#: g10/mainproc.c:1635
  msgid "signature verification suppressed\n"
  msgstr "underskriftverificering undertrykt\n"
  
- #: g10/mainproc.c:1739
++#: g10/mainproc.c:1744
  msgid "can't handle this ambiguous signature data\n"
  msgstr "kan ikke håndtere disse tvetydige underskriftdata\n"
  
- #: g10/mainproc.c:1753 g10/mainproc.c:1761
++#: g10/mainproc.c:1758 g10/mainproc.c:1766
  #, c-format
  msgid "Signature made %s\n"
  msgstr "Underskrift lavet %s\n"
  
- #: g10/mainproc.c:1754 g10/mainproc.c:1762
++#: g10/mainproc.c:1759 g10/mainproc.c:1767
  #, c-format
  msgid "               using %s key %s\n"
  msgstr "               bruger %s nøgle %s\n"
  
- #: g10/mainproc.c:1766
++#: g10/mainproc.c:1771
  #, 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:1772
++#: g10/mainproc.c:1777
  #, fuzzy, c-format
  #| msgid "                aka \"%s\""
  msgid "               issuer \"%s\"\n"
  msgstr "       også kendt som »%s«"
  
- #: g10/mainproc.c:1789
++#: g10/mainproc.c:1794
  msgid "Key available at: "
  msgstr "Nøgle tilgængelig på: "
  
- #: g10/mainproc.c:2024
++#: g10/mainproc.c:2029
  msgid "[uncertain]"
  msgstr "[usikker]"
  
- #: g10/mainproc.c:2062
++#: g10/mainproc.c:2067
  #, c-format
  msgid "                aka \"%s\""
  msgstr "       også kendt som »%s«"
  
- #: g10/mainproc.c:2145
++#: g10/mainproc.c:2150
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "Underskrift udløbet %s\n"
  
- #: g10/mainproc.c:2149
++#: g10/mainproc.c:2154
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "Underskrift udløber %s\n"
  
- #: g10/mainproc.c:2160
++#: g10/mainproc.c:2165
  #, 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:2161
++#: g10/mainproc.c:2166
  msgid "binary"
  msgstr "binær"
  
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2167
  msgid "textmode"
  msgstr "tekstilstand"
  
- #: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "ukendt"
  
- #: g10/mainproc.c:2164
++#: g10/mainproc.c:2169
  #, fuzzy
  #| msgid "algorithm: %s"
  msgid ", key algorithm "
  msgstr "algoritme: %s"
  
- #: g10/mainproc.c:2199
++#: g10/mainproc.c:2204
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2229
++#: g10/mainproc.c:2234
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "Kan ikke kontrollere underskrift: %s\n"
  
- #: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
++#: g10/mainproc.c:2327 g10/mainproc.c:2346 g10/mainproc.c:2470
  msgid "not a detached signature\n"
  msgstr "ikke en frakoblet underskrift\n"
  
- #: g10/mainproc.c:2375
++#: g10/mainproc.c:2380
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
  msgstr ""
  "ADVARSEL: flere underskrifter detekteret. Kun den første vil blive "
  "kontrolleret.\n"
  
- #: g10/mainproc.c:2384
++#: g10/mainproc.c:2389
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "uafhængig underskrift for klasse 0x%02x\n"
  
- #: g10/mainproc.c:2469
++#: g10/mainproc.c:2474
  msgid "old style (PGP 2.x) signature\n"
  msgstr "gammeldags (PGP 2.x) underskrift\n"
  
@@@ -6285,23 -4974,18 +6247,23 @@@ msgstr "Er dette billede korrekt (j/N/a
  msgid "unable to display photo ID!\n"
  msgstr "kan ikke vise billed-id!\n"
  
- #: g10/pkclist.c:72 g10/revoke.c:757
++#: g10/pkclist.c:72 g10/revoke.c:758
  msgid "No reason specified"
  msgstr "Ingen årsag angivet"
  
- #: g10/pkclist.c:74 g10/revoke.c:759
++#: g10/pkclist.c:74 g10/revoke.c:760
  msgid "Key is superseded"
  msgstr "Nøglen er blevet afløst"
  
- #: g10/pkclist.c:76 g10/revoke.c:758
++#: g10/pkclist.c:76 g10/revoke.c:759
  msgid "Key has been compromised"
  msgstr "Nøglen er blevet komprimeret"
  
- #: g10/pkclist.c:78 g10/revoke.c:760
++#: g10/pkclist.c:78 g10/revoke.c:761
  msgid "Key is no longer used"
  msgstr "Nøglen bruges ikke længere"
  
- #: g10/pkclist.c:80 g10/revoke.c:761
++#: g10/pkclist.c:80 g10/revoke.c:762
  msgid "User ID is no longer valid"
  msgstr "Bruger-id er ikke længere gyldigt"
  
@@@ -6380,7 -5051,6 +6342,7 @@@ msgstr "
  "Minimumstroværdighedsniveau for denne nøgle er: %s\n"
  "\n"
  
- #: g10/pkclist.c:310 g10/revoke.c:786
++#: g10/pkclist.c:310 g10/revoke.c:787
  msgid "Your decision? "
  msgstr "Dit valg? "
  
@@@ -6588,33 -5220,26 +6550,33 @@@ msgstr "
  msgid "No such user ID.\n"
  msgstr "Ingen sådan bruger-id.\n"
  
- #: g10/pkclist.c:1197 g10/pkclist.c:1273
++#: g10/pkclist.c:1197 g10/pkclist.c:1274
  msgid "skipped: public key already set as default recipient\n"
  msgstr "udeladt: offentlig nøgle er allerede valgt som standardmodtager\n"
  
- #: g10/pkclist.c:1218
++#: g10/pkclist.c:1219
  msgid "Public key is disabled.\n"
  msgstr "Offentlig nøgle er slået fra.\n"
  
- #: g10/pkclist.c:1228
++#: g10/pkclist.c:1229
  msgid "skipped: public key already set\n"
  msgstr "udelod: offentlig nøgle er allerede angivet\n"
  
- #: g10/pkclist.c:1263
++#: g10/pkclist.c:1264
  #, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "ukendt standardmodtager »%s«\n"
  
- #: g10/pkclist.c:1312
++#: g10/pkclist.c:1313
  msgid "no valid addressees\n"
  msgstr "ingen gyldige adresser\n"
  
- #: g10/pkclist.c:1665
++#: g10/pkclist.c:1666
  #, 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:1690
++#: g10/pkclist.c:1691
  #, 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"
@@@ -6623,29 -5247,23 +6585,29 @@@
  msgid "data not saved; use option \"--output\" to save it\n"
  msgstr "data ej gemt; brug tilvalg »--output« for at gemme\n"
  
- #: g10/plaintext.c:598
++#: g10/plaintext.c:614
  msgid "Detached signature.\n"
  msgstr "Frakoblet underskrift.\n"
  
- #: g10/plaintext.c:606
++#: g10/plaintext.c:622
  msgid "Please enter name of data file: "
  msgstr "Indtast navn for datafil: "
  
- #: g10/plaintext.c:643
++#: g10/plaintext.c:659
  msgid "reading stdin ...\n"
  msgstr "læser stdin ...\n"
  
- #: g10/plaintext.c:688
++#: g10/plaintext.c:704
  msgid "no signed data\n"
  msgstr "ingen underskrevne data\n"
  
- #: g10/plaintext.c:706
++#: g10/plaintext.c:722
  #, fuzzy, c-format
  #| msgid "can't open signed data `%s'\n"
  msgid "can't open signed data '%s'\n"
  msgstr "kan ikke åbne underskrevne data »%s«\n"
  
- #: g10/plaintext.c:741
++#: g10/plaintext.c:757
  #, c-format
  msgid "can't open signed data fd=%d: %s\n"
  msgstr "kan ikke åbne underskrevne data fd=%d: %s\n"
@@@ -6714,7 -5318,6 +6676,7 @@@ msgstr "Hemmelig nøgle er tilgængelig
  msgid "Create a designated revocation certificate for this key? (y/N) "
  msgstr "Opret et designet tilbagekaldscertifikat for denne nøgle? (j/N) "
  
- #: g10/revoke.c:336 g10/revoke.c:727
++#: g10/revoke.c:336 g10/revoke.c:728
  msgid "ASCII armored output forced.\n"
  msgstr "ASCII-pansret resultat er tvunget.\n"
  
@@@ -6751,23 -5348,20 +6713,23 @@@ msgid "
  "the secret key.  However, if the secret key is still accessible,\n"
  "it is better to generate a new revocation certificate and give\n"
  "a reason for the revocation.  For details see the description of\n"
- "of the gpg command \"--gen-revoke\" in the GnuPG manual."
+ "of the gpg command \"--generate-revocation\" in the GnuPG manual."
  msgstr ""
  
- #: g10/revoke.c:575
++#: g10/revoke.c:576
  msgid ""
  "To avoid an accidental use of this file, a colon has been inserted\n"
  "before the 5 dashes below.  Remove this colon with a text editor\n"
  "before importing and publishing this revocation certificate."
  msgstr ""
  
- #: g10/revoke.c:590
++#: g10/revoke.c:591
  #, fuzzy, c-format
  #| msgid "Revocation certificate created.\n"
  msgid "revocation certificate stored as '%s.rev'\n"
  msgstr "Tilbagekaldscertifikat oprettet.\n"
  
- #: g10/revoke.c:634
++#: g10/revoke.c:635
  #, fuzzy, c-format
  #| msgid "secret key \"%s\" not found: %s\n"
  msgid "secret key \"%s\" not found\n"
@@@ -6776,22 -5370,18 +6738,22 @@@ msgstr "hemmelig nøgle »%s« blev ikk
  #. TRANSLATORS: The %s prints a key specification which
  #. for example has been given at the command line.  Several lines
  #. lines with secret key infos are printed after this message.
- #: g10/revoke.c:661
++#: g10/revoke.c:662
  #, c-format
  msgid "'%s' matches multiple secret keys:\n"
  msgstr ""
  
- #: g10/revoke.c:688
++#: g10/revoke.c:689
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error searching the keyring: %s\n"
  msgstr "fejl ved oprettelse af nøglering »%s«: %s\n"
  
- #: g10/revoke.c:711
++#: g10/revoke.c:712
  msgid "Create a revocation certificate for this key? (y/N) "
  msgstr "Opret et tilbagekaldscertifikat for denne nøgle? (j/N) "
  
- #: g10/revoke.c:735
++#: g10/revoke.c:736
  msgid ""
  "Revocation certificate created.\n"
  "\n"
@@@ -6810,33 -5400,26 +6772,33 @@@ msgstr "
  "forsigtig: Dit udskrivningssystem kan gemme dataene og gøre dem\n"
  "tilgængelige for andre!\n"
  
- #: g10/revoke.c:769
++#: g10/revoke.c:770
  msgid "Please select the reason for the revocation:\n"
  msgstr "Vælg venligst årsagen for tilbagekaldet:\n"
  
- #: g10/revoke.c:779
++#: g10/revoke.c:780
  msgid "Cancel"
  msgstr "Afbryd"
  
- #: g10/revoke.c:781
++#: g10/revoke.c:782
  #, c-format
  msgid "(Probably you want to select %d here)\n"
  msgstr "(Du vil sikkert vælge %d her)\n"
  
- #: g10/revoke.c:822
++#: g10/revoke.c:823
  msgid "Enter an optional description; end it with an empty line:\n"
  msgstr "Indtast en valgfri beskrivelse; afslut den med en tom linje:\n"
  
- #: g10/revoke.c:850
++#: g10/revoke.c:851
  #, c-format
  msgid "Reason for revocation: %s\n"
  msgstr "Årsag for tilbagekald: %s\n"
  
- #: g10/revoke.c:852
++#: g10/revoke.c:853
  msgid "(No description given)\n"
  msgstr "(Ingen beskrivelse angivet)\n"
  
- #: g10/revoke.c:857
++#: g10/revoke.c:858
  msgid "Is this okay? (y/N) "
  msgstr "Er dette okay? (j/N) "
  
@@@ -6978,12 -5541,10 +6940,12 @@@ msgstr "
  "ADVARSEL: kan ikke %%-udvide foretrukken nøgleserveradresse (for stor). "
  "Bruger uden udvidelse.\n"
  
- #: g10/sign.c:329
++#: g10/sign.c:331
  #, c-format
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s/%s-underskrift fra: »%s«\n"
  
- #: g10/sign.c:878
++#: g10/sign.c:880
  #, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6991,11 -5552,9 +6953,11 @@@ msgstr "
  "ADVARSEL: tvang af sammendragsalgoritme %s (%d) overtræder "
  "modtagerpræferencer\n"
  
- #: g10/sign.c:1009
++#: g10/sign.c:1011
  msgid "signing:"
  msgstr "underskriver:"
  
- #: g10/sign.c:1286
++#: g10/sign.c:1288
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "%s-kryptering vil blive brugt\n"
@@@ -7019,7 -5574,6 +6981,7 @@@ msgid "this is a PGP generated Elgamal 
  msgstr ""
  "dette er en PGP-oprettet Elgamalnøgle som ikke er sikker for underskrifter!"
  
- #: g10/tdbdump.c:57 g10/trustdb.c:362
++#: g10/tdbdump.c:57 g10/trustdb.c:369
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "stol på post %lu, type %d: skrivning mislykkedes: %s\n"
@@@ -7067,7 -5613,6 +7029,7 @@@ msgstr "fejl under forsøg på at find
  msgid "read error in '%s': %s\n"
  msgstr "læsefejl i »%s«: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "trustdb: synkronisering mislykkedes: %s\n"
@@@ -7215,309 -5731,322 +7177,388 @@@ msgstr "kan ikke håndtere tekstlinjer 
  msgid "input line longer than %d characters\n"
  msgstr "inddatalinje er længere end %d tegn\n"
  
- #: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
++#: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
  #, fuzzy, c-format
  #| msgid "error sending standard options: %s\n"
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "fejl under afsendelse af standardtilvalg: %s\n"
  
- #: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
++#: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:357 g10/tofu.c:699
++#: g10/tofu.c:355 g10/tofu.c:888
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:501
++#: g10/tofu.c:505
  #, fuzzy, c-format
  #| msgid "unsupported algorithm: %s"
  msgid "unsupported TOFU database version: %s\n"
  msgstr "ikke understøttet algoritme: %s"
  
- #: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
- #: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
- #: g10/tofu.c:3056
++#: g10/tofu.c:538
+ #, fuzzy, c-format
+ #| msgid "error creating temporary file: %s\n"
+ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
+ msgstr "fejl ved oprettelse af midlertidig fil: %s\n"
+ 
++#: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
+ msgid "TOFU DB error"
+ msgstr ""
+ 
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2340 g10/tofu.c:2359
++#: g10/tofu.c:2372 g10/tofu.c:2384 g10/tofu.c:2399 g10/tofu.c:2411
++#: g10/tofu.c:2980 g10/tofu.c:2997 g10/tofu.c:3033 g10/tofu.c:3050
++#: g10/tofu.c:3353
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error reading TOFU database: %s\n"
  msgstr "fejl under afsendelse af %s-kommando: %s\n"
  
- #: g10/tofu.c:566 g10/tofu.c:574
++#: g10/tofu.c:716 g10/tofu.c:724
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error determining TOFU database's version: %s\n"
  msgstr "fejl ved skrivning af hemmelig nøglering »%s«: %s\n"
  
- #: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
++#: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing TOFU database: %s\n"
  msgstr "%s: fejl ved skrivning af mappepost: %s\n"
  
- #: g10/tofu.c:765
++#: g10/tofu.c:844
+ #, fuzzy, c-format
+ #| msgid "error sending %s command: %s\n"
+ msgid "error creating 'encryptions' TOFU table: %s\n"
+ msgstr "fejl under afsendelse af %s-kommando: %s\n"
+ 
++#: g10/tofu.c:874
+ #, c-format
+ msgid "adding column effective_policy to bindings DB: %s\n"
+ msgstr ""
+ 
++#: g10/tofu.c:956
  #, fuzzy, c-format
  #| msgid "error opening `%s': %s\n"
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "fejl ved åbning af »%s«: %s\n"
  
- #: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
++#: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error updating TOFU database: %s\n"
  msgstr "fejl under afsendelse af %s-kommando: %s\n"
  
- #: g10/tofu.c:1239
++#: g10/tofu.c:1328
  #, c-format
  msgid ""
  "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1247
++#: g10/tofu.c:1337
  #, c-format
- msgid "The email address \"%s\" is associated with %d keys!"
- msgstr ""
+ msgid "The email address \"%s\" is associated with %d key!"
+ msgid_plural "The email address \"%s\" is associated with %d keys!"
+ msgstr[0] ""
+ msgstr[1] ""
  
- #: g10/tofu.c:1251
++#: g10/tofu.c:1343
  msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  
- #: g10/tofu.c:1257
++#: g10/tofu.c:1349
  #, c-format
  msgid ""
  "Please indicate whether this email address should be associated with key %s "
  "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1513
++#: g10/tofu.c:1605
  #, fuzzy, c-format
  #| msgid "error getting new PIN: %s\n"
  msgid "error gathering other user IDs: %s\n"
  msgstr "fejl ved indhentelse af ny PIN: %s\n"
  
- #: g10/tofu.c:1523
++#: g10/tofu.c:1615
  #, fuzzy
  #| msgid "list key and user IDs"
  msgid "This key's user IDs:\n"
  msgstr "vis nøgle og bruger-id'er"
  
- #: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
++#: g10/tofu.c:1631 g10/tofu.c:1796
  #, fuzzy, c-format
  #| msgid "validity: %s"
  msgid "policy: %s"
  msgstr "validitet: %s"
  
- #: g10/tofu.c:1630
++#: g10/tofu.c:1722
  #, fuzzy, c-format
  #| msgid "error getting stored flags: %s\n"
  msgid "error gathering signature stats: %s\n"
  msgstr "fejl ved indhentelse af gemte flag: %s\n"
  
- #: g10/tofu.c:1634
++#: g10/tofu.c:1726
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1651
++#: g10/tofu.c:1744
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1684 g10/tofu.c:1689
++#: g10/tofu.c:1785 g10/tofu.c:1790
  msgid ", "
  msgstr ""
  
- #: g10/tofu.c:1693
++#: g10/tofu.c:1794
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
  msgstr "vis nøgler"
  
- #: g10/tofu.c:1715
++#: g10/tofu.c:1820
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid "Verified %d message."
+ msgid_plural "Verified %d messages."
+ msgstr[0] "vis beskedsammendrag"
+ msgstr[1] "vis beskedsammendrag"
+ 
++#: g10/tofu.c:1824
+ #, fuzzy, c-format
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid "Encrypted %d message."
+ msgid_plural "Encrypted %d messages."
+ msgstr[0] "krypteret med %lu adgangsfraser\n"
+ msgstr[1] "krypteret med %lu adgangsfraser\n"
+ 
++#: g10/tofu.c:1831
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid "Verified %d message in the future."
+ msgid_plural "Verified %d messages in the future."
+ msgstr[0] "vis beskedsammendrag"
+ msgstr[1] "vis beskedsammendrag"
+ 
++#: g10/tofu.c:1835
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid "Verified %d message"
- msgid_plural "Verified %d messages"
+ msgid "Encrypted %d message in the future."
+ msgid_plural "Encrypted %d messages in the future."
  msgstr[0] "vis beskedsammendrag"
  msgstr[1] "vis beskedsammendrag"
  
- #: g10/tofu.c:1719
++#: g10/tofu.c:1849
  #, c-format
- msgid "Encrypted %d message"
- msgid_plural "Encrypted %d messages"
+ msgid "Messages verified over the past %d day: %d."
+ msgid_plural "Messages verified over the past %d days: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1734
++#: g10/tofu.c:1855
  #, c-format
- msgid " over the past day."
- msgid_plural " over the past %d days."
+ msgid "Messages encrypted over the past %d day: %d."
+ msgid_plural "Messages encrypted over the past %d days: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1740
++#: g10/tofu.c:1865
  #, c-format
- msgid " over the past month."
- msgid_plural " over the past %d months."
+ msgid "Messages verified over the past %d month: %d."
+ msgid_plural "Messages verified over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1746
++#: g10/tofu.c:1871
  #, c-format
- msgid " over the past year."
- msgid_plural " over the past %d years."
+ msgid "Messages encrypted over the past %d month: %d."
+ msgid_plural "Messages encrypted over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1752
- msgid " in the past."
++#: g10/tofu.c:1881
+ #, c-format
+ msgid "Messages verified over the past %d year: %d."
+ msgid_plural "Messages verified over the past %d years: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1887
+ #, c-format
+ msgid "Messages encrypted over the past %d year: %d."
+ msgid_plural "Messages encrypted over the past %d years: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1895
+ #, c-format
+ msgid "Messages verified in the past: %d."
  msgstr ""
  
++#: g10/tofu.c:1899
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid "Messages encrypted in the past: %d."
+ msgstr "vis beskedsammendrag"
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1767
++#: g10/tofu.c:1916
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1809
++#: g10/tofu.c:1958
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1815
++#: g10/tofu.c:1964
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1823
++#: g10/tofu.c:1972
  msgid "Defaulting to unknown."
  msgstr ""
  
- #: g10/tofu.c:1938 g10/tofu.c:2074
++#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
- #: g10/tofu.c:1994
++#: g10/tofu.c:2143
  #, fuzzy, c-format
  #| msgid "error writing key: %s\n"
  msgid "resetting keydb: %s\n"
  msgstr "fejl ved skrivning af nøgle: %s\n"
  
- #: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
- #: g10/tofu.c:2425
++#: g10/tofu.c:2601
  #, fuzzy, c-format
  #| msgid "error storing flags: %s\n"
- msgid "error setting TOFU binding's trust level to %s\n"
+ msgid "error setting TOFU binding's policy to %s\n"
  msgstr "fejl ved lagring af flag: %s\n"
  
- #: g10/tofu.c:2473
++#: g10/tofu.c:2794
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "error changing TOFU policy: %s\n"
  msgstr "fejl ved oprettelse af datakanal: %s\n"
  
- #. TRANSLATORS: The tilde ('~') is used here to indicate a
- #. * non-breakable space
- #: g10/tofu.c:2574
++#: g10/tofu.c:2839
  #, c-format
- msgid "%d~year"
- msgid_plural "%d~years"
+ msgid "%lld~year"
+ msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2583
++#: g10/tofu.c:2844
  #, c-format
- msgid "%d~month"
- msgid_plural "%d~months"
+ msgid "%lld~month"
+ msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2592
++#: g10/tofu.c:2849
  #, c-format
- msgid "%d~day"
- msgid_plural "%d~days"
+ msgid "%lld~week"
+ msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2854
+ #, c-format
+ msgid "%lld~day"
+ msgid_plural "%lld~days"
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:2859
  #, c-format
- msgid "%d~hour"
- msgid_plural "%d~hours"
+ msgid "%lld~hour"
+ msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2610
++#: g10/tofu.c:2864
  #, c-format
- msgid "%d~minute"
- msgid_plural "%d~minutes"
+ msgid "%lld~minute"
+ msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2619
++#: g10/tofu.c:2866
  #, c-format
- msgid "%d~second"
- msgid_plural "%d~seconds"
+ msgid "%lld~second"
+ msgid_plural "%lld~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2802
++#: g10/tofu.c:3103
  #, c-format
- msgid "%s: "
+ msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:2806
++#: g10/tofu.c:3109
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
- msgid "Verified %ld signatures"
+ msgid "%s: Verified 0 signatures."
  msgstr "Slettede %d underskrifter.\n"
  
- #: g10/tofu.c:2816
++#: g10/tofu.c:3117
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid "Verified %ld signature in the past %s"
- msgid_plural "Verified %ld signatures in the past %s"
+ msgid "%s: Verified %ld~signature in the past %s."
+ msgid_plural "%s: Verified %ld~signatures in the past %s."
  msgstr[0] "vis beskedsammendrag"
  msgstr[1] "vis beskedsammendrag"
  
- #: g10/tofu.c:2826
- #, fuzzy, c-format
++#: g10/tofu.c:3127
+ #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
- msgid ", and encrypted %ld messages"
+ msgid "Encrypted 0 messages."
  msgstr "krypteret med %lu adgangsfraser\n"
  
- #: g10/tofu.c:2835
++#: g10/tofu.c:3135
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid ", and encrypted %ld message in the past %s"
- msgid_plural ", and encrypted %ld messages in the past %s"
+ msgid "Encrypted %ld~message in the past %s."
+ msgid_plural "Encrypted %ld~messages in the past %s."
  msgstr[0] "vis beskedsammendrag"
  msgstr[1] "vis beskedsammendrag"
  
- #: g10/tofu.c:2880
++#: g10/tofu.c:3146
+ #, fuzzy, c-format
+ #| msgid "validity: %s"
+ msgid "(policy: %s)"
+ msgstr "validitet: %s"
+ 
++#: g10/tofu.c:3177
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2883
++#: g10/tofu.c:3180
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2887
++#: g10/tofu.c:3184
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2890
++#: g10/tofu.c:3187
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2919
++#: g10/tofu.c:3216
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7534,19 -6063,15 +7575,19 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
- #: g10/tofu.c:3480 g10/tofu.c:3572
++#: g10/tofu.c:3298 g10/tofu.c:3449 g10/tofu.c:3627 g10/tofu.c:3670
++#: g10/tofu.c:3784 g10/tofu.c:3859 g10/tofu.c:3894
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error opening TOFU database: %s\n"
  msgstr "fejl under afsendelse af %s-kommando: %s\n"
  
- #: g10/tofu.c:3185
++#: g10/tofu.c:3482
  #, c-format
- msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
  msgstr ""
  
- #: g10/tofu.c:3515
++#: g10/tofu.c:3819
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7578,72 -6098,58 +7619,72 @@@ msgstr "nøgle %s: ingen offentlig nøg
  msgid "key %s marked as ultimately trusted\n"
  msgstr "nøgle %s markeret som ultimativ troværdig\n"
  
- #: g10/trustdb.c:341
++#: g10/trustdb.c:348
  #, 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:347
++#: g10/trustdb.c:354
  #, 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:422
++#: g10/trustdb.c:429
  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:431
++#: g10/trustdb.c:438
  msgid "If that does not work, please consult the manual\n"
  msgstr "Hvis det ikke virker, så se venligst manualen\n"
  
- #: g10/trustdb.c:468
++#: g10/trustdb.c:475
  #, 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:474
++#: g10/trustdb.c:481
  #, c-format
  msgid "using %s trust model\n"
  msgstr "bruger %s troværdighedsmodel\n"
  
- #: g10/trustdb.c:511
++#: g10/trustdb.c:518
  msgid "no need for a trustdb check\n"
  msgstr "intet behov for kontrol af trustdb\n"
  
- #: g10/trustdb.c:517 g10/trustdb.c:2160
++#: g10/trustdb.c:524 g10/trustdb.c:2187
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "næste kontrol af trustdb sker den %s\n"
  
- #: g10/trustdb.c:526
++#: g10/trustdb.c:533
  #, 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:542
++#: g10/trustdb.c:549
  #, 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:749 g10/trustdb.c:1313
++#: g10/trustdb.c:756 g10/trustdb.c:1340
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "offentlig nøgle %s blev ikke fundet: %s\n"
  
- #: g10/trustdb.c:966
++#: g10/trustdb.c:973
  msgid "please do a --check-trustdb\n"
  msgstr "udfør venligst en --check-trustdb\n"
  
- #: g10/trustdb.c:971
++#: g10/trustdb.c:978
  msgid "checking the trustdb\n"
  msgstr "kontrollerer trustdb\n"
  
- #: g10/trustdb.c:1883
++#: g10/trustdb.c:1910
  #, fuzzy, c-format
  #| msgid "%lu keys processed so far\n"
  msgid "%d key processed"
@@@ -7651,7 -6157,6 +7692,7 @@@ msgid_plural "%d keys processed
  msgstr[0] "     %lu-nøgler behandlet\n"
  msgstr[1] "     %lu-nøgler behandlet\n"
  
- #: g10/trustdb.c:1886
++#: g10/trustdb.c:1913
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7659,16 -6164,13 +7700,16 @@@ msgid_plural " (%d validity counts clea
  msgstr[0] "%d nøgler behandlet (%d validiteter ryddet)\n"
  msgstr[1] "%d nøgler behandlet (%d validiteter ryddet)\n"
  
- #: g10/trustdb.c:1956
++#: g10/trustdb.c:1983
  msgid "no ultimately trusted keys found\n"
  msgstr "ingen ultimativ troværdige nøgler fundet\n"
  
- #: g10/trustdb.c:1970
++#: g10/trustdb.c:1997
  #, 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:2087
++#: g10/trustdb.c:2114
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7676,7 -6178,6 +7717,7 @@@ msgstr "
  "dybde: %d  gyldig: %3d  underskrevet: %3d  troværdighed: %d-, %dq, %dn, %dm, "
  "%df, %du\n"
  
- #: g10/trustdb.c:2167
++#: g10/trustdb.c:2194
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr "kan ikke opdatere trustdb-versionspost: skrivning mislykkedes: %s\n"
@@@ -7789,19 -6269,14 +7830,19 @@@ msgstr "
  "Syntaks: kbxutil [tilvalg] [filer]\n"
  "Vis, eksporter, importer Keybox-data\n"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3208
++#: scd/app-nks.c:718 scd/app-openpgp.c:3221
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr "RSA-modulus mangler eller har ikke størrelsen %d bit\n"
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3220
++#: scd/app-nks.c:726 scd/app-openpgp.c:3233
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr "RSA offentlig eksponent mangler eller større end %d bit\n"
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
- #: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
- #: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1965 scd/app-openpgp.c:1984
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2166 scd/app-openpgp.c:2430
++#: scd/app-openpgp.c:2477 scd/app-openpgp.c:2582 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "PIN-tilbagekald returnerede fejl: %s\n"
@@@ -7855,85 -6321,67 +7896,85 @@@ msgstr "
  "|P|Indtast venligst PIN Unblocking Code (PUK) for nøglen til at oprette "
  "kvalificerede underskrifter."
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2511 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "fejl ved indhentelse af ny PIN: %s\n"
  
- #: scd/app-openpgp.c:806
++#: scd/app-openpgp.c:801
  #, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "kunne ikke gemme fingeraftrykket: %s\n"
  
- #: scd/app-openpgp.c:819
++#: scd/app-openpgp.c:814
  #, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "kunne ikke gemme oprettelsesdatoen: %s\n"
  
- #: scd/app-openpgp.c:1236
++#: scd/app-openpgp.c:1247
  msgid "response does not contain the RSA modulus\n"
  msgstr "svar indeholder ikke RSA modulus'erne\n"
  
- #: scd/app-openpgp.c:1243
++#: scd/app-openpgp.c:1254
  msgid "response does not contain the RSA public exponent\n"
  msgstr "svar indeholder ikke den RSA-offentlige eksponent\n"
  
- #: scd/app-openpgp.c:1353
++#: scd/app-openpgp.c:1364
  #, fuzzy
  #| msgid "response does not contain the RSA public exponent\n"
  msgid "response does not contain the EC public key\n"
  msgstr "svar indeholder ikke den RSA-offentlige eksponent\n"
  
- #: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:1464 scd/app-openpgp.c:3825
  msgid "response does not contain the public key data\n"
  msgstr "svar indeholder ikke data for offentlig nøgle\n"
  
- #: scd/app-openpgp.c:1551
++#: scd/app-openpgp.c:1564
  #, c-format
  msgid "reading public key failed: %s\n"
  msgstr "læsning af offentlig nøgle mislykkedes: %s\n"
  
- #: scd/app-openpgp.c:1903
++#: scd/app-openpgp.c:1916
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr "bruger standard-PIN som %s\n"
  
- #: scd/app-openpgp.c:1910
++#: scd/app-openpgp.c:1923
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  "kunne ikke bruge standard-PIN som %s: %s - deaktiverer yderligere "
  "standardbrug\n"
  
- #: scd/app-openpgp.c:1925
++#: scd/app-openpgp.c:1938
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr "||Indtast venligst PIN%%0A[sigs færdig: %lu]"
  
- #: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
++#: scd/app-openpgp.c:1949 scd/app-openpgp.c:2424
  msgid "||Please enter the PIN"
  msgstr "||Indtast venligst PIN'en"
  
- #: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2173 scd/app-openpgp.c:2437
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr "PIN for CHV%d er for kort; minimumlængde er %d\n"
  
- #: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
- #: scd/app-openpgp.c:4114
++#: scd/app-openpgp.c:2004 scd/app-openpgp.c:2043 scd/app-openpgp.c:2185
++#: scd/app-openpgp.c:4126
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "verificering af CHV%d mislykkedes: %s\n"
  
- #: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
++#: scd/app-openpgp.c:2072 scd/app-openpgp.c:2458 scd/app-openpgp.c:4556
  msgid "error retrieving CHV status from card\n"
  msgstr "fejl ved indhentelse af CHV-status fra kort\n"
  
- #: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
++#: scd/app-openpgp.c:2078 scd/app-openpgp.c:4565
  msgid "card is permanently locked!\n"
  msgstr "kort er permanent låst!\n"
  
- #: scd/app-openpgp.c:2072
++#: scd/app-openpgp.c:2085
  #, fuzzy, c-format
  #| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@@ -7944,24 -6392,19 +7985,24 @@@ msgstr[1] "%d PIN-forsøg for administr
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:2082
++#: scd/app-openpgp.c:2095
  #, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "|A|Ændr venligst administrator-PIN%%0A[tilbageværende forsøg: %d]"
  
- #: scd/app-openpgp.c:2086
++#: scd/app-openpgp.c:2099
  msgid "|A|Please enter the Admin PIN"
  msgstr "|A|Indtast venligst administrator-PIN'en"
  
- #: scd/app-openpgp.c:2107
++#: scd/app-openpgp.c:2120
  msgid "access to admin commands is not configured\n"
  msgstr "adgang til administratorkommandoer er ikke konfigureret\n"
  
- #: scd/app-openpgp.c:2460
++#: scd/app-openpgp.c:2473
  msgid "||Please enter the Reset Code for the card"
  msgstr "||Indtast venligst nulstillingskoden for kortet"
  
- #: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
++#: scd/app-openpgp.c:2483 scd/app-openpgp.c:2537
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr "Nulstillingskode er for kort; minimumlængde er %d\n"
@@@ -7969,79 -6412,61 +8010,79 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2493
++#: scd/app-openpgp.c:2506
  msgid "|RN|New Reset Code"
  msgstr "|RN|Ny nulstillingskode"
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|AN|New Admin PIN"
  msgstr "|AN|Ny administrator-PIN"
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|N|New PIN"
  msgstr "|N|Ny PIN"
  
- #: scd/app-openpgp.c:2565
++#: scd/app-openpgp.c:2578
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "||Indtast venligst administrator-PIN'en og ny administrator-PIN"
  
- #: scd/app-openpgp.c:2566
++#: scd/app-openpgp.c:2579
  msgid "||Please enter the PIN and New PIN"
  msgstr "||Indtast venligst PIN'en og ny PIN"
  
- #: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
++#: scd/app-openpgp.c:2635 scd/app-openpgp.c:3885
  msgid "error reading application data\n"
  msgstr "fejl ved læsning af programdata\n"
  
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
++#: scd/app-openpgp.c:2641 scd/app-openpgp.c:3892
  msgid "error reading fingerprint DO\n"
  msgstr "fejl ved læsning af fingeraftryk DO\n"
  
- #: scd/app-openpgp.c:2638
++#: scd/app-openpgp.c:2651
  msgid "key already exists\n"
  msgstr "nøgle findes allerede\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2655
  msgid "existing key will be replaced\n"
  msgstr "eksisterende nøgle vil blive erstattet\n"
  
- #: scd/app-openpgp.c:2644
++#: scd/app-openpgp.c:2657
  msgid "generating new key\n"
  msgstr "opretter ny nøgle\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2659
  msgid "writing new key\n"
  msgstr "skriver ny nøgle\n"
  
- #: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
++#: scd/app-openpgp.c:3201 scd/app-openpgp.c:3553
  msgid "creation timestamp missing\n"
  msgstr "oprettelsestidsstempel mangler\n"
  
- #: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
++#: scd/app-openpgp.c:3243 scd/app-openpgp.c:3251
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr "RSA-primtal %s mangler eller har ikke størrelsen %d bit\n"
  
- #: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
++#: scd/app-openpgp.c:3384 scd/app-openpgp.c:3647
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "kunne ikke gemme nøglen: %s\n"
  
- #: scd/app-openpgp.c:3534
++#: scd/app-openpgp.c:3547
  #, fuzzy
  #| msgid "unsupported algorithm: %s"
  msgid "unsupported curve\n"
  msgstr "ikke understøttet algoritme: %s"
  
- #: scd/app-openpgp.c:3790
++#: scd/app-openpgp.c:3802
  msgid "please wait while key is being generated ...\n"
  msgstr "vent venligst mens nøglen bliver oprettet ...\n"
  
- #: scd/app-openpgp.c:3798
++#: scd/app-openpgp.c:3810
  msgid "generating key failed\n"
  msgstr "oprettelse af nøgle mislykkedes\n"
  
- #: scd/app-openpgp.c:3804
++#: scd/app-openpgp.c:3816
  #, fuzzy, c-format
  #| msgid "key generation completed (%d seconds)\n"
  msgid "key generation completed (%d second)\n"
@@@ -8049,32 -6474,26 +8090,32 @@@ msgid_plural "key generation completed 
  msgstr[0] "nøgleoprettelse færdig (%d sekunder)\n"
  msgstr[1] "nøgleoprettelse færdig (%d sekunder)\n"
  
- #: scd/app-openpgp.c:3838
++#: scd/app-openpgp.c:3850
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "ugyldig struktur for OpenPGP-kort (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:3900
  msgid "fingerprint on card does not match requested one\n"
  msgstr "fingeraftryk på kort matcher ikke den anmodte\n"
  
- #: scd/app-openpgp.c:4004
++#: scd/app-openpgp.c:4016
  #, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "kort understøtter ikke sammendragsalgoritme %s\n"
  
- #: scd/app-openpgp.c:4089
++#: scd/app-openpgp.c:4101
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "underskrifter oprettet indtil videre: %lu\n"
  
- #: scd/app-openpgp.c:4551
++#: scd/app-openpgp.c:4570
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  "verifikation af administrator-PIN er i øjeblikket forbudt via denne "
  "kommando\n"
  
- #: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
++#: scd/app-openpgp.c:4871 scd/app-openpgp.c:4882
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "kan ikke tilgå %s - ugyldig OpenPGP-kort?\n"
@@@ -8094,7 -6510,6 +8135,7 @@@ msgstr "|N|Oprindelig ny PIN
  msgid "run in multi server mode (foreground)"
  msgstr "kør i flerservertilstand (forgrund)"
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|LEVEL|angiv fejlsøgningsniveau til NIVEAU"
  
@@@ -8134,13 -6540,11 +8175,13 @@@ msgstr "nægt brugen af kommandoer for 
  msgid "use variable length input for pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:287
++#: scd/scdaemon.c:286
  #, 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:289
++#: scd/scdaemon.c:288
  #, fuzzy
  #| msgid ""
  #| "Syntax: scdaemon [options] [command [args]]\n"
@@@ -8152,7 -6556,6 +8193,7 @@@ msgstr "
  "Syntaks: scdaemon [tilvalg] kommando [parametre]]\n"
  "Smartcard-dæmon for GnuPG\n"
  
- #: scd/scdaemon.c:786
++#: scd/scdaemon.c:784
  #, fuzzy
  #| msgid ""
  #| "please use the option `--daemon' to run the program in the background\n"
@@@ -8160,12 -6563,10 +8201,12 @@@ msgid "please use the option '--daemon
  msgstr ""
  "brug venligst tilvalget »--daemon« til at køre programmet i baggrunden\n"
  
- #: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1904
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "håndtering for fd %d startet\n"
  
- #: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
++#: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1909
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "håndtering for fd %d termineret\n"
@@@ -8246,9 -6631,6 +8287,9 @@@ msgstr "antallet af matchende certifika
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "dirmngr cache-only-nøgleopslag mislykkedes: %s\n"
  
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
 +#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  msgid "failed to allocate keyDB handle\n"
  msgstr "kunne ikke allokere keyDB-håndtag\n"
  
@@@ -8742,11 -7022,9 +8783,11 @@@ msgstr "Klar. Du skal nu sende denne fo
  msgid "resource problem: out of core\n"
  msgstr "ressourceproblem: ikke nok kerne\n"
  
- #: sm/decrypt.c:330
++#: sm/decrypt.c:332
  msgid "(this is the RC2 algorithm)\n"
  msgstr "(dette er RC2-algoritmen)\n"
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:334
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr "(dette ser ikke ud til at være en krypteret besked)\n"
  
@@@ -8790,117 -7060,89 +8831,117 @@@ msgstr "vis eksterne nøgler
  msgid "list certificate chain"
  msgstr "vis certifikatkæde"
  
- #: sm/gpgsm.c:218
++#: sm/gpgsm.c:219
  msgid "import certificates"
  msgstr "importer certifikater"
  
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
  msgid "export certificates"
  msgstr "eksporter certifikater"
  
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:228
  msgid "register a smartcard"
  msgstr "registrer et smartkort"
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:231
  msgid "pass a command to the dirmngr"
  msgstr "send en kommando til dirmngr'en"
  
- #: sm/gpgsm.c:232
++#: sm/gpgsm.c:233
  msgid "invoke gpg-protect-tool"
  msgstr "opstart gpg-protect-tool"
  
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:250
  msgid "create base-64 encoded output"
  msgstr "opret base-64-kodet resultat"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in PEM format"
  msgstr "antag inddata er i PEM-format"
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in base-64 format"
  msgstr "antag inddata er i base-64-format"
  
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:262
  msgid "assume input is in binary format"
  msgstr "antag inddata er i binært format"
  
- #: sm/gpgsm.c:267
++#: sm/gpgsm.c:269
  msgid "never consult a CRL"
  msgstr "konsulter aldrig en CRL"
  
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:279
  msgid "check validity using OCSP"
  msgstr "kontroller validitet med OCSP"
  
- #: sm/gpgsm.c:282
++#: sm/gpgsm.c:284
  msgid "|N|number of certificates to include"
  msgstr "|N|antal certifikater der skal inkluderes"
  
- #: sm/gpgsm.c:285
++#: sm/gpgsm.c:287
  msgid "|FILE|take policy information from FILE"
  msgstr "|FILE|tag politikinformation fra FIL"
  
- #: sm/gpgsm.c:288
++#: sm/gpgsm.c:290
  msgid "do not check certificate policies"
  msgstr "kontroller ikke certifikatpolitikker"
  
- #: sm/gpgsm.c:292
++#: sm/gpgsm.c:294
  msgid "fetch missing issuer certificates"
  msgstr "hent manglende udstedercertifikater"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "don't use the terminal at all"
  msgstr "brug overhovedet ikke terminalen"
  
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:307
  msgid "|FILE|write a server mode log to FILE"
  msgstr "|FILE|skriv en servertilstandslog til FIL"
  
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:312
  msgid "|FILE|write an audit log to FILE"
  msgstr "|FILE|skriv en revisionslog til FIL"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "batch mode: never ask"
  msgstr "kørselstilstand: spørg aldrig"
  
- #: sm/gpgsm.c:314
++#: sm/gpgsm.c:316
  msgid "assume yes on most questions"
  msgstr "forvent ja til de fleste spørgsmål"
  
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:317
  msgid "assume no on most questions"
  msgstr "forvent nej til de fleste spørgsmål"
  
- #: sm/gpgsm.c:318
++#: sm/gpgsm.c:320
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "|FILE|tilføj nøglering til nøgleringslisten"
  
- #: sm/gpgsm.c:321
++#: sm/gpgsm.c:323
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|USER-ID|brug BRUGER-ID som hemmelig standardnøgle"
  
- #: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|SPEC|brug denne nøgleserver til at slå nøgler op"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|NAME|brug chifferalgoritme NAVN"
  
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:352
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|NAME|brug beskedsammendragsalgoritme NAVN"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:559
  #, 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:570
++#: sm/gpgsm.c:562
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpgsm [options] [files]\n"
@@@ -8915,50 -7157,41 +8956,50 @@@ msgstr "
  "Sign, check, encrypt eller decrypt med S/MIME-protokollen\n"
  "standardhandling afhænger af inddata\n"
  
- #: sm/gpgsm.c:774
++#: sm/gpgsm.c:766
  #, 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:785
++#: sm/gpgsm.c:777
  #, fuzzy, c-format
  #| msgid "unknown validation model `%s'\n"
  msgid "unknown validation model '%s'\n"
  msgstr "ukendt valideringsmodel »%s«\n"
  
- #: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
  #, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "%s:%u: intet værtsnavn angivet\n"
  
- #: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr "%s:%u: adgangskode angivet uden bruger\n"
  
- #: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
  #, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr "%s:%u: udelader denne linje\n"
  
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1427
  msgid "could not parse keyserver\n"
  msgstr "kunne ikke fortolke nøgleserver\n"
  
- #: sm/gpgsm.c:1636
++#: sm/gpgsm.c:1630
  #, 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:1677
++#: sm/gpgsm.c:1671
  #, 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:2033
++#: sm/gpgsm.c:2028
  msgid "invalid command (there is no implicit command)\n"
  msgstr "ugyldig kommando (der er ingen implict kommando)\n"
  
@@@ -9790,8 -7872,6 +9831,8 @@@ msgstr "
  msgid "CRL access not possible due to disabled %s\n"
  msgstr ""
  
 +#: dirmngr/crlfetch.c:223 dirmngr/ldap-wrapper-ce.c:488
- #: dirmngr/ldap-wrapper.c:742 dirmngr/misc.c:563
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:563
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
@@@ -9993,126 -8037,98 +10034,126 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:160
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:158
++#: dirmngr/dirmngr.c:161
  #, 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:159
++#: dirmngr/dirmngr.c:162
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:163
  #, fuzzy
  #| msgid "pass a command to the dirmngr"
  msgid "shutdown the dirmngr"
  msgstr "send en kommando til dirmngr'en"
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:164
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
- #: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
++#: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|FILE|skriv servertilstandslogge til FIL"
  
- #: dirmngr/dirmngr.c:177
++#: dirmngr/dirmngr.c:180
  #, fuzzy
  #| msgid "Quit without saving? (y/N) "
  msgid "run without asking a user"
  msgstr "Afslut uden at gemme? (j/N) "
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:181
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:182
  #, fuzzy
  #| msgid "allow PKA lookups (DNS requests)"
  msgid "allow sending OCSP requests"
  msgstr "tillad PKA-opslag (DNS-forespørgsler)"
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:184
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:185
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:186
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:188
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:192
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:202
  #, 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:201
++#: dirmngr/dirmngr.c:204
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
  #, 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:207
++#: dirmngr/dirmngr.c:210
  #, fuzzy
  #| msgid "|URL|use keyserver at URL"
  msgid "|URL|use OCSP responder at URL"
  msgstr "|URL|brug nøgleserver på adressen"
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:212
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:218
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:220
++#: dirmngr/dirmngr.c:223
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:225
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:240
++#: dirmngr/dirmngr.c:246
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -10125,13 -8141,11 +10166,13 @@@ msgstr "
  "@\n"
  "(Se manualsiden for en fuldstændig liste over alle kommandoer og tilvalg)\n"
  
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:361
  #, 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:355
++#: dirmngr/dirmngr.c:363
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -10143,88 -8157,71 +10184,88 @@@ msgstr "
  "Syntaks: gpg-agent [tilvalg] [kommando [parametre]]\n"
  "Hemmelig nøglehåndtering for GnuPG\n"
  
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:443
  #, 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:488 tools/gpgconf.c:543 tools/gpgconf.c:577
- #: tools/gpgconf.c:648
++#: dirmngr/dirmngr.c:496 tools/gpgconf.c:550 tools/gpgconf.c:585
++#: tools/gpgconf.c:656
  #, fuzzy, c-format
  #| msgid "usage: gpgsm [options] "
  msgid "usage: %s [options] "
  msgstr "brug: gpgsm [tilvalg] "
  
- #: dirmngr/dirmngr.c:1062
++#: dirmngr/dirmngr.c:1074
  #, fuzzy
  #| 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:1301 dirmngr/server.c:1585
++#: dirmngr/dirmngr.c:1300 dirmngr/server.c:1585
  #, 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:1307 dirmngr/server.c:1591
++#: dirmngr/dirmngr.c:1306 dirmngr/server.c:1591
  #, 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:1484
++#: dirmngr/dirmngr.c:1487
  #, 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:1539 dirmngr/dirmngr.c:1623
++#: dirmngr/dirmngr.c:1542 dirmngr/dirmngr.c:1626
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "ugyldig fingeraftryk"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
++#: dirmngr/dirmngr.c:1578 dirmngr/dirmngr.c:1604 tools/gpgconf-comp.c:4032
  #, 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:1630
++#: dirmngr/dirmngr.c:1633
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1700
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1734
++#: dirmngr/dirmngr.c:1738
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1739
++#: dirmngr/dirmngr.c:1743
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1745
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1746
++#: dirmngr/dirmngr.c:1750
  #, fuzzy
  #| msgid "not forced"
  msgid "shutdown forced\n"
  msgstr "ikke tvunget"
  
- #: dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1758
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1761
++#: dirmngr/dirmngr.c:1765
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10752,36 -8650,30 +10793,36 @@@ msgstr "select mislykkedes: %s\n
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2463
++#: dirmngr/server.c:2469
  #, 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:2474
++#: dirmngr/server.c:2480
  #, 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:2495
++#: dirmngr/server.c:2501
  #, 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:2503
++#: dirmngr/server.c:2509
  #, 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:2534
++#: dirmngr/server.c:2540
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2553
++#: dirmngr/server.c:2559
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
@@@ -10837,7 -8720,6 +10878,7 @@@ msgstr "
  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:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:167
  msgid "quiet"
  msgstr "stille"
  
@@@ -10939,22 -8801,15 +10980,22 @@@ msgstr "afsendelse af linje mislykkedes
  msgid "error sending standard options: %s\n"
  msgstr "fejl under afsendelse af standardtilvalg: %s\n"
  
 +#: tools/gpgconf-comp.c:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
- #: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
++#: tools/gpgconf-comp.c:766 tools/gpgconf-comp.c:865
  msgid "Options controlling the diagnostic output"
  msgstr "Tilvalg der kontrollerer det diagnostiske resultat"
  
 +#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
- #: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
++#: tools/gpgconf-comp.c:779 tools/gpgconf-comp.c:888
  msgid "Options controlling the configuration"
  msgstr "Tilvalg der kontrollerer konfigurationen"
  
- #: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
- #: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
++#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:723
++#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:901
  msgid "Options useful for debugging"
  msgstr "Tilvalg nyttige for fejlsøgning"
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
  msgid "Options controlling the security"
  msgstr "Tilvalg der kontrollerer sikkerheden"
  
@@@ -11004,11 -8848,9 +11045,11 @@@ msgstr "tillad ikke genbrug af gamle ad
  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:698 tools/gpgconf-comp.c:775
++#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
  msgid "|NAME|use NAME as default secret key"
  msgstr "|NAME|brug NAVN som hemmelig standardnøgle"
  
- #: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
++#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:784
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NAME|krypter også til bruger-id-NAVN"
  
@@@ -11016,186 -8857,160 +11057,204 @@@
  msgid "|SPEC|set up email aliases"
  msgstr "|SPEC|opsæt e-post-aliasser"
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
++#: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
  msgid "Configuration for Keyservers"
  msgstr "Konfiguration for nøgleservere"
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
++#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
  msgid "|URL|use keyserver at URL"
  msgstr "|URL|brug nøgleserver på adressen"
  
- #: tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:741
  msgid "allow PKA lookups (DNS requests)"
  msgstr "tillad PKA-opslag (DNS-forespørgsler)"
  
- #: tools/gpgconf-comp.c:738
++#: tools/gpgconf-comp.c:744
  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:787
++#: tools/gpgconf-comp.c:793
  msgid "disable all access to the dirmngr"
  msgstr "deaktiver al adgang til dirmngr"
  
- #: tools/gpgconf-comp.c:790
++#: tools/gpgconf-comp.c:796
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
  msgstr "|NAME|brug kodnings-NAVN for PKCS#12-adgangsfraser"
  
- #: tools/gpgconf-comp.c:820
++#: tools/gpgconf-comp.c:829
  msgid "do not check CRLs for root certificates"
  msgstr "kontroller ikke CRL'er for rodcertifikater"
  
- #: tools/gpgconf-comp.c:869
++#: tools/gpgconf-comp.c:878
  msgid "Options controlling the format of the output"
  msgstr "Tilvalg der kontrollerer formatet for resultatet"
  
- #: tools/gpgconf-comp.c:905
++#: tools/gpgconf-comp.c:920
  msgid "Options controlling the interactivity and enforcement"
  msgstr "Tilvalg der kontrollerer interaktiviteten og tvang"
  
- #: tools/gpgconf-comp.c:918
++#: tools/gpgconf-comp.c:933
  #, fuzzy
  #| msgid "Options controlling the security"
  msgid "Options controlling the use of Tor"
  msgstr "Tilvalg der kontrollerer sikkerheden"
  
- #: tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:947
  msgid "Configuration for HTTP servers"
  msgstr "Konfiguration for HTTP-servere"
  
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:958
  msgid "use system's HTTP proxy setting"
  msgstr "brug systemets HTTP-proxyopsætning"
  
- #: tools/gpgconf-comp.c:948
++#: tools/gpgconf-comp.c:963
  msgid "Configuration of LDAP servers to use"
  msgstr "Konfiguraiton af LDAP-servere der skal bruges"
  
- #: tools/gpgconf-comp.c:977
++#: tools/gpgconf-comp.c:992
  msgid "LDAP server list"
  msgstr "LDAP-serverliste"
  
- #: tools/gpgconf-comp.c:985
++#: tools/gpgconf-comp.c:1000
  msgid "Configuration for OCSP"
  msgstr "Konfiguration for OCSP"
  
- #: tools/gpgconf-comp.c:1066
++#: tools/gpgconf-comp.c:1081
  msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1067
++#: tools/gpgconf-comp.c:1082
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1083
  msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1069
++#: tools/gpgconf-comp.c:1084
  msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1070
++#: tools/gpgconf-comp.c:1085
  msgid "Network"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1071
++#: tools/gpgconf-comp.c:1086
  #, fuzzy
  #| msgid "Bad Passphrase"
  msgid "Passphrase Entry"
  msgstr "Ugyldig adgangsfrase"
  
- #: tools/gpgconf-comp.c:1225
++#: tools/gpgconf-comp.c:1240
  #, fuzzy
  #| msgid "Component not found"
  msgid "Component not suitable for launching"
  msgstr "Komponent blev ikke fundet"
  
- #: tools/gpgconf-comp.c:3283
++#: tools/gpgconf-comp.c:3311
  #, c-format
  msgid "External verification of component %s failed"
  msgstr "Ekstern verifikation af komponent %s mislykkedes"
  
- #: tools/gpgconf-comp.c:3434
++#: tools/gpgconf-comp.c:3462
  msgid "Note that group specifications are ignored\n"
  msgstr "Bemærk at gruppespecifikationer ignoreres\n"
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf-comp.c:4036
+ #, 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:4038
+ #, fuzzy, c-format
+ #| msgid "error in `%s': %s\n"
+ msgid "error parsing '%s'\n"
+ msgstr "fejl i »%s«: %s\n"
+ 
++#: tools/gpgconf.c:73
  msgid "list all components"
  msgstr "vis alle komponenter"
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "check all programs"
  msgstr "kontroller alle programmer"
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|list options"
  msgstr "|COMPONENT|vis indstillinger"
  
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
  msgid "|COMPONENT|change options"
  msgstr "|COMPONENT|ændr indstillinger"
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "|COMPONENT|check options"
  msgstr "|COMPONENT|kontroller indstillinger"
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "apply global default values"
  msgstr "anvend globale standardværdier"
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
+ #, fuzzy
+ #| msgid "|FILE|take policy information from FILE"
+ msgid "|FILE|update configuration files using FILE"
+ msgstr "|FILE|tag politikinformation fra FIL"
+ 
++#: tools/gpgconf.c:83
  #, fuzzy
  #| msgid "get the configuration directories for gpgconf"
  msgid "get the configuration directories for @GPGCONF@"
  msgstr "hent konfigurationsmapperne for gpgconf"
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:85
  msgid "list global configuration file"
  msgstr "vis global konfigurationsfil"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  msgid "check global configuration file"
  msgstr "kontroller global konfigurationsfil"
  
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:89
  #, fuzzy
  #| msgid "update the trust database"
  msgid "query the software version database"
  msgstr "opdater troværdighedsdatabasen"
  
- #: tools/gpgconf.c:86
++#: tools/gpgconf.c:90
  #, fuzzy
  #| msgid "list all components"
  msgid "reload all or a given component"
  msgstr "vis alle komponenter"
  
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:91
  #, fuzzy
  #| msgid "list all components"
  msgid "launch a given component"
  msgstr "vis alle komponenter"
  
- #: tools/gpgconf.c:88
++#: tools/gpgconf.c:92
  #, fuzzy
  #| msgid "list all components"
  msgid "kill a given component"
  msgstr "vis alle komponenter"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "use as output file"
  msgstr "brug som uddatafil"
  
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:102
  msgid "activate changes at runtime, if possible"
  msgstr "aktiver ændringer ved kørselstid, hvis muligt"
  
- #: tools/gpgconf.c:122
++#: tools/gpgconf.c:127
  #, 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:125
++#: tools/gpgconf.c:130
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpgconf [options]\n"
@@@ -11207,15 -9022,12 +11266,15 @@@ msgstr "
  "Syntaks: gpgconf [tilvalg]\n"
  "Håndter konfigurationsindstillinger for værktøjer i GnuPG-systemet\n"
  
- #: tools/gpgconf.c:545 tools/gpgconf.c:579
++#: tools/gpgconf.c:552 tools/gpgconf.c:587
  msgid "Need one component argument"
  msgstr "Kræver en kompomentparameter"
  
- #: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
++#: tools/gpgconf.c:561 tools/gpgconf.c:599 tools/gpgconf.c:632
  msgid "Component not found"
  msgstr "Komponent blev ikke fundet"
  
- #: tools/gpgconf.c:650
++#: tools/gpgconf.c:658
  msgid "No argument allowed"
  msgstr "Ingen parameter tilladt"
  
diff --cc po/de.po
index ff91186,feac198..2390b96
--- a/po/de.po
+++ b/po/de.po
@@@ -9,8 -9,7 +9,8 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg-2.1.0\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-11-18 16:54+0100\n"
- "PO-Revision-Date: 2016-11-18 15:40+0100\n"
++"POT-Creation-Date: 2016-12-20 11:28+0100\n"
+ "PO-Revision-Date: 2016-12-20 11:14+0100\n"
  "Last-Translator: Werner Koch <wk at gnupg.org>\n"
  "Language-Team: German <de at li.org>\n"
  "Language: de\n"
@@@ -158,24 -129,10 +158,24 @@@ msgstr "Falsche Passphrase!
  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:838 common/dotlock.c:839 g10/card-util.c:839
- #: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1306 g10/keygen.c:4577
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
++#: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
  #, c-format
  msgid "can't create '%s': %s\n"
  msgstr "'%s' kann nicht erzeugt werden: %s\n"
  
 +#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
- #: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1307
++#: g10/import.c:305 g10/import.c:448 g10/import.c:621 g10/keygen.c:3681
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
- #: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
- #: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:825 g10/sign.c:1025
++#: g10/sign.c:1130 g10/sign.c:1275 g10/tdbdump.c:143 g10/tdbdump.c:151
++#: g10/tdbio.c:720 g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161
++#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
++#: dirmngr/certcache.c:368 dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1564
  #, c-format
  msgid "can't open '%s': %s\n"
  msgstr "'%s' kann nicht geöffnet werden: %s\n"
@@@ -243,11 -189,9 +243,11 @@@ msgstr "
  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:92 g10/call-agent.c:1100
++#: agent/divert-scd.c:92 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr "Die legen Sie die Karte mit der folgenden Seriennummer ein:"
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1101
++#: agent/divert-scd.c:93 g10/call-agent.c:1102
  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 "
@@@ -389,45 -307,30 +389,45 @@@ msgstr "
  "@Optionen:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
  msgid "run in daemon mode (background)"
  msgstr "Im Daemon Modus ausführen"
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
  msgid "run in server mode (foreground)"
  msgstr "Im Server Modus ausführen"
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
  msgid "run in supervised mode"
  msgstr "Im \"Supervised\" Modus ausführen"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:170 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "Detaillierte Informationen"
  
 +#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "Reduzierte Informationen"
  
- #: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
  msgid "sh-style command output"
  msgstr "Ausgabe für /bin/sh"
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
  msgid "csh-style command output"
  msgstr "Ausgabe für /bin/csh"
  
- #: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
- #: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
++#: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
  msgid "|FILE|read options from FILE"
  msgstr "|DATEI|Konfigurationsoptionen aus DATEI lesen"
  
- #: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:177
  msgid "do not detach from the console"
  msgstr "Im Vordergrund laufen lassen"
  
@@@ -502,21 -388,14 +502,21 @@@ msgstr "PuTTY Unterstützung einschalte
  #. 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:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:481 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1025 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:358
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:124 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  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 at li.org>.\n"
  
- #: agent/gpg-agent.c:491
++#: agent/gpg-agent.c:490
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "Gebrauch: @GPG_AGENT@ [Optionen] [Kommando [Argumente]]"
  
- #: agent/gpg-agent.c:493
++#: agent/gpg-agent.c:492
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
@@@ -524,135 -403,100 +524,135 @@@ msgstr "
  "Syntax: @GPG_AGENT@ [Optionen] [Befehl [Argumente]]\n"
  "Verwaltung von geheimen Schlüsseln für @GNUPG@\n"
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:537 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:442
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr "ungültige Debugebene `%s' angegeben\n"
  
- #: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:793
++#: agent/gpg-agent.c:1082 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:812
  #, c-format
  msgid "Note: no default option file '%s'\n"
  msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
  
- #: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
- #: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1093 agent/gpg-agent.c:1935 g10/gpg.c:2510
++#: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:817
++#: dirmngr/dirmngr.c:1670 tools/symcryptrun.c:932
  #, c-format
  msgid "option file '%s': %s\n"
  msgstr "Optionendatei '%s': %s\n"
  
- #: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:806
++#: agent/gpg-agent.c:1101 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:825
  #, c-format
  msgid "reading options from '%s'\n"
  msgstr "Optionen werden aus '%s' gelesen\n"
  
- #: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
- #: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
++#: agent/gpg-agent.c:1223 g10/gpg.c:3643 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:936 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:527
  #, c-format
  msgid "Note: '%s' is not considered an option\n"
  msgstr "Hinweis: `%s' wird nicht als Option betrachtet\n"
  
- #: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
++#: agent/gpg-agent.c:2080 scd/scdaemon.c:1073 dirmngr/dirmngr.c:1081
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "Socket kann nicht erzeugt werden: %s\n"
  
- #: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
++#: agent/gpg-agent.c:2097 scd/scdaemon.c:1086 dirmngr/dirmngr.c:1094
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr "Der Name des Sockets `%s' ist zu lang\n"
  
- #: agent/gpg-agent.c:2134
++#: agent/gpg-agent.c:2135
  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:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
++#: agent/gpg-agent.c:2145 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1126
  msgid "error getting nonce for the socket\n"
  msgstr "Fehler beim Ermitteln der \"Nonce\" dieses Sockets\n"
  
- #: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
++#: agent/gpg-agent.c:2150 scd/scdaemon.c:1113 dirmngr/dirmngr.c:1129
  #, 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:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
- #: dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2160 agent/gpg-agent.c:2197 scd/scdaemon.c:1121
++#: dirmngr/dirmngr.c:1138
  #, 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:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:2165 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1143
  #, c-format
  msgid "listen() failed: %s\n"
  msgstr "Der listen()-Aufruf ist fehlgeschlagen: %s\n"
  
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
++#: agent/gpg-agent.c:2172 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1149
  #, c-format
  msgid "listening on socket '%s'\n"
  msgstr "Es wird auf Socket `%s' gehört\n"
  
- #: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: agent/gpg-agent.c:2191 agent/gpg-agent.c:2234 g10/exec.c:199
 +#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, c-format
  msgid "can't create directory '%s': %s\n"
  msgstr "Verzeichnis `%s' kann nicht erzeugt werden: %s\n"
  
- #: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: agent/gpg-agent.c:2194 agent/gpg-agent.c:2239 g10/openfile.c:491
 +#: g10/openfile.c:520 sm/keydb.c:103
  #, c-format
  msgid "directory '%s' created\n"
  msgstr "Verzeichnis `%s' erzeugt\n"
  
- #: agent/gpg-agent.c:2244
++#: agent/gpg-agent.c:2245
  #, c-format
  msgid "stat() failed for '%s': %s\n"
  msgstr "stat()-Aufruf für `%s' fehlgeschlagen: %s\n"
  
- #: agent/gpg-agent.c:2248
++#: agent/gpg-agent.c:2249
  #, 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:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
++#: agent/gpg-agent.c:2392 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1871
  #, 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:2598
++#: agent/gpg-agent.c:2599
  #, 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:2603
++#: agent/gpg-agent.c:2604
  #, 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:2678
++#: agent/gpg-agent.c:2679
  #, 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:2683
++#: agent/gpg-agent.c:2684
  #, 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:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
++#: agent/gpg-agent.c:2881 scd/scdaemon.c:1272 dirmngr/dirmngr.c:2075
  #, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "npth_select()-Aufruf fehlgeschlagen: %s - warte 1s\n"
  
- #: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2954 scd/scdaemon.c:1321
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s angehalten\n"
  
- #: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
++#: agent/gpg-agent.c:3092 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  msgid "no gpg-agent running in this session\n"
  msgstr "Der gpg-agent läuft nicht für diese Session\n"
  
@@@ -668,8 -510,6 +668,8 @@@ msgstr "
  "Syntax: gpg-preset-passphrase [Optionen] KEYGRIP\n"
  "Kennwortpuffer-Pflege\n"
  
- #: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
++#: agent/protect-tool.c:106 g10/gpg.c:424 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:153 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -677,9 -517,6 +677,9 @@@ msgstr "
  "@Befehle:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
- #: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:92 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:168 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -735,8 -564,6 +735,8 @@@ msgstr "Vom Benutzer abgebrochen\n
  msgid "error while asking for the passphrase: %s\n"
  msgstr "Fehler bei der Abfrage der Passphrase: %s\n"
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
- #: tools/gpgconf.c:323
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1472
++#: tools/gpgconf.c:328
  #, c-format
  msgid "error opening '%s': %s\n"
  msgstr "Fehler beim Öffnen von `%s': %s\n"
@@@ -918,9 -716,6 +918,9 @@@ msgstr "Schutzverfahren %d (%s) wird ni
  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:438
 +#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
- #: dirmngr/ldap-wrapper.c:710
++#: dirmngr/ldap-wrapper.c:711
  #, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "Fehler beim Erzeugen einer \"Pipe\": %s\n"
@@@ -932,8 -724,6 +932,8 @@@
  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:848 dirmngr/dirmngr.c:1155
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1167
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "Fehler beim \"Forken\" des Prozess: %s\n"
@@@ -978,27 -759,22 +978,27 @@@ msgstr "Verbindung zu '%s' kann nicht a
  msgid "problem setting the gpg-agent options\n"
  msgstr "Beim Setzen der gpg-agent Optionen ist ein Problem aufgetreten\n"
  
- #: common/sysutils.c:144
++#: common/sysutils.c:148
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "core-dump-Dateierzeugung kann nicht abgeschaltet werden: %s\n"
  
- #: common/sysutils.c:239
++#: common/sysutils.c:250
  #, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "WARNUNG: Unsichere Besitzrechte für %s \"%s\"\n"
  
- #: common/sysutils.c:271
++#: common/sysutils.c:282
  #, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "WARNUNG: Unsichere Zugriffsrechte für %s \"%s\"\n"
  
- #: common/sysutils.c:659
++#: common/sysutils.c:693
  #, 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:685
++#: common/sysutils.c:719
  #, c-format
  msgid "renaming '%s' to '%s' failed: %s\n"
  msgstr "umbenennen von `%s' nach `%s' schlug fehl: %s\n"
@@@ -1074,7 -835,6 +1074,7 @@@ msgstr "%s:%u: Die Option \"%s\" is ver
  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:554
++#: common/miscellaneous.c:556
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr "Unbekanntes Debug Flag '%s' wird ignoriert\n"
@@@ -1178,8 -915,6 +1178,8 @@@ msgstr "Sitzungsschlüssel erzeugt
  msgid "algorithm: %s"
  msgstr "Verfahren: %s"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3098
++#: scd/app-openpgp.c:3111
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "Nicht unterstütztes Verfahren: %s"
@@@ -1365,7 -1058,6 +1365,7 @@@ msgstr "Option \"%.50s\" ist mehrdeutig
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr "Befehl \"%.50s\" ist mehrdeutig\n"
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1173
++#: common/argparse.c:401 dirmngr/dirmngr.c:1185
  msgid "out of core\n"
  msgstr "Nicht genügend Speicher\n"
  
@@@ -1423,8 -1104,6 +1423,8 @@@ msgstr "Dateisperre %s konnte nicht ein
  msgid "waiting for lock %s...\n"
  msgstr "Warten auf die Freigabe der Dateisperre `%s' ...\n"
  
- #: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
- #: dirmngr/dirmngr.c:715
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:725
++#: dirmngr/dirmngr.c:734
  #, 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"
@@@ -1462,7 -1133,6 +1462,7 @@@ msgstr "Unerwartete ASCII-Hülle: 
  msgid "invalid dash escaped line: "
  msgstr "Ungültige mit Bindestrich \"escapte\" Zeile: "
  
- #: g10/armor.c:873 g10/armor.c:1490
++#: g10/armor.c:873 g10/armor.c:1493
  #, c-format
  msgid "invalid radix64 character %02X skipped\n"
  msgstr "Ungültiges \"radix64\" Zeichen %02x übersprungen\n"
@@@ -1479,7 -1146,6 +1479,7 @@@ msgstr "vorzeitiges Dateiende (innerhal
  msgid "malformed CRC\n"
  msgstr "Falsch aufgebaute Prüfsumme\n"
  
- #: g10/armor.c:962 g10/armor.c:1527
++#: g10/armor.c:962 g10/armor.c:1530
  #, c-format
  msgid "CRC error; %06lX - %06lX\n"
  msgstr "Prüfsummenfehler; %06lx - %06lx\n"
@@@ -1492,16 -1156,13 +1492,16 @@@ msgstr "vorzeitiges Dateiende (im Nachs
  msgid "error in trailer line\n"
  msgstr "Fehler in der Nachsatzzeile\n"
  
- #: g10/armor.c:1303
++#: g10/armor.c:1306
  msgid "no valid OpenPGP data found.\n"
  msgstr "Keine gültigen OpenPGP-Daten gefunden.\n"
  
- #: g10/armor.c:1308
++#: g10/armor.c:1311
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
  msgstr "ungültige ASCII-Hülle: Zeile ist länger als %d Zeichen\n"
  
- #: g10/armor.c:1312
++#: g10/armor.c:1315
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr ""
@@@ -1581,8 -1227,6 +1581,8 @@@ msgstr "OpenPGP Karte ist nicht vorhand
  msgid "OpenPGP card no. %s detected\n"
  msgstr "OpenPGP Karte Nr. %s erkannt\n"
  
- #: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
- #: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2030
++#: g10/keygen.c:4087 g10/revoke.c:215 g10/revoke.c:618
  msgid "can't do this in batch mode\n"
  msgstr "Dies kann im Batchmodus nicht durchgeführt werden.\n"
  
@@@ -1590,14 -1233,9 +1590,14 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "Dieser Befehl ist nur für Karten ab Version 2 möglich.\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2454
++#: g10/card-util.c:109 scd/app-openpgp.c:2467
  msgid "Reset Code not or not anymore available\n"
  msgstr "Der Rückstellcode ist nicht vorhanden\n"
  
 +#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
- #: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
- #: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1768
++#: g10/keygen.c:1945 g10/keygen.c:2313 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "Ihre Auswahl? "
  
@@@ -1660,10 -1284,6 +1660,10 @@@ msgstr "URL um den öffentlichen Schlü
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr "Fehler: URL ist zu lang (Grenze beträgt %d Zeichen).\n"
  
- #: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
- #: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:334
++#: g10/import.c:592 g10/import.c:640 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
++#: dirmngr/dirmngr.c:1510 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, c-format
  msgid "error reading '%s': %s\n"
  msgstr "Fehler beim Lesen von `%s': %s\n"
@@@ -1729,7 -1334,6 +1729,7 @@@ msgstr "Schlüsseloperation nicht mögl
  msgid "not an OpenPGP card"
  msgstr "Keine gültige OpenPGP-Karte"
  
- #: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
++#: g10/card-util.c:1173 g10/keygen.c:4106 g10/keygen.c:5092
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr "Fehler beim Holen der aktuellen Schlüsselinfo: %s\n"
@@@ -1767,13 -1366,10 +1767,13 @@@ msgid "What keysize do you want for th
  msgstr ""
  "Welche Schlüssellänge wünschen Sie für den Authentisierungs-Schlüssel? (%u) "
  
- #: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
++#: g10/card-util.c:1316 g10/keygen.c:2122 g10/keygen.c:2154
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "aufgerundet auf %u Bit\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2207 sm/certreqgen-ui.c:188
  #, 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"
@@@ -1830,9 -1416,6 +1830,9 @@@ msgstr "   (2) Verschlüsselungs-Schlü
  msgid "   (3) Authentication key\n"
  msgstr "   (3) Authentisierungs-Schlüssel\n"
  
- #: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
- #: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
- #: g10/keygen.c:2314 g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1508
++#: g10/keygen.c:1794 g10/keygen.c:1822 g10/keygen.c:1952 g10/keygen.c:2060
++#: g10/keygen.c:2336 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Ungültige Auswahl.\n"
  
@@@ -1863,7 -1440,6 +1863,7 @@@ msgstr "Fortsetzen? (j/N) 
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr "Möchten Sie die Karte wirklich komplett löschen? (\"yes\" eingeben) "
  
- #: g10/card-util.c:1816 g10/keyedit.c:1867
++#: g10/card-util.c:1816 g10/keyedit.c:1868
  msgid "quit this menu"
  msgstr "Menü verlassen"
  
@@@ -1871,7 -1446,6 +1871,7 @@@
  msgid "show admin commands"
  msgstr "Zeige Admin-Befehle"
  
- #: g10/card-util.c:1819 g10/keyedit.c:1870
++#: g10/card-util.c:1819 g10/keyedit.c:1871
  msgid "show this help"
  msgstr "Diese Hilfe zeigen"
  
@@@ -1947,30 -1503,20 +1947,30 @@@ msgstr "Admin-Befehle sind erlaubt\n
  msgid "Admin commands are not allowed\n"
  msgstr "Admin-Befehle sind nicht erlaubt\n"
  
- #: g10/card-util.c:2127 g10/keyedit.c:2816
++#: g10/card-util.c:2127 g10/keyedit.c:2817
  msgid "Invalid command  (try \"help\")\n"
  msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n"
  
- #: g10/decrypt.c:191 g10/encrypt.c:955
++#: g10/decrypt.c:190 g10/encrypt.c:955
  msgid "--output doesn't work for this command\n"
  msgstr "--output funktioniert nicht bei diesem Befehl\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4904 g10/keyring.c:398 g10/keyring.c:771
  #, c-format
  msgid "can't open '%s'\n"
  msgstr "'%s' kann nicht geöffnet werden\n"
  
 +#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
- #: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
- #: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4858 g10/keyedit.c:2051
++#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2163
  #, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "Schlüssel \"%s\" nicht gefunden: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
- #: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
- #: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4866 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:645 g10/tofu.c:2171
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "Fehler beim Lesen des Schlüsselblocks: %s\n"
@@@ -2030,7 -1564,6 +2030,7 @@@ msgstr "
  "Verwenden Sie zunächst den Befehl \"--delete-secret-key\", um ihn zu "
  "entfernen.\n"
  
- #: g10/encrypt.c:232 g10/sign.c:1292
++#: g10/encrypt.c:232 g10/sign.c:1294
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "Fehler beim Erzeugen der Passphrase: %s\n"
@@@ -2051,7 -1581,6 +2051,7 @@@ msgstr "benutze Cipher %s\n
  msgid "'%s' already compressed\n"
  msgstr "`%s' ist bereits komprimiert\n"
  
- #: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:610
  #, c-format
  msgid "WARNING: '%s' is an empty file\n"
  msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
@@@ -2069,7 -1596,6 +2069,7 @@@ msgstr "
  "WARNUNG: Erzwungene Verwendung des symmetrischen Verschlüsselungsverfahren "
  "%s (%d) verletzt die Empfängervoreinstellungen\n"
  
- #: g10/encrypt.c:707 g10/sign.c:984
++#: g10/encrypt.c:707 g10/sign.c:986
  #, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2105,7 -1626,6 +2105,7 @@@ msgstr "%s verschlüsselte Daten\n
  msgid "encrypted with unknown algorithm %d\n"
  msgstr "Mit unbekanntem Verfahren verschlüsselt %d\n"
  
- #: g10/decrypt-data.c:164 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:129
  msgid ""
  "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
  msgstr ""
@@@ -2195,8 -1697,6 +2195,8 @@@ msgstr "Während des Exports soviel wi
  msgid " - skipped"
  msgstr " - übersprungen"
  
- #: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:845 g10/sign.c:1148
++#: g10/export.c:1251 g10/import.c:1543 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:847 g10/sign.c:1150
  #, c-format
  msgid "writing to '%s'\n"
  msgstr "Schreiben nach '%s'\n"
@@@ -2219,8 -1715,6 +2219,8 @@@ msgstr "Schlüssel %s: PGP 2.x-artiger 
  msgid "WARNING: nothing exported\n"
  msgstr "WARNUNG: Nichts exportiert\n"
  
- #: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
- #: g10/plaintext.c:151 g10/plaintext.c:174
++#: g10/export.c:2283 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/plaintext.c:167 g10/plaintext.c:190
  #, c-format
  msgid "error creating '%s': %s\n"
  msgstr "Fehler beim Erstellen von `%s': %s\n"
@@@ -2265,8 -1750,6 +2265,8 @@@ msgstr "Fehler beim automatischen hole
  msgid "No fingerprint"
  msgstr "Kein Fingerabdruck vorhanden"
  
- #: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
- #: g10/revoke.c:701
++#: g10/getkey.c:1873 g10/keyedit.c:2929 g10/keyedit.c:3016 g10/revoke.c:637
++#: g10/revoke.c:702
  #, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "Geheimer Schlüssel \"%s\" nicht gefunden: %s\n"
@@@ -2299,199 -1777,153 +2299,203 @@@ 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/gpg.c:424 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:200
  msgid "make a signature"
  msgstr "Eine Signatur erzeugen"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:427
  msgid "make a clear text signature"
  msgstr "Eine Klartextsignatur erzeugen"
  
- #: g10/gpg.c:426 sm/gpgsm.c:202
++#: g10/gpg.c:429 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "Eine abgetrennte Signatur erzeugen"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:430 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "Daten verschlüsseln"
  
- #: g10/gpg.c:429
++#: g10/gpg.c:432
  msgid "encryption only with symmetric cipher"
  msgstr "Daten symmetrisch verschlüsseln"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:434 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "Daten entschlüsseln (Voreinstellung)"
  
- #: g10/gpg.c:433 sm/gpgsm.c:206
++#: g10/gpg.c:436 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "Signatur prüfen"
  
- #: g10/gpg.c:435 sm/gpgsm.c:207
++#: g10/gpg.c:438 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "Liste der Schlüssel"
  
- #: g10/gpg.c:437
++#: g10/gpg.c:440
  msgid "list keys and signatures"
  msgstr "Liste der Schlüssel und ihrer Signaturen"
  
- #: g10/gpg.c:438
++#: g10/gpg.c:443
  msgid "list and check key signatures"
  msgstr "Signaturen der Schlüssel auflisten und prüfen"
  
- #: g10/gpg.c:439 sm/gpgsm.c:212
++#: g10/gpg.c:445 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "Liste der Schlüssel und ihrer \"Fingerabdrücke\""
  
- #: g10/gpg.c:440 sm/gpgsm.c:210
++#: g10/gpg.c:446 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "Liste der geheimen Schlüssel"
  
- #: g10/gpg.c:442 sm/gpgsm.c:213
++#: g10/gpg.c:448 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "Ein neues Schlüsselpaar erzeugen"
  
- #: g10/gpg.c:444
++#: g10/gpg.c:451
  msgid "quickly generate a new key pair"
  msgstr "Schnell ein neues Schlüsselpaar erzeugen"
  
- #: g10/gpg.c:446
++#: g10/gpg.c:454
  msgid "quickly add a new user-id"
  msgstr "Schnell eine neue User-ID anfügen"
  
- #: g10/gpg.c:449
++#: g10/gpg.c:459
  msgid "quickly revoke a user-id"
  msgstr "Schnell eine User-ID widerrufen"
  
- #: g10/gpg.c:451
++#: g10/gpg.c:462
+ msgid "quickly set a new expiration date"
+ msgstr "Schnell ein neues Ablaufdatum setzen"
+ 
++#: g10/gpg.c:464
  msgid "full featured key pair generation"
  msgstr "Ein neues Schlüsselpaar erzeugen (alle Optionen)"
  
- #: g10/gpg.c:452
++#: g10/gpg.c:467
  msgid "generate a revocation certificate"
  msgstr "Ein Schlüsselwiderruf-Zertifikat erzeugen"
  
- #: g10/gpg.c:454 sm/gpgsm.c:215
++#: g10/gpg.c:470 sm/gpgsm.c:216
  msgid "remove keys from the public keyring"
  msgstr "Schlüssel aus dem öff. Schlüsselbund entfernen"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:472
  msgid "remove keys from the secret keyring"
  msgstr "Schlüssel aus dem geh. Schlüsselbund entfernen"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:474
  msgid "quickly sign a key"
  msgstr "Schlüssel schnell signieren"
  
- #: g10/gpg.c:460
++#: g10/gpg.c:476
  msgid "quickly sign a key locally"
  msgstr "Schlüssel schnell nur für diesen Rechner signieren"
  
- #: g10/gpg.c:461
++#: g10/gpg.c:477
  msgid "sign a key"
  msgstr "Schlüssel signieren"
  
- #: g10/gpg.c:462
++#: g10/gpg.c:478
  msgid "sign a key locally"
  msgstr "Schlüssel nur für diesen Rechner signieren"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:479
  msgid "sign or edit a key"
  msgstr "Signieren oder bearbeiten eines Schlüssels"
  
- #: g10/gpg.c:465 sm/gpgsm.c:233
++#: g10/gpg.c:481 sm/gpgsm.c:234
  msgid "change a passphrase"
  msgstr "Die Passphrase ändern"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:485
  msgid "export keys"
  msgstr "Schlüssel exportieren"
  
- #: g10/gpg.c:468
++#: g10/gpg.c:486
  msgid "export keys to a keyserver"
  msgstr "Schlüssel zu einem Schlü.server exportieren"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:487
  msgid "import keys from a keyserver"
  msgstr "Schlüssel von einem Schlü.server importieren"
  
- #: g10/gpg.c:471
++#: g10/gpg.c:490
  msgid "search for keys on a keyserver"
  msgstr "Schlüssel auf einem Schlü.server suchen"
  
- #: g10/gpg.c:473
++#: g10/gpg.c:492
  msgid "update all keys from a keyserver"
  msgstr "alle Schlüssel per Schlü.server aktualisieren"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:498
  msgid "import/merge keys"
  msgstr "Schlüssel importieren/kombinieren"
  
- #: g10/gpg.c:482
++#: g10/gpg.c:501
  msgid "print the card status"
  msgstr "den Karten-Status ausgeben"
  
- #: g10/gpg.c:483
++#: g10/gpg.c:502
  msgid "change data on a card"
  msgstr "Daten auf einer Karte ändern"
  
- #: g10/gpg.c:484
++#: g10/gpg.c:504
  msgid "change a card's PIN"
  msgstr "PIN einer Karte ändern"
  
- #: g10/gpg.c:496
++#: g10/gpg.c:516
  msgid "update the trust database"
  msgstr "Ändern der \"Trust\"-Datenbank"
  
- #: g10/gpg.c:505
++#: g10/gpg.c:525
  msgid "print message digests"
  msgstr "Hashwerte für die Dateien ausgeben"
  
- #: g10/gpg.c:508 sm/gpgsm.c:228
++#: g10/gpg.c:528 sm/gpgsm.c:229
  msgid "run in server mode"
  msgstr "Im Server Modus ausführen"
  
- #: g10/gpg.c:510
++#: g10/gpg.c:530
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr "|WERT|Setze die TOFU-Politik für einen Schlüssel"
  
- #: g10/gpg.c:514 sm/gpgsm.c:246
++#: g10/gpg.c:534 sm/gpgsm.c:248
  msgid "create ascii armored output"
  msgstr "Ausgabe mit ASCII-Hülle versehen"
  
- #: g10/gpg.c:517 sm/gpgsm.c:262
++#: g10/gpg.c:537 sm/gpgsm.c:264
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|USER-ID|Verschlüsseln für USER-ID"
  
- #: g10/gpg.c:533 sm/gpgsm.c:298
++#: g10/gpg.c:553 sm/gpgsm.c:300
  msgid "|USER-ID|use USER-ID to sign or decrypt"
  msgstr "|USER-ID|Mit USER-ID signieren bzw. entschlüsseln"
  
- #: g10/gpg.c:539
++#: g10/gpg.c:559
  msgid "|N|set compress level to N (0 disables)"
  msgstr "|N|Kompressionsstufe auf N setzen (0=keine)"
  
- #: g10/gpg.c:546
++#: g10/gpg.c:566
  msgid "use canonical text mode"
  msgstr "Textmodus benutzen"
  
- #: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
++#: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
  msgid "|FILE|write output to FILE"
  msgstr "|DATEI|Ausgabe auf DATEI schreiben"
  
- #: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
++#: g10/gpg.c:598 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
  msgid "do not make any changes"
  msgstr "Keine wirklichen Änderungen durchführen"
  
- #: g10/gpg.c:579
++#: g10/gpg.c:599
  msgid "prompt before overwriting"
  msgstr "vor Überschreiben nachfragen"
  
- #: g10/gpg.c:628
++#: g10/gpg.c:648
  msgid "use strict OpenPGP behavior"
  msgstr "OpenPGP-Verhalten strikt beachten"
  
- #: g10/gpg.c:654 sm/gpgsm.c:355
++#: g10/gpg.c:674 sm/gpgsm.c:357
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2500,7 -1932,6 +2504,7 @@@ msgstr "
  "(Auf der \"man\"-Seite ist eine vollständige Liste aller Befehle und "
  "Optionen)\n"
  
- #: g10/gpg.c:657 sm/gpgsm.c:358
++#: g10/gpg.c:677
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2520,11 -1951,9 +2524,11 @@@ msgstr "
  " --list-keys [Namen]        Schlüssel anzeigen\n"
  " --fingerprint [Namen]      \"Fingerabdrücke\" anzeigen\n"
  
- #: g10/gpg.c:1026
++#: g10/gpg.c:1047
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
  msgstr "Aufruf: @GPG@ [Optionen] [Dateien] (-h für Hilfe)"
  
- #: g10/gpg.c:1029
++#: g10/gpg.c:1050
  msgid ""
  "Syntax: @GPG@ [options] [files]\n"
  "Sign, check, encrypt or decrypt\n"
@@@ -2534,7 -1963,6 +2538,7 @@@ msgstr "
  "Signieren, prüfen, verschlüsseln, entschlüsseln.\n"
  "Die voreingestellte Operation ist abhängig von den Eingabedaten\n"
  
- #: g10/gpg.c:1040 sm/gpgsm.c:588
++#: g10/gpg.c:1061 sm/gpgsm.c:580
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2542,74 -1970,59 +2546,74 @@@ msgstr "
  "\n"
  "Unterstützte Verfahren:\n"
  
- #: g10/gpg.c:1043
++#: g10/gpg.c:1064
  msgid "Pubkey: "
  msgstr "Öff. Schlüssel: "
  
- #: g10/gpg.c:1050 g10/keyedit.c:3402
++#: g10/gpg.c:1071 g10/keyedit.c:3483
  msgid "Cipher: "
  msgstr "Verschlü.: "
  
- #: g10/gpg.c:1057
++#: g10/gpg.c:1078
  msgid "Hash: "
  msgstr "Hash: "
  
- #: g10/gpg.c:1064 g10/keyedit.c:3451
++#: g10/gpg.c:1085 g10/keyedit.c:3532
  msgid "Compression: "
  msgstr "Komprimierung: "
  
- #: g10/gpg.c:1133 sm/gpgsm.c:662
++#: g10/gpg.c:1154 sm/gpgsm.c:654
  #, c-format
  msgid "usage: %s [options] %s\n"
  msgstr "Aufruf: %s [Optionen] %s\n"
  
- #: g10/gpg.c:1321 sm/gpgsm.c:751
++#: g10/gpg.c:1342 sm/gpgsm.c:743
  msgid "conflicting commands\n"
  msgstr "Widersprüchliche Befehle\n"
  
- #: g10/gpg.c:1339
++#: g10/gpg.c:1360
  #, c-format
  msgid "no = sign found in group definition '%s'\n"
  msgstr "Kein '='-Zeichen in der Gruppendefinition gefunden `%s'\n"
  
- #: g10/gpg.c:1537
++#: g10/gpg.c:1558
  #, c-format
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr "WARNUNG: Unsicheres Besitzverhältnis des Home-Verzeichnis `%s'\n"
  
- #: g10/gpg.c:1540
++#: g10/gpg.c:1561
  #, c-format
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
  msgstr "WARNUNG: Unsicheres Besitzverhältnis der Konfigurationsdatei `%s'\n"
  
- #: g10/gpg.c:1543
++#: g10/gpg.c:1564
  #, c-format
  msgid "WARNING: unsafe ownership on extension '%s'\n"
  msgstr "WARNUNG: Unsicheres Besitzverhältnis auf die Erweiterung `%s'\n"
  
- #: g10/gpg.c:1549
++#: g10/gpg.c:1570
  #, c-format
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
  msgstr "WARNUNG: Unsichere Zugriffsrechte des Home-Verzeichnis `%s'\n"
  
- #: g10/gpg.c:1552
++#: g10/gpg.c:1573
  #, c-format
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
  msgstr "WARNUNG: Unsichere Zugriffsrechte der Konfigurationsdatei `%s'\n"
  
- #: g10/gpg.c:1555
++#: g10/gpg.c:1576
  #, c-format
  msgid "WARNING: unsafe permissions on extension '%s'\n"
  msgstr "WARNUNG: Unsichere Zugriffsrechte auf die Erweiterung `%s'\n"
  
- #: g10/gpg.c:1561
++#: g10/gpg.c:1582
  #, 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:1564
++#: g10/gpg.c:1585
  #, c-format
  msgid ""
  "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@@ -2617,20 -2030,17 +2621,20 @@@ msgstr "
  "WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses der "
  "Konfigurationsdatei '%s'\n"
  
- #: g10/gpg.c:1567
++#: g10/gpg.c:1588
  #, 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:1573
++#: g10/gpg.c:1594
  #, 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:1576
++#: g10/gpg.c:1597
  #, c-format
  msgid ""
  "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2638,507 -2048,350 +2642,447 @@@ msgstr "
  "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses der "
  "Konfigurationsdatei '%s'\n"
  
- #: g10/gpg.c:1579
++#: g10/gpg.c:1600
  #, 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:1786
++#: g10/gpg.c:1816
  #, c-format
  msgid "unknown configuration item '%s'\n"
  msgstr "Unbekanntes Konfigurationselement `%s'\n"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1925
  msgid "display photo IDs during key listings"
  msgstr "Anzeigen der Foto-ID in den Schlüssellisten"
  
- #: g10/gpg.c:1895
++#: g10/gpg.c:1927
  msgid "show key usage information during key listings"
  msgstr "Schlüsselverwendungszwecke mit den Schlüsseln anlisten"
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1929
  msgid "show policy URLs during signature listings"
  msgstr "Richtlinien-URL mit den Signaturen anlisten"
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1931
  msgid "show all notations during signature listings"
  msgstr "Alle Notationen mit den Signaturen anlisten"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1933
  msgid "show IETF standard notations during signature listings"
  msgstr "Standard Notationen mit den Signaturen anlisten"
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1937
  msgid "show user-supplied notations during signature listings"
  msgstr "Benutzer-Notationen mit den Signaturen anlisten"
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1939
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "Bevorzugten Schlüsselserver mit den Signaturen anlisten"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1941
  msgid "show user ID validity during key listings"
  msgstr "Zeige Gültigkeit der User-ID in den Schlüssellisten"
  
- #: g10/gpg.c:1911
++#: g10/gpg.c:1943
  msgid "show revoked and expired user IDs in key listings"
  msgstr "Zeige widerrufene und verfallene User-ID in den Schlüssellisten"
  
- #: g10/gpg.c:1913
++#: g10/gpg.c:1945
  msgid "show revoked and expired subkeys in key listings"
  msgstr "Zeige widerrufene und verfallene Unterschlüssel in den Schlüssellisten"
  
- #: g10/gpg.c:1915
++#: g10/gpg.c:1947
  msgid "show the keyring name in key listings"
  msgstr "Anzeigen des Schlüsselbundes, in dem ein Schlüssel drin ist"
  
- #: g10/gpg.c:1917
++#: g10/gpg.c:1949
  msgid "show expiration dates during signature listings"
  msgstr "Das Ablaufdatum mit den Signaturen anlisten"
  
- #: g10/gpg.c:2019 g10/gpg.c:2056
++#: g10/gpg.c:2051 g10/gpg.c:2088
  #, c-format
  msgid "valid values for option '%s':\n"
  msgstr "Gültige Argumente für Option '%s':\n"
  
- #: g10/gpg.c:2030
++#: g10/gpg.c:2062
  #, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "Unbekannte TOFU Regel '%s'\n"
  
- #: g10/gpg.c:2032 g10/gpg.c:2068
++#: g10/gpg.c:2064 g10/gpg.c:2100
  msgid "(use \"help\" to list choices)\n"
  msgstr "(\"help\" um mögliche Werte anzuzeigen)\n"
  
- #: g10/gpg.c:2066
++#: g10/gpg.c:2098 g10/keygen.c:167
  #, c-format
  msgid "invalid value for option '%s'\n"
  msgstr "Ungültiges Argument für Option '%s'\n"
  
- #: g10/gpg.c:2203
++#: g10/gpg.c:2235
  #, c-format
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
  
- #: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
++#: g10/gpg.c:2839 g10/gpg.c:3610 g10/gpg.c:3622
  #, 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:2978 g10/gpg.c:2990
++#: g10/gpg.c:3011 g10/gpg.c:3023
  #, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "`%s' ist kein gültiges Signaturablaufdatum\n"
  
- #: g10/gpg.c:3012
++#: g10/gpg.c:3045
  #, c-format
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "\"%s\" ist keine gültige E-Mailadresse\n"
  
- #: g10/gpg.c:3044 sm/gpgsm.c:1166
++#: g10/gpg.c:3077 sm/gpgsm.c:1158
  #, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "Ungültiger Subjekt-Name '%s'\n"
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3130
  #, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "`%s' ist kein gültiger Zeichensatz\n"
  
- #: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
++#: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
  msgid "could not parse keyserver URL\n"
  msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
  
- #: g10/gpg.c:3137
++#: g10/gpg.c:3170
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: ungültige Schlüsselserver-Option\n"
  
- #: g10/gpg.c:3140
++#: g10/gpg.c:3173
  msgid "invalid keyserver options\n"
  msgstr "Ungültige Schlüsselserver-Option\n"
  
- #: g10/gpg.c:3147
++#: g10/gpg.c:3180
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: ungültige Import-Option\n"
  
- #: g10/gpg.c:3150
++#: g10/gpg.c:3183
  msgid "invalid import options\n"
  msgstr "Ungültige Import-Option\n"
  
- #: g10/gpg.c:3156 g10/gpg.c:3171
++#: g10/gpg.c:3189 g10/gpg.c:3204
  #, c-format
  msgid "invalid filter option: %s\n"
  msgstr "Ungültige Filter-Option: %s\n"
  
- #: g10/gpg.c:3162
++#: g10/gpg.c:3195
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: ungültige Export-Option.\n"
  
- #: g10/gpg.c:3165
++#: g10/gpg.c:3198
  msgid "invalid export options\n"
  msgstr "Ungültige Export-Option\n"
  
- #: g10/gpg.c:3177
++#: g10/gpg.c:3210
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: ungültige Listen-Option.\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3213
  msgid "invalid list options\n"
  msgstr "Ungültige Listen-Option\n"
  
- #: g10/gpg.c:3188
++#: g10/gpg.c:3221
  msgid "display photo IDs during signature verification"
  msgstr "Foto-ID während der Signaturprüfung anzeigen"
  
- #: g10/gpg.c:3190
++#: g10/gpg.c:3223
  msgid "show policy URLs during signature verification"
  msgstr "Richtlinien-URLs während der Signaturprüfung anzeigen"
  
- #: g10/gpg.c:3192
++#: g10/gpg.c:3225
  msgid "show all notations during signature verification"
  msgstr "Alle Notationen während der Signaturprüfung anzeigen"
  
- #: g10/gpg.c:3194
++#: g10/gpg.c:3227
  msgid "show IETF standard notations during signature verification"
  msgstr "Standard-Notationen während der Signaturprüfung anzeigen"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3231
  msgid "show user-supplied notations during signature verification"
  msgstr "Benutzer-Notationen während der Signaturprüfung anzeigen"
  
- #: g10/gpg.c:3200
++#: g10/gpg.c:3233
  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:3202
++#: g10/gpg.c:3235
  msgid "show user ID validity during signature verification"
  msgstr "Die Gültigkeit der User-ID während der Signaturprüfung anzeigen"
  
- #: g10/gpg.c:3204
++#: g10/gpg.c:3237
  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:3206
++#: g10/gpg.c:3239
  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:3208
++#: g10/gpg.c:3241
  msgid "validate signatures with PKA data"
  msgstr "Prüfe Signaturgültigkeit mittels PKA-Daten"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3243
  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:3217
++#: g10/gpg.c:3250
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: ungültige Überprüfungs-Option.\n"
  
- #: g10/gpg.c:3220
++#: g10/gpg.c:3253
  msgid "invalid verify options\n"
  msgstr "Ungültige Überprüfungs-Option\n"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3260
  #, 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:3417
++#: g10/gpg.c:3452
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: ungültige \"auto-key-locate\"-Liste\n"
  
- #: g10/gpg.c:3420
++#: g10/gpg.c:3455
  msgid "invalid auto-key-locate list\n"
  msgstr "ungültige \"auto-key-locate\"-Liste\n"
  
- #: g10/gpg.c:3553 sm/gpgsm.c:1507
++#: g10/gpg.c:3592 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
  msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
  
- #: g10/gpg.c:3564
++#: g10/gpg.c:3603
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "WARNUNG: %s ersetzt %s\n"
  
- #: g10/gpg.c:3573
++#: g10/gpg.c:3612
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s zusammen mit %s ist nicht erlaubt!\n"
  
- #: g10/gpg.c:3576
++#: g10/gpg.c:3615
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
  
- #: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
++#: g10/gpg.c:3630 sm/gpgsm.c:1518 dirmngr/dirmngr.c:951
  msgid "WARNING: running with faked system time: "
  msgstr "WARNUNG: Ausführung mit gefälschter Systemzeit: "
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3651
  #, 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:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
++#: g10/gpg.c:3686 g10/gpg.c:3710 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
  
- #: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
++#: g10/gpg.c:3692 g10/gpg.c:3716 sm/gpgsm.c:1591 sm/gpgsm.c:1597
  msgid "selected digest algorithm is invalid\n"
  msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
  
- #: g10/gpg.c:3659
++#: g10/gpg.c:3698
  msgid "selected compression algorithm is invalid\n"
  msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n"
  
- #: g10/gpg.c:3665
++#: g10/gpg.c:3704
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
  
- #: g10/gpg.c:3680
++#: g10/gpg.c:3719
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed müssen größer als 0 sein\n"
  
- #: g10/gpg.c:3682
++#: g10/gpg.c:3721
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed müssen größer als 1 sein\n"
  
- #: g10/gpg.c:3684
++#: g10/gpg.c:3723
  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:3686
++#: g10/gpg.c:3725
  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:3688
++#: g10/gpg.c:3727
  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:3691
++#: g10/gpg.c:3730
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
  msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
  
- #: g10/gpg.c:3695
++#: g10/gpg.c:3734
  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:3702
++#: g10/gpg.c:3741
  msgid "invalid default preferences\n"
  msgstr "ungültige Standard-Voreinstellungen\n"
  
- #: g10/gpg.c:3706
++#: g10/gpg.c:3745
  msgid "invalid personal cipher preferences\n"
  msgstr "ungültige private Verschlüsselungsvoreinstellungen\n"
  
- #: g10/gpg.c:3710
++#: g10/gpg.c:3749
  msgid "invalid personal digest preferences\n"
  msgstr "ungültige private Hashvoreinstellungen\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3753
  msgid "invalid personal compress preferences\n"
  msgstr "ungültige private Komprimierungsvoreinstellungen\n"
  
- #: g10/gpg.c:3750
++#: g10/gpg.c:3789
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s arbeitet noch nicht mit %s zusammen\n"
  
- #: g10/gpg.c:3797
++#: g10/gpg.c:3836
  #, c-format
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr ""
  "Die Benutzung des Verschlüsselungsverfahren %s ist im %s-Modus nicht "
  "erlaubt.\n"
  
- #: g10/gpg.c:3802
++#: g10/gpg.c:3841
  #, c-format
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr "Die Benutzung der Hashmethode %s ist im %s-Modus nicht erlaubt.\n"
  
- #: g10/gpg.c:3807
++#: g10/gpg.c:3846
  #, c-format
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr ""
  "Die Benutzung des Komprimierverfahren %s ist im %s-Modus nicht erlaubt.\n"
  
- #: g10/gpg.c:3906
++#: g10/gpg.c:3945
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:3957
  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:3975
- msgid "--store [filename]"
- msgstr "--store [Dateiname]"
- 
- #: g10/gpg.c:3985
- msgid "--symmetric [filename]"
- msgstr "--symmetric [Dateiname]"
- 
- #: g10/gpg.c:3989
++#: g10/gpg.c:4028
  #, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "Symmetrische Entschlüsselung von `%s' fehlgeschlagen: %s\n"
  
- #: g10/gpg.c:4000
- msgid "--encrypt [filename]"
- msgstr "--encrypt [Dateiname]"
- 
- #: g10/gpg.c:4016
- msgid "--symmetric --encrypt [filename]"
- msgstr "--symmetric --encrypt [Dateiname]"
- 
- #: g10/gpg.c:4018
++#: g10/gpg.c:4057
  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:4021
++#: g10/gpg.c:4060
  #, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr "Im %s-Modus kann --symmetric --encrypt nicht verwendet werden.\n"
  
- #: g10/gpg.c:4042
- msgid "--sign [filename]"
- msgstr "--sign [Dateiname]"
- 
- #: g10/gpg.c:4058
- msgid "--sign --encrypt [filename]"
- msgstr "--sign --encrypt [Dateiname]"
- 
- #: g10/gpg.c:4076
- msgid "--symmetric --sign --encrypt [filename]"
- msgstr "--symmetric --sign --encrypt [Dateiname]"
- 
- #: g10/gpg.c:4078
++#: g10/gpg.c:4117
  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:4081
++#: g10/gpg.c:4120
  #, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr ""
  "Im %s-Modus kann --symmetric --sign --encrypt nicht verwendet werden.\n"
  
- #: g10/gpg.c:4105
- msgid "--sign --symmetric [filename]"
- msgstr "--sign --symmetric [Dateiname]"
- 
- #: g10/gpg.c:4117
- msgid "--clearsign [filename]"
- msgstr "--clearsign [Dateiname]"
- 
- #: g10/gpg.c:4147
- msgid "--decrypt [filename]"
- msgstr "--decrypt [Dateiname]"
- 
- #: g10/gpg.c:4174
- msgid "--sign-key user-id"
- msgstr "--sign-key User-ID"
- 
- #: g10/gpg.c:4178
- msgid "--lsign-key user-id"
- msgstr "--lsign-key User-ID"
- 
- #: g10/gpg.c:4199
- msgid "--edit-key user-id [commands]"
- msgstr "--edit-key User-ID [Befehle]"
- 
- #: g10/gpg.c:4215
- msgid "--passwd <user-id>"
- msgstr "--passwd User-ID"
- 
- #: g10/gpg.c:4411 g10/keyserver.c:1837
++#: g10/gpg.c:4462 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n"
  
- #: g10/gpg.c:4416
++#: g10/gpg.c:4467
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n"
  
- #: g10/gpg.c:4422
++#: g10/gpg.c:4473
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "Schlüsselexport fehlgeschlagen: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4486
  #, c-format
  msgid "export as ssh key failed: %s\n"
  msgstr "Schlüsselexport im SSH Format fehlgeschlagen: %s\n"
  
- #: g10/gpg.c:4447
++#: g10/gpg.c:4498
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n"
  
- #: g10/gpg.c:4460
++#: g10/gpg.c:4511
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4578
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
  
- #: g10/gpg.c:4538
++#: g10/gpg.c:4589
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
  
- #: g10/gpg.c:4630
++#: g10/gpg.c:4681
  #, c-format
  msgid "invalid hash algorithm '%s'\n"
  msgstr "Ungültiges Hashverfahren '%s'\n"
  
- #: g10/gpg.c:4776 g10/tofu.c:2002
++#: g10/gpg.c:4827 g10/tofu.c:2151
  #, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "Fehler in der Schlüsselangabe '%s': %s\n"
  
- #: g10/gpg.c:4788
++#: g10/gpg.c:4839
  #, 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:4835
- msgid "[filename]"
- msgstr "[Dateiname]"
- 
- #: g10/gpg.c:4841
++#: g10/gpg.c:4894
  msgid "Go ahead and type your message ...\n"
  msgstr "Auf geht's - Botschaft eintippen ...\n"
  
- #: g10/gpg.c:5179
++#: g10/gpg.c:5232
  msgid "the given certification policy URL is invalid\n"
  msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n"
  
- #: g10/gpg.c:5181
++#: g10/gpg.c:5234
  msgid "the given signature policy URL is invalid\n"
  msgstr "Die angegebene Signatur-Richtlinien-URL ist ungültig\n"
  
- #: g10/gpg.c:5214
++#: g10/gpg.c:5267
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "Die angegebene URL des bevorzugten Schlüsselserver ist ungültig\n"
  
@@@ -3150,7 -2401,6 +3094,7 @@@ msgstr "|DATEI|Schlüssel aus der Schl�
  msgid "make timestamp conflicts only a warning"
  msgstr "differierende Zeitangaben sind kein Fehler"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:345
++#: g10/gpgv.c:82 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
  
@@@ -3179,133 -2424,105 +3123,133 @@@ msgstr "Keine Hilfe vorhanden.
  msgid "No help available for '%s'"
  msgstr "Keine Hilfe für '%s' vorhanden."
  
- #: g10/import.c:151
++#: g10/import.c:152
  msgid "import signatures that are marked as local-only"
  msgstr "Importiere Signaturen, die als nicht exportfähig markiert sind"
  
- #: g10/import.c:154
++#: g10/import.c:155
  msgid "repair damage from the pks keyserver during import"
  msgstr "Beseitige Beschädigung durch den Schlüsselserver während des Imports"
  
- #: g10/import.c:157
++#: g10/import.c:158
  msgid "do not clear the ownertrust values during import"
  msgstr "die \"Ownertrust\" Werte beim Import nicht löschen"
  
- #: g10/import.c:160
++#: g10/import.c:161
  msgid "do not update the trustdb after import"
  msgstr "ändern Sie die \"Trust\"-Datenbank nach dem Import nicht"
  
- #: g10/import.c:163
++#: g10/import.c:164
  msgid "show key during import"
  msgstr "Schlüssel beim Import anzeigen"
  
- #: g10/import.c:166
++#: g10/import.c:167
  msgid "only accept updates to existing keys"
  msgstr "Nur Änderungen bereits existierender Schlüssel vornehmen"
  
- #: g10/import.c:169
++#: g10/import.c:170
  msgid "remove unusable parts from key after import"
  msgstr "entferne nach dem Import unbrauchbare Teile des Schlüssels"
  
- #: g10/import.c:172
++#: g10/import.c:173
  msgid "remove as much as possible from key after import"
  msgstr "nach dem Import soviel wie möglich aus dem Schlüssel entfernen"
  
- #: g10/import.c:175
++#: g10/import.c:176
  msgid "run import filters and export key immediately"
  msgstr "Import-Filter anwenden und Schlüssel direkt exportieren"
  
- #: g10/import.c:326 g10/import.c:568
++#: g10/import.c:327 g10/import.c:569
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "überspringe den Block vom Typ %d\n"
  
- #: g10/import.c:585
++#: g10/import.c:586
  #, c-format
  msgid "%lu keys processed so far\n"
  msgstr "%lu Schlüssel bislang bearbeitet\n"
  
- #: g10/import.c:655
++#: g10/import.c:656
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "Anzahl insgesamt bearbeiteter Schlüssel: %lu\n"
  
- #: g10/import.c:658
++#: g10/import.c:659
  #, c-format
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "             ignorierte PGP-2 Schlüssel: %lu\n"
  
- #: g10/import.c:660
++#: g10/import.c:661
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "              ignorierte neue Schlüssel: %lu\n"
  
- #: g10/import.c:663
++#: g10/import.c:664
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "                           ohne User-ID: %lu\n"
  
- #: g10/import.c:666 sm/import.c:130
++#: g10/import.c:667 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "                             importiert: %lu"
  
- #: g10/import.c:670 sm/import.c:134
++#: g10/import.c:671 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "                            unverändert: %lu\n"
  
- #: g10/import.c:672
++#: g10/import.c:673
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "                          neue User-IDs: %lu\n"
  
- #: g10/import.c:674
++#: g10/import.c:675
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "                    neue Unterschlüssel: %lu\n"
  
- #: g10/import.c:676
++#: g10/import.c:677
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "                        neue Signaturen: %lu\n"
  
- #: g10/import.c:678
++#: g10/import.c:679
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "                neue Schlüsselwiderrufe: %lu\n"
  
- #: g10/import.c:680 sm/import.c:136
++#: g10/import.c:681 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "             gelesene geheime Schlüssel: %lu\n"
  
- #: g10/import.c:682 sm/import.c:138
++#: g10/import.c:683 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "           geheime Schlüssel importiert: %lu\n"
  
- #: g10/import.c:684 sm/import.c:140
++#: g10/import.c:685 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr "                unveränderte geh. Schl.: %lu\n"
  
- #: g10/import.c:686 sm/import.c:142
++#: g10/import.c:687 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "                       nicht importiert: %lu\n"
  
- #: g10/import.c:688
++#: g10/import.c:689
  #, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "    Signaturen bereinigt: %lu\n"
  
- #: g10/import.c:690
++#: g10/import.c:691
  #, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "      User-IDs bereinigt: %lu\n"
  
- #: g10/import.c:1034
++#: g10/import.c:1035
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
@@@ -3314,191 -2531,153 +3258,191 @@@ msgstr "
  "WARNUNG: Schlüssel %s hat Einstellungen zu nicht verfügbaren\n"
  "Verfahren für folgende User-ID:\n"
  
- #: g10/import.c:1076
++#: g10/import.c:1077
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr "         \"%s\": Einstellungen des Verschlüsselungsverfahren %s\n"
  
- #: g10/import.c:1091
++#: g10/import.c:1092
  #, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "         \"%s\": Einstellungen der Hashmethode %s\n"
  
- #: g10/import.c:1103
++#: g10/import.c:1104
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr "         \"%s\": Einstellungen der Komprimierungsverfahren %s\n"
  
- #: g10/import.c:1116
++#: g10/import.c:1117
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr "es ist extrem empfehlenswert Ihre Einstellungen zu ändern und\n"
  
- #: g10/import.c:1118
++#: g10/import.c:1119
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  "diesen Schlüssel wieder zu verteilen, um mögliche Probleme durch unpassende "
  "Verfahrenskombinationen zu vermeiden\n"
  
- #: g10/import.c:1143
++#: g10/import.c:1144
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  "Sie können Ihren Einstellungen mittels \"gpg --edit-key %s updpref save\" "
  "ändern\n"
  
- #: g10/import.c:1379 g10/import.c:2167
++#: g10/import.c:1380 g10/import.c:2168
  #, c-format
  msgid "key %s: no user ID\n"
  msgstr "Schlüssel %s: Keine User-ID\n"
  
- #: g10/import.c:1385
++#: g10/import.c:1386
  #, c-format
  msgid "key %s: %s\n"
  msgstr "Schlüssel %s: %s\n"
  
- #: g10/import.c:1386 g10/import.c:2141
++#: g10/import.c:1387 g10/import.c:2142
  msgid "rejected by import screener"
  msgstr "vom Import-Aufpasser zurückgewiesen"
  
- #: g10/import.c:1416
++#: g10/import.c:1417
  #, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "Schlüssel %s: PKS Unterschlüsseldefekt repariert\n"
  
- #: g10/import.c:1434
++#: g10/import.c:1435
  #, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "Schlüssel %s: Nicht eigenbeglaubigte User-ID `%s' übernommen\n"
  
- #: g10/import.c:1444 g10/import.c:1475
++#: g10/import.c:1445 g10/import.c:1476
  #, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "Schlüssel %s: Keine gültigen User-IDs\n"
  
- #: g10/import.c:1446
++#: g10/import.c:1447
  msgid "this may be caused by a missing self-signature\n"
  msgstr "dies könnte durch fehlende Eigenbeglaubigung verursacht worden sein\n"
  
- #: g10/import.c:1516 g10/import.c:2318
++#: g10/import.c:1517 g10/import.c:2319
  #, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "Schlüssel %s: Öffentlicher Schlüssel nicht gefunden: %s\n"
  
- #: g10/import.c:1522
++#: g10/import.c:1523
  #, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "Schlüssel %s: neuer Schlüssel - übersprungen\n"
  
- #: g10/import.c:1537
++#: g10/import.c:1538
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "kein schreibbarer Schlüsselbund gefunden: %s\n"
  
- #: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
++#: g10/import.c:1547 g10/import.c:1648 g10/import.c:2385
  #, c-format
  msgid "error writing keyring '%s': %s\n"
  msgstr "Fehler beim Schreiben des Schlüsselbundes `%s': %s\n"
  
- #: g10/import.c:1566
++#: g10/import.c:1567
  #, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "Schlüssel %s: Öffentlicher Schlüssel \"%s\" importiert\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1591
  #, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "Schlüssel %s: Stimmt nicht mit unserer Kopie überein\n"
  
- #: g10/import.c:1606 g10/import.c:2342
++#: g10/import.c:1607 g10/import.c:2343
  #, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "Schlüssel %s: der originale Schlüsselblock wurde nicht gefunden: %s\n"
  
- #: g10/import.c:1614 g10/import.c:2349
++#: g10/import.c:1615 g10/import.c:2350
  #, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "Schlüssel %s: Lesefehler im originalen Schlüsselblock: %s\n"
  
- #: g10/import.c:1657
++#: g10/import.c:1658
  #, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "Schlüssel %s: \"%s\" 1 neue User-ID\n"
  
- #: g10/import.c:1660
++#: g10/import.c:1661
  #, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "Schlüssel %s: \"%s\" %d neue User-IDs\n"
  
- #: g10/import.c:1663
++#: g10/import.c:1664
  #, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "Schlüssel %s: \"%s\" 1 neue Signatur\n"
  
- #: g10/import.c:1666
++#: g10/import.c:1667
  #, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "Schlüssel %s: \"%s\" %d neue Signaturen\n"
  
- #: g10/import.c:1669
++#: g10/import.c:1670
  #, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "Schlüssel %s: \"%s\" 1 neuer Unterschlüssel\n"
  
- #: g10/import.c:1672
++#: g10/import.c:1673
  #, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "Schlüssel %s: \"%s\" %d neue Unterschlüssel\n"
  
- #: g10/import.c:1675
++#: g10/import.c:1676
  #, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "Schlüssel %s: \"%s\" %d Signaturen bereinigt\n"
  
- #: g10/import.c:1678
++#: g10/import.c:1679
  #, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "Schlüssel %s: \"%s\" %d Signaturen bereinigt\n"
  
- #: g10/import.c:1681
++#: g10/import.c:1682
  #, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "Schlüssel %s: \"%s\" %d User-ID bereinigt\n"
  
- #: g10/import.c:1684
++#: g10/import.c:1685
  #, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "Schlüssel %s: \"%s\" %d User-IDs bereinigt\n"
  
- #: g10/import.c:1707
++#: g10/import.c:1708
  #, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "Schlüssel %s: \"%s\" nicht geändert\n"
  
- #: g10/import.c:2019 g10/import.c:2264
++#: g10/import.c:2020 g10/import.c:2265
  #, c-format
  msgid "key %s: secret key imported\n"
  msgstr "Schlüssel %s: geheimer Schlüssel importiert\n"
  
- #: g10/import.c:2027
++#: g10/import.c:2028
  #, c-format
  msgid "key %s: secret key already exists\n"
  msgstr "Schlüssel %s: geheimer Schlüssel bereits vorhanden\n"
  
- #: g10/import.c:2035
++#: g10/import.c:2036
  #, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "Schlüssel %s: Fehler beim Senden zum gpg-agent: %s\n"
  
- #: g10/import.c:2140
++#: g10/import.c:2141
  #, c-format
  msgid "secret key %s: %s\n"
  msgstr "Geheimer Schlüssel %s: %s\n"
  
- #: g10/import.c:2160 g10/import.c:2195
++#: g10/import.c:2161 g10/import.c:2196
  msgid "importing secret keys not allowed\n"
  msgstr "Importieren geheimer Schlüssel ist nicht erlaubt\n"
  
- #: g10/import.c:2184
++#: g10/import.c:2185
  #, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr ""
@@@ -3515,146 -2694,119 +3459,146 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2256
++#: g10/import.c:2257
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  "Um '%s' zu migrieren sollte für jede Smartcard \"%s\" aufgerufen werden.\n"
  
- #: g10/import.c:2311
++#: g10/import.c:2312
  #, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
  "Schlüssel %s: Kein öffentlicher Schlüssel - der Schlüsselwiderruf kann nicht "
  "angebracht werden\n"
  
- #: g10/import.c:2360
++#: g10/import.c:2361
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "Schlüssel %s: Ungültiges Widerrufzertifikat: %s - zurückgewiesen\n"
  
- #: g10/import.c:2393
++#: g10/import.c:2394
  #, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "Schlüssel %s: \"%s\" Widerrufzertifikat importiert\n"
  
- #: g10/import.c:2469
++#: g10/import.c:2470
  #, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "Schlüssel %s: Keine User-ID für Signatur\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2487
  #, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr ""
  "Schlüssel %s: Nicht unterstütztes Public-Key-Verfahren für User-ID \"%s\"\n"
  
- #: g10/import.c:2488
++#: g10/import.c:2489
  #, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "Schlüssel %s: Ungültige Eigenbeglaubigung für User-ID \"%s\"\n"
  
- #: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
++#: g10/import.c:2506 g10/import.c:2532 g10/import.c:2583
  #, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "Schlüssel %s: Nicht unterstütztes Public-Key-Verfahren\n"
  
- #: g10/import.c:2506
++#: g10/import.c:2507
  #, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "Schlüssel %s: Ungültige \"direct-key\"-Signatur\n"
  
- #: g10/import.c:2520
++#: g10/import.c:2521
  #, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "Schlüssel %s: Kein Unterschlüssel für die Unterschlüsselanbindung\n"
  
- #: g10/import.c:2533
++#: g10/import.c:2534
  #, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "Schlüssel %s: Ungültige Unterschlüssel-Anbindung\n"
  
- #: g10/import.c:2549
++#: g10/import.c:2550
  #, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "Schlüssel %s: Mehrfache Unterschlüssel-Anbindung entfernt\n"
  
- #: g10/import.c:2571
++#: g10/import.c:2572
  #, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "Schlüssel %s: Kein Unterschlüssel für Schlüsselwiderruf\n"
  
- #: g10/import.c:2584
++#: g10/import.c:2585
  #, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "Schlüssel %s: Ungültiger Unterschlüsselwiderruf\n"
  
- #: g10/import.c:2599
++#: g10/import.c:2600
  #, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "Schlüssel %s: Mehrfacher Unterschlüsselwiderruf entfernt\n"
  
- #: g10/import.c:2641
++#: g10/import.c:2642
  #, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "Schlüssel %s: User-ID übersprungen \"%s\"\n"
  
- #: g10/import.c:2665
++#: g10/import.c:2666
  #, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "Schlüssel %s: Unterschlüssel übersprungen\n"
  
- #: g10/import.c:2694
++#: g10/import.c:2695
  #, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr ""
  "Schlüssel %s: Nicht exportfähige Signatur (Klasse %02x) - übersprungen\n"
  
- #: g10/import.c:2705
++#: g10/import.c:2706
  #, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "Schlüssel %s: Widerrufzertifikat an falschem Platz - übersprungen\n"
  
- #: g10/import.c:2723
++#: g10/import.c:2724
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "Schlüssel %s: Ungültiges Widerrufzertifikat: %s - übersprungen\n"
  
- #: g10/import.c:2737
++#: g10/import.c:2738
  #, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr ""
  "Schlüssel %s: Unterschlüssel-Widerrufzertifikat an falschem Platz - "
  "übersprungen\n"
  
- #: g10/import.c:2745
++#: g10/import.c:2746
  #, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "Schlüssel %s: unerwartete Signaturklasse (0x%02x) - übersprungen\n"
  
- #: g10/import.c:2887
++#: g10/import.c:2888
  #, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "Schlüssel %s: Doppelte User-ID entdeckt - zusammengeführt\n"
  
- #: g10/import.c:2951
++#: g10/import.c:2952
  #, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr "WARNUNG: Schlüssel %s ist u.U. widerrufen: hole Widerrufschlüssel %s\n"
  
- #: g10/import.c:2967
++#: g10/import.c:2968
  #, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr ""
  "WARNUNG: Schlüssel %s ist u.U. widerrufen: Widerrufschlüssel %s ist nicht "
  "vorhanden\n"
  
- #: g10/import.c:3031
++#: g10/import.c:3032
  #, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "Schlüssel %s: \"%s\" Widerrufzertifikat hinzugefügt\n"
  
- #: g10/import.c:3069
++#: g10/import.c:3070
  #, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "Schlüssel %s: \"direct-key\"-Signaturen hinzugefügt\n"
@@@ -3689,33 -2835,26 +3633,33 @@@ msgstr "Schlüsselblockhilfsmittel`%s'
  msgid "error opening key DB: %s\n"
  msgstr "Fehler beim Öffnen der Schlüsseldatenbank: %s\n"
  
- #: g10/keydb.c:1782
++#: g10/keydb.c:1786
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "Schlüsselbund-Cache konnte nicht neu erzeugt werden: %s\n"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[revocation]"
  msgstr "[Widerruf]"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[self-signature]"
  msgstr "[Eigenbeglaubigung]"
  
- #: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
++#: g10/keyedit.c:433 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: dirmngr/ldap-wrapper.c:694
  #, c-format
  msgid "error allocating memory: %s\n"
  msgstr "Fehler beim Allozieren von Speicher: %s\n"
  
- #: g10/keyedit.c:629
++#: g10/keyedit.c:630
  #, c-format
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr ""
  "Die Signatur mit den nicht unterstützten Public-Key-Verfahren (%d) kann "
  "nicht geprüft werden: %s\n"
  
- #: g10/keyedit.c:638
++#: g10/keyedit.c:639
  #, c-format
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
@@@ -3723,44 -2862,37 +3667,44 @@@ msgstr "
  "Die Signatur mit der nicht unterstützten Hashmethode (%d) kann nicht\n"
  "geprüft werden: %s.\n"
  
- #: g10/keyedit.c:800
++#: g10/keyedit.c:801
  msgid " (reordered signatures follow)"
  msgstr " (neu geordnete Signaturen folgen)"
  
- #: g10/keyedit.c:913
++#: g10/keyedit.c:914
  #, c-format
  msgid "key %s:\n"
  msgstr "Schlüssel %s:\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:917
  #, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
  msgstr[0] "%d doppelte Signatur entfernt\n"
  msgstr[1] "%d doppelte Signaturen entfernt\n"
  
- #: g10/keyedit.c:919 g10/keylist.c:480
++#: g10/keyedit.c:920 g10/keylist.c:480
  #, c-format
  msgid "%d signature not checked due to a missing key\n"
  msgid_plural "%d signatures not checked due to missing keys\n"
  msgstr[0] "%d Beglaubigung wegen fehlendem Schlüssel nicht geprüft\n"
  msgstr[1] "%d Beglaubigungen wegen fehlender Schlüssel nicht geprüft\n"
  
- #: g10/keyedit.c:923 g10/keylist.c:476
++#: g10/keyedit.c:924 g10/keylist.c:476
  #, c-format
  msgid "%d bad signature\n"
  msgid_plural "%d bad signatures\n"
  msgstr[0] "%d falsche Beglaubigung\n"
  msgstr[1] "%d falsche Beglaubigungen\n"
  
- #: g10/keyedit.c:927
++#: g10/keyedit.c:928
  #, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
  msgstr[0] "%d Signatur neu eingeordnet\n"
  msgstr[1] "%d Signaturen neu eingeordnet\n"
  
- #: g10/keyedit.c:932
++#: g10/keyedit.c:933
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
@@@ -3769,7 -2901,6 +3713,7 @@@ msgstr "
  "WARNUNG: Es wurden Fehler gefunden aber nur Eigenbeglaubigungen geprüft; um "
  "alle Beglaubigungen zu prüfen das Kommando '%s' verwenden.\n"
  
- #: g10/keyedit.c:992 g10/pkclist.c:274
++#: g10/keyedit.c:993 g10/pkclist.c:274
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
  "keys\n"
@@@ -3782,17 -2913,14 +3726,17 @@@ msgstr "
  "unterschiedlichen Quellen ...)?\n"
  "\n"
  
- #: g10/keyedit.c:996 g10/pkclist.c:286
++#: g10/keyedit.c:997 g10/pkclist.c:286
  #, c-format
  msgid "  %d = I trust marginally\n"
  msgstr " %d = Ich vertraue ihm marginal\n"
  
- #: g10/keyedit.c:997 g10/pkclist.c:288
++#: g10/keyedit.c:998 g10/pkclist.c:288
  #, c-format
  msgid "  %d = I trust fully\n"
  msgstr " %d = Ich vertraue ihm vollständig\n"
  
- #: g10/keyedit.c:1015
++#: g10/keyedit.c:1016
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
@@@ -3802,52 -2930,40 +3746,52 @@@ msgstr "
  "Eine Tiefe größer 1 erlaubt dem zu signierenden Schlüssel\n"
  "Trust-Signatures für Sie zu machen.\n"
  
- #: g10/keyedit.c:1032
++#: g10/keyedit.c:1033
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  "Geben Sie bitte eine Domain ein, um die Signatur einzuschränken\n"
  "oder nur die Eingabetaste für keine Domain\n"
  
- #: g10/keyedit.c:1160
++#: g10/keyedit.c:1161
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr "Überspringe User-ID \"%s\" da es keine textbasierte ID ist.\n"
  
- #: g10/keyedit.c:1168
++#: g10/keyedit.c:1169
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "User-ID \"%s\" ist widerrufen."
  
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
- #: g10/keyedit.c:2246
++#: g10/keyedit.c:1178 g10/keyedit.c:1206 g10/keyedit.c:1233 g10/keyedit.c:1417
++#: g10/keyedit.c:2247
  msgid "Are you sure you still want to sign it? (y/N) "
  msgstr "Wollen Sie ihn immer noch beglaubigen? (j/N) "
  
- #: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
- #: g10/keyedit.c:2251 g10/keyedit.c:3177
++#: g10/keyedit.c:1192 g10/keyedit.c:1220 g10/keyedit.c:1247 g10/keyedit.c:1423
++#: g10/keyedit.c:2252 g10/keyedit.c:3178
  msgid "  Unable to sign.\n"
  msgstr "  Beglaubigen ist nicht möglich.\n"
  
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1197
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "User-ID \"%s\" ist abgelaufen."
  
- #: g10/keyedit.c:1224
++#: g10/keyedit.c:1225
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "User-ID \"%s\" ist nicht eigenbeglaubigt."
  
- #: g10/keyedit.c:1253
++#: g10/keyedit.c:1254
  #, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "User-ID \"%s\" ist signierbar."
  
- #: g10/keyedit.c:1255
++#: g10/keyedit.c:1256
  msgid "Sign it? (y/N) "
  msgstr "Wirklich signieren? (j/N) "
  
- #: g10/keyedit.c:1282
++#: g10/keyedit.c:1283
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -3856,11 -2972,9 +3800,11 @@@ msgstr "
  "Die Eigenbeglaubigung von \"%s\"\n"
  "ist eine PGP 2.x artige Signatur.\n"
  
- #: g10/keyedit.c:1291
++#: g10/keyedit.c:1292
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr "Soll sie zu einer OpenPGP Eigenbeglaubigung geändert werden? (j/N) "
  
- #: g10/keyedit.c:1304
++#: g10/keyedit.c:1305
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3869,13 -2983,11 +3813,13 @@@ msgstr "
  "Ihre derzeitige Beglaubigung von \"%s\"\n"
  "ist abgelaufen.\n"
  
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:1310
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr ""
  "Soll eine neue Beglaubigung als Ersatz für die abgelaufene erstellt werden? "
  "(J/n) "
  
- #: g10/keyedit.c:1330
++#: g10/keyedit.c:1331
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3884,44 -2996,35 +3828,44 @@@ msgstr "
  "Die derzeitige Beglaubigung von \"%s\"\n"
  "ist nur für diesen Rechner gültig.\n"
  
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:1336
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr ""
  "Soll sie zu einer voll exportierbaren Beglaubigung erhoben werden? (j/N) "
  
- #: g10/keyedit.c:1355
++#: g10/keyedit.c:1356
  #, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "\"%s\" wurde bereits durch Schlüssel %s lokal beglaubigt\n"
  
- #: g10/keyedit.c:1359
++#: g10/keyedit.c:1360
  #, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "\"%s\" wurde bereits durch Schlüssel %s beglaubigt\n"
  
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:1365
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "Wollen Sie ihn immer noch wieder beglaubigen? (j/N) "
  
- #: g10/keyedit.c:1386
++#: g10/keyedit.c:1387
  #, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "Nichts zu beglaubigen für Schlüssel %s\n"
  
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1411
  msgid "This key has expired!"
  msgstr "Dieser Schlüssel ist verfallen!"
  
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1429
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "Dieser Schlüssel wird %s verfallen.\n"
  
- #: g10/keyedit.c:1434
++#: g10/keyedit.c:1435
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr "Soll Ihre Beglaubigung zur selben Zeit verfallen? (J/n) "
  
- #: g10/keyedit.c:1475
++#: g10/keyedit.c:1476
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -3931,32 -3034,26 +3875,32 @@@ msgstr "
  "wollen, wirklich der o.g. Person gehört?\n"
  "Wenn Sie darauf keine Antwort wissen, geben Sie \"0\" ein.\n"
  
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1481
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) Ich antworte nicht.%s\n"
  
- #: g10/keyedit.c:1482
++#: g10/keyedit.c:1483
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) Ich habe es überhaupt nicht überprüft.%s\n"
  
- #: g10/keyedit.c:1484
++#: g10/keyedit.c:1485
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) Ich habe es flüchtig überprüft.%s\n"
  
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:1488
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) Ich habe es sehr sorgfältig überprüft.%s\n"
  
  # translated by wk
- #: g10/keyedit.c:1494
++#: g10/keyedit.c:1495
  msgid "Your selection? (enter '?' for more information): "
  msgstr "Ihre Auswahl? ('?' für weitere Informationen): "
  
- #: g10/keyedit.c:1521
++#: g10/keyedit.c:1522
  #, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -3965,227 -3062,173 +3909,227 @@@ msgstr "
  "Sind Sie wirklich sicher, daß Sie vorstehenden Schlüssel mit Ihrem\n"
  "Schlüssel \"%s\" (%s) beglaubigen wollen\n"
  
- #: g10/keyedit.c:1529
++#: g10/keyedit.c:1530
  msgid "This will be a self-signature.\n"
  msgstr "Dies wird eine Eigenbeglaubigung sein.\n"
  
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:1535
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr ""
  "WARNUNG: Die Signatur wird nicht als nicht-exportierbar markiert werden.\n"
  
- #: g10/keyedit.c:1541
++#: g10/keyedit.c:1542
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr "WARNUNG: Die Signatur wird nicht als unwiderrufbar markiert werden.\n"
  
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1552
  msgid "The signature will be marked as non-exportable.\n"
  msgstr "Die Signatur wird als nicht-exportfähig markiert werden.\n"
  
- #: g10/keyedit.c:1558
++#: g10/keyedit.c:1559
  msgid "The signature will be marked as non-revocable.\n"
  msgstr "Die Signatur wird als unwiderrufbar markiert werden.\n"
  
- #: g10/keyedit.c:1565
++#: g10/keyedit.c:1566
  msgid "I have not checked this key at all.\n"
  msgstr "Ich habe diesen Schlüssel überhaupt nicht überprüft.\n"
  
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:1571
  msgid "I have checked this key casually.\n"
  msgstr "Ich habe diesen Schlüssel flüchtig überprüft.\n"
  
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:1576
  msgid "I have checked this key very carefully.\n"
  msgstr "Ich habe diesen Schlüssel sehr sorgfältig überprüft.\n"
  
- #: g10/keyedit.c:1587
++#: g10/keyedit.c:1588
  msgid "Really sign? (y/N) "
  msgstr "Wirklich signieren? (j/N) "
  
- #: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
- #: g10/keyedit.c:6463 g10/sign.c:323
++#: g10/keyedit.c:1639 g10/keyedit.c:6308 g10/keyedit.c:6391 g10/keyedit.c:6500
++#: g10/keyedit.c:6562 g10/sign.c:325
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "Beglaubigung fehlgeschlagen: %s\n"
  
- #: g10/keyedit.c:1725
++#: g10/keyedit.c:1726
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  "Der Schlüssel enthält nur \"stub\"- oder \"on-card\"-Schlüsselelemente- "
  "keine Passphrase ist zu ändern.\n"
  
- #: g10/keyedit.c:1755
++#: g10/keyedit.c:1756
  #, c-format
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "Schlüssel %s: Fehler beim Ändern der Passphrase: %s\n"
  
- #: g10/keyedit.c:1869
++#: g10/keyedit.c:1870
  msgid "save and quit"
  msgstr "speichern und Menü verlassen"
  
- #: g10/keyedit.c:1872
++#: g10/keyedit.c:1873
  msgid "show key fingerprint"
  msgstr "Fingerabdruck des Schlüssels anzeigen"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1874
  msgid "show the keygrip"
  msgstr "\"Keygrip\" des Schlüssels anzeigen"
  
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1875
  msgid "list key and user IDs"
  msgstr "Schlüssel und User-IDs auflisten"
  
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1877
  msgid "select user ID N"
  msgstr "User-ID N auswählen"
  
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1878
  msgid "select subkey N"
  msgstr "Unterschlüssel N auswählen"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1879
  msgid "check signatures"
  msgstr "Signaturen prüfen"
  
- #: g10/keyedit.c:1884
++#: g10/keyedit.c:1885
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr "die ausgewählten User-IDs beglaubigen [* für verwandte Befehle s.u.]"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1890
  msgid "sign selected user IDs locally"
  msgstr "Die ausgewählte User-ID nur für diesen Rechner beglaubigen"
  
- #: g10/keyedit.c:1890
++#: g10/keyedit.c:1891
  msgid "sign selected user IDs with a trust signature"
  msgstr "Die ausgewählte User-ID mit einer \"Trust\"-Signatur beglaubigen"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1893
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr "die ausgewählten User-IDs unwiderrufbar beglaubigen"
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1895
  msgid "add a user ID"
  msgstr "Eine User-ID hinzufügen"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1897
  msgid "add a photo ID"
  msgstr "Eine Foto-ID hinzufügen"
  
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1898
  msgid "delete selected user IDs"
  msgstr "ausgewählte User-IDs entfernen"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1901
  msgid "add a subkey"
  msgstr "einen Unterschlüssel hinzufügen"
  
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1904
  msgid "add a key to a smartcard"
  msgstr "der Smartcard einen Schlüssel hinzufügen"
  
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1906
  msgid "move a key to a smartcard"
  msgstr "einen Schlüssel auf die Smartcard schieben"
  
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1908
  msgid "move a backup key to a smartcard"
  msgstr "eine Sicherungskopie des Schlüssels auf die Smartcard schieben"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1910
  msgid "delete selected subkeys"
  msgstr "ausgewählte Unterschlüssel entfernen"
  
- #: g10/keyedit.c:1911
++#: g10/keyedit.c:1912
  msgid "add a revocation key"
  msgstr "Einen Widerrufschlüssel hinzufügen"
  
- #: g10/keyedit.c:1913
++#: g10/keyedit.c:1914
  msgid "delete signatures from the selected user IDs"
  msgstr "Beglaubigungen der ausgewählten User-IDs entfernen"
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1916
  msgid "change the expiration date for the key or selected subkeys"
  msgstr ""
  "das Verfallsdatum des Schlüssel oder ausgewählter Unterschlüssels ändern"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1918
  msgid "flag the selected user ID as primary"
  msgstr "User-ID als Haupt-User-ID kennzeichnen"
  
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1921
  msgid "list preferences (expert)"
  msgstr "Liste der Voreinstellungen (für Experten)"
  
- #: g10/keyedit.c:1921
++#: g10/keyedit.c:1922
  msgid "list preferences (verbose)"
  msgstr "Liste der Voreinstellungen (ausführlich)"
  
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:1924
  msgid "set preference list for the selected user IDs"
  msgstr "ändern der Voreinstellungsliste der ausgewählten User-IDs"
  
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1927
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr ""
  "Setze die URL des bevorzugten Schlüsselservers für die ausgewählten User-IDs"
  
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1929
  msgid "set a notation for the selected user IDs"
  msgstr "Eine Notation für die ausgewählten User-IDs setzen"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1931
  msgid "change the passphrase"
  msgstr "Die Passphrase ändern"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1934
  msgid "change the ownertrust"
  msgstr "Den \"Ownertrust\" ändern"
  
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1937
  msgid "revoke signatures on the selected user IDs"
  msgstr "Beglaubigungen der ausgewählten User-IDs widerrufen"
  
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1939
  msgid "revoke selected user IDs"
  msgstr "Ausgewählte User-ID widerrufen"
  
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1942
  msgid "revoke key or selected subkeys"
  msgstr "Schlüssel oder ausgewählten Unterschlüssel widerrufen"
  
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1944
  msgid "enable key"
  msgstr "Schlüssel anschalten"
  
- #: g10/keyedit.c:1944
++#: g10/keyedit.c:1945
  msgid "disable key"
  msgstr "Schlüssel abschalten"
  
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1947
  msgid "show selected photo IDs"
  msgstr "ausgewählte Foto-IDs anzeigen"
  
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1949
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  "unbrauchbare User-IDs verkleinern und unbrauchbare Signaturen aus dem "
  "Schlüssel entfernen"
  
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:1951
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  "unbrauchbare User-IDs verkleinern und alle Signaturen aus dem Schlüssel "
  "entfernen"
  
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2063
  msgid "Secret key is available.\n"
  msgstr "Geheimer Schlüssel ist vorhanden.\n"
  
- #: g10/keyedit.c:2162
++#: g10/keyedit.c:2163
  msgid "Need the secret key to do this.\n"
  msgstr "Hierzu wird der geheime Schlüssel benötigt.\n"
  
- #: g10/keyedit.c:2183
++#: g10/keyedit.c:2184
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4198,259 -3241,204 +4142,264 @@@ msgstr "
  "Signaturen\n"
  " (\"nrsign\"), oder jede Kombination davon (\"ltsign\", \"tnrsign\", etc.).\n"
  
- #: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
++#: g10/keyedit.c:2240 g10/keyedit.c:3178 g10/keyedit.c:3317 g10/keyedit.c:3379
  msgid "Key is revoked."
  msgstr "Schlüssel wurde widerrufen."
  
- #: g10/keyedit.c:2262
++#: g10/keyedit.c:2263
  msgid "Really sign all user IDs? (y/N) "
  msgstr "Wirklich alle User-IDs beglaubigen? (j/N) "
  
- #: g10/keyedit.c:2266
++#: g10/keyedit.c:2267
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "Wirklich alle textbasierten User-IDs beglaubigen? (j/N) "
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2275
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Tip: Wählen Sie die User-IDs, die beglaubigt werden sollen\n"
  
- #: g10/keyedit.c:2285
++#: g10/keyedit.c:2286
  #, c-format
  msgid "Unknown signature type '%s'\n"
  msgstr "Unbekannter Signaturtyp `%s'\n"
  
- #: g10/keyedit.c:2309
++#: g10/keyedit.c:2310
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
  msgstr "Dieser Befehl ist im %s-Modus nicht erlaubt.\n"
  
- #: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
++#: g10/keyedit.c:2332 g10/keyedit.c:2356 g10/keyedit.c:2550
  msgid "You must select at least one user ID.\n"
  msgstr "Zumindestens eine User-ID muß ausgewählt werden.\n"
  
- #: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
++#: g10/keyedit.c:2334 g10/keyedit.c:2358 g10/keyedit.c:2512 g10/keyedit.c:2552
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr "(Benutze den '%s' Befehl.)\n"
  
- #: g10/keyedit.c:2336
++#: g10/keyedit.c:2337
  msgid "You can't delete the last user ID!\n"
  msgstr "Die letzte User-ID kann nicht gelöscht werden!\n"
  
- #: g10/keyedit.c:2339
++#: g10/keyedit.c:2340
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "Möchten Sie alle ausgewählten User-IDs wirklich entfernen? (j/N) "
  
- #: g10/keyedit.c:2340
++#: g10/keyedit.c:2341
  msgid "Really remove this user ID? (y/N) "
  msgstr "Diese User-ID wirklich entfernen? (j/N) "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2397
++#: g10/keyedit.c:2398
  msgid "Really move the primary key? (y/N) "
  msgstr "Den Hauptschlüssel wirklich verschieben? (j/N) "
  
- #: g10/keyedit.c:2409 g10/keyedit.c:4866
++#: g10/keyedit.c:2410 g10/keyedit.c:4964
  msgid "You must select exactly one key.\n"
  msgstr "Sie müssen genau einen Schlüssel auswählen.\n"
  
- #: g10/keyedit.c:2436
++#: g10/keyedit.c:2437
  msgid "Command expects a filename argument\n"
  msgstr "Befehl benötigt einen Dateinamen als Argument\n"
  
- #: g10/keyedit.c:2457
++#: g10/keyedit.c:2458
  #, c-format
  msgid "Can't open '%s': %s\n"
  msgstr "'%s' kann nicht geöffnet werden: %s\n"
  
- #: g10/keyedit.c:2474
++#: g10/keyedit.c:2475
  #, c-format
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "Fehler beim Lesen der Sicherungskopie des Schlüssels von `%s': %s\n"
  
- #: g10/keyedit.c:2509
++#: g10/keyedit.c:2510
  msgid "You must select at least one key.\n"
  msgstr "Zumindestens ein Schlüssel muß ausgewählt werden.\n"
  
- #: g10/keyedit.c:2515
++#: g10/keyedit.c:2516
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "Möchten Sie die ausgewählten Schlüssel wirklich entfernen? (j/N) "
  
- #: g10/keyedit.c:2517
++#: g10/keyedit.c:2518
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "Möchten Sie diesen Schlüssel wirklich entfernen? (j/N) "
  
- #: g10/keyedit.c:2555
++#: g10/keyedit.c:2556
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr "Möchten Sie wirklich alle ausgewählten User-IDs widerrufen? (j/N) "
  
- #: g10/keyedit.c:2556
++#: g10/keyedit.c:2557
  msgid "Really revoke this user ID? (y/N) "
  msgstr "Diese User-ID wirklich widerrufen? (j/N) "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2575
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "Möchten Sie diesen Schlüssel wirklich vollständig widerrufen? (j/N) "
  
- #: g10/keyedit.c:2585
++#: g10/keyedit.c:2586
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr ""
  "Möchten Sie die ausgewählten Unterschlüssel wirklich widerrufen? (j/N) "
  
- #: g10/keyedit.c:2587
++#: g10/keyedit.c:2588
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "Möchten Sie diesen Schlüssel wirklich widerrufen? (j/N) "
  
- #: g10/keyedit.c:2645
++#: g10/keyedit.c:2646
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  "\"Owner trust\" kann nicht gesetzt werden, wenn eine anwendereigene 'Trust'-"
  "Datenbank benutzt wird\n"
  
- #: g10/keyedit.c:2690
++#: g10/keyedit.c:2691
  msgid "Set preference list to:\n"
  msgstr "Setze die Liste der Voreinstellungen auf:\n"
  
- #: g10/keyedit.c:2697
++#: g10/keyedit.c:2698
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr ""
  "Möchten Sie die Voreinstellungen der ausgewählten User-IDs wirklich ändern? "
  "(j/N) "
  
- #: g10/keyedit.c:2699
++#: g10/keyedit.c:2700
  msgid "Really update the preferences? (y/N) "
  msgstr "Die Voreinstellungen wirklich ändern? (j/N) "
  
- #: g10/keyedit.c:2773
++#: g10/keyedit.c:2774
  msgid "Save changes? (y/N) "
  msgstr "Änderungen speichern? (j/N) "
  
- #: g10/keyedit.c:2777
++#: g10/keyedit.c:2778
  msgid "Quit without saving? (y/N) "
  msgstr "Beenden ohne zu speichern? (j/N) "
  
- #: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
- #: g10/keyedit.c:3267 g10/keyedit.c:3332
++#: g10/keyedit.c:2789 g10/keyedit.c:2799 g10/keyedit.c:2943 g10/keyedit.c:3046
++#: g10/keyedit.c:3268 g10/keyedit.c:3333 g10/keyedit.c:3409
  #, c-format
  msgid "update failed: %s\n"
  msgstr "Änderung fehlgeschlagen: %s\n"
  
- #: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
++#: g10/keyedit.c:2805 g10/keyedit.c:3273 g10/keyedit.c:3338 g10/keyedit.c:3416
  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:3038
++#: g10/keyedit.c:3039
  #, c-format
  msgid "User ID revocation failed: %s\n"
  msgstr "Widerufen der User-ID fehlgeschlagen: %s\n"
  
- #: g10/keyedit.c:3083
++#: g10/keyedit.c:3084
  #, c-format
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "\"%s\" ist kein Fingerabdruck\n"
  
- #: g10/keyedit.c:3112
++#: g10/keyedit.c:3113
  #, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "\"%s\" ist nicht der Fingerabdruck des Hauptschlüssels\n"
  
- #: g10/keyedit.c:3248 g10/keyedit.c:3251
++#: g10/keyedit.c:3249 g10/keyedit.c:3252
  #, c-format
  msgid "Invalid user ID '%s': %s\n"
  msgstr "Ungültige User-ID '%s': %s\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  msgid "No matching user IDs."
  msgstr "Keine passende User-ID"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  msgid "Nothing to sign.\n"
  msgstr "Nichts zu beglaubigen\n"
  
- #: g10/keyedit.c:3427
++#: g10/keyedit.c:3388
+ #, c-format
+ msgid "'%s' is not a valid expiration time\n"
+ msgstr "'%s' ist kein gültiges Ablaufdatum\n"
+ 
++#: g10/keyedit.c:3508
  msgid "Digest: "
  msgstr "Digest: "
  
- #: g10/keyedit.c:3484
++#: g10/keyedit.c:3565
  msgid "Features: "
  msgstr "Eigenschaften: "
  
- #: g10/keyedit.c:3495
++#: g10/keyedit.c:3576
  msgid "Keyserver no-modify"
  msgstr "Keyserver no-modify"
  
- #: g10/keyedit.c:3510 g10/keylist.c:377
++#: g10/keyedit.c:3591 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr "Bevorzugter Schlüsselserver:"
  
- #: g10/keyedit.c:3518 g10/keyedit.c:3519
++#: g10/keyedit.c:3599 g10/keyedit.c:3600
  msgid "Notations: "
  msgstr "\"Notationen\": "
  
- #: g10/keyedit.c:3764
++#: g10/keyedit.c:3845
  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:3836
++#: g10/keyedit.c:3917
  #, 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:3860
++#: g10/keyedit.c:3941
  #, 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:3866
++#: g10/keyedit.c:3947
  msgid "(sensitive)"
  msgstr "(empfindlich)"
  
- #: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3989 g10/keyedit.c:4131 g10/keylist.c:262 g10/keyserver.c:538
  #, c-format
  msgid "created: %s"
  msgstr "erzeugt: %s"
  
- #: g10/keyedit.c:3911 g10/keylist.c:1852
++#: g10/keyedit.c:3992 g10/keylist.c:1852
  #, c-format
  msgid "revoked: %s"
  msgstr "widerrufen: %s"
  
- #: g10/keyedit.c:3913 g10/keylist.c:1858
++#: g10/keyedit.c:3994 g10/keylist.c:1858
  #, c-format
  msgid "expired: %s"
  msgstr "verfallen: %s"
  
- #: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyedit.c:3996 g10/keyedit.c:4133 g10/keylist.c:264 g10/keylist.c:1864
 +#: g10/keyserver.c:544
  #, c-format
  msgid "expires: %s"
  msgstr "verfällt: %s"
  
- #: g10/keyedit.c:3917
++#: g10/keyedit.c:3998
  #, c-format
  msgid "usage: %s"
  msgstr "Aufruf: %s"
  
- #: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
++#: g10/keyedit.c:4006 g10/keyedit.c:4026 g10/keylist.c:267
  msgid "card-no: "
  msgstr "Kartennummer:"
  
- #: g10/keyedit.c:3984
++#: g10/keyedit.c:4065
  #, c-format
  msgid "trust: %s"
  msgstr "Vertrauen: %s"
  
- #: g10/keyedit.c:3988
++#: g10/keyedit.c:4069
  #, c-format
  msgid "validity: %s"
  msgstr "Gültigkeit: %s"
  
- #: g10/keyedit.c:3995
++#: g10/keyedit.c:4076
  msgid "This key has been disabled"
  msgstr "Hinweis: Dieser Schlüssel ist abgeschaltet"
  
- #: g10/keyedit.c:4013
++#: g10/keyedit.c:4094
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4458,19 -3446,13 +4407,19 @@@ msgstr "
  "Bitte beachten Sie, daß ohne einen Programmneustart die angezeigte\n"
  "Schlüsselgültigkeit nicht notwendigerweise korrekt ist.\n"
  
- #: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
- #: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: g10/keyedit.c:4150 g10/keyedit.c:4581 g10/keyserver.c:548
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:712
 +#: dirmngr/ocsp.c:703
  msgid "revoked"
  msgstr "widerrufen"
  
- #: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
- #: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4152 g10/keyedit.c:4583 g10/keyserver.c:552
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:714
  msgid "expired"
  msgstr "verfallen"
  
  # translated by wk
- #: g10/keyedit.c:4188
++#: g10/keyedit.c:4269
  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"
@@@ -4478,15 -3460,12 +4427,15 @@@ 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:4240
++#: g10/keyedit.c:4321
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr "WARNUNG: Ihr Unterschlüssel zum Verschlüsseln wird bald verfallen.\n"
  
- #: g10/keyedit.c:4241
++#: g10/keyedit.c:4322
  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:4300
++#: g10/keyedit.c:4381
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4496,72 -3475,57 +4445,72 @@@ msgstr "
  "könnte\n"
  "         bei einigen PGP-Versionen zur Zurückweisung des Schlüssels führen.\n"
  
- #: g10/keyedit.c:4305 g10/keyedit.c:4595
++#: g10/keyedit.c:4386 g10/keyedit.c:4676
  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:4311
++#: g10/keyedit.c:4392
  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:4326 g10/keygen.c:2697
++#: g10/keyedit.c:4407 g10/keygen.c:2719
  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:4428
++#: g10/keyedit.c:4509
  msgid "Delete this good signature? (y/N/q)"
  msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
  
- #: g10/keyedit.c:4438
++#: g10/keyedit.c:4519
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "Diese ungültige Beglaubigung entfernen= (j/N/q)"
  
- #: g10/keyedit.c:4442
++#: g10/keyedit.c:4523
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4530
  msgid "Really delete this self-signature? (y/N)"
  msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
  
- #: g10/keyedit.c:4465
++#: g10/keyedit.c:4546
  #, 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:4469
++#: g10/keyedit.c:4550
  msgid "Nothing deleted.\n"
  msgstr "Nichts entfernt.\n"
  
- #: g10/keyedit.c:4504 g10/trust.c:693
++#: g10/keyedit.c:4585 g10/trust.c:716
  msgid "invalid"
  msgstr "ungültig"
  
- #: g10/keyedit.c:4506
++#: g10/keyedit.c:4587
  #, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "User-ID \"%s\" bereits verkleinert: %s\n"
  
- #: g10/keyedit.c:4512
++#: g10/keyedit.c:4593
  #, 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:4520
++#: g10/keyedit.c:4601
  #, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "User-ID \"%s\": bereits minimiert\n"
  
- #: g10/keyedit.c:4521
++#: g10/keyedit.c:4602
  #, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "User-ID \"%s\": bereits sauber\n"
  
- #: g10/keyedit.c:4590
++#: g10/keyedit.c:4671
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4571,276 -3535,217 +4520,276 @@@ msgstr "
  "         Widerrufers könnte bei einigen PGP-Versionen zur Zurückweisung\n"
  "         des Schlüssels führen.\n"
  
- #: g10/keyedit.c:4601
++#: g10/keyedit.c:4682
  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:4618
++#: g10/keyedit.c:4699
  msgid "Enter the user ID of the designated revoker: "
  msgstr "Geben sie die User-ID des designierten Widerrufers ein: "
  
- #: g10/keyedit.c:4643
++#: g10/keyedit.c:4724
  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:4658
++#: g10/keyedit.c:4739
  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:4680
++#: g10/keyedit.c:4761
  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:4698
++#: g10/keyedit.c:4779
  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:4704
++#: g10/keyedit.c:4785
  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:4755
++#: g10/keyedit.c:4848
  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:4760
++#: g10/keyedit.c:4853
  msgid "Changing expiration time for a subkey.\n"
  msgstr "Ändern des Verfallsdatums des Unterschlüssels.\n"
  
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:4856
  msgid "Changing expiration time for the primary key.\n"
  msgstr "Ändern des Verfallsdatums des Hauptschlüssels.\n"
  
- #: g10/keyedit.c:4814
++#: g10/keyedit.c:4910
  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:4987
++#: g10/keyedit.c:5085
  #, c-format
  msgid "signing subkey %s is already cross-certified\n"
  msgstr "Signaturunterschlüssel %s ist bereits rücksigniert\n"
  
- #: g10/keyedit.c:4993
++#: g10/keyedit.c:5091
  #, 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:5108
++#: g10/keyedit.c:5206
  msgid "Please select exactly one user ID.\n"
  msgstr "Bitte genau eine User-ID auswählen.\n"
  
- #: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
++#: g10/keyedit.c:5247 g10/keyedit.c:5361 g10/keyedit.c:5474 g10/keyedit.c:5611
  #, 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:5320
++#: g10/keyedit.c:5418
  msgid "Enter your preferred keyserver URL: "
  msgstr "Geben Sie die URL Ihres bevorzugten Schlüsselservers ein: "
  
- #: g10/keyedit.c:5399
++#: g10/keyedit.c:5497
  msgid "Are you sure you want to replace it? (y/N) "
  msgstr "Wollen Sie ihn wirklich ersetzen? (j/N) "
  
- #: g10/keyedit.c:5400
++#: g10/keyedit.c:5498
  msgid "Are you sure you want to delete it? (y/N) "
  msgstr "Wollen Sie ihn wirklich löschen? (j/N) "
  
- #: g10/keyedit.c:5459
++#: g10/keyedit.c:5557
  msgid "Enter the notation: "
  msgstr "Geben Sie die \"Notation\" ein: "
  
- #: g10/keyedit.c:5606
++#: g10/keyedit.c:5704
  msgid "Proceed? (y/N) "
  msgstr "Fortfahren (j/N)? "
  
- #: g10/keyedit.c:5676
++#: g10/keyedit.c:5774
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "Keine User-ID mit Index %d\n"
  
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5836
  #, c-format
  msgid "No user ID with hash %s\n"
  msgstr "Keine User-ID mit Hash %s\n"
  
- #: g10/keyedit.c:5839
++#: g10/keyedit.c:5937
  #, c-format
  msgid "No subkey with key ID '%s'.\n"
  msgstr "Kein Unterschlüssel mit Schlüssel-ID '%s'.\n"
  
- #: g10/keyedit.c:5861
++#: g10/keyedit.c:5959
  #, c-format
  msgid "No subkey with index %d\n"
  msgstr "Kein Unterschlüssel mit Index %d\n"
  
- #: g10/keyedit.c:6002
++#: g10/keyedit.c:6100
  #, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "User-ID: \"%s\"\n"
  
- #: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
++#: g10/keyedit.c:6103 g10/keyedit.c:6205 g10/keyedit.c:6253
  #, 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:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
++#: g10/keyedit.c:6105 g10/keyedit.c:6207 g10/keyedit.c:6255
  msgid " (non-exportable)"
  msgstr " (nicht-exportierbar)"
  
- #: g10/keyedit.c:6011
++#: g10/keyedit.c:6109
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "Diese Signatur ist seit %s verfallen.\n"
  
- #: g10/keyedit.c:6016
++#: g10/keyedit.c:6114
  msgid "Are you sure you still want to revoke it? (y/N) "
  msgstr "Wollen Sie ihn immer noch widerrufen? (j/N) "
  
- #: g10/keyedit.c:6021
++#: g10/keyedit.c:6119
  msgid "Create a revocation certificate for this signature? (y/N) "
  msgstr "Ein Widerrufszertifikat für diese Signatur erzeugen (j/N)"
  
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6173
  msgid "Not signed by you.\n"
  msgstr "Nicht von Ihnen signiert.\n"
  
- #: g10/keyedit.c:6081
++#: g10/keyedit.c:6179
  #, 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:6110
++#: g10/keyedit.c:6208
  msgid " (non-revocable)"
  msgstr " (unwiderrufbar)"
  
- #: g10/keyedit.c:6117
++#: g10/keyedit.c:6215
  #, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "widerrufen durch Ihren Schlüssel %s um %s\n"
  
- #: g10/keyedit.c:6142
++#: g10/keyedit.c:6240
  msgid "You are about to revoke these signatures:\n"
  msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
  
- #: g10/keyedit.c:6165
++#: g10/keyedit.c:6263
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "Wirklich ein Signatur-Widerrufszertifikat erzeugen? (j/N) "
  
- #: g10/keyedit.c:6198
++#: g10/keyedit.c:6296
  msgid "no secret key\n"
  msgstr "Kein geheimer Schlüssel\n"
  
- #: g10/keyedit.c:6246
++#: g10/keyedit.c:6344
  #, 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:6256
++#: g10/keyedit.c:6354
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "User-ID \"%s\" ist bereits widerrufen\n"
  
- #: g10/keyedit.c:6273
++#: g10/keyedit.c:6371
  #, 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:6386
++#: g10/keyedit.c:6485
  #, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "Schlüssel %s ist bereits widerrufen\n"
  
- #: g10/keyedit.c:6448
++#: g10/keyedit.c:6547
  #, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "Unterschlüssel %s ist bereits widerrufen\n"
  
- #: g10/keyedit.c:6545
++#: g10/keyedit.c:6644
  #, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr "Anzeigen einer %s Foto-ID (Größe %ld) für Schlüssel %s (User-ID %d)\n"
  
- #: g10/keygen.c:305
++#: g10/keygen.c:316
  #, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "Voreinstellung `%s' ist doppelt\n"
  
- #: g10/keygen.c:312
++#: g10/keygen.c:323
  msgid "too many cipher preferences\n"
  msgstr "zu viele Verschlüsselungeinstellungen\n"
  
- #: g10/keygen.c:314
++#: g10/keygen.c:325
  msgid "too many digest preferences\n"
  msgstr "zu viele Hashvoreinstellungen\n"
  
- #: g10/keygen.c:316
++#: g10/keygen.c:327
  msgid "too many compression preferences\n"
  msgstr "zu viele Komprimierungsvoreinstellungen\n"
  
- #: g10/keygen.c:457
++#: g10/keygen.c:468
  #, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "Ungültiges Feld `%s' in der Voreinstellungszeichenkette\n"
  
- #: g10/keygen.c:936
++#: g10/keygen.c:947
  msgid "writing direct signature\n"
  msgstr "Die \"Direct Key Signature\" wird geschrieben\n"
  
- #: g10/keygen.c:982
++#: g10/keygen.c:993
  msgid "writing self signature\n"
  msgstr "Die Eigenbeglaubigung wird geschrieben\n"
  
- #: g10/keygen.c:1038
++#: g10/keygen.c:1049
  msgid "writing key binding signature\n"
  msgstr "Schreiben der \"key-binding\" Signatur\n"
  
- #: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
- #: g10/keygen.c:1610 g10/keygen.c:1615
++#: g10/keygen.c:1413 g10/keygen.c:1418 g10/keygen.c:1470 g10/keygen.c:1475
++#: g10/keygen.c:1622 g10/keygen.c:1627
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "Ungültige Schlüssellänge; %u Bit werden verwendet\n"
  
- #: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
++#: g10/keygen.c:1424 g10/keygen.c:1481 g10/keygen.c:1489 g10/keygen.c:1633
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "Schlüssellänge auf %u Bit aufgerundet\n"
  
- #: g10/keygen.c:1503
++#: g10/keygen.c:1515
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  "WARNUNG: Einige OpenPGP-Programme können einen DSA-Schlüssel dieser "
  "Digestlänge nicht verwenden\n"
  
- #: g10/keygen.c:1677
++#: g10/keygen.c:1689
  msgid "Sign"
  msgstr "Signieren"
  
- #: g10/keygen.c:1680
++#: g10/keygen.c:1692
  msgid "Certify"
  msgstr "Zertif."
  
- #: g10/keygen.c:1683
++#: g10/keygen.c:1695
  msgid "Encrypt"
  msgstr "Verschl."
  
- #: g10/keygen.c:1686
++#: g10/keygen.c:1698
  msgid "Authenticate"
  msgstr "Authentisierung"
  
@@@ -4854,150 -3759,119 +4803,150 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1705
++#: g10/keygen.c:1717
  msgid "SsEeAaQq"
  msgstr "UuVvAaQq"
  
- #: g10/keygen.c:1732
++#: g10/keygen.c:1744
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "Mögliche Vorgänge eines %s-Schlüssels: "
  
- #: g10/keygen.c:1738
++#: g10/keygen.c:1750
  msgid "Current allowed actions: "
  msgstr "Derzeit erlaubte Vorgänge: "
  
- #: g10/keygen.c:1743
++#: g10/keygen.c:1755
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) Umschalten der Signaturfähigkeit\n"
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) Umschalten der Verschlüsselungsfähigkeit\n"
  
- #: g10/keygen.c:1749
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) Umschalten der Authentisierungsfähigkeit\n"
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) Beenden\n"
  
- #: g10/keygen.c:1881 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1893 sm/certreqgen-ui.c:161
  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/keygen.c:1885
++#: g10/keygen.c:1897
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) RSA und RSA (voreingestellt)\n"
  
- #: g10/keygen.c:1889
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA und Elgamal\n"
  
- #: g10/keygen.c:1892
++#: g10/keygen.c:1904
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (nur signieren/beglaubigen)\n"
  
- #: g10/keygen.c:1894
++#: g10/keygen.c:1906
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (nur signieren/beglaubigen)\n"
  
- #: g10/keygen.c:1900
++#: g10/keygen.c:1912
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) Elgamal (nur verschlüsseln)\n"
  
- #: g10/keygen.c:1902
++#: g10/keygen.c:1914
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (nur verschlüsseln)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1920
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (Leistungsfähigkeit selber einstellbar)\n"
  
- #: g10/keygen.c:1910
++#: g10/keygen.c:1922
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (Leistungsfähigkeit selber einstellbar)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1928
  #, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "  (%d) ECC und ECC\n"
  
- #: g10/keygen.c:1918
++#: g10/keygen.c:1930
  #, c-format
  msgid "  (%d) ECC (sign only)\n"
  msgstr "  (%d) ECC (nur signieren)\n"
  
- #: g10/keygen.c:1920
++#: g10/keygen.c:1932
  #, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "  (%d) ECC (Leistungsfähigkeit selber einstellbar)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1934
  #, c-format
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "  (%d) ECC (nur verschlüsseln)\n"
  
- #: g10/keygen.c:1926
++#: g10/keygen.c:1938
  #, c-format
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) Vorhandener Schlüssel\n"
  
- #: g10/keygen.c:2022 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:206
  msgid "Enter the keygrip: "
  msgstr "Geben Sie den \"Keygrip\" ein: "
  
- #: g10/keygen.c:2035 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2047 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr "Kein gültiger \"Keygrip\" (40 Hex-Ziffern werden erwartet)\n"
  
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2049 sm/certreqgen-ui.c:216
  msgid "No key with this keygrip\n"
  msgstr "Kein Schlüssel mit diesem \"Keygrip\"\n"
  
- #: g10/keygen.c:2111 g10/keygen.c:2125
++#: g10/keygen.c:2133 g10/keygen.c:2147
  #, c-format
  msgid "rounded to %u bits\n"
  msgstr "gerundet auf %u Bit\n"
  
- #: g10/keygen.c:2166
++#: g10/keygen.c:2188
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr "%s-Schlüssel können zwischen %u und %u Bit lang sein.\n"
  
- #: g10/keygen.c:2174
++#: g10/keygen.c:2196
  #, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Welche Schlüssellänge wünschen Sie für den Unterschlüssel? (%u) "
  
- #: g10/keygen.c:2177 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2199 sm/certreqgen-ui.c:183
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Welche Schlüssellänge wünschen Sie? (%u) "
  
- #: g10/keygen.c:2191 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2213 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Die verlangte Schlüssellänge beträgt %u Bit\n"
  
- #: g10/keygen.c:2237
++#: g10/keygen.c:2259
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Bitte wählen Sie, welche elliptische Kurve Sie möchten:\n"
  
- #: g10/keygen.c:2409
++#: g10/keygen.c:2431
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5013,7 -3887,6 +4962,7 @@@ msgstr "
  "      <n>m = Schlüssel verfällt nach n Monaten\n"
  "      <n>y = Schlüssel verfällt nach n Jahren\n"
  
- #: g10/keygen.c:2420
++#: g10/keygen.c:2442
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5029,38 -3902,30 +4978,38 @@@ msgstr "
  "      <n>m = Schlüssel verfällt nach n Monaten\n"
  "      <n>y = Schlüssel verfällt nach n Jahren\n"
  
- #: g10/keygen.c:2443
++#: g10/keygen.c:2465
  msgid "Key is valid for? (0) "
  msgstr "Wie lange bleibt der Schlüssel gültig? (0) "
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2470
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Wie lange bleibt die Beglaubigung gültig? (%s) "
  
- #: g10/keygen.c:2461 g10/keygen.c:2486
++#: g10/keygen.c:2483 g10/keygen.c:2508
  msgid "invalid value\n"
  msgstr "Ungültiger Wert.\n"
  
- #: g10/keygen.c:2468
++#: g10/keygen.c:2490
  msgid "Key does not expire at all\n"
  msgstr "Schlüssel verfällt nie\n"
  
- #: g10/keygen.c:2469
++#: g10/keygen.c:2491
  msgid "Signature does not expire at all\n"
  msgstr "Signature verfällt nie\n"
  
- #: g10/keygen.c:2474
++#: g10/keygen.c:2496
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "Key verfällt am %s\n"
  
- #: g10/keygen.c:2475
++#: g10/keygen.c:2497
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "Signatur verfällt am %s\n"
  
- #: g10/keygen.c:2479
++#: g10/keygen.c:2501
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5068,11 -3933,9 +5017,11 @@@ msgstr "
  "Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n"
  "Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2514
  msgid "Is this correct? (y/N) "
  msgstr "Ist dies richtig? (j/N) "
  
- #: g10/keygen.c:2560
++#: g10/keygen.c:2582
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5086,7 -3949,6 +5035,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2575
++#: g10/keygen.c:2597
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -5102,49 -3964,38 +5051,49 @@@ msgstr "
  "    \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
  "\n"
  
- #: g10/keygen.c:2594
++#: g10/keygen.c:2616
  msgid "Real name: "
  msgstr "Ihr Name (\"Vorname Nachname\"): "
  
- #: g10/keygen.c:2603
++#: g10/keygen.c:2625
  msgid "Invalid character in name\n"
  msgstr "Ungültiges Zeichen im Namen\n"
  
- #: g10/keygen.c:2604
++#: g10/keygen.c:2626
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr "Die Zeichen '%s' und '%s' dürfen in einem Namen nicht vorkommen\n"
  
- #: g10/keygen.c:2608
++#: g10/keygen.c:2630
  msgid "Name may not start with a digit\n"
  msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
  
- #: g10/keygen.c:2611
++#: g10/keygen.c:2633
  msgid "Name must be at least 5 characters long\n"
  msgstr "Der Name muß min. 5 Zeichen lang sein.\n"
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2643
  msgid "Email address: "
  msgstr "Email-Adresse: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2649
  msgid "Not a valid email address\n"
  msgstr "Diese Email-Adresse ist ungültig\n"
  
- #: g10/keygen.c:2636
++#: g10/keygen.c:2658
  msgid "Comment: "
  msgstr "Kommentar: "
  
- #: g10/keygen.c:2642
++#: g10/keygen.c:2664
  msgid "Invalid character in comment\n"
  msgstr "Ungültiges Zeichen im Kommentar.\n"
  
- #: g10/keygen.c:2678
++#: g10/keygen.c:2700
  #, c-format
  msgid "You are using the '%s' character set.\n"
  msgstr "Sie benutzen den Zeichensatz `%s'\n"
  
- #: g10/keygen.c:2684
++#: g10/keygen.c:2706
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5155,7 -4006,6 +5104,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2689
++#: g10/keygen.c:2711
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr "Bitte keine Emailadressen als Namen oder Kommentar verwenden\n"
  
@@@ -5170,31 -4020,24 +5119,31 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2714
++#: g10/keygen.c:2736
  msgid "NnCcEeOoQq"
  msgstr "NnKkEeFfAa"
  
- #: g10/keygen.c:2724
++#: g10/keygen.c:2746
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "Ändern: (N)ame, (K)ommentar, (E)-Mail oder (A)bbrechen? "
  
- #: g10/keygen.c:2725
++#: g10/keygen.c:2747
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr "Ändern: (N)ame, (K)ommentar, (E)-Mail oder (F)ertig/(A)bbrechen? "
  
- #: g10/keygen.c:2730
++#: g10/keygen.c:2752
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "Ändern: (N)ame, (E)-Mail oder (A)bbrechen? "
  
- #: g10/keygen.c:2731
++#: g10/keygen.c:2753
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "Ändern: (N)ame, (E)-Mail oder (F)ertig/(A)bbrechen? "
  
- #: g10/keygen.c:2750
++#: g10/keygen.c:2772
  msgid "Please correct the error first\n"
  msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
  
- #: g10/keygen.c:2796
++#: g10/keygen.c:2818
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5205,13 -4048,10 +5154,13 @@@ msgstr "
  "unterstützen, indem Sie z.B. in einem anderen Fenster/Konsole irgendetwas\n"
  "tippen, die Maus verwenden oder irgendwelche anderen Programme benutzen.\n"
  
- #: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
- #: g10/keygen.c:4777 g10/keygen.c:4882
++#: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
++#: g10/keygen.c:4330 g10/keygen.c:4803 g10/keygen.c:5064 g10/keygen.c:5169
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n"
  
- #: g10/keygen.c:3598
++#: g10/keygen.c:3922
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5222,62 -4062,49 +5171,62 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3924
  msgid "Continue? (Y/n) "
  msgstr "Fortsetzen? (J/n) "
  
- #: g10/keygen.c:3621
++#: g10/keygen.c:3945
  #, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "Ein Schlüssel für \"%s\" existiert bereits\n"
  
- #: g10/keygen.c:3626
++#: g10/keygen.c:3950
  msgid "Create anyway? (y/N) "
  msgstr "Trotzdem erzeugen? (j/N) "
  
- #: g10/keygen.c:3632
++#: g10/keygen.c:3956
  msgid "creating anyway\n"
  msgstr "wird trotzdem erzeugt\n"
  
- #: g10/keygen.c:3981
++#: g10/keygen.c:4315
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr "Hinweis: \"%s %s\" ruft den erweiterten Dialog auf.\n"
  
- #: g10/keygen.c:4013
++#: g10/keygen.c:4358
  msgid "Key generation canceled.\n"
  msgstr "Schlüsselerzeugung abgebrochen.\n"
  
- #: g10/keygen.c:4073
++#: g10/keygen.c:4418
  #, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "Sicherungsdatei '%s' kann nicht erzeugt werden: %s\n"
  
- #: g10/keygen.c:4093
++#: g10/keygen.c:4438
  #, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "Hinweis: Sicherung des Kartenschlüssels wurde auf `%s' gespeichert\n"
  
- #: g10/keygen.c:4244 g10/keygen.c:4393
++#: g10/keygen.c:4589 g10/keygen.c:4738
  #, c-format
  msgid "writing public key to '%s'\n"
  msgstr "schreiben des öffentlichen Schlüssels nach '%s'\n"
  
- #: g10/keygen.c:4387
++#: g10/keygen.c:4732
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "kein schreibbarer öffentlicher Schlüsselbund gefunden: %s\n"
  
- #: g10/keygen.c:4401
++#: g10/keygen.c:4746
  #, c-format
  msgid "error writing public keyring '%s': %s\n"
  msgstr "Fehler beim Schreiben des öff. Schlüsselbundes `%s': %s\n"
  
- #: g10/keygen.c:4433
++#: g10/keygen.c:4778
  msgid "public and secret key created and signed.\n"
  msgstr "Öffentlichen und geheimen Schlüssel erzeugt und signiert.\n"
  
- #: g10/keygen.c:4445
++#: g10/keygen.c:4790
  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"
@@@ -5286,7 -4113,6 +5235,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:4649 g10/keygen.c:4833
++#: g10/keygen.c:4936 g10/keygen.c:5120
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5294,7 -4120,6 +5243,7 @@@ msgstr "
  "Der Schlüssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
  "stimmen nicht überein)\n"
  
- #: g10/keygen.c:4651 g10/keygen.c:4835
++#: g10/keygen.c:4938 g10/keygen.c:5122
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5302,19 -4127,15 +5251,19 @@@ msgstr "
  "Der Schlüssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
  "Uhren stimmen nicht überein)\n"
  
- #: g10/keygen.c:4662 g10/keygen.c:4846
++#: g10/keygen.c:4949 g10/keygen.c:5133
  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:4674 g10/keygen.c:4676
++#: g10/keygen.c:4961 g10/keygen.c:4963
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Geheime Teile des Hauptschlüssels sind nicht vorhanden.\n"
  
- #: g10/keygen.c:4683 g10/keygen.c:4685
++#: g10/keygen.c:4970 g10/keygen.c:4972
  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:4704 g10/keygen.c:4860
++#: g10/keygen.c:4991 g10/keygen.c:5147
  msgid "Really create? (y/N) "
  msgstr "Wirklich erzeugen? (j/N) "
  
@@@ -5632,125 -4388,99 +5581,125 @@@ msgid "standalone revocation - use \"gp
  msgstr ""
  "Einzelner Widerruf - verwenden Sie \"gpg --import\", um ihn anzuwenden\n"
  
- #: g10/mainproc.c:1233 g10/mainproc.c:1276
++#: g10/mainproc.c:1238 g10/mainproc.c:1281
  msgid "no signature found\n"
  msgstr "Keine Signatur gefunden\n"
  
- #: g10/mainproc.c:1607
++#: g10/mainproc.c:1612
  #, c-format
  msgid "BAD signature from \"%s\""
  msgstr "FALSCHE Signatur von \"%s\""
  
- #: g10/mainproc.c:1609
++#: g10/mainproc.c:1614
  #, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Verfallene Signatur von \"%s\""
  
- #: g10/mainproc.c:1611
++#: g10/mainproc.c:1616
  #, c-format
  msgid "Good signature from \"%s\""
  msgstr "Korrekte Signatur von \"%s\""
  
- #: g10/mainproc.c:1630
++#: g10/mainproc.c:1635
  msgid "signature verification suppressed\n"
  msgstr "Signaturüberprüfung unterdrückt\n"
  
- #: g10/mainproc.c:1739
++#: g10/mainproc.c:1744
  msgid "can't handle this ambiguous signature data\n"
  msgstr "diese mehrdeutige Signaturdaten können nicht bearbeitet werden\n"
  
- #: g10/mainproc.c:1753 g10/mainproc.c:1761
++#: g10/mainproc.c:1758 g10/mainproc.c:1766
  #, c-format
  msgid "Signature made %s\n"
  msgstr "Signatur vom %s\n"
  
- #: g10/mainproc.c:1754 g10/mainproc.c:1762
++#: g10/mainproc.c:1759 g10/mainproc.c:1767
  #, 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:1766
++#: g10/mainproc.c:1771
  #, 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:1772
++#: g10/mainproc.c:1777
  #, c-format
  msgid "               issuer \"%s\"\n"
  msgstr "               Aussteller \"%s\"\n"
  
- #: g10/mainproc.c:1789
++#: g10/mainproc.c:1794
  msgid "Key available at: "
  msgstr "Schlüssel erhältlich bei: "
  
- #: g10/mainproc.c:2024
++#: g10/mainproc.c:2029
  msgid "[uncertain]"
  msgstr "[ungewiß]  "
  
- #: g10/mainproc.c:2062
++#: g10/mainproc.c:2067
  #, c-format
  msgid "                aka \"%s\""
  msgstr "                    alias \"%s\""
  
- #: g10/mainproc.c:2145
++#: g10/mainproc.c:2150
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "Diese Signatur ist seit %s verfallen.\n"
  
- #: g10/mainproc.c:2149
++#: g10/mainproc.c:2154
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "Diese Signatur verfällt am %s.\n"
  
- #: g10/mainproc.c:2160
++#: g10/mainproc.c:2165
  #, c-format
  msgid "%s signature, digest algorithm %s%s%s\n"
  msgstr "%s Signatur, Hashmethode %s%s%s\n"
  
- #: g10/mainproc.c:2161
++#: g10/mainproc.c:2166
  msgid "binary"
  msgstr "Binäre"
  
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2167
  msgid "textmode"
  msgstr "Textmodus"
  
- #: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "unbekannt"
  
- #: g10/mainproc.c:2164
++#: g10/mainproc.c:2169
  msgid ", key algorithm "
  msgstr ", Schlüsselverfahren "
  
- #: g10/mainproc.c:2199
++#: g10/mainproc.c:2204
  #, 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:2229
++#: g10/mainproc.c:2234
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "Signatur kann nicht geprüft werden: %s\n"
  
- #: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
++#: g10/mainproc.c:2327 g10/mainproc.c:2346 g10/mainproc.c:2470
  msgid "not a detached signature\n"
  msgstr "keine abgetrennte Signatur\n"
  
- #: g10/mainproc.c:2375
++#: g10/mainproc.c:2380
  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:2384
++#: g10/mainproc.c:2389
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "Einzelne Signatur der Klasse 0x%02x\n"
  
- #: g10/mainproc.c:2469
++#: g10/mainproc.c:2474
  msgid "old style (PGP 2.x) signature\n"
  msgstr "Signatur nach alter (PGP 2.x) Art\n"
  
@@@ -6049,23 -4725,18 +5998,23 @@@ msgstr "Ist dieses Bild richtig? (j/N) 
  msgid "unable to display photo ID!\n"
  msgstr "Die Foto-ID kann nicht angezeigt werden!\n"
  
- #: g10/pkclist.c:72 g10/revoke.c:757
++#: g10/pkclist.c:72 g10/revoke.c:758
  msgid "No reason specified"
  msgstr "Kein Grund angegeben"
  
- #: g10/pkclist.c:74 g10/revoke.c:759
++#: g10/pkclist.c:74 g10/revoke.c:760
  msgid "Key is superseded"
  msgstr "Schlüssel ist überholt"
  
- #: g10/pkclist.c:76 g10/revoke.c:758
++#: g10/pkclist.c:76 g10/revoke.c:759
  msgid "Key has been compromised"
  msgstr "Hinweis: Dieser Schlüssel ist nicht mehr sicher"
  
- #: g10/pkclist.c:78 g10/revoke.c:760
++#: g10/pkclist.c:78 g10/revoke.c:761
  msgid "Key is no longer used"
  msgstr "Schlüssel wird nicht mehr benutzt"
  
- #: g10/pkclist.c:80 g10/revoke.c:761
++#: g10/pkclist.c:80 g10/revoke.c:762
  msgid "User ID is no longer valid"
  msgstr "User-ID ist nicht mehr gültig"
  
@@@ -6141,7 -4799,6 +6090,7 @@@ msgid "
  "\n"
  msgstr "Die minimale Trust-Ebene für diesen Schlüssel beträgt: %s\n"
  
- #: g10/pkclist.c:310 g10/revoke.c:786
++#: g10/pkclist.c:310 g10/revoke.c:787
  msgid "Your decision? "
  msgstr "Ihre Auswahl? "
  
@@@ -6177,28 -4828,21 +6126,24 @@@ msgstr "
  "Dieser Schlüssel gehört uns (da wir nämlich den geheimen Schlüssel dazu "
  "haben)\n"
  
 +#: g10/pkclist.c:456
- #, fuzzy, c-format
- #| msgid "root certificate has now been marked as trusted\n"
+ #, c-format
  msgid "%s: This key is bad!  It has been marked as untrusted!\n"
- msgstr "Das Wurzelzertifikat wurde nun als vertrauenswürdig markiert\n"
+ msgstr ""
+ "%s: Der Schlüssel ist gefälscht!  Er wurde als nicht vertrauenswürdig "
+ "markiert.\n"
  
 +#: g10/pkclist.c:484
- #, fuzzy
- #| msgid ""
- #| "It is NOT certain that the key belongs to the person named\n"
- #| "in the user ID.  If you *really* know what you are doing,\n"
- #| "you may answer the next question with yes.\n"
  msgid ""
- "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "This key is bad!  It has been marked as untrusted!  If you\n"
  "*really* know what you are doing, you may answer the next\n"
  "question with yes.\n"
  msgstr ""
- "Es ist NICHT sicher, daß der Schlüssel zu dem in der User-ID\n"
- "Genannten gehört. Wenn Sie *wirklich* wissen, was Sie tun,\n"
- "können Sie die nächste Frage mit ja beantworten\n"
+ "Der Schlüssel ist gefälscht!  Er wurde als als nicht vertrauenswürdig\n"
+ "markiert.  Wenn Sie *wirklich* wissen, was Sie tun, können Sie die\n"
+ "nächste Frage mit ja beantworten.\n"
  
 +#: g10/pkclist.c:489
  msgid ""
  "It is NOT certain that the key belongs to the person named\n"
  "in the user ID.  If you *really* know what you are doing,\n"
@@@ -6348,34 -4963,27 +6293,34 @@@ msgstr "
  msgid "No such user ID.\n"
  msgstr "Keine solche User-ID vorhanden.\n"
  
- #: g10/pkclist.c:1197 g10/pkclist.c:1273
++#: g10/pkclist.c:1197 g10/pkclist.c:1274
  msgid "skipped: public key already set as default recipient\n"
  msgstr ""
  "übersprungen: öffentlicher Schlüssel bereits als Standardempfänger gesetzt\n"
  
- #: g10/pkclist.c:1218
++#: g10/pkclist.c:1219
  msgid "Public key is disabled.\n"
  msgstr "Öffentlicher Schlüssel ist abgeschaltet.\n"
  
- #: g10/pkclist.c:1228
++#: g10/pkclist.c:1229
  msgid "skipped: public key already set\n"
  msgstr "übersprungen: öffentlicher Schlüssel bereits gesetzt\n"
  
- #: g10/pkclist.c:1263
++#: g10/pkclist.c:1264
  #, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "Unbekannter voreingestellter Empfänger \"%s\"\n"
  
- #: g10/pkclist.c:1312
++#: g10/pkclist.c:1313
  msgid "no valid addressees\n"
  msgstr "Keine gültigen Adressaten\n"
  
- #: g10/pkclist.c:1665
++#: g10/pkclist.c:1666
  #, 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:1690
++#: g10/pkclist.c:1691
  #, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "Hinweis: Schlüssel %s hat keine Einstellung für %s\n"
@@@ -6385,28 -4992,22 +6330,28 @@@ msgid "data not saved; use option \"--o
  msgstr ""
  "Daten wurden nicht gespeichert; verwenden Sie dafür die Option \"--output\"\n"
  
- #: g10/plaintext.c:598
++#: g10/plaintext.c:614
  msgid "Detached signature.\n"
  msgstr "Abgetrennte Beglaubigungen.\n"
  
- #: g10/plaintext.c:606
++#: g10/plaintext.c:622
  msgid "Please enter name of data file: "
  msgstr "Bitte geben Sie den Namen der Datendatei ein: "
  
- #: g10/plaintext.c:643
++#: g10/plaintext.c:659
  msgid "reading stdin ...\n"
  msgstr "lese stdin ...\n"
  
- #: g10/plaintext.c:688
++#: g10/plaintext.c:704
  msgid "no signed data\n"
  msgstr "keine signierten Daten\n"
  
- #: g10/plaintext.c:706
++#: g10/plaintext.c:722
  #, c-format
  msgid "can't open signed data '%s'\n"
  msgstr "kann signierte Datei '%s' nicht öffnen.\n"
  
- #: g10/plaintext.c:741
++#: g10/plaintext.c:757
  #, c-format
  msgid "can't open signed data fd=%d: %s\n"
  msgstr "kann signierte Daten auf fd=%d nicht öffnen: %s\n"
@@@ -6473,7 -5060,6 +6418,7 @@@ msgid "Create a designated revocation c
  msgstr ""
  "Ein vorgesehenes Widerrufszertifikat für diesen Schlüssel erzeugen? (j/N) "
  
- #: g10/revoke.c:336 g10/revoke.c:727
++#: g10/revoke.c:336 g10/revoke.c:728
  msgid "ASCII armored output forced.\n"
  msgstr "Ausgabe mit ASCII Hülle erzwungen\n"
  
@@@ -6519,9 -5099,8 +6464,9 @@@ msgstr "
  "den privaten Schlüssel noch zugegriffen werden kann, so ist es besser,\n"
  "ein neues Widerrufszertifikat zu erzeugen, um den Grund des Widerrufs\n"
  "mit angeben zu können.  Weitere Informationen finden Sie im GnuPG\n"
- "Handbuch unter der Beschreibung des gpg Kommandos \"--gen-revoke\"."
+ "Handbuch unter der Beschreibung des gpg Kommandos \"--generate-revocation\"."
  
- #: g10/revoke.c:575
++#: g10/revoke.c:576
  msgid ""
  "To avoid an accidental use of this file, a colon has been inserted\n"
  "before the 5 dashes below.  Remove this colon with a text editor\n"
@@@ -6532,12 -5111,10 +6477,12 @@@ msgstr "
  "unten eingefügt.  Vor dem Import dieses Widerrufszertifikats\n"
  "entfernen Sie bitte diesen Doppelpunkt mittels eines Texteditors."
  
- #: g10/revoke.c:590
++#: g10/revoke.c:591
  #, c-format
  msgid "revocation certificate stored as '%s.rev'\n"
  msgstr "Widerrufzertifikat wurde als '%s.rev' gespeichert.\n"
  
- #: g10/revoke.c:634
++#: g10/revoke.c:635
  #, c-format
  msgid "secret key \"%s\" not found\n"
  msgstr "Geheimer Schlüssel \"%s\" nicht gefunden\n"
@@@ -6545,22 -5122,18 +6490,22 @@@
  #. TRANSLATORS: The %s prints a key specification which
  #. for example has been given at the command line.  Several lines
  #. lines with secret key infos are printed after this message.
- #: g10/revoke.c:661
++#: g10/revoke.c:662
  #, c-format
  msgid "'%s' matches multiple secret keys:\n"
  msgstr "'%s' trifft auf mehrere geheime Schlüssel zu:\n"
  
- #: g10/revoke.c:688
++#: g10/revoke.c:689
  #, c-format
  msgid "error searching the keyring: %s\n"
  msgstr "Fehler beim Suchen im Schlüsselbund: %s\n"
  
- #: g10/revoke.c:711
++#: g10/revoke.c:712
  msgid "Create a revocation certificate for this key? (y/N) "
  msgstr "Ein Widerrufszertifikat für diesen Schlüssel erzeugen? (j/N) "
  
  # translated by wk
- #: g10/revoke.c:735
++#: g10/revoke.c:736
  msgid ""
  "Revocation certificate created.\n"
  "\n"
@@@ -6580,34 -5153,27 +6525,34 @@@ msgstr "
  "Drucksystem kann unter Umständen eine Kopie anderen Nutzern zugänglich\n"
  "machen.\n"
  
- #: g10/revoke.c:769
++#: g10/revoke.c:770
  msgid "Please select the reason for the revocation:\n"
  msgstr "Grund für den Widerruf:\n"
  
- #: g10/revoke.c:779
++#: g10/revoke.c:780
  msgid "Cancel"
  msgstr "Abbruch"
  
- #: g10/revoke.c:781
++#: g10/revoke.c:782
  #, c-format
  msgid "(Probably you want to select %d here)\n"
  msgstr "(Wahrscheinlich möchten Sie hier %d auswählen)\n"
  
- #: g10/revoke.c:822
++#: g10/revoke.c:823
  msgid "Enter an optional description; end it with an empty line:\n"
  msgstr ""
  "Geben Sie eine optionale Beschreibung ein. Beenden mit einer leeren Zeile:\n"
  
- #: g10/revoke.c:850
++#: g10/revoke.c:851
  #, c-format
  msgid "Reason for revocation: %s\n"
  msgstr "Grund für Widerruf: %s\n"
  
- #: g10/revoke.c:852
++#: g10/revoke.c:853
  msgid "(No description given)\n"
  msgstr "(Keine Beschreibung angegeben)\n"
  
- #: g10/revoke.c:857
++#: g10/revoke.c:858
  msgid "Is this okay? (y/N) "
  msgstr "Ist das OK? (j/N) "
  
@@@ -6747,12 -5293,10 +6692,12 @@@ msgstr "
  "WARNUNG: URL für bevorzugten Schlüsselserver kann nicht %%-erweitert werden "
  "(zu groß). Verwende \"unerweiterte\".\n"
  
- #: g10/sign.c:329
++#: g10/sign.c:331
  #, c-format
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s/%s Signatur von: \"%s\"\n"
  
- #: g10/sign.c:878
++#: g10/sign.c:880
  #, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6760,11 -5304,9 +6705,11 @@@ msgstr "
  "WARNUNG: Erzwingen des Hashverfahrens %s (%d) verstößt gegen die "
  "Empfängervoreinstellungen\n"
  
- #: g10/sign.c:1009
++#: g10/sign.c:1011
  msgid "signing:"
  msgstr "signiere:"
  
- #: g10/sign.c:1286
++#: g10/sign.c:1288
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "%s Verschlüsselung wird verwendet\n"
@@@ -6790,7 -5328,6 +6735,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:362
++#: g10/tdbdump.c:57 g10/trustdb.c:369
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "Vertrauenssatz %lu, Typ %d: Schreiben fehlgeschlagen: %s\n"
@@@ -6835,7 -5364,6 +6780,7 @@@ msgstr "Fehler beim Suchen des \"Trust 
  msgid "read error in '%s': %s\n"
  msgstr "Lesefehler in `%s': %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "\"Trust-DB\": sync fehlgeschlagen: %s\n"
@@@ -6978,55 -5477,60 +6923,77 @@@ msgstr "Textzeilen länger als %d Zeich
  msgid "input line longer than %d characters\n"
  msgstr "Eingabezeile ist länger als %d Zeichen\n"
  
- #: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
++#: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
  #, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "Fehler beim Starten einer Transaktion auf der TOFU Datenbank: %s\n"
  
- #: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
++#: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr "Fehler beim Committen einer Transaktion auf der TOFU Datenbank: %s\n"
  
- #: g10/tofu.c:357 g10/tofu.c:699
++#: g10/tofu.c:355 g10/tofu.c:888
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  "Fehler beim Zurückrollen einer Transaktion auf der TOFU Datenbank: %s\n"
  
- #: g10/tofu.c:501
++#: g10/tofu.c:505
  #, c-format
  msgid "unsupported TOFU database version: %s\n"
  msgstr "Nicht unterstützte TOFU Datenbank Version: %s\n"
  
- #: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
- #: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
- #: g10/tofu.c:3056
++#: g10/tofu.c:538
+ #, fuzzy, c-format
+ #| msgid "error creating temporary file: %s\n"
+ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
+ msgstr "Fehler beim Erstellen einer temporären Datei: %s\n"
+ 
++#: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
+ msgid "TOFU DB error"
+ msgstr "TOFU (Trust on First Use) database error"
+ 
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2340 g10/tofu.c:2359
++#: g10/tofu.c:2372 g10/tofu.c:2384 g10/tofu.c:2399 g10/tofu.c:2411
++#: g10/tofu.c:2980 g10/tofu.c:2997 g10/tofu.c:3033 g10/tofu.c:3050
++#: g10/tofu.c:3353
  #, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "Fehler beim Lesen der TOFU Datenbank: %s\n"
  
- #: g10/tofu.c:566 g10/tofu.c:574
++#: g10/tofu.c:716 g10/tofu.c:724
  #, c-format
  msgid "error determining TOFU database's version: %s\n"
  msgstr "Fehler beim Feststellen der TOFU Datenbank Version: %s\n"
  
- #: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
++#: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
  #, c-format
  msgid "error initializing TOFU database: %s\n"
  msgstr "Fehler beim Initialisieren der TOFU Datenbank: %s\n"
  
- #: g10/tofu.c:765
++#: g10/tofu.c:844
+ #, fuzzy, c-format
+ #| msgid "error creating temporary file: %s\n"
+ msgid "error creating 'encryptions' TOFU table: %s\n"
+ msgstr "Fehler beim Erstellen einer temporären Datei: %s\n"
+ 
++#: g10/tofu.c:874
+ #, c-format
+ msgid "adding column effective_policy to bindings DB: %s\n"
+ msgstr ""
+ 
++#: g10/tofu.c:956
  #, c-format
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "Fehler beim Öffner der TOFU Datenbank '%s': %s\n"
  
- #: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
++#: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
  #, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "Fehler beim Schreiben der TOFU Datenbank: %s\n"
  
- #: g10/tofu.c:1239
++#: g10/tofu.c:1328
  #, fuzzy, c-format
  #| msgid "The email address \"%s\" is associated with %d key:\n"
  #| msgid_plural "The email address \"%s\" is associated with %d keys:\n"
@@@ -7034,14 -5538,14 +7001,16 @@@ msgid "
  "This is the first time the email address \"%s\" is being used with key %s."
  msgstr "Die Email-Adresse \"%s\" ist mit einem Schlüssel assoziert:\n"
  
- #: g10/tofu.c:1247
++#: g10/tofu.c:1337
  #, fuzzy, c-format
  #| msgid "The email address \"%s\" is associated with %d key:\n"
  #| msgid_plural "The email address \"%s\" is associated with %d keys:\n"
- msgid "The email address \"%s\" is associated with %d keys!"
- msgstr "Die Email-Adresse \"%s\" ist mit einem Schlüssel assoziert:\n"
+ msgid "The email address \"%s\" is associated with %d key!"
+ msgid_plural "The email address \"%s\" is associated with %d keys!"
+ msgstr[0] "Die Email-Adresse \"%s\" ist mit einem Schlüssel assoziert:\n"
+ msgstr[1] "Die Email-Adresse \"%s\" ist mit einem Schlüssel assoziert:\n"
  
- #: g10/tofu.c:1251
++#: g10/tofu.c:1343
  #, fuzzy
  #| msgid ""
  #| "The key with fingerprint %s raised a conflict with the binding %s.  Since "
@@@ -7052,70 -5556,75 +7021,89 @@@ msgstr "
  "(%s).  Die Richtlinie dieser Bindung wurde deswegen von 'auto' auf 'ask' "
  "geändert."
  
- #: g10/tofu.c:1257
++#: g10/tofu.c:1349
  #, c-format
  msgid ""
  "Please indicate whether this email address should be associated with key %s "
  "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1513
++#: g10/tofu.c:1605
  #, c-format
  msgid "error gathering other user IDs: %s\n"
  msgstr "Fehler beim Einsammeln der übrigen User-IDs: %s\n"
  
- #: g10/tofu.c:1523
++#: g10/tofu.c:1615
  #, fuzzy
  #| msgid "list key and user IDs"
  msgid "This key's user IDs:\n"
  msgstr "Schlüssel und User-IDs auflisten"
  
- #: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
++#: g10/tofu.c:1631 g10/tofu.c:1796
  #, c-format
  msgid "policy: %s"
  msgstr "Richtlinie: %s"
  
- #: g10/tofu.c:1630
++#: g10/tofu.c:1722
  #, c-format
  msgid "error gathering signature stats: %s\n"
  msgstr "Fehler beim Einsammeln der Signaturstatistik: %s\n"
  
- #: g10/tofu.c:1634
++#: g10/tofu.c:1726
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] "Die Email-Adresse \"%s\" ist mit einem Schlüssel assoziert:\n"
  msgstr[1] "Die Email-Adresse \"%s\" ist mit %d Schlüsseln assoziert:\n"
  
- #: g10/tofu.c:1651
++#: g10/tofu.c:1744
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr "Statistik für Schlüssel mit der Email-Adresse \"%s\":\n"
  
- #: g10/tofu.c:1684 g10/tofu.c:1689
++#: g10/tofu.c:1785 g10/tofu.c:1790
  msgid ", "
  msgstr ""
  
- #: g10/tofu.c:1693
++#: g10/tofu.c:1794
  msgid "this key"
  msgstr "dieser Schlüssel"
  
- #: g10/tofu.c:1715
++#: g10/tofu.c:1820
  #, fuzzy, c-format
  #| msgid "Verified %ld messages signed by \"%s\"."
- msgid "Verified %d message"
- msgid_plural "Verified %d messages"
+ msgid "Verified %d message."
+ msgid_plural "Verified %d messages."
  msgstr[0] "%ld überprüfte Nachrichten von \"%s\"."
  msgstr[1] "%ld überprüfte Nachrichten von \"%s\"."
  
- #: g10/tofu.c:1719
- #, c-format
- msgid "Encrypted %d message"
- msgid_plural "Encrypted %d messages"
- msgstr[0] ""
- msgstr[1] ""
++#: g10/tofu.c:1824
+ #, fuzzy, c-format
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid "Encrypted %d message."
+ msgid_plural "Encrypted %d messages."
+ msgstr[0] "Verschlüsselt mit %lu Passphrases\n"
+ msgstr[1] "Verschlüsselt mit %lu Passphrases\n"
  
- #: g10/tofu.c:1734
++#: g10/tofu.c:1831
+ #, fuzzy, c-format
+ #| msgid "%ld message signed in the future."
+ #| msgid_plural "%ld messages signed in the future."
+ msgid "Verified %d message in the future."
+ msgid_plural "Verified %d messages in the future."
+ msgstr[0] "%ld Nachricht in der Zukunft signiert."
+ msgstr[1] "%ld Nachrichten in der Zukunf signiert."
+ 
++#: g10/tofu.c:1835
+ #, fuzzy, c-format
+ #| msgid "%ld message signed in the future."
+ #| msgid_plural "%ld messages signed in the future."
+ msgid "Encrypted %d message in the future."
+ msgid_plural "Encrypted %d messages in the future."
+ msgstr[0] "%ld Nachricht in der Zukunft signiert."
+ msgstr[1] "%ld Nachrichten in der Zukunf signiert."
+ 
++#: g10/tofu.c:1849
  #, fuzzy, c-format
  #| msgid " over the past %ld day."
  #| msgid_plural " over the past %ld days."
@@@ -7124,7 -5633,22 +7112,25 @@@ msgid_plural "Messages verified over th
  msgstr[0] " innerhalb des letzten Tages."
  msgstr[1] " innerhalb der letzten %ld Tage."
  
- #: g10/tofu.c:1740
++#: g10/tofu.c:1855
+ #, fuzzy, c-format
+ #| msgid " over the past %ld day."
+ #| msgid_plural " over the past %ld days."
+ msgid "Messages encrypted over the past %d day: %d."
+ msgid_plural "Messages encrypted over the past %d days: %d."
+ msgstr[0] " innerhalb des letzten Tages."
+ msgstr[1] " innerhalb der letzten %ld Tage."
+ 
++#: g10/tofu.c:1865
+ #, fuzzy, c-format
+ #| msgid " over the past %ld month."
+ #| msgid_plural " over the past %ld months."
+ msgid "Messages verified over the past %d month: %d."
+ msgid_plural "Messages verified over the past %d months: %d."
+ msgstr[0] " innerhalb des letzten Monats."
+ msgstr[1] " innerhalb der letzten %ld Monate."
+ 
++#: g10/tofu.c:1871
  #, fuzzy, c-format
  #| msgid " over the past %ld month."
  #| msgid_plural " over the past %ld months."
@@@ -7133,7 -5657,6 +7139,7 @@@ msgid_plural "Messages encrypted over t
  msgstr[0] " innerhalb des letzten Monats."
  msgstr[1] " innerhalb der letzten %ld Monate."
  
- #: g10/tofu.c:1746
++#: g10/tofu.c:1881
  #, fuzzy, c-format
  #| msgid " over the past %ld day."
  #| msgid_plural " over the past %ld days."
@@@ -7142,17 -5665,35 +7148,39 @@@ msgid_plural "Messages verified over th
  msgstr[0] " innerhalb des letzten Tages."
  msgstr[1] " innerhalb der letzten %ld Tage."
  
- #: g10/tofu.c:1752
- #, fuzzy
++#: g10/tofu.c:1887
+ #, fuzzy, c-format
+ #| msgid " over the past %ld day."
+ #| msgid_plural " over the past %ld days."
+ msgid "Messages encrypted over the past %d year: %d."
+ msgid_plural "Messages encrypted over the past %d years: %d."
+ msgstr[0] " innerhalb des letzten Tages."
+ msgstr[1] " innerhalb der letzten %ld Tage."
+ 
++#: g10/tofu.c:1895
+ #, fuzzy, c-format
  #| msgid " over the past %ld day."
  #| msgid_plural " over the past %ld days."
- msgid " in the past."
+ msgid "Messages verified in the past: %d."
  msgstr " innerhalb des letzten Tages."
  
++#: g10/tofu.c:1899
+ #, fuzzy, c-format
+ #| msgid ""
+ #| "Verified %ld message signed by \"%s\"\n"
+ #| "in the past %s."
+ #| msgid_plural ""
+ #| "Verified %ld messages signed by \"%s\"\n"
+ #| "in the past %s."
+ msgid "Messages encrypted in the past: %d."
+ msgstr ""
+ "%ld überprüfte Nachricht von \"%s\"\n"
+ "in den letzten %s."
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1767
++#: g10/tofu.c:1916
  msgid "TOFU detected a binding conflict"
  msgstr ""
  "Normalerweise ist lediglich ein Schlüssel mit einer Email-Adresse "
@@@ -7166,95 -5707,103 +7194,120 @@@
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1809
++#: g10/tofu.c:1958
  msgid "gGaAuUrRbB"
  msgstr "gGaAuUlLfF"
  
- #: g10/tofu.c:1815
++#: g10/tofu.c:1964
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr "(G)ut, einmal (A)kzeptieren, (U)nbekannt, einmal ab(L)ehnen, (F)alsch?"
  
- #: g10/tofu.c:1823
++#: g10/tofu.c:1972
  msgid "Defaulting to unknown."
  msgstr ""
  
- #: g10/tofu.c:1938 g10/tofu.c:2074
++#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
- #: g10/tofu.c:1994
++#: g10/tofu.c:2143
  #, fuzzy, c-format
  #| msgid "error writing key: %s\n"
  msgid "resetting keydb: %s\n"
  msgstr "Fehler beim Schreiben des Schlüssels: %s\n"
  
- #: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
- #: g10/tofu.c:2425
- #, c-format
- msgid "error setting TOFU binding's trust level to %s\n"
++#: g10/tofu.c:2601
+ #, fuzzy, c-format
+ #| msgid "error setting TOFU binding's trust level to %s\n"
+ msgid "error setting TOFU binding's policy to %s\n"
  msgstr "Fehler beim Setzen der TOFU Binding Vertrauensstufe auf %s\n"
  
- #: g10/tofu.c:2473
++#: g10/tofu.c:2794
  #, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "Fehler beim Ändern der TOFU Richtlinie: %s\n"
  
- #. TRANSLATORS: The tilde ('~') is used here to indicate a
- #. * non-breakable space
- #: g10/tofu.c:2574
- #, c-format
- msgid "%d~year"
- msgid_plural "%d~years"
++#: g10/tofu.c:2839
+ #, fuzzy, c-format
+ #| msgid "%d~year"
+ #| msgid_plural "%d~years"
+ msgid "%lld~year"
+ msgid_plural "%lld~years"
  msgstr[0] "%d~Jahr"
  msgstr[1] "%d~Jahre"
  
- #: g10/tofu.c:2583
- #, c-format
- msgid "%d~month"
- msgid_plural "%d~months"
++#: g10/tofu.c:2844
+ #, fuzzy, c-format
+ #| msgid "%d~month"
+ #| msgid_plural "%d~months"
+ msgid "%lld~month"
+ msgid_plural "%lld~months"
  msgstr[0] "%d~Monat"
  msgstr[1] "%d~Monate"
  
- #: g10/tofu.c:2592
++#: g10/tofu.c:2849
  #, c-format
- msgid "%d~day"
- msgid_plural "%d~days"
+ msgid "%lld~week"
+ msgid_plural "%lld~weeks"
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:2854
+ #, fuzzy, c-format
+ #| msgid "%d~day"
+ #| msgid_plural "%d~days"
+ msgid "%lld~day"
+ msgid_plural "%lld~days"
  msgstr[0] "%d~Tag"
  msgstr[1] "%d~Tage"
  
- #: g10/tofu.c:2601
- #, c-format
- msgid "%d~hour"
- msgid_plural "%d~hours"
++#: g10/tofu.c:2859
+ #, fuzzy, c-format
+ #| msgid "%d~hour"
+ #| msgid_plural "%d~hours"
+ msgid "%lld~hour"
+ msgid_plural "%lld~hours"
  msgstr[0] "%d~Stunde"
  msgstr[1] "%d~Stunden"
  
- #: g10/tofu.c:2610
- #, c-format
- msgid "%d~minute"
- msgid_plural "%d~minutes"
++#: g10/tofu.c:2864
+ #, fuzzy, c-format
+ #| msgid "%d~minute"
+ #| msgid_plural "%d~minutes"
+ msgid "%lld~minute"
+ msgid_plural "%lld~minutes"
  msgstr[0] "%d~Minute"
  msgstr[1] "%d~Minuten"
  
- #: g10/tofu.c:2619
- #, c-format
- msgid "%d~second"
- msgid_plural "%d~seconds"
++#: g10/tofu.c:2866
+ #, fuzzy, c-format
+ #| msgid "%d~second"
+ #| msgid_plural "%d~seconds"
+ msgid "%lld~second"
+ msgid_plural "%lld~seconds"
  msgstr[0] "%d~Sekunde"
  msgstr[1] "%d~Sekunden"
  
- #: g10/tofu.c:2802
- #, c-format
- msgid "%s: "
- msgstr ""
- 
- #: g10/tofu.c:2806
++#: g10/tofu.c:3103
+ #, fuzzy, c-format
+ #| msgid "TOFU: few signatures %d message %s"
+ #| msgid_plural "TOFU: few signatures %d messages %s"
+ msgid "%s: Verified 0~signatures and encrypted 0~messages."
+ msgstr ""
+ "WARNUNG: Falls sie glauben, mehr als %d mit diesem Schlüssel signierte\n"
+ "Nachricht erhalten zu haben, so kann es sich bei diesem Schlüssel um\n"
+ "eine Fälschung handeln!  Prüfen Sie die Email-Adresse genau auf kleine\n"
+ "Variationen (z.B. zusätzliche Leerzeichen).  Falls Ihnen der Schlüssel\n"
+ "suspekt erscheint, so benutzen Sie '%s' um den Schlüssel als Fälschung\n"
+ "zu markieren."
+ 
++#: g10/tofu.c:3109
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
- msgid "Verified %ld signatures"
+ msgid "%s: Verified 0 signatures."
  msgstr "%d Beglaubigungen entfernt.\n"
  
- #: g10/tofu.c:2816
++#: g10/tofu.c:3117
  #, fuzzy, c-format
  #| msgid ""
  #| "Verified %ld message signed by \"%s\"\n"
@@@ -7271,13 -5820,11 +7324,13 @@@ msgstr[1] "
  "%ld überprüfte Nachrichten von \"%s\"\n"
  "in den letzten %s."
  
- #: g10/tofu.c:2826
- #, fuzzy, c-format
++#: g10/tofu.c:3127
+ #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
- msgid ", and encrypted %ld messages"
+ msgid "Encrypted 0 messages."
  msgstr "Verschlüsselt mit %lu Passphrases\n"
  
- #: g10/tofu.c:2835
++#: g10/tofu.c:3135
  #, fuzzy, c-format
  #| msgid ""
  #| "Verified %ld message signed by \"%s\"\n"
@@@ -7294,7 -5841,11 +7347,13 @@@ msgstr[1] "
  "%ld überprüfte Nachrichten von \"%s\"\n"
  "in den letzten %s."
  
- #: g10/tofu.c:2880
++#: g10/tofu.c:3146
+ #, fuzzy, c-format
+ #| msgid "policy: %s"
+ msgid "(policy: %s)"
+ msgstr "Richtlinie: %s"
+ 
++#: g10/tofu.c:3177
  #, fuzzy
  #| msgid "Warning: we've have yet to see a message signed by this key!\n"
  msgid ""
@@@ -7303,7 -5854,6 +7362,7 @@@ msgstr "
  "WARNUNG: Wir müssen noch eine mit diesem Schlüssel signierte Nachricht "
  "sehen.\n"
  
- #: g10/tofu.c:2883
++#: g10/tofu.c:3180
  #, fuzzy
  #| msgid "Warning: we've only seen a single message signed by this key!\n"
  msgid ""
@@@ -7312,7 -5862,6 +7371,7 @@@ msgstr "
  "WARNUNG: Wir haben nur eine einzige mit diesem Schlüssel signierte Nachricht "
  "gesehen.\n"
  
- #: g10/tofu.c:2887
++#: g10/tofu.c:3184
  #, fuzzy
  #| msgid "Warning: we've have yet to see a message signed by this key!\n"
  msgid "Warning: you have yet to encrypt a message to this key!\n"
@@@ -7320,7 -5869,6 +7379,7 @@@ msgstr "
  "WARNUNG: Wir müssen noch eine mit diesem Schlüssel signierte Nachricht "
  "sehen.\n"
  
- #: g10/tofu.c:2890
++#: g10/tofu.c:3187
  #, fuzzy
  #| msgid "Warning: we've only seen a single message signed by this key!\n"
  msgid "Warning: you have only encrypted one message to this key!\n"
@@@ -7328,7 -5876,6 +7387,7 @@@ msgstr "
  "WARNUNG: Wir haben nur eine einzige mit diesem Schlüssel signierte Nachricht "
  "gesehen.\n"
  
- #: g10/tofu.c:2919
++#: g10/tofu.c:3216
  #, fuzzy, c-format
  #| msgid ""
  #| "Warning: if you think you've seen more than %ld message signed by this "
@@@ -7369,18 -5916,14 +7428,18 @@@ msgstr[1] "
  "  %s\n"
  "um den Schlüssel als Fälschung zu markieren.\n"
  
- #: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
- #: g10/tofu.c:3480 g10/tofu.c:3572
++#: g10/tofu.c:3298 g10/tofu.c:3449 g10/tofu.c:3627 g10/tofu.c:3670
++#: g10/tofu.c:3784 g10/tofu.c:3859 g10/tofu.c:3894
  #, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "Fehler beim Öffnen der TOFU Datenbank: %s\n"
  
- #: g10/tofu.c:3185
++#: g10/tofu.c:3482
  #, c-format
- msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
  msgstr ""
  
- #: g10/tofu.c:3515
++#: g10/tofu.c:3819
  #, fuzzy, c-format
  #| msgid "error writing public keyring '%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7413,71 -5951,57 +7472,71 @@@ msgstr "
  msgid "key %s marked as ultimately trusted\n"
  msgstr "Schlüssel %s ist als ultimativ vertrauenswürdig gekennzeichnet\n"
  
- #: g10/trustdb.c:341
++#: g10/trustdb.c:348
  #, 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:347
++#: g10/trustdb.c:354
  #, 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:422
++#: g10/trustdb.c:429
  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:431
++#: g10/trustdb.c:438
  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:468
++#: g10/trustdb.c:475
  #, 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:474
++#: g10/trustdb.c:481
  #, c-format
  msgid "using %s trust model\n"
  msgstr "verwende Vertrauensmodell %s\n"
  
- #: g10/trustdb.c:511
++#: g10/trustdb.c:518
  msgid "no need for a trustdb check\n"
  msgstr "\"Trust-DB\"-Überprüfung nicht nötig\n"
  
- #: g10/trustdb.c:517 g10/trustdb.c:2160
++#: g10/trustdb.c:524 g10/trustdb.c:2187
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "nächste \"Trust-DB\"-Pflichtüberprüfung am %s\n"
  
- #: g10/trustdb.c:526
++#: g10/trustdb.c:533
  #, 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:542
++#: g10/trustdb.c:549
  #, 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:749 g10/trustdb.c:1313
++#: g10/trustdb.c:756 g10/trustdb.c:1340
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "Öffentlicher Schlüssel %s nicht gefunden: %s\n"
  
- #: g10/trustdb.c:966
++#: g10/trustdb.c:973
  msgid "please do a --check-trustdb\n"
  msgstr "Bitte ein --check-trustdb durchführen\n"
  
- #: g10/trustdb.c:971
++#: g10/trustdb.c:978
  msgid "checking the trustdb\n"
  msgstr "\"Trust-DB\" wird überprüft\n"
  
- #: g10/trustdb.c:1883
++#: g10/trustdb.c:1910
  #, c-format
  msgid "%d key processed"
  msgid_plural "%d keys processed"
@@@ -7485,23 -6009,19 +7544,23 @@@ msgstr[0] "%d Schlüssel bislang bearbe
  msgstr[1] "%d Schlüssel bislang bearbeitet"
  
  # translated by wk
- #: g10/trustdb.c:1886
++#: g10/trustdb.c:1913
  #, 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:1956
++#: g10/trustdb.c:1983
  msgid "no ultimately trusted keys found\n"
  msgstr "keine ultimativ vertrauenswürdigen Schlüssel gefunden\n"
  
- #: g10/trustdb.c:1970
++#: g10/trustdb.c:1997
  #, 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:2087
++#: g10/trustdb.c:2114
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7509,7 -6029,6 +7568,7 @@@ msgstr "
  "Tiefe: %d  gültig: %3d  signiert: %3d  Vertrauen: %d-, %dq, %dn, %dm, %df, "
  "%du\n"
  
- #: g10/trustdb.c:2167
++#: g10/trustdb.c:2194
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr ""
@@@ -7620,19 -6118,14 +7679,19 @@@ msgstr "
  "Syntax: kbxutil [Optionen] [Dateien]\n"
  "Anlisten exportieren und Importieren von KeyBox Dateien\n"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3208
++#: scd/app-nks.c:718 scd/app-openpgp.c:3221
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr "Der RSA Modulus fehlt oder ist nicht %d Bits lang\n"
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3220
++#: scd/app-nks.c:726 scd/app-openpgp.c:3233
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr "Der öffentliche Exponent fehlt oder ist zu groß (mehr als %d Bit)\n"
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
- #: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
- #: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1965 scd/app-openpgp.c:1984
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2166 scd/app-openpgp.c:2430
++#: scd/app-openpgp.c:2477 scd/app-openpgp.c:2582 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "PIN-Callback meldete Fehler: %s\n"
@@@ -7688,83 -6172,65 +7747,83 @@@ msgstr "
  "|N|Bitte geben Sie den PIN Entsperrcode (PUK) für den Schlüssel zur "
  "Erstellung qualifizierter Signaturen ein."
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2511 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "Fehler beim Abfragen einer neuen PIN: %s\n"
  
- #: scd/app-openpgp.c:806
++#: scd/app-openpgp.c:801
  #, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "Der Fingerabdruck kann nicht gespeichert werden: %s\n"
  
- #: scd/app-openpgp.c:819
++#: scd/app-openpgp.c:814
  #, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "Das Erzeugungsdatum konnte nicht gespeichert werden: %s\n"
  
- #: scd/app-openpgp.c:1236
++#: scd/app-openpgp.c:1247
  msgid "response does not contain the RSA modulus\n"
  msgstr "Die Antwort enthält das RSA-Modulus nicht\n"
  
- #: scd/app-openpgp.c:1243
++#: scd/app-openpgp.c:1254
  msgid "response does not contain the RSA public exponent\n"
  msgstr "Antwort enthält den öffentlichen RSA-Exponenten nicht\n"
  
- #: scd/app-openpgp.c:1353
++#: scd/app-openpgp.c:1364
  msgid "response does not contain the EC public key\n"
  msgstr "Der EC Schlüssel fehlt in der Antwort\n"
  
- #: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:1464 scd/app-openpgp.c:3825
  msgid "response does not contain the public key data\n"
  msgstr "Die Antwort enthält keine öffentliche Schlüssel-Daten\n"
  
- #: scd/app-openpgp.c:1551
++#: scd/app-openpgp.c:1564
  #, c-format
  msgid "reading public key failed: %s\n"
  msgstr "Lesen des öffentlichen Schlüssels fehlgeschlagen: %s\n"
  
- #: scd/app-openpgp.c:1903
++#: scd/app-openpgp.c:1916
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr "Die Standard PIN wird für %s benutzt\n"
  
- #: scd/app-openpgp.c:1910
++#: scd/app-openpgp.c:1923
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  "Die Standard PIN für %s konnte nicht benutzt werden: %s - Die Standard PIN "
  "wird nicht weiter benutzt\n"
  
- #: scd/app-openpgp.c:1925
++#: scd/app-openpgp.c:1938
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr "||Bitte die PIN eingeben%%0A[Sigs erzeugt: %lu]"
  
- #: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
++#: scd/app-openpgp.c:1949 scd/app-openpgp.c:2424
  msgid "||Please enter the PIN"
  msgstr "||Bitte die PIN eingeben"
  
- #: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2173 scd/app-openpgp.c:2437
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr "PIN für CHV%d ist zu kurz; die Mindestlänge beträgt %d\n"
  
- #: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
- #: scd/app-openpgp.c:4114
++#: scd/app-openpgp.c:2004 scd/app-openpgp.c:2043 scd/app-openpgp.c:2185
++#: scd/app-openpgp.c:4126
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "Prüfung des CHV%d fehlgeschlagen: %s\n"
  
- #: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
++#: scd/app-openpgp.c:2072 scd/app-openpgp.c:2458 scd/app-openpgp.c:4556
  msgid "error retrieving CHV status from card\n"
  msgstr "Fehler beim Holen des CHV-Status' von der Karte\n"
  
- #: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
++#: scd/app-openpgp.c:2078 scd/app-openpgp.c:4565
  msgid "card is permanently locked!\n"
  msgstr "Karte ist dauerhaft gesperrt!\n"
  
- #: scd/app-openpgp.c:2072
++#: scd/app-openpgp.c:2085
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7774,24 -6240,19 +7833,24 @@@ msgstr[1] "Noch %d Admin-PIN-Versuche, 
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:2082
++#: scd/app-openpgp.c:2095
  #, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "|A|Bitte die Admin-PIN eingeben.%%0A[Verbliebene Versuche: %d]"
  
- #: scd/app-openpgp.c:2086
++#: scd/app-openpgp.c:2099
  msgid "|A|Please enter the Admin PIN"
  msgstr "|A|Bitte die Admin-PIN eingeben."
  
- #: scd/app-openpgp.c:2107
++#: scd/app-openpgp.c:2120
  msgid "access to admin commands is not configured\n"
  msgstr "Zugriff auf Admin-Befehle ist nicht eingerichtet\n"
  
- #: scd/app-openpgp.c:2460
++#: scd/app-openpgp.c:2473
  msgid "||Please enter the Reset Code for the card"
  msgstr "Bitte geben Sie den Rückstellcode für diese Karte ein"
  
- #: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
++#: scd/app-openpgp.c:2483 scd/app-openpgp.c:2537
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr "Der Rückstellcode ist zu kurz; die Mindestlänge beträgt %d\n"
@@@ -7799,109 -6260,85 +7858,109 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2493
++#: scd/app-openpgp.c:2506
  msgid "|RN|New Reset Code"
  msgstr "|RN|Neuer Rückstellcode"
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|AN|New Admin PIN"
  msgstr "|AN|Neue Admin-PIN"
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|N|New PIN"
  msgstr "|N|Neue PIN"
  
- #: scd/app-openpgp.c:2565
++#: scd/app-openpgp.c:2578
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "|A|Bitte die Admin-PIN sowie die neue Admin-PIN eingeben."
  
- #: scd/app-openpgp.c:2566
++#: scd/app-openpgp.c:2579
  msgid "||Please enter the PIN and New PIN"
  msgstr "||Bitte die PIN sowie die neue PIN eingeben"
  
- #: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
++#: scd/app-openpgp.c:2635 scd/app-openpgp.c:3885
  msgid "error reading application data\n"
  msgstr "Fehler beim Lesen der Anwendungsdaten\n"
  
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
++#: scd/app-openpgp.c:2641 scd/app-openpgp.c:3892
  msgid "error reading fingerprint DO\n"
  msgstr "Fehler beim Lesen des Fingerabdrucks DO\n"
  
- #: scd/app-openpgp.c:2638
++#: scd/app-openpgp.c:2651
  msgid "key already exists\n"
  msgstr "Schlüssel existiert bereits\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2655
  msgid "existing key will be replaced\n"
  msgstr "Existierender Schlüssel wird ersetzt werden\n"
  
- #: scd/app-openpgp.c:2644
++#: scd/app-openpgp.c:2657
  msgid "generating new key\n"
  msgstr "neue Schlüssel werden erzeugt\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2659
  msgid "writing new key\n"
  msgstr "der neue Schlüssel wird geschrieben\n"
  
- #: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
++#: scd/app-openpgp.c:3201 scd/app-openpgp.c:3553
  msgid "creation timestamp missing\n"
  msgstr "Erzeugungsdatum fehlt\n"
  
- #: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
++#: scd/app-openpgp.c:3243 scd/app-openpgp.c:3251
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr "Die RSA Primzahl %s fehlt oder ist nicht %d Bits lang\n"
  
- #: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
++#: scd/app-openpgp.c:3384 scd/app-openpgp.c:3647
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "Speichern des Schlüssels fehlgeschlagen: %s\n"
  
- #: scd/app-openpgp.c:3534
++#: scd/app-openpgp.c:3547
  msgid "unsupported curve\n"
  msgstr "Nicht unterstützte Kurve\n"
  
- #: scd/app-openpgp.c:3790
++#: scd/app-openpgp.c:3802
  msgid "please wait while key is being generated ...\n"
  msgstr "Bitte warten, der Schlüssel wird erzeugt ...\n"
  
- #: scd/app-openpgp.c:3798
++#: scd/app-openpgp.c:3810
  msgid "generating key failed\n"
  msgstr "Schlüsselerzeugung fehlgeschlagen\n"
  
- #: scd/app-openpgp.c:3804
++#: scd/app-openpgp.c:3816
  #, c-format
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
  msgstr[0] "Schlüsselerzeugung abgeschlossen (%d Sekunde)\n"
  msgstr[1] "Schlüsselerzeugung abgeschlossen (%d Sekunden)\n"
  
- #: scd/app-openpgp.c:3838
++#: scd/app-openpgp.c:3850
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "Ungültige Struktur der OpenPGP-Karte (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:3900
  msgid "fingerprint on card does not match requested one\n"
  msgstr "Der Fingerabdruck auf der Karte entspricht nicht dem angeforderten.\n"
  
- #: scd/app-openpgp.c:4004
++#: scd/app-openpgp.c:4016
  #, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "Die Hashmethode %s wird von der Karte nicht unterstützt\n"
  
- #: scd/app-openpgp.c:4089
++#: scd/app-openpgp.c:4101
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "Anzahl bereits erzeugter Signaturen: %lu\n"
  
- #: scd/app-openpgp.c:4551
++#: scd/app-openpgp.c:4570
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  "Die Überprüfung der Admin PIN ist momentan durch einen Befehl verboten "
  "worden\n"
  
- #: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
++#: scd/app-openpgp.c:4871 scd/app-openpgp.c:4882
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "Kann auf %s nicht zugreifen - ungültige OpenPGP-Karte?\n"
@@@ -7921,7 -6355,6 +7980,7 @@@ msgstr "|N|Erstmalige neue PIN
  msgid "run in multi server mode (foreground)"
  msgstr "Im Multiserver Modus ausführen"
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|NAME|Die Debugstufe auf NAME setzen"
  
@@@ -7961,11 -6385,9 +8020,11 @@@ msgstr "Verweigere die Benutzung von \"
  msgid "use variable length input for pinpad"
  msgstr "Variable Längeneingabe für die Kartenlesertastatur benutzen"
  
- #: scd/scdaemon.c:287
++#: scd/scdaemon.c:286
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Gebrauch: @SCDAEMON@ [Optionen] (-h für Hilfe)"
  
- #: scd/scdaemon.c:289
++#: scd/scdaemon.c:288
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
@@@ -7973,18 -6395,15 +8032,18 @@@ msgstr "
  "Syntax: @SCDAEMON@ [Optionen] [Befehl [Argumente]]\n"
  "Smartcard Daemon für @GNUPG@\n"
  
- #: scd/scdaemon.c:786
++#: scd/scdaemon.c:784
  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:1160 dirmngr/dirmngr.c:1900
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1904
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "Handhabungsroutine für fd %d gestartet\n"
  
- #: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
++#: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1909
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "Handhabungsroutine für den fd %d beendet\n"
@@@ -8060,9 -6463,6 +8119,9 @@@ msgstr "Anzahl der übereinstimmenden Z
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "Schlüsselsuche im Cache des Dirmngr schlug fehl: %s\n"
  
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
 +#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  msgid "failed to allocate keyDB handle\n"
  msgstr "Kann keinen KeyDB Handler bereitstellen\n"
  
@@@ -8549,11 -6847,9 +8608,11 @@@ msgstr "Fertig.  Sie sollten nun diese 
  msgid "resource problem: out of core\n"
  msgstr "Resourcenproblem: Nicht genügend Hauptspeicher\n"
  
- #: sm/decrypt.c:330
++#: sm/decrypt.c:332
  msgid "(this is the RC2 algorithm)\n"
  msgstr "(Dies ist der RC-2 Algorithmus)\n"
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:334
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr "(dies ist wahrscheinlich keine verschlüsselte Nachricht)\n"
  
@@@ -8594,115 -6882,87 +8653,115 @@@ msgstr "Externe Schlüssel anzeigen
  msgid "list certificate chain"
  msgstr "Schlüssel mit Zertifikatekette anzeigen"
  
- #: sm/gpgsm.c:218
++#: sm/gpgsm.c:219
  msgid "import certificates"
  msgstr "Zertifikate importieren"
  
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
  msgid "export certificates"
  msgstr "Zertifikate exportieren"
  
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:228
  msgid "register a smartcard"
  msgstr "Smartcard registrieren"
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:231
  msgid "pass a command to the dirmngr"
  msgstr "Das Kommando an den Dirmngr durchreichen"
  
- #: sm/gpgsm.c:232
++#: sm/gpgsm.c:233
  msgid "invoke gpg-protect-tool"
  msgstr "Rufe das gpg-protect-tool auf"
  
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:250
  msgid "create base-64 encoded output"
  msgstr "Ausgabe im Basis-64 Format erzeugen"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in PEM format"
  msgstr "Eingabedaten sind im PEM Format"
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in base-64 format"
  msgstr "Eingabedaten sind im Basis-64 Format"
  
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:262
  msgid "assume input is in binary format"
  msgstr "Eingabedaten sind im Binärformat"
  
- #: sm/gpgsm.c:267
++#: sm/gpgsm.c:269
  msgid "never consult a CRL"
  msgstr "Niemals eine CRL konsultieren"
  
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:279
  msgid "check validity using OCSP"
  msgstr "Die Gültigkeit mittels OCSP prüfen"
  
- #: sm/gpgsm.c:282
++#: sm/gpgsm.c:284
  msgid "|N|number of certificates to include"
  msgstr "|N|Sende N Zertifikate mit"
  
- #: sm/gpgsm.c:285
++#: sm/gpgsm.c:287
  msgid "|FILE|take policy information from FILE"
  msgstr "|DATEI|Richtlinieninformationen DATEI entnehmen"
  
- #: sm/gpgsm.c:288
++#: sm/gpgsm.c:290
  msgid "do not check certificate policies"
  msgstr "Zertifikatsrichtlinien nicht überprüfen"
  
- #: sm/gpgsm.c:292
++#: sm/gpgsm.c:294
  msgid "fetch missing issuer certificates"
  msgstr "Fehlende Zertifikate automatisch holen"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "don't use the terminal at all"
  msgstr "das Terminal gar nicht benutzen"
  
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:307
  msgid "|FILE|write a server mode log to FILE"
  msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
  
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:312
  msgid "|FILE|write an audit log to FILE"
  msgstr "|DATEI|Schreibe ein Audit-Log auf DATEI"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "batch mode: never ask"
  msgstr "Stapelmodus: Keine Abfragen"
  
- #: sm/gpgsm.c:314
++#: sm/gpgsm.c:316
  msgid "assume yes on most questions"
  msgstr "\"Ja\" als Standardantwort annehmen"
  
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:317
  msgid "assume no on most questions"
  msgstr "\"Nein\" als Standardantwort annehmen"
  
- #: sm/gpgsm.c:318
++#: sm/gpgsm.c:320
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "|DATEI|DATEI als öffentlichen Schlüsselbund mitbenutzen"
  
- #: sm/gpgsm.c:321
++#: sm/gpgsm.c:323
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|USER-ID|USER-ID als voreingestellten Schlüssel benutzen"
  
- #: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|SPEC|Schlüssel bei diesem Server nachschlagen"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|NAME|Verschlüsselungsverfahren NAME benutzen"
  
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:352
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|NAME|Hashverfahren NAME benutzen"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:559
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
  msgstr "Aufruf: @GPGSM@ [Optionen] [Dateien] (-h für Hilfe)"
  
- #: sm/gpgsm.c:570
++#: sm/gpgsm.c:562
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
  "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@@ -8711,46 -6971,37 +8770,46 @@@ msgstr "
  "Syntax: @GPGSM@ [Optionen] [Dateien]\n"
  "Signieren, prüfen, ver- und entschlüsseln mittels S/MIME Protokoll\n"
  
- #: sm/gpgsm.c:774
++#: sm/gpgsm.c:766
  #, 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:785
++#: sm/gpgsm.c:777
  #, c-format
  msgid "unknown validation model '%s'\n"
  msgstr "Unbekanntes Gültigkeitsmodell '%s'\n"
  
- #: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
  #, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "%s:%u: Kein Server-Name angegeben\n"
  
- #: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr "%s:%u: Passwort ohne Benutzer\n"
  
- #: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
  #, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr "%s:%u: Zeile wird übersprungen\n"
  
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1427
  msgid "could not parse keyserver\n"
  msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
  
- #: sm/gpgsm.c:1636
++#: sm/gpgsm.c:1630
  #, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "Importiere allgemeine Zertifikate: %s\n"
  
- #: sm/gpgsm.c:1677
++#: sm/gpgsm.c:1671
  #, c-format
  msgid "can't sign using '%s': %s\n"
  msgstr "Signieren mit `%s' nicht möglich: %s\n"
  
- #: sm/gpgsm.c:2033
++#: sm/gpgsm.c:2028
  msgid "invalid command (there is no implicit command)\n"
  msgstr "Ungültiger Befehl (Es gibt keinen implizierten Befehl)\n"
  
@@@ -9540,8 -7640,6 +9599,8 @@@ msgstr "Es wird \"HTTP\" anstatt \"HTTP
  msgid "CRL access not possible due to disabled %s\n"
  msgstr "CRL Zugriff nicht möglich da %s abgeschaltet ist\n"
  
 +#: dirmngr/crlfetch.c:223 dirmngr/ldap-wrapper-ce.c:488
- #: dirmngr/ldap-wrapper.c:742 dirmngr/misc.c:563
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:563
  #, c-format
  msgid "error initializing reader object: %s\n"
  msgstr "Fehler beim Initialisieren des \"reader\" Objekts: %s\n"
@@@ -9712,112 -7774,84 +9771,112 @@@ msgstr "Absoluter Dateiname erwartet\n
  msgid "looking up '%s'\n"
  msgstr "Auffinden von `%s'\n"
  
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:160
  msgid "list the contents of the CRL cache"
  msgstr "Den Inhalt des CRL Zwischenspeichers anzeigen"
  
- #: dirmngr/dirmngr.c:158
++#: dirmngr/dirmngr.c:161
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|DATEI|Lade die CRL aus der DATEI in den Zwischenspeicher"
  
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:162
  msgid "|URL|fetch a CRL from URL"
  msgstr "|URL|Hole eine CRL von dieser URL"
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:163
  msgid "shutdown the dirmngr"
  msgstr "Den Dirmngr herunterfahren"
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:164
  msgid "flush the cache"
  msgstr "Den Zwischenspeicher löschen"
  
- #: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
- #: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
++#: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
  
- #: dirmngr/dirmngr.c:177
++#: dirmngr/dirmngr.c:180
  msgid "run without asking a user"
  msgstr "Ausführung ohne Benutzernachfrage"
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:181
  msgid "force loading of outdated CRLs"
  msgstr "Laden von abgelaufenen CRLs erzwingen"
  
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:182
  msgid "allow sending OCSP requests"
  msgstr "OCSP Anfragen erlauben"
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:184
  msgid "allow online software version check"
  msgstr "Online Softwareversionstest erlauben"
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:185
  msgid "inhibit the use of HTTP"
  msgstr "Sperre die Benutzung von HTTP"
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:186
  msgid "inhibit the use of LDAP"
  msgstr "Sperre die Benutzung von LDAP"
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:188
  msgid "ignore HTTP CRL distribution points"
  msgstr "Übergehe HTTP CRL Distribution Points"
  
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
  msgid "ignore LDAP CRL distribution points"
  msgstr "Übergehe LDAP CRL Distribution Points"
  
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:192
  msgid "ignore certificate contained OCSP service URLs"
  msgstr "Übergehe im Zertifikat enthaltene OCSP Service URLs"
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr "|URL|Leite alle HTTP Anfragen über URL"
  
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
  msgid "|HOST|use HOST for LDAP queries"
  msgstr "|HOST|Benutze HOST für LDAP Anfragen"
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr "Keine Benutzung der Rückgriffshosts mit --ldap-proxy"
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:202
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|DATEI|Lese die LDAP Serverliste aus DATEI"
  
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
  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:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr "|N|Setze die LDAP Zeitüberschreitung auf N Sekunden"
  
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:210
  msgid "|URL|use OCSP responder at URL"
  msgstr "|URL|Benutze den OCSP Responder mit dieser URL"
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:212
  msgid "|FPR|OCSP response signed by FPR"
  msgstr "|FPR|OCSP Antwort ist durch FPR signiert"
  
- #: dirmngr/dirmngr.c:215
++#: 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:220
++#: dirmngr/dirmngr.c:223
  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:222
++#: dirmngr/dirmngr.c:225
  msgid "route all network traffic via Tor"
  msgstr "Netzzugriff nur über Tor"
  
- #: dirmngr/dirmngr.c:240
++#: dirmngr/dirmngr.c:246
  msgid ""
  "@\n"
  "(See the \"info\" manual for a complete listing of all commands and "
@@@ -9827,11 -7861,9 +9886,11 @@@ msgstr "
  "(Im \"info\"-Handbuch findet sich eine vollständige Liste aller Kommandos "
  "und Optionen)\n"
  
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:361
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Gebrauch: @DIRMNGR@ [Optionen]"
  
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:363
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9839,79 -7871,62 +9898,79 @@@ msgstr "
  "Syntax: @DIRMNGR@ [Optionen] [Kommando [Argumente]]\n"
  "Keyserver, CRL und OCSP Zugriff für @GNUPG@\n"
  
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:443
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr "Gültige Debugebenen sind: %s\n"
  
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
- #: tools/gpgconf.c:648
++#: dirmngr/dirmngr.c:496 tools/gpgconf.c:550 tools/gpgconf.c:585
++#: tools/gpgconf.c:656
  #, c-format
  msgid "usage: %s [options] "
  msgstr "Aufruf: %s [Optionen] "
  
- #: dirmngr/dirmngr.c:1062
++#: dirmngr/dirmngr.c:1074
  msgid "colons are not allowed in the socket name\n"
  msgstr "Doppelpunkte sind im Namen des Sockets nicht erlaubt\n"
  
- #: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
++#: dirmngr/dirmngr.c:1300 dirmngr/server.c:1585
  #, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "Holen der CRL von `%s' fehlgeschlagen: %s\n"
  
- #: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
++#: dirmngr/dirmngr.c:1306 dirmngr/server.c:1591
  #, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "Verarbeitung der CRL von `%s' fehlgeschlagen: %s\n"
  
- #: dirmngr/dirmngr.c:1484
++#: dirmngr/dirmngr.c:1487
  #, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "%s:%u: Zeile ist zu lang - übergangen\n"
  
- #: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
++#: dirmngr/dirmngr.c:1542 dirmngr/dirmngr.c:1626
  #, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "%s:%u: ungültiger Fingerabdruck erkannt\n"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
++#: dirmngr/dirmngr.c:1578 dirmngr/dirmngr.c:1604 tools/gpgconf-comp.c:4032
  #, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "%s:%u: Lesefehler: %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1633
  #, 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:1697
++#: dirmngr/dirmngr.c:1700
  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:1734
++#: dirmngr/dirmngr.c:1738
  msgid "SIGUSR2 received - no action defined\n"
  msgstr "SIGUSR2 empfangen - keine Aktion definiert\n"
  
- #: dirmngr/dirmngr.c:1739
++#: dirmngr/dirmngr.c:1743
  msgid "SIGTERM received - shutting down ...\n"
  msgstr "SIGTERM empfangen - wird heruntergefahren ...\n"
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1745
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr "SIGTERM empfangen - immer noch %d Verbindungen aktiv\n"
  
- #: dirmngr/dirmngr.c:1746
++#: dirmngr/dirmngr.c:1750
  msgid "shutdown forced\n"
  msgstr "Herunterfahren wurde erzwungen\n"
  
- #: dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1758
  msgid "SIGINT received - immediate shutdown\n"
  msgstr "SIGINT empfangen - wird sofort heruntergefahren\n"
  
- #: dirmngr/dirmngr.c:1761
++#: dirmngr/dirmngr.c:1765
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr "Signal %d empfangen - keine Aktion definiert\n"
@@@ -10375,32 -8291,26 +10434,32 @@@ msgstr "fetch_next_cert fehlgeschlagen
  msgid "max_replies %d exceeded\n"
  msgstr "max_replies %d überschritten\n"
  
- #: dirmngr/server.c:2463
++#: dirmngr/server.c:2469
  #, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "Fehler beim Erzeugen der Kontrollstruktur: %s\n"
  
- #: dirmngr/server.c:2474
++#: dirmngr/server.c:2480
  #, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "Fehler beim Bereitstellen eines Assuan Kontext: %s\n"
  
- #: dirmngr/server.c:2495
++#: dirmngr/server.c:2501
  #, c-format
  msgid "failed to initialize the server: %s\n"
  msgstr "Fehler beim Initialisieren des Servers: %s\n"
  
- #: dirmngr/server.c:2503
++#: dirmngr/server.c:2509
  #, 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:2534
++#: dirmngr/server.c:2540
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr "Assuan accept Problem: %s\n"
  
- #: dirmngr/server.c:2553
++#: dirmngr/server.c:2559
  #, c-format
  msgid "Assuan processing failed: %s\n"
  msgstr "Assuan Verarbeitung fehlgeschlagen: %s\n"
@@@ -10445,7 -8346,6 +10504,7 @@@ msgid "certificate should not have bee
  msgstr ""
  "Das Zertifikat hätte nicht zum Signieren einer CRL benutzt werden sollen\n"
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:167
  msgid "quiet"
  msgstr "Reduzierte Informationen"
  
@@@ -10536,22 -8416,15 +10595,22 @@@ msgstr "Senden der Zeile schlug fehl: %
  msgid "error sending standard options: %s\n"
  msgstr "Fehler beim Senden der Standardoptionen: %s\n"
  
 +#: tools/gpgconf-comp.c:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
- #: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
++#: tools/gpgconf-comp.c:766 tools/gpgconf-comp.c:865
  msgid "Options controlling the diagnostic output"
  msgstr "Optionen zur Einstellung der Diagnoseausgaben"
  
 +#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
- #: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
++#: tools/gpgconf-comp.c:779 tools/gpgconf-comp.c:888
  msgid "Options controlling the configuration"
  msgstr "Optionen zur Einstellung der Konfiguration"
  
- #: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
- #: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
++#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:723
++#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:901
  msgid "Options useful for debugging"
  msgstr "Nützliche Optionen zur Fehlersuche"
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
  msgid "Options controlling the security"
  msgstr "Optionen zur Einstellung der Sicherheit"
  
@@@ -10599,11 -8461,9 +10658,11 @@@ msgstr "Verbiete die Wiedernutzung alte
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr "|N|Setze die Pinentry Zeitüberschreitung auf N Sekunden"
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
++#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
  msgid "|NAME|use NAME as default secret key"
  msgstr "|NAME|NAME als voreingestellten Schlüssel benutzen"
  
- #: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
++#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:784
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NAME|Auch an NAME verschlüsseln"
  
@@@ -10611,170 -8470,140 +10670,184 @@@
  msgid "|SPEC|set up email aliases"
  msgstr "|SPEC|Email Alias festlegen"
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
++#: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
  msgid "Configuration for Keyservers"
  msgstr "Konfiguration der Schlüsselserver"
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
++#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
  msgid "|URL|use keyserver at URL"
  msgstr "Benutze Schlüsselserver unter der URL"
  
- #: tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:741
  msgid "allow PKA lookups (DNS requests)"
  msgstr "Erlaube PKA Zugriffe (DNS Anfragen)"
  
- #: tools/gpgconf-comp.c:738
++#: tools/gpgconf-comp.c:744
  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:787
++#: tools/gpgconf-comp.c:793
  msgid "disable all access to the dirmngr"
  msgstr "Jeglichen Zugriff auf den Dirmngr verhindern"
  
- #: tools/gpgconf-comp.c:790
++#: tools/gpgconf-comp.c:796
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
  msgstr "|NAME|Benutze die Kodierung NAME für PKCS#12 Passphrasen"
  
- #: tools/gpgconf-comp.c:820
++#: tools/gpgconf-comp.c:829
  msgid "do not check CRLs for root certificates"
  msgstr "CRL bei Wurzelzertifikaten nicht überprüfen"
  
- #: tools/gpgconf-comp.c:869
++#: tools/gpgconf-comp.c:878
  msgid "Options controlling the format of the output"
  msgstr "Optionen zum Einstellen der Ausgabeformate"
  
- #: tools/gpgconf-comp.c:905
++#: tools/gpgconf-comp.c:920
  msgid "Options controlling the interactivity and enforcement"
  msgstr "Optionen zur Einstellung der Interaktivität und Geltendmachung"
  
- #: tools/gpgconf-comp.c:918
++#: tools/gpgconf-comp.c:933
  msgid "Options controlling the use of Tor"
  msgstr "Optionen zur Benutzung von Tor"
  
- #: tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:947
  msgid "Configuration for HTTP servers"
  msgstr "Konfiguration für HTTP Server"
  
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:958
  msgid "use system's HTTP proxy setting"
  msgstr "Benutze die HTTP Proxy Einstellung des Systems"
  
- #: tools/gpgconf-comp.c:948
++#: tools/gpgconf-comp.c:963
  msgid "Configuration of LDAP servers to use"
  msgstr "Konfiguration der zu nutzenden LDAP-Server"
  
- #: tools/gpgconf-comp.c:977
++#: tools/gpgconf-comp.c:992
  msgid "LDAP server list"
  msgstr "Liste der LDAP Server"
  
- #: tools/gpgconf-comp.c:985
++#: tools/gpgconf-comp.c:1000
  msgid "Configuration for OCSP"
  msgstr "Konfiguration zu OCSP"
  
- #: tools/gpgconf-comp.c:1066
++#: tools/gpgconf-comp.c:1081
  msgid "OpenPGP"
  msgstr "OpenPGP"
  
- #: tools/gpgconf-comp.c:1067
++#: tools/gpgconf-comp.c:1082
  msgid "Private Keys"
  msgstr "Geheime Schlüssel"
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1083
  msgid "Smartcards"
  msgstr "Smartcard"
  
- #: tools/gpgconf-comp.c:1069
++#: tools/gpgconf-comp.c:1084
  msgid "S/MIME"
  msgstr "S/MIME"
  
- #: tools/gpgconf-comp.c:1070
++#: tools/gpgconf-comp.c:1085
  msgid "Network"
  msgstr "Netz"
  
- #: tools/gpgconf-comp.c:1071
++#: tools/gpgconf-comp.c:1086
  msgid "Passphrase Entry"
  msgstr "Passphrase Eingabe"
  
- #: tools/gpgconf-comp.c:1225
++#: tools/gpgconf-comp.c:1240
  msgid "Component not suitable for launching"
  msgstr "Komponente unterstützt kein direktes starten"
  
- #: tools/gpgconf-comp.c:3283
++#: tools/gpgconf-comp.c:3311
  #, c-format
  msgid "External verification of component %s failed"
  msgstr "Die externe Überprüfung der Komponente %s war nicht erfolgreich"
  
- #: tools/gpgconf-comp.c:3434
++#: tools/gpgconf-comp.c:3462
  msgid "Note that group specifications are ignored\n"
  msgstr "Beachten Sie, daß Gruppenspezifiaktionen ignoriert werden\n"
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf-comp.c:4036
+ #, c-format
+ msgid "error closing '%s'\n"
+ msgstr "Fehler beim Schließen von '%s'\n"
+ 
++#: tools/gpgconf-comp.c:4038
+ #, c-format
+ msgid "error parsing '%s'\n"
+ msgstr "Fehler beim Hashen von '%s'\n"
+ 
++#: tools/gpgconf.c:73
  msgid "list all components"
  msgstr "Liste aller Komponenten"
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "check all programs"
  msgstr "Prüfe alle Programme"
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|list options"
  msgstr "|KOMPONENTE|Zeige die Optionen an"
  
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
  msgid "|COMPONENT|change options"
  msgstr "|KOMPONENTE|Ändere die Optionen"
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "|COMPONENT|check options"
  msgstr "|KOMPONENTE|Prüfe die Optionen"
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "apply global default values"
  msgstr "Wende die gobalen Voreinstellungen an"
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
+ msgid "|FILE|update configuration files using FILE"
+ msgstr "|DATEI|Konfigurationsdateien mittels DATEI ändern"
+ 
++#: tools/gpgconf.c:83
  msgid "get the configuration directories for @GPGCONF@"
  msgstr "Hole die Einstellungsverzeichnisse von @GPGCONF@"
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:85
  msgid "list global configuration file"
  msgstr "Zeige die globale Konfigurationsdatei an"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  msgid "check global configuration file"
  msgstr "Prüfe die globale Konfigurationsdatei"
  
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:89
  msgid "query the software version database"
  msgstr "Abfrage der Datenbank mit Softwareversionen"
  
- #: tools/gpgconf.c:86
++#: tools/gpgconf.c:90
  msgid "reload all or a given component"
  msgstr "\"reload\" an alle oder eine Komponente senden"
  
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:91
  msgid "launch a given component"
  msgstr "Die angegebene Komponente starten"
  
- #: tools/gpgconf.c:88
++#: tools/gpgconf.c:92
  msgid "kill a given component"
  msgstr "\"kill\" an eine Komponente senden"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "use as output file"
  msgstr "Als Ausgabedatei benutzen"
  
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:102
  msgid "activate changes at runtime, if possible"
  msgstr "Aktiviere Änderungen zur Laufzeit; falls möglich"
  
- #: tools/gpgconf.c:122
++#: tools/gpgconf.c:127
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "Gebrauch: @GPGCONF@ [Optionen] (-h für Hilfe)"
  
- #: tools/gpgconf.c:125
++#: tools/gpgconf.c:130
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10782,15 -8611,12 +10855,15 @@@ msgstr "
  "Syntax: @GPGCONF@ {Optionen]\n"
  "Verwalte Konfigurationsoptionen für Programme des @GNUPG@ Systems\n"
  
- #: tools/gpgconf.c:545 tools/gpgconf.c:579
++#: tools/gpgconf.c:552 tools/gpgconf.c:587
  msgid "Need one component argument"
  msgstr "Benötige ein Komponentenargument"
  
- #: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
++#: tools/gpgconf.c:561 tools/gpgconf.c:599 tools/gpgconf.c:632
  msgid "Component not found"
  msgstr "Komponente nicht gefunden"
  
- #: tools/gpgconf.c:650
++#: tools/gpgconf.c:658
  msgid "No argument allowed"
  msgstr "Argumente sind nicht erlaubt"
  
diff --cc po/el.po
index cfb8e39,14613f6..9b37072
--- a/po/el.po
+++ b/po/el.po
@@@ -8,7 -8,6 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg-1.1.92\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-11-18 16:54+0100\n"
++"POT-Creation-Date: 2016-12-20 11:28+0100\n"
  "PO-Revision-Date: 2003-06-27 12:00+0200\n"
  "Last-Translator: Dokianakis Theofanis <madf at hellug.gr>\n"
  "Language-Team: Greek <nls at tux.hellug.gr>\n"
@@@ -157,25 -128,11 +157,25 @@@ msgstr "κακή φράση κλειδ�
  msgid "ssh keys greater than %d bits are not supported\n"
  msgstr "δεν υποστηρίζεται ο αλγόριθμος προστασίας %d%s\n"
  
 +#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
- #: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1306 g10/keygen.c:4577
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
++#: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't create '%s': %s\n"
  msgstr "αδυναμία δημιουργίας του `%s': %s\n"
  
 +#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
- #: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1307
++#: g10/import.c:305 g10/import.c:448 g10/import.c:621 g10/keygen.c:3681
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
- #: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
- #: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:825 g10/sign.c:1025
++#: g10/sign.c:1130 g10/sign.c:1275 g10/tdbdump.c:143 g10/tdbdump.c:151
++#: g10/tdbio.c:720 g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161
++#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
++#: dirmngr/certcache.c:368 dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1564
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
@@@ -238,11 -184,9 +238,11 @@@ msgstr "Πληκτρολογήστε τ
  msgid "failed to create stream from socket: %s\n"
  msgstr "%s: αδυναμία δημιουργίας hashtable: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1100
++#: agent/divert-scd.c:92 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1101
++#: agent/divert-scd.c:93 g10/call-agent.c:1102
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  
@@@ -385,48 -303,33 +385,48 @@@ msgstr "
  "Επιλογές:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
  #, fuzzy
  #| msgid "Key is superseded"
  msgid "run in supervised mode"
  msgstr "Το κλειδί έχει παρακαμθεί"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:170 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "αναλυτικά"
  
 +#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "ήσυχη έξοδος"
  
- #: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
  msgid "csh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
- #: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
++#: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
  #, fuzzy
  msgid "|FILE|read options from FILE"
  msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
  
- #: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:177
  msgid "do not detach from the console"
  msgstr ""
  
@@@ -511,162 -397,120 +511,162 @@@ 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:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:481 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1025 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:358
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:124 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  #, fuzzy
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr "Αναφέρετε τα προβλήματα στο <gnupg-bugs at gnu.org>\n"
  
- #: agent/gpg-agent.c:491
++#: agent/gpg-agent.c:490
  #, fuzzy
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
  
- #: agent/gpg-agent.c:493
++#: agent/gpg-agent.c:492
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:537 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:442
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:793
++#: agent/gpg-agent.c:1082 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:812
  #, fuzzy, c-format
  #| msgid "NOTE: no default option file `%s'\n"
  msgid "Note: no default option file '%s'\n"
  msgstr "ΣΗΜΕΙΩΣΗ: μη προκαθορισμένο αρχείο επιλογών `%s'\n"
  
- #: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
- #: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1093 agent/gpg-agent.c:1935 g10/gpg.c:2510
++#: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:817
++#: dirmngr/dirmngr.c:1670 tools/symcryptrun.c:932
  #, fuzzy, c-format
  #| msgid "option file `%s': %s\n"
  msgid "option file '%s': %s\n"
  msgstr "αρχείο επιλογών `%s': %s\n"
  
- #: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:806
++#: agent/gpg-agent.c:1101 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:825
  #, fuzzy, c-format
  #| msgid "reading options from `%s'\n"
  msgid "reading options from '%s'\n"
  msgstr "ανάγνωση επιλογών από `%s'\n"
  
- #: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
- #: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
++#: agent/gpg-agent.c:1223 g10/gpg.c:3643 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:936 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:527
  #, 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:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
++#: agent/gpg-agent.c:2080 scd/scdaemon.c:1073 dirmngr/dirmngr.c:1081
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
  msgstr "αδυναμία δημιουργίας του %s: %s\n"
  
- #: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
++#: agent/gpg-agent.c:2097 scd/scdaemon.c:1086 dirmngr/dirmngr.c:1094
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2134
++#: agent/gpg-agent.c:2135
  #, fuzzy
  msgid "a gpg-agent is already running - not starting a new one\n"
  msgstr "ο gpg-agent δεν είναι διαθέσιμος σε αυτή τη συνεδρία\n"
  
- #: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
++#: agent/gpg-agent.c:2145 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1126
  #, fuzzy
  msgid "error getting nonce for the socket\n"
  msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
++#: agent/gpg-agent.c:2150 scd/scdaemon.c:1113 dirmngr/dirmngr.c:1129
  #, fuzzy, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
  
- #: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
- #: dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2160 agent/gpg-agent.c:2197 scd/scdaemon.c:1121
++#: dirmngr/dirmngr.c:1138
  #, fuzzy, c-format
  msgid "can't set permissions of '%s': %s\n"
  msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
  
- #: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:2165 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1143
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
  msgstr "η ενημέρωση απέτυχε: %s\n"
  
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
++#: agent/gpg-agent.c:2172 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1149
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
  msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
  
- #: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: agent/gpg-agent.c:2191 agent/gpg-agent.c:2234 g10/exec.c:199
 +#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, 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:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: agent/gpg-agent.c:2194 agent/gpg-agent.c:2239 g10/openfile.c:491
 +#: g10/openfile.c:520 sm/keydb.c:103
  #, fuzzy, c-format
  msgid "directory '%s' created\n"
  msgstr "%s: κατάλογος δημιουργήθηκε\n"
  
- #: agent/gpg-agent.c:2244
++#: agent/gpg-agent.c:2245
  #, fuzzy, c-format
  msgid "stat() failed for '%s': %s\n"
  msgstr "trustdb: read απέτυχε (n=%d): %s\n"
  
- #: agent/gpg-agent.c:2248
++#: agent/gpg-agent.c:2249
  #, fuzzy, c-format
  msgid "can't use '%s' as home directory\n"
  msgstr "%s: αδυναμία δημιουργίας καταλόγου: %s\n"
  
- #: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
++#: agent/gpg-agent.c:2392 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1871
  #, fuzzy, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
- #: agent/gpg-agent.c:2598
++#: agent/gpg-agent.c:2599
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2603
++#: agent/gpg-agent.c:2604
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2678
++#: agent/gpg-agent.c:2679
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2683
++#: agent/gpg-agent.c:2684
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
++#: agent/gpg-agent.c:2881 scd/scdaemon.c:1272 dirmngr/dirmngr.c:2075
  #, fuzzy, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "η ενημέρωση μυστικού απέτυχε: %s\n"
  
- #: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2954 scd/scdaemon.c:1321
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
  msgstr "%s: παραλείφθηκε: %s\n"
  
- #: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
++#: agent/gpg-agent.c:3092 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  #, fuzzy
  msgid "no gpg-agent running in this session\n"
  msgstr "ο gpg-agent δεν είναι διαθέσιμος σε αυτή τη συνεδρία\n"
@@@ -682,8 -524,6 +682,8 @@@ msgid "
  "Password cache maintenance\n"
  msgstr ""
  
- #: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
++#: agent/protect-tool.c:106 g10/gpg.c:424 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:153 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -691,9 -531,6 +691,9 @@@ msgstr "
  "@Εντολές:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
- #: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:92 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:168 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -747,8 -576,6 +747,8 @@@ msgstr "Ακύρωση
  msgid "error while asking for the passphrase: %s\n"
  msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
- #: tools/gpgconf.c:323
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1472
++#: tools/gpgconf.c:328
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
  msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
@@@ -918,9 -716,6 +918,9 @@@ msgstr "δεν υποστηρίζετα
  msgid "protection hash algorithm %d (%s) is not supported\n"
  msgstr "δεν υποστηρίζεται ο αλγόριθμος προστασίας %d%s\n"
  
 +#: common/exechelp-posix.c:359 common/exechelp-w32.c:438
 +#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
- #: dirmngr/ldap-wrapper.c:710
++#: dirmngr/ldap-wrapper.c:711
  #, fuzzy, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
@@@ -932,8 -724,6 +932,8 @@@
  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:848 dirmngr/dirmngr.c:1155
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1167
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
  msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
@@@ -980,27 -761,22 +980,27 @@@ msgstr "αδυναμία σύνδεση
  msgid "problem setting the gpg-agent options\n"
  msgstr "πρόβλημα με τον agent: agent επιστρέφει 0x%lx\n"
  
- #: common/sysutils.c:144
++#: common/sysutils.c:148
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "αδυναμία απενεργοποίησης των core dump: %s\n"
  
- #: common/sysutils.c:239
++#: common/sysutils.c:250
  #, fuzzy, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία στο %s \"%s\"\n"
  
- #: common/sysutils.c:271
++#: common/sysutils.c:282
  #, fuzzy, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
  
- #: common/sysutils.c:659
++#: common/sysutils.c:693
  #, fuzzy, c-format
  msgid "waiting for file '%s' to become accessible ...\n"
  msgstr "η ενημέρωση απέτυχε: %s\n"
  
- #: common/sysutils.c:685
++#: common/sysutils.c:719
  #, fuzzy, c-format
  msgid "renaming '%s' to '%s' failed: %s\n"
  msgstr "θωράκιση απέτυχε: %s\n"
@@@ -1076,7 -837,6 +1076,7 @@@ msgstr "
  msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
  msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
  
- #: common/miscellaneous.c:554
++#: common/miscellaneous.c:556
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
@@@ -1191,8 -928,6 +1191,8 @@@ msgstr "%s: κλειδοθήκη δημ
  msgid "algorithm: %s"
  msgstr "θωράκιση: %s\n"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3098
++#: scd/app-openpgp.c:3111
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
@@@ -1404,7 -1097,6 +1404,7 @@@ msgstr "
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr ""
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1173
++#: common/argparse.c:401 dirmngr/dirmngr.c:1185
  #, fuzzy
  msgid "out of core\n"
  msgstr "μη επεξεργασμένο"
@@@ -1463,8 -1144,6 +1463,8 @@@ msgstr "το δημόσιο κλειδ�
  msgid "waiting for lock %s...\n"
  msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
  
- #: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
- #: dirmngr/dirmngr.c:715
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:725
++#: dirmngr/dirmngr.c:734
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
@@@ -1504,7 -1175,6 +1504,7 @@@ msgstr "μη αναμενόμενη θ�
  msgid "invalid dash escaped line: "
  msgstr "μη έγκυρη dash escaped γραμμή: "
  
- #: g10/armor.c:873 g10/armor.c:1490
++#: g10/armor.c:873 g10/armor.c:1493
  #, fuzzy, c-format
  msgid "invalid radix64 character %02X skipped\n"
  msgstr "μη έγκυρος radix64 χαρακτήρας %02x παράβλεψη\n"
@@@ -1521,7 -1188,6 +1521,7 @@@ msgstr "πρόωρο τέλος αρχ�
  msgid "malformed CRC\n"
  msgstr "λάθος μορφή CRC\n"
  
- #: g10/armor.c:962 g10/armor.c:1527
++#: g10/armor.c:962 g10/armor.c:1530
  #, fuzzy, c-format
  msgid "CRC error; %06lX - %06lX\n"
  msgstr "σφάλμα CRC: %06lx - %06lx\n"
@@@ -1535,16 -1199,13 +1535,16 @@@ msgstr "πρόωρο τέλος αρχ�
  msgid "error in trailer line\n"
  msgstr "σφάλμα στη γραμμή trailer\n"
  
- #: g10/armor.c:1303
++#: g10/armor.c:1306
  msgid "no valid OpenPGP data found.\n"
  msgstr "δε βρέθηκαν έγκυρα OpenPGP δεδομένα.\n"
  
- #: g10/armor.c:1308
++#: g10/armor.c:1311
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
  msgstr "μη έγκυρη θωράκιση: η γραμμή είναι πάνω από %d χαρακτήρες\n"
  
- #: g10/armor.c:1312
++#: g10/armor.c:1315
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr ""
@@@ -1633,8 -1279,6 +1633,8 @@@ msgstr "το μυστικό κλειδ�
  msgid "OpenPGP card no. %s detected\n"
  msgstr ""
  
- #: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
- #: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2030
++#: g10/keygen.c:4087 g10/revoke.c:215 g10/revoke.c:618
  #, fuzzy
  msgid "can't do this in batch mode\n"
  msgstr "δεν μπορεί να γίνει αυτό σε κατάσταση δέσμης (batchmode)\n"
@@@ -1644,15 -1287,10 +1644,15 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "Αυτή η εντολή απαγορεύετε σε αυτή την κατάσταση %s.\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2454
++#: g10/card-util.c:109 scd/app-openpgp.c:2467
  #, fuzzy
  msgid "Reset Code not or not anymore available\n"
  msgstr "τμήματα του μυστικού κλειδιού δεν είναι διαθέσιμα\n"
  
 +#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
- #: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
- #: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1768
++#: g10/keygen.c:1945 g10/keygen.c:2313 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "Η επιλογή σας; "
  
@@@ -1719,10 -1343,6 +1719,10 @@@ msgstr "κανένα αντίστιχ�
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
- #: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:334
++#: g10/import.c:592 g10/import.c:640 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
++#: dirmngr/dirmngr.c:1510 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
@@@ -1796,7 -1401,6 +1796,7 @@@ msgstr "Η δημιουργία κλε�
  msgid "not an OpenPGP card"
  msgstr "δε βρέθηκαν έγκυρα OpenPGP δεδομένα.\n"
  
- #: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
++#: g10/card-util.c:1173 g10/keygen.c:4106 g10/keygen.c:5092
  #, fuzzy, c-format
  msgid "error getting current key info: %s\n"
  msgstr "αδυναμία εγγραφής μυστικής κλειδοθήκης `%s': %s\n"
@@@ -1827,13 -1426,10 +1827,13 @@@ msgstr "Τι μέγεθος κλειδ�
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "Τι μέγεθος κλειδιού θα θέλατε; (1024) "
  
- #: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
++#: g10/card-util.c:1316 g10/keygen.c:2122 g10/keygen.c:2154
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "στρογγυλοποιήθηκε έως τα %u bits\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2207 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr ""
@@@ -1888,9 -1474,6 +1888,9 @@@ msgstr "   (%d) RSA (για κρυπτ�
  msgid "   (3) Authentication key\n"
  msgstr ""
  
- #: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
- #: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
- #: g10/keygen.c:2314 g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1508
++#: g10/keygen.c:1794 g10/keygen.c:1822 g10/keygen.c:1952 g10/keygen.c:2060
++#: g10/keygen.c:2336 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Μη έγκυρη επιλογή.\n"
  
@@@ -1924,7 -1501,6 +1924,7 @@@ msgstr "Σίγουρα να υπογρ�
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1816 g10/keyedit.c:1867
++#: g10/card-util.c:1816 g10/keyedit.c:1868
  msgid "quit this menu"
  msgstr "τερματισμός αυτού του μενού"
  
@@@ -1933,7 -1508,6 +1933,7 @@@
  msgid "show admin commands"
  msgstr "συγκρουόμενες εντολές\n"
  
- #: g10/card-util.c:1819 g10/keyedit.c:1870
++#: g10/card-util.c:1819 g10/keyedit.c:1871
  msgid "show this help"
  msgstr "απεικόνιση αυτής της βοήθειας"
  
@@@ -2017,31 -1573,21 +2017,31 @@@ msgstr "συγκρουόμενες εν
  msgid "Admin commands are not allowed\n"
  msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
  
- #: g10/card-util.c:2127 g10/keyedit.c:2816
++#: g10/card-util.c:2127 g10/keyedit.c:2817
  msgid "Invalid command  (try \"help\")\n"
  msgstr "Μη έγκυρη εντολή  (δοκιμάστε \"help\")\n"
  
- #: g10/decrypt.c:191 g10/encrypt.c:955
++#: g10/decrypt.c:190 g10/encrypt.c:955
  msgid "--output doesn't work for this command\n"
  msgstr "--output δεν λειτουργεί για αυτή την εντολή\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4904 g10/keyring.c:398 g10/keyring.c:771
  #, fuzzy, c-format
  #| msgid "can't open `%s'\n"
  msgid "can't open '%s'\n"
  msgstr "αδυναμία πρόσβασης του `%s'\n"
  
 +#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
- #: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
- #: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4858 g10/keyedit.c:2051
++#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2163
  #, fuzzy, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "το κλειδί '%s' δε βρέθηκε: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
- #: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
- #: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4866 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:645 g10/tofu.c:2171
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "σφάλμα κατά την ανάγνωση του μπλοκ κλειδιών: %s\n"
@@@ -2104,7 -1638,6 +2104,7 @@@ msgid "use option \"--delete-secret-key
  msgstr ""
  "χρησιμοποιείστε πρώτα την επιλογή \"--delete-secret-key\" για διαγραφή του.\n"
  
- #: g10/encrypt.c:232 g10/sign.c:1292
++#: g10/encrypt.c:232 g10/sign.c:1294
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
@@@ -2124,7 -1654,6 +2124,7 @@@ msgstr "χρήση του κρυπτα�
  msgid "'%s' already compressed\n"
  msgstr "`%s' ήδη συμπιέστηκε\n"
  
- #: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:610
  #, fuzzy, c-format
  #| msgid "WARNING: `%s' is an empty file\n"
  msgid "WARNING: '%s' is an empty file\n"
@@@ -2144,7 -1671,6 +2144,7 @@@ msgstr "
  "ο εξαναγκασμός συμμετρικού αλγόριθμου %s (%d) παραβιάζει τις\n"
  "επιλογές του παραλήπτη\n"
  
- #: g10/encrypt.c:707 g10/sign.c:984
++#: g10/encrypt.c:707 g10/sign.c:986
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2180,7 -1701,6 +2180,7 @@@ msgstr "%s κρυπτογραφημέν
  msgid "encrypted with unknown algorithm %d\n"
  msgstr "κρυπτογραφημένο με άγνωστο αλγόριθμο %d\n"
  
- #: g10/decrypt-data.c:164 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:129
  msgid ""
  "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
  msgstr ""
@@@ -2280,8 -1782,6 +2280,8 @@@ msgstr "
  msgid " - skipped"
  msgstr "%s: παραλείφθηκε: %s\n"
  
- #: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:845 g10/sign.c:1148
++#: g10/export.c:1251 g10/import.c:1543 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:847 g10/sign.c:1150
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
@@@ -2307,8 -1803,6 +2307,8 @@@ msgstr "κλειδί %08lX:  κλειδ
  msgid "WARNING: nothing exported\n"
  msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δεν έγινε καμμία εξαγωγή\n"
  
- #: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
- #: g10/plaintext.c:151 g10/plaintext.c:174
++#: g10/export.c:2283 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/plaintext.c:167 g10/plaintext.c:190
  #, fuzzy, c-format
  #| msgid "error creating `%s': %s\n"
  msgid "error creating '%s': %s\n"
@@@ -2356,8 -1841,6 +2356,8 @@@ msgstr "σφάλμα κατά τη δη
  msgid "No fingerprint"
  msgstr "απεικόνιση του fingerprint"
  
- #: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
- #: g10/revoke.c:701
++#: g10/getkey.c:1873 g10/keyedit.c:2929 g10/keyedit.c:3016 g10/revoke.c:637
++#: g10/revoke.c:702
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "το μυστικό κλειδί `%s' δε βρέθηκε: %s\n"
@@@ -2390,218 -1868,174 +2390,224 @@@ msgstr "
  msgid "using subkey %s instead of primary key %s\n"
  msgstr "χρήση του δευτερεύοντος κλειδιού %08lX αντί του πρωτεύοντος %08lX\n"
  
- #: g10/gpg.c:424 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:200
  #, fuzzy
  msgid "make a signature"
  msgstr "δημιουργία μιας μη προσαρτημένης υπογραφής"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:427
  #, fuzzy
  msgid "make a clear text signature"
  msgstr "|[αρχείο]|δημιουργία μιας μη κρυπτογραφημένης υπογραφής"
  
- #: g10/gpg.c:426 sm/gpgsm.c:202
++#: g10/gpg.c:429 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "δημιουργία μιας μη προσαρτημένης υπογραφής"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:430 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "κρυπτογράφηση δεδομένων"
  
- #: g10/gpg.c:429
++#: g10/gpg.c:432
  msgid "encryption only with symmetric cipher"
  msgstr "κρυπτογράφηση με χρήση μόνο συμμετρικών αλγορίθμων"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:434 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "αποκρυπτογράφηση δεδομένων (προκαθορισμένο)"
  
- #: g10/gpg.c:433 sm/gpgsm.c:206
++#: g10/gpg.c:436 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "επαλήθευση μιας υπογραφής"
  
- #: g10/gpg.c:435 sm/gpgsm.c:207
++#: g10/gpg.c:438 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "απεικόνιση της λίστας κλειδιών"
  
- #: g10/gpg.c:437
++#: g10/gpg.c:440
  msgid "list keys and signatures"
  msgstr "απεικόνιση της λίστας κλειδιών και υπογραφών"
  
- #: g10/gpg.c:438
++#: g10/gpg.c:443
  #, fuzzy
  msgid "list and check key signatures"
  msgstr "έλεγχος υπογραφής κλειδιού"
  
- #: g10/gpg.c:439 sm/gpgsm.c:212
++#: g10/gpg.c:445 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "απεικόνιση της λίστας κλειδιών και αποτυπωμάτων (fingerprints)"
  
- #: g10/gpg.c:440 sm/gpgsm.c:210
++#: g10/gpg.c:446 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "απεικόνιση της λίστας μυστικών κλειδιών"
  
- #: g10/gpg.c:442 sm/gpgsm.c:213
++#: g10/gpg.c:448 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
  
- #: g10/gpg.c:444
++#: g10/gpg.c:451
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly generate a new key pair"
  msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
  
- #: g10/gpg.c:446
++#: g10/gpg.c:454
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly add a new user-id"
  msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
  
- #: g10/gpg.c:449
++#: g10/gpg.c:459
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly revoke a user-id"
  msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
  
- #: g10/gpg.c:451
++#: g10/gpg.c:462
+ #, fuzzy
+ #| msgid "generate a new key pair"
+ msgid "quickly set a new expiration date"
+ msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
+ 
++#: g10/gpg.c:464
  msgid "full featured key pair generation"
  msgstr ""
  
- #: g10/gpg.c:452
++#: g10/gpg.c:467
  msgid "generate a revocation certificate"
  msgstr "δημιουργία ενός πιστοποιητικού ανάκλησης"
  
- #: g10/gpg.c:454 sm/gpgsm.c:215
++#: g10/gpg.c:470 sm/gpgsm.c:216
  msgid "remove keys from the public keyring"
  msgstr "αφαίρεση των κλειδιών από τη δημόσια κλειδοθήκη"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:472
  msgid "remove keys from the secret keyring"
  msgstr "αφαίρεση των κλειδιών από τη μυστική κλειδοθήκη"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:474
  #, fuzzy
  #| msgid "sign a key"
  msgid "quickly sign a key"
  msgstr "υπογραφή ενός κλειδιού"
  
- #: g10/gpg.c:460
++#: g10/gpg.c:476
  #, fuzzy
  #| msgid "sign a key locally"
  msgid "quickly sign a key locally"
  msgstr "υπογραφή ενός κλειδιού τοπικά"
  
- #: g10/gpg.c:461
++#: g10/gpg.c:477
  msgid "sign a key"
  msgstr "υπογραφή ενός κλειδιού"
  
- #: g10/gpg.c:462
++#: g10/gpg.c:478
  msgid "sign a key locally"
  msgstr "υπογραφή ενός κλειδιού τοπικά"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:479
  msgid "sign or edit a key"
  msgstr "υπογραφή ή επεξεργασία ενός κλειδιού"
  
- #: g10/gpg.c:465 sm/gpgsm.c:233
++#: g10/gpg.c:481 sm/gpgsm.c:234
  #, fuzzy
  msgid "change a passphrase"
  msgstr "αλλαγή της φράσης κλειδί"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:485
  msgid "export keys"
  msgstr "εξαγωγή κλειδιών"
  
- #: g10/gpg.c:468
++#: g10/gpg.c:486
  msgid "export keys to a keyserver"
  msgstr "εξαγωγή κλειδιών σε ένα διακομιστή κλειδιών"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:487
  msgid "import keys from a keyserver"
  msgstr "εισαγωγή κλειδιών από ένα διακομιστή κλειδιών"
  
- #: g10/gpg.c:471
++#: g10/gpg.c:490
  msgid "search for keys on a keyserver"
  msgstr "αναζήτηση κλειδιών σε ένα διακομιστή κλειδιών"
  
- #: g10/gpg.c:473
++#: g10/gpg.c:492
  msgid "update all keys from a keyserver"
  msgstr "ανανέωση όλων των κλειδιών από ένα διακομιστή κλειδιών"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:498
  msgid "import/merge keys"
  msgstr "εισαγωγή/συγχώνευση κλειδιών"
  
- #: g10/gpg.c:482
++#: g10/gpg.c:501
  msgid "print the card status"
  msgstr ""
  
- #: g10/gpg.c:483
++#: g10/gpg.c:502
  msgid "change data on a card"
  msgstr ""
  
- #: g10/gpg.c:484
++#: g10/gpg.c:504
  msgid "change a card's PIN"
  msgstr ""
  
- #: g10/gpg.c:496
++#: g10/gpg.c:516
  msgid "update the trust database"
  msgstr "ανανέωση της βάσης δεδομένων εμπιστοσύνης"
  
- #: g10/gpg.c:505
++#: g10/gpg.c:525
  #, fuzzy
  msgid "print message digests"
  msgstr "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
  
- #: g10/gpg.c:508 sm/gpgsm.c:228
++#: g10/gpg.c:528 sm/gpgsm.c:229
  msgid "run in server mode"
  msgstr ""
  
- #: g10/gpg.c:510
++#: g10/gpg.c:530
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:514 sm/gpgsm.c:246
++#: g10/gpg.c:534 sm/gpgsm.c:248
  msgid "create ascii armored output"
  msgstr "δημιουργία ascii θωρακισμένης εξόδου"
  
- #: g10/gpg.c:517 sm/gpgsm.c:262
++#: g10/gpg.c:537 sm/gpgsm.c:264
  #, fuzzy
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|ΟΝΟΜΑ|κρυπτογράφηση για ΟΝΟΜΑ"
  
- #: g10/gpg.c:533 sm/gpgsm.c:298
++#: g10/gpg.c:553 sm/gpgsm.c:300
  #, fuzzy
  msgid "|USER-ID|use USER-ID to sign or decrypt"
  msgstr "χρήση αυτής της ταυτότητας (user id) για υπογραφή ή αποκρυπτογράφηση"
  
- #: g10/gpg.c:539
++#: g10/gpg.c:559
  #, fuzzy
  msgid "|N|set compress level to N (0 disables)"
  msgstr "|N|καθορισμός επιπέδου συμπίεσης N (0 απενεργοποιεί)"
  
- #: g10/gpg.c:546
++#: g10/gpg.c:566
  msgid "use canonical text mode"
  msgstr "χρήση κανονικής κατάστασης κειμένου"
  
- #: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
++#: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
  #, fuzzy
  msgid "|FILE|write output to FILE"
  msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
  
- #: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
++#: g10/gpg.c:598 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
  msgid "do not make any changes"
  msgstr "να μη γίνει καμμία αλλαγή"
  
- #: g10/gpg.c:579
++#: g10/gpg.c:599
  msgid "prompt before overwriting"
  msgstr "ερώτηση πριν την επικάλυψη"
  
- #: g10/gpg.c:628
++#: g10/gpg.c:648
  msgid "use strict OpenPGP behavior"
  msgstr ""
  
- #: g10/gpg.c:654 sm/gpgsm.c:355
++#: g10/gpg.c:674 sm/gpgsm.c:357
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2609,7 -2043,16 +2615,17 @@@ msgstr "
  "@\n"
  "(δείτε τη σελίδα man για μια πλήρη λίστα εντολών και επιλογών)\n"
  
- #: g10/gpg.c:657 sm/gpgsm.c:358
++#: g10/gpg.c:677
+ #, fuzzy
+ #| msgid ""
+ #| "@\n"
+ #| "Examples:\n"
+ #| "\n"
+ #| " -se -r Bob [file]          sign and encrypt for user Bob\n"
+ #| " --clear-sign [file]         make a clear text signature\n"
+ #| " --detach-sign [file]       make a detached signature\n"
+ #| " --list-keys [names]        show keys\n"
+ #| " --fingerprint [names]      show fingerprints\n"
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2629,13 -2072,11 +2645,13 @@@ msgstr "
  " --list-keys [ονόματα]        απεικόνιση κλειδιών\n"
  " --fingerprint [ονόματα]      απεικόνιση αποτυπωμάτων (fingerprints)\n"
  
- #: g10/gpg.c:1026
++#: g10/gpg.c:1047
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
  msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
  
- #: g10/gpg.c:1029
++#: g10/gpg.c:1050
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg [options] [files]\n"
@@@ -2650,7 -2091,6 +2666,7 @@@ msgstr "
  "υπογραφή, έλεγχος, κρυπτογράφηση ή αποκρυπτογράφηση\n"
  "η προκαθορισμένη λειτουργία εξαρτάται από τα δεδομένα εισόδου\n"
  
- #: g10/gpg.c:1040 sm/gpgsm.c:588
++#: g10/gpg.c:1061 sm/gpgsm.c:580
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2658,613 -2098,435 +2674,550 @@@ msgstr "
  "\n"
  "Υποστηριζόμενοι αλγόριθμοι:\n"
  
- #: g10/gpg.c:1043
++#: g10/gpg.c:1064
  msgid "Pubkey: "
  msgstr "ΔημοσΚλειδί:"
  
- #: g10/gpg.c:1050 g10/keyedit.c:3402
++#: g10/gpg.c:1071 g10/keyedit.c:3483
  msgid "Cipher: "
  msgstr "Κρυπταλγόριθμος: "
  
- #: g10/gpg.c:1057
++#: g10/gpg.c:1078
  msgid "Hash: "
  msgstr "Hash: "
  
- #: g10/gpg.c:1064 g10/keyedit.c:3451
++#: g10/gpg.c:1085 g10/keyedit.c:3532
  msgid "Compression: "
  msgstr "Συμπίεση: "
  
- #: g10/gpg.c:1133 sm/gpgsm.c:662
++#: g10/gpg.c:1154 sm/gpgsm.c:654
  #, fuzzy, c-format
  msgid "usage: %s [options] %s\n"
  msgstr "χρήση: gpg [επιλογές] "
  
- #: g10/gpg.c:1321 sm/gpgsm.c:751
++#: g10/gpg.c:1342 sm/gpgsm.c:743
  msgid "conflicting commands\n"
  msgstr "συγκρουόμενες εντολές\n"
  
- #: g10/gpg.c:1339
++#: g10/gpg.c:1360
  #, fuzzy, c-format
  msgid "no = sign found in group definition '%s'\n"
  msgstr "δεν βρέθηκε το σύμβολο = στον ορισμό της ομάδας \"%s\"\n"
  
- #: g10/gpg.c:1537
++#: g10/gpg.c:1558
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία στο %s \"%s\"\n"
  
- #: g10/gpg.c:1540
++#: g10/gpg.c:1561
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
  msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία στο %s \"%s\"\n"
  
- #: g10/gpg.c:1543
++#: g10/gpg.c:1564
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on extension '%s'\n"
  msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία στο %s \"%s\"\n"
  
- #: g10/gpg.c:1549
++#: g10/gpg.c:1570
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
  msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
  
- #: g10/gpg.c:1552
++#: g10/gpg.c:1573
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
  msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
  
- #: g10/gpg.c:1555
++#: g10/gpg.c:1576
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on extension '%s'\n"
  msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
  
- #: g10/gpg.c:1561
++#: g10/gpg.c:1582
  #, fuzzy, c-format
  msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
  msgstr ""
  "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησίαεσώκλειστου φακέλου στο %s \"%s\"\n"
  
- #: g10/gpg.c:1564
++#: g10/gpg.c:1585
  #, fuzzy, c-format
  msgid ""
  "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
  msgstr ""
  "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησίαεσώκλειστου φακέλου στο %s \"%s\"\n"
  
- #: g10/gpg.c:1567
++#: g10/gpg.c:1588
  #, fuzzy, c-format
  msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
  msgstr ""
  "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησίαεσώκλειστου φακέλου στο %s \"%s\"\n"
  
- #: g10/gpg.c:1573
++#: g10/gpg.c:1594
  #, fuzzy, c-format
  msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
  msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες εσώκλειστου φακέλου στο %s \"%s\"\n"
  
- #: g10/gpg.c:1576
++#: g10/gpg.c:1597
  #, fuzzy, c-format
  msgid ""
  "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
  msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες εσώκλειστου φακέλου στο %s \"%s\"\n"
  
- #: g10/gpg.c:1579
++#: g10/gpg.c:1600
  #, fuzzy, c-format
  msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
  msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες εσώκλειστου φακέλου στο %s \"%s\"\n"
  
- #: g10/gpg.c:1786
++#: g10/gpg.c:1816
  #, fuzzy, c-format
  msgid "unknown configuration item '%s'\n"
  msgstr "άγνωστο αντικείμενο ρυθμίσεως \"%s\"\n"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1925
  msgid "display photo IDs during key listings"
  msgstr ""
  
- #: g10/gpg.c:1895
++#: g10/gpg.c:1927
  #, fuzzy
  msgid "show key usage information during key listings"
  msgstr "Δεν βρέθηκε αντίστοιχη υπογραφή στη μυστική κλειδοθήκη\n"
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1929
  msgid "show policy URLs during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1931
  #, fuzzy
  msgid "show all notations during signature listings"
  msgstr "Δεν βρέθηκε αντίστοιχη υπογραφή στη μυστική κλειδοθήκη\n"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1933
  msgid "show IETF standard notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1937
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1939
  #, fuzzy
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "το URL πολιτικής υπογραφής που δόθηκε δεν είναι έγκυρο\n"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1941
  msgid "show user ID validity during key listings"
  msgstr ""
  
- #: g10/gpg.c:1911
++#: g10/gpg.c:1943
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  
- #: g10/gpg.c:1913
++#: g10/gpg.c:1945
  msgid "show revoked and expired subkeys in key listings"
  msgstr ""
  
- #: g10/gpg.c:1915
++#: g10/gpg.c:1947
  #, fuzzy
  msgid "show the keyring name in key listings"
  msgstr "απεικόνιση της κλειδοθήκης στην οποία αναφέρετε το κλειδί"
  
- #: g10/gpg.c:1917
++#: g10/gpg.c:1949
  #, fuzzy
  msgid "show expiration dates during signature listings"
  msgstr "Δεν βρέθηκε αντίστοιχη υπογραφή στη μυστική κλειδοθήκη\n"
  
- #: g10/gpg.c:2019 g10/gpg.c:2056
++#: g10/gpg.c:2051 g10/gpg.c:2088
  #, fuzzy, c-format
  msgid "valid values for option '%s':\n"
  msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
  
- #: g10/gpg.c:2030
++#: g10/gpg.c:2062
  #, fuzzy, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "άγνωστος προκαθορισμένος παραλήπτης `%s'\n"
  
- #: g10/gpg.c:2032 g10/gpg.c:2068
++#: g10/gpg.c:2064 g10/gpg.c:2100
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2066
++#: g10/gpg.c:2098 g10/keygen.c:167
  #, fuzzy, c-format
  msgid "invalid value for option '%s'\n"
  msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
  
- #: g10/gpg.c:2203
++#: g10/gpg.c:2235
  #, fuzzy, c-format
  #| msgid "NOTE: old default options file `%s' ignored\n"
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "ΣΗΜΕΙΩΣΗ: αγνοήθηκε το παλιό αρχείο προκαθορισμένων επιλογών `%s'\n"
  
- #: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
++#: g10/gpg.c:2839 g10/gpg.c:3610 g10/gpg.c:3622
  #, 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:2978 g10/gpg.c:2990
++#: g10/gpg.c:3011 g10/gpg.c:3023
  #, fuzzy, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
  
- #: g10/gpg.c:3012
++#: g10/gpg.c:3045
  #, fuzzy, c-format
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "Μη έγκυρη διεύθυνση Email\n"
  
- #: g10/gpg.c:3044 sm/gpgsm.c:1166
++#: g10/gpg.c:3077 sm/gpgsm.c:1158
  #, fuzzy, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "μη έγκυρος αλγόριθμος  hash `%s'\n"
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3130
  #, fuzzy, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
  
- #: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
++#: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
  #, fuzzy
  msgid "could not parse keyserver URL\n"
  msgstr "αδυναμία επεξεργασίας του URI του διακομιση κλειδιών\n"
  
- #: g10/gpg.c:3137
++#: g10/gpg.c:3170
  #, fuzzy, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: μη έγκυρες επιλογές εξαγωγής\n"
  
- #: g10/gpg.c:3140
++#: g10/gpg.c:3173
  #, fuzzy
  msgid "invalid keyserver options\n"
  msgstr "μη έγκυρες επιλογές εξαγωγής\n"
  
- #: g10/gpg.c:3147
++#: g10/gpg.c:3180
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: μη έγκυρες επιλογές ειγαγωγής\n"
  
- #: g10/gpg.c:3150
++#: g10/gpg.c:3183
  msgid "invalid import options\n"
  msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
  
- #: g10/gpg.c:3156 g10/gpg.c:3171
++#: g10/gpg.c:3189 g10/gpg.c:3204
  #, fuzzy, c-format
  msgid "invalid filter option: %s\n"
  msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
  
- #: g10/gpg.c:3162
++#: g10/gpg.c:3195
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: μη έγκυρες επιλογές εξαγωγής\n"
  
- #: g10/gpg.c:3165
++#: g10/gpg.c:3198
  msgid "invalid export options\n"
  msgstr "μη έγκυρες επιλογές εξαγωγής\n"
  
- #: g10/gpg.c:3177
++#: g10/gpg.c:3210
  #, fuzzy, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: μη έγκυρες επιλογές ειγαγωγής\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3213
  #, fuzzy
  msgid "invalid list options\n"
  msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
  
- #: g10/gpg.c:3188
++#: g10/gpg.c:3221
  msgid "display photo IDs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3190
++#: g10/gpg.c:3223
  msgid "show policy URLs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3192
++#: g10/gpg.c:3225
  #, fuzzy
  msgid "show all notations during signature verification"
  msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
  
- #: g10/gpg.c:3194
++#: g10/gpg.c:3227
  msgid "show IETF standard notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3231
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3200
++#: g10/gpg.c:3233
  #, fuzzy
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "το URL πολιτικής υπογραφής που δόθηκε δεν είναι έγκυρο\n"
  
- #: g10/gpg.c:3202
++#: g10/gpg.c:3235
  #, fuzzy
  msgid "show user ID validity during signature verification"
  msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
  
- #: g10/gpg.c:3204
++#: g10/gpg.c:3237
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  
- #: g10/gpg.c:3206
++#: g10/gpg.c:3239
  #, fuzzy
  msgid "show only the primary user ID in signature verification"
  msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
  
- #: g10/gpg.c:3208
++#: g10/gpg.c:3241
  msgid "validate signatures with PKA data"
  msgstr ""
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3243
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr ""
  
- #: g10/gpg.c:3217
++#: g10/gpg.c:3250
  #, fuzzy, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: μη έγκυρες επιλογές εξαγωγής\n"
  
- #: g10/gpg.c:3220
++#: g10/gpg.c:3253
  #, fuzzy
  msgid "invalid verify options\n"
  msgstr "μη έγκυρες επιλογές εξαγωγής\n"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3260
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "αδυναμία ορισμού του exec-path σε %s\n"
  
- #: g10/gpg.c:3417
++#: g10/gpg.c:3452
  #, fuzzy, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: μη έγκυρες επιλογές εξαγωγής\n"
  
- #: g10/gpg.c:3420
++#: g10/gpg.c:3455
  msgid "invalid auto-key-locate list\n"
  msgstr ""
  
- #: g10/gpg.c:3553 sm/gpgsm.c:1507
++#: g10/gpg.c:3592 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
  msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το πρόγραμμα ίσως δημιουργήσει αρχείο core!\n"
  
- #: g10/gpg.c:3564
++#: g10/gpg.c:3603
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το %s παρακάμπτει το %s\n"
  
- #: g10/gpg.c:3573
++#: g10/gpg.c:3612
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "το %s δεν επιτρέπεται με το %s!\n"
  
- #: g10/gpg.c:3576
++#: g10/gpg.c:3615
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "το %s δεν έχει καμμία έννοια μαζί με το %s!\n"
  
- #: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
++#: g10/gpg.c:3630 sm/gpgsm.c:1518 dirmngr/dirmngr.c:951
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3651
  #, fuzzy, c-format
  msgid "will not run with insecure memory due to %s\n"
  msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
  
- #: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
++#: g10/gpg.c:3686 g10/gpg.c:3710 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "ο επιλεγμένος αλγόριθμος κρυπτογράφησης δεν είναι έγκυρος\n"
  
- #: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
++#: g10/gpg.c:3692 g10/gpg.c:3716 sm/gpgsm.c:1591 sm/gpgsm.c:1597
  msgid "selected digest algorithm is invalid\n"
  msgstr "ο επιλεγμένος αλγόριθμος περίληψης δεν είναι έγκυρος\n"
  
- #: g10/gpg.c:3659
++#: g10/gpg.c:3698
  #, fuzzy
  msgid "selected compression algorithm is invalid\n"
  msgstr "ο επιλεγμένος αλγόριθμος κρυπτογράφησης δεν είναι έγκυρος\n"
  
- #: g10/gpg.c:3665
++#: g10/gpg.c:3704
  msgid "selected certification digest algorithm is invalid\n"
  msgstr ""
  "ο επιλεγμένος αλγόριθμος περίληψης για πιστοποίηση\n"
  "δεν είναι έγκυρος\n"
  
- #: g10/gpg.c:3680
++#: g10/gpg.c:3719
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed πρέπει να είναι μεγαλύτερα από 0\n"
  
- #: g10/gpg.c:3682
++#: g10/gpg.c:3721
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed πρέπει να είναι μεγαλύτερα από 1\n"
  
- #: g10/gpg.c:3684
++#: g10/gpg.c:3723
  #, fuzzy
  msgid "max-cert-depth must be in the range from 1 to 255\n"
  msgstr "max-cert-depth πρέπει να είναι μεταξύ 1 και 255\n"
  
- #: g10/gpg.c:3686
++#: g10/gpg.c:3725
  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:3688
++#: g10/gpg.c:3727
  msgid "invalid min-cert-level; must be 1, 2, or 3\n"
  msgstr "μη έγκυρο min-cert-level· πρέπει να είναι 0, 1, 2, ή 3\n"
  
- #: g10/gpg.c:3691
++#: g10/gpg.c:3730
  #, fuzzy
  #| 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:3695
++#: g10/gpg.c:3734
  msgid "invalid S2K mode; must be 0, 1 or 3\n"
  msgstr "μη έγκυρη κατάσταση S2K; πρέπει να είναι 0, 1 ή 3\n"
  
- #: g10/gpg.c:3702
++#: g10/gpg.c:3741
  msgid "invalid default preferences\n"
  msgstr "μη έγκυρες προεπιλογές\n"
  
- #: g10/gpg.c:3706
++#: g10/gpg.c:3745
  msgid "invalid personal cipher preferences\n"
  msgstr "μη έγκυρες προεπιλογές προσωπικού κρυπταλγόριθμου\n"
  
- #: g10/gpg.c:3710
++#: g10/gpg.c:3749
  msgid "invalid personal digest preferences\n"
  msgstr "μη έγκυρες προεπιλογές προσωπικού αλγόριθμου περίληψης\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3753
  msgid "invalid personal compress preferences\n"
  msgstr "μη έγκυρες προεπιλογές προσωπικού αλγόριθμου συμπίεσης\n"
  
- #: g10/gpg.c:3750
++#: g10/gpg.c:3789
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "το %s ακόμα δε λειτουργεί μαζί με το %s\n"
  
- #: g10/gpg.c:3797
++#: g10/gpg.c:3836
  #, fuzzy, c-format
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr "απαγορεύετε η χρήση του κρυπταλγόριθμου \"%s\" στην κατάσταση %s\n"
  
- #: g10/gpg.c:3802
++#: g10/gpg.c:3841
  #, fuzzy, c-format
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr ""
  "απαγορεύετε η χρήση του αλγόριθμου περίληψης \"%s\" στην κατάσταση %s\n"
  
- #: g10/gpg.c:3807
++#: g10/gpg.c:3846
  #, fuzzy, c-format
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr ""
  "απαγορεύετε η χρήση του αλγόριθμου συμπίεσης \"%s\" στην κατάσταση %s\n"
  
- #: g10/gpg.c:3906
++#: g10/gpg.c:3945
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:3957
  msgid "WARNING: recipients (-r) given without using public key encryption\n"
  msgstr ""
  "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δώθηκαν παραλήπτες (-r) χώρις χρήση κρυπτογράφησης\n"
  "δημοσίου κλειδιού\n"
  
- #: g10/gpg.c:3975
- msgid "--store [filename]"
- msgstr "--store [όνομα αρχείου]"
- 
- #: g10/gpg.c:3985
- msgid "--symmetric [filename]"
- msgstr "--symmetric [όνομα αρχείου]"
- 
- #: g10/gpg.c:3989
++#: g10/gpg.c:4028
  #, fuzzy, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "αποκρυπτογράφηση απέτυχε: %s\n"
  
- #: g10/gpg.c:4000
- msgid "--encrypt [filename]"
- msgstr "--encrypt [όνομα αρχείου]"
- 
- #: g10/gpg.c:4016
- #, fuzzy
- msgid "--symmetric --encrypt [filename]"
- msgstr "--sign --encrypt [όνομα αρχείου]"
- 
- #: g10/gpg.c:4018
++#: g10/gpg.c:4057
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4021
++#: g10/gpg.c:4060
  #, fuzzy, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr "απαγορεύετε η χρήση του %s στην κατάσταση %s.\n"
  
- #: g10/gpg.c:4042
- msgid "--sign [filename]"
- msgstr "--sign [όνομα αρχείου]"
- 
- #: g10/gpg.c:4058
- msgid "--sign --encrypt [filename]"
- msgstr "--sign --encrypt [όνομα αρχείου]"
- 
- #: g10/gpg.c:4076
- #, fuzzy
- msgid "--symmetric --sign --encrypt [filename]"
- msgstr "--sign --encrypt [όνομα αρχείου]"
- 
- #: g10/gpg.c:4078
++#: g10/gpg.c:4117
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4081
++#: g10/gpg.c:4120
  #, fuzzy, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr "απαγορεύετε η χρήση του %s στην κατάσταση %s.\n"
  
- #: g10/gpg.c:4105
- msgid "--sign --symmetric [filename]"
- msgstr "--sign --symmetric [όνομα αρχείου]"
- 
- #: g10/gpg.c:4117
- msgid "--clearsign [filename]"
- msgstr "--clearsign [όνομα αρχείου]"
- 
- #: g10/gpg.c:4147
- msgid "--decrypt [filename]"
- msgstr "--decrypt [όνομα αρχείου]"
- 
- #: g10/gpg.c:4174
- msgid "--sign-key user-id"
- msgstr "--sign-key user-id"
- 
- #: g10/gpg.c:4178
- msgid "--lsign-key user-id"
- msgstr "--lsign-key user-id"
- 
- #: g10/gpg.c:4199
- msgid "--edit-key user-id [commands]"
- msgstr "--edit-key user-id [εντολές]"
- 
- #: g10/gpg.c:4215
- #, fuzzy
- msgid "--passwd <user-id>"
- msgstr "--sign-key user-id"
- 
- #: g10/gpg.c:4411 g10/keyserver.c:1837
++#: g10/gpg.c:4462 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "keyserver αποστολή απέτυχε: %s\n"
  
- #: g10/gpg.c:4416
++#: g10/gpg.c:4467
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "keyserver λήψη απέτυχε: %s\n"
  
- #: g10/gpg.c:4422
++#: g10/gpg.c:4473
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "εξαγωγή κλειδιού απέτυχε: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4486
  #, fuzzy, c-format
  #| msgid "key export failed: %s\n"
  msgid "export as ssh key failed: %s\n"
  msgstr "εξαγωγή κλειδιού απέτυχε: %s\n"
  
- #: g10/gpg.c:4447
++#: g10/gpg.c:4498
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "keyserver αναζήτηση απέτυχε: %s\n"
  
- #: g10/gpg.c:4460
++#: g10/gpg.c:4511
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "keyserver ανανέωση απέτυχε: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4578
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "αποθωράκιση απέτυχε: %s\n"
  
- #: g10/gpg.c:4538
++#: g10/gpg.c:4589
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "θωράκιση απέτυχε: %s\n"
  
- #: g10/gpg.c:4630
++#: g10/gpg.c:4681
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
  msgstr "μη έγκυρος αλγόριθμος  hash `%s'\n"
  
- #: g10/gpg.c:4776 g10/tofu.c:2002
++#: g10/gpg.c:4827 g10/tofu.c:2151
  #, fuzzy, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: g10/gpg.c:4788
++#: g10/gpg.c:4839
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4835
- msgid "[filename]"
- msgstr "[όνομα αρχείου]"
- 
- #: g10/gpg.c:4841
++#: g10/gpg.c:4894
  msgid "Go ahead and type your message ...\n"
  msgstr "Μπορείτε τώρα να εισαγάγετε το μήνυμα σας ...\n"
  
- #: g10/gpg.c:5179
++#: g10/gpg.c:5232
  msgid "the given certification policy URL is invalid\n"
  msgstr "το URL πολιτικής πιστοποιητικού που δόθηκε δεν είναι έγκυρο\n"
  
- #: g10/gpg.c:5181
++#: g10/gpg.c:5234
  msgid "the given signature policy URL is invalid\n"
  msgstr "το URL πολιτικής υπογραφής που δόθηκε δεν είναι έγκυρο\n"
  
- #: g10/gpg.c:5214
++#: g10/gpg.c:5267
  #, fuzzy
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "το URL πολιτικής υπογραφής που δόθηκε δεν είναι έγκυρο\n"
@@@ -3278,7 -2538,6 +3231,7 @@@ msgstr "εξαγωγή των κλει�
  msgid "make timestamp conflicts only a warning"
  msgstr "ορισμός των συγκρούσεων ώρας (timestamp) μόνο σαν προειδοποίηση"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:345
++#: g10/gpgv.c:82 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|εγγραφή των πληροφοριών κατάστασης στο FD"
  
@@@ -3309,328 -2563,262 +3262,328 @@@ msgstr "Δεν υπάρχει διαθ�
  msgid "No help available for '%s'"
  msgstr "Δεν υπάρχει διαθέσιμη βοήθεια για `%s'"
  
- #: g10/import.c:151
++#: g10/import.c:152
  msgid "import signatures that are marked as local-only"
  msgstr ""
  
- #: g10/import.c:154
++#: g10/import.c:155
  msgid "repair damage from the pks keyserver during import"
  msgstr ""
  
- #: g10/import.c:157
++#: g10/import.c:158
  #, fuzzy
  msgid "do not clear the ownertrust values during import"
  msgstr "ανανέωση της βάσης δεδομένων εμπιστοσύνης"
  
- #: g10/import.c:160
++#: g10/import.c:161
  #, fuzzy
  msgid "do not update the trustdb after import"
  msgstr "ανανέωση της βάσης δεδομένων εμπιστοσύνης"
  
- #: g10/import.c:163
++#: g10/import.c:164
  #, fuzzy
  msgid "show key during import"
  msgstr "απεικόνιση του fingerprint"
  
- #: g10/import.c:166
++#: g10/import.c:167
  msgid "only accept updates to existing keys"
  msgstr ""
  
- #: g10/import.c:169
++#: g10/import.c:170
  #, fuzzy
  msgid "remove unusable parts from key after import"
  msgstr "μη χρησιμοποιήσιμο μυστικό κλειδί"
  
- #: g10/import.c:172
++#: g10/import.c:173
  msgid "remove as much as possible from key after import"
  msgstr ""
  
- #: g10/import.c:175
++#: g10/import.c:176
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:326 g10/import.c:568
++#: g10/import.c:327 g10/import.c:569
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "παράλειψη τμήματος του τύπου %d\n"
  
- #: g10/import.c:585
++#: g10/import.c:586
  #, fuzzy, c-format
  msgid "%lu keys processed so far\n"
  msgstr "%lu κλειδιά έχουν μέχρι τώρα επεξεργαστεί\n"
  
- #: g10/import.c:655
++#: g10/import.c:656
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "Συνολικός αριθμός που επεξεργάστηκαν: %lu\n"
  
- #: g10/import.c:658
++#: g10/import.c:659
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "      νέα κλειδιά που παραλείφθηκαν: %lu\n"
  
- #: g10/import.c:660
++#: g10/import.c:661
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "      νέα κλειδιά που παραλείφθηκαν: %lu\n"
  
- #: g10/import.c:663
++#: g10/import.c:664
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "          χωρίς user ID: %lu\n"
  
- #: g10/import.c:666 sm/import.c:130
++#: g10/import.c:667 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "              εισαχθέντα: %lu"
  
- #: g10/import.c:670 sm/import.c:134
++#: g10/import.c:671 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "             αμετάβλητα: %lu\n"
  
- #: g10/import.c:672
++#: g10/import.c:673
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "          νέα user ID: %lu\n"
  
- #: g10/import.c:674
++#: g10/import.c:675
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "           νέα υποκλειδιά: %lu\n"
  
- #: g10/import.c:676
++#: g10/import.c:677
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "        νέες υπογραφές: %lu\n"
  
- #: g10/import.c:678
++#: g10/import.c:679
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "   νέες ανακλήσεις κλειδιών: %lu\n"
  
- #: g10/import.c:680 sm/import.c:136
++#: g10/import.c:681 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "      αναγνωσμένα μυστικά κλειδιά: %lu\n"
  
- #: g10/import.c:682 sm/import.c:138
++#: g10/import.c:683 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "  εισαχθέντα μυστικά κλειδιά: %lu\n"
  
- #: g10/import.c:684 sm/import.c:140
++#: g10/import.c:685 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr " αμετάβλητα μυστικά κλειδιά: %lu\n"
  
- #: g10/import.c:686 sm/import.c:142
++#: g10/import.c:687 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "          μη  εισαχθέντα: %lu\n"
  
- #: g10/import.c:688
++#: g10/import.c:689
  #, fuzzy, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "        νέες υπογραφές: %lu\n"
  
- #: g10/import.c:690
++#: g10/import.c:691
  #, fuzzy, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "      αναγνωσμένα μυστικά κλειδιά: %lu\n"
  
- #: g10/import.c:1034
++#: g10/import.c:1035
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
  "algorithms on these user IDs:\n"
  msgstr ""
  
- #: g10/import.c:1076
++#: g10/import.c:1077
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1091
++#: g10/import.c:1092
  #, fuzzy, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "%s υπογραφή, αλγόριθμος περίληψης %s\n"
  
- #: g10/import.c:1103
++#: g10/import.c:1104
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1116
++#: g10/import.c:1117
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr ""
  
- #: g10/import.c:1118
++#: g10/import.c:1119
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  
- #: g10/import.c:1143
++#: g10/import.c:1144
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  
- #: g10/import.c:1379 g10/import.c:2167
++#: g10/import.c:1380 g10/import.c:2168
  #, fuzzy, c-format
  msgid "key %s: no user ID\n"
  msgstr "κλειδί %08lX: δεν υπάρχει αυτό το user ID\n"
  
- #: g10/import.c:1385
++#: g10/import.c:1386
  #, fuzzy, c-format
  msgid "key %s: %s\n"
  msgstr "παραλείφθηκε `%s': %s\n"
  
- #: g10/import.c:1386 g10/import.c:2141
++#: g10/import.c:1387 g10/import.c:2142
  msgid "rejected by import screener"
  msgstr ""
  
- #: g10/import.c:1416
++#: g10/import.c:1417
  #, fuzzy, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "κλειδί %08lX: επιδιόρθωση φθαρμένου υποκλειδιού HKP\n"
  
- #: g10/import.c:1434
++#: g10/import.c:1435
  #, fuzzy, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "κλειδί %08lX: δεκτό μη ιδιο-υπογεγραμμένο user ID '%s'\n"
  
- #: g10/import.c:1444 g10/import.c:1475
++#: g10/import.c:1445 g10/import.c:1476
  #, fuzzy, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "κλειδί %08lX: δεν έχει έγκυρα user ID\n"
  
- #: g10/import.c:1446
++#: g10/import.c:1447
  msgid "this may be caused by a missing self-signature\n"
  msgstr "αυτό μπορεί να συνέβει από μια απούσα ιδιοϋπογραφή\n"
  
- #: g10/import.c:1516 g10/import.c:2318
++#: g10/import.c:1517 g10/import.c:2319
  #, fuzzy, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "κλειδί %08lX: μυστικό κλειδί που δε βρέθηκε: %s\n"
  
- #: g10/import.c:1522
++#: g10/import.c:1523
  #, fuzzy, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "κλειδί %08lX:  νέο κλειδί - παραλείφθηκε\n"
  
- #: g10/import.c:1537
++#: g10/import.c:1538
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "δεν βρεθηκε εγγράψιμη κλειδοθήκη: %s\n"
  
- #: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
++#: g10/import.c:1547 g10/import.c:1648 g10/import.c:2385
  #, fuzzy, c-format
  #| msgid "error writing keyring `%s': %s\n"
  msgid "error writing keyring '%s': %s\n"
  msgstr "αδυναμία εγγραφής της κλειδοθήκης `%s': %s\n"
  
- #: g10/import.c:1566
++#: g10/import.c:1567
  #, fuzzy, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "κλειδί %08lX: το δημόσιο κλειδί \"%s\" έχει εισαχθεί\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1591
  #, fuzzy, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "κλειδί %08lX: δεν ταιριάζει με το αντίγραφο μας\n"
  
- #: g10/import.c:1606 g10/import.c:2342
++#: g10/import.c:1607 g10/import.c:2343
  #, fuzzy, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "κλειδί %08lX: αδυναμία εντοπισμού του αρχικού τμήματος κλειδιού: %s\n"
  
- #: g10/import.c:1614 g10/import.c:2349
++#: g10/import.c:1615 g10/import.c:2350
  #, fuzzy, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "κλειδί %08lX: αδυναμία ανάγνωσης του αρχικού τμήματος κλειδιού: %s\n"
  
- #: g10/import.c:1657
++#: g10/import.c:1658
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "κλειδί %08lX: \"%s\" 1 νέο user ID\n"
  
- #: g10/import.c:1660
++#: g10/import.c:1661
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "κλειδί %08lX: \"%s\" %d νέα user ID\n"
  
- #: g10/import.c:1663
++#: g10/import.c:1664
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "κλειδί %08lX: \"%s\" 1 νέα υπογραφή\n"
  
- #: g10/import.c:1666
++#: g10/import.c:1667
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "κλειδί %08lX: \"%s\" %d νέες υπογραφές\n"
  
- #: g10/import.c:1669
++#: g10/import.c:1670
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "κλειδί %08lX: \"%s\" 1 νέο υποκλειδί\n"
  
- #: g10/import.c:1672
++#: g10/import.c:1673
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "κλειδί %08lX: \"%s\" %d νέα υποκλειδιά\n"
  
- #: g10/import.c:1675
++#: g10/import.c:1676
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "κλειδί %08lX: \"%s\" %d νέες υπογραφές\n"
  
- #: g10/import.c:1678
++#: g10/import.c:1679
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "κλειδί %08lX: \"%s\" %d νέες υπογραφές\n"
  
- #: g10/import.c:1681
++#: g10/import.c:1682
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "κλειδί %08lX: \"%s\" %d νέα user ID\n"
  
- #: g10/import.c:1684
++#: g10/import.c:1685
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "κλειδί %08lX: \"%s\" %d νέα user ID\n"
  
- #: g10/import.c:1707
++#: g10/import.c:1708
  #, fuzzy, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "κλειδί %08lX: \"%s\" αμετάβλητο\n"
  
- #: g10/import.c:2019 g10/import.c:2264
++#: g10/import.c:2020 g10/import.c:2265
  #, fuzzy, c-format
  msgid "key %s: secret key imported\n"
  msgstr "κλειδί %08lX: μυστικό κλειδί εισήχθηκε\n"
  
- #: g10/import.c:2027
++#: g10/import.c:2028
  #, fuzzy, c-format
  #| msgid "skipped: secret key already present\n"
  msgid "key %s: secret key already exists\n"
  msgstr "παραλείφθηκε: μυστικό κλειδί ήδη παρών\n"
  
- #: g10/import.c:2035
++#: g10/import.c:2036
  #, fuzzy, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
  
- #: g10/import.c:2140
++#: g10/import.c:2141
  #, fuzzy, c-format
  msgid "secret key %s: %s\n"
  msgstr "το μυστικό κλειδί `%s' δε βρέθηκε: %s\n"
  
- #: g10/import.c:2160 g10/import.c:2195
++#: g10/import.c:2161 g10/import.c:2196
  #, fuzzy
  msgid "importing secret keys not allowed\n"
  msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
  
- #: g10/import.c:2184
++#: g10/import.c:2185
  #, fuzzy, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr "κλειδί %08lX: μυστικό κλειδί με άκυρο κρυπταλγ. %d - παραλείφθηκε\n"
@@@ -3645,147 -2833,120 +3598,147 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2256
++#: g10/import.c:2257
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2311
++#: g10/import.c:2312
  #, fuzzy, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
  "κλειδί %08lX: όχι δημόσιο κλειδί - αδυναμία εφαρμογής πιστοποιητικού "
  "ανάκλησης\n"
  
- #: g10/import.c:2360
++#: g10/import.c:2361
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "κλειδί %08lX: μη έγκυρο πιστοποιητικό ανάκλησης: %s - απόρριψη\n"
  
- #: g10/import.c:2393
++#: g10/import.c:2394
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "κλειδί %08lX: \"%s\" πιστοποιητικό ανάκλησης εισήχθηκε\n"
  
- #: g10/import.c:2469
++#: g10/import.c:2470
  #, fuzzy, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "κλειδί %08lX: δεν υπάρχει user ID για την υπογραφή\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2487
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr ""
  "κλειδί %08lX: μη υποστηριζόμενος αλγόριθμος δημοσίου κλειδιού στο user id "
  "\"%s\"\n"
  
- #: g10/import.c:2488
++#: g10/import.c:2489
  #, fuzzy, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "κλειδί %08lX: μη έγκυρη ιδιο-υπογραφή στο user id \"%s\"\n"
  
- #: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
++#: g10/import.c:2506 g10/import.c:2532 g10/import.c:2583
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "κλειδί %08lX: μη υποστηριζόμενος αλγόριθμος δημοσίου κλειδιού\n"
  
- #: g10/import.c:2506
++#: g10/import.c:2507
  #, fuzzy, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "κλειδί %08lX: άμεση υπογραφή κλειδιού προστέθηκε\n"
  
- #: g10/import.c:2520
++#: g10/import.c:2521
  #, fuzzy, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "κλειδί %08lX: δεν υπάρχει υποκλειδί για τη δέσμευση κλειδιού\n"
  
- #: g10/import.c:2533
++#: g10/import.c:2534
  #, fuzzy, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "κλειδί %08lX: μη έγκυρη δέσμευση υποκλειδιού\n"
  
- #: g10/import.c:2549
++#: g10/import.c:2550
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "κλειδί %08lX: αφαιρέθηκε η δέσμευση πολλαπλού υποκλειδιού\n"
  
- #: g10/import.c:2571
++#: g10/import.c:2572
  #, fuzzy, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "κλειδί %08lX: δεν υπάρχει υποκλειδί για την ανάκληση κλειδιού\n"
  
- #: g10/import.c:2584
++#: g10/import.c:2585
  #, fuzzy, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "κλειδί %08lX: μη έγκυρη ανάκληση υποκλειδιού\n"
  
- #: g10/import.c:2599
++#: g10/import.c:2600
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "κλειδί %08lX: αφαιρέθηκε η ανάκληση πολλαπλού υποκλειδιού\n"
  
- #: g10/import.c:2641
++#: g10/import.c:2642
  #, fuzzy, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "κλειδί %08lX: παραλείφθηκε user ID '"
  
- #: g10/import.c:2665
++#: g10/import.c:2666
  #, fuzzy, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "κλειδί %08lX: παραλείφθηκε υποκλειδί\n"
  
- #: g10/import.c:2694
++#: g10/import.c:2695
  #, fuzzy, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "κλειδί %08lX: μη εξαγόμενη υπογραφή (κλάση %02x) - παραλείφθηκε\n"
  
- #: g10/import.c:2705
++#: g10/import.c:2706
  #, fuzzy, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr ""
  "κλειδί %08lX: το πιστοποιητικό ανάκλησης σε λάθος σημείο - παραλείφθηκε\n"
  
- #: g10/import.c:2723
++#: g10/import.c:2724
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "κλειδί %08lX: μη έγκυρο πιστοποιητικό ανάκλησης: %s - παραλείφθηκε\n"
  
- #: g10/import.c:2737
++#: g10/import.c:2738
  #, fuzzy, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr ""
  "κλειδί %08lX: η υπογραφή του υποκλειδιού σε λάθος σημείο - παραλείφθηκε\n"
  
- #: g10/import.c:2745
++#: g10/import.c:2746
  #, fuzzy, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "κλειδί %08lX: μη αναμενώμενη κλάση υπογραφής (0x%02x) - παραλείφθηκε\n"
  
- #: g10/import.c:2887
++#: g10/import.c:2888
  #, fuzzy, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "κλειδί %08lX: εντοπίστηκε διπλό user ID - ενώθηκαν\n"
  
- #: g10/import.c:2951
++#: g10/import.c:2952
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr ""
  "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: κλειδί %08lX μπορεί να ανακληθεί: λήψη κλειδιού ανάκλησης "
  "%08lX\n"
  
- #: g10/import.c:2967
++#: g10/import.c:2968
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr ""
  "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: κλειδί %08lX μπορεί να ανακληθεί: το κλειδί ανάκλησης %08lX\n"
  "δεν είναι παρών.\n"
  
- #: g10/import.c:3031
++#: g10/import.c:3032
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "κλειδί %08lX: \"%s\" πιστοποιητικό ανάκλησης προστέθηκε\n"
  
- #: g10/import.c:3069
++#: g10/import.c:3070
  #, fuzzy, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "κλειδί %08lX: άμεση υπογραφή κλειδιού προστέθηκε\n"
@@@ -3822,54 -2977,43 +3775,54 @@@ msgstr "σφάλμα κατά τη δη
  msgid "error opening key DB: %s\n"
  msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
- #: g10/keydb.c:1782
++#: g10/keydb.c:1786
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "αποτυχία επαναδόμησης της cache κλειδοθήκης: %s\n"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[revocation]"
  msgstr "[ανάκληση]"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[self-signature]"
  msgstr "[ιδιο-υπογραφή]"
  
- #: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
++#: g10/keyedit.c:433 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: dirmngr/ldap-wrapper.c:694
  #, fuzzy, c-format
  msgid "error allocating memory: %s\n"
  msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
  
- #: g10/keyedit.c:629
++#: g10/keyedit.c:630
  #, fuzzy, c-format
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr "κλειδί %08lX: μη υποστηριζόμενος αλγόριθμος δημοσίου κλειδιού\n"
  
- #: g10/keyedit.c:638
++#: g10/keyedit.c:639
  #, fuzzy, c-format
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "%s υπογραφή, αλγόριθμος περίληψης %s\n"
  
- #: g10/keyedit.c:800
++#: g10/keyedit.c:801
  #, fuzzy
  msgid " (reordered signatures follow)"
  msgstr "Καλή υπογραφή από \""
  
- #: g10/keyedit.c:913
++#: g10/keyedit.c:914
  #, fuzzy, c-format
  msgid "key %s:\n"
  msgstr "παραλείφθηκε `%s': %s\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:917
  #, fuzzy, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
  msgstr[0] "Το user ID \"%s\" ανακαλείτε."
  msgstr[1] "Το user ID \"%s\" ανακαλείτε."
  
- #: g10/keyedit.c:919 g10/keylist.c:480
++#: g10/keyedit.c:920 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
@@@ -3877,7 -3021,6 +3830,7 @@@ msgid_plural "%d signatures not checke
  msgstr[0] "1 υπογραφή δεν ελέγχθηκε λόγω χαμένου κλειδιού\n"
  msgstr[1] "1 υπογραφή δεν ελέγχθηκε λόγω χαμένου κλειδιού\n"
  
- #: g10/keyedit.c:923 g10/keylist.c:476
++#: g10/keyedit.c:924 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
@@@ -3885,21 -3028,18 +3838,21 @@@ msgid_plural "%d bad signatures\n
  msgstr[0] "%d κακές υπογραφές\n"
  msgstr[1] "%d κακές υπογραφές\n"
  
- #: g10/keyedit.c:927
++#: g10/keyedit.c:928
  #, fuzzy, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
  msgstr[0] "Καλή υπογραφή από \""
  msgstr[1] "Καλή υπογραφή από \""
  
- #: g10/keyedit.c:932
++#: g10/keyedit.c:933
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:992 g10/pkclist.c:274
++#: g10/keyedit.c:993 g10/pkclist.c:274
  #, fuzzy
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
@@@ -3912,68 -3052,53 +3865,68 @@@ msgstr "
  "να κοιτάζει passports και fingerprints από διάφορες πηγές...);\n"
  "\n"
  
- #: g10/keyedit.c:996 g10/pkclist.c:286
++#: g10/keyedit.c:997 g10/pkclist.c:286
  #, fuzzy, c-format
  msgid "  %d = I trust marginally\n"
  msgstr " %d = Έχω μερική εμπιστοσύνη\n"
  
- #: g10/keyedit.c:997 g10/pkclist.c:288
++#: g10/keyedit.c:998 g10/pkclist.c:288
  #, fuzzy, c-format
  msgid "  %d = I trust fully\n"
  msgstr " %d = Έχω πλήρη εμπιστοσύνη\n"
  
- #: g10/keyedit.c:1015
++#: g10/keyedit.c:1016
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
  "trust signatures on your behalf.\n"
  msgstr ""
  
- #: g10/keyedit.c:1032
++#: g10/keyedit.c:1033
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  
- #: g10/keyedit.c:1160
++#: g10/keyedit.c:1161
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1168
++#: g10/keyedit.c:1169
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "Το user ID \"%s\" ανακαλείτε."
  
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
- #: g10/keyedit.c:2246
++#: g10/keyedit.c:1178 g10/keyedit.c:1206 g10/keyedit.c:1233 g10/keyedit.c:1417
++#: g10/keyedit.c:2247
  msgid "Are you sure you still want to sign it? (y/N) "
  msgstr "Σίγουρα θέλετε ακόμα να το υπογράψετε; (y/N) "
  
- #: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
- #: g10/keyedit.c:2251 g10/keyedit.c:3177
++#: g10/keyedit.c:1192 g10/keyedit.c:1220 g10/keyedit.c:1247 g10/keyedit.c:1423
++#: g10/keyedit.c:2252 g10/keyedit.c:3178
  msgid "  Unable to sign.\n"
  msgstr "  Αδυναμία υπογραφής.\n"
  
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1197
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "Το user ID \"%s\" έχει έληξε."
  
- #: g10/keyedit.c:1224
++#: g10/keyedit.c:1225
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το user ID \"%s\" δεν έχει ιδιο-υπογραφεί."
  
- #: g10/keyedit.c:1253
++#: g10/keyedit.c:1254
  #, fuzzy, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το user ID \"%s\" δεν έχει ιδιο-υπογραφεί."
  
- #: g10/keyedit.c:1255
++#: g10/keyedit.c:1256
  #, fuzzy
  msgid "Sign it? (y/N) "
  msgstr "Σίγουρα να υπογραφεί; "
  
- #: g10/keyedit.c:1282
++#: g10/keyedit.c:1283
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -3982,11 -3107,9 +3935,11 @@@ msgstr "
  "Η ιδιο-υπογραφή στο \"%s\"\n"
  "είναι μια υπογραφή τύπου PGP 2.x.\n"
  
- #: g10/keyedit.c:1291
++#: g10/keyedit.c:1292
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr "Θέλετε να τη προάγετε σε μια OpenPGP ιδιο-υπογραφή; (y/N) "
  
- #: g10/keyedit.c:1304
++#: g10/keyedit.c:1305
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3995,12 -3118,10 +3948,12 @@@ msgstr "
  "Η προυπάρχουσα υπογραφή σας στο \"%s\"\n"
  "έχει λήξει.\n"
  
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:1310
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr ""
  "Θέλετε να ορίσετε μια νέα υπογραφή προς αντικατάσταση της ληγμένης; (y/N) "
  
- #: g10/keyedit.c:1330
++#: g10/keyedit.c:1331
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -4009,43 -3130,34 +3962,43 @@@ msgstr "
  "Η προυπάρχουσα υπογραφή σας στο \"%s\"\n"
  "είναι μια τοπική υπογραφή.\n"
  
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:1336
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr "Θέλετε να τη προάγετε σε μια πλήρη εξαγώγιμη υπογραφή; (y/N) "
  
- #: g10/keyedit.c:1355
++#: g10/keyedit.c:1356
  #, fuzzy, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "\"%s\" ήδη υπογράφθηκε από το κλειδί %08lX\n"
  
- #: g10/keyedit.c:1359
++#: g10/keyedit.c:1360
  #, fuzzy, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "\"%s\" ήδη υπογράφθηκε από το κλειδί %08lX\n"
  
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:1365
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "Σίγουρα θέλετε ακόμα να το ξαναυπογράψετε; (y/N) "
  
- #: g10/keyedit.c:1386
++#: g10/keyedit.c:1387
  #, fuzzy, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "Τίποτα για να υπογραφεί με το κλειδί  %08lX\n"
  
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1411
  msgid "This key has expired!"
  msgstr "Αυτό το κλειδί έχει λήξει!"
  
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1429
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "Αυτό το κλειδί πρόκειτε να λήξει στις %s.\n"
  
- #: g10/keyedit.c:1434
++#: g10/keyedit.c:1435
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr "Θέλετε η υπογαφήσας να λήξει ταυτόχρονα;  (Y/n) "
  
- #: g10/keyedit.c:1475
++#: g10/keyedit.c:1476
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -4055,32 -3167,26 +4008,32 @@@ msgstr "
  "ανήκει πράγματι στο προανφερθέν άτομο; Εάν δεν ξέρετε τι να απαντήσετε "
  "πατήστε\"0\".\n"
  
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1481
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) Δεν απαντώ.%s\n"
  
- #: g10/keyedit.c:1482
++#: g10/keyedit.c:1483
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) Δεν έχω ελέγξει καθόλου.%s\n"
  
- #: g10/keyedit.c:1484
++#: g10/keyedit.c:1485
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) Έχω κάνει τον συνήθη έλεγχο.%s\n"
  
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:1488
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) Έχω κάνει εκτεταμένο έλεγχο.%s\n"
  
- #: g10/keyedit.c:1494
++#: g10/keyedit.c:1495
  #, fuzzy
  msgid "Your selection? (enter '?' for more information): "
  msgstr "Η επιλογή σας; (πληκτρολογήστε ? για πληροφορίες): "
  
- #: g10/keyedit.c:1521
++#: g10/keyedit.c:1522
  #, fuzzy, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -4089,21 -3195,18 +4042,21 @@@ msgstr "
  "Σίγουρα θέλετε να υπογράψετε αυτό το κλειδί\n"
  "με το κλειδί σας: \""
  
- #: g10/keyedit.c:1529
++#: g10/keyedit.c:1530
  #, fuzzy
  msgid "This will be a self-signature.\n"
  msgstr ""
  "\n"
  "Αυτή θα είναι μια ιδιο-υπογραφή.\n"
  
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:1535
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr ""
  "\n"
  "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: η υπογραφή δε θα σημειωθεί σαν μη-εξαγώγιμη.\n"
  
- #: g10/keyedit.c:1541
++#: g10/keyedit.c:1542
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr ""
@@@ -4111,14 -3214,12 +4064,14 @@@
  "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Η υπογραφή δε θα σημειωθεί σαν μη-ανακαλέσιμη.\n"
  "\n"
  
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1552
  #, fuzzy
  msgid "The signature will be marked as non-exportable.\n"
  msgstr ""
  "\n"
  "Η υπογραφή θα σημειωθεί σαν μη-εξαγώγιμη.\n"
  
- #: g10/keyedit.c:1558
++#: g10/keyedit.c:1559
  #, fuzzy
  msgid "The signature will be marked as non-revocable.\n"
  msgstr ""
@@@ -4126,233 -3227,184 +4079,233 @@@
  "Η υπογραφή θα σημειωθεί σαν μη-ανακαλέσιμη.\n"
  "\n"
  
- #: g10/keyedit.c:1565
++#: g10/keyedit.c:1566
  #, fuzzy
  msgid "I have not checked this key at all.\n"
  msgstr ""
  "\n"
  "Δεν έχω ελέγξει καθόλου αυτό το κλειδί.\n"
  
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:1571
  #, fuzzy
  msgid "I have checked this key casually.\n"
  msgstr ""
  "\n"
  "Έχω κάνει συνηθισμένο έλεγχο σε αυτό το κλειδί.\n"
  
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:1576
  #, fuzzy
  msgid "I have checked this key very carefully.\n"
  msgstr ""
  "\n"
  "Έχω ελέγξει πολύ προσεκτικά αυτό το κλειδί.\n"
  
- #: g10/keyedit.c:1587
++#: g10/keyedit.c:1588
  #, fuzzy
  msgid "Really sign? (y/N) "
  msgstr "Σίγουρα να υπογραφεί; "
  
- #: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
- #: g10/keyedit.c:6463 g10/sign.c:323
++#: g10/keyedit.c:1639 g10/keyedit.c:6308 g10/keyedit.c:6391 g10/keyedit.c:6500
++#: g10/keyedit.c:6562 g10/sign.c:325
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "η υπογραφή απέτυχε: %s\n"
  
- #: g10/keyedit.c:1725
++#: g10/keyedit.c:1726
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  
- #: g10/keyedit.c:1755
++#: g10/keyedit.c:1756
  #, fuzzy, c-format
  #| msgid "error creating passphrase: %s\n"
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: g10/keyedit.c:1869
++#: g10/keyedit.c:1870
  msgid "save and quit"
  msgstr "αποθήκευση και έξοδος"
  
- #: g10/keyedit.c:1872
++#: g10/keyedit.c:1873
  #, fuzzy
  msgid "show key fingerprint"
  msgstr "απεικόνιση του fingerprint"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1874
  #, fuzzy
  msgid "show the keygrip"
  msgstr "Σημείωση υπογραφής: "
  
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1875
  msgid "list key and user IDs"
  msgstr "απεικόνιση των κλειδιών και των user ID"
  
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1877
  msgid "select user ID N"
  msgstr "επιλογή user ID N"
  
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1878
  #, fuzzy
  msgid "select subkey N"
  msgstr "επιλογή user ID N"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1879
  #, fuzzy
  msgid "check signatures"
  msgstr "ανάκληση υπογραφών"
  
- #: g10/keyedit.c:1884
++#: g10/keyedit.c:1885
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr ""
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1890
  #, fuzzy
  msgid "sign selected user IDs locally"
  msgstr "υπογραφή του κλειδιού τοπικά"
  
- #: g10/keyedit.c:1890
++#: g10/keyedit.c:1891
  #, fuzzy
  msgid "sign selected user IDs with a trust signature"
  msgstr "Συμβουλή: Επιλέξτε το user ID για υπογραφή\n"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1893
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr ""
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1895
  msgid "add a user ID"
  msgstr "προσθήκη ενός user ID"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1897
  msgid "add a photo ID"
  msgstr "προσθήκη ενός photo ID"
  
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1898
  #, fuzzy
  msgid "delete selected user IDs"
  msgstr "διαγραφή ενός user ID"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1901
  #, fuzzy
  msgid "add a subkey"
  msgstr "addkey"
  
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1904
  msgid "add a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1906
  msgid "move a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1908
  msgid "move a backup key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1910
  #, fuzzy
  msgid "delete selected subkeys"
  msgstr "διαγραφή ενός δευτερεύοντος κλειδιού"
  
- #: g10/keyedit.c:1911
++#: g10/keyedit.c:1912
  msgid "add a revocation key"
  msgstr "προσθήκη ενός κλειδιού ανάκλησης"
  
- #: g10/keyedit.c:1913
++#: g10/keyedit.c:1914
  #, fuzzy
  msgid "delete signatures from the selected user IDs"
  msgstr ""
  "Σίγουρα θέλετε να ανανεωθούν οι προεπιλογές για το επιλεγμένο user ID; "
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1916
  #, fuzzy
  msgid "change the expiration date for the key or selected subkeys"
  msgstr "Δεν μπορείτε να αλλάξετε την ημερομηνία λήξης σε ένα v3 κλειδί\n"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1918
  #, fuzzy
  msgid "flag the selected user ID as primary"
  msgstr "σημείωση του user ID σαν πρωτεύων"
  
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1921
  msgid "list preferences (expert)"
  msgstr "απεικόνιση προεπιλογών (ειδικές)"
  
- #: g10/keyedit.c:1921
++#: g10/keyedit.c:1922
  msgid "list preferences (verbose)"
  msgstr "απεικόνιση επιλογών (αναλυτικά)"
  
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:1924
  #, fuzzy
  msgid "set preference list for the selected user IDs"
  msgstr ""
  "Σίγουρα θέλετε να ανανεωθούν οι προεπιλογές για το επιλεγμένο user ID; "
  
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1927
  #, fuzzy
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr "αδυναμία επεξεργασίας του URI του διακομιση κλειδιών\n"
  
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1929
  #, fuzzy
  msgid "set a notation for the selected user IDs"
  msgstr ""
  "Σίγουρα θέλετε να ανανεωθούν οι προεπιλογές για το επιλεγμένο user ID; "
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1931
  msgid "change the passphrase"
  msgstr "αλλαγή της φράσης κλειδί"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1934
  msgid "change the ownertrust"
  msgstr "αλλαγή της εμπιστοσύνης ιδιοκτήτη"
  
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1937
  #, fuzzy
  msgid "revoke signatures on the selected user IDs"
  msgstr "Σίγουρα θέλετε να ανακληθούν όλα τα επιλεγμένα user ID; "
  
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1939
  #, fuzzy
  msgid "revoke selected user IDs"
  msgstr "ανάκληση ενός user ID"
  
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1942
  #, fuzzy
  msgid "revoke key or selected subkeys"
  msgstr "ανάκληση ενός δευτερεύοντος κλειδιού"
  
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1944
  #, fuzzy
  msgid "enable key"
  msgstr "ενεργοποιεί ένα κλειδί"
  
- #: g10/keyedit.c:1944
++#: g10/keyedit.c:1945
  #, fuzzy
  msgid "disable key"
  msgstr "απενεργοποιεί ένα κλειδί"
  
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1947
  #, fuzzy
  msgid "show selected photo IDs"
  msgstr "απεικόνιση photo ID"
  
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1949
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:1951
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2063
  msgid "Secret key is available.\n"
  msgstr "Το μυστικό κλειδί είναι διαθέσιμο.\n"
  
- #: g10/keyedit.c:2162
++#: g10/keyedit.c:2163
  msgid "Need the secret key to do this.\n"
  msgstr "Απαιτείται το μυστικό κλειδί για να γίνει αυτό.\n"
  
- #: g10/keyedit.c:2183
++#: g10/keyedit.c:2184
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4360,280 -3412,225 +4313,285 @@@
  "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
  msgstr ""
  
- #: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
++#: g10/keyedit.c:2240 g10/keyedit.c:3178 g10/keyedit.c:3317 g10/keyedit.c:3379
  msgid "Key is revoked."
  msgstr "Το κλειδί ανακλήθηκε."
  
- #: g10/keyedit.c:2262
++#: g10/keyedit.c:2263
  #, fuzzy
  msgid "Really sign all user IDs? (y/N) "
  msgstr "Σίγουρα να υπογραφούν όλα τα user ID; "
  
- #: g10/keyedit.c:2266
++#: g10/keyedit.c:2267
  #, fuzzy
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "Σίγουρα να υπογραφούν όλα τα user ID; "
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2275
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Συμβουλή: Επιλέξτε το user ID για υπογραφή\n"
  
- #: g10/keyedit.c:2285
++#: g10/keyedit.c:2286
  #, fuzzy, c-format
  msgid "Unknown signature type '%s'\n"
  msgstr "άγνωστη κλάση υπογραφής"
  
- #: g10/keyedit.c:2309
++#: g10/keyedit.c:2310
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
  msgstr "Αυτή η εντολή απαγορεύετε σε αυτή την κατάσταση %s.\n"
  
- #: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
++#: g10/keyedit.c:2332 g10/keyedit.c:2356 g10/keyedit.c:2550
  msgid "You must select at least one user ID.\n"
  msgstr "Πρέπει να επιλέξετε το λιγότερο ένα user ID.\n"
  
- #: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
++#: g10/keyedit.c:2334 g10/keyedit.c:2358 g10/keyedit.c:2512 g10/keyedit.c:2552
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2336
++#: g10/keyedit.c:2337
  msgid "You can't delete the last user ID!\n"
  msgstr "Δεν μπορείτε να διαγράψετε το τελευταίο user ID!\n"
  
- #: g10/keyedit.c:2339
++#: g10/keyedit.c:2340
  #, fuzzy
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "Σίγουρα θέλετε να διαγραφούν όλα τα επιλεγμένα user ID; "
  
- #: g10/keyedit.c:2340
++#: g10/keyedit.c:2341
  #, fuzzy
  msgid "Really remove this user ID? (y/N) "
  msgstr "Σίγουρα θέλετε να διαγραφεί αυτό το user ID; "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2397
++#: g10/keyedit.c:2398
  #, fuzzy
  msgid "Really move the primary key? (y/N) "
  msgstr "Σίγουρα θέλετε να διαγραφεί αυτό το user ID; "
  
- #: g10/keyedit.c:2409 g10/keyedit.c:4866
++#: g10/keyedit.c:2410 g10/keyedit.c:4964
  #, fuzzy
  msgid "You must select exactly one key.\n"
  msgstr "Πρέπει να επιλέξετε τουλάχιστον ένα κλειδί.\n"
  
- #: g10/keyedit.c:2436
++#: g10/keyedit.c:2437
  msgid "Command expects a filename argument\n"
  msgstr ""
  
- #: g10/keyedit.c:2457
++#: g10/keyedit.c:2458
  #, fuzzy, c-format
  msgid "Can't open '%s': %s\n"
  msgstr "αδυναμία πρόσβασης στο `%s': %s\n"
  
- #: g10/keyedit.c:2474
++#: g10/keyedit.c:2475
  #, fuzzy, c-format
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
  
- #: g10/keyedit.c:2509
++#: g10/keyedit.c:2510
  msgid "You must select at least one key.\n"
  msgstr "Πρέπει να επιλέξετε τουλάχιστον ένα κλειδί.\n"
  
- #: g10/keyedit.c:2515
++#: g10/keyedit.c:2516
  #, fuzzy
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "Σίγουρα θέλετε να διαγραφούν τα επιλεγμένα κλειδιά; "
  
- #: g10/keyedit.c:2517
++#: g10/keyedit.c:2518
  #, fuzzy
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "Σίγουρα θέλετε να διαγραφεί αυτό το κλειδί; "
  
- #: g10/keyedit.c:2555
++#: g10/keyedit.c:2556
  #, fuzzy
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr "Σίγουρα θέλετε να ανακληθούν όλα τα επιλεγμένα user ID; "
  
- #: g10/keyedit.c:2556
++#: g10/keyedit.c:2557
  #, fuzzy
  msgid "Really revoke this user ID? (y/N) "
  msgstr "Σίγουρα θέλετε να ανακληθεί αυτό το user ID; "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2575
  #, fuzzy
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "Σίγουρα θέλετε να ανακληθεί αυτό το κλειδί; "
  
- #: g10/keyedit.c:2585
++#: g10/keyedit.c:2586
  #, fuzzy
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "Σίγουρα θέλετε να ανακληθούν τα επιλεγμένα κλειδιά; "
  
- #: g10/keyedit.c:2587
++#: g10/keyedit.c:2588
  #, fuzzy
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "Σίγουρα θέλετε να ανακληθεί αυτό το κλειδί; "
  
- #: g10/keyedit.c:2645
++#: g10/keyedit.c:2646
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  
- #: g10/keyedit.c:2690
++#: g10/keyedit.c:2691
  #, fuzzy
  msgid "Set preference list to:\n"
  msgstr "ορισμός απεικόνισης επιλογών"
  
- #: g10/keyedit.c:2697
++#: g10/keyedit.c:2698
  #, fuzzy
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr ""
  "Σίγουρα θέλετε να ανανεωθούν οι προεπιλογές για το επιλεγμένο user ID; "
  
- #: g10/keyedit.c:2699
++#: g10/keyedit.c:2700
  #, fuzzy
  msgid "Really update the preferences? (y/N) "
  msgstr "Σίγουρα να ανανεωθούν οι προεπιλογές;"
  
- #: g10/keyedit.c:2773
++#: g10/keyedit.c:2774
  #, fuzzy
  msgid "Save changes? (y/N) "
  msgstr "Αποθήκευση των αλλαγών; "
  
- #: g10/keyedit.c:2777
++#: g10/keyedit.c:2778
  #, fuzzy
  msgid "Quit without saving? (y/N) "
  msgstr "Τερματισμός χωρίς αποθήκευση; "
  
- #: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
- #: g10/keyedit.c:3267 g10/keyedit.c:3332
++#: g10/keyedit.c:2789 g10/keyedit.c:2799 g10/keyedit.c:2943 g10/keyedit.c:3046
++#: g10/keyedit.c:3268 g10/keyedit.c:3333 g10/keyedit.c:3409
  #, c-format
  msgid "update failed: %s\n"
  msgstr "η ενημέρωση απέτυχε: %s\n"
  
- #: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
++#: g10/keyedit.c:2805 g10/keyedit.c:3273 g10/keyedit.c:3338 g10/keyedit.c:3416
  msgid "Key not changed so no update needed.\n"
  msgstr "Το κλειδί δεν άλλαξε οπότε δεν χρειάζεται ενημέρωση.\n"
  
- #: g10/keyedit.c:3038
++#: g10/keyedit.c:3039
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
  msgstr "Η δημιουργία κλειδιού απέτυχε: %s\n"
  
- #: g10/keyedit.c:3083
++#: g10/keyedit.c:3084
  #, fuzzy, c-format
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
  
- #: g10/keyedit.c:3112
++#: g10/keyedit.c:3113
  #, fuzzy, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
  
- #: g10/keyedit.c:3248 g10/keyedit.c:3251
++#: g10/keyedit.c:3249 g10/keyedit.c:3252
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
  msgstr "μη έγκυρη τιμή\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  #, fuzzy
  #| msgid "No such user ID.\n"
  msgid "No matching user IDs."
  msgstr "Δεν υπάρχει αυτό το user ID.\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  #, fuzzy
  msgid "Nothing to sign.\n"
  msgstr "Τίποτα για να υπογραφεί με το κλειδί  %08lX\n"
  
- #: g10/keyedit.c:3427
++#: g10/keyedit.c:3388
+ #, fuzzy, c-format
+ msgid "'%s' is not a valid expiration time\n"
+ msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
+ 
++#: g10/keyedit.c:3508
  msgid "Digest: "
  msgstr "Περίληψη: "
  
- #: g10/keyedit.c:3484
++#: g10/keyedit.c:3565
  msgid "Features: "
  msgstr "Δυνατότητε: "
  
- #: g10/keyedit.c:3495
++#: g10/keyedit.c:3576
  msgid "Keyserver no-modify"
  msgstr ""
  
- #: g10/keyedit.c:3510 g10/keylist.c:377
++#: g10/keyedit.c:3591 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr ""
  
- #: g10/keyedit.c:3518 g10/keyedit.c:3519
++#: g10/keyedit.c:3599 g10/keyedit.c:3600
  #, fuzzy
  msgid "Notations: "
  msgstr "Σημείωση: "
  
- #: g10/keyedit.c:3764
++#: g10/keyedit.c:3845
  msgid "There are no preferences on a PGP 2.x-style user ID.\n"
  msgstr "Δεν υπάρχουν προεπιλογές σε ένα user ID τύπου PGP 2.x.\n"
  
- #: g10/keyedit.c:3836
++#: g10/keyedit.c:3917
  #, fuzzy, c-format
  msgid "The following key was revoked on %s by %s key %s\n"
  msgstr "Αυτό το κλειδί μπορεί να ανακληθεί από %s κλειδί "
  
- #: g10/keyedit.c:3860
++#: g10/keyedit.c:3941
  #, fuzzy, c-format
  msgid "This key may be revoked by %s key %s"
  msgstr "Αυτό το κλειδί μπορεί να ανακληθεί από %s κλειδί "
  
- #: g10/keyedit.c:3866
++#: g10/keyedit.c:3947
  #, fuzzy
  msgid "(sensitive)"
  msgstr " (ευαίσθητο)"
  
- #: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3989 g10/keyedit.c:4131 g10/keylist.c:262 g10/keyserver.c:538
  #, fuzzy, c-format
  msgid "created: %s"
  msgstr "αδυναμία δημιουργίας του %s: %s\n"
  
- #: g10/keyedit.c:3911 g10/keylist.c:1852
++#: g10/keyedit.c:3992 g10/keylist.c:1852
  #, fuzzy, c-format
  msgid "revoked: %s"
  msgstr "[ανακλημένο]"
  
- #: g10/keyedit.c:3913 g10/keylist.c:1858
++#: g10/keyedit.c:3994 g10/keylist.c:1858
  #, fuzzy, c-format
  msgid "expired: %s"
  msgstr " [λήγει: %s]"
  
- #: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyedit.c:3996 g10/keyedit.c:4133 g10/keylist.c:264 g10/keylist.c:1864
 +#: g10/keyserver.c:544
  #, fuzzy, c-format
  msgid "expires: %s"
  msgstr " [λήγει: %s]"
  
- #: g10/keyedit.c:3917
++#: g10/keyedit.c:3998
  #, fuzzy, c-format
  msgid "usage: %s"
  msgstr " εμπιστοσύνη: %c/%c"
  
- #: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
++#: g10/keyedit.c:4006 g10/keyedit.c:4026 g10/keylist.c:267
  msgid "card-no: "
  msgstr ""
  
- #: g10/keyedit.c:3984
++#: g10/keyedit.c:4065
  #, fuzzy, c-format
  msgid "trust: %s"
  msgstr " εμπιστοσύνη: %c/%c"
  
- #: g10/keyedit.c:3988
++#: g10/keyedit.c:4069
  #, c-format
  msgid "validity: %s"
  msgstr ""
  
- #: g10/keyedit.c:3995
++#: g10/keyedit.c:4076
  msgid "This key has been disabled"
  msgstr "Αυτό το κλειδί έχει απενεργοποιηθεί"
  
- #: g10/keyedit.c:4013
++#: g10/keyedit.c:4094
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4641,20 -3638,14 +4599,20 @@@ msgstr "
  "Η εγγυρότητα του απεικονιζόμενου κλειδιού δεν είναι απαραίτητα σωστή\n"
  "εκτός και εάν επανακκινήσετε το πρόγραμμα.\n"
  
- #: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
- #: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: g10/keyedit.c:4150 g10/keyedit.c:4581 g10/keyserver.c:548
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:712
 +#: dirmngr/ocsp.c:703
  #, fuzzy
  msgid "revoked"
  msgstr "[ανακλημένο]"
  
- #: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
- #: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4152 g10/keyedit.c:4583 g10/keyserver.c:552
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:714
  #, fuzzy
  msgid "expired"
  msgstr "expire"
  
- #: g10/keyedit.c:4188
++#: g10/keyedit.c:4269
  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"
@@@ -4662,17 -3653,14 +4620,17 @@@ msgstr "
  "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δεν έχει σημειωθεί ID χρήστη σαν πρωτεύων.  Αυτή η εντολή\n"
  "              μπορεί να κάνει ένα άλλο ID χρήστη να γίνει το πρωτεύων.\n"
  
- #: g10/keyedit.c:4240
++#: g10/keyedit.c:4321
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr ""
  
- #: g10/keyedit.c:4241
++#: g10/keyedit.c:4322
  #, fuzzy
  #| 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:4300
++#: g10/keyedit.c:4381
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4681,35 -3669,27 +4639,35 @@@ msgstr "
  "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτό έιναι ένα κλειδί τύπου PGP2. Η προσθήκη ενός photo ID\n"
  "               μπορεί να κάνει μερικές εκδόσεις PGP να το απορρίψουν.\n"
  
- #: g10/keyedit.c:4305 g10/keyedit.c:4595
++#: g10/keyedit.c:4386 g10/keyedit.c:4676
  msgid "Are you sure you still want to add it? (y/N) "
  msgstr "Σίγουρα ακόμα θέλετε να το προσθέσετε; (y/N) "
  
- #: g10/keyedit.c:4311
++#: g10/keyedit.c:4392
  msgid "You may not add a photo ID to a PGP2-style key.\n"
  msgstr "Δεν μπορείτε να προσθέσετε μια photo ID σε ένα κλειδί τύπου PGP2.\n"
  
- #: g10/keyedit.c:4326 g10/keygen.c:2697
++#: g10/keyedit.c:4407 g10/keygen.c:2719
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4509
  msgid "Delete this good signature? (y/N/q)"
  msgstr "Διαγραφή αυτής της καλής υπογραφής; (y/N/q)"
  
- #: g10/keyedit.c:4438
++#: g10/keyedit.c:4519
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "Διαγραφή αυτής της μη έγκυρης υπογραφής; (y/N/q)"
  
- #: g10/keyedit.c:4442
++#: g10/keyedit.c:4523
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "Διαγραφή αυτής της άγνωστης υπογραφής; (y/N/q)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4530
  msgid "Really delete this self-signature? (y/N)"
  msgstr "Σίγουρα να διαγραφεί αυτή η ιδιο-υπογραφή; (y/N)"
  
- #: g10/keyedit.c:4465
++#: g10/keyedit.c:4546
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
@@@ -4717,38 -3697,31 +4675,38 @@@ msgid_plural "Deleted %d signatures.\n
  msgstr[0] "Διαγράφτηκε %d υπογραφή.\n"
  msgstr[1] "Διαγράφτηκε %d υπογραφή.\n"
  
- #: g10/keyedit.c:4469
++#: g10/keyedit.c:4550
  msgid "Nothing deleted.\n"
  msgstr "Τίποτα δεν διαγράφτηκε.\n"
  
- #: g10/keyedit.c:4504 g10/trust.c:693
++#: g10/keyedit.c:4585 g10/trust.c:716
  #, fuzzy
  msgid "invalid"
  msgstr "μη έγκυρη θωράκιση"
  
- #: g10/keyedit.c:4506
++#: g10/keyedit.c:4587
  #, fuzzy, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "Το user ID \"%s\" ανακαλείτε."
  
- #: g10/keyedit.c:4512
++#: g10/keyedit.c:4593
  #, 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:4520
++#: g10/keyedit.c:4601
  #, fuzzy, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
  
- #: g10/keyedit.c:4521
++#: g10/keyedit.c:4602
  #, fuzzy, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
  
- #: g10/keyedit.c:4590
++#: g10/keyedit.c:4671
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4758,38 -3731,31 +4716,38 @@@ msgstr "
  "               καθορισμένου ανακλητή μπορεί να κάνει μερικές εκδόσεις PGP\n"
  "               να το απορρίψουν.\n"
  
- #: g10/keyedit.c:4601
++#: g10/keyedit.c:4682
  msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
  msgstr ""
  "Δεν μπορείτε να προσθέσετε ένα καθορισμένο ανακλητή σε κλειδί τύπου PGP2.x.\n"
  
- #: g10/keyedit.c:4618
++#: g10/keyedit.c:4699
  msgid "Enter the user ID of the designated revoker: "
  msgstr "Πληκτρολογήστε το user ID του διορισμένου ανακλητή: "
  
- #: g10/keyedit.c:4643
++#: g10/keyedit.c:4724
  msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
  msgstr ""
  "αδυναμία ορισμού ενός κλειδιού τύπου PGP 2.x, σαν διορισμένου ανακλητή\n"
  
- #: g10/keyedit.c:4658
++#: g10/keyedit.c:4739
  msgid "you cannot appoint a key as its own designated revoker\n"
  msgstr ""
  "δε μπορείτε να ορίσετε ένα κλειδί σαν το διορισμένο ανακλητή του εαυτού του\n"
  
- #: g10/keyedit.c:4680
++#: g10/keyedit.c:4761
  #, fuzzy
  msgid "this key has already been designated as a revoker\n"
  msgstr ""
  "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτό το κλειδί έχει ανακληθεί από τον ορισμένο ανακλητή!\n"
  
- #: g10/keyedit.c:4698
++#: g10/keyedit.c:4779
  msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
  msgstr ""
  "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: εάν ορίσετε ένα κλειδί σαν διορισμένο ανακλητή δεν μπορεί να "
  "επανέλθει!\n"
  
- #: g10/keyedit.c:4704
++#: g10/keyedit.c:4785
  #, fuzzy
  msgid ""
  "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4797,7 -3763,6 +4755,7 @@@ msgstr "
  "Είστε σίγουροι ότι θέλετε να ορίσετε ένα κλειδί σαν διορισμένο ανακλητή; (y/"
  "N): "
  
- #: g10/keyedit.c:4755
++#: g10/keyedit.c:4848
  #, fuzzy
  msgid ""
  "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@@ -4806,242 -3771,191 +4764,242 @@@ msgstr "
  "Είστε σίγουροι ότι θέλετε να ορίσετε ένα κλειδί σαν διορισμένο ανακλητή; (y/"
  "N): "
  
- #: g10/keyedit.c:4760
++#: g10/keyedit.c:4853
  #, fuzzy
  msgid "Changing expiration time for a subkey.\n"
  msgstr "Αλλαγή ημερομηνίας λήξης για ένα δευτερεύον κλειδί.\n"
  
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:4856
  msgid "Changing expiration time for the primary key.\n"
  msgstr "Αλλαγή ημερομηνίας λήξης για ένα πρωτεύον κλειδί.\n"
  
- #: g10/keyedit.c:4814
++#: g10/keyedit.c:4910
  msgid "You can't change the expiration date of a v3 key\n"
  msgstr "Δεν μπορείτε να αλλάξετε την ημερομηνία λήξης σε ένα v3 κλειδί\n"
  
- #: g10/keyedit.c:4987
++#: g10/keyedit.c:5085
  #, fuzzy, c-format
  msgid "signing subkey %s is already cross-certified\n"
  msgstr ""
  "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το υπογράφων υποκλειδί %08lX δεν έχει κατ' αντιπαράσταση "
  "πιστοποιηθεί\n"
  
- #: g10/keyedit.c:4993
++#: g10/keyedit.c:5091
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr ""
  
- #: g10/keyedit.c:5108
++#: g10/keyedit.c:5206
  msgid "Please select exactly one user ID.\n"
  msgstr "Πρέπει να επιλέξετε ακριβώς ένα user ID.\n"
  
- #: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
++#: g10/keyedit.c:5247 g10/keyedit.c:5361 g10/keyedit.c:5474 g10/keyedit.c:5611
  #, fuzzy, c-format
  msgid "skipping v3 self-signature on user ID \"%s\"\n"
  msgstr "παραλείφθηκε η v3 ιδιο-υπογραφή στο user id \"%s\"\n"
  
- #: g10/keyedit.c:5320
++#: g10/keyedit.c:5418
  msgid "Enter your preferred keyserver URL: "
  msgstr ""
  
- #: g10/keyedit.c:5399
++#: g10/keyedit.c:5497
  #, fuzzy
  msgid "Are you sure you want to replace it? (y/N) "
  msgstr "Σίγουρα θέλετε ακόμα να το χρησιμοποιήσετε; (y/N) "
  
- #: g10/keyedit.c:5400
++#: g10/keyedit.c:5498
  #, fuzzy
  msgid "Are you sure you want to delete it? (y/N) "
  msgstr "Σίγουρα θέλετε ακόμα να το χρησιμοποιήσετε; (y/N) "
  
- #: g10/keyedit.c:5459
++#: g10/keyedit.c:5557
  #, fuzzy
  msgid "Enter the notation: "
  msgstr "Σημείωση υπογραφής: "
  
- #: g10/keyedit.c:5606
++#: g10/keyedit.c:5704
  #, fuzzy
  msgid "Proceed? (y/N) "
  msgstr "Επικάλυψη (y/N); "
  
- #: g10/keyedit.c:5676
++#: g10/keyedit.c:5774
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "Δεν υπάρχει user ID με δείκτη %d\n"
  
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5836
  #, fuzzy, c-format
  msgid "No user ID with hash %s\n"
  msgstr "Δεν υπάρχει user ID με δείκτη %d\n"
  
- #: g10/keyedit.c:5839
++#: g10/keyedit.c:5937
  #, fuzzy, c-format
  msgid "No subkey with key ID '%s'.\n"
  msgstr "Δεν υπάρχει user ID με δείκτη %d\n"
  
- #: g10/keyedit.c:5861
++#: g10/keyedit.c:5959
  #, fuzzy, c-format
  msgid "No subkey with index %d\n"
  msgstr "Δεν υπάρχει user ID με δείκτη %d\n"
  
- #: g10/keyedit.c:6002
++#: g10/keyedit.c:6100
  #, fuzzy, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "user ID: \""
  
- #: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
++#: g10/keyedit.c:6103 g10/keyedit.c:6205 g10/keyedit.c:6253
  #, fuzzy, c-format
  msgid "signed by your key %s on %s%s%s\n"
  msgstr "   υπογράφθηκε από %08lX στις %s%s%s\n"
  
- #: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
++#: g10/keyedit.c:6105 g10/keyedit.c:6207 g10/keyedit.c:6255
  msgid " (non-exportable)"
  msgstr " (μη-εξαγώγιμο)"
  
- #: g10/keyedit.c:6011
++#: g10/keyedit.c:6109
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "Αυτή η υπογραφή έληξε στις %s.\n"
  
- #: g10/keyedit.c:6016
++#: g10/keyedit.c:6114
  msgid "Are you sure you still want to revoke it? (y/N) "
  msgstr "Σίγουρα θέλετε να ανακληθεί αυτό το κλειδί; "
  
- #: g10/keyedit.c:6021
++#: g10/keyedit.c:6119
  msgid "Create a revocation certificate for this signature? (y/N) "
  msgstr "Δημιουργία ενός πιστοποιητικού ανάκλησης για αυτή την υπογραφή; (y/N)"
  
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6173
  #, fuzzy
  msgid "Not signed by you.\n"
  msgstr "   υπογράφθηκε από %08lX στις %s%s\n"
  
- #: g10/keyedit.c:6081
++#: g10/keyedit.c:6179
  #, fuzzy, c-format
  msgid "You have signed these user IDs on key %s:\n"
  msgstr "Έχετε υπογράψει αυτά τα user ID:\n"
  
- #: g10/keyedit.c:6110
++#: g10/keyedit.c:6208
  #, fuzzy
  msgid " (non-revocable)"
  msgstr " (μη-εξαγώγιμο)"
  
- #: g10/keyedit.c:6117
++#: g10/keyedit.c:6215
  #, fuzzy, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "   ανακλήθηκε από %08lX στις %s\n"
  
- #: g10/keyedit.c:6142
++#: g10/keyedit.c:6240
  msgid "You are about to revoke these signatures:\n"
  msgstr "Σκοπεύετε να ανακαλέσετε αυτές τις υπογραφές:\n"
  
- #: g10/keyedit.c:6165
++#: g10/keyedit.c:6263
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "Σίγουρα να δημιουργηθούν τα πιστοποιητικά ανάκλησης; (y/N)"
  
- #: g10/keyedit.c:6198
++#: g10/keyedit.c:6296
  msgid "no secret key\n"
  msgstr "κανένα μυστικό κλειδί\n"
  
- #: g10/keyedit.c:6246
++#: g10/keyedit.c:6344
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6256
++#: g10/keyedit.c:6354
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
  
- #: g10/keyedit.c:6273
++#: g10/keyedit.c:6371
  #, c-format
  msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
  msgstr ""
  "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μια υπογραφή user ID έχει ημερομηνία %d δεύτερα στο μέλλον\n"
  
- #: g10/keyedit.c:6386
++#: g10/keyedit.c:6485
  #, fuzzy, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
  
- #: g10/keyedit.c:6448
++#: g10/keyedit.c:6547
  #, fuzzy, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
  
- #: g10/keyedit.c:6545
++#: g10/keyedit.c:6644
  #, fuzzy, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr "Απεικόνιση %s photo ID μεγέθους %ld για το κλειδί 0x%08lX (uid %d)\n"
  
- #: g10/keygen.c:305
++#: g10/keygen.c:316
  #, fuzzy, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "η προεπιλογή %c%lu αντιγράφτηκε\n"
  
- #: g10/keygen.c:312
++#: g10/keygen.c:323
  #, fuzzy
  msgid "too many cipher preferences\n"
  msgstr "πάρα πολλές `%c' προεπιλογές\n"
  
- #: g10/keygen.c:314
++#: g10/keygen.c:325
  #, fuzzy
  msgid "too many digest preferences\n"
  msgstr "πάρα πολλές `%c' προεπιλογές\n"
  
- #: g10/keygen.c:316
++#: g10/keygen.c:327
  #, fuzzy
  msgid "too many compression preferences\n"
  msgstr "πάρα πολλές `%c' προεπιλογές\n"
  
- #: g10/keygen.c:457
++#: g10/keygen.c:468
  #, fuzzy, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "μη έγκυρος χαρακτήρας στο \"κορδόνι\" της επιλογής\n"
  
- #: g10/keygen.c:936
++#: g10/keygen.c:947
  msgid "writing direct signature\n"
  msgstr "εγγραφή άμεσης υπογραφής\n"
  
- #: g10/keygen.c:982
++#: g10/keygen.c:993
  msgid "writing self signature\n"
  msgstr "εγγραφή ιδιο-υπογραφής\n"
  
- #: g10/keygen.c:1038
++#: g10/keygen.c:1049
  msgid "writing key binding signature\n"
  msgstr "εγγραφή υπογραφής \"δέσιμου\" κλειδιού\n"
  
- #: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
- #: g10/keygen.c:1610 g10/keygen.c:1615
++#: g10/keygen.c:1413 g10/keygen.c:1418 g10/keygen.c:1470 g10/keygen.c:1475
++#: g10/keygen.c:1622 g10/keygen.c:1627
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "μη έγκυρο μέγεθος κλειδιού, χρήση %u bits\n"
  
- #: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
++#: g10/keygen.c:1424 g10/keygen.c:1481 g10/keygen.c:1489 g10/keygen.c:1633
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "στρογγυλοποίηση του μέγεθος κλειδιού έως %u bits\n"
  
- #: g10/keygen.c:1503
++#: g10/keygen.c:1515
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1677
++#: g10/keygen.c:1689
  #, fuzzy
  msgid "Sign"
  msgstr "sign"
  
- #: g10/keygen.c:1680
++#: g10/keygen.c:1692
  msgid "Certify"
  msgstr ""
  
- #: g10/keygen.c:1683
++#: g10/keygen.c:1695
  #, fuzzy
  msgid "Encrypt"
  msgstr "κρυπτογράφηση δεδομένων"
  
- #: g10/keygen.c:1686
++#: g10/keygen.c:1698
  msgid "Authenticate"
  msgstr ""
  
@@@ -5055,157 -3969,126 +5013,157 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1705
++#: g10/keygen.c:1717
  msgid "SsEeAaQq"
  msgstr ""
  
- #: g10/keygen.c:1732
++#: g10/keygen.c:1744
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr ""
  
- #: g10/keygen.c:1738
++#: g10/keygen.c:1750
  msgid "Current allowed actions: "
  msgstr ""
  
- #: g10/keygen.c:1743
++#: g10/keygen.c:1755
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr ""
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1758
  #, fuzzy, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%d) ElGamal (για κρυπτογράφηση μόνο)\n"
  
- #: g10/keygen.c:1749
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr ""
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr ""
  
- #: g10/keygen.c:1881 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1893 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Παρακαλώ επιλέξτε τον τύπο του κλειδιού που θέλετε:\n"
  
- #: g10/keygen.c:1885
++#: g10/keygen.c:1897
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) DSA και ElGamal (προκαθορισμένο)\n"
  
- #: g10/keygen.c:1889
++#: g10/keygen.c:1901
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA και ElGamal (προκαθορισμένο)\n"
  
- #: g10/keygen.c:1892
++#: g10/keygen.c:1904
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (για υπογραφή μόνο)\n"
  
- #: g10/keygen.c:1894
++#: g10/keygen.c:1906
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (για υπογραφή μόνο)\n"
  
- #: g10/keygen.c:1900
++#: g10/keygen.c:1912
  #, fuzzy, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) ElGamal (για κρυπτογράφηση μόνο)\n"
  
- #: g10/keygen.c:1902
++#: g10/keygen.c:1914
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (για κρυπτογράφηση μόνο)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1920
  #, fuzzy, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (για κρυπτογράφηση μόνο)\n"
  
- #: g10/keygen.c:1910
++#: g10/keygen.c:1922
  #, fuzzy, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (για κρυπτογράφηση μόνο)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1928
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA και ElGamal (προκαθορισμένο)\n"
  
- #: g10/keygen.c:1918
++#: g10/keygen.c:1930
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (για υπογραφή μόνο)\n"
  
- #: g10/keygen.c:1920
++#: g10/keygen.c:1932
  #, fuzzy, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) RSA (για κρυπτογράφηση μόνο)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1934
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) RSA (για κρυπτογράφηση μόνο)\n"
  
- #: g10/keygen.c:1926
++#: g10/keygen.c:1938
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) RSA (για κρυπτογράφηση μόνο)\n"
  
- #: g10/keygen.c:2022 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:206
  #, fuzzy
  msgid "Enter the keygrip: "
  msgstr "Σημείωση υπογραφής: "
  
- #: g10/keygen.c:2035 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2047 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2049 sm/certreqgen-ui.c:216
  #, fuzzy
  msgid "No key with this keygrip\n"
  msgstr "Δεν υπάρχει user ID με δείκτη %d\n"
  
- #: g10/keygen.c:2111 g10/keygen.c:2125
++#: g10/keygen.c:2133 g10/keygen.c:2147
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
  msgstr "στρογγυλοποιήθηκε έως τα %u bits\n"
  
- #: g10/keygen.c:2166
++#: g10/keygen.c:2188
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr ""
  
- #: g10/keygen.c:2174
++#: g10/keygen.c:2196
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Τι μέγεθος κλειδιού θα θέλατε; (1024) "
  
- #: g10/keygen.c:2177 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2199 sm/certreqgen-ui.c:183
  #, fuzzy, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Τι μέγεθος κλειδιού θα θέλατε; (1024) "
  
- #: g10/keygen.c:2191 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2213 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Το μέγεθος κλειδιού που ζητήθηκε είναι %u bits\n"
  
- #: g10/keygen.c:2237
++#: g10/keygen.c:2259
  #, fuzzy
  #| msgid "Please select what kind of key you want:\n"
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Παρακαλώ επιλέξτε τον τύπο του κλειδιού που θέλετε:\n"
  
- #: g10/keygen.c:2409
++#: g10/keygen.c:2431
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5221,7 -4104,6 +5179,7 @@@ msgstr "
  "      <n>m = το κλειδί λήγει σε n μήνες\n"
  "      <n>y = το κλειδί λήγει σε n έτη\n"
  
- #: g10/keygen.c:2420
++#: g10/keygen.c:2442
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5237,40 -4119,32 +5195,40 @@@ msgstr "
  "      <n>m = το κλειδί λήγει σε n μήνες\n"
  "      <n>y = το κλειδί λήγει σε n έτη\n"
  
- #: g10/keygen.c:2443
++#: g10/keygen.c:2465
  msgid "Key is valid for? (0) "
  msgstr "Το κλειδί είναι έγκυρο για; (0) "
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2470
  #, fuzzy, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Η υπογραφή έιναι έγκυρη για; (0) "
  
- #: g10/keygen.c:2461 g10/keygen.c:2486
++#: g10/keygen.c:2483 g10/keygen.c:2508
  msgid "invalid value\n"
  msgstr "μη έγκυρη τιμή\n"
  
- #: g10/keygen.c:2468
++#: g10/keygen.c:2490
  #, fuzzy
  msgid "Key does not expire at all\n"
  msgstr "το %s δεν λήγει ποτέ\n"
  
- #: g10/keygen.c:2469
++#: g10/keygen.c:2491
  #, fuzzy
  msgid "Signature does not expire at all\n"
  msgstr "το %s δεν λήγει ποτέ\n"
  
- #: g10/keygen.c:2474
++#: g10/keygen.c:2496
  #, fuzzy, c-format
  msgid "Key expires at %s\n"
  msgstr "το %s λήγει στις %s\n"
  
- #: g10/keygen.c:2475
++#: g10/keygen.c:2497
  #, fuzzy, c-format
  msgid "Signature expires at %s\n"
  msgstr "Υπογραφή λήγει στις %s.\n"
  
- #: g10/keygen.c:2479
++#: g10/keygen.c:2501
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5278,12 -4152,10 +5236,12 @@@ msgstr "
  "Το σύστημα σας δεν μπορεί να απεικονίσει ημερομηνίες πέρα του 2038.\n"
  "Όμως, θα χειρίζονται σωστά έως το 2106.\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2514
  #, fuzzy
  msgid "Is this correct? (y/N) "
  msgstr "Είναι αυτό σωστό (y/n); "
  
- #: g10/keygen.c:2560
++#: g10/keygen.c:2582
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5294,7 -4166,6 +5252,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2575
++#: g10/keygen.c:2597
  #, fuzzy
  msgid ""
  "\n"
@@@ -5311,50 -4182,39 +5269,50 @@@ msgstr "
  "    \"Nikolaoy Nikos (toy Ioanni) <nikoln at athens.gr>\"\n"
  "\n"
  
- #: g10/keygen.c:2594
++#: g10/keygen.c:2616
  msgid "Real name: "
  msgstr "Αληθινό Όνομα: "
  
- #: g10/keygen.c:2603
++#: g10/keygen.c:2625
  msgid "Invalid character in name\n"
  msgstr "Μη έγκυρος χαρακτήρας στο όνομα\n"
  
- #: g10/keygen.c:2604
++#: g10/keygen.c:2626
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2608
++#: g10/keygen.c:2630
  msgid "Name may not start with a digit\n"
  msgstr "Το όνομα δεν επιτρέπεται να ξεκινά με αριθμητικό ψηφίο\n"
  
- #: g10/keygen.c:2611
++#: g10/keygen.c:2633
  msgid "Name must be at least 5 characters long\n"
  msgstr "Το όνομα πρέπει να έχει τουλάχιστον 5 χαρακτήρες\n"
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2643
  msgid "Email address: "
  msgstr "Διεύθυνση Email: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2649
  msgid "Not a valid email address\n"
  msgstr "Μη έγκυρη διεύθυνση Email\n"
  
- #: g10/keygen.c:2636
++#: g10/keygen.c:2658
  msgid "Comment: "
  msgstr "Σχόλιο: "
  
- #: g10/keygen.c:2642
++#: g10/keygen.c:2664
  msgid "Invalid character in comment\n"
  msgstr "Μη έγκυρος χαρακτήρας στο σχόλιο\n"
  
- #: g10/keygen.c:2678
++#: g10/keygen.c:2700
  #, fuzzy, c-format
  #| msgid "You are using the `%s' character set.\n"
  msgid "You are using the '%s' character set.\n"
  msgstr "Χρησιμοποιείτε το `%s' σετ χαρακτήρων.\n"
  
- #: g10/keygen.c:2684
++#: g10/keygen.c:2706
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5365,7 -4225,6 +5323,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2689
++#: g10/keygen.c:2711
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr "Παρακαλώ μην τοποθετείτε την διεύθυνση email στο όνομα ή στο σχόλιο\n"
  
@@@ -5380,35 -4239,28 +5338,35 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2714
++#: g10/keygen.c:2736
  msgid "NnCcEeOoQq"
  msgstr "NnCcEeOoQq"
  
- #: g10/keygen.c:2724
++#: g10/keygen.c:2746
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "Αλλαγή (N)όνομα, (C)σχόλιο, (E)mail ή (Q)τερματισμός; "
  
- #: g10/keygen.c:2725
++#: g10/keygen.c:2747
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr "Αλλαγή (N)όνομα, (C)σχόλιο, (E)mail ή (O)εντάξει/(Q)τερματισμός; "
  
- #: g10/keygen.c:2730
++#: g10/keygen.c:2752
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "Αλλαγή (N)όνομα, (C)σχόλιο, (E)mail ή (Q)τερματισμός; "
  
- #: g10/keygen.c:2731
++#: g10/keygen.c:2753
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "Αλλαγή (N)όνομα, (C)σχόλιο, (E)mail ή (O)εντάξει/(Q)τερματισμός; "
  
- #: g10/keygen.c:2750
++#: g10/keygen.c:2772
  msgid "Please correct the error first\n"
  msgstr "Παρακαλώ, διορθώστε πρώτα το σφάλμα\n"
  
- #: g10/keygen.c:2796
++#: g10/keygen.c:2818
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5420,13 -4272,10 +5378,13 @@@ msgstr "
  "τους δίσκους) κατα τη διάρκεια υπολογισμού πρώτων αριθμών. Αυτό δίνει\n"
  "στη γεννήτρια τυχαίων αριθμών μια ευκαιρία να μαζέψει αρκετή εντροπία.\n"
  
- #: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
- #: g10/keygen.c:4777 g10/keygen.c:4882
++#: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
++#: g10/keygen.c:4330 g10/keygen.c:4803 g10/keygen.c:5064 g10/keygen.c:5169
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Η δημιουργία κλειδιού απέτυχε: %s\n"
  
- #: g10/keygen.c:3598
++#: g10/keygen.c:3922
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5434,66 -4283,53 +5392,66 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3924
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3621
++#: g10/keygen.c:3945
  #, fuzzy, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "`%s' ήδη συμπιέστηκε\n"
  
- #: g10/keygen.c:3626
++#: g10/keygen.c:3950
  #, fuzzy
  msgid "Create anyway? (y/N) "
  msgstr "Χρήση οπωσδήποτε αυτού του κλειδιού; "
  
- #: g10/keygen.c:3632
++#: g10/keygen.c:3956
  #, fuzzy
  msgid "creating anyway\n"
  msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
  
- #: g10/keygen.c:3981
++#: g10/keygen.c:4315
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:4013
++#: g10/keygen.c:4358
  msgid "Key generation canceled.\n"
  msgstr "Η δημιουργία κλειδιού αναβλήθηκε.\n"
  
- #: g10/keygen.c:4073
++#: g10/keygen.c:4418
  #, fuzzy, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "αδυναμία δημιουργίας του `%s': %s\n"
  
- #: g10/keygen.c:4093
++#: g10/keygen.c:4438
  #, fuzzy, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "ΣΗΜΕΙΩΣΗ: το μυστικό κλειδί %08lX έληξε στις %s\n"
  
- #: g10/keygen.c:4244 g10/keygen.c:4393
++#: g10/keygen.c:4589 g10/keygen.c:4738
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
  msgstr "εγγραφή του δημοσίου κλειδιού στο `%s'\n"
  
- #: g10/keygen.c:4387
++#: g10/keygen.c:4732
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "δε βρέθηκε εγγράψιμη δημόσια κλειδοθήκη: %s\n"
  
- #: g10/keygen.c:4401
++#: g10/keygen.c:4746
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error writing public keyring '%s': %s\n"
  msgstr "αδυναμία εγγραφής δημόσιας κλειδοθήκης `%s': %s\n"
  
- #: g10/keygen.c:4433
++#: g10/keygen.c:4778
  msgid "public and secret key created and signed.\n"
  msgstr "το δημόσιο και το μυστικό κλειδί δημιουργήθηκαν και υπογράφηκαν.\n"
  
- #: g10/keygen.c:4445
++#: g10/keygen.c:4790
  #, fuzzy
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
@@@ -5504,7 -4340,6 +5462,7 @@@ msgstr "
  "Μπορείτε να χρησιμοποιήσετε την εντολή \"--edit-key\" για να δημιουργηθεί\n"
  "ένα δευτερεύον κλειδί για αυτό το λόγο.\n"
  
- #: g10/keygen.c:4649 g10/keygen.c:4833
++#: g10/keygen.c:4936 g10/keygen.c:5120
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5512,7 -4347,6 +5470,7 @@@ msgstr "
  "το κλειδί δημιουργήθηκε %lu δευτερόλεπτο στο μέλλον (χρονοδίνη ή\n"
  "απλώς πρόβλημα στο ρολόι)\n"
  
- #: g10/keygen.c:4651 g10/keygen.c:4835
++#: g10/keygen.c:4938 g10/keygen.c:5122
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5520,7 -4354,6 +5478,7 @@@ msgstr "
  "το κλειδί δημιουργήθηκε %lu δευτερόλεπτα στο μέλλον (χρονοδίνη ή\n"
  "απλώς πρόβλημα στο ρολόι)\n"
  
- #: g10/keygen.c:4662 g10/keygen.c:4846
++#: g10/keygen.c:4949 g10/keygen.c:5133
  #, fuzzy
  #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
@@@ -5528,16 -4361,13 +5486,16 @@@ msgstr "
  "ΣΗΜΕΙΩΣΗ: η δημιουργία υποκλειδιών για κλειδιά v3 δεν είναι σύμφωνο\n"
  "με το OpenPGP\n"
  
- #: g10/keygen.c:4674 g10/keygen.c:4676
++#: g10/keygen.c:4961 g10/keygen.c:4963
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Μυστικά τμήματα του κύριου κλειδιού δεν είναι διαθέσιμα.\n"
  
- #: g10/keygen.c:4683 g10/keygen.c:4685
++#: g10/keygen.c:4970 g10/keygen.c:4972
  #, fuzzy
  msgid "Secret parts of primary key are stored on-card.\n"
  msgstr "Μυστικά τμήματα του κύριου κλειδιού δεν είναι διαθέσιμα.\n"
  
- #: g10/keygen.c:4704 g10/keygen.c:4860
++#: g10/keygen.c:4991 g10/keygen.c:5147
  #, fuzzy
  msgid "Really create? (y/N) "
  msgstr "Σίγουρα να δημιουργηθεί; "
@@@ -5864,128 -4629,102 +5822,128 @@@ msgstr "
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
  msgstr "ανεξάρτητη ανάκληση - χρησιμοποιείστε \"gpg --import\" για εφαρμογή\n"
  
- #: g10/mainproc.c:1233 g10/mainproc.c:1276
++#: g10/mainproc.c:1238 g10/mainproc.c:1281
  #, fuzzy
  msgid "no signature found\n"
  msgstr "Καλή υπογραφή από \""
  
- #: g10/mainproc.c:1607
++#: g10/mainproc.c:1612
  #, fuzzy, c-format
  msgid "BAD signature from \"%s\""
  msgstr "ΚΑΚΗ υπογραφή από \""
  
- #: g10/mainproc.c:1609
++#: g10/mainproc.c:1614
  #, fuzzy, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Ληγμένη υπογραφή από \""
  
- #: g10/mainproc.c:1611
++#: g10/mainproc.c:1616
  #, fuzzy, c-format
  msgid "Good signature from \"%s\""
  msgstr "Καλή υπογραφή από \""
  
- #: g10/mainproc.c:1630
++#: g10/mainproc.c:1635
  msgid "signature verification suppressed\n"
  msgstr "καταστολή ανάκλησης υπογραφής\n"
  
- #: g10/mainproc.c:1739
++#: g10/mainproc.c:1744
  #, fuzzy
  msgid "can't handle this ambiguous signature data\n"
  msgstr "αδυναμία χειρισμού αυτών των πολλαπλών υπογραφών\n"
  
- #: g10/mainproc.c:1753 g10/mainproc.c:1761
++#: g10/mainproc.c:1758 g10/mainproc.c:1766
  #, fuzzy, c-format
  msgid "Signature made %s\n"
  msgstr "Υπογραφή έληξε στις %s.\n"
  
- #: g10/mainproc.c:1754 g10/mainproc.c:1762
++#: g10/mainproc.c:1759 g10/mainproc.c:1767
  #, fuzzy, c-format
  msgid "               using %s key %s\n"
  msgstr "                γνωστό σαν \""
  
- #: g10/mainproc.c:1766
++#: g10/mainproc.c:1771
  #, fuzzy, c-format
  msgid "Signature made %s using %s key ID %s\n"
  msgstr "Υπογραφή έγινε στο %.*s με χρήση του κλειδιού%s ID %08lX\n"
  
- #: g10/mainproc.c:1772
++#: g10/mainproc.c:1777
  #, fuzzy, c-format
  msgid "               issuer \"%s\"\n"
  msgstr "                γνωστό σαν \""
  
- #: g10/mainproc.c:1789
++#: g10/mainproc.c:1794
  msgid "Key available at: "
  msgstr "Κλειδί διαθέσιμο στο: "
  
- #: g10/mainproc.c:2024
++#: g10/mainproc.c:2029
  msgid "[uncertain]"
  msgstr "[αβέβαιο]"
  
- #: g10/mainproc.c:2062
++#: g10/mainproc.c:2067
  #, fuzzy, c-format
  msgid "                aka \"%s\""
  msgstr "                γνωστό σαν \""
  
- #: g10/mainproc.c:2145
++#: g10/mainproc.c:2150
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "Υπογραφή έληξε στις %s.\n"
  
- #: g10/mainproc.c:2149
++#: g10/mainproc.c:2154
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "Υπογραφή λήγει στις %s.\n"
  
- #: g10/mainproc.c:2160
++#: g10/mainproc.c:2165
  #, 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:2161
++#: g10/mainproc.c:2166
  msgid "binary"
  msgstr "δυαδικό"
  
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2167
  msgid "textmode"
  msgstr "κατάσταση-κειμένου"
  
- #: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "άγνωστο"
  
- #: g10/mainproc.c:2164
++#: g10/mainproc.c:2169
  #, fuzzy
  #| msgid "unknown pubkey algorithm"
  msgid ", key algorithm "
  msgstr "άγνωστος αλγόριθμος δημοσίου κλειδιού"
  
- #: g10/mainproc.c:2199
++#: g10/mainproc.c:2204
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2229
++#: g10/mainproc.c:2234
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "Αδυναμία ελέγχου της υπογραφής: %s\n"
  
- #: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
++#: g10/mainproc.c:2327 g10/mainproc.c:2346 g10/mainproc.c:2470
  msgid "not a detached signature\n"
  msgstr "δεν είναι αποκομμένη υπογραφή\n"
  
- #: g10/mainproc.c:2375
++#: g10/mainproc.c:2380
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
  msgstr ""
  "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: εντοπισμός πολλαπλών υπογραφών. Μόνο η πρώτη θα ελεγχθεί.\n"
  
- #: g10/mainproc.c:2384
++#: g10/mainproc.c:2389
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "ανεξάρτητη υπογραφή κλάσης 0x%02x\n"
  
- #: g10/mainproc.c:2469
++#: g10/mainproc.c:2474
  msgid "old style (PGP 2.x) signature\n"
  msgstr "υπογραφή παλιού στυλ (PGP 2.x)\n"
  
@@@ -6274,23 -4959,18 +6232,23 @@@ msgstr "Είναι αυτή η φωτο
  msgid "unable to display photo ID!\n"
  msgstr "αδυναμία απεικόνισης του photo ID!\n"
  
- #: g10/pkclist.c:72 g10/revoke.c:757
++#: g10/pkclist.c:72 g10/revoke.c:758
  msgid "No reason specified"
  msgstr "Δεν έχει οριστεί αιτία"
  
- #: g10/pkclist.c:74 g10/revoke.c:759
++#: g10/pkclist.c:74 g10/revoke.c:760
  msgid "Key is superseded"
  msgstr "Το κλειδί έχει παρακαμθεί"
  
- #: g10/pkclist.c:76 g10/revoke.c:758
++#: g10/pkclist.c:76 g10/revoke.c:759
  msgid "Key has been compromised"
  msgstr "Το κλειδί έχει εκτεθεί"
  
- #: g10/pkclist.c:78 g10/revoke.c:760
++#: g10/pkclist.c:78 g10/revoke.c:761
  msgid "Key is no longer used"
  msgstr "Το κλειδί δε χρησιμοποιείται πλέον"
  
- #: g10/pkclist.c:80 g10/revoke.c:761
++#: g10/pkclist.c:80 g10/revoke.c:762
  msgid "User ID is no longer valid"
  msgstr "Το User ID δεν είναι πλέον έγκυρο"
  
@@@ -6371,7 -5038,6 +6329,7 @@@ msgid "
  "\n"
  msgstr ""
  
- #: g10/pkclist.c:310 g10/revoke.c:786
++#: g10/pkclist.c:310 g10/revoke.c:787
  msgid "Your decision? "
  msgstr "Η απόφαση σας; "
  
@@@ -6410,10 -5069,9 +6368,10 @@@ msgstr "Αυτό το κλειδί αν
  msgid "%s: This key is bad!  It has been marked as untrusted!\n"
  msgstr ""
  
 +#: g10/pkclist.c:484
  #, fuzzy
  msgid ""
- "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "This key is bad!  It has been marked as untrusted!  If you\n"
  "*really* know what you are doing, you may answer the next\n"
  "question with yes.\n"
  msgstr ""
@@@ -6575,34 -5203,27 +6533,34 @@@ msgstr "
  msgid "No such user ID.\n"
  msgstr "Δεν υπάρχει αυτό το user ID.\n"
  
- #: g10/pkclist.c:1197 g10/pkclist.c:1273
++#: g10/pkclist.c:1197 g10/pkclist.c:1274
  msgid "skipped: public key already set as default recipient\n"
  msgstr ""
  "παραλείφθηκε: δημόσιο κλειδί έχει ήδη οριστεί σαν εξ ορισμού παραλήπτης\n"
  
- #: g10/pkclist.c:1218
++#: g10/pkclist.c:1219
  msgid "Public key is disabled.\n"
  msgstr "Το δημόσιο κλειδί έχει απενεργοποιηθεί.\n"
  
- #: g10/pkclist.c:1228
++#: g10/pkclist.c:1229
  msgid "skipped: public key already set\n"
  msgstr "παραλείφθηκε: δημόσιο κλειδί έχει ήδη οριστεί\n"
  
- #: g10/pkclist.c:1263
++#: g10/pkclist.c:1264
  #, fuzzy, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "άγνωστος προκαθορισμένος παραλήπτης `%s'\n"
  
- #: g10/pkclist.c:1312
++#: g10/pkclist.c:1313
  msgid "no valid addressees\n"
  msgstr "καμμία έγκυρη διεύθυνση\n"
  
- #: g10/pkclist.c:1665
++#: g10/pkclist.c:1666
  #, fuzzy, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "κλειδί %08lX: δεν υπάρχει αυτό το user ID\n"
  
- #: g10/pkclist.c:1690
++#: g10/pkclist.c:1691
  #, fuzzy, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "κλειδί %08lX: δεν υπάρχει αυτό το user ID\n"
@@@ -6611,29 -5231,23 +6569,29 @@@
  msgid "data not saved; use option \"--output\" to save it\n"
  msgstr "δεδομένα δεν αποθηκεύτηκαν. Αποθήκευση με την επιλογή \"--output\"\n"
  
- #: g10/plaintext.c:598
++#: g10/plaintext.c:614
  msgid "Detached signature.\n"
  msgstr "Αποκομμένη υπογραφή.\n"
  
- #: g10/plaintext.c:606
++#: g10/plaintext.c:622
  msgid "Please enter name of data file: "
  msgstr "Εισάγετε το όνομα αρχείου δεδομένων: "
  
- #: g10/plaintext.c:643
++#: g10/plaintext.c:659
  msgid "reading stdin ...\n"
  msgstr "ανάγνωση της stdin ...\n"
  
- #: g10/plaintext.c:688
++#: g10/plaintext.c:704
  msgid "no signed data\n"
  msgstr "δεν υπάρχουν υπογεγραμμένα δεδομένα\n"
  
- #: g10/plaintext.c:706
++#: g10/plaintext.c:722
  #, fuzzy, c-format
  #| msgid "can't open signed data `%s'\n"
  msgid "can't open signed data '%s'\n"
  msgstr "αδυναμία πρόσβασης υπογεγραμμένων δεδομένων `%s'\n"
  
- #: g10/plaintext.c:741
++#: g10/plaintext.c:757
  #, fuzzy, c-format
  msgid "can't open signed data fd=%d: %s\n"
  msgstr "αδυναμία πρόσβασης υπογεγραμμένων δεδομένων `%s'\n"
@@@ -6702,7 -5302,6 +6660,7 @@@ msgstr "Το μυστικό κλειδ�
  msgid "Create a designated revocation certificate for this key? (y/N) "
  msgstr "Δημιουργία ενός πιστοποιητικού ανάκλησης για αυτό το κλειδί; "
  
- #: g10/revoke.c:336 g10/revoke.c:727
++#: g10/revoke.c:336 g10/revoke.c:728
  msgid "ASCII armored output forced.\n"
  msgstr "Εξαναγκασμός εξόδου σε θωρακισμένο ASCII.\n"
  
@@@ -6738,23 -5331,20 +6696,23 @@@ msgid "
  "the secret key.  However, if the secret key is still accessible,\n"
  "it is better to generate a new revocation certificate and give\n"
  "a reason for the revocation.  For details see the description of\n"
- "of the gpg command \"--gen-revoke\" in the GnuPG manual."
+ "of the gpg command \"--generate-revocation\" in the GnuPG manual."
  msgstr ""
  
- #: g10/revoke.c:575
++#: g10/revoke.c:576
  msgid ""
  "To avoid an accidental use of this file, a colon has been inserted\n"
  "before the 5 dashes below.  Remove this colon with a text editor\n"
  "before importing and publishing this revocation certificate."
  msgstr ""
  
- #: g10/revoke.c:590
++#: g10/revoke.c:591
  #, fuzzy, c-format
  #| msgid "Revocation certificate created.\n"
  msgid "revocation certificate stored as '%s.rev'\n"
  msgstr "Πιστοποιητικό ανάκλησης δημιουργήθηκε.\n"
  
- #: g10/revoke.c:634
++#: g10/revoke.c:635
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found\n"
  msgstr "το μυστικό κλειδί `%s' δε βρέθηκε: %s\n"
@@@ -6762,23 -5352,19 +6720,23 @@@
  #. TRANSLATORS: The %s prints a key specification which
  #. for example has been given at the command line.  Several lines
  #. lines with secret key infos are printed after this message.
- #: g10/revoke.c:661
++#: g10/revoke.c:662
  #, c-format
  msgid "'%s' matches multiple secret keys:\n"
  msgstr ""
  
- #: g10/revoke.c:688
++#: g10/revoke.c:689
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error searching the keyring: %s\n"
  msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
  
- #: g10/revoke.c:711
++#: g10/revoke.c:712
  #, fuzzy
  msgid "Create a revocation certificate for this key? (y/N) "
  msgstr "Δημιουργία ενός πιστοποιητικού ανάκλησης για αυτό το κλειδί; "
  
- #: g10/revoke.c:735
++#: g10/revoke.c:736
  msgid ""
  "Revocation certificate created.\n"
  "\n"
@@@ -6797,33 -5383,26 +6755,33 @@@ msgstr "
  "προσοχή το σύστημα εκτύπωσης στο μηχανημά σας μπορεί να αποθηκεύσει την\n"
  "εκτύπωση και να την κάνει διαθέσιμη σε άλλους!\n"
  
- #: g10/revoke.c:769
++#: g10/revoke.c:770
  msgid "Please select the reason for the revocation:\n"
  msgstr "Παρακαλώ επιλέξτε την αιτία για την ανάκληση:\n"
  
- #: g10/revoke.c:779
++#: g10/revoke.c:780
  msgid "Cancel"
  msgstr "Ακύρωση"
  
- #: g10/revoke.c:781
++#: g10/revoke.c:782
  #, c-format
  msgid "(Probably you want to select %d here)\n"
  msgstr "(Πιθανών να θέλετε να επιλέξετε το %d εδώ)\n"
  
- #: g10/revoke.c:822
++#: g10/revoke.c:823
  msgid "Enter an optional description; end it with an empty line:\n"
  msgstr "Πληκτρολογήστε μια προαιρετική περιγραφή· τέλος με μια άδεια γραμμή:\n"
  
- #: g10/revoke.c:850
++#: g10/revoke.c:851
  #, c-format
  msgid "Reason for revocation: %s\n"
  msgstr "Αιτία για ανάκληση: %s\n"
  
- #: g10/revoke.c:852
++#: g10/revoke.c:853
  msgid "(No description given)\n"
  msgstr "(Δεν δώθηκε περιγραφή)\n"
  
- #: g10/revoke.c:857
++#: g10/revoke.c:858
  #, fuzzy
  msgid "Is this okay? (y/N) "
  msgstr "Είναι αυτό εντάξει; "
@@@ -6964,12 -5523,10 +6922,12 @@@ msgstr "
  "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: αδυναμία στη %%-ανάπτυξη του url πολιτικής (πολυ μεγάλο).\n"
  "               Χρήση μη ανεπτυγμένου.\n"
  
- #: g10/sign.c:329
++#: g10/sign.c:331
  #, fuzzy, c-format
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s υπογραφή από: \"%s\"\n"
  
- #: g10/sign.c:878
++#: g10/sign.c:880
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6977,11 -5534,9 +6935,11 @@@ msgstr "
  "ο εξαναγκασμός του αλγόριθμου περίληψης %s (%d) παραβιάζει τις\n"
  "προεπιλογές του παραλήπτη\n"
  
- #: g10/sign.c:1009
++#: g10/sign.c:1011
  msgid "signing:"
  msgstr "υπογραφή:"
  
- #: g10/sign.c:1286
++#: g10/sign.c:1288
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "%s κρυπτογράφηση θα χρησιμοποιηθεί\n"
@@@ -7008,7 -5559,6 +6966,7 @@@ msgstr "
  "παραλείφθηκε `%s': αυτό είναι δημιουργημένο από PGP κλειδί ElGamal και δεν "
  "είναι ασφαλές για υπογραφές!\n"
  
- #: g10/tdbdump.c:57 g10/trustdb.c:362
++#: g10/tdbdump.c:57 g10/trustdb.c:369
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "εγγραφή trust %lu, τύπος %d: write απέτυχε: %s\n"
@@@ -7056,7 -5598,6 +7014,7 @@@ msgstr "σφάλμα στην εύρε�
  msgid "read error in '%s': %s\n"
  msgstr "σφάλμα ανάγνωσης: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "trustdb: sync απέτυχε: %s\n"
@@@ -7202,298 -5714,306 +7160,372 @@@ msgstr "αδυναμία χειρισμ
  msgid "input line longer than %d characters\n"
  msgstr "γραμμή εισόδου μεγαλύτερη από %d χαρακτήρες\n"
  
- #: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
++#: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
  #, fuzzy, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
  
- #: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
++#: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:357 g10/tofu.c:699
++#: g10/tofu.c:355 g10/tofu.c:888
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:501
++#: g10/tofu.c:505
  #, fuzzy, c-format
  msgid "unsupported TOFU database version: %s\n"
  msgstr ""
  "\n"
  "Υποστηριζόμενοι αλγόριθμοι:\n"
  
- #: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
- #: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
- #: g10/tofu.c:3056
++#: g10/tofu.c:538
+ #, fuzzy, c-format
+ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
+ 
++#: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
+ msgid "TOFU DB error"
+ msgstr ""
+ 
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2340 g10/tofu.c:2359
++#: g10/tofu.c:2372 g10/tofu.c:2384 g10/tofu.c:2399 g10/tofu.c:2411
++#: g10/tofu.c:2980 g10/tofu.c:2997 g10/tofu.c:3033 g10/tofu.c:3050
++#: g10/tofu.c:3353
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
  
- #: g10/tofu.c:566 g10/tofu.c:574
++#: g10/tofu.c:716 g10/tofu.c:724
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error determining TOFU database's version: %s\n"
  msgstr "αδυναμία εγγραφής μυστικής κλειδοθήκης `%s': %s\n"
  
- #: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
++#: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing TOFU database: %s\n"
  msgstr "%s: σφάλμα στην εγγραφή της εγγραφής dir : %s\n"
  
- #: g10/tofu.c:765
++#: g10/tofu.c:844
+ #, fuzzy, c-format
+ msgid "error creating 'encryptions' TOFU table: %s\n"
+ msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
+ 
++#: g10/tofu.c:874
+ #, c-format
+ msgid "adding column effective_policy to bindings DB: %s\n"
+ msgstr ""
+ 
++#: g10/tofu.c:956
  #, fuzzy, c-format
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
- #: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
++#: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
  
- #: g10/tofu.c:1239
++#: g10/tofu.c:1328
  #, c-format
  msgid ""
  "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1247
++#: g10/tofu.c:1337
  #, c-format
- msgid "The email address \"%s\" is associated with %d keys!"
- msgstr ""
+ msgid "The email address \"%s\" is associated with %d key!"
+ msgid_plural "The email address \"%s\" is associated with %d keys!"
+ msgstr[0] ""
+ msgstr[1] ""
  
- #: g10/tofu.c:1251
++#: g10/tofu.c:1343
  msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  
- #: g10/tofu.c:1257
++#: g10/tofu.c:1349
  #, c-format
  msgid ""
  "Please indicate whether this email address should be associated with key %s "
  "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1513
++#: g10/tofu.c:1605
  #, fuzzy, c-format
  msgid "error gathering other user IDs: %s\n"
  msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: g10/tofu.c:1523
++#: g10/tofu.c:1615
  #, fuzzy
  #| msgid "list key and user IDs"
  msgid "This key's user IDs:\n"
  msgstr "απεικόνιση των κλειδιών και των user ID"
  
- #: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
++#: g10/tofu.c:1631 g10/tofu.c:1796
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "policy: %s"
  msgstr "Πολιτική: "
  
- #: g10/tofu.c:1630
++#: g10/tofu.c:1722
  #, fuzzy, c-format
  msgid "error gathering signature stats: %s\n"
  msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: g10/tofu.c:1634
++#: g10/tofu.c:1726
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1651
++#: g10/tofu.c:1744
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1684 g10/tofu.c:1689
++#: g10/tofu.c:1785 g10/tofu.c:1790
  msgid ", "
  msgstr ""
  
- #: g10/tofu.c:1693
++#: g10/tofu.c:1794
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
  msgstr "απεικόνιση της λίστας κλειδιών"
  
- #: g10/tofu.c:1715
++#: g10/tofu.c:1820
+ #, fuzzy, c-format
+ msgid "Verified %d message."
+ msgid_plural "Verified %d messages."
+ msgstr[0] "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
+ msgstr[1] "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
+ 
++#: g10/tofu.c:1824
  #, fuzzy, c-format
- msgid "Verified %d message"
- msgid_plural "Verified %d messages"
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid "Encrypted %d message."
+ msgid_plural "Encrypted %d messages."
+ msgstr[0] "κρυπτογραφημένο με %lu φράσεις κλειδιά\n"
+ msgstr[1] "κρυπτογραφημένο με %lu φράσεις κλειδιά\n"
+ 
++#: g10/tofu.c:1831
+ #, fuzzy, c-format
+ msgid "Verified %d message in the future."
+ msgid_plural "Verified %d messages in the future."
+ msgstr[0] "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
+ msgstr[1] "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
+ 
++#: g10/tofu.c:1835
+ #, fuzzy, c-format
+ msgid "Encrypted %d message in the future."
+ msgid_plural "Encrypted %d messages in the future."
  msgstr[0] "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
  msgstr[1] "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
  
- #: g10/tofu.c:1719
++#: g10/tofu.c:1849
  #, c-format
- msgid "Encrypted %d message"
- msgid_plural "Encrypted %d messages"
+ msgid "Messages verified over the past %d day: %d."
+ msgid_plural "Messages verified over the past %d days: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1734
++#: g10/tofu.c:1855
  #, c-format
- msgid " over the past day."
- msgid_plural " over the past %d days."
+ msgid "Messages encrypted over the past %d day: %d."
+ msgid_plural "Messages encrypted over the past %d days: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1740
++#: g10/tofu.c:1865
  #, c-format
- msgid " over the past month."
- msgid_plural " over the past %d months."
+ msgid "Messages verified over the past %d month: %d."
+ msgid_plural "Messages verified over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1746
++#: g10/tofu.c:1871
  #, c-format
- msgid " over the past year."
- msgid_plural " over the past %d years."
+ msgid "Messages encrypted over the past %d month: %d."
+ msgid_plural "Messages encrypted over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1752
- msgid " in the past."
++#: g10/tofu.c:1881
+ #, c-format
+ msgid "Messages verified over the past %d year: %d."
+ msgid_plural "Messages verified over the past %d years: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1887
+ #, c-format
+ msgid "Messages encrypted over the past %d year: %d."
+ msgid_plural "Messages encrypted over the past %d years: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1895
+ #, c-format
+ msgid "Messages verified in the past: %d."
  msgstr ""
  
++#: g10/tofu.c:1899
+ #, fuzzy, c-format
+ msgid "Messages encrypted in the past: %d."
+ msgstr "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1767
++#: g10/tofu.c:1916
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1809
++#: g10/tofu.c:1958
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1815
++#: g10/tofu.c:1964
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1823
++#: g10/tofu.c:1972
  msgid "Defaulting to unknown."
  msgstr ""
  
- #: g10/tofu.c:1938 g10/tofu.c:2074
++#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
- #: g10/tofu.c:1994
++#: g10/tofu.c:2143
  #, fuzzy, c-format
  msgid "resetting keydb: %s\n"
  msgstr "αδυναμία εγγραφής της κλειδοθήκης `%s': %s\n"
  
- #: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
- #: g10/tofu.c:2425
++#: g10/tofu.c:2601
  #, fuzzy, c-format
- msgid "error setting TOFU binding's trust level to %s\n"
+ msgid "error setting TOFU binding's policy to %s\n"
  msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
- #: g10/tofu.c:2473
++#: g10/tofu.c:2794
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #. TRANSLATORS: The tilde ('~') is used here to indicate a
- #. * non-breakable space
- #: g10/tofu.c:2574
++#: g10/tofu.c:2839
  #, c-format
- msgid "%d~year"
- msgid_plural "%d~years"
+ msgid "%lld~year"
+ msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2583
++#: g10/tofu.c:2844
  #, c-format
- msgid "%d~month"
- msgid_plural "%d~months"
+ msgid "%lld~month"
+ msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2592
++#: g10/tofu.c:2849
  #, c-format
- msgid "%d~day"
- msgid_plural "%d~days"
+ msgid "%lld~week"
+ msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2854
  #, c-format
- msgid "%d~hour"
- msgid_plural "%d~hours"
+ msgid "%lld~day"
+ msgid_plural "%lld~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2610
++#: g10/tofu.c:2859
  #, c-format
- msgid "%d~minute"
- msgid_plural "%d~minutes"
+ msgid "%lld~hour"
+ msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2619
++#: g10/tofu.c:2864
  #, c-format
- msgid "%d~second"
- msgid_plural "%d~seconds"
+ msgid "%lld~minute"
+ msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2802
++#: g10/tofu.c:2866
  #, c-format
- msgid "%s: "
+ msgid "%lld~second"
+ msgid_plural "%lld~seconds"
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:3103
+ #, c-format
+ msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:2806
++#: g10/tofu.c:3109
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
- msgid "Verified %ld signatures"
+ msgid "%s: Verified 0 signatures."
  msgstr "Διαγράφηκαν %d υπογραφές.\n"
  
- #: g10/tofu.c:2816
++#: g10/tofu.c:3117
  #, fuzzy, c-format
- msgid "Verified %ld signature in the past %s"
- msgid_plural "Verified %ld signatures in the past %s"
+ msgid "%s: Verified %ld~signature in the past %s."
+ msgid_plural "%s: Verified %ld~signatures in the past %s."
  msgstr[0] "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
  msgstr[1] "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
  
- #: g10/tofu.c:2826
- #, fuzzy, c-format
++#: g10/tofu.c:3127
+ #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
- msgid ", and encrypted %ld messages"
+ msgid "Encrypted 0 messages."
  msgstr "κρυπτογραφημένο με %lu φράσεις κλειδιά\n"
  
- #: g10/tofu.c:2835
++#: g10/tofu.c:3135
  #, fuzzy, c-format
- msgid ", and encrypted %ld message in the past %s"
- msgid_plural ", and encrypted %ld messages in the past %s"
+ msgid "Encrypted %ld~message in the past %s."
+ msgid_plural "Encrypted %ld~messages in the past %s."
  msgstr[0] "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
  msgstr[1] "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
  
- #: g10/tofu.c:2880
++#: g10/tofu.c:3146
+ #, fuzzy, c-format
+ #| msgid "Policy: "
+ msgid "(policy: %s)"
+ msgstr "Πολιτική: "
+ 
++#: g10/tofu.c:3177
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2883
++#: g10/tofu.c:3180
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2887
++#: g10/tofu.c:3184
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2890
++#: g10/tofu.c:3187
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2919
++#: g10/tofu.c:3216
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7510,18 -6030,14 +7542,18 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
- #: g10/tofu.c:3480 g10/tofu.c:3572
++#: g10/tofu.c:3298 g10/tofu.c:3449 g10/tofu.c:3627 g10/tofu.c:3670
++#: g10/tofu.c:3784 g10/tofu.c:3859 g10/tofu.c:3894
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
  
- #: g10/tofu.c:3185
++#: g10/tofu.c:3482
  #, c-format
- msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
  msgstr ""
  
- #: g10/tofu.c:3515
++#: g10/tofu.c:3819
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7555,74 -6066,59 +7587,74 @@@ msgstr "
  msgid "key %s marked as ultimately trusted\n"
  msgstr "σημείωση κλειδιού σαν απόλυτης εμπιστοσύνης.\n"
  
- #: g10/trustdb.c:341
++#: g10/trustdb.c:348
  #, c-format
  msgid "trust record %lu, req type %d: read failed: %s\n"
  msgstr "εγγραφή trust %lu, req τύπος %d: read απέτυχε: %s\n"
  
- #: g10/trustdb.c:347
++#: g10/trustdb.c:354
  #, c-format
  msgid "trust record %lu is not of requested type %d\n"
  msgstr "η εγγραφή trust %lu δεν είναι του ζητούμενου τύπου %d\n"
  
- #: g10/trustdb.c:422
++#: g10/trustdb.c:429
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr ""
  
- #: g10/trustdb.c:431
++#: g10/trustdb.c:438
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:468
++#: g10/trustdb.c:475
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:474
++#: g10/trustdb.c:481
  #, c-format
  msgid "using %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:511
++#: g10/trustdb.c:518
  msgid "no need for a trustdb check\n"
  msgstr "δεν υπάρχει ανάγκη για έλεγχο της trustdb\n"
  
- #: g10/trustdb.c:517 g10/trustdb.c:2160
++#: g10/trustdb.c:524 g10/trustdb.c:2187
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "επόμενος έλεγχος της trustdb θα γίνει στις %s\n"
  
- #: g10/trustdb.c:526
++#: g10/trustdb.c:533
  #, fuzzy, c-format
  msgid "no need for a trustdb check with '%s' trust model\n"
  msgstr "δεν υπάρχει ανάγκη για έλεγχο της trustdb\n"
  
- #: g10/trustdb.c:542
++#: g10/trustdb.c:549
  #, fuzzy, c-format
  msgid "no need for a trustdb update with '%s' trust model\n"
  msgstr "δεν υπάρχει ανάγκη για έλεγχο της trustdb\n"
  
- #: g10/trustdb.c:749 g10/trustdb.c:1313
++#: g10/trustdb.c:756 g10/trustdb.c:1340
  #, fuzzy, c-format
  msgid "public key %s not found: %s\n"
  msgstr "το δημόσιο κλειδί %08lX δεν βρέθηκε: %s\n"
  
- #: g10/trustdb.c:966
++#: g10/trustdb.c:973
  msgid "please do a --check-trustdb\n"
  msgstr "παρακαλώ κάντε ένα --check-trustdb\n"
  
- #: g10/trustdb.c:971
++#: g10/trustdb.c:978
  msgid "checking the trustdb\n"
  msgstr "έλεγχος της trustdb\n"
  
- #: g10/trustdb.c:1883
++#: g10/trustdb.c:1910
  #, fuzzy, c-format
  msgid "%d key processed"
  msgid_plural "%d keys processed"
  msgstr[0] "%lu κλειδιά έχουν μέχρι τώρα επεξεργαστεί\n"
  msgstr[1] "%lu κλειδιά έχουν μέχρι τώρα επεξεργαστεί\n"
  
- #: g10/trustdb.c:1886
++#: g10/trustdb.c:1913
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7630,23 -6126,19 +7662,23 @@@ msgid_plural " (%d validity counts clea
  msgstr[0] "%d κλειδιά επεξεργάστηκαν (%d μετρήσεις εγγυρότητας πέρασαν)\n"
  msgstr[1] "%d κλειδιά επεξεργάστηκαν (%d μετρήσεις εγγυρότητας πέρασαν)\n"
  
- #: g10/trustdb.c:1956
++#: g10/trustdb.c:1983
  msgid "no ultimately trusted keys found\n"
  msgstr "δε βρέθηκαν απόλυτα εμπιστεύσιμα κλειδιά\n"
  
- #: g10/trustdb.c:1970
++#: g10/trustdb.c:1997
  #, fuzzy, c-format
  msgid "public key of ultimately trusted key %s not found\n"
  msgstr ""
  "δε βρέθηκε το δημόσιο κλειδί του απόλυτα εμπιστεύσιμου κλειδιού %08lX\n"
  
- #: g10/trustdb.c:2087
++#: g10/trustdb.c:2114
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr ""
  
- #: g10/trustdb.c:2167
++#: g10/trustdb.c:2194
  #, fuzzy, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr "εγγραφή trust %lu, τύπος %d: write απέτυχε: %s\n"
@@@ -7760,19 -6231,14 +7792,19 @@@ msgid "
  "List, export, import Keybox data\n"
  msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3208
++#: scd/app-nks.c:718 scd/app-openpgp.c:3221
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3220
++#: scd/app-nks.c:726 scd/app-openpgp.c:3233
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
- #: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
- #: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1965 scd/app-openpgp.c:1984
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2166 scd/app-openpgp.c:2430
++#: scd/app-openpgp.c:2477 scd/app-openpgp.c:2582 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr ""
@@@ -7821,84 -6278,66 +7853,84 @@@ msgid "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2511 scd/app-dinsig.c:532
  #, fuzzy, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: scd/app-openpgp.c:806
++#: scd/app-openpgp.c:801
  #, fuzzy, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
  
- #: scd/app-openpgp.c:819
++#: scd/app-openpgp.c:814
  #, fuzzy, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "αποτυχία επαναδόμησης της cache κλειδοθήκης: %s\n"
  
- #: scd/app-openpgp.c:1236
++#: scd/app-openpgp.c:1247
  msgid "response does not contain the RSA modulus\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1243
++#: scd/app-openpgp.c:1254
  msgid "response does not contain the RSA public exponent\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1353
++#: scd/app-openpgp.c:1364
  #, fuzzy
  #| msgid "remove keys from the public keyring"
  msgid "response does not contain the EC public key\n"
  msgstr "αφαίρεση των κλειδιών από τη δημόσια κλειδοθήκη"
  
- #: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:1464 scd/app-openpgp.c:3825
  msgid "response does not contain the public key data\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1551
++#: scd/app-openpgp.c:1564
  #, fuzzy, c-format
  msgid "reading public key failed: %s\n"
  msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
  
- #: scd/app-openpgp.c:1903
++#: scd/app-openpgp.c:1916
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1910
++#: scd/app-openpgp.c:1923
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1925
++#: scd/app-openpgp.c:1938
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr ""
  
- #: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
++#: scd/app-openpgp.c:1949 scd/app-openpgp.c:2424
  #, fuzzy
  msgid "||Please enter the PIN"
  msgstr "αλλαγή της φράσης κλειδί"
  
- #: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2173 scd/app-openpgp.c:2437
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
- #: scd/app-openpgp.c:4114
++#: scd/app-openpgp.c:2004 scd/app-openpgp.c:2043 scd/app-openpgp.c:2185
++#: scd/app-openpgp.c:4126
  #, fuzzy, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "keyserver αποστολή απέτυχε: %s\n"
  
- #: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
++#: scd/app-openpgp.c:2072 scd/app-openpgp.c:2458 scd/app-openpgp.c:4556
  msgid "error retrieving CHV status from card\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
++#: scd/app-openpgp.c:2078 scd/app-openpgp.c:4565
  msgid "card is permanently locked!\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2072
++#: scd/app-openpgp.c:2085
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7908,26 -6347,21 +7940,26 @@@ msgstr[1] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:2082
++#: scd/app-openpgp.c:2095
  #, fuzzy, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "αλλαγή της φράσης κλειδί"
  
- #: scd/app-openpgp.c:2086
++#: scd/app-openpgp.c:2099
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
  msgstr "αλλαγή της φράσης κλειδί"
  
- #: scd/app-openpgp.c:2107
++#: scd/app-openpgp.c:2120
  msgid "access to admin commands is not configured\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2460
++#: scd/app-openpgp.c:2473
  #, fuzzy
  msgid "||Please enter the Reset Code for the card"
  msgstr "Παρακαλώ επιλέξτε την αιτία για την ανάκληση:\n"
  
- #: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
++#: scd/app-openpgp.c:2483 scd/app-openpgp.c:2537
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr ""
@@@ -7935,117 -6369,93 +7967,117 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2493
++#: scd/app-openpgp.c:2506
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|AN|New Admin PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|N|New PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2565
++#: scd/app-openpgp.c:2578
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "αλλαγή της φράσης κλειδί"
  
- #: scd/app-openpgp.c:2566
++#: scd/app-openpgp.c:2579
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
  msgstr "αλλαγή της φράσης κλειδί"
  
- #: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
++#: scd/app-openpgp.c:2635 scd/app-openpgp.c:3885
  #, fuzzy
  msgid "error reading application data\n"
  msgstr "σφάλμα κατά την ανάγνωση του μπλοκ κλειδιών: %s\n"
  
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
++#: scd/app-openpgp.c:2641 scd/app-openpgp.c:3892
  #, fuzzy
  msgid "error reading fingerprint DO\n"
  msgstr "%s: σφάλμα στην ανάγνωση της εγγραφής free : %s\n"
  
- #: scd/app-openpgp.c:2638
++#: scd/app-openpgp.c:2651
  #, fuzzy
  msgid "key already exists\n"
  msgstr "`%s' ήδη συμπιέστηκε\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2655
  msgid "existing key will be replaced\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2644
++#: scd/app-openpgp.c:2657
  #, fuzzy
  msgid "generating new key\n"
  msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2659
  #, fuzzy
  msgid "writing new key\n"
  msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
  
- #: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
++#: scd/app-openpgp.c:3201 scd/app-openpgp.c:3553
  msgid "creation timestamp missing\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
++#: scd/app-openpgp.c:3243 scd/app-openpgp.c:3251
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
++#: scd/app-openpgp.c:3384 scd/app-openpgp.c:3647
  #, fuzzy, c-format
  msgid "failed to store the key: %s\n"
  msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
  
- #: scd/app-openpgp.c:3534
++#: scd/app-openpgp.c:3547
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "μη υποστηριζόμενο URI"
  
- #: scd/app-openpgp.c:3790
++#: scd/app-openpgp.c:3802
  msgid "please wait while key is being generated ...\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3798
++#: scd/app-openpgp.c:3810
  #, fuzzy
  msgid "generating key failed\n"
  msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
  
- #: scd/app-openpgp.c:3804
++#: scd/app-openpgp.c:3816
  #, fuzzy, c-format
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
  msgstr[0] "Η δημιουργία κλειδιού απέτυχε: %s\n"
  msgstr[1] "Η δημιουργία κλειδιού απέτυχε: %s\n"
  
- #: scd/app-openpgp.c:3838
++#: scd/app-openpgp.c:3850
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:3900
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4004
++#: scd/app-openpgp.c:4016
  #, fuzzy, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "%s υπογραφή, αλγόριθμος περίληψης %s\n"
  
- #: scd/app-openpgp.c:4089
++#: scd/app-openpgp.c:4101
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4551
++#: scd/app-openpgp.c:4570
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
++#: scd/app-openpgp.c:4871 scd/app-openpgp.c:4882
  #, fuzzy, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "δε βρέθηκαν έγκυρα OpenPGP δεδομένα.\n"
@@@ -8066,7 -6473,6 +8098,7 @@@ msgstr "
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
@@@ -8111,27 -6508,22 +8143,27 @@@ msgstr "συγκρουόμενες εν
  msgid "use variable length input for pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:287
++#: scd/scdaemon.c:286
  #, fuzzy
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
  
- #: scd/scdaemon.c:289
++#: scd/scdaemon.c:288
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
  msgstr ""
  
- #: scd/scdaemon.c:786
++#: scd/scdaemon.c:784
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1904
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
++#: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1909
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
@@@ -8211,9 -6587,6 +8243,9 @@@ msgstr "σφάλμα στη δημιο�
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
  
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
 +#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  #, fuzzy
  msgid "failed to allocate keyDB handle\n"
  msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
@@@ -8709,11 -6980,9 +8741,11 @@@ msgstr "
  msgid "resource problem: out of core\n"
  msgstr ""
  
- #: sm/decrypt.c:330
++#: sm/decrypt.c:332
  msgid "(this is the RC2 algorithm)\n"
  msgstr ""
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:334
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr ""
  
@@@ -8757,124 -7018,96 +8789,124 @@@ msgstr "απεικόνιση της λ�
  msgid "list certificate chain"
  msgstr "κακό πιστοποιητικό"
  
- #: sm/gpgsm.c:218
++#: sm/gpgsm.c:219
  #, fuzzy
  msgid "import certificates"
  msgstr "κακό πιστοποιητικό"
  
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
  #, fuzzy
  msgid "export certificates"
  msgstr "κακό πιστοποιητικό"
  
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:228
  msgid "register a smartcard"
  msgstr ""
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:231
  msgid "pass a command to the dirmngr"
  msgstr ""
  
- #: sm/gpgsm.c:232
++#: sm/gpgsm.c:233
  msgid "invoke gpg-protect-tool"
  msgstr ""
  
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:250
  #, fuzzy
  msgid "create base-64 encoded output"
  msgstr "δημιουργία ascii θωρακισμένης εξόδου"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in PEM format"
  msgstr ""
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in base-64 format"
  msgstr ""
  
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:262
  msgid "assume input is in binary format"
  msgstr ""
  
- #: sm/gpgsm.c:267
++#: sm/gpgsm.c:269
  msgid "never consult a CRL"
  msgstr ""
  
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:279
  msgid "check validity using OCSP"
  msgstr ""
  
- #: sm/gpgsm.c:282
++#: sm/gpgsm.c:284
  msgid "|N|number of certificates to include"
  msgstr ""
  
- #: sm/gpgsm.c:285
++#: sm/gpgsm.c:287
  msgid "|FILE|take policy information from FILE"
  msgstr ""
  
- #: sm/gpgsm.c:288
++#: sm/gpgsm.c:290
  msgid "do not check certificate policies"
  msgstr ""
  
- #: sm/gpgsm.c:292
++#: sm/gpgsm.c:294
  msgid "fetch missing issuer certificates"
  msgstr ""
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "don't use the terminal at all"
  msgstr "μη χρήση τερματικού"
  
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:307
  msgid "|FILE|write a server mode log to FILE"
  msgstr ""
  
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:312
  #, fuzzy
  msgid "|FILE|write an audit log to FILE"
  msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "batch mode: never ask"
  msgstr "κατάσταση batch: να μη γίνονται ερωτήσεις"
  
- #: sm/gpgsm.c:314
++#: sm/gpgsm.c:316
  msgid "assume yes on most questions"
  msgstr "απάντηση ναι στις περισσότερες ερωτήσεις"
  
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:317
  msgid "assume no on most questions"
  msgstr "απάντηση όχι στις περισσότερες ερωτήσεις"
  
- #: sm/gpgsm.c:318
++#: sm/gpgsm.c:320
  #, fuzzy
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "προσθήκη αυτού του κλειδιού στη λίστα των κλειδοθηκών"
  
- #: sm/gpgsm.c:321
++#: sm/gpgsm.c:323
  #, fuzzy
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|ΟΝΟΜΑ|χρήση ΟΝΟΜΑτος σαν προκαθορισμένο μυστικό κλειδί"
  
- #: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
  #, fuzzy
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|ΔΙΑΚΟΜΙΣΤΗΣ|χρήση αυτού του διακομιστή κλειδιών για αναζήτηση"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|ΟΝΟΜΑ|χρήση αλγόριθμου κρυπτογράφησης ΟΝΟΜΑ"
  
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:352
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|ΟΝΟΜΑ|χρήση αλγόριθμου περίληψης μηνύματος ΟΝΟΜΑ "
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:559
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
  msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
  
- #: sm/gpgsm.c:570
++#: sm/gpgsm.c:562
  #, fuzzy
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
@@@ -8885,47 -7118,38 +8917,47 @@@ msgstr "
  "υπογραφή, έλεγχος, κρυπτογράφηση ή αποκρυπτογράφηση\n"
  "η προκαθορισμένη λειτουργία εξαρτάται από τα δεδομένα εισόδου\n"
  
- #: sm/gpgsm.c:774
++#: sm/gpgsm.c:766
  #, fuzzy, c-format
  msgid "Note: won't be able to encrypt to '%s': %s\n"
  msgstr "αδυναμία σύνδεσης στο `%s': %s\n"
  
- #: sm/gpgsm.c:785
++#: sm/gpgsm.c:777
  #, fuzzy, c-format
  msgid "unknown validation model '%s'\n"
  msgstr "άγνωστος προκαθορισμένος παραλήπτης `%s'\n"
  
- #: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
  #, fuzzy, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "(Δεν δώθηκε περιγραφή)\n"
  
- #: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr ""
  
- #: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
  #, fuzzy, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr " s = παράλειψη αυτού του κλειδιού\n"
  
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1427
  #, fuzzy
  msgid "could not parse keyserver\n"
  msgstr "αδυναμία επεξεργασίας του URI του διακομιση κλειδιών\n"
  
- #: sm/gpgsm.c:1636
++#: sm/gpgsm.c:1630
  #, fuzzy, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "εγγραφή στο  `%s'\n"
  
- #: sm/gpgsm.c:1677
++#: sm/gpgsm.c:1671
  #, fuzzy, c-format
  msgid "can't sign using '%s': %s\n"
  msgstr "αδυναμία κλεισίματος του `%s': %s\n"
  
- #: sm/gpgsm.c:2033
++#: sm/gpgsm.c:2028
  msgid "invalid command (there is no implicit command)\n"
  msgstr ""
  
@@@ -9689,8 -7762,6 +9721,8 @@@ msgstr "
  msgid "CRL access not possible due to disabled %s\n"
  msgstr ""
  
 +#: dirmngr/crlfetch.c:223 dirmngr/ldap-wrapper-ce.c:488
- #: dirmngr/ldap-wrapper.c:742 dirmngr/misc.c:563
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:563
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
@@@ -9875,116 -7910,88 +9907,116 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:160
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:158
++#: dirmngr/dirmngr.c:161
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
  
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:162
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:163
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:164
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
- #: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
++#: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:177
++#: dirmngr/dirmngr.c:180
  #, fuzzy
  msgid "run without asking a user"
  msgstr "Τερματισμός χωρίς αποθήκευση; "
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:181
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:182
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:184
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:185
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:186
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:188
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:192
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:202
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
  
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:210
  #, fuzzy
  msgid "|URL|use OCSP responder at URL"
  msgstr "αδυναμία επεξεργασίας του URI του διακομιση κλειδιών\n"
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:212
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:218
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:220
++#: dirmngr/dirmngr.c:223
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:225
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:240
++#: dirmngr/dirmngr.c:246
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -9997,91 -8004,72 +10029,91 @@@ msgstr "
  "@\n"
  "(δείτε τη σελίδα man για μια πλήρη λίστα εντολών και επιλογών)\n"
  
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:361
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
  
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:363
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:443
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
- #: tools/gpgconf.c:648
++#: dirmngr/dirmngr.c:496 tools/gpgconf.c:550 tools/gpgconf.c:585
++#: tools/gpgconf.c:656
  #, fuzzy, c-format
  msgid "usage: %s [options] "
  msgstr "χρήση: gpg [επιλογές] "
  
- #: dirmngr/dirmngr.c:1062
++#: dirmngr/dirmngr.c:1074
  #, fuzzy
  #| msgid "%s not allowed with %s!\n"
  msgid "colons are not allowed in the socket name\n"
  msgstr "το %s δεν επιτρέπεται με το %s!\n"
  
- #: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
++#: dirmngr/dirmngr.c:1300 dirmngr/server.c:1585
  #, fuzzy, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "θωράκιση απέτυχε: %s\n"
  
- #: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
++#: dirmngr/dirmngr.c:1306 dirmngr/server.c:1591
  #, fuzzy, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "θωράκιση απέτυχε: %s\n"
  
- #: dirmngr/dirmngr.c:1484
++#: dirmngr/dirmngr.c:1487
  #, fuzzy, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "η γραμμή είναι πολύ μεγάλη\n"
  
- #: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
++#: dirmngr/dirmngr.c:1542 dirmngr/dirmngr.c:1626
  #, fuzzy, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
++#: dirmngr/dirmngr.c:1578 dirmngr/dirmngr.c:1604 tools/gpgconf-comp.c:4032
  #, fuzzy, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "σφάλμα ανάγνωσης: %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1633
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1700
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1734
++#: dirmngr/dirmngr.c:1738
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1739
++#: dirmngr/dirmngr.c:1743
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1745
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1746
++#: dirmngr/dirmngr.c:1750
  #, fuzzy
  msgid "shutdown forced\n"
  msgstr "μη επεξεργασμένο"
  
- #: dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1758
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1761
++#: dirmngr/dirmngr.c:1765
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10563,33 -8452,27 +10595,33 @@@ msgstr "διαγραφή block κλει
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2463
++#: dirmngr/server.c:2469
  #, fuzzy, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "αδυναμία δημιουργίας του `%s': %s\n"
  
- #: dirmngr/server.c:2474
++#: dirmngr/server.c:2480
  #, fuzzy, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "%s: αδυναμία δημιουργίας hashtable: %s\n"
  
- #: dirmngr/server.c:2495
++#: dirmngr/server.c:2501
  #, 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:2503
++#: dirmngr/server.c:2509
  #, fuzzy, c-format
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "αποτυχία επαναδόμησης της cache κλειδοθήκης: %s\n"
  
- #: dirmngr/server.c:2534
++#: dirmngr/server.c:2540
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2553
++#: dirmngr/server.c:2559
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
@@@ -10637,7 -8511,6 +10669,7 @@@ msgstr "ο DSA απαιτεί τη χρ
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:167
  #, fuzzy
  msgid "quiet"
  msgstr "τερματισμός"
@@@ -10730,22 -8583,15 +10762,22 @@@ msgstr "η υπογραφή απέτυ�
  msgid "error sending standard options: %s\n"
  msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
  
 +#: tools/gpgconf-comp.c:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
- #: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
++#: tools/gpgconf-comp.c:766 tools/gpgconf-comp.c:865
  msgid "Options controlling the diagnostic output"
  msgstr ""
  
 +#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
- #: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
++#: tools/gpgconf-comp.c:779 tools/gpgconf-comp.c:888
  msgid "Options controlling the configuration"
  msgstr ""
  
- #: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
- #: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
++#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:723
++#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:901
  msgid "Options useful for debugging"
  msgstr ""
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
  msgid "Options controlling the security"
  msgstr ""
  
@@@ -10795,11 -8630,9 +10827,11 @@@ msgstr "σφάλμα στη δημιο�
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
++#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
  msgid "|NAME|use NAME as default secret key"
  msgstr "|ΟΝΟΜΑ|χρήση ΟΝΟΜΑτος σαν προκαθορισμένο μυστικό κλειδί"
  
- #: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
++#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:784
  #, fuzzy
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|ΟΝΟΜΑ|κρυπτογράφηση για ΟΝΟΜΑ"
@@@ -10808,194 -8640,161 +10840,208 @@@
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
++#: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
  msgid "Configuration for Keyservers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
++#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
  #, fuzzy
  msgid "|URL|use keyserver at URL"
  msgstr "αδυναμία επεξεργασίας του URI του διακομιση κλειδιών\n"
  
- #: tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:741
  msgid "allow PKA lookups (DNS requests)"
  msgstr ""
  
- #: tools/gpgconf-comp.c:738
++#: tools/gpgconf-comp.c:744
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr ""
  
- #: tools/gpgconf-comp.c:787
++#: tools/gpgconf-comp.c:793
  msgid "disable all access to the dirmngr"
  msgstr ""
  
- #: tools/gpgconf-comp.c:790
++#: tools/gpgconf-comp.c:796
  #, fuzzy
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
  msgstr "|ΟΝΟΜΑ|χρήση αλγόριθμου κρυπτογράφησης ΟΝΟΜΑ για φράσεις κλειδιά"
  
- #: tools/gpgconf-comp.c:820
++#: tools/gpgconf-comp.c:829
  msgid "do not check CRLs for root certificates"
  msgstr ""
  
- #: tools/gpgconf-comp.c:869
++#: tools/gpgconf-comp.c:878
  msgid "Options controlling the format of the output"
  msgstr ""
  
- #: tools/gpgconf-comp.c:905
++#: tools/gpgconf-comp.c:920
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:918
++#: tools/gpgconf-comp.c:933
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:947
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:958
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:948
++#: tools/gpgconf-comp.c:963
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:977
++#: tools/gpgconf-comp.c:992
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:985
++#: tools/gpgconf-comp.c:1000
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1066
++#: tools/gpgconf-comp.c:1081
  msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1067
++#: tools/gpgconf-comp.c:1082
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1083
  msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1069
++#: tools/gpgconf-comp.c:1084
  msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1070
++#: tools/gpgconf-comp.c:1085
  #, fuzzy
  #| msgid "network error"
  msgid "Network"
  msgstr "σφάλμα δικτύου"
  
- #: tools/gpgconf-comp.c:1071
++#: tools/gpgconf-comp.c:1086
  #, fuzzy
  msgid "Passphrase Entry"
  msgstr "κακή φράση κλειδί"
  
- #: tools/gpgconf-comp.c:1225
++#: tools/gpgconf-comp.c:1240
  #, fuzzy
  msgid "Component not suitable for launching"
  msgstr "δεν βρέθηκε το δημόσιο κλειδί"
  
- #: tools/gpgconf-comp.c:3283
++#: tools/gpgconf-comp.c:3311
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3434
++#: tools/gpgconf-comp.c:3462
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf-comp.c:4036
+ #, fuzzy, c-format
+ msgid "error closing '%s'\n"
+ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
+ 
++#: tools/gpgconf-comp.c:4038
+ #, fuzzy, c-format
+ msgid "error parsing '%s'\n"
+ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
+ 
++#: tools/gpgconf.c:73
  msgid "list all components"
  msgstr ""
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "check all programs"
  msgstr ""
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|list options"
  msgstr ""
  
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
  msgid "|COMPONENT|change options"
  msgstr ""
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "|COMPONENT|check options"
  msgstr ""
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "apply global default values"
  msgstr ""
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
+ msgid "|FILE|update configuration files using FILE"
+ msgstr ""
+ 
++#: tools/gpgconf.c:83
  msgid "get the configuration directories for @GPGCONF@"
  msgstr ""
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:85
  #, fuzzy
  msgid "list global configuration file"
  msgstr "άγνωστο αντικείμενο ρυθμίσεως \"%s\"\n"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  #, fuzzy
  msgid "check global configuration file"
  msgstr "άγνωστο αντικείμενο ρυθμίσεως \"%s\"\n"
  
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:89
  #, fuzzy
  #| msgid "update the trust database"
  msgid "query the software version database"
  msgstr "ανανέωση της βάσης δεδομένων εμπιστοσύνης"
  
- #: tools/gpgconf.c:86
++#: tools/gpgconf.c:90
  msgid "reload all or a given component"
  msgstr ""
  
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:91
  msgid "launch a given component"
  msgstr ""
  
- #: tools/gpgconf.c:88
++#: tools/gpgconf.c:92
  msgid "kill a given component"
  msgstr ""
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "use as output file"
  msgstr "χρήση ως αρχείου εξόδου"
  
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:102
  msgid "activate changes at runtime, if possible"
  msgstr ""
  
- #: tools/gpgconf.c:122
++#: tools/gpgconf.c:127
  #, fuzzy
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
  
- #: tools/gpgconf.c:125
++#: tools/gpgconf.c:130
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
  msgstr ""
  
- #: tools/gpgconf.c:545 tools/gpgconf.c:579
++#: tools/gpgconf.c:552 tools/gpgconf.c:587
  msgid "Need one component argument"
  msgstr ""
  
- #: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
++#: tools/gpgconf.c:561 tools/gpgconf.c:599 tools/gpgconf.c:632
  #, fuzzy
  msgid "Component not found"
  msgstr "δεν βρέθηκε το δημόσιο κλειδί"
  
- #: tools/gpgconf.c:650
++#: tools/gpgconf.c:658
  #, fuzzy
  msgid "No argument allowed"
  msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
diff --cc po/en at boldquot.po
index 8ba3f78,0000000..b4cf8a2
mode 100644,000000..100644
--- a/po/en at boldquot.po
+++ b/po/en at boldquot.po
@@@ -1,10637 -1,0 +1,10671 @@@
 +# English translations for GNU gnupg package.
 +# Copyright (C) 2016 Free Software Foundation, Inc.
 +# This file is distributed under the same license as the GNU gnupg package.
 +# Automatically generated, 2016.
 +#
 +# All this catalog "translates" are quotation characters.
 +# The msgids must be ASCII and therefore cannot contain real quotation
 +# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
 +# and double quote (0x22). These substitutes look strange; see
 +# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
 +#
 +# This catalog translates grave accent (0x60) and apostrophe (0x27) to
 +# left single quotation mark (U+2018) and right single quotation mark (U+2019).
 +# It also translates pairs of apostrophe (0x27) to
 +# left single quotation mark (U+2018) and right single quotation mark (U+2019)
 +# and pairs of quotation mark (0x22) to
 +# left double quotation mark (U+201C) and right double quotation mark (U+201D).
 +#
 +# When output to an UTF-8 terminal, the quotation characters appear perfectly.
 +# When output to an ISO-8859-1 terminal, the single quotation marks are
 +# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
 +# grave/acute accent (by libiconv), and the double quotation marks are
 +# transliterated to 0x22.
 +# When output to an ASCII terminal, the single quotation marks are
 +# transliterated to apostrophes, and the double quotation marks are
 +# transliterated to 0x22.
 +#
 +# This catalog furthermore displays the text between the quotation marks in
 +# bold face, assuming the VT100/XTerm escape sequences.
 +#
 +msgid ""
 +msgstr ""
- "Project-Id-Version: GNU gnupg 2.1.16\n"
++"Project-Id-Version: GNU gnupg 2.1.17\n"
 +"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-11-18 16:54+0100\n"
- "PO-Revision-Date: 2016-11-18 16:54+0100\n"
++"POT-Creation-Date: 2016-12-20 11:28+0100\n"
++"PO-Revision-Date: 2016-12-20 11:28+0100\n"
 +"Last-Translator: Automatically generated\n"
 +"Language-Team: none\n"
 +"Language: en\n"
 +"MIME-Version: 1.0\n"
 +"Content-Type: text/plain; charset=UTF-8\n"
 +"Content-Transfer-Encoding: 8bit\n"
 +"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 +
 +#: agent/call-pinentry.c:259
 +#, c-format
 +msgid "failed to acquire the pinentry lock: %s\n"
 +msgstr "failed to acquire the pinentry lock: %s\n"
 +
 +#. TRANSLATORS: These are labels for buttons etc used in
 +#. Pinentries.  An underscore indicates that the next letter
 +#. should be used as an accelerator.  Double the underscore for
 +#. a literal one.  The actual to be translated text starts after
 +#. the second vertical bar.  Note that gpg-agent has been set to
 +#. utf-8 so that the strings are in the expected encoding.
 +#: agent/call-pinentry.c:462
 +msgid "|pinentry-label|_OK"
 +msgstr "|pinentry-label|_OK"
 +
 +#: agent/call-pinentry.c:463
 +msgid "|pinentry-label|_Cancel"
 +msgstr "|pinentry-label|_Cancel"
 +
 +#: agent/call-pinentry.c:464
 +msgid "|pinentry-label|_Yes"
 +msgstr "|pinentry-label|_Yes"
 +
 +#: agent/call-pinentry.c:465
 +msgid "|pinentry-label|_No"
 +msgstr "|pinentry-label|_No"
 +
 +#: agent/call-pinentry.c:466
 +msgid "|pinentry-label|PIN:"
 +msgstr "|pinentry-label|PIN:"
 +
 +#: agent/call-pinentry.c:467
 +msgid "|pinentry-label|_Save in password manager"
 +msgstr "|pinentry-label|_Save in password manager"
 +
 +#: agent/call-pinentry.c:468
 +msgid "Do you really want to make your passphrase visible on the screen?"
 +msgstr "Do you really want to make your passphrase visible on the screen?"
 +
 +#: agent/call-pinentry.c:470
 +msgid "|pinentry-tt|Make passphrase visible"
 +msgstr "|pinentry-tt|Make passphrase visible"
 +
 +#: agent/call-pinentry.c:471
 +msgid "|pinentry-tt|Hide passphrase"
 +msgstr "|pinentry-tt|Hide passphrase"
 +
 +#. TRANSLATORS: This string is displayed by Pinentry as the label
 +#. for the quality bar.
 +#: agent/call-pinentry.c:772
 +msgid "Quality:"
 +msgstr "Quality:"
 +
 +#. TRANSLATORS: This string is a tooltip, shown by pinentry when
 +#. hovering over the quality bar.  Please use an appropriate
 +#. string to describe what this is about.  The length of the
 +#. tooltip is limited to about 900 characters.  If you do not
 +#. translate this entry, a default english text (see source)
 +#. will be used.
 +#: agent/call-pinentry.c:793
 +msgid "pinentry.qualitybar.tooltip"
 +msgstr "pinentry.qualitybar.tooltip"
 +
 +#: agent/call-pinentry.c:902
 +msgid ""
 +"Please enter your PIN, so that the secret key can be unlocked for this "
 +"session"
 +msgstr ""
 +"Please enter your PIN, so that the secret key can be unlocked for this "
 +"session"
 +
 +#: agent/call-pinentry.c:905
 +msgid ""
 +"Please enter your passphrase, so that the secret key can be unlocked for "
 +"this session"
 +msgstr ""
 +"Please enter your passphrase, so that the secret key can be unlocked for "
 +"this session"
 +
 +#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
 +msgid "PIN:"
 +msgstr "PIN:"
 +
 +#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
 +msgid "Passphrase:"
 +msgstr "Passphrase:"
 +
 +#: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
 +msgid "does not match - try again"
 +msgstr "does not match - try again"
 +
 +#. TRANSLATORS: The string is appended to an error message in
 +#. the pinentry.  The %s is the actual error message, the
 +#. two %d give the current and maximum number of tries.
 +#: agent/call-pinentry.c:989
 +#, c-format
 +msgid "SETERROR %s (try %d of %d)"
 +msgstr "SETERROR %s (try %d of %d)"
 +
 +#: agent/call-pinentry.c:1000
 +msgid "Repeat:"
 +msgstr "Repeat:"
 +
 +#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
 +msgid "PIN too long"
 +msgstr "PIN too long"
 +
 +#: agent/call-pinentry.c:1030
 +msgid "Passphrase too long"
 +msgstr "Passphrase too long"
 +
 +#: agent/call-pinentry.c:1038
 +msgid "Invalid characters in PIN"
 +msgstr "Invalid characters in PIN"
 +
 +#: agent/call-pinentry.c:1043
 +msgid "PIN too short"
 +msgstr "PIN too short"
 +
 +#: agent/call-pinentry.c:1056
 +msgid "Bad PIN"
 +msgstr "Bad PIN"
 +
 +#: agent/call-pinentry.c:1056
 +msgid "Bad Passphrase"
 +msgstr "Bad Passphrase"
 +
 +#: agent/command-ssh.c:635 agent/command-ssh.c:730
 +#, 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:838 common/dotlock.c:839 g10/card-util.c:839
- #: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1306 g10/keygen.c:4577
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
++#: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
 +#, c-format
 +msgid "can't create '%s': %s\n"
 +msgstr "can't create '%s': %s\n"
 +
 +#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
- #: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1307
++#: g10/import.c:305 g10/import.c:448 g10/import.c:621 g10/keygen.c:3681
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
- #: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
- #: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:825 g10/sign.c:1025
++#: g10/sign.c:1130 g10/sign.c:1275 g10/tdbdump.c:143 g10/tdbdump.c:151
++#: g10/tdbio.c:720 g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161
++#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
++#: dirmngr/certcache.c:368 dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1564
 +#, c-format
 +msgid "can't open '%s': %s\n"
 +msgstr "can't open '%s': %s\n"
 +
 +#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
 +#, c-format
 +msgid "error getting serial number of card: %s\n"
 +msgstr "error getting serial number of card: %s\n"
 +
 +#: agent/command-ssh.c:2419
 +#, c-format
 +msgid "detected card with S/N: %s\n"
 +msgstr "detected card with S/N: %s\n"
 +
 +#: agent/command-ssh.c:2424
 +#, 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:2444
 +#, c-format
 +msgid "no suitable card key found: %s\n"
 +msgstr "no suitable card key found: %s\n"
 +
 +#: agent/command-ssh.c:2709
 +#, c-format
 +msgid ""
 +"An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 +"allow this?"
 +msgstr ""
 +"An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 +"allow this?"
 +
 +#: agent/command-ssh.c:2716
 +msgid "Allow"
 +msgstr "Allow"
 +
 +#: agent/command-ssh.c:2716
 +msgid "Deny"
 +msgstr "Deny"
 +
 +#: agent/command-ssh.c:2725
 +#, 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:2964 agent/genkey.c:351
 +msgid "Please re-enter this passphrase"
 +msgstr "Please re-enter this passphrase"
 +
 +#: agent/command-ssh.c:2991
 +#, c-format
 +msgid ""
 +"Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 +"%s%%0Awithin gpg-agent's key storage"
 +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:3511
 +#, c-format
 +msgid "failed to create stream from socket: %s\n"
 +msgstr "failed to create stream from socket: %s\n"
 +
- #: agent/divert-scd.c:92 g10/call-agent.c:1100
++#: agent/divert-scd.c:92 g10/call-agent.c:1101
 +msgid "Please insert the card with serial number"
 +msgstr "Please insert the card with serial number"
 +
- #: agent/divert-scd.c:93 g10/call-agent.c:1101
++#: agent/divert-scd.c:93 g10/call-agent.c:1102
 +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:204
 +msgid "Admin PIN"
 +msgstr "Admin PIN"
 +
 +#. TRANSLATORS: A PUK is the Personal Unblocking Code
 +#. used to unblock a PIN.
 +#: agent/divert-scd.c:209
 +msgid "PUK"
 +msgstr "PUK"
 +
 +#: agent/divert-scd.c:216
 +msgid "Reset Code"
 +msgstr "Reset Code"
 +
 +#: agent/divert-scd.c:242
 +#, c-format
 +msgid "%s%%0A%%0AUse the reader's pinpad for input."
 +msgstr "%s%%0A%%0AUse the reader's pinpad for input."
 +
 +#: agent/divert-scd.c:291
 +msgid "Repeat this Reset Code"
 +msgstr "Repeat this Reset Code"
 +
 +#: agent/divert-scd.c:293
 +msgid "Repeat this PUK"
 +msgstr "Repeat this PUK"
 +
 +#: agent/divert-scd.c:294
 +msgid "Repeat this PIN"
 +msgstr "Repeat this PIN"
 +
 +#: agent/divert-scd.c:299
 +msgid "Reset Code not correctly repeated; try again"
 +msgstr "Reset Code not correctly repeated; try again"
 +
 +#: agent/divert-scd.c:301
 +msgid "PUK not correctly repeated; try again"
 +msgstr "PUK not correctly repeated; try again"
 +
 +#: agent/divert-scd.c:302
 +msgid "PIN not correctly repeated; try again"
 +msgstr "PIN not correctly repeated; try again"
 +
 +#: agent/divert-scd.c:314
 +#, 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:110 sm/certreqgen-ui.c:394
 +#, c-format
 +msgid "error creating temporary file: %s\n"
 +msgstr "error creating temporary file: %s\n"
 +
 +#: agent/genkey.c:117
 +#, c-format
 +msgid "error writing to temporary file: %s\n"
 +msgstr "error writing to temporary file: %s\n"
 +
 +#: agent/genkey.c:158 agent/genkey.c:164
 +msgid "Enter new passphrase"
 +msgstr "Enter new passphrase"
 +
 +#: agent/genkey.c:172
 +msgid "Take this one anyway"
 +msgstr "Take this one anyway"
 +
 +#: agent/genkey.c:202
 +#, 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:204
 +#, 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 ""
 +"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:216
 +msgid "Yes, protection is not needed"
 +msgstr "Yes, protection is not needed"
 +
 +#: agent/genkey.c:233
 +#, 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:252
 +#, 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] ""
 +"A passphrase should contain at least %u digit or%%0Aspecial character."
 +msgstr[1] ""
 +"A passphrase should contain at least %u digits or%%0Aspecial characters."
 +
 +#: agent/genkey.c:278
 +#, 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:293
 +msgid "Warning: You have entered an insecure passphrase."
 +msgstr "Warning: You have entered an insecure passphrase."
 +
 +#: agent/genkey.c:480
 +#, 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:606
 +msgid "Please enter the new passphrase"
 +msgstr "Please enter the new passphrase"
 +
 +#: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
 +#: tools/gpg-check-pattern.c:69
 +msgid ""
 +"@Options:\n"
 +" "
 +msgstr ""
 +"@Options:\n"
 +" "
 +
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
 +msgid "run in daemon mode (background)"
 +msgstr "run in daemon mode (background)"
 +
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
 +msgid "run in server mode (foreground)"
 +msgstr "run in server mode (foreground)"
 +
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
 +msgid "run in supervised mode"
 +msgstr "run in supervised mode"
 +
- #: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:170 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:166
 +msgid "verbose"
 +msgstr "verbose"
 +
 +#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
 +#: dirmngr/dirmngr_ldap.c:136
 +msgid "be somewhat more quiet"
 +msgstr "be somewhat more quiet"
 +
- #: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
 +msgid "sh-style command output"
 +msgstr "sh-style command output"
 +
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
 +msgid "csh-style command output"
 +msgstr "csh-style command output"
 +
- #: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
- #: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
++#: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
 +msgid "|FILE|read options from FILE"
 +msgstr "|FILE|read options from FILE"
 +
- #: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:177
 +msgid "do not detach from the console"
 +msgstr "do not detach from the console"
 +
 +#: agent/gpg-agent.c:170
 +msgid "do not grab keyboard and mouse"
 +msgstr "do not grab keyboard and mouse"
 +
 +#: agent/gpg-agent.c:171 tools/symcryptrun.c:168
 +msgid "use a log file for the server"
 +msgstr "use a log file for the server"
 +
 +#: agent/gpg-agent.c:173
 +msgid "|PGM|use PGM as the PIN-Entry program"
 +msgstr "|PGM|use PGM as the PIN-Entry program"
 +
 +#: agent/gpg-agent.c:178
 +msgid "|PGM|use PGM as the SCdaemon program"
 +msgstr "|PGM|use PGM as the SCdaemon program"
 +
 +#: agent/gpg-agent.c:180
 +msgid "do not use the SCdaemon"
 +msgstr "do not use the SCdaemon"
 +
 +#: agent/gpg-agent.c:184
 +msgid "|NAME|accept some commands via NAME"
 +msgstr "|NAME|accept some commands via NAME"
 +
 +#: agent/gpg-agent.c:200
 +msgid "ignore requests to change the TTY"
 +msgstr "ignore requests to change the TTY"
 +
 +#: agent/gpg-agent.c:202
 +msgid "ignore requests to change the X display"
 +msgstr "ignore requests to change the X display"
 +
 +#: agent/gpg-agent.c:205
 +msgid "|N|expire cached PINs after N seconds"
 +msgstr "|N|expire cached PINs after N seconds"
 +
 +#: agent/gpg-agent.c:219
 +msgid "do not use the PIN cache when signing"
 +msgstr "do not use the PIN cache when signing"
 +
 +#: agent/gpg-agent.c:221
 +msgid "disallow the use of an external password cache"
 +msgstr "disallow the use of an external password cache"
 +
 +#: agent/gpg-agent.c:223
 +msgid "disallow clients to mark keys as \"trusted\""
 +msgstr "disallow clients to mark keys as “trusted”"
 +
 +#: agent/gpg-agent.c:226
 +msgid "allow presetting passphrase"
 +msgstr "allow presetting passphrase"
 +
 +#: agent/gpg-agent.c:228
 +msgid "disallow caller to override the pinentry"
 +msgstr "disallow caller to override the pinentry"
 +
 +#: agent/gpg-agent.c:231
 +msgid "allow passphrase to be prompted through Emacs"
 +msgstr "allow passphrase to be prompted through Emacs"
 +
 +#: agent/gpg-agent.c:233
 +msgid "enable ssh support"
 +msgstr "enable ssh support"
 +
 +#: agent/gpg-agent.c:236
 +msgid "enable putty support"
 +msgstr "enable putty support"
 +
 +#. 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:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:481 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1025 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:358
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:124 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
 +msgid "Please report bugs to <@EMAIL@>.\n"
 +msgstr "Please report bugs to <@EMAIL@>.\n"
 +
- #: agent/gpg-agent.c:491
++#: agent/gpg-agent.c:490
 +msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 +msgstr "Usage: @GPG_AGENT@ [options] (-h for help)"
 +
- #: agent/gpg-agent.c:493
++#: agent/gpg-agent.c:492
 +msgid ""
 +"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 +"Secret key management for @GNUPG@\n"
 +msgstr ""
 +"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 +"Secret key management for @GNUPG@\n"
 +
- #: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:537 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:442
 +#, c-format
 +msgid "invalid debug-level '%s' given\n"
 +msgstr "invalid debug-level ‘%s’ given\n"
 +
- #: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:793
++#: agent/gpg-agent.c:1082 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:812
 +#, c-format
 +msgid "Note: no default option file '%s'\n"
 +msgstr "Note: no default option file ‘%s’\n"
 +
- #: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
- #: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1093 agent/gpg-agent.c:1935 g10/gpg.c:2510
++#: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:817
++#: dirmngr/dirmngr.c:1670 tools/symcryptrun.c:932
 +#, c-format
 +msgid "option file '%s': %s\n"
 +msgstr "option file '%s': %s\n"
 +
- #: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:806
++#: agent/gpg-agent.c:1101 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:825
 +#, c-format
 +msgid "reading options from '%s'\n"
 +msgstr "reading options from ‘%s’\n"
 +
- #: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
- #: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
++#: agent/gpg-agent.c:1223 g10/gpg.c:3643 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:936 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:527
 +#, c-format
 +msgid "Note: '%s' is not considered an option\n"
 +msgstr "Note: ‘%s’ is not considered an option\n"
 +
- #: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
++#: agent/gpg-agent.c:2080 scd/scdaemon.c:1073 dirmngr/dirmngr.c:1081
 +#, c-format
 +msgid "can't create socket: %s\n"
 +msgstr "can't create socket: %s\n"
 +
- #: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
++#: agent/gpg-agent.c:2097 scd/scdaemon.c:1086 dirmngr/dirmngr.c:1094
 +#, c-format
 +msgid "socket name '%s' is too long\n"
 +msgstr "socket name ‘%s’ is too long\n"
 +
- #: agent/gpg-agent.c:2134
++#: agent/gpg-agent.c:2135
 +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:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
++#: agent/gpg-agent.c:2145 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1126
 +msgid "error getting nonce for the socket\n"
 +msgstr "error getting nonce for the socket\n"
 +
- #: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
++#: agent/gpg-agent.c:2150 scd/scdaemon.c:1113 dirmngr/dirmngr.c:1129
 +#, c-format
 +msgid "error binding socket to '%s': %s\n"
 +msgstr "error binding socket to '%s': %s\n"
 +
- #: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
- #: dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2160 agent/gpg-agent.c:2197 scd/scdaemon.c:1121
++#: dirmngr/dirmngr.c:1138
 +#, c-format
 +msgid "can't set permissions of '%s': %s\n"
 +msgstr "can't set permissions of '%s': %s\n"
 +
- #: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:2165 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1143
 +#, c-format
 +msgid "listen() failed: %s\n"
 +msgstr "listen() failed: %s\n"
 +
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
++#: agent/gpg-agent.c:2172 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1149
 +#, c-format
 +msgid "listening on socket '%s'\n"
 +msgstr "listening on socket ‘%s’\n"
 +
- #: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: agent/gpg-agent.c:2191 agent/gpg-agent.c:2234 g10/exec.c:199
 +#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
 +#, c-format
 +msgid "can't create directory '%s': %s\n"
 +msgstr "can't create directory '%s': %s\n"
 +
- #: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: agent/gpg-agent.c:2194 agent/gpg-agent.c:2239 g10/openfile.c:491
 +#: g10/openfile.c:520 sm/keydb.c:103
 +#, c-format
 +msgid "directory '%s' created\n"
 +msgstr "directory ‘%s’ created\n"
 +
- #: agent/gpg-agent.c:2244
++#: agent/gpg-agent.c:2245
 +#, c-format
 +msgid "stat() failed for '%s': %s\n"
 +msgstr "stat() failed for '%s': %s\n"
 +
- #: agent/gpg-agent.c:2248
++#: agent/gpg-agent.c:2249
 +#, c-format
 +msgid "can't use '%s' as home directory\n"
 +msgstr "can't use ‘%s’ as home directory\n"
 +
- #: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
++#: agent/gpg-agent.c:2392 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1871
 +#, c-format
 +msgid "error reading nonce on fd %d: %s\n"
 +msgstr "error reading nonce on fd %d: %s\n"
 +
- #: agent/gpg-agent.c:2598
++#: agent/gpg-agent.c:2599
 +#, c-format
 +msgid "handler 0x%lx for fd %d started\n"
 +msgstr "handler 0x%lx for fd %d started\n"
 +
- #: agent/gpg-agent.c:2603
++#: agent/gpg-agent.c:2604
 +#, c-format
 +msgid "handler 0x%lx for fd %d terminated\n"
 +msgstr "handler 0x%lx for fd %d terminated\n"
 +
- #: agent/gpg-agent.c:2678
++#: agent/gpg-agent.c:2679
 +#, 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:2683
++#: agent/gpg-agent.c:2684
 +#, 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:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
++#: agent/gpg-agent.c:2881 scd/scdaemon.c:1272 dirmngr/dirmngr.c:2075
 +#, c-format
 +msgid "npth_pselect failed: %s - waiting 1s\n"
 +msgstr "npth_pselect failed: %s - waiting 1s\n"
 +
- #: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2954 scd/scdaemon.c:1321
 +#, c-format
 +msgid "%s %s stopped\n"
 +msgstr "%s %s stopped\n"
 +
- #: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
++#: agent/gpg-agent.c:3092 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
 +msgid "no gpg-agent running in this session\n"
 +msgstr "no gpg-agent running in this session\n"
 +
 +#: agent/preset-passphrase.c:99
 +msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 +msgstr "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 +
 +#: agent/preset-passphrase.c:102
 +msgid ""
 +"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 +"Password cache maintenance\n"
 +msgstr ""
 +"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 +"Password cache maintenance\n"
 +
- #: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
++#: agent/protect-tool.c:106 g10/gpg.c:424 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:153 tools/gpgconf.c:71
 +msgid ""
 +"@Commands:\n"
 +" "
 +msgstr ""
 +"@Commands:\n"
 +" "
 +
- #: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
- #: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:92 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:168 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:96 tools/symcryptrun.c:159
 +msgid ""
 +"@\n"
 +"Options:\n"
 +" "
 +msgstr ""
 +"@\n"
 +"Options:\n"
 +" "
 +
 +#: agent/protect-tool.c:154
 +msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 +msgstr "Usage: gpg-protect-tool [options] (-h for help)\n"
 +
 +#: agent/protect-tool.c:156
 +msgid ""
 +"Syntax: gpg-protect-tool [options] [args]\n"
 +"Secret key maintenance tool\n"
 +msgstr ""
 +"Syntax: gpg-protect-tool [options] [args]\n"
 +"Secret key maintenance tool\n"
 +
 +#: agent/protect-tool.c:693
 +msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 +msgstr "Please enter the passphrase to unprotect the PKCS#12 object."
 +
 +#: agent/protect-tool.c:698
 +msgid "Please enter the passphrase to protect the new PKCS#12 object."
 +msgstr "Please enter the passphrase to protect the new PKCS#12 object."
 +
 +#: agent/protect-tool.c:704
 +msgid ""
 +"Please enter the passphrase to protect the imported object within the GnuPG "
 +"system."
 +msgstr ""
 +"Please enter the passphrase to protect the imported object within the GnuPG "
 +"system."
 +
 +#: agent/protect-tool.c:709
 +msgid ""
 +"Please enter the passphrase or the PIN\n"
 +"needed to complete this operation."
 +msgstr ""
 +"Please enter the passphrase or the PIN\n"
 +"needed to complete this operation."
 +
 +#: agent/protect-tool.c:720 tools/symcryptrun.c:450
 +msgid "cancelled\n"
 +msgstr "cancelled\n"
 +
 +#: agent/protect-tool.c:722 tools/symcryptrun.c:446
 +#, c-format
 +msgid "error while asking for the passphrase: %s\n"
 +msgstr "error while asking for the passphrase: %s\n"
 +
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
- #: tools/gpgconf.c:323
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1472
++#: tools/gpgconf.c:328
 +#, 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
 +#, c-format
 +msgid "file '%s', line %d: %s\n"
 +msgstr "file '%s', line %d: %s\n"
 +
 +#: agent/trustlist.c:192 agent/trustlist.c:200
 +#, c-format
 +msgid "statement \"%s\" ignored in '%s', line %d\n"
 +msgstr "statement “%s” ignored in '%s', line %d\n"
 +
 +#: agent/trustlist.c:206
 +#, c-format
 +msgid "system trustlist '%s' not available\n"
 +msgstr "system trustlist ‘%s’ not available\n"
 +
 +#: agent/trustlist.c:250
 +#, c-format
 +msgid "bad fingerprint in '%s', line %d\n"
 +msgstr "bad fingerprint in '%s', line %d\n"
 +
 +#: agent/trustlist.c:275 agent/trustlist.c:282
 +#, c-format
 +msgid "invalid keyflag in '%s', line %d\n"
 +msgstr "invalid keyflag in '%s', line %d\n"
 +
 +#: agent/trustlist.c:316 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:434 agent/trustlist.c:503
 +msgid "error reading list of trusted root certificates\n"
 +msgstr "error reading list of trusted root certificates\n"
 +
 +#. TRANSLATORS: This prompt is shown by the Pinentry
 +#. and has one special property: A "%%0A" is used by
 +#. Pinentry to insert a line break.  The double
 +#. percent sign is actually needed because it is also
 +#. a printf format string.  If you need to insert a
 +#. plain % sign, you need to encode it as "%%25".  The
 +#. "%s" gets replaced by the name as stored in the
 +#. certificate.
 +#: agent/trustlist.c:664
 +#, c-format
 +msgid ""
 +"Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 +"certificates?"
 +msgstr ""
 +"Do you ultimately trust%%0A  “%s”%%0Ato correctly certify user "
 +"certificates?"
 +
 +#: agent/trustlist.c:673 common/audit.c:467
 +msgid "Yes"
 +msgstr "Yes"
 +
 +#: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
 +#: common/audit.c:469
 +msgid "No"
 +msgstr "No"
 +
 +#. TRANSLATORS: This prompt is shown by the Pinentry and has
 +#. one special property: A "%%0A" is used by Pinentry to
 +#. insert a line break.  The double percent sign is actually
 +#. needed because it is also a printf format string.  If you
 +#. need to insert a plain % sign, you need to encode it as
 +#. "%%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:707
 +#, c-format
 +msgid ""
 +"Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
 +"fingerprint:%%0A  %s"
 +msgstr ""
 +"Please verify that the certificate identified as:%%0A  “%s”%%0Ahas the "
 +"fingerprint:%%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:721
 +msgid "Correct"
 +msgstr "Correct"
 +
 +#: agent/trustlist.c:721
 +msgid "Wrong"
 +msgstr "Wrong"
 +
 +#: agent/findkey.c:261
 +#, 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:277
 +#, c-format
 +msgid ""
 +"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 +"it now."
 +msgstr ""
 +"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 +"it now."
 +
 +#: agent/findkey.c:291 agent/findkey.c:298
 +msgid "Change passphrase"
 +msgstr "Change passphrase"
 +
 +#: agent/findkey.c:299
 +msgid "I'll change it later"
 +msgstr "I'll change it later"
 +
 +#: agent/findkey.c:1438
 +#, c-format
 +msgid ""
 +"Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 +"%%0A?"
 +msgstr ""
 +"Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 +"%%0A?"
 +
 +#: agent/findkey.c:1462 agent/findkey.c:1476
 +msgid "Delete key"
 +msgstr "Delete key"
 +
 +#: agent/findkey.c:1473
 +msgid ""
 +"Warning: This key is also listed for use with SSH!\n"
 +"Deleting the key might remove your ability to access remote machines."
 +msgstr ""
 +"Warning: This key is also listed for use with SSH!\n"
 +"Deleting the key might remove your ability to access remote machines."
 +
 +#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
 +msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 +msgstr "DSA requires the hash length to be a multiple of 8 bits\n"
 +
 +#: agent/pksign.c:187 sm/certcheck.c:97
 +#, c-format
 +msgid "%s key uses an unsafe (%u bit) hash\n"
 +msgstr "%s key uses an unsafe (%u bit) hash\n"
 +
 +#: agent/pksign.c:202
 +#, c-format
 +msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 +msgstr "a %zu bit hash is not valid for a %u bit %s key\n"
 +
 +#: agent/pksign.c:508
 +#, c-format
 +msgid "checking created signature failed: %s\n"
 +msgstr "checking created signature failed: %s\n"
 +
 +#: agent/cvt-openpgp.c:338
 +msgid "secret key parts are not available\n"
 +msgstr "secret key parts are not available\n"
 +
 +#: agent/cvt-openpgp.c:344
 +#, c-format
 +msgid "public key algorithm %d (%s) is not supported\n"
 +msgstr "public key algorithm %d (%s) is not supported\n"
 +
 +#: agent/cvt-openpgp.c:448
 +#, c-format
 +msgid "protection algorithm %d (%s) is not supported\n"
 +msgstr "protection algorithm %d (%s) is not supported\n"
 +
 +#: agent/cvt-openpgp.c:455
 +#, c-format
 +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:438
 +#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
- #: dirmngr/ldap-wrapper.c:710
++#: dirmngr/ldap-wrapper.c:711
 +#, 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:344
 +#: common/exechelp-w32.c:448 common/exechelp-w32.c:472
 +#: common/exechelp-w32.c:502
 +#, 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:848 dirmngr/dirmngr.c:1155
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1167
 +#, c-format
 +msgid "error forking process: %s\n"
 +msgstr "error forking process: %s\n"
 +
 +#: common/exechelp-posix.c:669 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:792
 +#, 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:799
 +#: common/exechelp-w32.c:785 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:807
 +#, c-format
 +msgid "error running '%s': terminated\n"
 +msgstr "error running '%s': terminated\n"
 +
 +#: common/exechelp-posix.c:750 common/exechelp-w32.c:766
 +#, c-format
 +msgid "waiting for processes to terminate failed: %s\n"
 +msgstr "waiting for processes to terminate failed: %s\n"
 +
 +#: common/exechelp-w32.c:778 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"
 +
 +#: common/simple-pwquery.c:260
 +#, c-format
 +msgid "can't connect to '%s': %s\n"
 +msgstr "can't connect to '%s': %s\n"
 +
 +#: common/simple-pwquery.c:270
 +msgid "problem setting the gpg-agent options\n"
 +msgstr "problem setting the gpg-agent options\n"
 +
- #: common/sysutils.c:144
++#: common/sysutils.c:148
 +#, c-format
 +msgid "can't disable core dumps: %s\n"
 +msgstr "can't disable core dumps: %s\n"
 +
- #: common/sysutils.c:239
++#: common/sysutils.c:250
 +#, c-format
 +msgid "Warning: unsafe ownership on %s \"%s\"\n"
 +msgstr "Warning: unsafe ownership on %s “%s”\n"
 +
- #: common/sysutils.c:271
++#: common/sysutils.c:282
 +#, c-format
 +msgid "Warning: unsafe permissions on %s \"%s\"\n"
 +msgstr "Warning: unsafe permissions on %s “%s”\n"
 +
- #: common/sysutils.c:659
++#: common/sysutils.c:693
 +#, c-format
 +msgid "waiting for file '%s' to become accessible ...\n"
 +msgstr "waiting for file ‘%s’ to become accessible ...\n"
 +
- #: common/sysutils.c:685
++#: common/sysutils.c:719
 +#, c-format
 +msgid "renaming '%s' to '%s' failed: %s\n"
 +msgstr "renaming ‘%s’ to ‘%s’ failed: %s\n"
 +
 +#. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:45 common/yesno.c:82
 +msgid "yes"
 +msgstr "yes"
 +
 +#: common/yesno.c:46 common/yesno.c:87
 +msgid "yY"
 +msgstr "yY"
 +
 +#. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:48 common/yesno.c:84
 +msgid "no"
 +msgstr "no"
 +
 +#: common/yesno.c:49 common/yesno.c:88
 +msgid "nN"
 +msgstr "nN"
 +
 +#. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:86
 +msgid "quit"
 +msgstr "quit"
 +
 +#: common/yesno.c:89
 +msgid "qQ"
 +msgstr "qQ"
 +
 +#. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:123
 +msgid "okay|okay"
 +msgstr "okay|okay"
 +
 +#. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:125
 +msgid "cancel|cancel"
 +msgstr "cancel|cancel"
 +
 +#: common/yesno.c:126
 +msgid "oO"
 +msgstr "oO"
 +
 +#: common/yesno.c:127
 +msgid "cC"
 +msgstr "cC"
 +
 +#: common/miscellaneous.c:86
 +#, c-format
 +msgid "out of core in secure memory while allocating %lu bytes"
 +msgstr "out of core in secure memory while allocating %lu bytes"
 +
 +#: common/miscellaneous.c:89
 +#, c-format
 +msgid "out of core while allocating %lu bytes"
 +msgstr "out of core while allocating %lu bytes"
 +
 +#: common/miscellaneous.c:115 g10/card-util.c:800 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
 +#, 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
 +#, 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:554
++#: common/miscellaneous.c:556
 +#, c-format
 +msgid "unknown debug flag '%s' ignored\n"
 +msgstr "unknown debug flag ‘%s’ ignored\n"
 +
 +#: common/asshelp.c:380
 +#, c-format
 +msgid "no running gpg-agent - starting '%s'\n"
 +msgstr "no running gpg-agent - starting ‘%s’\n"
 +
 +#: common/asshelp.c:440
 +#, c-format
 +msgid "waiting for the agent to come up ... (%ds)\n"
 +msgstr "waiting for the agent to come up ... (%ds)\n"
 +
 +#: common/asshelp.c:448
 +msgid "connection to agent established\n"
 +msgstr "connection to agent established\n"
 +
 +#: common/asshelp.c:488
 +msgid "connection to agent is in restricted mode\n"
 +msgstr "connection to agent is in restricted mode\n"
 +
 +#: common/asshelp.c:545
 +#, c-format
 +msgid "no running Dirmngr - starting '%s'\n"
 +msgstr "no running Dirmngr - starting ‘%s’\n"
 +
 +#: common/asshelp.c:593
 +#, c-format
 +msgid "waiting for the dirmngr to come up ... (%ds)\n"
 +msgstr "waiting for the dirmngr to come up ... (%ds)\n"
 +
 +#: common/asshelp.c:602
 +msgid "connection to the dirmngr established\n"
 +msgstr "connection to the dirmngr established\n"
 +
 +#. TRANSLATORS: Copy the prefix between the vertical bars
 +#. verbatim.  It will not be printed.
 +#: common/audit.c:474
 +msgid "|audit-log-result|Good"
 +msgstr "|audit-log-result|Good"
 +
 +#: common/audit.c:477
 +msgid "|audit-log-result|Bad"
 +msgstr "|audit-log-result|Bad"
 +
 +#: common/audit.c:479
 +msgid "|audit-log-result|Not supported"
 +msgstr "|audit-log-result|Not supported"
 +
 +#: common/audit.c:481
 +msgid "|audit-log-result|No certificate"
 +msgstr "|audit-log-result|No certificate"
 +
 +#: common/audit.c:483
 +msgid "|audit-log-result|Not enabled"
 +msgstr "|audit-log-result|Not enabled"
 +
 +#: common/audit.c:485
 +msgid "|audit-log-result|Error"
 +msgstr "|audit-log-result|Error"
 +
 +#: common/audit.c:487
 +msgid "|audit-log-result|Not used"
 +msgstr "|audit-log-result|Not used"
 +
 +#: common/audit.c:489
 +msgid "|audit-log-result|Okay"
 +msgstr "|audit-log-result|Okay"
 +
 +#: common/audit.c:491
 +msgid "|audit-log-result|Skipped"
 +msgstr "|audit-log-result|Skipped"
 +
 +#: common/audit.c:493
 +msgid "|audit-log-result|Some"
 +msgstr "|audit-log-result|Some"
 +
 +#: common/audit.c:726
 +msgid "Certificate chain available"
 +msgstr "Certificate chain available"
 +
 +#: common/audit.c:733
 +msgid "root certificate missing"
 +msgstr "root certificate missing"
 +
 +#: common/audit.c:759
 +msgid "Data encryption succeeded"
 +msgstr "Data encryption succeeded"
 +
 +#: common/audit.c:764 common/audit.c:830 common/audit.c:906 common/audit.c:997
 +msgid "Data available"
 +msgstr "Data available"
 +
 +#: common/audit.c:767
 +msgid "Session key created"
 +msgstr "Session key created"
 +
 +#: common/audit.c:772 common/audit.c:912 common/audit.c:919
 +#, c-format
 +msgid "algorithm: %s"
 +msgstr "algorithm: %s"
 +
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3098
++#: scd/app-openpgp.c:3111
 +#, c-format
 +msgid "unsupported algorithm: %s"
 +msgstr "unsupported algorithm: %s"
 +
 +#: common/audit.c:778 common/audit.c:925
 +msgid "seems to be not encrypted"
 +msgstr "seems to be not encrypted"
 +
 +#: common/audit.c:784 common/audit.c:933
 +msgid "Number of recipients"
 +msgstr "Number of recipients"
 +
 +#: common/audit.c:792 common/audit.c:956
 +#, c-format
 +msgid "Recipient %d"
 +msgstr "Recipient %d"
 +
 +#: common/audit.c:825
 +msgid "Data signing succeeded"
 +msgstr "Data signing succeeded"
 +
 +#: common/audit.c:839 common/audit.c:1033 common/audit.c:1060
 +#, c-format
 +msgid "data hash algorithm: %s"
 +msgstr "data hash algorithm: %s"
 +
 +#: common/audit.c:862
 +#, c-format
 +msgid "Signer %d"
 +msgstr "Signer %d"
 +
 +#: common/audit.c:866 common/audit.c:1065
 +#, c-format
 +msgid "attr hash algorithm: %s"
 +msgstr "attr hash algorithm: %s"
 +
 +#: common/audit.c:901
 +msgid "Data decryption succeeded"
 +msgstr "Data decryption succeeded"
 +
 +#: common/audit.c:910
 +msgid "Encryption algorithm supported"
 +msgstr "Encryption algorithm supported"
 +
 +#: common/audit.c:993
 +msgid "Data verification succeeded"
 +msgstr "Data verification succeeded"
 +
 +#: common/audit.c:1002
 +msgid "Signature available"
 +msgstr "Signature available"
 +
 +#: common/audit.c:1024
 +msgid "Parsing data succeeded"
 +msgstr "Parsing data succeeded"
 +
 +#: common/audit.c:1036
 +#, c-format
 +msgid "bad data hash algorithm: %s"
 +msgstr "bad data hash algorithm: %s"
 +
 +#: common/audit.c:1051
 +#, c-format
 +msgid "Signature %d"
 +msgstr "Signature %d"
 +
 +#: common/audit.c:1079
 +msgid "Certificate chain valid"
 +msgstr "Certificate chain valid"
 +
 +#: common/audit.c:1090
 +msgid "Root certificate trustworthy"
 +msgstr "Root certificate trustworthy"
 +
 +#: common/audit.c:1111 sm/certchain.c:1009
 +msgid "no CRL found for certificate"
 +msgstr "no CRL found for certificate"
 +
 +#: common/audit.c:1114 sm/certchain.c:1019
 +msgid "the available CRL is too old"
 +msgstr "the available CRL is too old"
 +
 +#: common/audit.c:1119
 +msgid "CRL/OCSP check of certificates"
 +msgstr "CRL/OCSP check of certificates"
 +
 +#: common/audit.c:1139
 +msgid "Included certificates"
 +msgstr "Included certificates"
 +
 +#: common/audit.c:1194
 +msgid "No audit log entries."
 +msgstr "No audit log entries."
 +
 +#: common/audit.c:1243
 +msgid "Unknown operation"
 +msgstr "Unknown operation"
 +
 +#: common/audit.c:1261
 +msgid "Gpg-Agent usable"
 +msgstr "Gpg-Agent usable"
 +
 +#: common/audit.c:1271
 +msgid "Dirmngr usable"
 +msgstr "Dirmngr usable"
 +
 +#: common/audit.c:1307
 +#, c-format
 +msgid "No help available for '%s'."
 +msgstr "No help available for '%s'."
 +
 +#: common/helpfile.c:90
 +msgid "ignoring garbage line"
 +msgstr "ignoring garbage line"
 +
 +#: common/gettime.c:887
 +msgid "[none]"
 +msgstr "[none]"
 +
 +#: common/argparse.c:365
 +msgid "argument not expected"
 +msgstr "argument not expected"
 +
 +#: common/argparse.c:367
 +msgid "read error"
 +msgstr "read error"
 +
 +#: common/argparse.c:369
 +msgid "keyword too long"
 +msgstr "keyword too long"
 +
 +#: common/argparse.c:371
 +msgid "missing argument"
 +msgstr "missing argument"
 +
 +#: common/argparse.c:373
 +msgid "invalid argument"
 +msgstr "invalid argument"
 +
 +#: common/argparse.c:375
 +msgid "invalid command"
 +msgstr "invalid command"
 +
 +#: common/argparse.c:377
 +msgid "invalid alias definition"
 +msgstr "invalid alias definition"
 +
 +#: common/argparse.c:379
 +msgid "out of core"
 +msgstr "out of core"
 +
 +#: common/argparse.c:381
 +msgid "invalid option"
 +msgstr "invalid option"
 +
 +#: common/argparse.c:389
 +#, c-format
 +msgid "missing argument for option \"%.50s\"\n"
 +msgstr "missing argument for option “%.50s”\n"
 +
 +#: common/argparse.c:391
 +#, c-format
 +msgid "invalid argument for option \"%.50s\"\n"
 +msgstr "invalid argument for option “%.50s”\n"
 +
 +#: common/argparse.c:393
 +#, c-format
 +msgid "option \"%.50s\" does not expect an argument\n"
 +msgstr "option “%.50s” does not expect an argument\n"
 +
 +#: common/argparse.c:395
 +#, c-format
 +msgid "invalid command \"%.50s\"\n"
 +msgstr "invalid command “%.50s”\n"
 +
 +#: common/argparse.c:397
 +#, c-format
 +msgid "option \"%.50s\" is ambiguous\n"
 +msgstr "option “%.50s” is ambiguous\n"
 +
 +#: common/argparse.c:399
 +#, c-format
 +msgid "command \"%.50s\" is ambiguous\n"
 +msgstr "command “%.50s” is ambiguous\n"
 +
- #: common/argparse.c:401 dirmngr/dirmngr.c:1173
++#: common/argparse.c:401 dirmngr/dirmngr.c:1185
 +msgid "out of core\n"
 +msgstr "out of core\n"
 +
 +#: common/argparse.c:403
 +#, c-format
 +msgid "invalid option \"%.50s\"\n"
 +msgstr "invalid option “%.50s”\n"
 +
 +#: common/utf8conv.c:123
 +#, c-format
 +msgid "conversion from '%s' to '%s' not available\n"
 +msgstr "conversion from ‘%s’ to ‘%s’ not available\n"
 +
 +#: common/utf8conv.c:131
 +#, c-format
 +msgid "iconv_open failed: %s\n"
 +msgstr "iconv_open failed: %s\n"
 +
 +#: common/utf8conv.c:385 common/utf8conv.c:651
 +#, c-format
 +msgid "conversion from '%s' to '%s' failed: %s\n"
 +msgstr "conversion from ‘%s’ to ‘%s’ failed: %s\n"
 +
 +#: common/dotlock.c:707
 +#, c-format
 +msgid "failed to create temporary file '%s': %s\n"
 +msgstr "failed to create temporary file '%s': %s\n"
 +
 +#: common/dotlock.c:771
 +#, c-format
 +msgid "error writing to '%s': %s\n"
 +msgstr "error writing to '%s': %s\n"
 +
 +#: common/dotlock.c:1116
 +#, c-format
 +msgid "removing stale lockfile (created by %d)\n"
 +msgstr "removing stale lockfile (created by %d)\n"
 +
 +#: common/dotlock.c:1152
 +#, 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:1153
 +msgid "(deadlock?) "
 +msgstr "(deadlock?) "
 +
 +#: common/dotlock.c:1192
 +#, c-format
 +msgid "lock '%s' not made: %s\n"
 +msgstr "lock ‘%s’ not made: %s\n"
 +
 +#: common/dotlock.c:1219
 +#, c-format
 +msgid "waiting for lock %s...\n"
 +msgstr "waiting for lock %s...\n"
 +
- #: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
- #: dirmngr/dirmngr.c:715
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:725
++#: dirmngr/dirmngr.c:734
 +#, c-format
 +msgid "%s is too old (need %s, have %s)\n"
 +msgstr "%s is too old (need %s, have %s)\n"
 +
 +#: g10/armor.c:424
 +#, c-format
 +msgid "armor: %s\n"
 +msgstr "armor: %s\n"
 +
 +#: g10/armor.c:463
 +msgid "invalid armor header: "
 +msgstr "invalid armor header: "
 +
 +#: g10/armor.c:474
 +msgid "armor header: "
 +msgstr "armor header: "
 +
 +#: g10/armor.c:487
 +msgid "invalid clearsig header\n"
 +msgstr "invalid clearsig header\n"
 +
 +#: g10/armor.c:500
 +msgid "unknown armor header: "
 +msgstr "unknown armor header: "
 +
 +#: g10/armor.c:553
 +msgid "nested clear text signatures\n"
 +msgstr "nested clear text signatures\n"
 +
 +#: g10/armor.c:688
 +msgid "unexpected armor: "
 +msgstr "unexpected armor: "
 +
 +#: g10/armor.c:701
 +msgid "invalid dash escaped line: "
 +msgstr "invalid dash escaped line: "
 +
- #: g10/armor.c:873 g10/armor.c:1490
++#: g10/armor.c:873 g10/armor.c:1493
 +#, c-format
 +msgid "invalid radix64 character %02X skipped\n"
 +msgstr "invalid radix64 character %02X skipped\n"
 +
 +#: g10/armor.c:916
 +msgid "premature eof (no CRC)\n"
 +msgstr "premature eof (no CRC)\n"
 +
 +#: g10/armor.c:950
 +msgid "premature eof (in CRC)\n"
 +msgstr "premature eof (in CRC)\n"
 +
 +#: g10/armor.c:958
 +msgid "malformed CRC\n"
 +msgstr "malformed CRC\n"
 +
- #: g10/armor.c:962 g10/armor.c:1527
++#: g10/armor.c:962 g10/armor.c:1530
 +#, c-format
 +msgid "CRC error; %06lX - %06lX\n"
 +msgstr "CRC error; %06lX - %06lX\n"
 +
 +#: g10/armor.c:982
 +msgid "premature eof (in trailer)\n"
 +msgstr "premature eof (in trailer)\n"
 +
 +#: g10/armor.c:986
 +msgid "error in trailer line\n"
 +msgstr "error in trailer line\n"
 +
- #: g10/armor.c:1303
++#: g10/armor.c:1306
 +msgid "no valid OpenPGP data found.\n"
 +msgstr "no valid OpenPGP data found.\n"
 +
- #: g10/armor.c:1308
++#: g10/armor.c:1311
 +#, c-format
 +msgid "invalid armor: line longer than %d characters\n"
 +msgstr "invalid armor: line longer than %d characters\n"
 +
- #: g10/armor.c:1312
++#: g10/armor.c:1315
 +msgid ""
 +"quoted printable character in armor - probably a buggy MTA has been used\n"
 +msgstr ""
 +"quoted printable character in armor - probably a buggy MTA has been used\n"
 +
 +#: g10/build-packet.c:1110
 +#, c-format
 +msgid "[ not human readable (%zu bytes: %s%s) ]"
 +msgstr "[ not human readable (%zu bytes: %s%s) ]"
 +
 +#: g10/build-packet.c:1162
 +msgid ""
 +"a notation name must have only printable characters or spaces, and end with "
 +"an '='\n"
 +msgstr ""
 +"a notation name must have only printable characters or spaces, and end with "
 +"an ‘=’\n"
 +
 +#: g10/build-packet.c:1174 g10/build-packet.c:1270
 +msgid "a user notation name must contain the '@' character\n"
 +msgstr "a user notation name must contain the ‘@’ character\n"
 +
 +#: g10/build-packet.c:1180 g10/build-packet.c:1276
 +msgid "a notation name must not contain more than one '@' character\n"
 +msgstr "a notation name must not contain more than one ‘@’ character\n"
 +
 +#: g10/build-packet.c:1198
 +msgid "a notation value must not use any control characters\n"
 +msgstr "a notation value must not use any control characters\n"
 +
 +#: g10/build-packet.c:1254
 +msgid "a notation name may not contain an '=' character\n"
 +msgstr "a notation name may not contain an ‘=’ character\n"
 +
 +#: g10/build-packet.c:1260
 +msgid "a notation name must have only printable characters or spaces\n"
 +msgstr "a notation name must have only printable characters or spaces\n"
 +
 +#: g10/build-packet.c:1319 g10/build-packet.c:1330
 +msgid "WARNING: invalid notation data found\n"
 +msgstr "WARNING: invalid notation data found\n"
 +
 +#: g10/call-agent.c:144 sm/call-agent.c:199
 +#, c-format
 +msgid "failed to proxy %s inquiry to client\n"
 +msgstr "failed to proxy %s inquiry to client\n"
 +
 +#: g10/call-agent.c:169
 +msgid "Enter passphrase: "
 +msgstr "Enter passphrase: "
 +
 +#: g10/call-agent.c:196 sm/call-agent.c:98 sm/call-dirmngr.c:165
 +#, c-format
 +msgid "error getting version from '%s': %s\n"
 +msgstr "error getting version from '%s': %s\n"
 +
 +#: g10/call-agent.c:202 sm/call-agent.c:104 sm/call-dirmngr.c:171
 +#, c-format
 +msgid "server '%s' is older than us (%s < %s)"
 +msgstr "server ‘%s’ is older than us (%s < %s)"
 +
 +#: g10/call-agent.c:208 sm/call-agent.c:110 sm/call-dirmngr.c:177
 +#, c-format
 +msgid "WARNING: %s\n"
 +msgstr "WARNING: %s\n"
 +
 +#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1705
 +#, 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:1711
 +#, c-format
 +msgid "OpenPGP card no. %s detected\n"
 +msgstr "OpenPGP card no. %s detected\n"
 +
- #: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
- #: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2030
++#: g10/keygen.c:4087 g10/revoke.c:215 g10/revoke.c:618
 +msgid "can't do this in batch mode\n"
 +msgstr "can't do this in batch mode\n"
 +
 +#: g10/card-util.c:107
 +msgid "This command is only available for version 2 cards\n"
 +msgstr "This command is only available for version 2 cards\n"
 +
- #: g10/card-util.c:109 scd/app-openpgp.c:2454
++#: g10/card-util.c:109 scd/app-openpgp.c:2467
 +msgid "Reset Code not or not anymore available\n"
 +msgstr "Reset Code not or not anymore available\n"
 +
 +#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
- #: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
- #: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1768
++#: g10/keygen.c:1945 g10/keygen.c:2313 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
 +msgid "Your selection? "
 +msgstr "Your selection? "
 +
 +#: g10/card-util.c:279 g10/card-util.c:330
 +msgid "[not set]"
 +msgstr "[not set]"
 +
 +#: g10/card-util.c:533
 +msgid "male"
 +msgstr "male"
 +
 +#: g10/card-util.c:534
 +msgid "female"
 +msgstr "female"
 +
 +#: g10/card-util.c:534
 +msgid "unspecified"
 +msgstr "unspecified"
 +
 +#: g10/card-util.c:561
 +msgid "not forced"
 +msgstr "not forced"
 +
 +#: g10/card-util.c:561
 +msgid "forced"
 +msgstr "forced"
 +
 +#: g10/card-util.c:647
 +msgid "Error: Only plain ASCII is currently allowed.\n"
 +msgstr "Error: Only plain ASCII is currently allowed.\n"
 +
 +#: g10/card-util.c:649
 +msgid "Error: The \"<\" character may not be used.\n"
 +msgstr "Error: The “<” character may not be used.\n"
 +
 +#: g10/card-util.c:651
 +msgid "Error: Double spaces are not allowed.\n"
 +msgstr "Error: Double spaces are not allowed.\n"
 +
 +#: g10/card-util.c:668
 +msgid "Cardholder's surname: "
 +msgstr "Cardholder's surname: "
 +
 +#: g10/card-util.c:670
 +msgid "Cardholder's given name: "
 +msgstr "Cardholder's given name: "
 +
 +#: g10/card-util.c:688
 +#, 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:709
 +msgid "URL to retrieve public key: "
 +msgstr "URL to retrieve public key: "
 +
 +#: g10/card-util.c:717
 +#, c-format
 +msgid "Error: URL too long (limit is %d characters).\n"
 +msgstr "Error: URL too long (limit is %d characters).\n"
 +
- #: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
- #: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:334
++#: g10/import.c:592 g10/import.c:640 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
++#: dirmngr/dirmngr.c:1510 tools/gpgconf.c:341 tools/gpgconf.c:387
 +#, c-format
 +msgid "error reading '%s': %s\n"
 +msgstr "error reading '%s': %s\n"
 +
 +#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2319
 +#: dirmngr/crlcache.c:926
 +#, c-format
 +msgid "error writing '%s': %s\n"
 +msgstr "error writing '%s': %s\n"
 +
 +#: g10/card-util.c:872
 +msgid "Login data (account name): "
 +msgstr "Login data (account name): "
 +
 +#: g10/card-util.c:882
 +#, c-format
 +msgid "Error: Login data too long (limit is %d characters).\n"
 +msgstr "Error: Login data too long (limit is %d characters).\n"
 +
 +#: g10/card-util.c:918
 +msgid "Private DO data: "
 +msgstr "Private DO data: "
 +
 +#: g10/card-util.c:928
 +#, c-format
 +msgid "Error: Private DO too long (limit is %d characters).\n"
 +msgstr "Error: Private DO too long (limit is %d characters).\n"
 +
 +#: g10/card-util.c:1011
 +msgid "Language preferences: "
 +msgstr "Language preferences: "
 +
 +#: g10/card-util.c:1019
 +msgid "Error: invalid length of preference string.\n"
 +msgstr "Error: invalid length of preference string.\n"
 +
 +#: g10/card-util.c:1028
 +msgid "Error: invalid characters in preference string.\n"
 +msgstr "Error: invalid characters in preference string.\n"
 +
 +#: g10/card-util.c:1050
 +msgid "Sex ((M)ale, (F)emale or space): "
 +msgstr "Sex ((M)ale, (F)emale or space): "
 +
 +#: g10/card-util.c:1064
 +msgid "Error: invalid response.\n"
 +msgstr "Error: invalid response.\n"
 +
 +#: g10/card-util.c:1086
 +msgid "CA fingerprint: "
 +msgstr "CA fingerprint: "
 +
 +#: g10/card-util.c:1109
 +msgid "Error: invalid formatted fingerprint.\n"
 +msgstr "Error: invalid formatted fingerprint.\n"
 +
 +#: g10/card-util.c:1159
 +#, c-format
 +msgid "key operation not possible: %s\n"
 +msgstr "key operation not possible: %s\n"
 +
 +#: g10/card-util.c:1160
 +msgid "not an OpenPGP card"
 +msgstr "not an OpenPGP card"
 +
- #: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
++#: g10/card-util.c:1173 g10/keygen.c:4106 g10/keygen.c:5092
 +#, c-format
 +msgid "error getting current key info: %s\n"
 +msgstr "error getting current key info: %s\n"
 +
 +#: g10/card-util.c:1260
 +msgid "Replace existing key? (y/N) "
 +msgstr "Replace existing key? (y/N) "
 +
 +#: g10/card-util.c:1277
 +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 ""
 +"Note: There is no guarantee that the card supports the requested size.\n"
 +"      If the key generation does not succeed, please check the\n"
 +"      documentation of your card to see what sizes are allowed.\n"
 +
 +#: g10/card-util.c:1302
 +#, c-format
 +msgid "What keysize do you want for the Signature key? (%u) "
 +msgstr "What keysize do you want for the Signature key? (%u) "
 +
 +#: g10/card-util.c:1304
 +#, c-format
 +msgid "What keysize do you want for the Encryption key? (%u) "
 +msgstr "What keysize do you want for the Encryption key? (%u) "
 +
 +#: g10/card-util.c:1305
 +#, c-format
 +msgid "What keysize do you want for the Authentication key? (%u) "
 +msgstr "What keysize do you want for the Authentication key? (%u) "
 +
- #: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
++#: g10/card-util.c:1316 g10/keygen.c:2122 g10/keygen.c:2154
 +#: sm/certreqgen-ui.c:198
 +#, c-format
 +msgid "rounded up to %u bits\n"
 +msgstr "rounded up to %u bits\n"
 +
- #: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2207 sm/certreqgen-ui.c:188
 +#, 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:1329
 +#, 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:1349
 +#, c-format
 +msgid "error changing size of key %d to %u bits: %s\n"
 +msgstr "error changing size of key %d to %u bits: %s\n"
 +
 +#: g10/card-util.c:1373
 +msgid "Make off-card backup of encryption key? (Y/n) "
 +msgstr "Make off-card backup of encryption key? (Y/n) "
 +
 +#: g10/card-util.c:1387
 +msgid "Note: keys are already stored on the card!\n"
 +msgstr "Note: keys are already stored on the card!\n"
 +
 +#: g10/card-util.c:1390
 +msgid "Replace existing keys? (y/N) "
 +msgstr "Replace existing keys? (y/N) "
 +
 +#: g10/card-util.c:1402
 +#, c-format
 +msgid ""
 +"Please note that the factory settings of the PINs are\n"
 +"   PIN = '%s'     Admin PIN = '%s'\n"
 +"You should change them using the command --change-pin\n"
 +msgstr ""
 +"Please note that the factory settings of the PINs are\n"
 +"   PIN = ‘%s’     Admin PIN = ‘%s’\n"
 +"You should change them using the command --change-pin\n"
 +
 +#: g10/card-util.c:1462
 +msgid "Please select the type of key to generate:\n"
 +msgstr "Please select the type of key to generate:\n"
 +
 +#: g10/card-util.c:1464 g10/card-util.c:1578
 +msgid "   (1) Signature key\n"
 +msgstr "   (1) Signature key\n"
 +
 +#: g10/card-util.c:1465 g10/card-util.c:1580
 +msgid "   (2) Encryption key\n"
 +msgstr "   (2) Encryption key\n"
 +
 +#: g10/card-util.c:1466 g10/card-util.c:1582
 +msgid "   (3) Authentication key\n"
 +msgstr "   (3) Authentication key\n"
 +
- #: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
- #: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
- #: g10/keygen.c:2314 g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1508
++#: g10/keygen.c:1794 g10/keygen.c:1822 g10/keygen.c:1952 g10/keygen.c:2060
++#: g10/keygen.c:2336 g10/revoke.c:820
 +msgid "Invalid selection.\n"
 +msgstr "Invalid selection.\n"
 +
 +#: g10/card-util.c:1575
 +msgid "Please select where to store the key:\n"
 +msgstr "Please select where to store the key:\n"
 +
 +#: g10/card-util.c:1621
 +#, c-format
 +msgid "KEYTOCARD failed: %s\n"
 +msgstr "KEYTOCARD failed: %s\n"
 +
 +#: g10/card-util.c:1717
 +msgid "This command is not supported by this card\n"
 +msgstr "This command is not supported by this card\n"
 +
 +#: g10/card-util.c:1722
 +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:1725
 +msgid "Continue? (y/N) "
 +msgstr "Continue? (y/N) "
 +
 +#: g10/card-util.c:1730
 +msgid "Really do a factory reset? (enter \"yes\") "
 +msgstr "Really do a factory reset? (enter “yes”) "
 +
- #: g10/card-util.c:1816 g10/keyedit.c:1867
++#: g10/card-util.c:1816 g10/keyedit.c:1868
 +msgid "quit this menu"
 +msgstr "quit this menu"
 +
 +#: g10/card-util.c:1818
 +msgid "show admin commands"
 +msgstr "show admin commands"
 +
- #: g10/card-util.c:1819 g10/keyedit.c:1870
++#: g10/card-util.c:1819 g10/keyedit.c:1871
 +msgid "show this help"
 +msgstr "show this help"
 +
 +#: g10/card-util.c:1821
 +msgid "list all available data"
 +msgstr "list all available data"
 +
 +#: g10/card-util.c:1824
 +msgid "change card holder's name"
 +msgstr "change card holder's name"
 +
 +#: g10/card-util.c:1825
 +msgid "change URL to retrieve key"
 +msgstr "change URL to retrieve key"
 +
 +#: g10/card-util.c:1826
 +msgid "fetch the key specified in the card URL"
 +msgstr "fetch the key specified in the card URL"
 +
 +#: g10/card-util.c:1827
 +msgid "change the login name"
 +msgstr "change the login name"
 +
 +#: g10/card-util.c:1828
 +msgid "change the language preferences"
 +msgstr "change the language preferences"
 +
 +#: g10/card-util.c:1829
 +msgid "change card holder's sex"
 +msgstr "change card holder's sex"
 +
 +#: g10/card-util.c:1830
 +msgid "change a CA fingerprint"
 +msgstr "change a CA fingerprint"
 +
 +#: g10/card-util.c:1831
 +msgid "toggle the signature force PIN flag"
 +msgstr "toggle the signature force PIN flag"
 +
 +#: g10/card-util.c:1832
 +msgid "generate new keys"
 +msgstr "generate new keys"
 +
 +#: g10/card-util.c:1833
 +msgid "menu to change or unblock the PIN"
 +msgstr "menu to change or unblock the PIN"
 +
 +#: g10/card-util.c:1834
 +msgid "verify the PIN and list all data"
 +msgstr "verify the PIN and list all data"
 +
 +#: g10/card-util.c:1835
 +msgid "unblock the PIN using a Reset Code"
 +msgstr "unblock the PIN using a Reset Code"
 +
 +#: g10/card-util.c:1836
 +msgid "destroy all keys and data"
 +msgstr "destroy all keys and data"
 +
 +#: g10/card-util.c:1958
 +msgid "gpg/card> "
 +msgstr "gpg/card> "
 +
 +#: g10/card-util.c:1999
 +msgid "Admin-only command\n"
 +msgstr "Admin-only command\n"
 +
 +#: g10/card-util.c:2030
 +msgid "Admin commands are allowed\n"
 +msgstr "Admin commands are allowed\n"
 +
 +#: g10/card-util.c:2032
 +msgid "Admin commands are not allowed\n"
 +msgstr "Admin commands are not allowed\n"
 +
- #: g10/card-util.c:2127 g10/keyedit.c:2816
++#: g10/card-util.c:2127 g10/keyedit.c:2817
 +msgid "Invalid command  (try \"help\")\n"
 +msgstr "Invalid command  (try “help”)\n"
 +
- #: g10/decrypt.c:191 g10/encrypt.c:955
++#: g10/decrypt.c:190 g10/encrypt.c:955
 +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:4851 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4904 g10/keyring.c:398 g10/keyring.c:771
 +#, c-format
 +msgid "can't open '%s'\n"
 +msgstr "can't open ‘%s’\n"
 +
 +#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
- #: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
- #: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4858 g10/keyedit.c:2051
++#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2163
 +#, c-format
 +msgid "key \"%s\" not found: %s\n"
 +msgstr "key “%s” not found: %s\n"
 +
- #: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
- #: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
- #: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4866 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:645 g10/tofu.c:2171
 +#, c-format
 +msgid "error reading keyblock: %s\n"
 +msgstr "error reading keyblock: %s\n"
 +
 +#: g10/delkey.c:118 g10/getkey.c:579
 +#, c-format
 +msgid "key \"%s\" not found\n"
 +msgstr "key “%s” not found\n"
 +
 +#: g10/delkey.c:129 g10/delkey.c:136
 +msgid "(unless you specify the key by fingerprint)\n"
 +msgstr "(unless you specify the key by fingerprint)\n"
 +
 +#: g10/delkey.c:135
 +msgid "can't do this in batch mode without \"--yes\"\n"
 +msgstr "can't do this in batch mode without “--yes”\n"
 +
 +#: g10/delkey.c:148
 +msgid "Delete this key from the keyring? (y/N) "
 +msgstr "Delete this key from the keyring? (y/N) "
 +
 +#: g10/delkey.c:158
 +msgid "This is a secret key! - really delete? (y/N) "
 +msgstr "This is a secret key! - really delete? (y/N) "
 +
 +#: g10/delkey.c:201
 +#, c-format
 +msgid "deleting secret %s failed: %s\n"
 +msgstr "deleting secret %s failed: %s\n"
 +
 +#: g10/delkey.c:203
 +msgid "key"
 +msgstr "key"
 +
 +#: g10/delkey.c:203
 +msgid "subkey"
 +msgstr "subkey"
 +
 +#: g10/delkey.c:226
 +#, c-format
 +msgid "deleting keyblock failed: %s\n"
 +msgstr "deleting keyblock failed: %s\n"
 +
 +#: g10/delkey.c:239
 +msgid "ownertrust information cleared\n"
 +msgstr "ownertrust information cleared\n"
 +
 +#: g10/delkey.c:275
 +#, c-format
 +msgid "there is a secret key for public key \"%s\"!\n"
 +msgstr "there is a secret key for public key “%s”!\n"
 +
 +#: g10/delkey.c:277
 +msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 +msgstr "use option “--delete-secret-keys” to delete it first.\n"
 +
- #: g10/encrypt.c:232 g10/sign.c:1292
++#: g10/encrypt.c:232 g10/sign.c:1294
 +#, c-format
 +msgid "error creating passphrase: %s\n"
 +msgstr "error creating passphrase: %s\n"
 +
 +#: g10/encrypt.c:239
 +msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 +msgstr "can't use a symmetric ESK packet due to the S2K mode\n"
 +
 +#: g10/encrypt.c:253
 +#, c-format
 +msgid "using cipher %s\n"
 +msgstr "using cipher %s\n"
 +
 +#: g10/encrypt.c:263 g10/encrypt.c:624
 +#, c-format
 +msgid "'%s' already compressed\n"
 +msgstr "‘%s’ already compressed\n"
 +
- #: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:610
 +#, c-format
 +msgid "WARNING: '%s' is an empty file\n"
 +msgstr "WARNING: ‘%s’ is an empty file\n"
 +
 +#: g10/encrypt.c:557
 +#, c-format
 +msgid "reading from '%s'\n"
 +msgstr "reading from ‘%s’\n"
 +
 +#: g10/encrypt.c:605
 +#, c-format
 +msgid ""
 +"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 +msgstr ""
 +"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 +
- #: g10/encrypt.c:707 g10/sign.c:984
++#: g10/encrypt.c:707 g10/sign.c:986
 +#, c-format
 +msgid ""
 +"WARNING: forcing compression algorithm %s (%d) violates recipient "
 +"preferences\n"
 +msgstr ""
 +"WARNING: forcing compression algorithm %s (%d) violates recipient "
 +"preferences\n"
 +
 +#: g10/encrypt.c:817
 +#, 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:903
 +#, c-format
 +msgid "%s/%s encrypted for: \"%s\"\n"
 +msgstr "%s/%s encrypted for: “%s”\n"
 +
 +#: g10/encrypt.c:931 g10/pkclist.c:1029 g10/pkclist.c:1080
 +#, c-format
 +msgid "you may not use %s while in %s mode\n"
 +msgstr "you may not use %s while in %s mode\n"
 +
 +#: g10/decrypt-data.c:93 g10/mainproc.c:304
 +#, c-format
 +msgid "%s encrypted data\n"
 +msgstr "%s encrypted data\n"
 +
 +#: g10/decrypt-data.c:96 g10/mainproc.c:308
 +#, c-format
 +msgid "encrypted with unknown algorithm %d\n"
 +msgstr "encrypted with unknown algorithm %d\n"
 +
- #: g10/decrypt-data.c:164 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:129
 +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:176
 +msgid "problem handling encrypted packet\n"
 +msgstr "problem handling encrypted packet\n"
 +
 +#: g10/exec.c:60
 +msgid "no remote program execution supported\n"
 +msgstr "no remote program execution supported\n"
 +
 +#: g10/exec.c:319
 +msgid ""
 +"external program calls are disabled due to unsafe options file permissions\n"
 +msgstr ""
 +"external program calls are disabled due to unsafe options file permissions\n"
 +
 +#: g10/exec.c:349
 +msgid "this platform requires temporary files when calling external programs\n"
 +msgstr ""
 +"this platform requires temporary files when calling external programs\n"
 +
 +#: g10/exec.c:427
 +#, c-format
 +msgid "unable to execute program '%s': %s\n"
 +msgstr "unable to execute program '%s': %s\n"
 +
 +#: g10/exec.c:430
 +#, c-format
 +msgid "unable to execute shell '%s': %s\n"
 +msgstr "unable to execute shell '%s': %s\n"
 +
 +#: g10/exec.c:521
 +#, c-format
 +msgid "system error while calling external program: %s\n"
 +msgstr "system error while calling external program: %s\n"
 +
 +#: g10/exec.c:532 g10/exec.c:599
 +msgid "unnatural exit of external program\n"
 +msgstr "unnatural exit of external program\n"
 +
 +#: g10/exec.c:547
 +msgid "unable to execute external program\n"
 +msgstr "unable to execute external program\n"
 +
 +#: g10/exec.c:564
 +#, c-format
 +msgid "unable to read external program response: %s\n"
 +msgstr "unable to read external program response: %s\n"
 +
 +#: g10/exec.c:610 g10/exec.c:617
 +#, c-format
 +msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 +msgstr "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 +
 +#: g10/exec.c:622
 +#, c-format
 +msgid "WARNING: unable to remove temp directory '%s': %s\n"
 +msgstr "WARNING: unable to remove temp directory '%s': %s\n"
 +
 +#: g10/export.c:106
 +msgid "export signatures that are marked as local-only"
 +msgstr "export signatures that are marked as local-only"
 +
 +#: g10/export.c:108
 +msgid "export attribute user IDs (generally photo IDs)"
 +msgstr "export attribute user IDs (generally photo IDs)"
 +
 +#: g10/export.c:110
 +msgid "export revocation keys marked as \"sensitive\""
 +msgstr "export revocation keys marked as “sensitive”"
 +
 +#: g10/export.c:112
 +msgid "remove unusable parts from key during export"
 +msgstr "remove unusable parts from key during export"
 +
 +#: g10/export.c:114
 +msgid "remove as much as possible from key during export"
 +msgstr "remove as much as possible from key during export"
 +
 +#: g10/export.c:1218
 +msgid " - skipped"
 +msgstr " - skipped"
 +
- #: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:845 g10/sign.c:1148
++#: g10/export.c:1251 g10/import.c:1543 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:847 g10/sign.c:1150
 +#, c-format
 +msgid "writing to '%s'\n"
 +msgstr "writing to ‘%s’\n"
 +
 +#: g10/export.c:1675
 +#, c-format
 +msgid "key %s: key material on-card - skipped\n"
 +msgstr "key %s: key material on-card - skipped\n"
 +
 +#: g10/export.c:1861
 +msgid "exporting secret keys not allowed\n"
 +msgstr "exporting secret keys not allowed\n"
 +
 +#: g10/export.c:1938
 +#, c-format
 +msgid "key %s: PGP 2.x style key - skipped\n"
 +msgstr "key %s: PGP 2.x style key - skipped\n"
 +
 +#: g10/export.c:2026
 +msgid "WARNING: nothing exported\n"
 +msgstr "WARNING: nothing exported\n"
 +
- #: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
- #: g10/plaintext.c:151 g10/plaintext.c:174
++#: g10/export.c:2283 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/plaintext.c:167 g10/plaintext.c:190
 +#, c-format
 +msgid "error creating '%s': %s\n"
 +msgstr "error creating '%s': %s\n"
 +
 +#: g10/getkey.c:257
 +msgid "[User ID not found]"
 +msgstr "[User ID not found]"
 +
 +#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1876
 +#: g10/pkclist.c:989
 +#, c-format
 +msgid "(check argument of option '%s')\n"
 +msgstr "(check argument of option '%s')\n"
 +
 +#: g10/getkey.c:516
 +#, c-format
 +msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
 +msgstr "Warning: ‘%s’ should be a long key ID or a fingerprint\n"
 +
 +#: g10/getkey.c:546
 +#, c-format
 +msgid "error looking up: %s\n"
 +msgstr "error looking up: %s\n"
 +
 +#: g10/getkey.c:636
 +#, c-format
 +msgid "Warning: %s appears in the keyring %d times\n"
 +msgstr "Warning: %s appears in the keyring %d times\n"
 +
 +#: g10/getkey.c:1437
 +#, c-format
 +msgid "automatically retrieved '%s' via %s\n"
 +msgstr "automatically retrieved ‘%s’ via %s\n"
 +
 +#: g10/getkey.c:1443
 +#, c-format
 +msgid "error retrieving '%s' via %s: %s\n"
 +msgstr "error retrieving ‘%s’ via %s: %s\n"
 +
 +#: g10/getkey.c:1445
 +msgid "No fingerprint"
 +msgstr "No fingerprint"
 +
- #: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
- #: g10/revoke.c:701
++#: g10/getkey.c:1873 g10/keyedit.c:2929 g10/keyedit.c:3016 g10/revoke.c:637
++#: g10/revoke.c:702
 +#, c-format
 +msgid "secret key \"%s\" not found: %s\n"
 +msgstr "secret key “%s” not found: %s\n"
 +
 +#: g10/getkey.c:1956
 +#, c-format
 +msgid "Warning: not using '%s' as default key: %s\n"
 +msgstr "Warning: not using ‘%s’ as default key: %s\n"
 +
 +#: g10/getkey.c:1964
 +#, c-format
 +msgid "using \"%s\" as default secret key for signing\n"
 +msgstr "using “%s” as default secret key for signing\n"
 +
 +#: g10/getkey.c:1971
 +#, c-format
 +msgid "all values passed to '%s' ignored\n"
 +msgstr "all values passed to ‘%s’ ignored\n"
 +
 +#: g10/getkey.c:2777
 +#, c-format
 +msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 +msgstr "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 +
 +#: g10/getkey.c:3611
 +#, c-format
 +msgid "using subkey %s instead of primary key %s\n"
 +msgstr "using subkey %s instead of primary key %s\n"
 +
- #: g10/gpg.c:424 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:200
 +msgid "make a signature"
 +msgstr "make a signature"
 +
- #: g10/gpg.c:425
++#: g10/gpg.c:427
 +msgid "make a clear text signature"
 +msgstr "make a clear text signature"
 +
- #: g10/gpg.c:426 sm/gpgsm.c:202
++#: g10/gpg.c:429 sm/gpgsm.c:202
 +msgid "make a detached signature"
 +msgstr "make a detached signature"
 +
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:430 sm/gpgsm.c:203
 +msgid "encrypt data"
 +msgstr "encrypt data"
 +
- #: g10/gpg.c:429
++#: g10/gpg.c:432
 +msgid "encryption only with symmetric cipher"
 +msgstr "encryption only with symmetric cipher"
 +
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:434 sm/gpgsm.c:205
 +msgid "decrypt data (default)"
 +msgstr "decrypt data (default)"
 +
- #: g10/gpg.c:433 sm/gpgsm.c:206
++#: g10/gpg.c:436 sm/gpgsm.c:206
 +msgid "verify a signature"
 +msgstr "verify a signature"
 +
- #: g10/gpg.c:435 sm/gpgsm.c:207
++#: g10/gpg.c:438 sm/gpgsm.c:207
 +msgid "list keys"
 +msgstr "list keys"
 +
- #: g10/gpg.c:437
++#: g10/gpg.c:440
 +msgid "list keys and signatures"
 +msgstr "list keys and signatures"
 +
- #: g10/gpg.c:438
++#: g10/gpg.c:443
 +msgid "list and check key signatures"
 +msgstr "list and check key signatures"
 +
- #: g10/gpg.c:439 sm/gpgsm.c:212
++#: g10/gpg.c:445 sm/gpgsm.c:212
 +msgid "list keys and fingerprints"
 +msgstr "list keys and fingerprints"
 +
- #: g10/gpg.c:440 sm/gpgsm.c:210
++#: g10/gpg.c:446 sm/gpgsm.c:210
 +msgid "list secret keys"
 +msgstr "list secret keys"
 +
- #: g10/gpg.c:442 sm/gpgsm.c:213
++#: g10/gpg.c:448 sm/gpgsm.c:213
 +msgid "generate a new key pair"
 +msgstr "generate a new key pair"
 +
- #: g10/gpg.c:444
++#: g10/gpg.c:451
 +msgid "quickly generate a new key pair"
 +msgstr "quickly generate a new key pair"
 +
- #: g10/gpg.c:446
++#: g10/gpg.c:454
 +msgid "quickly add a new user-id"
 +msgstr "quickly add a new user-id"
 +
- #: g10/gpg.c:449
++#: g10/gpg.c:459
 +msgid "quickly revoke a user-id"
 +msgstr "quickly revoke a user-id"
 +
- #: g10/gpg.c:451
++#: g10/gpg.c:462
++msgid "quickly set a new expiration date"
++msgstr "quickly set a new expiration date"
++
++#: g10/gpg.c:464
 +msgid "full featured key pair generation"
 +msgstr "full featured key pair generation"
 +
- #: g10/gpg.c:452
++#: g10/gpg.c:467
 +msgid "generate a revocation certificate"
 +msgstr "generate a revocation certificate"
 +
- #: g10/gpg.c:454 sm/gpgsm.c:215
++#: g10/gpg.c:470 sm/gpgsm.c:216
 +msgid "remove keys from the public keyring"
 +msgstr "remove keys from the public keyring"
 +
- #: g10/gpg.c:456
++#: g10/gpg.c:472
 +msgid "remove keys from the secret keyring"
 +msgstr "remove keys from the secret keyring"
 +
- #: g10/gpg.c:458
++#: g10/gpg.c:474
 +msgid "quickly sign a key"
 +msgstr "quickly sign a key"
 +
- #: g10/gpg.c:460
++#: g10/gpg.c:476
 +msgid "quickly sign a key locally"
 +msgstr "quickly sign a key locally"
 +
- #: g10/gpg.c:461
++#: g10/gpg.c:477
 +msgid "sign a key"
 +msgstr "sign a key"
 +
- #: g10/gpg.c:462
++#: g10/gpg.c:478
 +msgid "sign a key locally"
 +msgstr "sign a key locally"
 +
- #: g10/gpg.c:463
++#: g10/gpg.c:479
 +msgid "sign or edit a key"
 +msgstr "sign or edit a key"
 +
- #: g10/gpg.c:465 sm/gpgsm.c:233
++#: g10/gpg.c:481 sm/gpgsm.c:234
 +msgid "change a passphrase"
 +msgstr "change a passphrase"
 +
- #: g10/gpg.c:467
++#: g10/gpg.c:485
 +msgid "export keys"
 +msgstr "export keys"
 +
- #: g10/gpg.c:468
++#: g10/gpg.c:486
 +msgid "export keys to a keyserver"
 +msgstr "export keys to a keyserver"
 +
- #: g10/gpg.c:469
++#: g10/gpg.c:487
 +msgid "import keys from a keyserver"
 +msgstr "import keys from a keyserver"
 +
- #: g10/gpg.c:471
++#: g10/gpg.c:490
 +msgid "search for keys on a keyserver"
 +msgstr "search for keys on a keyserver"
 +
- #: g10/gpg.c:473
++#: g10/gpg.c:492
 +msgid "update all keys from a keyserver"
 +msgstr "update all keys from a keyserver"
 +
- #: g10/gpg.c:479
++#: g10/gpg.c:498
 +msgid "import/merge keys"
 +msgstr "import/merge keys"
 +
- #: g10/gpg.c:482
++#: g10/gpg.c:501
 +msgid "print the card status"
 +msgstr "print the card status"
 +
- #: g10/gpg.c:483
++#: g10/gpg.c:502
 +msgid "change data on a card"
 +msgstr "change data on a card"
 +
- #: g10/gpg.c:484
++#: g10/gpg.c:504
 +msgid "change a card's PIN"
 +msgstr "change a card's PIN"
 +
- #: g10/gpg.c:496
++#: g10/gpg.c:516
 +msgid "update the trust database"
 +msgstr "update the trust database"
 +
- #: g10/gpg.c:505
++#: g10/gpg.c:525
 +msgid "print message digests"
 +msgstr "print message digests"
 +
- #: g10/gpg.c:508 sm/gpgsm.c:228
++#: g10/gpg.c:528 sm/gpgsm.c:229
 +msgid "run in server mode"
 +msgstr "run in server mode"
 +
- #: g10/gpg.c:510
++#: g10/gpg.c:530
 +msgid "|VALUE|set the TOFU policy for a key"
 +msgstr "|VALUE|set the TOFU policy for a key"
 +
- #: g10/gpg.c:514 sm/gpgsm.c:246
++#: g10/gpg.c:534 sm/gpgsm.c:248
 +msgid "create ascii armored output"
 +msgstr "create ascii armored output"
 +
- #: g10/gpg.c:517 sm/gpgsm.c:262
++#: g10/gpg.c:537 sm/gpgsm.c:264
 +msgid "|USER-ID|encrypt for USER-ID"
 +msgstr "|USER-ID|encrypt for USER-ID"
 +
- #: g10/gpg.c:533 sm/gpgsm.c:298
++#: g10/gpg.c:553 sm/gpgsm.c:300
 +msgid "|USER-ID|use USER-ID to sign or decrypt"
 +msgstr "|USER-ID|use USER-ID to sign or decrypt"
 +
- #: g10/gpg.c:539
++#: g10/gpg.c:559
 +msgid "|N|set compress level to N (0 disables)"
 +msgstr "|N|set compress level to N (0 disables)"
 +
- #: g10/gpg.c:546
++#: g10/gpg.c:566
 +msgid "use canonical text mode"
 +msgstr "use canonical text mode"
 +
- #: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
++#: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
 +msgid "|FILE|write output to FILE"
 +msgstr "|FILE|write output to FILE"
 +
- #: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
++#: g10/gpg.c:598 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
 +msgid "do not make any changes"
 +msgstr "do not make any changes"
 +
- #: g10/gpg.c:579
++#: g10/gpg.c:599
 +msgid "prompt before overwriting"
 +msgstr "prompt before overwriting"
 +
- #: g10/gpg.c:628
++#: g10/gpg.c:648
 +msgid "use strict OpenPGP behavior"
 +msgstr "use strict OpenPGP behavior"
 +
- #: g10/gpg.c:654 sm/gpgsm.c:355
++#: g10/gpg.c:674 sm/gpgsm.c:357
 +msgid ""
 +"@\n"
 +"(See the man page for a complete listing of all commands and options)\n"
 +msgstr ""
 +"@\n"
 +"(See the man page for a complete listing of all commands and options)\n"
 +
- #: g10/gpg.c:657 sm/gpgsm.c:358
++#: g10/gpg.c:677
 +msgid ""
 +"@\n"
 +"Examples:\n"
 +"\n"
 +" -se -r Bob [file]          sign and encrypt for user Bob\n"
- " --clearsign [file]         make a clear text signature\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"
 +msgstr ""
 +"@\n"
 +"Examples:\n"
 +"\n"
 +" -se -r Bob [file]          sign and encrypt for user Bob\n"
- " --clearsign [file]         make a clear text signature\n"
++" --clear-sign [file]        make a clear text signature\n"
 +" --detach-sign [file]       make a detached signature\n"
 +" --list-keys [names]        show keys\n"
 +" --fingerprint [names]      show fingerprints\n"
 +
- #: g10/gpg.c:1026
++#: g10/gpg.c:1047
 +msgid "Usage: @GPG@ [options] [files] (-h for help)"
 +msgstr "Usage: @GPG@ [options] [files] (-h for help)"
 +
- #: g10/gpg.c:1029
++#: g10/gpg.c:1050
 +msgid ""
 +"Syntax: @GPG@ [options] [files]\n"
 +"Sign, check, encrypt or decrypt\n"
 +"Default operation depends on the input data\n"
 +msgstr ""
 +"Syntax: @GPG@ [options] [files]\n"
 +"Sign, check, encrypt or decrypt\n"
 +"Default operation depends on the input data\n"
 +
- #: g10/gpg.c:1040 sm/gpgsm.c:588
++#: g10/gpg.c:1061 sm/gpgsm.c:580
 +msgid ""
 +"\n"
 +"Supported algorithms:\n"
 +msgstr ""
 +"\n"
 +"Supported algorithms:\n"
 +
- #: g10/gpg.c:1043
++#: g10/gpg.c:1064
 +msgid "Pubkey: "
 +msgstr "Pubkey: "
 +
- #: g10/gpg.c:1050 g10/keyedit.c:3402
++#: g10/gpg.c:1071 g10/keyedit.c:3483
 +msgid "Cipher: "
 +msgstr "Cipher: "
 +
- #: g10/gpg.c:1057
++#: g10/gpg.c:1078
 +msgid "Hash: "
 +msgstr "Hash: "
 +
- #: g10/gpg.c:1064 g10/keyedit.c:3451
++#: g10/gpg.c:1085 g10/keyedit.c:3532
 +msgid "Compression: "
 +msgstr "Compression: "
 +
- #: g10/gpg.c:1133 sm/gpgsm.c:662
++#: g10/gpg.c:1154 sm/gpgsm.c:654
 +#, c-format
 +msgid "usage: %s [options] %s\n"
 +msgstr "usage: %s [options] %s\n"
 +
- #: g10/gpg.c:1321 sm/gpgsm.c:751
++#: g10/gpg.c:1342 sm/gpgsm.c:743
 +msgid "conflicting commands\n"
 +msgstr "conflicting commands\n"
 +
- #: g10/gpg.c:1339
++#: g10/gpg.c:1360
 +#, c-format
 +msgid "no = sign found in group definition '%s'\n"
 +msgstr "no = sign found in group definition ‘%s’\n"
 +
- #: g10/gpg.c:1537
++#: g10/gpg.c:1558
 +#, c-format
 +msgid "WARNING: unsafe ownership on homedir '%s'\n"
 +msgstr "WARNING: unsafe ownership on homedir ‘%s’\n"
 +
- #: g10/gpg.c:1540
++#: g10/gpg.c:1561
 +#, c-format
 +msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 +msgstr "WARNING: unsafe ownership on configuration file ‘%s’\n"
 +
- #: g10/gpg.c:1543
++#: g10/gpg.c:1564
 +#, c-format
 +msgid "WARNING: unsafe ownership on extension '%s'\n"
 +msgstr "WARNING: unsafe ownership on extension ‘%s’\n"
 +
- #: g10/gpg.c:1549
++#: g10/gpg.c:1570
 +#, c-format
 +msgid "WARNING: unsafe permissions on homedir '%s'\n"
 +msgstr "WARNING: unsafe permissions on homedir ‘%s’\n"
 +
- #: g10/gpg.c:1552
++#: g10/gpg.c:1573
 +#, c-format
 +msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 +msgstr "WARNING: unsafe permissions on configuration file ‘%s’\n"
 +
- #: g10/gpg.c:1555
++#: g10/gpg.c:1576
 +#, c-format
 +msgid "WARNING: unsafe permissions on extension '%s'\n"
 +msgstr "WARNING: unsafe permissions on extension ‘%s’\n"
 +
- #: g10/gpg.c:1561
++#: g10/gpg.c:1582
 +#, 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:1564
++#: g10/gpg.c:1585
 +#, 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:1567
++#: g10/gpg.c:1588
 +#, 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:1573
++#: g10/gpg.c:1594
 +#, 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:1576
++#: g10/gpg.c:1597
 +#, 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:1579
++#: g10/gpg.c:1600
 +#, 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:1786
++#: g10/gpg.c:1816
 +#, c-format
 +msgid "unknown configuration item '%s'\n"
 +msgstr "unknown configuration item ‘%s’\n"
 +
- #: g10/gpg.c:1893
++#: g10/gpg.c:1925
 +msgid "display photo IDs during key listings"
 +msgstr "display photo IDs during key listings"
 +
- #: g10/gpg.c:1895
++#: g10/gpg.c:1927
 +msgid "show key usage information during key listings"
 +msgstr "show key usage information during key listings"
 +
- #: g10/gpg.c:1897
++#: g10/gpg.c:1929
 +msgid "show policy URLs during signature listings"
 +msgstr "show policy URLs during signature listings"
 +
- #: g10/gpg.c:1899
++#: g10/gpg.c:1931
 +msgid "show all notations during signature listings"
 +msgstr "show all notations during signature listings"
 +
- #: g10/gpg.c:1901
++#: g10/gpg.c:1933
 +msgid "show IETF standard notations during signature listings"
 +msgstr "show IETF standard notations during signature listings"
 +
- #: g10/gpg.c:1905
++#: g10/gpg.c:1937
 +msgid "show user-supplied notations during signature listings"
 +msgstr "show user-supplied notations during signature listings"
 +
- #: g10/gpg.c:1907
++#: g10/gpg.c:1939
 +msgid "show preferred keyserver URLs during signature listings"
 +msgstr "show preferred keyserver URLs during signature listings"
 +
- #: g10/gpg.c:1909
++#: g10/gpg.c:1941
 +msgid "show user ID validity during key listings"
 +msgstr "show user ID validity during key listings"
 +
- #: g10/gpg.c:1911
++#: g10/gpg.c:1943
 +msgid "show revoked and expired user IDs in key listings"
 +msgstr "show revoked and expired user IDs in key listings"
 +
- #: g10/gpg.c:1913
++#: g10/gpg.c:1945
 +msgid "show revoked and expired subkeys in key listings"
 +msgstr "show revoked and expired subkeys in key listings"
 +
- #: g10/gpg.c:1915
++#: g10/gpg.c:1947
 +msgid "show the keyring name in key listings"
 +msgstr "show the keyring name in key listings"
 +
- #: g10/gpg.c:1917
++#: g10/gpg.c:1949
 +msgid "show expiration dates during signature listings"
 +msgstr "show expiration dates during signature listings"
 +
- #: g10/gpg.c:2019 g10/gpg.c:2056
++#: g10/gpg.c:2051 g10/gpg.c:2088
 +#, c-format
 +msgid "valid values for option '%s':\n"
 +msgstr "valid values for option '%s':\n"
 +
- #: g10/gpg.c:2030
++#: g10/gpg.c:2062
 +#, c-format
 +msgid "unknown TOFU policy '%s'\n"
 +msgstr "unknown TOFU policy ‘%s’\n"
 +
- #: g10/gpg.c:2032 g10/gpg.c:2068
++#: g10/gpg.c:2064 g10/gpg.c:2100
 +msgid "(use \"help\" to list choices)\n"
 +msgstr "(use “help” to list choices)\n"
 +
- #: g10/gpg.c:2066
++#: g10/gpg.c:2098 g10/keygen.c:167
 +#, c-format
 +msgid "invalid value for option '%s'\n"
 +msgstr "invalid value for option ‘%s’\n"
 +
- #: g10/gpg.c:2203
++#: g10/gpg.c:2235
 +#, c-format
 +msgid "Note: old default options file '%s' ignored\n"
 +msgstr "Note: old default options file ‘%s’ ignored\n"
 +
- #: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
++#: g10/gpg.c:2839 g10/gpg.c:3610 g10/gpg.c:3622
 +#, c-format
 +msgid "Note: %s is not for normal use!\n"
 +msgstr "Note: %s is not for normal use!\n"
 +
- #: g10/gpg.c:2978 g10/gpg.c:2990
++#: g10/gpg.c:3011 g10/gpg.c:3023
 +#, c-format
 +msgid "'%s' is not a valid signature expiration\n"
 +msgstr "‘%s’ is not a valid signature expiration\n"
 +
- #: g10/gpg.c:3012
++#: g10/gpg.c:3045
 +#, c-format
 +msgid "\"%s\" is not a proper mail address\n"
 +msgstr "“%s” is not a proper mail address\n"
 +
- #: g10/gpg.c:3044 sm/gpgsm.c:1166
++#: g10/gpg.c:3077 sm/gpgsm.c:1158
 +#, c-format
 +msgid "invalid pinentry mode '%s'\n"
 +msgstr "invalid pinentry mode ‘%s’\n"
 +
- #: g10/gpg.c:3097
++#: g10/gpg.c:3130
 +#, c-format
 +msgid "'%s' is not a valid character set\n"
 +msgstr "‘%s’ is not a valid character set\n"
 +
- #: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
++#: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
 +msgid "could not parse keyserver URL\n"
 +msgstr "could not parse keyserver URL\n"
 +
- #: g10/gpg.c:3137
++#: g10/gpg.c:3170
 +#, c-format
 +msgid "%s:%d: invalid keyserver options\n"
 +msgstr "%s:%d: invalid keyserver options\n"
 +
- #: g10/gpg.c:3140
++#: g10/gpg.c:3173
 +msgid "invalid keyserver options\n"
 +msgstr "invalid keyserver options\n"
 +
- #: g10/gpg.c:3147
++#: g10/gpg.c:3180
 +#, c-format
 +msgid "%s:%d: invalid import options\n"
 +msgstr "%s:%d: invalid import options\n"
 +
- #: g10/gpg.c:3150
++#: g10/gpg.c:3183
 +msgid "invalid import options\n"
 +msgstr "invalid import options\n"
 +
- #: g10/gpg.c:3156 g10/gpg.c:3171
++#: g10/gpg.c:3189 g10/gpg.c:3204
 +#, c-format
 +msgid "invalid filter option: %s\n"
 +msgstr "invalid filter option: %s\n"
 +
- #: g10/gpg.c:3162
++#: g10/gpg.c:3195
 +#, c-format
 +msgid "%s:%d: invalid export options\n"
 +msgstr "%s:%d: invalid export options\n"
 +
- #: g10/gpg.c:3165
++#: g10/gpg.c:3198
 +msgid "invalid export options\n"
 +msgstr "invalid export options\n"
 +
- #: g10/gpg.c:3177
++#: g10/gpg.c:3210
 +#, c-format
 +msgid "%s:%d: invalid list options\n"
 +msgstr "%s:%d: invalid list options\n"
 +
- #: g10/gpg.c:3180
++#: g10/gpg.c:3213
 +msgid "invalid list options\n"
 +msgstr "invalid list options\n"
 +
- #: g10/gpg.c:3188
++#: g10/gpg.c:3221
 +msgid "display photo IDs during signature verification"
 +msgstr "display photo IDs during signature verification"
 +
- #: g10/gpg.c:3190
++#: g10/gpg.c:3223
 +msgid "show policy URLs during signature verification"
 +msgstr "show policy URLs during signature verification"
 +
- #: g10/gpg.c:3192
++#: g10/gpg.c:3225
 +msgid "show all notations during signature verification"
 +msgstr "show all notations during signature verification"
 +
- #: g10/gpg.c:3194
++#: g10/gpg.c:3227
 +msgid "show IETF standard notations during signature verification"
 +msgstr "show IETF standard notations during signature verification"
 +
- #: g10/gpg.c:3198
++#: g10/gpg.c:3231
 +msgid "show user-supplied notations during signature verification"
 +msgstr "show user-supplied notations during signature verification"
 +
- #: g10/gpg.c:3200
++#: g10/gpg.c:3233
 +msgid "show preferred keyserver URLs during signature verification"
 +msgstr "show preferred keyserver URLs during signature verification"
 +
- #: g10/gpg.c:3202
++#: g10/gpg.c:3235
 +msgid "show user ID validity during signature verification"
 +msgstr "show user ID validity during signature verification"
 +
- #: g10/gpg.c:3204
++#: g10/gpg.c:3237
 +msgid "show revoked and expired user IDs in signature verification"
 +msgstr "show revoked and expired user IDs in signature verification"
 +
- #: g10/gpg.c:3206
++#: g10/gpg.c:3239
 +msgid "show only the primary user ID in signature verification"
 +msgstr "show only the primary user ID in signature verification"
 +
- #: g10/gpg.c:3208
++#: g10/gpg.c:3241
 +msgid "validate signatures with PKA data"
 +msgstr "validate signatures with PKA data"
 +
- #: g10/gpg.c:3210
++#: g10/gpg.c:3243
 +msgid "elevate the trust of signatures with valid PKA data"
 +msgstr "elevate the trust of signatures with valid PKA data"
 +
- #: g10/gpg.c:3217
++#: g10/gpg.c:3250
 +#, c-format
 +msgid "%s:%d: invalid verify options\n"
 +msgstr "%s:%d: invalid verify options\n"
 +
- #: g10/gpg.c:3220
++#: g10/gpg.c:3253
 +msgid "invalid verify options\n"
 +msgstr "invalid verify options\n"
 +
- #: g10/gpg.c:3227
++#: g10/gpg.c:3260
 +#, c-format
 +msgid "unable to set exec-path to %s\n"
 +msgstr "unable to set exec-path to %s\n"
 +
- #: g10/gpg.c:3417
++#: g10/gpg.c:3452
 +#, c-format
 +msgid "%s:%d: invalid auto-key-locate list\n"
 +msgstr "%s:%d: invalid auto-key-locate list\n"
 +
- #: g10/gpg.c:3420
++#: g10/gpg.c:3455
 +msgid "invalid auto-key-locate list\n"
 +msgstr "invalid auto-key-locate list\n"
 +
- #: g10/gpg.c:3553 sm/gpgsm.c:1507
++#: g10/gpg.c:3592 sm/gpgsm.c:1501
 +msgid "WARNING: program may create a core file!\n"
 +msgstr "WARNING: program may create a core file!\n"
 +
- #: g10/gpg.c:3564
++#: g10/gpg.c:3603
 +#, c-format
 +msgid "WARNING: %s overrides %s\n"
 +msgstr "WARNING: %s overrides %s\n"
 +
- #: g10/gpg.c:3573
++#: g10/gpg.c:3612
 +#, c-format
 +msgid "%s not allowed with %s!\n"
 +msgstr "%s not allowed with %s!\n"
 +
- #: g10/gpg.c:3576
++#: g10/gpg.c:3615
 +#, c-format
 +msgid "%s makes no sense with %s!\n"
 +msgstr "%s makes no sense with %s!\n"
 +
- #: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
++#: g10/gpg.c:3630 sm/gpgsm.c:1518 dirmngr/dirmngr.c:951
 +msgid "WARNING: running with faked system time: "
 +msgstr "WARNING: running with faked system time: "
 +
- #: g10/gpg.c:3612
++#: g10/gpg.c:3651
 +#, 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:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
++#: g10/gpg.c:3686 g10/gpg.c:3710 sm/gpgsm.c:1585
 +msgid "selected cipher algorithm is invalid\n"
 +msgstr "selected cipher algorithm is invalid\n"
 +
- #: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
++#: g10/gpg.c:3692 g10/gpg.c:3716 sm/gpgsm.c:1591 sm/gpgsm.c:1597
 +msgid "selected digest algorithm is invalid\n"
 +msgstr "selected digest algorithm is invalid\n"
 +
- #: g10/gpg.c:3659
++#: g10/gpg.c:3698
 +msgid "selected compression algorithm is invalid\n"
 +msgstr "selected compression algorithm is invalid\n"
 +
- #: g10/gpg.c:3665
++#: g10/gpg.c:3704
 +msgid "selected certification digest algorithm is invalid\n"
 +msgstr "selected certification digest algorithm is invalid\n"
 +
- #: g10/gpg.c:3680
++#: g10/gpg.c:3719
 +msgid "completes-needed must be greater than 0\n"
 +msgstr "completes-needed must be greater than 0\n"
 +
- #: g10/gpg.c:3682
++#: g10/gpg.c:3721
 +msgid "marginals-needed must be greater than 1\n"
 +msgstr "marginals-needed must be greater than 1\n"
 +
- #: g10/gpg.c:3684
++#: g10/gpg.c:3723
 +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:3686
++#: g10/gpg.c:3725
 +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:3688
++#: g10/gpg.c:3727
 +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:3691
++#: g10/gpg.c:3730
 +msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 +msgstr "Note: simple S2K mode (0) is strongly discouraged\n"
 +
- #: g10/gpg.c:3695
++#: g10/gpg.c:3734
 +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:3702
++#: g10/gpg.c:3741
 +msgid "invalid default preferences\n"
 +msgstr "invalid default preferences\n"
 +
- #: g10/gpg.c:3706
++#: g10/gpg.c:3745
 +msgid "invalid personal cipher preferences\n"
 +msgstr "invalid personal cipher preferences\n"
 +
- #: g10/gpg.c:3710
++#: g10/gpg.c:3749
 +msgid "invalid personal digest preferences\n"
 +msgstr "invalid personal digest preferences\n"
 +
- #: g10/gpg.c:3714
++#: g10/gpg.c:3753
 +msgid "invalid personal compress preferences\n"
 +msgstr "invalid personal compress preferences\n"
 +
- #: g10/gpg.c:3750
++#: g10/gpg.c:3789
 +#, c-format
 +msgid "%s does not yet work with %s\n"
 +msgstr "%s does not yet work with %s\n"
 +
- #: g10/gpg.c:3797
++#: g10/gpg.c:3836
 +#, c-format
 +msgid "you may not use cipher algorithm '%s' while in %s mode\n"
 +msgstr "you may not use cipher algorithm ‘%s’ while in %s mode\n"
 +
- #: g10/gpg.c:3802
++#: g10/gpg.c:3841
 +#, c-format
 +msgid "you may not use digest algorithm '%s' while in %s mode\n"
 +msgstr "you may not use digest algorithm ‘%s’ while in %s mode\n"
 +
- #: g10/gpg.c:3807
++#: g10/gpg.c:3846
 +#, c-format
 +msgid "you may not use compression algorithm '%s' while in %s mode\n"
 +msgstr "you may not use compression algorithm ‘%s’ while in %s mode\n"
 +
- #: g10/gpg.c:3906
++#: g10/gpg.c:3945
 +#, c-format
 +msgid "failed to initialize the TrustDB: %s\n"
 +msgstr "failed to initialize the TrustDB: %s\n"
 +
- #: g10/gpg.c:3918
++#: g10/gpg.c:3957
 +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:3975
- msgid "--store [filename]"
- msgstr "--store [filename]"
- 
- #: g10/gpg.c:3985
- msgid "--symmetric [filename]"
- msgstr "--symmetric [filename]"
- 
- #: g10/gpg.c:3989
++#: g10/gpg.c:4028
 +#, c-format
 +msgid "symmetric encryption of '%s' failed: %s\n"
 +msgstr "symmetric encryption of ‘%s’ failed: %s\n"
 +
- #: g10/gpg.c:4000
- msgid "--encrypt [filename]"
- msgstr "--encrypt [filename]"
- 
- #: g10/gpg.c:4016
- msgid "--symmetric --encrypt [filename]"
- msgstr "--symmetric --encrypt [filename]"
- 
- #: g10/gpg.c:4018
++#: g10/gpg.c:4057
 +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:4021
++#: g10/gpg.c:4060
 +#, c-format
 +msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 +msgstr "you cannot use --symmetric --encrypt while in %s mode\n"
 +
- #: g10/gpg.c:4042
- msgid "--sign [filename]"
- msgstr "--sign [filename]"
- 
- #: g10/gpg.c:4058
- msgid "--sign --encrypt [filename]"
- msgstr "--sign --encrypt [filename]"
- 
- #: g10/gpg.c:4076
- msgid "--symmetric --sign --encrypt [filename]"
- msgstr "--symmetric --sign --encrypt [filename]"
- 
- #: g10/gpg.c:4078
++#: g10/gpg.c:4117
 +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:4081
++#: g10/gpg.c:4120
 +#, c-format
 +msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 +msgstr "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 +
- #: g10/gpg.c:4105
- msgid "--sign --symmetric [filename]"
- msgstr "--sign --symmetric [filename]"
- 
- #: g10/gpg.c:4117
- msgid "--clearsign [filename]"
- msgstr "--clearsign [filename]"
- 
- #: g10/gpg.c:4147
- msgid "--decrypt [filename]"
- msgstr "--decrypt [filename]"
- 
- #: g10/gpg.c:4174
- msgid "--sign-key user-id"
- msgstr "--sign-key user-id"
- 
- #: g10/gpg.c:4178
- msgid "--lsign-key user-id"
- msgstr "--lsign-key user-id"
- 
- #: g10/gpg.c:4199
- msgid "--edit-key user-id [commands]"
- msgstr "--edit-key user-id [commands]"
- 
- #: g10/gpg.c:4215
- msgid "--passwd <user-id>"
- msgstr "--passwd <user-id>"
- 
- #: g10/gpg.c:4411 g10/keyserver.c:1837
++#: g10/gpg.c:4462 g10/keyserver.c:1837
 +#, c-format
 +msgid "keyserver send failed: %s\n"
 +msgstr "keyserver send failed: %s\n"
 +
- #: g10/gpg.c:4416
++#: g10/gpg.c:4467
 +#, c-format
 +msgid "keyserver receive failed: %s\n"
 +msgstr "keyserver receive failed: %s\n"
 +
- #: g10/gpg.c:4422
++#: g10/gpg.c:4473
 +#, c-format
 +msgid "key export failed: %s\n"
 +msgstr "key export failed: %s\n"
 +
- #: g10/gpg.c:4435
++#: g10/gpg.c:4486
 +#, c-format
 +msgid "export as ssh key failed: %s\n"
 +msgstr "export as ssh key failed: %s\n"
 +
- #: g10/gpg.c:4447
++#: g10/gpg.c:4498
 +#, c-format
 +msgid "keyserver search failed: %s\n"
 +msgstr "keyserver search failed: %s\n"
 +
- #: g10/gpg.c:4460
++#: g10/gpg.c:4511
 +#, c-format
 +msgid "keyserver refresh failed: %s\n"
 +msgstr "keyserver refresh failed: %s\n"
 +
- #: g10/gpg.c:4527
++#: g10/gpg.c:4578
 +#, c-format
 +msgid "dearmoring failed: %s\n"
 +msgstr "dearmoring failed: %s\n"
 +
- #: g10/gpg.c:4538
++#: g10/gpg.c:4589
 +#, c-format
 +msgid "enarmoring failed: %s\n"
 +msgstr "enarmoring failed: %s\n"
 +
- #: g10/gpg.c:4630
++#: g10/gpg.c:4681
 +#, c-format
 +msgid "invalid hash algorithm '%s'\n"
 +msgstr "invalid hash algorithm ‘%s’\n"
 +
- #: g10/gpg.c:4776 g10/tofu.c:2002
++#: g10/gpg.c:4827 g10/tofu.c:2151
 +#, c-format
 +msgid "error parsing key specification '%s': %s\n"
 +msgstr "error parsing key specification '%s': %s\n"
 +
- #: g10/gpg.c:4788
++#: g10/gpg.c:4839
 +#, 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:4835
- msgid "[filename]"
- msgstr "[filename]"
- 
- #: g10/gpg.c:4841
++#: g10/gpg.c:4894
 +msgid "Go ahead and type your message ...\n"
 +msgstr "Go ahead and type your message ...\n"
 +
- #: g10/gpg.c:5179
++#: g10/gpg.c:5232
 +msgid "the given certification policy URL is invalid\n"
 +msgstr "the given certification policy URL is invalid\n"
 +
- #: g10/gpg.c:5181
++#: g10/gpg.c:5234
 +msgid "the given signature policy URL is invalid\n"
 +msgstr "the given signature policy URL is invalid\n"
 +
- #: g10/gpg.c:5214
++#: g10/gpg.c:5267
 +msgid "the given preferred keyserver URL is invalid\n"
 +msgstr "the given preferred keyserver URL is invalid\n"
 +
 +#: g10/gpgv.c:77
 +msgid "|FILE|take the keys from the keyring FILE"
 +msgstr "|FILE|take the keys from the keyring FILE"
 +
 +#: g10/gpgv.c:80
 +msgid "make timestamp conflicts only a warning"
 +msgstr "make timestamp conflicts only a warning"
 +
- #: g10/gpgv.c:82 sm/gpgsm.c:345
++#: g10/gpgv.c:82 sm/gpgsm.c:347
 +msgid "|FD|write status info to this FD"
 +msgstr "|FD|write status info to this FD"
 +
 +#: g10/gpgv.c:86
 +msgid "|ALGO|reject signatures made with ALGO"
 +msgstr "|ALGO|reject signatures made with ALGO"
 +
 +#: g10/gpgv.c:124
 +msgid "Usage: gpgv [options] [files] (-h for help)"
 +msgstr "Usage: gpgv [options] [files] (-h for help)"
 +
 +#: g10/gpgv.c:126
 +msgid ""
 +"Syntax: gpgv [options] [files]\n"
 +"Check signatures against known trusted keys\n"
 +msgstr ""
 +"Syntax: gpgv [options] [files]\n"
 +"Check signatures against known trusted keys\n"
 +
 +#: g10/helptext.c:72
 +msgid "No help available"
 +msgstr "No help available"
 +
 +#: g10/helptext.c:82
 +#, c-format
 +msgid "No help available for '%s'"
 +msgstr "No help available for ‘%s’"
 +
- #: g10/import.c:151
++#: g10/import.c:152
 +msgid "import signatures that are marked as local-only"
 +msgstr "import signatures that are marked as local-only"
 +
- #: g10/import.c:154
++#: g10/import.c:155
 +msgid "repair damage from the pks keyserver during import"
 +msgstr "repair damage from the pks keyserver during import"
 +
- #: g10/import.c:157
++#: g10/import.c:158
 +msgid "do not clear the ownertrust values during import"
 +msgstr "do not clear the ownertrust values during import"
 +
- #: g10/import.c:160
++#: g10/import.c:161
 +msgid "do not update the trustdb after import"
 +msgstr "do not update the trustdb after import"
 +
- #: g10/import.c:163
++#: g10/import.c:164
 +msgid "show key during import"
 +msgstr "show key during import"
 +
- #: g10/import.c:166
++#: g10/import.c:167
 +msgid "only accept updates to existing keys"
 +msgstr "only accept updates to existing keys"
 +
- #: g10/import.c:169
++#: g10/import.c:170
 +msgid "remove unusable parts from key after import"
 +msgstr "remove unusable parts from key after import"
 +
- #: g10/import.c:172
++#: g10/import.c:173
 +msgid "remove as much as possible from key after import"
 +msgstr "remove as much as possible from key after import"
 +
- #: g10/import.c:175
++#: g10/import.c:176
 +msgid "run import filters and export key immediately"
 +msgstr "run import filters and export key immediately"
 +
- #: g10/import.c:326 g10/import.c:568
++#: g10/import.c:327 g10/import.c:569
 +#, c-format
 +msgid "skipping block of type %d\n"
 +msgstr "skipping block of type %d\n"
 +
- #: g10/import.c:585
++#: g10/import.c:586
 +#, c-format
 +msgid "%lu keys processed so far\n"
 +msgstr "%lu keys processed so far\n"
 +
- #: g10/import.c:655
++#: g10/import.c:656
 +#, c-format
 +msgid "Total number processed: %lu\n"
 +msgstr "Total number processed: %lu\n"
 +
- #: g10/import.c:658
++#: g10/import.c:659
 +#, c-format
 +msgid "    skipped PGP-2 keys: %lu\n"
 +msgstr "    skipped PGP-2 keys: %lu\n"
 +
- #: g10/import.c:660
++#: g10/import.c:661
 +#, c-format
 +msgid "      skipped new keys: %lu\n"
 +msgstr "      skipped new keys: %lu\n"
 +
- #: g10/import.c:663
++#: g10/import.c:664
 +#, c-format
 +msgid "          w/o user IDs: %lu\n"
 +msgstr "          w/o user IDs: %lu\n"
 +
- #: g10/import.c:666 sm/import.c:130
++#: g10/import.c:667 sm/import.c:130
 +#, c-format
 +msgid "              imported: %lu"
 +msgstr "              imported: %lu"
 +
- #: g10/import.c:670 sm/import.c:134
++#: g10/import.c:671 sm/import.c:134
 +#, c-format
 +msgid "             unchanged: %lu\n"
 +msgstr "             unchanged: %lu\n"
 +
- #: g10/import.c:672
++#: g10/import.c:673
 +#, c-format
 +msgid "          new user IDs: %lu\n"
 +msgstr "          new user IDs: %lu\n"
 +
- #: g10/import.c:674
++#: g10/import.c:675
 +#, c-format
 +msgid "           new subkeys: %lu\n"
 +msgstr "           new subkeys: %lu\n"
 +
- #: g10/import.c:676
++#: g10/import.c:677
 +#, c-format
 +msgid "        new signatures: %lu\n"
 +msgstr "        new signatures: %lu\n"
 +
- #: g10/import.c:678
++#: g10/import.c:679
 +#, c-format
 +msgid "   new key revocations: %lu\n"
 +msgstr "   new key revocations: %lu\n"
 +
- #: g10/import.c:680 sm/import.c:136
++#: g10/import.c:681 sm/import.c:136
 +#, c-format
 +msgid "      secret keys read: %lu\n"
 +msgstr "      secret keys read: %lu\n"
 +
- #: g10/import.c:682 sm/import.c:138
++#: g10/import.c:683 sm/import.c:138
 +#, c-format
 +msgid "  secret keys imported: %lu\n"
 +msgstr "  secret keys imported: %lu\n"
 +
- #: g10/import.c:684 sm/import.c:140
++#: g10/import.c:685 sm/import.c:140
 +#, c-format
 +msgid " secret keys unchanged: %lu\n"
 +msgstr " secret keys unchanged: %lu\n"
 +
- #: g10/import.c:686 sm/import.c:142
++#: g10/import.c:687 sm/import.c:142
 +#, c-format
 +msgid "          not imported: %lu\n"
 +msgstr "          not imported: %lu\n"
 +
- #: g10/import.c:688
++#: g10/import.c:689
 +#, c-format
 +msgid "    signatures cleaned: %lu\n"
 +msgstr "    signatures cleaned: %lu\n"
 +
- #: g10/import.c:690
++#: g10/import.c:691
 +#, c-format
 +msgid "      user IDs cleaned: %lu\n"
 +msgstr "      user IDs cleaned: %lu\n"
 +
- #: g10/import.c:1034
++#: g10/import.c:1035
 +#, c-format
 +msgid ""
 +"WARNING: key %s contains preferences for unavailable\n"
 +"algorithms on these user IDs:\n"
 +msgstr ""
 +"WARNING: key %s contains preferences for unavailable\n"
 +"algorithms on these user IDs:\n"
 +
- #: g10/import.c:1076
++#: g10/import.c:1077
 +#, c-format
 +msgid "         \"%s\": preference for cipher algorithm %s\n"
 +msgstr "         “%s”: preference for cipher algorithm %s\n"
 +
- #: g10/import.c:1091
++#: g10/import.c:1092
 +#, c-format
 +msgid "         \"%s\": preference for digest algorithm %s\n"
 +msgstr "         “%s”: preference for digest algorithm %s\n"
 +
- #: g10/import.c:1103
++#: g10/import.c:1104
 +#, c-format
 +msgid "         \"%s\": preference for compression algorithm %s\n"
 +msgstr "         “%s”: preference for compression algorithm %s\n"
 +
- #: g10/import.c:1116
++#: g10/import.c:1117
 +msgid "it is strongly suggested that you update your preferences and\n"
 +msgstr "it is strongly suggested that you update your preferences and\n"
 +
- #: g10/import.c:1118
++#: g10/import.c:1119
 +msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 +msgstr ""
 +"re-distribute this key to avoid potential algorithm mismatch problems\n"
 +
- #: g10/import.c:1143
++#: g10/import.c:1144
 +#, c-format
 +msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 +msgstr "you can update your preferences with: gpg --edit-key %s updpref save\n"
 +
- #: g10/import.c:1379 g10/import.c:2167
++#: g10/import.c:1380 g10/import.c:2168
 +#, c-format
 +msgid "key %s: no user ID\n"
 +msgstr "key %s: no user ID\n"
 +
- #: g10/import.c:1385
++#: g10/import.c:1386
 +#, c-format
 +msgid "key %s: %s\n"
 +msgstr "key %s: %s\n"
 +
- #: g10/import.c:1386 g10/import.c:2141
++#: g10/import.c:1387 g10/import.c:2142
 +msgid "rejected by import screener"
 +msgstr "rejected by import screener"
 +
- #: g10/import.c:1416
++#: g10/import.c:1417
 +#, c-format
 +msgid "key %s: PKS subkey corruption repaired\n"
 +msgstr "key %s: PKS subkey corruption repaired\n"
 +
- #: g10/import.c:1434
++#: g10/import.c:1435
 +#, c-format
 +msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 +msgstr "key %s: accepted non self-signed user ID “%s”\n"
 +
- #: g10/import.c:1444 g10/import.c:1475
++#: g10/import.c:1445 g10/import.c:1476
 +#, c-format
 +msgid "key %s: no valid user IDs\n"
 +msgstr "key %s: no valid user IDs\n"
 +
- #: g10/import.c:1446
++#: g10/import.c:1447
 +msgid "this may be caused by a missing self-signature\n"
 +msgstr "this may be caused by a missing self-signature\n"
 +
- #: g10/import.c:1516 g10/import.c:2318
++#: g10/import.c:1517 g10/import.c:2319
 +#, c-format
 +msgid "key %s: public key not found: %s\n"
 +msgstr "key %s: public key not found: %s\n"
 +
- #: g10/import.c:1522
++#: g10/import.c:1523
 +#, c-format
 +msgid "key %s: new key - skipped\n"
 +msgstr "key %s: new key - skipped\n"
 +
- #: g10/import.c:1537
++#: g10/import.c:1538
 +#, c-format
 +msgid "no writable keyring found: %s\n"
 +msgstr "no writable keyring found: %s\n"
 +
- #: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
++#: g10/import.c:1547 g10/import.c:1648 g10/import.c:2385
 +#, c-format
 +msgid "error writing keyring '%s': %s\n"
 +msgstr "error writing keyring '%s': %s\n"
 +
- #: g10/import.c:1566
++#: g10/import.c:1567
 +#, c-format
 +msgid "key %s: public key \"%s\" imported\n"
 +msgstr "key %s: public key “%s” imported\n"
 +
- #: g10/import.c:1590
++#: g10/import.c:1591
 +#, c-format
 +msgid "key %s: doesn't match our copy\n"
 +msgstr "key %s: doesn't match our copy\n"
 +
- #: g10/import.c:1606 g10/import.c:2342
++#: g10/import.c:1607 g10/import.c:2343
 +#, c-format
 +msgid "key %s: can't locate original keyblock: %s\n"
 +msgstr "key %s: can't locate original keyblock: %s\n"
 +
- #: g10/import.c:1614 g10/import.c:2349
++#: g10/import.c:1615 g10/import.c:2350
 +#, c-format
 +msgid "key %s: can't read original keyblock: %s\n"
 +msgstr "key %s: can't read original keyblock: %s\n"
 +
- #: g10/import.c:1657
++#: g10/import.c:1658
 +#, c-format
 +msgid "key %s: \"%s\" 1 new user ID\n"
 +msgstr "key %s: “%s” 1 new user ID\n"
 +
- #: g10/import.c:1660
++#: g10/import.c:1661
 +#, c-format
 +msgid "key %s: \"%s\" %d new user IDs\n"
 +msgstr "key %s: “%s” %d new user IDs\n"
 +
- #: g10/import.c:1663
++#: g10/import.c:1664
 +#, c-format
 +msgid "key %s: \"%s\" 1 new signature\n"
 +msgstr "key %s: “%s” 1 new signature\n"
 +
- #: g10/import.c:1666
++#: g10/import.c:1667
 +#, c-format
 +msgid "key %s: \"%s\" %d new signatures\n"
 +msgstr "key %s: “%s” %d new signatures\n"
 +
- #: g10/import.c:1669
++#: g10/import.c:1670
 +#, c-format
 +msgid "key %s: \"%s\" 1 new subkey\n"
 +msgstr "key %s: “%s” 1 new subkey\n"
 +
- #: g10/import.c:1672
++#: g10/import.c:1673
 +#, c-format
 +msgid "key %s: \"%s\" %d new subkeys\n"
 +msgstr "key %s: “%s” %d new subkeys\n"
 +
- #: g10/import.c:1675
++#: g10/import.c:1676
 +#, c-format
 +msgid "key %s: \"%s\" %d signature cleaned\n"
 +msgstr "key %s: “%s” %d signature cleaned\n"
 +
- #: g10/import.c:1678
++#: g10/import.c:1679
 +#, c-format
 +msgid "key %s: \"%s\" %d signatures cleaned\n"
 +msgstr "key %s: “%s” %d signatures cleaned\n"
 +
- #: g10/import.c:1681
++#: g10/import.c:1682
 +#, c-format
 +msgid "key %s: \"%s\" %d user ID cleaned\n"
 +msgstr "key %s: “%s” %d user ID cleaned\n"
 +
- #: g10/import.c:1684
++#: g10/import.c:1685
 +#, c-format
 +msgid "key %s: \"%s\" %d user IDs cleaned\n"
 +msgstr "key %s: “%s” %d user IDs cleaned\n"
 +
- #: g10/import.c:1707
++#: g10/import.c:1708
 +#, c-format
 +msgid "key %s: \"%s\" not changed\n"
 +msgstr "key %s: “%s” not changed\n"
 +
- #: g10/import.c:2019 g10/import.c:2264
++#: g10/import.c:2020 g10/import.c:2265
 +#, c-format
 +msgid "key %s: secret key imported\n"
 +msgstr "key %s: secret key imported\n"
 +
- #: g10/import.c:2027
++#: g10/import.c:2028
 +#, c-format
 +msgid "key %s: secret key already exists\n"
 +msgstr "key %s: secret key already exists\n"
 +
- #: g10/import.c:2035
++#: g10/import.c:2036
 +#, c-format
 +msgid "key %s: error sending to agent: %s\n"
 +msgstr "key %s: error sending to agent: %s\n"
 +
- #: g10/import.c:2140
++#: g10/import.c:2141
 +#, c-format
 +msgid "secret key %s: %s\n"
 +msgstr "secret key %s: %s\n"
 +
- #: g10/import.c:2160 g10/import.c:2195
++#: g10/import.c:2161 g10/import.c:2196
 +msgid "importing secret keys not allowed\n"
 +msgstr "importing secret keys not allowed\n"
 +
- #: g10/import.c:2184
++#: g10/import.c:2185
 +#, c-format
 +msgid "key %s: secret key with invalid cipher %d - skipped\n"
 +msgstr "key %s: secret key with invalid cipher %d - skipped\n"
 +
 +#. TRANSLATORS: For smartcard, each private key on
 +#. host has a reference (stub) to a smartcard and
 +#. actual private key data is stored on the card.  A
 +#. single smartcard can have up to three private key
 +#. data.  Importing private key stub is always
 +#. skipped in 2.1, and it returns
 +#. GPG_ERR_NOT_PROCESSED.  Instead, user should be
 +#. suggested to run 'gpg --card-status', then,
 +#. references to a card will be automatically
 +#. created again.
- #: g10/import.c:2256
++#: g10/import.c:2257
 +#, c-format
 +msgid "To migrate '%s', with each smartcard, run: %s\n"
 +msgstr "To migrate '%s', with each smartcard, run: %s\n"
 +
- #: g10/import.c:2311
++#: g10/import.c:2312
 +#, c-format
 +msgid "key %s: no public key - can't apply revocation certificate\n"
 +msgstr "key %s: no public key - can't apply revocation certificate\n"
 +
- #: g10/import.c:2360
++#: g10/import.c:2361
 +#, c-format
 +msgid "key %s: invalid revocation certificate: %s - rejected\n"
 +msgstr "key %s: invalid revocation certificate: %s - rejected\n"
 +
- #: g10/import.c:2393
++#: g10/import.c:2394
 +#, c-format
 +msgid "key %s: \"%s\" revocation certificate imported\n"
 +msgstr "key %s: “%s” revocation certificate imported\n"
 +
- #: g10/import.c:2469
++#: g10/import.c:2470
 +#, c-format
 +msgid "key %s: no user ID for signature\n"
 +msgstr "key %s: no user ID for signature\n"
 +
- #: g10/import.c:2486
++#: g10/import.c:2487
 +#, c-format
 +msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 +msgstr "key %s: unsupported public key algorithm on user ID “%s”\n"
 +
- #: g10/import.c:2488
++#: g10/import.c:2489
 +#, c-format
 +msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 +msgstr "key %s: invalid self-signature on user ID “%s”\n"
 +
- #: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
++#: g10/import.c:2506 g10/import.c:2532 g10/import.c:2583
 +#, c-format
 +msgid "key %s: unsupported public key algorithm\n"
 +msgstr "key %s: unsupported public key algorithm\n"
 +
- #: g10/import.c:2506
++#: g10/import.c:2507
 +#, c-format
 +msgid "key %s: invalid direct key signature\n"
 +msgstr "key %s: invalid direct key signature\n"
 +
- #: g10/import.c:2520
++#: g10/import.c:2521
 +#, c-format
 +msgid "key %s: no subkey for key binding\n"
 +msgstr "key %s: no subkey for key binding\n"
 +
- #: g10/import.c:2533
++#: g10/import.c:2534
 +#, c-format
 +msgid "key %s: invalid subkey binding\n"
 +msgstr "key %s: invalid subkey binding\n"
 +
- #: g10/import.c:2549
++#: g10/import.c:2550
 +#, c-format
 +msgid "key %s: removed multiple subkey binding\n"
 +msgstr "key %s: removed multiple subkey binding\n"
 +
- #: g10/import.c:2571
++#: g10/import.c:2572
 +#, c-format
 +msgid "key %s: no subkey for key revocation\n"
 +msgstr "key %s: no subkey for key revocation\n"
 +
- #: g10/import.c:2584
++#: g10/import.c:2585
 +#, c-format
 +msgid "key %s: invalid subkey revocation\n"
 +msgstr "key %s: invalid subkey revocation\n"
 +
- #: g10/import.c:2599
++#: g10/import.c:2600
 +#, c-format
 +msgid "key %s: removed multiple subkey revocation\n"
 +msgstr "key %s: removed multiple subkey revocation\n"
 +
- #: g10/import.c:2641
++#: g10/import.c:2642
 +#, c-format
 +msgid "key %s: skipped user ID \"%s\"\n"
 +msgstr "key %s: skipped user ID “%s”\n"
 +
- #: g10/import.c:2665
++#: g10/import.c:2666
 +#, c-format
 +msgid "key %s: skipped subkey\n"
 +msgstr "key %s: skipped subkey\n"
 +
- #: g10/import.c:2694
++#: g10/import.c:2695
 +#, c-format
 +msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 +msgstr "key %s: non exportable signature (class 0x%02X) - skipped\n"
 +
- #: g10/import.c:2705
++#: g10/import.c:2706
 +#, c-format
 +msgid "key %s: revocation certificate at wrong place - skipped\n"
 +msgstr "key %s: revocation certificate at wrong place - skipped\n"
 +
- #: g10/import.c:2723
++#: g10/import.c:2724
 +#, c-format
 +msgid "key %s: invalid revocation certificate: %s - skipped\n"
 +msgstr "key %s: invalid revocation certificate: %s - skipped\n"
 +
- #: g10/import.c:2737
++#: g10/import.c:2738
 +#, c-format
 +msgid "key %s: subkey signature in wrong place - skipped\n"
 +msgstr "key %s: subkey signature in wrong place - skipped\n"
 +
- #: g10/import.c:2745
++#: g10/import.c:2746
 +#, c-format
 +msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 +msgstr "key %s: unexpected signature class (0x%02X) - skipped\n"
 +
- #: g10/import.c:2887
++#: g10/import.c:2888
 +#, c-format
 +msgid "key %s: duplicated user ID detected - merged\n"
 +msgstr "key %s: duplicated user ID detected - merged\n"
 +
- #: g10/import.c:2951
++#: g10/import.c:2952
 +#, c-format
 +msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 +msgstr "WARNING: key %s may be revoked: fetching revocation key %s\n"
 +
- #: g10/import.c:2967
++#: g10/import.c:2968
 +#, c-format
 +msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 +msgstr "WARNING: key %s may be revoked: revocation key %s not present.\n"
 +
- #: g10/import.c:3031
++#: g10/import.c:3032
 +#, c-format
 +msgid "key %s: \"%s\" revocation certificate added\n"
 +msgstr "key %s: “%s” revocation certificate added\n"
 +
- #: g10/import.c:3069
++#: g10/import.c:3070
 +#, c-format
 +msgid "key %s: direct key signature added\n"
 +msgstr "key %s: direct key signature added\n"
 +
 +#: g10/keydb.c:404 g10/keydb.c:431 sm/keydb.c:213 sm/keydb.c:226
 +#, c-format
 +msgid "error creating keybox '%s': %s\n"
 +msgstr "error creating keybox '%s': %s\n"
 +
 +#: g10/keydb.c:407 g10/keydb.c:434
 +#, c-format
 +msgid "error creating keyring '%s': %s\n"
 +msgstr "error creating keyring '%s': %s\n"
 +
 +#: g10/keydb.c:443 sm/keydb.c:232
 +#, c-format
 +msgid "keybox '%s' created\n"
 +msgstr "keybox ‘%s’ created\n"
 +
 +#: g10/keydb.c:445
 +#, c-format
 +msgid "keyring '%s' created\n"
 +msgstr "keyring ‘%s’ created\n"
 +
 +#: g10/keydb.c:823
 +#, c-format
 +msgid "keyblock resource '%s': %s\n"
 +msgstr "keyblock resource '%s': %s\n"
 +
 +#: g10/keydb.c:911
 +#, c-format
 +msgid "error opening key DB: %s\n"
 +msgstr "error opening key DB: %s\n"
 +
- #: g10/keydb.c:1782
++#: g10/keydb.c:1786
 +#, c-format
 +msgid "failed to rebuild keyring cache: %s\n"
 +msgstr "failed to rebuild keyring cache: %s\n"
 +
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
 +msgid "[revocation]"
 +msgstr "[revocation]"
 +
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
 +msgid "[self-signature]"
 +msgstr "[self-signature]"
 +
- #: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
++#: g10/keyedit.c:433 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: dirmngr/ldap-wrapper.c:694
 +#, c-format
 +msgid "error allocating memory: %s\n"
 +msgstr "error allocating memory: %s\n"
 +
- #: g10/keyedit.c:629
++#: g10/keyedit.c:630
 +#, c-format
 +msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
 +msgstr ""
 +"can't check signature with unsupported public-key algorithm (%d): %s.\n"
 +
- #: g10/keyedit.c:638
++#: g10/keyedit.c:639
 +#, c-format
 +msgid ""
 +"can't check signature with unsupported message-digest algorithm %d: %s.\n"
 +msgstr ""
 +"can't check signature with unsupported message-digest algorithm %d: %s.\n"
 +
- #: g10/keyedit.c:800
++#: g10/keyedit.c:801
 +msgid " (reordered signatures follow)"
 +msgstr " (reordered signatures follow)"
 +
- #: g10/keyedit.c:913
++#: g10/keyedit.c:914
 +#, c-format
 +msgid "key %s:\n"
 +msgstr "key %s:\n"
 +
- #: g10/keyedit.c:916
++#: g10/keyedit.c:917
 +#, c-format
 +msgid "%d duplicate signature removed\n"
 +msgid_plural "%d duplicate signatures removed\n"
 +msgstr[0] "%d duplicate signature removed\n"
 +msgstr[1] "%d duplicate signatures removed\n"
 +
- #: g10/keyedit.c:919 g10/keylist.c:480
++#: g10/keyedit.c:920 g10/keylist.c:480
 +#, c-format
 +msgid "%d signature not checked due to a missing key\n"
 +msgid_plural "%d signatures not checked due to missing keys\n"
 +msgstr[0] "%d signature not checked due to a missing key\n"
 +msgstr[1] "%d signatures not checked due to missing keys\n"
 +
- #: g10/keyedit.c:923 g10/keylist.c:476
++#: g10/keyedit.c:924 g10/keylist.c:476
 +#, c-format
 +msgid "%d bad signature\n"
 +msgid_plural "%d bad signatures\n"
 +msgstr[0] "%d bad signature\n"
 +msgstr[1] "%d bad signatures\n"
 +
- #: g10/keyedit.c:927
++#: g10/keyedit.c:928
 +#, c-format
 +msgid "%d signature reordered\n"
 +msgid_plural "%d signatures reordered\n"
 +msgstr[0] "%d signature reordered\n"
 +msgstr[1] "%d signatures reordered\n"
 +
- #: g10/keyedit.c:932
++#: g10/keyedit.c:933
 +#, c-format
 +msgid ""
 +"Warning: errors found and only checked self-signatures, run '%s' to check "
 +"all signatures.\n"
 +msgstr ""
 +"Warning: errors found and only checked self-signatures, run ‘%s’ to "
 +"check all signatures.\n"
 +
- #: g10/keyedit.c:992 g10/pkclist.c:274
++#: g10/keyedit.c:993 g10/pkclist.c:274
 +msgid ""
 +"Please decide how far you trust this user to correctly verify other users' "
 +"keys\n"
 +"(by looking at passports, checking fingerprints from different sources, "
 +"etc.)\n"
 +msgstr ""
 +"Please decide how far you trust this user to correctly verify other users' "
 +"keys\n"
 +"(by looking at passports, checking fingerprints from different sources, "
 +"etc.)\n"
 +
- #: g10/keyedit.c:996 g10/pkclist.c:286
++#: g10/keyedit.c:997 g10/pkclist.c:286
 +#, c-format
 +msgid "  %d = I trust marginally\n"
 +msgstr "  %d = I trust marginally\n"
 +
- #: g10/keyedit.c:997 g10/pkclist.c:288
++#: g10/keyedit.c:998 g10/pkclist.c:288
 +#, c-format
 +msgid "  %d = I trust fully\n"
 +msgstr "  %d = I trust fully\n"
 +
- #: g10/keyedit.c:1015
++#: g10/keyedit.c:1016
 +msgid ""
 +"Please enter the depth of this trust signature.\n"
 +"A depth greater than 1 allows the key you are signing to make\n"
 +"trust signatures on your behalf.\n"
 +msgstr ""
 +"Please enter the depth of this trust signature.\n"
 +"A depth greater than 1 allows the key you are signing to make\n"
 +"trust signatures on your behalf.\n"
 +
- #: g10/keyedit.c:1032
++#: g10/keyedit.c:1033
 +msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 +msgstr "Please enter a domain to restrict this signature, or enter for none.\n"
 +
- #: g10/keyedit.c:1160
++#: g10/keyedit.c:1161
 +#, c-format
 +msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 +msgstr "Skipping user ID “%s”, which is not a text ID.\n"
 +
- #: g10/keyedit.c:1168
++#: g10/keyedit.c:1169
 +#, c-format
 +msgid "User ID \"%s\" is revoked."
 +msgstr "User ID “%s” is revoked."
 +
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
- #: g10/keyedit.c:2246
++#: g10/keyedit.c:1178 g10/keyedit.c:1206 g10/keyedit.c:1233 g10/keyedit.c:1417
++#: g10/keyedit.c:2247
 +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:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
- #: g10/keyedit.c:2251 g10/keyedit.c:3177
++#: g10/keyedit.c:1192 g10/keyedit.c:1220 g10/keyedit.c:1247 g10/keyedit.c:1423
++#: g10/keyedit.c:2252 g10/keyedit.c:3178
 +msgid "  Unable to sign.\n"
 +msgstr "  Unable to sign.\n"
 +
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1197
 +#, c-format
 +msgid "User ID \"%s\" is expired."
 +msgstr "User ID “%s” is expired."
 +
- #: g10/keyedit.c:1224
++#: g10/keyedit.c:1225
 +#, c-format
 +msgid "User ID \"%s\" is not self-signed."
 +msgstr "User ID “%s” is not self-signed."
 +
- #: g10/keyedit.c:1253
++#: g10/keyedit.c:1254
 +#, c-format
 +msgid "User ID \"%s\" is signable.  "
 +msgstr "User ID “%s” is signable.  "
 +
- #: g10/keyedit.c:1255
++#: g10/keyedit.c:1256
 +msgid "Sign it? (y/N) "
 +msgstr "Sign it? (y/N) "
 +
- #: g10/keyedit.c:1282
++#: g10/keyedit.c:1283
 +#, c-format
 +msgid ""
 +"The self-signature on \"%s\"\n"
 +"is a PGP 2.x-style signature.\n"
 +msgstr ""
 +"The self-signature on “%s”\n"
 +"is a PGP 2.x-style signature.\n"
 +
- #: g10/keyedit.c:1291
++#: g10/keyedit.c:1292
 +msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 +msgstr "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 +
- #: g10/keyedit.c:1304
++#: g10/keyedit.c:1305
 +#, c-format
 +msgid ""
 +"Your current signature on \"%s\"\n"
 +"has expired.\n"
 +msgstr ""
 +"Your current signature on “%s”\n"
 +"has expired.\n"
 +
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:1310
 +msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 +msgstr ""
 +"Do you want to issue a new signature to replace the expired one? (y/N) "
 +
- #: g10/keyedit.c:1330
++#: g10/keyedit.c:1331
 +#, c-format
 +msgid ""
 +"Your current signature on \"%s\"\n"
 +"is a local signature.\n"
 +msgstr ""
 +"Your current signature on “%s”\n"
 +"is a local signature.\n"
 +
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:1336
 +msgid "Do you want to promote it to a full exportable signature? (y/N) "
 +msgstr "Do you want to promote it to a full exportable signature? (y/N) "
 +
- #: g10/keyedit.c:1355
++#: g10/keyedit.c:1356
 +#, c-format
 +msgid "\"%s\" was already locally signed by key %s\n"
 +msgstr "“%s” was already locally signed by key %s\n"
 +
- #: g10/keyedit.c:1359
++#: g10/keyedit.c:1360
 +#, c-format
 +msgid "\"%s\" was already signed by key %s\n"
 +msgstr "“%s” was already signed by key %s\n"
 +
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:1365
 +msgid "Do you want to sign it again anyway? (y/N) "
 +msgstr "Do you want to sign it again anyway? (y/N) "
 +
- #: g10/keyedit.c:1386
++#: g10/keyedit.c:1387
 +#, c-format
 +msgid "Nothing to sign with key %s\n"
 +msgstr "Nothing to sign with key %s\n"
 +
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1411
 +msgid "This key has expired!"
 +msgstr "This key has expired!"
 +
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1429
 +#, c-format
 +msgid "This key is due to expire on %s.\n"
 +msgstr "This key is due to expire on %s.\n"
 +
- #: g10/keyedit.c:1434
++#: g10/keyedit.c:1435
 +msgid "Do you want your signature to expire at the same time? (Y/n) "
 +msgstr "Do you want your signature to expire at the same time? (Y/n) "
 +
- #: g10/keyedit.c:1475
++#: g10/keyedit.c:1476
 +msgid ""
 +"How carefully have you verified the key you are about to sign actually "
 +"belongs\n"
 +"to the person named above?  If you don't know what to answer, enter \"0\".\n"
 +msgstr ""
 +"How carefully have you verified the key you are about to sign actually "
 +"belongs\n"
 +"to the person named above?  If you don't know what to answer, enter "
 +"“0”.\n"
 +
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1481
 +#, c-format
 +msgid "   (0) I will not answer.%s\n"
 +msgstr "   (0) I will not answer.%s\n"
 +
- #: g10/keyedit.c:1482
++#: g10/keyedit.c:1483
 +#, c-format
 +msgid "   (1) I have not checked at all.%s\n"
 +msgstr "   (1) I have not checked at all.%s\n"
 +
- #: g10/keyedit.c:1484
++#: g10/keyedit.c:1485
 +#, c-format
 +msgid "   (2) I have done casual checking.%s\n"
 +msgstr "   (2) I have done casual checking.%s\n"
 +
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:1488
 +#, c-format
 +msgid "   (3) I have done very careful checking.%s\n"
 +msgstr "   (3) I have done very careful checking.%s\n"
 +
- #: g10/keyedit.c:1494
++#: g10/keyedit.c:1495
 +msgid "Your selection? (enter '?' for more information): "
 +msgstr "Your selection? (enter ‘?’ for more information): "
 +
- #: g10/keyedit.c:1521
++#: g10/keyedit.c:1522
 +#, c-format
 +msgid ""
 +"Are you sure that you want to sign this key with your\n"
 +"key \"%s\" (%s)\n"
 +msgstr ""
 +"Are you sure that you want to sign this key with your\n"
 +"key “%s” (%s)\n"
 +
- #: g10/keyedit.c:1529
++#: g10/keyedit.c:1530
 +msgid "This will be a self-signature.\n"
 +msgstr "This will be a self-signature.\n"
 +
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:1535
 +msgid "WARNING: the signature will not be marked as non-exportable.\n"
 +msgstr "WARNING: the signature will not be marked as non-exportable.\n"
 +
- #: g10/keyedit.c:1541
++#: g10/keyedit.c:1542
 +msgid "WARNING: the signature will not be marked as non-revocable.\n"
 +msgstr "WARNING: the signature will not be marked as non-revocable.\n"
 +
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1552
 +msgid "The signature will be marked as non-exportable.\n"
 +msgstr "The signature will be marked as non-exportable.\n"
 +
- #: g10/keyedit.c:1558
++#: g10/keyedit.c:1559
 +msgid "The signature will be marked as non-revocable.\n"
 +msgstr "The signature will be marked as non-revocable.\n"
 +
- #: g10/keyedit.c:1565
++#: g10/keyedit.c:1566
 +msgid "I have not checked this key at all.\n"
 +msgstr "I have not checked this key at all.\n"
 +
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:1571
 +msgid "I have checked this key casually.\n"
 +msgstr "I have checked this key casually.\n"
 +
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:1576
 +msgid "I have checked this key very carefully.\n"
 +msgstr "I have checked this key very carefully.\n"
 +
- #: g10/keyedit.c:1587
++#: g10/keyedit.c:1588
 +msgid "Really sign? (y/N) "
 +msgstr "Really sign? (y/N) "
 +
- #: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
- #: g10/keyedit.c:6463 g10/sign.c:323
++#: g10/keyedit.c:1639 g10/keyedit.c:6308 g10/keyedit.c:6391 g10/keyedit.c:6500
++#: g10/keyedit.c:6562 g10/sign.c:325
 +#, c-format
 +msgid "signing failed: %s\n"
 +msgstr "signing failed: %s\n"
 +
- #: g10/keyedit.c:1725
++#: g10/keyedit.c:1726
 +msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 +msgstr "Key has only stub or on-card key items - no passphrase to change.\n"
 +
- #: g10/keyedit.c:1755
++#: g10/keyedit.c:1756
 +#, c-format
 +msgid "key %s: error changing passphrase: %s\n"
 +msgstr "key %s: error changing passphrase: %s\n"
 +
- #: g10/keyedit.c:1869
++#: g10/keyedit.c:1870
 +msgid "save and quit"
 +msgstr "save and quit"
 +
- #: g10/keyedit.c:1872
++#: g10/keyedit.c:1873
 +msgid "show key fingerprint"
 +msgstr "show key fingerprint"
 +
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1874
 +msgid "show the keygrip"
 +msgstr "show the keygrip"
 +
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1875
 +msgid "list key and user IDs"
 +msgstr "list key and user IDs"
 +
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1877
 +msgid "select user ID N"
 +msgstr "select user ID N"
 +
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1878
 +msgid "select subkey N"
 +msgstr "select subkey N"
 +
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1879
 +msgid "check signatures"
 +msgstr "check signatures"
 +
- #: g10/keyedit.c:1884
++#: g10/keyedit.c:1885
 +msgid "sign selected user IDs [* see below for related commands]"
 +msgstr "sign selected user IDs [* see below for related commands]"
 +
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1890
 +msgid "sign selected user IDs locally"
 +msgstr "sign selected user IDs locally"
 +
- #: g10/keyedit.c:1890
++#: g10/keyedit.c:1891
 +msgid "sign selected user IDs with a trust signature"
 +msgstr "sign selected user IDs with a trust signature"
 +
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1893
 +msgid "sign selected user IDs with a non-revocable signature"
 +msgstr "sign selected user IDs with a non-revocable signature"
 +
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1895
 +msgid "add a user ID"
 +msgstr "add a user ID"
 +
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1897
 +msgid "add a photo ID"
 +msgstr "add a photo ID"
 +
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1898
 +msgid "delete selected user IDs"
 +msgstr "delete selected user IDs"
 +
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1901
 +msgid "add a subkey"
 +msgstr "add a subkey"
 +
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1904
 +msgid "add a key to a smartcard"
 +msgstr "add a key to a smartcard"
 +
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1906
 +msgid "move a key to a smartcard"
 +msgstr "move a key to a smartcard"
 +
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1908
 +msgid "move a backup key to a smartcard"
 +msgstr "move a backup key to a smartcard"
 +
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1910
 +msgid "delete selected subkeys"
 +msgstr "delete selected subkeys"
 +
- #: g10/keyedit.c:1911
++#: g10/keyedit.c:1912
 +msgid "add a revocation key"
 +msgstr "add a revocation key"
 +
- #: g10/keyedit.c:1913
++#: g10/keyedit.c:1914
 +msgid "delete signatures from the selected user IDs"
 +msgstr "delete signatures from the selected user IDs"
 +
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1916
 +msgid "change the expiration date for the key or selected subkeys"
 +msgstr "change the expiration date for the key or selected subkeys"
 +
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1918
 +msgid "flag the selected user ID as primary"
 +msgstr "flag the selected user ID as primary"
 +
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1921
 +msgid "list preferences (expert)"
 +msgstr "list preferences (expert)"
 +
- #: g10/keyedit.c:1921
++#: g10/keyedit.c:1922
 +msgid "list preferences (verbose)"
 +msgstr "list preferences (verbose)"
 +
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:1924
 +msgid "set preference list for the selected user IDs"
 +msgstr "set preference list for the selected user IDs"
 +
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1927
 +msgid "set the preferred keyserver URL for the selected user IDs"
 +msgstr "set the preferred keyserver URL for the selected user IDs"
 +
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1929
 +msgid "set a notation for the selected user IDs"
 +msgstr "set a notation for the selected user IDs"
 +
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1931
 +msgid "change the passphrase"
 +msgstr "change the passphrase"
 +
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1934
 +msgid "change the ownertrust"
 +msgstr "change the ownertrust"
 +
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1937
 +msgid "revoke signatures on the selected user IDs"
 +msgstr "revoke signatures on the selected user IDs"
 +
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1939
 +msgid "revoke selected user IDs"
 +msgstr "revoke selected user IDs"
 +
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1942
 +msgid "revoke key or selected subkeys"
 +msgstr "revoke key or selected subkeys"
 +
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1944
 +msgid "enable key"
 +msgstr "enable key"
 +
- #: g10/keyedit.c:1944
++#: g10/keyedit.c:1945
 +msgid "disable key"
 +msgstr "disable key"
 +
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1947
 +msgid "show selected photo IDs"
 +msgstr "show selected photo IDs"
 +
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1949
 +msgid "compact unusable user IDs and remove unusable signatures from key"
 +msgstr "compact unusable user IDs and remove unusable signatures from key"
 +
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:1951
 +msgid "compact unusable user IDs and remove all signatures from key"
 +msgstr "compact unusable user IDs and remove all signatures from key"
 +
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2063
 +msgid "Secret key is available.\n"
 +msgstr "Secret key is available.\n"
 +
- #: g10/keyedit.c:2162
++#: g10/keyedit.c:2163
 +msgid "Need the secret key to do this.\n"
 +msgstr "Need the secret key to do this.\n"
 +
- #: g10/keyedit.c:2183
++#: g10/keyedit.c:2184
 +msgid ""
 +"* The 'sign' command may be prefixed with an 'l' for local signatures "
 +"(lsign),\n"
 +"  a 't' for trust signatures (tsign), an 'nr' for non-revocable signatures\n"
 +"  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 +msgstr ""
 +"* The ‘sign’ command may be prefixed with an ‘l’ for local "
 +"signatures (lsign),\n"
 +"  a ‘t’ for trust signatures (tsign), an ‘nr’ for non-revocable "
 +"signatures\n"
 +"  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 +
- #: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
++#: g10/keyedit.c:2240 g10/keyedit.c:3178 g10/keyedit.c:3317 g10/keyedit.c:3379
 +msgid "Key is revoked."
 +msgstr "Key is revoked."
 +
- #: g10/keyedit.c:2262
++#: g10/keyedit.c:2263
 +msgid "Really sign all user IDs? (y/N) "
 +msgstr "Really sign all user IDs? (y/N) "
 +
- #: g10/keyedit.c:2266
++#: g10/keyedit.c:2267
 +msgid "Really sign all text user IDs? (y/N) "
 +msgstr "Really sign all text user IDs? (y/N) "
 +
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2275
 +msgid "Hint: Select the user IDs to sign\n"
 +msgstr "Hint: Select the user IDs to sign\n"
 +
- #: g10/keyedit.c:2285
++#: g10/keyedit.c:2286
 +#, c-format
 +msgid "Unknown signature type '%s'\n"
 +msgstr "Unknown signature type ‘%s’\n"
 +
- #: g10/keyedit.c:2309
++#: g10/keyedit.c:2310
 +#, 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/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
++#: g10/keyedit.c:2332 g10/keyedit.c:2356 g10/keyedit.c:2550
 +msgid "You must select at least one user ID.\n"
 +msgstr "You must select at least one user ID.\n"
 +
- #: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
++#: g10/keyedit.c:2334 g10/keyedit.c:2358 g10/keyedit.c:2512 g10/keyedit.c:2552
 +#, c-format
 +msgid "(Use the '%s' command.)\n"
 +msgstr "(Use the ‘%s’ command.)\n"
 +
- #: g10/keyedit.c:2336
++#: g10/keyedit.c:2337
 +msgid "You can't delete the last user ID!\n"
 +msgstr "You can't delete the last user ID!\n"
 +
- #: g10/keyedit.c:2339
++#: g10/keyedit.c:2340
 +msgid "Really remove all selected user IDs? (y/N) "
 +msgstr "Really remove all selected user IDs? (y/N) "
 +
- #: g10/keyedit.c:2340
++#: g10/keyedit.c:2341
 +msgid "Really remove this user ID? (y/N) "
 +msgstr "Really remove this user ID? (y/N) "
 +
 +#. TRANSLATORS: Please take care: This is about
 +#. moving the key and not about removing it.
- #: g10/keyedit.c:2397
++#: g10/keyedit.c:2398
 +msgid "Really move the primary key? (y/N) "
 +msgstr "Really move the primary key? (y/N) "
 +
- #: g10/keyedit.c:2409 g10/keyedit.c:4866
++#: g10/keyedit.c:2410 g10/keyedit.c:4964
 +msgid "You must select exactly one key.\n"
 +msgstr "You must select exactly one key.\n"
 +
- #: g10/keyedit.c:2436
++#: g10/keyedit.c:2437
 +msgid "Command expects a filename argument\n"
 +msgstr "Command expects a filename argument\n"
 +
- #: g10/keyedit.c:2457
++#: g10/keyedit.c:2458
 +#, c-format
 +msgid "Can't open '%s': %s\n"
 +msgstr "Can't open '%s': %s\n"
 +
- #: g10/keyedit.c:2474
++#: g10/keyedit.c:2475
 +#, c-format
 +msgid "Error reading backup key from '%s': %s\n"
 +msgstr "Error reading backup key from '%s': %s\n"
 +
- #: g10/keyedit.c:2509
++#: g10/keyedit.c:2510
 +msgid "You must select at least one key.\n"
 +msgstr "You must select at least one key.\n"
 +
- #: g10/keyedit.c:2515
++#: g10/keyedit.c:2516
 +msgid "Do you really want to delete the selected keys? (y/N) "
 +msgstr "Do you really want to delete the selected keys? (y/N) "
 +
- #: g10/keyedit.c:2517
++#: g10/keyedit.c:2518
 +msgid "Do you really want to delete this key? (y/N) "
 +msgstr "Do you really want to delete this key? (y/N) "
 +
- #: g10/keyedit.c:2555
++#: g10/keyedit.c:2556
 +msgid "Really revoke all selected user IDs? (y/N) "
 +msgstr "Really revoke all selected user IDs? (y/N) "
 +
- #: g10/keyedit.c:2556
++#: g10/keyedit.c:2557
 +msgid "Really revoke this user ID? (y/N) "
 +msgstr "Really revoke this user ID? (y/N) "
 +
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2575
 +msgid "Do you really want to revoke the entire key? (y/N) "
 +msgstr "Do you really want to revoke the entire key? (y/N) "
 +
- #: g10/keyedit.c:2585
++#: g10/keyedit.c:2586
 +msgid "Do you really want to revoke the selected subkeys? (y/N) "
 +msgstr "Do you really want to revoke the selected subkeys? (y/N) "
 +
- #: g10/keyedit.c:2587
++#: g10/keyedit.c:2588
 +msgid "Do you really want to revoke this subkey? (y/N) "
 +msgstr "Do you really want to revoke this subkey? (y/N) "
 +
- #: g10/keyedit.c:2645
++#: g10/keyedit.c:2646
 +msgid "Owner trust may not be set while using a user provided trust database\n"
 +msgstr ""
 +"Owner trust may not be set while using a user provided trust database\n"
 +
- #: g10/keyedit.c:2690
++#: g10/keyedit.c:2691
 +msgid "Set preference list to:\n"
 +msgstr "Set preference list to:\n"
 +
- #: g10/keyedit.c:2697
++#: g10/keyedit.c:2698
 +msgid "Really update the preferences for the selected user IDs? (y/N) "
 +msgstr "Really update the preferences for the selected user IDs? (y/N) "
 +
- #: g10/keyedit.c:2699
++#: g10/keyedit.c:2700
 +msgid "Really update the preferences? (y/N) "
 +msgstr "Really update the preferences? (y/N) "
 +
- #: g10/keyedit.c:2773
++#: g10/keyedit.c:2774
 +msgid "Save changes? (y/N) "
 +msgstr "Save changes? (y/N) "
 +
- #: g10/keyedit.c:2777
++#: g10/keyedit.c:2778
 +msgid "Quit without saving? (y/N) "
 +msgstr "Quit without saving? (y/N) "
 +
- #: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
- #: g10/keyedit.c:3267 g10/keyedit.c:3332
++#: g10/keyedit.c:2789 g10/keyedit.c:2799 g10/keyedit.c:2943 g10/keyedit.c:3046
++#: g10/keyedit.c:3268 g10/keyedit.c:3333 g10/keyedit.c:3409
 +#, c-format
 +msgid "update failed: %s\n"
 +msgstr "update failed: %s\n"
 +
- #: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
++#: g10/keyedit.c:2805 g10/keyedit.c:3273 g10/keyedit.c:3338 g10/keyedit.c:3416
 +msgid "Key not changed so no update needed.\n"
 +msgstr "Key not changed so no update needed.\n"
 +
- #: g10/keyedit.c:3038
++#: g10/keyedit.c:3039
 +#, c-format
 +msgid "User ID revocation failed: %s\n"
 +msgstr "User ID revocation failed: %s\n"
 +
- #: g10/keyedit.c:3083
++#: g10/keyedit.c:3084
 +#, c-format
 +msgid "\"%s\" is not a fingerprint\n"
 +msgstr "“%s” is not a fingerprint\n"
 +
- #: g10/keyedit.c:3112
++#: g10/keyedit.c:3113
 +#, c-format
 +msgid "\"%s\" is not the primary fingerprint\n"
 +msgstr "“%s” is not the primary fingerprint\n"
 +
- #: g10/keyedit.c:3248 g10/keyedit.c:3251
++#: g10/keyedit.c:3249 g10/keyedit.c:3252
 +#, c-format
 +msgid "Invalid user ID '%s': %s\n"
 +msgstr "Invalid user ID '%s': %s\n"
 +
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
 +msgid "No matching user IDs."
 +msgstr "No matching user IDs."
 +
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
 +msgid "Nothing to sign.\n"
 +msgstr "Nothing to sign.\n"
 +
- #: g10/keyedit.c:3427
++#: g10/keyedit.c:3388
++#, c-format
++msgid "'%s' is not a valid expiration time\n"
++msgstr "‘%s’ is not a valid expiration time\n"
++
++#: g10/keyedit.c:3508
 +msgid "Digest: "
 +msgstr "Digest: "
 +
- #: g10/keyedit.c:3484
++#: g10/keyedit.c:3565
 +msgid "Features: "
 +msgstr "Features: "
 +
- #: g10/keyedit.c:3495
++#: g10/keyedit.c:3576
 +msgid "Keyserver no-modify"
 +msgstr "Keyserver no-modify"
 +
- #: g10/keyedit.c:3510 g10/keylist.c:377
++#: g10/keyedit.c:3591 g10/keylist.c:377
 +msgid "Preferred keyserver: "
 +msgstr "Preferred keyserver: "
 +
- #: g10/keyedit.c:3518 g10/keyedit.c:3519
++#: g10/keyedit.c:3599 g10/keyedit.c:3600
 +msgid "Notations: "
 +msgstr "Notations: "
 +
- #: g10/keyedit.c:3764
++#: g10/keyedit.c:3845
 +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:3836
++#: g10/keyedit.c:3917
 +#, 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:3860
++#: g10/keyedit.c:3941
 +#, 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:3866
++#: g10/keyedit.c:3947
 +msgid "(sensitive)"
 +msgstr "(sensitive)"
 +
- #: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3989 g10/keyedit.c:4131 g10/keylist.c:262 g10/keyserver.c:538
 +#, c-format
 +msgid "created: %s"
 +msgstr "created: %s"
 +
- #: g10/keyedit.c:3911 g10/keylist.c:1852
++#: g10/keyedit.c:3992 g10/keylist.c:1852
 +#, c-format
 +msgid "revoked: %s"
 +msgstr "revoked: %s"
 +
- #: g10/keyedit.c:3913 g10/keylist.c:1858
++#: g10/keyedit.c:3994 g10/keylist.c:1858
 +#, c-format
 +msgid "expired: %s"
 +msgstr "expired: %s"
 +
- #: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyedit.c:3996 g10/keyedit.c:4133 g10/keylist.c:264 g10/keylist.c:1864
 +#: g10/keyserver.c:544
 +#, c-format
 +msgid "expires: %s"
 +msgstr "expires: %s"
 +
- #: g10/keyedit.c:3917
++#: g10/keyedit.c:3998
 +#, c-format
 +msgid "usage: %s"
 +msgstr "usage: %s"
 +
- #: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
++#: g10/keyedit.c:4006 g10/keyedit.c:4026 g10/keylist.c:267
 +msgid "card-no: "
 +msgstr "card-no: "
 +
- #: g10/keyedit.c:3984
++#: g10/keyedit.c:4065
 +#, c-format
 +msgid "trust: %s"
 +msgstr "trust: %s"
 +
- #: g10/keyedit.c:3988
++#: g10/keyedit.c:4069
 +#, c-format
 +msgid "validity: %s"
 +msgstr "validity: %s"
 +
- #: g10/keyedit.c:3995
++#: g10/keyedit.c:4076
 +msgid "This key has been disabled"
 +msgstr "This key has been disabled"
 +
- #: g10/keyedit.c:4013
++#: g10/keyedit.c:4094
 +msgid ""
 +"Please note that the shown key validity is not necessarily correct\n"
 +"unless you restart the program.\n"
 +msgstr ""
 +"Please note that the shown key validity is not necessarily correct\n"
 +"unless you restart the program.\n"
 +
- #: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
- #: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: g10/keyedit.c:4150 g10/keyedit.c:4581 g10/keyserver.c:548
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:712
 +#: dirmngr/ocsp.c:703
 +msgid "revoked"
 +msgstr "revoked"
 +
- #: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
- #: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4152 g10/keyedit.c:4583 g10/keyserver.c:552
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:714
 +msgid "expired"
 +msgstr "expired"
 +
- #: g10/keyedit.c:4188
++#: g10/keyedit.c:4269
 +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 ""
 +"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:4240
++#: g10/keyedit.c:4321
 +msgid "WARNING: Your encryption subkey expires soon.\n"
 +msgstr "WARNING: Your encryption subkey expires soon.\n"
 +
- #: g10/keyedit.c:4241
++#: g10/keyedit.c:4322
 +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:4300
++#: g10/keyedit.c:4381
 +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 ""
 +"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 +"versions\n"
 +"         of PGP to reject this key.\n"
 +
- #: g10/keyedit.c:4305 g10/keyedit.c:4595
++#: g10/keyedit.c:4386 g10/keyedit.c:4676
 +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:4311
++#: g10/keyedit.c:4392
 +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:4326 g10/keygen.c:2697
++#: g10/keyedit.c:4407 g10/keygen.c:2719
 +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:4428
++#: g10/keyedit.c:4509
 +msgid "Delete this good signature? (y/N/q)"
 +msgstr "Delete this good signature? (y/N/q)"
 +
- #: g10/keyedit.c:4438
++#: g10/keyedit.c:4519
 +msgid "Delete this invalid signature? (y/N/q)"
 +msgstr "Delete this invalid signature? (y/N/q)"
 +
- #: g10/keyedit.c:4442
++#: g10/keyedit.c:4523
 +msgid "Delete this unknown signature? (y/N/q)"
 +msgstr "Delete this unknown signature? (y/N/q)"
 +
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4530
 +msgid "Really delete this self-signature? (y/N)"
 +msgstr "Really delete this self-signature? (y/N)"
 +
- #: g10/keyedit.c:4465
++#: g10/keyedit.c:4546
 +#, 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:4469
++#: g10/keyedit.c:4550
 +msgid "Nothing deleted.\n"
 +msgstr "Nothing deleted.\n"
 +
- #: g10/keyedit.c:4504 g10/trust.c:693
++#: g10/keyedit.c:4585 g10/trust.c:716
 +msgid "invalid"
 +msgstr "invalid"
 +
- #: g10/keyedit.c:4506
++#: g10/keyedit.c:4587
 +#, c-format
 +msgid "User ID \"%s\" compacted: %s\n"
 +msgstr "User ID “%s” compacted: %s\n"
 +
- #: g10/keyedit.c:4512
++#: g10/keyedit.c:4593
 +#, 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:4520
++#: g10/keyedit.c:4601
 +#, c-format
 +msgid "User ID \"%s\": already minimized\n"
 +msgstr "User ID “%s”: already minimized\n"
 +
- #: g10/keyedit.c:4521
++#: g10/keyedit.c:4602
 +#, c-format
 +msgid "User ID \"%s\": already clean\n"
 +msgstr "User ID “%s”: already clean\n"
 +
- #: g10/keyedit.c:4590
++#: g10/keyedit.c:4671
 +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 ""
 +"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"
 +
- #: g10/keyedit.c:4601
++#: g10/keyedit.c:4682
 +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:4618
++#: g10/keyedit.c:4699
 +msgid "Enter the user ID of the designated revoker: "
 +msgstr "Enter the user ID of the designated revoker: "
 +
- #: g10/keyedit.c:4643
++#: g10/keyedit.c:4724
 +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:4658
++#: g10/keyedit.c:4739
 +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:4680
++#: g10/keyedit.c:4761
 +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:4698
++#: g10/keyedit.c:4779
 +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:4704
++#: g10/keyedit.c:4785
 +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:4755
++#: g10/keyedit.c:4848
 +msgid ""
 +"Are you sure you want to change the expiration time for multiple subkeys? (y/"
 +"N) "
 +msgstr ""
 +"Are you sure you want to change the expiration time for multiple subkeys? (y/"
 +"N) "
 +
- #: g10/keyedit.c:4760
++#: g10/keyedit.c:4853
 +msgid "Changing expiration time for a subkey.\n"
 +msgstr "Changing expiration time for a subkey.\n"
 +
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:4856
 +msgid "Changing expiration time for the primary key.\n"
 +msgstr "Changing expiration time for the primary key.\n"
 +
- #: g10/keyedit.c:4814
++#: g10/keyedit.c:4910
 +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:4987
++#: g10/keyedit.c:5085
 +#, c-format
 +msgid "signing subkey %s is already cross-certified\n"
 +msgstr "signing subkey %s is already cross-certified\n"
 +
- #: g10/keyedit.c:4993
++#: g10/keyedit.c:5091
 +#, 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:5108
++#: g10/keyedit.c:5206
 +msgid "Please select exactly one user ID.\n"
 +msgstr "Please select exactly one user ID.\n"
 +
- #: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
++#: g10/keyedit.c:5247 g10/keyedit.c:5361 g10/keyedit.c:5474 g10/keyedit.c:5611
 +#, 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:5320
++#: g10/keyedit.c:5418
 +msgid "Enter your preferred keyserver URL: "
 +msgstr "Enter your preferred keyserver URL: "
 +
- #: g10/keyedit.c:5399
++#: g10/keyedit.c:5497
 +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:5400
++#: g10/keyedit.c:5498
 +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:5459
++#: g10/keyedit.c:5557
 +msgid "Enter the notation: "
 +msgstr "Enter the notation: "
 +
- #: g10/keyedit.c:5606
++#: g10/keyedit.c:5704
 +msgid "Proceed? (y/N) "
 +msgstr "Proceed? (y/N) "
 +
- #: g10/keyedit.c:5676
++#: g10/keyedit.c:5774
 +#, c-format
 +msgid "No user ID with index %d\n"
 +msgstr "No user ID with index %d\n"
 +
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5836
 +#, c-format
 +msgid "No user ID with hash %s\n"
 +msgstr "No user ID with hash %s\n"
 +
- #: g10/keyedit.c:5839
++#: g10/keyedit.c:5937
 +#, c-format
 +msgid "No subkey with key ID '%s'.\n"
 +msgstr "No subkey with key ID '%s'.\n"
 +
- #: g10/keyedit.c:5861
++#: g10/keyedit.c:5959
 +#, c-format
 +msgid "No subkey with index %d\n"
 +msgstr "No subkey with index %d\n"
 +
- #: g10/keyedit.c:6002
++#: g10/keyedit.c:6100
 +#, c-format
 +msgid "user ID: \"%s\"\n"
 +msgstr "user ID: “%s”\n"
 +
- #: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
++#: g10/keyedit.c:6103 g10/keyedit.c:6205 g10/keyedit.c:6253
 +#, 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:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
++#: g10/keyedit.c:6105 g10/keyedit.c:6207 g10/keyedit.c:6255
 +msgid " (non-exportable)"
 +msgstr " (non-exportable)"
 +
- #: g10/keyedit.c:6011
++#: g10/keyedit.c:6109
 +#, c-format
 +msgid "This signature expired on %s.\n"
 +msgstr "This signature expired on %s.\n"
 +
- #: g10/keyedit.c:6016
++#: g10/keyedit.c:6114
 +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:6021
++#: g10/keyedit.c:6119
 +msgid "Create a revocation certificate for this signature? (y/N) "
 +msgstr "Create a revocation certificate for this signature? (y/N) "
 +
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6173
 +msgid "Not signed by you.\n"
 +msgstr "Not signed by you.\n"
 +
- #: g10/keyedit.c:6081
++#: g10/keyedit.c:6179
 +#, 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:6110
++#: g10/keyedit.c:6208
 +msgid " (non-revocable)"
 +msgstr " (non-revocable)"
 +
- #: g10/keyedit.c:6117
++#: g10/keyedit.c:6215
 +#, c-format
 +msgid "revoked by your key %s on %s\n"
 +msgstr "revoked by your key %s on %s\n"
 +
- #: g10/keyedit.c:6142
++#: g10/keyedit.c:6240
 +msgid "You are about to revoke these signatures:\n"
 +msgstr "You are about to revoke these signatures:\n"
 +
- #: g10/keyedit.c:6165
++#: g10/keyedit.c:6263
 +msgid "Really create the revocation certificates? (y/N) "
 +msgstr "Really create the revocation certificates? (y/N) "
 +
- #: g10/keyedit.c:6198
++#: g10/keyedit.c:6296
 +msgid "no secret key\n"
 +msgstr "no secret key\n"
 +
- #: g10/keyedit.c:6246
++#: g10/keyedit.c:6344
 +#, 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:6256
++#: g10/keyedit.c:6354
 +#, c-format
 +msgid "user ID \"%s\" is already revoked\n"
 +msgstr "user ID “%s” is already revoked\n"
 +
- #: g10/keyedit.c:6273
++#: g10/keyedit.c:6371
 +#, 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:6386
++#: g10/keyedit.c:6485
 +#, c-format
 +msgid "Key %s is already revoked.\n"
 +msgstr "Key %s is already revoked.\n"
 +
- #: g10/keyedit.c:6448
++#: g10/keyedit.c:6547
 +#, c-format
 +msgid "Subkey %s is already revoked.\n"
 +msgstr "Subkey %s is already revoked.\n"
 +
- #: g10/keyedit.c:6545
++#: g10/keyedit.c:6644
 +#, c-format
 +msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 +msgstr "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 +
- #: g10/keygen.c:305
++#: g10/keygen.c:316
 +#, c-format
 +msgid "preference '%s' duplicated\n"
 +msgstr "preference ‘%s’ duplicated\n"
 +
- #: g10/keygen.c:312
++#: g10/keygen.c:323
 +msgid "too many cipher preferences\n"
 +msgstr "too many cipher preferences\n"
 +
- #: g10/keygen.c:314
++#: g10/keygen.c:325
 +msgid "too many digest preferences\n"
 +msgstr "too many digest preferences\n"
 +
- #: g10/keygen.c:316
++#: g10/keygen.c:327
 +msgid "too many compression preferences\n"
 +msgstr "too many compression preferences\n"
 +
- #: g10/keygen.c:457
++#: g10/keygen.c:468
 +#, c-format
 +msgid "invalid item '%s' in preference string\n"
 +msgstr "invalid item ‘%s’ in preference string\n"
 +
- #: g10/keygen.c:936
++#: g10/keygen.c:947
 +msgid "writing direct signature\n"
 +msgstr "writing direct signature\n"
 +
- #: g10/keygen.c:982
++#: g10/keygen.c:993
 +msgid "writing self signature\n"
 +msgstr "writing self signature\n"
 +
- #: g10/keygen.c:1038
++#: g10/keygen.c:1049
 +msgid "writing key binding signature\n"
 +msgstr "writing key binding signature\n"
 +
- #: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
- #: g10/keygen.c:1610 g10/keygen.c:1615
++#: g10/keygen.c:1413 g10/keygen.c:1418 g10/keygen.c:1470 g10/keygen.c:1475
++#: g10/keygen.c:1622 g10/keygen.c:1627
 +#, c-format
 +msgid "keysize invalid; using %u bits\n"
 +msgstr "keysize invalid; using %u bits\n"
 +
- #: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
++#: g10/keygen.c:1424 g10/keygen.c:1481 g10/keygen.c:1489 g10/keygen.c:1633
 +#, c-format
 +msgid "keysize rounded up to %u bits\n"
 +msgstr "keysize rounded up to %u bits\n"
 +
- #: g10/keygen.c:1503
++#: g10/keygen.c:1515
 +msgid ""
 +"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 +msgstr ""
 +"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 +
- #: g10/keygen.c:1677
++#: g10/keygen.c:1689
 +msgid "Sign"
 +msgstr "Sign"
 +
- #: g10/keygen.c:1680
++#: g10/keygen.c:1692
 +msgid "Certify"
 +msgstr "Certify"
 +
- #: g10/keygen.c:1683
++#: g10/keygen.c:1695
 +msgid "Encrypt"
 +msgstr "Encrypt"
 +
- #: g10/keygen.c:1686
++#: g10/keygen.c:1698
 +msgid "Authenticate"
 +msgstr "Authenticate"
 +
 +#. TRANSLATORS: Please use only plain ASCII characters for the
 +#. translation.  If this is not possible use single digits.  The
 +#. string needs to 8 bytes long. Here is a description of the
 +#. functions:
 +#.
 +#. s = Toggle signing capability
 +#. e = Toggle encryption capability
 +#. a = Toggle authentication capability
 +#. q = Finish
 +#.
- #: g10/keygen.c:1705
++#: g10/keygen.c:1717
 +msgid "SsEeAaQq"
 +msgstr "SsEeAaQq"
 +
- #: g10/keygen.c:1732
++#: g10/keygen.c:1744
 +#, c-format
 +msgid "Possible actions for a %s key: "
 +msgstr "Possible actions for a %s key: "
 +
- #: g10/keygen.c:1738
++#: g10/keygen.c:1750
 +msgid "Current allowed actions: "
 +msgstr "Current allowed actions: "
 +
- #: g10/keygen.c:1743
++#: g10/keygen.c:1755
 +#, c-format
 +msgid "   (%c) Toggle the sign capability\n"
 +msgstr "   (%c) Toggle the sign capability\n"
 +
- #: g10/keygen.c:1746
++#: g10/keygen.c:1758
 +#, c-format
 +msgid "   (%c) Toggle the encrypt capability\n"
 +msgstr "   (%c) Toggle the encrypt capability\n"
 +
- #: g10/keygen.c:1749
++#: g10/keygen.c:1761
 +#, c-format
 +msgid "   (%c) Toggle the authenticate capability\n"
 +msgstr "   (%c) Toggle the authenticate capability\n"
 +
- #: g10/keygen.c:1752
++#: g10/keygen.c:1764
 +#, c-format
 +msgid "   (%c) Finished\n"
 +msgstr "   (%c) Finished\n"
 +
- #: g10/keygen.c:1881 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1893 sm/certreqgen-ui.c:161
 +msgid "Please select what kind of key you want:\n"
 +msgstr "Please select what kind of key you want:\n"
 +
- #: g10/keygen.c:1885
++#: g10/keygen.c:1897
 +#, c-format
 +msgid "   (%d) RSA and RSA (default)\n"
 +msgstr "   (%d) RSA and RSA (default)\n"
 +
- #: g10/keygen.c:1889
++#: g10/keygen.c:1901
 +#, c-format
 +msgid "   (%d) DSA and Elgamal\n"
 +msgstr "   (%d) DSA and Elgamal\n"
 +
- #: g10/keygen.c:1892
++#: g10/keygen.c:1904
 +#, c-format
 +msgid "   (%d) DSA (sign only)\n"
 +msgstr "   (%d) DSA (sign only)\n"
 +
- #: g10/keygen.c:1894
++#: g10/keygen.c:1906
 +#, c-format
 +msgid "   (%d) RSA (sign only)\n"
 +msgstr "   (%d) RSA (sign only)\n"
 +
- #: g10/keygen.c:1900
++#: g10/keygen.c:1912
 +#, c-format
 +msgid "   (%d) Elgamal (encrypt only)\n"
 +msgstr "   (%d) Elgamal (encrypt only)\n"
 +
- #: g10/keygen.c:1902
++#: g10/keygen.c:1914
 +#, c-format
 +msgid "   (%d) RSA (encrypt only)\n"
 +msgstr "   (%d) RSA (encrypt only)\n"
 +
- #: g10/keygen.c:1908
++#: g10/keygen.c:1920
 +#, c-format
 +msgid "   (%d) DSA (set your own capabilities)\n"
 +msgstr "   (%d) DSA (set your own capabilities)\n"
 +
- #: g10/keygen.c:1910
++#: g10/keygen.c:1922
 +#, c-format
 +msgid "   (%d) RSA (set your own capabilities)\n"
 +msgstr "   (%d) RSA (set your own capabilities)\n"
 +
- #: g10/keygen.c:1916
++#: g10/keygen.c:1928
 +#, c-format
 +msgid "   (%d) ECC and ECC\n"
 +msgstr "   (%d) ECC and ECC\n"
 +
- #: g10/keygen.c:1918
++#: g10/keygen.c:1930
 +#, c-format
 +msgid "  (%d) ECC (sign only)\n"
 +msgstr "  (%d) ECC (sign only)\n"
 +
- #: g10/keygen.c:1920
++#: g10/keygen.c:1932
 +#, c-format
 +msgid "  (%d) ECC (set your own capabilities)\n"
 +msgstr "  (%d) ECC (set your own capabilities)\n"
 +
- #: g10/keygen.c:1922
++#: g10/keygen.c:1934
 +#, c-format
 +msgid "  (%d) ECC (encrypt only)\n"
 +msgstr "  (%d) ECC (encrypt only)\n"
 +
- #: g10/keygen.c:1926
++#: g10/keygen.c:1938
 +#, c-format
 +msgid "  (%d) Existing key\n"
 +msgstr "  (%d) Existing key\n"
 +
- #: g10/keygen.c:2022 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:206
 +msgid "Enter the keygrip: "
 +msgstr "Enter the keygrip: "
 +
- #: g10/keygen.c:2035 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2047 sm/certreqgen-ui.c:214
 +msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 +msgstr "Not a valid keygrip (expecting 40 hex digits)\n"
 +
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2049 sm/certreqgen-ui.c:216
 +msgid "No key with this keygrip\n"
 +msgstr "No key with this keygrip\n"
 +
- #: g10/keygen.c:2111 g10/keygen.c:2125
++#: g10/keygen.c:2133 g10/keygen.c:2147
 +#, c-format
 +msgid "rounded to %u bits\n"
 +msgstr "rounded to %u bits\n"
 +
- #: g10/keygen.c:2166
++#: g10/keygen.c:2188
 +#, c-format
 +msgid "%s keys may be between %u and %u bits long.\n"
 +msgstr "%s keys may be between %u and %u bits long.\n"
 +
- #: g10/keygen.c:2174
++#: g10/keygen.c:2196
 +#, c-format
 +msgid "What keysize do you want for the subkey? (%u) "
 +msgstr "What keysize do you want for the subkey? (%u) "
 +
- #: g10/keygen.c:2177 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2199 sm/certreqgen-ui.c:183
 +#, c-format
 +msgid "What keysize do you want? (%u) "
 +msgstr "What keysize do you want? (%u) "
 +
- #: g10/keygen.c:2191 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2213 sm/certreqgen-ui.c:193
 +#, c-format
 +msgid "Requested keysize is %u bits\n"
 +msgstr "Requested keysize is %u bits\n"
 +
- #: g10/keygen.c:2237
++#: g10/keygen.c:2259
 +msgid "Please select which elliptic curve you want:\n"
 +msgstr "Please select which elliptic curve you want:\n"
 +
- #: g10/keygen.c:2409
++#: g10/keygen.c:2431
 +msgid ""
 +"Please specify how long the key should be valid.\n"
 +"         0 = key does not expire\n"
 +"      <n>  = key expires in n days\n"
 +"      <n>w = key expires in n weeks\n"
 +"      <n>m = key expires in n months\n"
 +"      <n>y = key expires in n years\n"
 +msgstr ""
 +"Please specify how long the key should be valid.\n"
 +"         0 = key does not expire\n"
 +"      <n>  = key expires in n days\n"
 +"      <n>w = key expires in n weeks\n"
 +"      <n>m = key expires in n months\n"
 +"      <n>y = key expires in n years\n"
 +
- #: g10/keygen.c:2420
++#: g10/keygen.c:2442
 +msgid ""
 +"Please specify how long the signature should be valid.\n"
 +"         0 = signature does not expire\n"
 +"      <n>  = signature expires in n days\n"
 +"      <n>w = signature expires in n weeks\n"
 +"      <n>m = signature expires in n months\n"
 +"      <n>y = signature expires in n years\n"
 +msgstr ""
 +"Please specify how long the signature should be valid.\n"
 +"         0 = signature does not expire\n"
 +"      <n>  = signature expires in n days\n"
 +"      <n>w = signature expires in n weeks\n"
 +"      <n>m = signature expires in n months\n"
 +"      <n>y = signature expires in n years\n"
 +
- #: g10/keygen.c:2443
++#: g10/keygen.c:2465
 +msgid "Key is valid for? (0) "
 +msgstr "Key is valid for? (0) "
 +
- #: g10/keygen.c:2448
++#: g10/keygen.c:2470
 +#, c-format
 +msgid "Signature is valid for? (%s) "
 +msgstr "Signature is valid for? (%s) "
 +
- #: g10/keygen.c:2461 g10/keygen.c:2486
++#: g10/keygen.c:2483 g10/keygen.c:2508
 +msgid "invalid value\n"
 +msgstr "invalid value\n"
 +
- #: g10/keygen.c:2468
++#: g10/keygen.c:2490
 +msgid "Key does not expire at all\n"
 +msgstr "Key does not expire at all\n"
 +
- #: g10/keygen.c:2469
++#: g10/keygen.c:2491
 +msgid "Signature does not expire at all\n"
 +msgstr "Signature does not expire at all\n"
 +
- #: g10/keygen.c:2474
++#: g10/keygen.c:2496
 +#, c-format
 +msgid "Key expires at %s\n"
 +msgstr "Key expires at %s\n"
 +
- #: g10/keygen.c:2475
++#: g10/keygen.c:2497
 +#, c-format
 +msgid "Signature expires at %s\n"
 +msgstr "Signature expires at %s\n"
 +
- #: g10/keygen.c:2479
++#: g10/keygen.c:2501
 +msgid ""
 +"Your system can't display dates beyond 2038.\n"
 +"However, it will be correctly handled up to 2106.\n"
 +msgstr ""
 +"Your system can't display dates beyond 2038.\n"
 +"However, it will be correctly handled up to 2106.\n"
 +
- #: g10/keygen.c:2492
++#: g10/keygen.c:2514
 +msgid "Is this correct? (y/N) "
 +msgstr "Is this correct? (y/N) "
 +
- #: g10/keygen.c:2560
++#: g10/keygen.c:2582
 +msgid ""
 +"\n"
 +"GnuPG needs to construct a user ID to identify your key.\n"
 +"\n"
 +msgstr ""
 +"\n"
 +"GnuPG needs to construct a user ID to identify your key.\n"
 +"\n"
 +
 +#. TRANSLATORS: This string is in general not anymore used
 +#. but you should keep your existing translation.  In case
 +#. the new string is not translated this old string will
 +#. be used.
- #: g10/keygen.c:2575
++#: g10/keygen.c:2597
 +msgid ""
 +"\n"
 +"You need a user ID to identify your key; the software constructs the user "
 +"ID\n"
 +"from the Real Name, Comment and Email Address in this form:\n"
 +"    \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
 +"\n"
 +msgstr ""
 +"\n"
 +"You need a user ID to identify your key; the software constructs the user "
 +"ID\n"
 +"from the Real Name, Comment and Email Address in this form:\n"
 +"    “Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>”\n"
 +"\n"
 +
- #: g10/keygen.c:2594
++#: g10/keygen.c:2616
 +msgid "Real name: "
 +msgstr "Real name: "
 +
- #: g10/keygen.c:2603
++#: g10/keygen.c:2625
 +msgid "Invalid character in name\n"
 +msgstr "Invalid character in name\n"
 +
- #: g10/keygen.c:2604
++#: g10/keygen.c:2626
 +#, c-format
 +msgid "The characters '%s' and '%s' may not appear in name\n"
 +msgstr "The characters ‘%s’ and ‘%s’ may not appear in name\n"
 +
- #: g10/keygen.c:2608
++#: g10/keygen.c:2630
 +msgid "Name may not start with a digit\n"
 +msgstr "Name may not start with a digit\n"
 +
- #: g10/keygen.c:2611
++#: g10/keygen.c:2633
 +msgid "Name must be at least 5 characters long\n"
 +msgstr "Name must be at least 5 characters long\n"
 +
- #: g10/keygen.c:2621
++#: g10/keygen.c:2643
 +msgid "Email address: "
 +msgstr "Email address: "
 +
- #: g10/keygen.c:2627
++#: g10/keygen.c:2649
 +msgid "Not a valid email address\n"
 +msgstr "Not a valid email address\n"
 +
- #: g10/keygen.c:2636
++#: g10/keygen.c:2658
 +msgid "Comment: "
 +msgstr "Comment: "
 +
- #: g10/keygen.c:2642
++#: g10/keygen.c:2664
 +msgid "Invalid character in comment\n"
 +msgstr "Invalid character in comment\n"
 +
- #: g10/keygen.c:2678
++#: g10/keygen.c:2700
 +#, c-format
 +msgid "You are using the '%s' character set.\n"
 +msgstr "You are using the ‘%s’ character set.\n"
 +
- #: g10/keygen.c:2684
++#: g10/keygen.c:2706
 +#, c-format
 +msgid ""
 +"You selected this USER-ID:\n"
 +"    \"%s\"\n"
 +"\n"
 +msgstr ""
 +"You selected this USER-ID:\n"
 +"    “%s”\n"
 +"\n"
 +
- #: g10/keygen.c:2689
++#: g10/keygen.c:2711
 +msgid "Please don't put the email address into the real name or the comment\n"
 +msgstr "Please don't put the email address into the real name or the comment\n"
 +
 +#. TRANSLATORS: These are the allowed answers in
 +#. lower and uppercase.  Below you will find the matching
 +#. string which should be translated accordingly and the
 +#. letter changed to match the one in the answer string.
 +#.
 +#. n = Change name
 +#. c = Change comment
 +#. e = Change email
 +#. o = Okay (ready, continue)
 +#. q = Quit
 +#.
- #: g10/keygen.c:2714
++#: g10/keygen.c:2736
 +msgid "NnCcEeOoQq"
 +msgstr "NnCcEeOoQq"
 +
- #: g10/keygen.c:2724
++#: g10/keygen.c:2746
 +msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 +msgstr "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 +
- #: g10/keygen.c:2725
++#: g10/keygen.c:2747
 +msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 +msgstr "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 +
- #: g10/keygen.c:2730
++#: g10/keygen.c:2752
 +msgid "Change (N)ame, (E)mail, or (Q)uit? "
 +msgstr "Change (N)ame, (E)mail, or (Q)uit? "
 +
- #: g10/keygen.c:2731
++#: g10/keygen.c:2753
 +msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 +msgstr "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 +
- #: g10/keygen.c:2750
++#: g10/keygen.c:2772
 +msgid "Please correct the error first\n"
 +msgstr "Please correct the error first\n"
 +
- #: g10/keygen.c:2796
++#: g10/keygen.c:2818
 +msgid ""
 +"We need to generate a lot of random bytes. It is a good idea to perform\n"
 +"some other action (type on the keyboard, move the mouse, utilize the\n"
 +"disks) during the prime generation; this gives the random number\n"
 +"generator a better chance to gain enough entropy.\n"
 +msgstr ""
 +"We need to generate a lot of random bytes. It is a good idea to perform\n"
 +"some other action (type on the keyboard, move the mouse, utilize the\n"
 +"disks) during the prime generation; this gives the random number\n"
 +"generator a better chance to gain enough entropy.\n"
 +
- #: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
- #: g10/keygen.c:4777 g10/keygen.c:4882
++#: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
++#: g10/keygen.c:4330 g10/keygen.c:4803 g10/keygen.c:5064 g10/keygen.c:5169
 +#, c-format
 +msgid "Key generation failed: %s\n"
 +msgstr "Key generation failed: %s\n"
 +
- #: g10/keygen.c:3598
++#: g10/keygen.c:3922
 +#, c-format
 +msgid ""
 +"About to create a key for:\n"
 +"    \"%s\"\n"
 +"\n"
 +msgstr ""
 +"About to create a key for:\n"
 +"    “%s”\n"
 +"\n"
 +
- #: g10/keygen.c:3600
++#: g10/keygen.c:3924
 +msgid "Continue? (Y/n) "
 +msgstr "Continue? (Y/n) "
 +
- #: g10/keygen.c:3621
++#: g10/keygen.c:3945
 +#, c-format
 +msgid "A key for \"%s\" already exists\n"
 +msgstr "A key for “%s” already exists\n"
 +
- #: g10/keygen.c:3626
++#: g10/keygen.c:3950
 +msgid "Create anyway? (y/N) "
 +msgstr "Create anyway? (y/N) "
 +
- #: g10/keygen.c:3632
++#: g10/keygen.c:3956
 +msgid "creating anyway\n"
 +msgstr "creating anyway\n"
 +
- #: g10/keygen.c:3981
++#: g10/keygen.c:4315
 +#, c-format
 +msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 +msgstr "Note: Use “%s %s” for a full featured key generation dialog.\n"
 +
- #: g10/keygen.c:4013
++#: g10/keygen.c:4358
 +msgid "Key generation canceled.\n"
 +msgstr "Key generation canceled.\n"
 +
- #: g10/keygen.c:4073
++#: g10/keygen.c:4418
 +#, c-format
 +msgid "can't create backup file '%s': %s\n"
 +msgstr "can't create backup file '%s': %s\n"
 +
- #: g10/keygen.c:4093
++#: g10/keygen.c:4438
 +#, c-format
 +msgid "Note: backup of card key saved to '%s'\n"
 +msgstr "Note: backup of card key saved to ‘%s’\n"
 +
- #: g10/keygen.c:4244 g10/keygen.c:4393
++#: g10/keygen.c:4589 g10/keygen.c:4738
 +#, c-format
 +msgid "writing public key to '%s'\n"
 +msgstr "writing public key to ‘%s’\n"
 +
- #: g10/keygen.c:4387
++#: g10/keygen.c:4732
 +#, c-format
 +msgid "no writable public keyring found: %s\n"
 +msgstr "no writable public keyring found: %s\n"
 +
- #: g10/keygen.c:4401
++#: g10/keygen.c:4746
 +#, c-format
 +msgid "error writing public keyring '%s': %s\n"
 +msgstr "error writing public keyring '%s': %s\n"
 +
- #: g10/keygen.c:4433
++#: g10/keygen.c:4778
 +msgid "public and secret key created and signed.\n"
 +msgstr "public and secret key created and signed.\n"
 +
- #: g10/keygen.c:4445
++#: g10/keygen.c:4790
 +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 ""
 +"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:4649 g10/keygen.c:4833
++#: g10/keygen.c:4936 g10/keygen.c:5120
 +#, 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:4651 g10/keygen.c:4835
++#: g10/keygen.c:4938 g10/keygen.c:5122
 +#, 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:4662 g10/keygen.c:4846
++#: g10/keygen.c:4949 g10/keygen.c:5133
 +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:4674 g10/keygen.c:4676
++#: g10/keygen.c:4961 g10/keygen.c:4963
 +msgid "Secret parts of primary key are not available.\n"
 +msgstr "Secret parts of primary key are not available.\n"
 +
- #: g10/keygen.c:4683 g10/keygen.c:4685
++#: g10/keygen.c:4970 g10/keygen.c:4972
 +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:4704 g10/keygen.c:4860
++#: g10/keygen.c:4991 g10/keygen.c:5147
 +msgid "Really create? (y/N) "
 +msgstr "Really create? (y/N) "
 +
 +#: g10/keyid.c:664 g10/keyid.c:677 g10/keyid.c:690
 +msgid "never     "
 +msgstr "never     "
 +
 +#: g10/keylist.c:331
 +msgid "Critical signature policy: "
 +msgstr "Critical signature policy: "
 +
 +#: g10/keylist.c:333
 +msgid "Signature policy: "
 +msgstr "Signature policy: "
 +
 +#: g10/keylist.c:375
 +msgid "Critical preferred keyserver: "
 +msgstr "Critical preferred keyserver: "
 +
 +#: g10/keylist.c:428
 +msgid "Critical signature notation: "
 +msgstr "Critical signature notation: "
 +
 +#: g10/keylist.c:430
 +msgid "Signature notation: "
 +msgstr "Signature notation: "
 +
 +#: g10/keylist.c:472
 +#, c-format
 +msgid "%d good signature\n"
 +msgid_plural "%d good signatures\n"
 +msgstr[0] "%d good signature\n"
 +msgstr[1] "%d good signatures\n"
 +
 +#: g10/keylist.c:485
 +#, c-format
 +msgid "%d signature not checked due to an error\n"
 +msgid_plural "%d signatures not checked due to errors\n"
 +msgstr[0] "%d signature not checked due to an error\n"
 +msgstr[1] "%d signatures not checked due to errors\n"
 +
 +#: g10/keylist.c:567
 +#, c-format
 +msgid "Warning: %lu key skipped due to its large size\n"
 +msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
 +msgstr[0] "Warning: %lu key skipped due to its large size\n"
 +msgstr[1] "Warning: %lu keys skipped due to their large sizes\n"
 +
 +#: g10/keylist.c:589
 +msgid "Keyring"
 +msgstr "Keyring"
 +
 +#: g10/keylist.c:1719
 +msgid "Primary key fingerprint:"
 +msgstr "Primary key fingerprint:"
 +
 +#: g10/keylist.c:1721
 +msgid "     Subkey fingerprint:"
 +msgstr "     Subkey fingerprint:"
 +
 +#. TRANSLATORS: this should fit into 24 bytes so that the
 +#. * fingerprint data is properly aligned with the user ID
 +#: g10/keylist.c:1729
 +msgid " Primary key fingerprint:"
 +msgstr " Primary key fingerprint:"
 +
 +#: g10/keylist.c:1731 g10/keylist.c:1741
 +msgid "      Subkey fingerprint:"
 +msgstr "      Subkey fingerprint:"
 +
 +#: g10/keylist.c:1736 g10/keylist.c:1752
 +msgid "      Key fingerprint ="
 +msgstr "      Key fingerprint ="
 +
 +#: g10/keylist.c:1803
 +msgid "      Card serial no. ="
 +msgstr "      Card serial no. ="
 +
 +#: g10/keyring.c:1498
 +#, c-format
 +msgid "caching keyring '%s'\n"
 +msgstr "caching keyring ‘%s’\n"
 +
 +#: g10/keyring.c:1572
 +#, c-format
 +msgid "%lu keys cached so far (%lu signature)\n"
 +msgid_plural "%lu keys cached so far (%lu signatures)\n"
 +msgstr[0] "%lu keys cached so far (%lu signature)\n"
 +msgstr[1] "%lu keys cached so far (%lu signatures)\n"
 +
 +#: g10/keyring.c:1588
 +#, c-format
 +msgid "%lu key cached"
 +msgid_plural "%lu keys cached"
 +msgstr[0] "%lu key cached"
 +msgstr[1] "%lu keys cached"
 +
 +#: g10/keyring.c:1590
 +#, c-format
 +msgid " (%lu signature)\n"
 +msgid_plural " (%lu signatures)\n"
 +msgstr[0] " (%lu signature)\n"
 +msgstr[1] " (%lu signatures)\n"
 +
 +#: g10/keyring.c:1665
 +#, c-format
 +msgid "%s: keyring created\n"
 +msgstr "%s: keyring created\n"
 +
 +#: g10/keyserver.c:91
 +msgid "override proxy options set for dirmngr"
 +msgstr "override proxy options set for dirmngr"
 +
 +#: g10/keyserver.c:93
 +msgid "include revoked keys in search results"
 +msgstr "include revoked keys in search results"
 +
 +#: g10/keyserver.c:94
 +msgid "include subkeys when searching by key ID"
 +msgstr "include subkeys when searching by key ID"
 +
 +#: g10/keyserver.c:96
 +msgid "override timeout options set for dirmngr"
 +msgstr "override timeout options set for dirmngr"
 +
 +#: g10/keyserver.c:100
 +msgid "automatically retrieve keys when verifying signatures"
 +msgstr "automatically retrieve keys when verifying signatures"
 +
 +#: g10/keyserver.c:102
 +msgid "honor the preferred keyserver URL set on the key"
 +msgstr "honor the preferred keyserver URL set on the key"
 +
 +#: g10/keyserver.c:104
 +msgid "honor the PKA record set on a key when retrieving keys"
 +msgstr "honor the PKA record set on a key when retrieving keys"
 +
 +#: g10/keyserver.c:550
 +msgid "disabled"
 +msgstr "disabled"
 +
 +#: g10/keyserver.c:754
 +msgid "Enter number(s), N)ext, or Q)uit > "
 +msgstr "Enter number(s), N)ext, or Q)uit > "
 +
 +#: g10/keyserver.c:860
 +#, c-format
 +msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 +msgstr "invalid keyserver protocol (us %d!=handler %d)\n"
 +
 +#: g10/keyserver.c:1001 g10/keyserver.c:1116
 +#, c-format
 +msgid "\"%s\" not a key ID: skipping\n"
 +msgstr "“%s” not a key ID: skipping\n"
 +
 +#: g10/keyserver.c:1421 g10/keyserver.c:1454
 +#, c-format
 +msgid "refreshing %d key from %s\n"
 +msgid_plural "refreshing %d keys from %s\n"
 +msgstr[0] "refreshing %d key from %s\n"
 +msgstr[1] "refreshing %d keys from %s\n"
 +
 +#: g10/keyserver.c:1428
 +#, c-format
 +msgid "WARNING: unable to refresh key %s via %s: %s\n"
 +msgstr "WARNING: unable to refresh key %s via %s: %s\n"
 +
 +#: g10/keyserver.c:1532
 +#, c-format
 +msgid "key \"%s\" not found on keyserver\n"
 +msgstr "key “%s” not found on keyserver\n"
 +
 +#: g10/keyserver.c:1535
 +msgid "key not found on keyserver\n"
 +msgstr "key not found on keyserver\n"
 +
 +#: g10/keyserver.c:1539
 +msgid "no keyserver known (use option --keyserver)\n"
 +msgstr "no keyserver known (use option --keyserver)\n"
 +
 +#: g10/keyserver.c:1704
 +#, c-format
 +msgid "requesting key %s from %s server %s\n"
 +msgstr "requesting key %s from %s server %s\n"
 +
 +#: g10/keyserver.c:1708
 +#, c-format
 +msgid "requesting key %s from %s\n"
 +msgstr "requesting key %s from %s\n"
 +
 +#: g10/keyserver.c:1809 g10/keyserver.c:1965
 +msgid "no keyserver known\n"
 +msgstr "no keyserver known\n"
 +
 +#: g10/keyserver.c:1824 g10/skclist.c:196 g10/skclist.c:224
 +#, c-format
 +msgid "skipped \"%s\": %s\n"
 +msgstr "skipped “%s”: %s\n"
 +
 +#: g10/keyserver.c:1827
 +#, c-format
 +msgid "sending key %s to %s\n"
 +msgstr "sending key %s to %s\n"
 +
 +#: g10/keyserver.c:1868
 +#, c-format
 +msgid "requesting key from '%s'\n"
 +msgstr "requesting key from ‘%s’\n"
 +
 +#: g10/keyserver.c:1884
 +#, c-format
 +msgid "WARNING: unable to fetch URI %s: %s\n"
 +msgstr "WARNING: unable to fetch URI %s: %s\n"
 +
 +#: g10/mainproc.c:254
 +#, 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:302
 +#, c-format
 +msgid "%s encrypted session key\n"
 +msgstr "%s encrypted session key\n"
 +
 +#: g10/mainproc.c:312
 +#, c-format
 +msgid "passphrase generated with unknown digest algorithm %d\n"
 +msgstr "passphrase generated with unknown digest algorithm %d\n"
 +
 +#: g10/mainproc.c:378
 +#, c-format
 +msgid "public key is %s\n"
 +msgstr "public key is %s\n"
 +
 +#: g10/mainproc.c:456
 +msgid "public key encrypted data: good DEK\n"
 +msgstr "public key encrypted data: good DEK\n"
 +
 +#: g10/mainproc.c:489
 +#, 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:493 g10/pkclist.c:228
 +#, c-format
 +msgid "      \"%s\"\n"
 +msgstr "      “%s”\n"
 +
 +#: g10/mainproc.c:497
 +#, c-format
 +msgid "encrypted with %s key, ID %s\n"
 +msgstr "encrypted with %s key, ID %s\n"
 +
 +#: g10/mainproc.c:514
 +#, c-format
 +msgid "public key decryption failed: %s\n"
 +msgstr "public key decryption failed: %s\n"
 +
 +#: g10/mainproc.c:530
 +#, c-format
 +msgid "encrypted with %lu passphrases\n"
 +msgstr "encrypted with %lu passphrases\n"
 +
 +#: g10/mainproc.c:532
 +msgid "encrypted with 1 passphrase\n"
 +msgstr "encrypted with 1 passphrase\n"
 +
 +#: g10/mainproc.c:566 g10/mainproc.c:587
 +#, c-format
 +msgid "assuming %s encrypted data\n"
 +msgstr "assuming %s encrypted data\n"
 +
 +#: g10/mainproc.c:573
 +#, 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:618 g10/mainproc.c:632
 +msgid "WARNING: message was not integrity protected\n"
 +msgstr "WARNING: message was not integrity protected\n"
 +
 +#: g10/mainproc.c:628
 +msgid "decryption okay\n"
 +msgstr "decryption okay\n"
 +
 +#: g10/mainproc.c:637
 +msgid "WARNING: encrypted message has been manipulated!\n"
 +msgstr "WARNING: encrypted message has been manipulated!\n"
 +
 +#: g10/mainproc.c:653
 +#, c-format
 +msgid "decryption failed: %s\n"
 +msgstr "decryption failed: %s\n"
 +
 +#: g10/mainproc.c:676
 +msgid "Note: sender requested \"for-your-eyes-only\"\n"
 +msgstr "Note: sender requested “for-your-eyes-only”\n"
 +
 +#: g10/mainproc.c:678
 +#, c-format
 +msgid "original file name='%.*s'\n"
 +msgstr "original file name='%.*s'\n"
 +
 +#: g10/mainproc.c:748
 +msgid "WARNING: multiple plaintexts seen\n"
 +msgstr "WARNING: multiple plaintexts seen\n"
 +
 +#: g10/mainproc.c:923
 +msgid "standalone revocation - use \"gpg --import\" to apply\n"
 +msgstr "standalone revocation - use “gpg --import” to apply\n"
 +
- #: g10/mainproc.c:1233 g10/mainproc.c:1276
++#: g10/mainproc.c:1238 g10/mainproc.c:1281
 +msgid "no signature found\n"
 +msgstr "no signature found\n"
 +
- #: g10/mainproc.c:1607
++#: g10/mainproc.c:1612
 +#, c-format
 +msgid "BAD signature from \"%s\""
 +msgstr "BAD signature from “%s”"
 +
- #: g10/mainproc.c:1609
++#: g10/mainproc.c:1614
 +#, c-format
 +msgid "Expired signature from \"%s\""
 +msgstr "Expired signature from “%s”"
 +
- #: g10/mainproc.c:1611
++#: g10/mainproc.c:1616
 +#, c-format
 +msgid "Good signature from \"%s\""
 +msgstr "Good signature from “%s”"
 +
- #: g10/mainproc.c:1630
++#: g10/mainproc.c:1635
 +msgid "signature verification suppressed\n"
 +msgstr "signature verification suppressed\n"
 +
- #: g10/mainproc.c:1739
++#: g10/mainproc.c:1744
 +msgid "can't handle this ambiguous signature data\n"
 +msgstr "can't handle this ambiguous signature data\n"
 +
- #: g10/mainproc.c:1753 g10/mainproc.c:1761
++#: g10/mainproc.c:1758 g10/mainproc.c:1766
 +#, c-format
 +msgid "Signature made %s\n"
 +msgstr "Signature made %s\n"
 +
- #: g10/mainproc.c:1754 g10/mainproc.c:1762
++#: g10/mainproc.c:1759 g10/mainproc.c:1767
 +#, c-format
 +msgid "               using %s key %s\n"
 +msgstr "               using %s key %s\n"
 +
- #: g10/mainproc.c:1766
++#: g10/mainproc.c:1771
 +#, 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:1772
++#: g10/mainproc.c:1777
 +#, c-format
 +msgid "               issuer \"%s\"\n"
 +msgstr "               issuer “%s”\n"
 +
- #: g10/mainproc.c:1789
++#: g10/mainproc.c:1794
 +msgid "Key available at: "
 +msgstr "Key available at: "
 +
- #: g10/mainproc.c:2024
++#: g10/mainproc.c:2029
 +msgid "[uncertain]"
 +msgstr "[uncertain]"
 +
- #: g10/mainproc.c:2062
++#: g10/mainproc.c:2067
 +#, c-format
 +msgid "                aka \"%s\""
 +msgstr "                aka “%s”"
 +
- #: g10/mainproc.c:2145
++#: g10/mainproc.c:2150
 +#, c-format
 +msgid "Signature expired %s\n"
 +msgstr "Signature expired %s\n"
 +
- #: g10/mainproc.c:2149
++#: g10/mainproc.c:2154
 +#, c-format
 +msgid "Signature expires %s\n"
 +msgstr "Signature expires %s\n"
 +
- #: g10/mainproc.c:2160
++#: g10/mainproc.c:2165
 +#, c-format
 +msgid "%s signature, digest algorithm %s%s%s\n"
 +msgstr "%s signature, digest algorithm %s%s%s\n"
 +
- #: g10/mainproc.c:2161
++#: g10/mainproc.c:2166
 +msgid "binary"
 +msgstr "binary"
 +
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2167
 +msgid "textmode"
 +msgstr "textmode"
 +
- #: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
 +msgid "unknown"
 +msgstr "unknown"
 +
- #: g10/mainproc.c:2164
++#: g10/mainproc.c:2169
 +msgid ", key algorithm "
 +msgstr ", key algorithm "
 +
- #: g10/mainproc.c:2199
++#: g10/mainproc.c:2204
 +#, 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:2229
++#: g10/mainproc.c:2234
 +#, c-format
 +msgid "Can't check signature: %s\n"
 +msgstr "Can't check signature: %s\n"
 +
- #: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
++#: g10/mainproc.c:2327 g10/mainproc.c:2346 g10/mainproc.c:2470
 +msgid "not a detached signature\n"
 +msgstr "not a detached signature\n"
 +
- #: g10/mainproc.c:2375
++#: g10/mainproc.c:2380
 +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:2384
++#: g10/mainproc.c:2389
 +#, c-format
 +msgid "standalone signature of class 0x%02x\n"
 +msgstr "standalone signature of class 0x%02x\n"
 +
- #: g10/mainproc.c:2469
++#: g10/mainproc.c:2474
 +msgid "old style (PGP 2.x) signature\n"
 +msgstr "old style (PGP 2.x) signature\n"
 +
 +#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
 +#, c-format
 +msgid "fstat of '%s' failed in %s: %s\n"
 +msgstr "fstat of ‘%s’ failed in %s: %s\n"
 +
 +#: g10/misc.c:170
 +#, c-format
 +msgid "fstat(%d) failed in %s: %s\n"
 +msgstr "fstat(%d) failed in %s: %s\n"
 +
 +#: g10/misc.c:279
 +#, c-format
 +msgid "WARNING: using experimental public key algorithm %s\n"
 +msgstr "WARNING: using experimental public key algorithm %s\n"
 +
 +#: g10/misc.c:286
 +msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 +msgstr "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 +
 +#: g10/misc.c:300
 +#, c-format
 +msgid "WARNING: using experimental cipher algorithm %s\n"
 +msgstr "WARNING: using experimental cipher algorithm %s\n"
 +
 +#: g10/misc.c:319
 +#, c-format
 +msgid "WARNING: using experimental digest algorithm %s\n"
 +msgstr "WARNING: using experimental digest algorithm %s\n"
 +
 +#: g10/misc.c:328
 +#, c-format
 +msgid "WARNING: digest algorithm %s is deprecated\n"
 +msgstr "WARNING: digest algorithm %s is deprecated\n"
 +
 +#: g10/misc.c:353
 +#, c-format
 +msgid "Note: signatures using the %s algorithm are rejected\n"
 +msgstr "Note: signatures using the %s algorithm are rejected\n"
 +
 +#: g10/misc.c:375
 +#, c-format
 +msgid "(reported error: %s)\n"
 +msgstr "(reported error: %s)\n"
 +
 +#: g10/misc.c:378
 +#, c-format
 +msgid "(reported error: %s <%s>)\n"
 +msgstr "(reported error: %s <%s>)\n"
 +
 +#: g10/misc.c:397
 +msgid "(further info: "
 +msgstr "(further info: "
 +
 +#: g10/misc.c:1056
 +#, c-format
 +msgid "%s:%d: deprecated option \"%s\"\n"
 +msgstr "%s:%d: deprecated option “%s”\n"
 +
 +#: g10/misc.c:1060
 +#, c-format
 +msgid "WARNING: \"%s\" is a deprecated option\n"
 +msgstr "WARNING: “%s” is a deprecated option\n"
 +
 +#: g10/misc.c:1062
 +#, c-format
 +msgid "please use \"%s%s\" instead\n"
 +msgstr "please use “%s%s” instead\n"
 +
 +#: g10/misc.c:1069
 +#, 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:1079
 +#, 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:1083
 +#, 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:1147
 +msgid "Uncompressed"
 +msgstr "Uncompressed"
 +
 +#. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: g10/misc.c:1172
 +msgid "uncompressed|none"
 +msgstr "uncompressed|none"
 +
 +#: g10/misc.c:1297
 +#, 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:1472
 +#, c-format
 +msgid "ambiguous option '%s'\n"
 +msgstr "ambiguous option ‘%s’\n"
 +
 +#: g10/misc.c:1497
 +#, c-format
 +msgid "unknown option '%s'\n"
 +msgstr "unknown option ‘%s’\n"
 +
 +#: g10/misc.c:1735
 +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:1757
 +#, c-format
 +msgid "unknown weak digest '%s'\n"
 +msgstr "unknown weak digest ‘%s’\n"
 +
 +#: g10/openfile.c:84
 +#, c-format
 +msgid "File '%s' exists. "
 +msgstr "File ‘%s’ exists. "
 +
 +#: g10/openfile.c:88
 +msgid "Overwrite? (y/N) "
 +msgstr "Overwrite? (y/N) "
 +
 +#: g10/openfile.c:123
 +#, c-format
 +msgid "%s: unknown suffix\n"
 +msgstr "%s: unknown suffix\n"
 +
 +#: g10/openfile.c:147
 +msgid "Enter new filename"
 +msgstr "Enter new filename"
 +
 +#: g10/openfile.c:218
 +msgid "writing to stdout\n"
 +msgstr "writing to stdout\n"
 +
 +#: g10/openfile.c:366
 +#, c-format
 +msgid "assuming signed data in '%s'\n"
 +msgstr "assuming signed data in ‘%s’\n"
 +
 +#: g10/openfile.c:457
 +#, c-format
 +msgid "new configuration file '%s' created\n"
 +msgstr "new configuration file ‘%s’ created\n"
 +
 +#: g10/openfile.c:498
 +#, c-format
 +msgid "WARNING: options in '%s' are not yet active during this run\n"
 +msgstr "WARNING: options in ‘%s’ are not yet active during this run\n"
 +
 +#: g10/parse-packet.c:257
 +#, c-format
 +msgid "can't handle public key algorithm %d\n"
 +msgstr "can't handle public key algorithm %d\n"
 +
 +#: g10/parse-packet.c:1113
 +msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 +msgstr "WARNING: potentially insecure symmetrically encrypted session key\n"
 +
 +#: g10/parse-packet.c:1649
 +#, c-format
 +msgid "subpacket of type %d has critical bit set\n"
 +msgstr "subpacket of type %d has critical bit set\n"
 +
 +#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
 +#, c-format
 +msgid "problem with the agent: %s\n"
 +msgstr "problem with the agent: %s\n"
 +
 +#: g10/passphrase.c:241
 +msgid "Enter passphrase\n"
 +msgstr "Enter passphrase\n"
 +
 +#: g10/passphrase.c:252
 +msgid "cancelled by user\n"
 +msgstr "cancelled by user\n"
 +
 +#: g10/passphrase.c:489
 +#, c-format
 +msgid " (main key ID %s)"
 +msgstr " (main key ID %s)"
 +
 +#: g10/passphrase.c:496
 +msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 +msgstr "Please enter the passphrase to unlock the OpenPGP secret key:"
 +
 +#: g10/passphrase.c:500
 +msgid "Please enter the passphrase to import the OpenPGP secret key:"
 +msgstr "Please enter the passphrase to import the OpenPGP secret key:"
 +
 +#: g10/passphrase.c:505
 +msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 +msgstr "Please enter the passphrase to export the OpenPGP secret subkey:"
 +
 +#: g10/passphrase.c:508
 +msgid "Please enter the passphrase to export the OpenPGP secret key:"
 +msgstr "Please enter the passphrase to export the OpenPGP secret key:"
 +
 +#: g10/passphrase.c:513
 +msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 +msgstr ""
 +"Do you really want to permanently delete the OpenPGP secret subkey key:"
 +
 +#: g10/passphrase.c:516
 +msgid "Do you really want to permanently delete the OpenPGP secret key:"
 +msgstr "Do you really want to permanently delete the OpenPGP secret key:"
 +
 +#: g10/passphrase.c:525
 +#, c-format
 +msgid ""
 +"%s\n"
 +"\"%.*s\"\n"
 +"%u-bit %s key, ID %s,\n"
 +"created %s%s.\n"
 +"%s"
 +msgstr ""
 +"%s\n"
 +"“%.*s”\n"
 +"%u-bit %s key, ID %s,\n"
 +"created %s%s.\n"
 +"%s"
 +
 +#: g10/photoid.c:77
 +msgid ""
 +"\n"
 +"Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
 +"Remember that the image is stored within your public key.  If you use a\n"
 +"very large picture, your key will become very large as well!\n"
 +"Keeping the image close to 240x288 is a good size to use.\n"
 +msgstr ""
 +"\n"
 +"Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
 +"Remember that the image is stored within your public key.  If you use a\n"
 +"very large picture, your key will become very large as well!\n"
 +"Keeping the image close to 240x288 is a good size to use.\n"
 +
 +#: g10/photoid.c:99
 +msgid "Enter JPEG filename for photo ID: "
 +msgstr "Enter JPEG filename for photo ID: "
 +
 +#: g10/photoid.c:120
 +#, c-format
 +msgid "unable to open JPEG file '%s': %s\n"
 +msgstr "unable to open JPEG file '%s': %s\n"
 +
 +#: g10/photoid.c:131
 +#, c-format
 +msgid "This JPEG is really large (%d bytes) !\n"
 +msgstr "This JPEG is really large (%d bytes) !\n"
 +
 +#: g10/photoid.c:133
 +msgid "Are you sure you want to use it? (y/N) "
 +msgstr "Are you sure you want to use it? (y/N) "
 +
 +#: g10/photoid.c:149
 +#, c-format
 +msgid "'%s' is not a JPEG file\n"
 +msgstr "‘%s’ is not a JPEG file\n"
 +
 +#: g10/photoid.c:168
 +msgid "Is this photo correct (y/N/q)? "
 +msgstr "Is this photo correct (y/N/q)? "
 +
 +#: g10/photoid.c:380
 +msgid "unable to display photo ID!\n"
 +msgstr "unable to display photo ID!\n"
 +
- #: g10/pkclist.c:72 g10/revoke.c:757
++#: g10/pkclist.c:72 g10/revoke.c:758
 +msgid "No reason specified"
 +msgstr "No reason specified"
 +
- #: g10/pkclist.c:74 g10/revoke.c:759
++#: g10/pkclist.c:74 g10/revoke.c:760
 +msgid "Key is superseded"
 +msgstr "Key is superseded"
 +
- #: g10/pkclist.c:76 g10/revoke.c:758
++#: g10/pkclist.c:76 g10/revoke.c:759
 +msgid "Key has been compromised"
 +msgstr "Key has been compromised"
 +
- #: g10/pkclist.c:78 g10/revoke.c:760
++#: g10/pkclist.c:78 g10/revoke.c:761
 +msgid "Key is no longer used"
 +msgstr "Key is no longer used"
 +
- #: g10/pkclist.c:80 g10/revoke.c:761
++#: g10/pkclist.c:80 g10/revoke.c:762
 +msgid "User ID is no longer valid"
 +msgstr "User ID is no longer valid"
 +
 +#: g10/pkclist.c:84
 +msgid "reason for revocation: "
 +msgstr "reason for revocation: "
 +
 +#: g10/pkclist.c:100
 +msgid "revocation comment: "
 +msgstr "revocation comment: "
 +
 +#. TRANSLATORS: These are the allowed answers in lower and
 +#. uppercase.  Below you will find the matching strings which
 +#. should be translated accordingly and the letter changed to
 +#. match the one in the answer string.
 +#.
 +#. i = please show me more information
 +#. m = back to the main menu
 +#. s = skip this key
 +#. q = quit
 +#.
 +#: g10/pkclist.c:216
 +msgid "iImMqQsS"
 +msgstr "iImMqQsS"
 +
 +#: g10/pkclist.c:224
 +msgid "No trust value assigned to:\n"
 +msgstr "No trust value assigned to:\n"
 +
 +#: g10/pkclist.c:257
 +#, c-format
 +msgid "  aka \"%s\"\n"
 +msgstr "  aka “%s”\n"
 +
 +#: g10/pkclist.c:267
 +msgid ""
 +"How much do you trust that this key actually belongs to the named user?\n"
 +msgstr ""
 +"How much do you trust that this key actually belongs to the named user?\n"
 +
 +#: g10/pkclist.c:282
 +#, c-format
 +msgid "  %d = I don't know or won't say\n"
 +msgstr "  %d = I don't know or won't say\n"
 +
 +#: g10/pkclist.c:284
 +#, c-format
 +msgid "  %d = I do NOT trust\n"
 +msgstr "  %d = I do NOT trust\n"
 +
 +#: g10/pkclist.c:290
 +#, c-format
 +msgid "  %d = I trust ultimately\n"
 +msgstr "  %d = I trust ultimately\n"
 +
 +#: g10/pkclist.c:296
 +msgid "  m = back to the main menu\n"
 +msgstr "  m = back to the main menu\n"
 +
 +#: g10/pkclist.c:299
 +msgid "  s = skip this key\n"
 +msgstr "  s = skip this key\n"
 +
 +#: g10/pkclist.c:300
 +msgid "  q = quit\n"
 +msgstr "  q = quit\n"
 +
 +#: g10/pkclist.c:304
 +#, c-format
 +msgid ""
 +"The minimum trust level for this key is: %s\n"
 +"\n"
 +msgstr ""
 +"The minimum trust level for this key is: %s\n"
 +"\n"
 +
- #: g10/pkclist.c:310 g10/revoke.c:786
++#: g10/pkclist.c:310 g10/revoke.c:787
 +msgid "Your decision? "
 +msgstr "Your decision? "
 +
 +#: g10/pkclist.c:331
 +msgid "Do you really want to set this key to ultimate trust? (y/N) "
 +msgstr "Do you really want to set this key to ultimate trust? (y/N) "
 +
 +#: g10/pkclist.c:345
 +msgid "Certificates leading to an ultimately trusted key:\n"
 +msgstr "Certificates leading to an ultimately trusted key:\n"
 +
 +#: g10/pkclist.c:434
 +#, c-format
 +msgid "%s: There is no assurance this key belongs to the named user\n"
 +msgstr "%s: There is no assurance this key belongs to the named user\n"
 +
 +#: g10/pkclist.c:439
 +#, c-format
 +msgid "%s: There is limited assurance this key belongs to the named user\n"
 +msgstr "%s: There is limited assurance this key belongs to the named user\n"
 +
 +#: g10/pkclist.c:445
 +msgid "This key probably belongs to the named user\n"
 +msgstr "This key probably belongs to the named user\n"
 +
 +#: g10/pkclist.c:450
 +msgid "This key belongs to us\n"
 +msgstr "This key belongs to us\n"
 +
 +#: g10/pkclist.c:456
 +#, c-format
 +msgid "%s: This key is bad!  It has been marked as untrusted!\n"
 +msgstr "%s: This key is bad!  It has been marked as untrusted!\n"
 +
 +#: g10/pkclist.c:484
 +msgid ""
- "This key has is bad!  It has been marked as untrusted!  If you\n"
++"This key is bad!  It has been marked as untrusted!  If you\n"
 +"*really* know what you are doing, you may answer the next\n"
 +"question with yes.\n"
 +msgstr ""
- "This key has is bad!  It has been marked as untrusted!  If you\n"
++"This key is bad!  It has been marked as untrusted!  If you\n"
 +"*really* know what you are doing, you may answer the next\n"
 +"question with yes.\n"
 +
 +#: g10/pkclist.c:489
 +msgid ""
 +"It is NOT certain that the key belongs to the person named\n"
 +"in the user ID.  If you *really* know what you are doing,\n"
 +"you may answer the next question with yes.\n"
 +msgstr ""
 +"It is NOT certain that the key belongs to the person named\n"
 +"in the user ID.  If you *really* know what you are doing,\n"
 +"you may answer the next question with yes.\n"
 +
 +#: g10/pkclist.c:508
 +msgid "Use this key anyway? (y/N) "
 +msgstr "Use this key anyway? (y/N) "
 +
 +#: g10/pkclist.c:562
 +msgid "WARNING: Using untrusted key!\n"
 +msgstr "WARNING: Using untrusted key!\n"
 +
 +#: g10/pkclist.c:569
 +msgid "WARNING: this key might be revoked (revocation key not present)\n"
 +msgstr "WARNING: this key might be revoked (revocation key not present)\n"
 +
 +#: g10/pkclist.c:578
 +msgid "WARNING: This key has been revoked by its designated revoker!\n"
 +msgstr "WARNING: This key has been revoked by its designated revoker!\n"
 +
 +#: g10/pkclist.c:581
 +msgid "WARNING: This key has been revoked by its owner!\n"
 +msgstr "WARNING: This key has been revoked by its owner!\n"
 +
 +#: g10/pkclist.c:582
 +msgid "         This could mean that the signature is forged.\n"
 +msgstr "         This could mean that the signature is forged.\n"
 +
 +#: g10/pkclist.c:588
 +msgid "WARNING: This subkey has been revoked by its owner!\n"
 +msgstr "WARNING: This subkey has been revoked by its owner!\n"
 +
 +#: g10/pkclist.c:593
 +msgid "Note: This key has been disabled.\n"
 +msgstr "Note: This key has been disabled.\n"
 +
 +#: g10/pkclist.c:613
 +#, c-format
 +msgid "Note: Verified signer's address is '%s'\n"
 +msgstr "Note: Verified signer's address is ‘%s’\n"
 +
 +#: g10/pkclist.c:620
 +#, c-format
 +msgid "Note: Signer's address '%s' does not match DNS entry\n"
 +msgstr "Note: Signer's address ‘%s’ does not match DNS entry\n"
 +
 +#: g10/pkclist.c:632
 +msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 +msgstr "trustlevel adjusted to FULL due to valid PKA info\n"
 +
 +#: g10/pkclist.c:640
 +msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 +msgstr "trustlevel adjusted to NEVER due to bad PKA info\n"
 +
 +#: g10/pkclist.c:651
 +msgid "Note: This key has expired!\n"
 +msgstr "Note: This key has expired!\n"
 +
 +#: g10/pkclist.c:662
 +msgid "WARNING: This key is not certified with a trusted signature!\n"
 +msgstr "WARNING: This key is not certified with a trusted signature!\n"
 +
 +#: g10/pkclist.c:664
 +msgid ""
 +"         There is no indication that the signature belongs to the owner.\n"
 +msgstr ""
 +"         There is no indication that the signature belongs to the owner.\n"
 +
 +#: g10/pkclist.c:673
 +msgid "WARNING: We do NOT trust this key!\n"
 +msgstr "WARNING: We do NOT trust this key!\n"
 +
 +#: g10/pkclist.c:674
 +msgid "         The signature is probably a FORGERY.\n"
 +msgstr "         The signature is probably a FORGERY.\n"
 +
 +#: g10/pkclist.c:682
 +msgid ""
 +"WARNING: This key is not certified with sufficiently trusted signatures!\n"
 +msgstr ""
 +"WARNING: This key is not certified with sufficiently trusted signatures!\n"
 +
 +#: g10/pkclist.c:684
 +msgid "         It is not certain that the signature belongs to the owner.\n"
 +msgstr "         It is not certain that the signature belongs to the owner.\n"
 +
 +#: g10/pkclist.c:847 g10/pkclist.c:865 g10/pkclist.c:1050 g10/pkclist.c:1092
 +#, c-format
 +msgid "%s: skipped: %s\n"
 +msgstr "%s: skipped: %s\n"
 +
 +#: g10/pkclist.c:880
 +#, c-format
 +msgid "%s: skipped: public key is disabled\n"
 +msgstr "%s: skipped: public key is disabled\n"
 +
 +#: g10/pkclist.c:899 g10/pkclist.c:1063
 +#, c-format
 +msgid "%s: skipped: public key already present\n"
 +msgstr "%s: skipped: public key already present\n"
 +
 +#: g10/pkclist.c:987
 +#, c-format
 +msgid "can't encrypt to '%s'\n"
 +msgstr "can't encrypt to ‘%s’\n"
 +
 +#: g10/pkclist.c:1002
 +#, c-format
 +msgid "option '%s' given, but no valid default keys given\n"
 +msgstr "option ‘%s’ given, but no valid default keys given\n"
 +
 +#: g10/pkclist.c:1009
 +#, c-format
 +msgid "option '%s' given, but option '%s' not given\n"
 +msgstr "option ‘%s’ given, but option ‘%s’ not given\n"
 +
 +#: g10/pkclist.c:1112
 +msgid "You did not specify a user ID. (you may use \"-r\")\n"
 +msgstr "You did not specify a user ID. (you may use “-r”)\n"
 +
 +#: g10/pkclist.c:1136
 +msgid "Current recipients:\n"
 +msgstr "Current recipients:\n"
 +
 +#: g10/pkclist.c:1162
 +msgid ""
 +"\n"
 +"Enter the user ID.  End with an empty line: "
 +msgstr ""
 +"\n"
 +"Enter the user ID.  End with an empty line: "
 +
 +#: g10/pkclist.c:1186
 +msgid "No such user ID.\n"
 +msgstr "No such user ID.\n"
 +
- #: g10/pkclist.c:1197 g10/pkclist.c:1273
++#: g10/pkclist.c:1197 g10/pkclist.c:1274
 +msgid "skipped: public key already set as default recipient\n"
 +msgstr "skipped: public key already set as default recipient\n"
 +
- #: g10/pkclist.c:1218
++#: g10/pkclist.c:1219
 +msgid "Public key is disabled.\n"
 +msgstr "Public key is disabled.\n"
 +
- #: g10/pkclist.c:1228
++#: g10/pkclist.c:1229
 +msgid "skipped: public key already set\n"
 +msgstr "skipped: public key already set\n"
 +
- #: g10/pkclist.c:1263
++#: g10/pkclist.c:1264
 +#, c-format
 +msgid "unknown default recipient \"%s\"\n"
 +msgstr "unknown default recipient “%s”\n"
 +
- #: g10/pkclist.c:1312
++#: g10/pkclist.c:1313
 +msgid "no valid addressees\n"
 +msgstr "no valid addressees\n"
 +
- #: g10/pkclist.c:1665
++#: g10/pkclist.c:1666
 +#, c-format
 +msgid "Note: key %s has no %s feature\n"
 +msgstr "Note: key %s has no %s feature\n"
 +
- #: g10/pkclist.c:1690
++#: g10/pkclist.c:1691
 +#, c-format
 +msgid "Note: key %s has no preference for %s\n"
 +msgstr "Note: key %s has no preference for %s\n"
 +
 +#: g10/plaintext.c:84
 +msgid "data not saved; use option \"--output\" to save it\n"
 +msgstr "data not saved; use option “--output” to save it\n"
 +
- #: g10/plaintext.c:598
++#: g10/plaintext.c:614
 +msgid "Detached signature.\n"
 +msgstr "Detached signature.\n"
 +
- #: g10/plaintext.c:606
++#: g10/plaintext.c:622
 +msgid "Please enter name of data file: "
 +msgstr "Please enter name of data file: "
 +
- #: g10/plaintext.c:643
++#: g10/plaintext.c:659
 +msgid "reading stdin ...\n"
 +msgstr "reading stdin ...\n"
 +
- #: g10/plaintext.c:688
++#: g10/plaintext.c:704
 +msgid "no signed data\n"
 +msgstr "no signed data\n"
 +
- #: g10/plaintext.c:706
++#: g10/plaintext.c:722
 +#, c-format
 +msgid "can't open signed data '%s'\n"
 +msgstr "can't open signed data ‘%s’\n"
 +
- #: g10/plaintext.c:741
++#: g10/plaintext.c:757
 +#, c-format
 +msgid "can't open signed data fd=%d: %s\n"
 +msgstr "can't open signed data fd=%d: %s\n"
 +
 +#: g10/pubkey-enc.c:116
 +#, c-format
 +msgid "anonymous recipient; trying secret key %s ...\n"
 +msgstr "anonymous recipient; trying secret key %s ...\n"
 +
 +#: g10/pubkey-enc.c:123
 +msgid "okay, we are the anonymous recipient.\n"
 +msgstr "okay, we are the anonymous recipient.\n"
 +
 +#: g10/pubkey-enc.c:282
 +msgid "old encoding of the DEK is not supported\n"
 +msgstr "old encoding of the DEK is not supported\n"
 +
 +#: g10/pubkey-enc.c:310
 +#, c-format
 +msgid "cipher algorithm %d%s is unknown or disabled\n"
 +msgstr "cipher algorithm %d%s is unknown or disabled\n"
 +
 +#: g10/pubkey-enc.c:352
 +#, c-format
 +msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 +msgstr "WARNING: cipher algorithm %s not found in recipient preferences\n"
 +
 +#: g10/pubkey-enc.c:377
 +#, c-format
 +msgid "Note: secret key %s expired at %s\n"
 +msgstr "Note: secret key %s expired at %s\n"
 +
 +#: g10/pubkey-enc.c:384
 +msgid "Note: key has been revoked"
 +msgstr "Note: key has been revoked"
 +
 +#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
 +#: g10/revoke.c:500
 +#, c-format
 +msgid "build_packet failed: %s\n"
 +msgstr "build_packet failed: %s\n"
 +
 +#: g10/revoke.c:144
 +#, c-format
 +msgid "key %s has no user IDs\n"
 +msgstr "key %s has no user IDs\n"
 +
 +#: g10/revoke.c:312
 +msgid "To be revoked by:\n"
 +msgstr "To be revoked by:\n"
 +
 +#: g10/revoke.c:316
 +msgid "(This is a sensitive revocation key)\n"
 +msgstr "(This is a sensitive revocation key)\n"
 +
 +#: g10/revoke.c:322
 +msgid "Secret key is not available.\n"
 +msgstr "Secret key is not available.\n"
 +
 +#: g10/revoke.c:327
 +msgid "Create a designated revocation certificate for this key? (y/N) "
 +msgstr "Create a designated revocation certificate for this key? (y/N) "
 +
- #: g10/revoke.c:336 g10/revoke.c:727
++#: g10/revoke.c:336 g10/revoke.c:728
 +msgid "ASCII armored output forced.\n"
 +msgstr "ASCII armored output forced.\n"
 +
 +#: g10/revoke.c:352 g10/revoke.c:479
 +#, c-format
 +msgid "make_keysig_packet failed: %s\n"
 +msgstr "make_keysig_packet failed: %s\n"
 +
 +#: g10/revoke.c:415
 +msgid "Revocation certificate created.\n"
 +msgstr "Revocation certificate created.\n"
 +
 +#: g10/revoke.c:421
 +#, c-format
 +msgid "no revocation keys found for \"%s\"\n"
 +msgstr "no revocation keys found for “%s”\n"
 +
 +#: g10/revoke.c:551
 +msgid "This is a revocation certificate for the OpenPGP key:"
 +msgstr "This is a revocation certificate for the OpenPGP key:"
 +
 +#: g10/revoke.c:567
 +msgid ""
 +"A revocation certificate is a kind of \"kill switch\" to publicly\n"
 +"declare that a key shall not anymore be used.  It is not possible\n"
 +"to retract such a revocation certificate once it has been published."
 +msgstr ""
 +"A revocation certificate is a kind of “kill switch” to publicly\n"
 +"declare that a key shall not anymore be used.  It is not possible\n"
 +"to retract such a revocation certificate once it has been published."
 +
 +#: g10/revoke.c:570
 +msgid ""
 +"Use it to revoke this key in case of a compromise or loss of\n"
 +"the secret key.  However, if the secret key is still accessible,\n"
 +"it is better to generate a new revocation certificate and give\n"
 +"a reason for the revocation.  For details see the description of\n"
- "of the gpg command \"--gen-revoke\" in the GnuPG manual."
++"of the gpg command \"--generate-revocation\" in the GnuPG manual."
 +msgstr ""
 +"Use it to revoke this key in case of a compromise or loss of\n"
 +"the secret key.  However, if the secret key is still accessible,\n"
 +"it is better to generate a new revocation certificate and give\n"
 +"a reason for the revocation.  For details see the description of\n"
- "of the gpg command “--gen-revoke” in the GnuPG manual."
++"of the gpg command “--generate-revocation” in the GnuPG manual."
 +
- #: g10/revoke.c:575
++#: g10/revoke.c:576
 +msgid ""
 +"To avoid an accidental use of this file, a colon has been inserted\n"
 +"before the 5 dashes below.  Remove this colon with a text editor\n"
 +"before importing and publishing this revocation certificate."
 +msgstr ""
 +"To avoid an accidental use of this file, a colon has been inserted\n"
 +"before the 5 dashes below.  Remove this colon with a text editor\n"
 +"before importing and publishing this revocation certificate."
 +
- #: g10/revoke.c:590
++#: g10/revoke.c:591
 +#, c-format
 +msgid "revocation certificate stored as '%s.rev'\n"
 +msgstr "revocation certificate stored as ‘%s.rev’\n"
 +
- #: g10/revoke.c:634
++#: g10/revoke.c:635
 +#, c-format
 +msgid "secret key \"%s\" not found\n"
 +msgstr "secret key “%s” not found\n"
 +
 +#. TRANSLATORS: The %s prints a key specification which
 +#. for example has been given at the command line.  Several lines
 +#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:661
++#: g10/revoke.c:662
 +#, c-format
 +msgid "'%s' matches multiple secret keys:\n"
 +msgstr "‘%s’ matches multiple secret keys:\n"
 +
- #: g10/revoke.c:688
++#: g10/revoke.c:689
 +#, c-format
 +msgid "error searching the keyring: %s\n"
 +msgstr "error searching the keyring: %s\n"
 +
- #: g10/revoke.c:711
++#: g10/revoke.c:712
 +msgid "Create a revocation certificate for this key? (y/N) "
 +msgstr "Create a revocation certificate for this key? (y/N) "
 +
- #: g10/revoke.c:735
++#: g10/revoke.c:736
 +msgid ""
 +"Revocation certificate created.\n"
 +"\n"
 +"Please move it to a medium which you can hide away; if Mallory gets\n"
 +"access to this certificate he can use it to make your key unusable.\n"
 +"It is smart to print this certificate and store it away, just in case\n"
 +"your media become unreadable.  But have some caution:  The print system of\n"
 +"your machine might store the data and make it available to others!\n"
 +msgstr ""
 +"Revocation certificate created.\n"
 +"\n"
 +"Please move it to a medium which you can hide away; if Mallory gets\n"
 +"access to this certificate he can use it to make your key unusable.\n"
 +"It is smart to print this certificate and store it away, just in case\n"
 +"your media become unreadable.  But have some caution:  The print system of\n"
 +"your machine might store the data and make it available to others!\n"
 +
- #: g10/revoke.c:769
++#: g10/revoke.c:770
 +msgid "Please select the reason for the revocation:\n"
 +msgstr "Please select the reason for the revocation:\n"
 +
- #: g10/revoke.c:779
++#: g10/revoke.c:780
 +msgid "Cancel"
 +msgstr "Cancel"
 +
- #: g10/revoke.c:781
++#: g10/revoke.c:782
 +#, c-format
 +msgid "(Probably you want to select %d here)\n"
 +msgstr "(Probably you want to select %d here)\n"
 +
- #: g10/revoke.c:822
++#: g10/revoke.c:823
 +msgid "Enter an optional description; end it with an empty line:\n"
 +msgstr "Enter an optional description; end it with an empty line:\n"
 +
- #: g10/revoke.c:850
++#: g10/revoke.c:851
 +#, c-format
 +msgid "Reason for revocation: %s\n"
 +msgstr "Reason for revocation: %s\n"
 +
- #: g10/revoke.c:852
++#: g10/revoke.c:853
 +msgid "(No description given)\n"
 +msgstr "(No description given)\n"
 +
- #: g10/revoke.c:857
++#: g10/revoke.c:858
 +msgid "Is this okay? (y/N) "
 +msgstr "Is this okay? (y/N) "
 +
 +#: g10/seskey.c:62 sm/encrypt.c:123
 +msgid "weak key created - retrying\n"
 +msgstr "weak key created - retrying\n"
 +
 +#: g10/seskey.c:66
 +#, c-format
 +msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 +msgstr "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 +
 +#: g10/seskey.c:306
 +#, c-format
 +msgid "%s key %s uses an unsafe (%zu bit) hash\n"
 +msgstr "%s key %s uses an unsafe (%zu bit) hash\n"
 +
 +#: g10/seskey.c:324
 +#, c-format
 +msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 +msgstr "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 +
 +#: g10/sig-check.c:122
 +msgid "WARNING: signature digest conflict in message\n"
 +msgstr "WARNING: signature digest conflict in message\n"
 +
 +#: g10/sig-check.c:149
 +#, c-format
 +msgid "WARNING: signing subkey %s is not cross-certified\n"
 +msgstr "WARNING: signing subkey %s is not cross-certified\n"
 +
 +#: g10/sig-check.c:151
 +#, c-format
 +msgid "please see %s for more information\n"
 +msgstr "please see %s for more information\n"
 +
 +#: g10/sig-check.c:161
 +#, c-format
 +msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 +msgstr "WARNING: signing subkey %s has an invalid cross-certification\n"
 +
 +#: g10/sig-check.c:281
 +#, c-format
 +msgid "public key %s is %lu second newer than the signature\n"
 +msgid_plural "public key %s is %lu seconds newer than the signature\n"
 +msgstr[0] "public key %s is %lu second newer than the signature\n"
 +msgstr[1] "public key %s is %lu seconds newer than the signature\n"
 +
 +#: g10/sig-check.c:290
 +#, c-format
 +msgid "public key %s is %lu day newer than the signature\n"
 +msgid_plural "public key %s is %lu days newer than the signature\n"
 +msgstr[0] "public key %s is %lu day newer than the signature\n"
 +msgstr[1] "public key %s is %lu days newer than the signature\n"
 +
 +#: g10/sig-check.c:304 g10/sign.c:266
 +#, c-format
 +msgid ""
 +"key %s was created %lu second in the future (time warp or clock problem)\n"
 +msgid_plural ""
 +"key %s was created %lu seconds in the future (time warp or clock problem)\n"
 +msgstr[0] ""
 +"key %s was created %lu second in the future (time warp or clock problem)\n"
 +msgstr[1] ""
 +"key %s was created %lu seconds in the future (time warp or clock problem)\n"
 +
 +#: g10/sig-check.c:313
 +#, c-format
 +msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
 +msgid_plural ""
 +"key %s was created %lu days in the future (time warp or clock problem)\n"
 +msgstr[0] ""
 +"key %s was created %lu day in the future (time warp or clock problem)\n"
 +msgstr[1] ""
 +"key %s was created %lu days in the future (time warp or clock problem)\n"
 +
 +#: g10/sig-check.c:330
 +#, c-format
 +msgid "Note: signature key %s expired %s\n"
 +msgstr "Note: signature key %s expired %s\n"
 +
 +#: g10/sig-check.c:341
 +#, c-format
 +msgid "Note: signature key %s has been revoked\n"
 +msgstr "Note: signature key %s has been revoked\n"
 +
 +#: g10/sig-check.c:475
 +#, c-format
 +msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 +msgstr "assuming bad signature from key %s due to an unknown critical bit\n"
 +
 +#: g10/sig-check.c:1052
 +#, c-format
 +msgid "key %s: no subkey for subkey revocation signature\n"
 +msgstr "key %s: no subkey for subkey revocation signature\n"
 +
 +#: g10/sig-check.c:1055
 +#, c-format
 +msgid "key %s: no subkey for subkey binding signature\n"
 +msgstr "key %s: no subkey for subkey binding signature\n"
 +
 +#: g10/sign.c:88
 +#, c-format
 +msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 +msgstr ""
 +"WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 +
 +#: g10/sign.c:114
 +#, c-format
 +msgid ""
 +"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 +msgstr ""
 +"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 +
 +#: g10/sign.c:137
 +#, c-format
 +msgid ""
 +"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 +"unexpanded.\n"
 +msgstr ""
 +"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 +"unexpanded.\n"
 +
- #: g10/sign.c:329
++#: g10/sign.c:331
 +#, c-format
 +msgid "%s/%s signature from: \"%s\"\n"
 +msgstr "%s/%s signature from: “%s”\n"
 +
- #: g10/sign.c:878
++#: g10/sign.c:880
 +#, c-format
 +msgid ""
 +"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 +msgstr ""
 +"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 +
- #: g10/sign.c:1009
++#: g10/sign.c:1011
 +msgid "signing:"
 +msgstr "signing:"
 +
- #: g10/sign.c:1286
++#: g10/sign.c:1288
 +#, c-format
 +msgid "%s encryption will be used\n"
 +msgstr "%s encryption will be used\n"
 +
 +#: g10/skclist.c:155 g10/skclist.c:236
 +msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 +msgstr "key is not flagged as insecure - can't use it with the faked RNG!\n"
 +
 +#: g10/skclist.c:187
 +#, c-format
 +msgid "skipped \"%s\": duplicated\n"
 +msgstr "skipped “%s”: duplicated\n"
 +
 +#: g10/skclist.c:206
 +msgid "skipped: secret key already present\n"
 +msgstr "skipped: secret key already present\n"
 +
 +#: g10/skclist.c:225
 +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:362
++#: g10/tdbdump.c:57 g10/trustdb.c:369
 +#, c-format
 +msgid "trust record %lu, type %d: write failed: %s\n"
 +msgstr "trust record %lu, type %d: write failed: %s\n"
 +
 +#: g10/tdbdump.c:105
 +#, c-format
 +msgid ""
 +"# List of assigned trustvalues, created %s\n"
 +"# (Use \"gpg --import-ownertrust\" to restore them)\n"
 +msgstr ""
 +"# List of assigned trustvalues, created %s\n"
 +"# (Use “gpg --import-ownertrust” to restore them)\n"
 +
 +#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
 +#, c-format
 +msgid "error in '%s': %s\n"
 +msgstr "error in '%s': %s\n"
 +
 +#: g10/tdbdump.c:162
 +msgid "line too long"
 +msgstr "line too long"
 +
 +#: g10/tdbdump.c:170
 +msgid "colon missing"
 +msgstr "colon missing"
 +
 +#: g10/tdbdump.c:176
 +msgid "invalid fingerprint"
 +msgstr "invalid fingerprint"
 +
 +#: g10/tdbdump.c:181
 +msgid "ownertrust value missing"
 +msgstr "ownertrust value missing"
 +
 +#: g10/tdbdump.c:217
 +#, c-format
 +msgid "error finding trust record in '%s': %s\n"
 +msgstr "error finding trust record in '%s': %s\n"
 +
 +#: g10/tdbdump.c:221
 +#, c-format
 +msgid "read error in '%s': %s\n"
 +msgstr "read error in '%s': %s\n"
 +
- #: g10/tdbdump.c:230 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:384
 +#, c-format
 +msgid "trustdb: sync failed: %s\n"
 +msgstr "trustdb: sync failed: %s\n"
 +
 +#: g10/tdbio.c:141 sm/keydb.c:356
 +#, c-format
 +msgid "can't create lock for '%s'\n"
 +msgstr "can't create lock for ‘%s’\n"
 +
 +#: g10/tdbio.c:146
 +#, c-format
 +msgid "can't lock '%s'\n"
 +msgstr "can't lock ‘%s’\n"
 +
 +#: g10/tdbio.c:205 g10/tdbio.c:1787
 +#, c-format
 +msgid "trustdb rec %lu: lseek failed: %s\n"
 +msgstr "trustdb rec %lu: lseek failed: %s\n"
 +
 +#: g10/tdbio.c:213 g10/tdbio.c:1798
 +#, c-format
 +msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 +msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
 +
 +#: g10/tdbio.c:352
 +msgid "trustdb transaction too large\n"
 +msgstr "trustdb transaction too large\n"
 +
 +#: g10/tdbio.c:682
 +#, c-format
 +msgid "%s: directory does not exist!\n"
 +msgstr "%s: directory does not exist!\n"
 +
 +#: g10/tdbio.c:703 dirmngr/http.c:501
 +#, c-format
 +msgid "can't access '%s': %s\n"
 +msgstr "can't access '%s': %s\n"
 +
 +#: g10/tdbio.c:724
 +#, c-format
 +msgid "%s: failed to create version record: %s"
 +msgstr "%s: failed to create version record: %s"
 +
 +#: g10/tdbio.c:729
 +#, c-format
 +msgid "%s: invalid trustdb created\n"
 +msgstr "%s: invalid trustdb created\n"
 +
 +#: g10/tdbio.c:732
 +#, c-format
 +msgid "%s: trustdb created\n"
 +msgstr "%s: trustdb created\n"
 +
 +#: g10/tdbio.c:788
 +msgid "Note: trustdb not writable\n"
 +msgstr "Note: trustdb not writable\n"
 +
 +#: g10/tdbio.c:797
 +#, c-format
 +msgid "%s: invalid trustdb\n"
 +msgstr "%s: invalid trustdb\n"
 +
 +#: g10/tdbio.c:834
 +#, c-format
 +msgid "%s: failed to create hashtable: %s\n"
 +msgstr "%s: failed to create hashtable: %s\n"
 +
 +#: g10/tdbio.c:842
 +#, c-format
 +msgid "%s: error updating version record: %s\n"
 +msgstr "%s: error updating version record: %s\n"
 +
 +#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
 +#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
 +#, c-format
 +msgid "%s: error reading version record: %s\n"
 +msgstr "%s: error reading version record: %s\n"
 +
 +#: g10/tdbio.c:938
 +#, c-format
 +msgid "%s: error writing version record: %s\n"
 +msgstr "%s: error writing version record: %s\n"
 +
 +#: g10/tdbio.c:1461
 +#, c-format
 +msgid "trustdb: lseek failed: %s\n"
 +msgstr "trustdb: lseek failed: %s\n"
 +
 +#: g10/tdbio.c:1472
 +#, c-format
 +msgid "trustdb: read failed (n=%d): %s\n"
 +msgstr "trustdb: read failed (n=%d): %s\n"
 +
 +#: g10/tdbio.c:1497
 +#, c-format
 +msgid "%s: not a trustdb file\n"
 +msgstr "%s: not a trustdb file\n"
 +
 +#: g10/tdbio.c:1522
 +#, c-format
 +msgid "%s: version record with recnum %lu\n"
 +msgstr "%s: version record with recnum %lu\n"
 +
 +#: g10/tdbio.c:1528
 +#, c-format
 +msgid "%s: invalid file version %d\n"
 +msgstr "%s: invalid file version %d\n"
 +
 +#: g10/tdbio.c:1748
 +#, c-format
 +msgid "%s: error reading free record: %s\n"
 +msgstr "%s: error reading free record: %s\n"
 +
 +#: g10/tdbio.c:1757
 +#, c-format
 +msgid "%s: error writing dir record: %s\n"
 +msgstr "%s: error writing dir record: %s\n"
 +
 +#: g10/tdbio.c:1768
 +#, c-format
 +msgid "%s: failed to zero a record: %s\n"
 +msgstr "%s: failed to zero a record: %s\n"
 +
 +#: g10/tdbio.c:1804
 +#, c-format
 +msgid "%s: failed to append a record: %s\n"
 +msgstr "%s: failed to append a record: %s\n"
 +
 +#: g10/tdbio.c:1865
 +msgid "Error: The trustdb is corrupted.\n"
 +msgstr "Error: The trustdb is corrupted.\n"
 +
 +#: g10/textfilter.c:146
 +#, c-format
 +msgid "can't handle text lines longer than %d characters\n"
 +msgstr "can't handle text lines longer than %d characters\n"
 +
 +#: g10/textfilter.c:241
 +#, c-format
 +msgid "input line longer than %d characters\n"
 +msgstr "input line longer than %d characters\n"
 +
- #: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
++#: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
 +#, c-format
 +msgid "error beginning transaction on TOFU database: %s\n"
 +msgstr "error beginning transaction on TOFU database: %s\n"
 +
- #: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
++#: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
 +#, c-format
 +msgid "error committing transaction on TOFU database: %s\n"
 +msgstr "error committing transaction on TOFU database: %s\n"
 +
- #: g10/tofu.c:357 g10/tofu.c:699
++#: g10/tofu.c:355 g10/tofu.c:888
 +#, c-format
 +msgid "error rolling back transaction on TOFU database: %s\n"
 +msgstr "error rolling back transaction on TOFU database: %s\n"
 +
- #: g10/tofu.c:501
++#: g10/tofu.c:505
 +#, c-format
 +msgid "unsupported TOFU database version: %s\n"
 +msgstr "unsupported TOFU database version: %s\n"
 +
- #: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
- #: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
- #: g10/tofu.c:3056
++#: g10/tofu.c:538
++#, c-format
++msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
++msgstr "error creating ‘ultimately_trusted_keys’ TOFU table: %s\n"
++
++#: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
++msgid "TOFU DB error"
++msgstr "TOFU DB error"
++
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2340 g10/tofu.c:2359
++#: g10/tofu.c:2372 g10/tofu.c:2384 g10/tofu.c:2399 g10/tofu.c:2411
++#: g10/tofu.c:2980 g10/tofu.c:2997 g10/tofu.c:3033 g10/tofu.c:3050
++#: g10/tofu.c:3353
 +#, c-format
 +msgid "error reading TOFU database: %s\n"
 +msgstr "error reading TOFU database: %s\n"
 +
- #: g10/tofu.c:566 g10/tofu.c:574
++#: g10/tofu.c:716 g10/tofu.c:724
 +#, c-format
 +msgid "error determining TOFU database's version: %s\n"
 +msgstr "error determining TOFU database's version: %s\n"
 +
- #: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
++#: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
 +#, c-format
 +msgid "error initializing TOFU database: %s\n"
 +msgstr "error initializing TOFU database: %s\n"
 +
- #: g10/tofu.c:765
++#: g10/tofu.c:844
++#, c-format
++msgid "error creating 'encryptions' TOFU table: %s\n"
++msgstr "error creating ‘encryptions’ TOFU table: %s\n"
++
++#: g10/tofu.c:874
++#, c-format
++msgid "adding column effective_policy to bindings DB: %s\n"
++msgstr "adding column effective_policy to bindings DB: %s\n"
++
++#: g10/tofu.c:956
 +#, c-format
 +msgid "error opening TOFU database '%s': %s\n"
 +msgstr "error opening TOFU database '%s': %s\n"
 +
- #: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
++#: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
 +#, c-format
 +msgid "error updating TOFU database: %s\n"
 +msgstr "error updating TOFU database: %s\n"
 +
- #: g10/tofu.c:1239
++#: g10/tofu.c:1328
 +#, c-format
 +msgid ""
 +"This is the first time the email address \"%s\" is being used with key %s."
 +msgstr ""
 +"This is the first time the email address “%s” is being used with key "
 +"%s."
 +
- #: g10/tofu.c:1247
++#: g10/tofu.c:1337
 +#, c-format
- msgid "The email address \"%s\" is associated with %d keys!"
- msgstr "The email address “%s” is associated with %d keys!"
++msgid "The email address \"%s\" is associated with %d key!"
++msgid_plural "The email address \"%s\" is associated with %d keys!"
++msgstr[0] "The email address “%s” is associated with %d key!"
++msgstr[1] "The email address “%s” is associated with %d keys!"
 +
- #: g10/tofu.c:1251
++#: g10/tofu.c:1343
 +msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
 +msgstr ""
 +"  Since this binding's policy was 'auto', it has been changed to 'ask'."
 +
- #: g10/tofu.c:1257
++#: g10/tofu.c:1349
 +#, c-format
 +msgid ""
 +"Please indicate whether this email address should be associated with key %s "
 +"or whether you think someone is impersonating \"%s\"."
 +msgstr ""
 +"Please indicate whether this email address should be associated with key %s "
 +"or whether you think someone is impersonating “%s”."
 +
- #: g10/tofu.c:1513
++#: g10/tofu.c:1605
 +#, c-format
 +msgid "error gathering other user IDs: %s\n"
 +msgstr "error gathering other user IDs: %s\n"
 +
- #: g10/tofu.c:1523
++#: g10/tofu.c:1615
 +msgid "This key's user IDs:\n"
 +msgstr "This key's user IDs:\n"
 +
- #: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
++#: g10/tofu.c:1631 g10/tofu.c:1796
 +#, c-format
 +msgid "policy: %s"
 +msgstr "policy: %s"
 +
- #: g10/tofu.c:1630
++#: g10/tofu.c:1722
 +#, c-format
 +msgid "error gathering signature stats: %s\n"
 +msgstr "error gathering signature stats: %s\n"
 +
- #: g10/tofu.c:1634
++#: g10/tofu.c:1726
 +#, c-format
 +msgid "The email address \"%s\" is associated with %d key:\n"
 +msgid_plural "The email address \"%s\" is associated with %d keys:\n"
 +msgstr[0] "The email address “%s” is associated with %d key:\n"
 +msgstr[1] "The email address “%s” is associated with %d keys:\n"
 +
- #: g10/tofu.c:1651
++#: g10/tofu.c:1744
 +#, c-format
 +msgid "Statistics for keys with the email address \"%s\":\n"
 +msgstr "Statistics for keys with the email address “%s”:\n"
 +
- #: g10/tofu.c:1684 g10/tofu.c:1689
++#: g10/tofu.c:1785 g10/tofu.c:1790
 +msgid ", "
 +msgstr ", "
 +
- #: g10/tofu.c:1693
++#: g10/tofu.c:1794
 +msgid "this key"
 +msgstr "this key"
 +
- #: g10/tofu.c:1715
++#: g10/tofu.c:1820
++#, c-format
++msgid "Verified %d message."
++msgid_plural "Verified %d messages."
++msgstr[0] "Verified %d message."
++msgstr[1] "Verified %d messages."
++
++#: g10/tofu.c:1824
++#, c-format
++msgid "Encrypted %d message."
++msgid_plural "Encrypted %d messages."
++msgstr[0] "Encrypted %d message."
++msgstr[1] "Encrypted %d messages."
++
++#: g10/tofu.c:1831
 +#, c-format
- msgid "Verified %d message"
- msgid_plural "Verified %d messages"
- msgstr[0] "Verified %d message"
- msgstr[1] "Verified %d messages"
++msgid "Verified %d message in the future."
++msgid_plural "Verified %d messages in the future."
++msgstr[0] "Verified %d message in the future."
++msgstr[1] "Verified %d messages in the future."
 +
- #: g10/tofu.c:1719
++#: g10/tofu.c:1835
 +#, c-format
- msgid "Encrypted %d message"
- msgid_plural "Encrypted %d messages"
- msgstr[0] "Encrypted %d message"
- msgstr[1] "Encrypted %d messages"
++msgid "Encrypted %d message in the future."
++msgid_plural "Encrypted %d messages in the future."
++msgstr[0] "Encrypted %d message in the future."
++msgstr[1] "Encrypted %d messages in the future."
 +
- #: g10/tofu.c:1734
++#: g10/tofu.c:1849
 +#, c-format
- msgid " over the past day."
- msgid_plural " over the past %d days."
- msgstr[0] " over the past day."
- msgstr[1] " over the past %d days."
++msgid "Messages verified over the past %d day: %d."
++msgid_plural "Messages verified over the past %d days: %d."
++msgstr[0] "Messages verified over the past %d day: %d."
++msgstr[1] "Messages verified over the past %d days: %d."
 +
- #: g10/tofu.c:1740
++#: g10/tofu.c:1855
 +#, c-format
- msgid " over the past month."
- msgid_plural " over the past %d months."
- msgstr[0] " over the past month."
- msgstr[1] " over the past %d months."
++msgid "Messages encrypted over the past %d day: %d."
++msgid_plural "Messages encrypted over the past %d days: %d."
++msgstr[0] "Messages encrypted over the past %d day: %d."
++msgstr[1] "Messages encrypted over the past %d days: %d."
 +
- #: g10/tofu.c:1746
++#: g10/tofu.c:1865
 +#, c-format
- msgid " over the past year."
- msgid_plural " over the past %d years."
- msgstr[0] " over the past year."
- msgstr[1] " over the past %d years."
++msgid "Messages verified over the past %d month: %d."
++msgid_plural "Messages verified over the past %d months: %d."
++msgstr[0] "Messages verified over the past %d month: %d."
++msgstr[1] "Messages verified over the past %d months: %d."
 +
- #: g10/tofu.c:1752
- msgid " in the past."
- msgstr " in the past."
++#: g10/tofu.c:1871
++#, c-format
++msgid "Messages encrypted over the past %d month: %d."
++msgid_plural "Messages encrypted over the past %d months: %d."
++msgstr[0] "Messages encrypted over the past %d month: %d."
++msgstr[1] "Messages encrypted over the past %d months: %d."
++
++#: g10/tofu.c:1881
++#, c-format
++msgid "Messages verified over the past %d year: %d."
++msgid_plural "Messages verified over the past %d years: %d."
++msgstr[0] "Messages verified over the past %d year: %d."
++msgstr[1] "Messages verified over the past %d years: %d."
++
++#: g10/tofu.c:1887
++#, c-format
++msgid "Messages encrypted over the past %d year: %d."
++msgid_plural "Messages encrypted over the past %d years: %d."
++msgstr[0] "Messages encrypted over the past %d year: %d."
++msgstr[1] "Messages encrypted over the past %d years: %d."
++
++#: g10/tofu.c:1895
++#, c-format
++msgid "Messages verified in the past: %d."
++msgstr "Messages verified in the past: %d."
++
++#: g10/tofu.c:1899
++#, c-format
++msgid "Messages encrypted in the past: %d."
++msgstr "Messages encrypted in the past: %d."
 +
 +#. TRANSLATORS: Please translate the text found in the source
 +#. * file below.  We don't directly internationalize that text so
 +#. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1767
++#: g10/tofu.c:1916
 +msgid "TOFU detected a binding conflict"
 +msgstr "TOFU detected a binding conflict"
 +
 +#. TRANSLATORS: Two letters (normally the lower and upper case
 +#. * version of the hotkey) for each of the five choices.  If
 +#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1809
++#: g10/tofu.c:1958
 +msgid "gGaAuUrRbB"
 +msgstr "gGaAuUrRbB"
 +
- #: g10/tofu.c:1815
++#: g10/tofu.c:1964
 +msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 +msgstr "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 +
- #: g10/tofu.c:1823
++#: g10/tofu.c:1972
 +msgid "Defaulting to unknown."
 +msgstr "Defaulting to unknown."
 +
- #: g10/tofu.c:1938 g10/tofu.c:2074
++#: g10/tofu.c:2087 g10/tofu.c:2223
 +msgid "TOFU db corruption detected.\n"
 +msgstr "TOFU db corruption detected.\n"
 +
- #: g10/tofu.c:1994
++#: g10/tofu.c:2143
 +#, c-format
 +msgid "resetting keydb: %s\n"
 +msgstr "resetting keydb: %s\n"
 +
- #: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
- #: g10/tofu.c:2425
++#: g10/tofu.c:2601
 +#, c-format
- msgid "error setting TOFU binding's trust level to %s\n"
- msgstr "error setting TOFU binding's trust level to %s\n"
++msgid "error setting TOFU binding's policy to %s\n"
++msgstr "error setting TOFU binding's policy to %s\n"
 +
- #: g10/tofu.c:2473
++#: g10/tofu.c:2794
 +#, c-format
 +msgid "error changing TOFU policy: %s\n"
 +msgstr "error changing TOFU policy: %s\n"
 +
- #. TRANSLATORS: The tilde ('~') is used here to indicate a
- #. * non-breakable space
- #: g10/tofu.c:2574
++#: g10/tofu.c:2839
 +#, c-format
- msgid "%d~year"
- msgid_plural "%d~years"
- msgstr[0] "%d~year"
- msgstr[1] "%d~years"
++msgid "%lld~year"
++msgid_plural "%lld~years"
++msgstr[0] "%lld~year"
++msgstr[1] "%lld~years"
 +
- #: g10/tofu.c:2583
++#: g10/tofu.c:2844
 +#, c-format
- msgid "%d~month"
- msgid_plural "%d~months"
- msgstr[0] "%d~month"
- msgstr[1] "%d~months"
++msgid "%lld~month"
++msgid_plural "%lld~months"
++msgstr[0] "%lld~month"
++msgstr[1] "%lld~months"
 +
- #: g10/tofu.c:2592
++#: g10/tofu.c:2849
 +#, c-format
- msgid "%d~day"
- msgid_plural "%d~days"
- msgstr[0] "%d~day"
- msgstr[1] "%d~days"
++msgid "%lld~week"
++msgid_plural "%lld~weeks"
++msgstr[0] "%lld~week"
++msgstr[1] "%lld~weeks"
 +
- #: g10/tofu.c:2601
++#: g10/tofu.c:2854
 +#, c-format
- msgid "%d~hour"
- msgid_plural "%d~hours"
- msgstr[0] "%d~hour"
- msgstr[1] "%d~hours"
++msgid "%lld~day"
++msgid_plural "%lld~days"
++msgstr[0] "%lld~day"
++msgstr[1] "%lld~days"
 +
- #: g10/tofu.c:2610
++#: g10/tofu.c:2859
 +#, c-format
- msgid "%d~minute"
- msgid_plural "%d~minutes"
- msgstr[0] "%d~minute"
- msgstr[1] "%d~minutes"
++msgid "%lld~hour"
++msgid_plural "%lld~hours"
++msgstr[0] "%lld~hour"
++msgstr[1] "%lld~hours"
 +
- #: g10/tofu.c:2619
++#: g10/tofu.c:2864
 +#, c-format
- msgid "%d~second"
- msgid_plural "%d~seconds"
- msgstr[0] "%d~second"
- msgstr[1] "%d~seconds"
++msgid "%lld~minute"
++msgid_plural "%lld~minutes"
++msgstr[0] "%lld~minute"
++msgstr[1] "%lld~minutes"
 +
- #: g10/tofu.c:2802
++#: g10/tofu.c:2866
 +#, c-format
- msgid "%s: "
- msgstr "%s: "
++msgid "%lld~second"
++msgid_plural "%lld~seconds"
++msgstr[0] "%lld~second"
++msgstr[1] "%lld~seconds"
 +
- #: g10/tofu.c:2806
++#: g10/tofu.c:3103
 +#, c-format
- msgid "Verified %ld signatures"
- msgstr "Verified %ld signatures"
++msgid "%s: Verified 0~signatures and encrypted 0~messages."
++msgstr "%s: Verified 0~signatures and encrypted 0~messages."
 +
- #: g10/tofu.c:2816
++#: g10/tofu.c:3109
 +#, c-format
- msgid "Verified %ld signature in the past %s"
- msgid_plural "Verified %ld signatures in the past %s"
- msgstr[0] "Verified %ld signature in the past %s"
- msgstr[1] "Verified %ld signatures in the past %s"
++msgid "%s: Verified 0 signatures."
++msgstr "%s: Verified 0 signatures."
 +
- #: g10/tofu.c:2826
++#: g10/tofu.c:3117
 +#, c-format
- msgid ", and encrypted %ld messages"
- msgstr ", and encrypted %ld messages"
++msgid "%s: Verified %ld~signature in the past %s."
++msgid_plural "%s: Verified %ld~signatures in the past %s."
++msgstr[0] "%s: Verified %ld~signature in the past %s."
++msgstr[1] "%s: Verified %ld~signatures in the past %s."
++
++#: g10/tofu.c:3127
++msgid "Encrypted 0 messages."
++msgstr "Encrypted 0 messages."
 +
- #: g10/tofu.c:2835
++#: g10/tofu.c:3135
 +#, c-format
- msgid ", and encrypted %ld message in the past %s"
- msgid_plural ", and encrypted %ld messages in the past %s"
- msgstr[0] ", and encrypted %ld message in the past %s"
- msgstr[1] ", and encrypted %ld messages in the past %s"
++msgid "Encrypted %ld~message in the past %s."
++msgid_plural "Encrypted %ld~messages in the past %s."
++msgstr[0] "Encrypted %ld~message in the past %s."
++msgstr[1] "Encrypted %ld~messages in the past %s."
 +
- #: g10/tofu.c:2880
++#: g10/tofu.c:3146
++#, c-format
++msgid "(policy: %s)"
++msgstr "(policy: %s)"
++
++#: g10/tofu.c:3177
 +msgid ""
 +"Warning: we have yet to see a message signed using this key and user id!\n"
 +msgstr ""
 +"Warning: we have yet to see a message signed using this key and user id!\n"
 +
- #: g10/tofu.c:2883
++#: g10/tofu.c:3180
 +msgid ""
 +"Warning: we've only seen one message signed using this key and user id!\n"
 +msgstr ""
 +"Warning: we've only seen one message signed using this key and user id!\n"
 +
- #: g10/tofu.c:2887
++#: g10/tofu.c:3184
 +msgid "Warning: you have yet to encrypt a message to this key!\n"
 +msgstr "Warning: you have yet to encrypt a message to this key!\n"
 +
- #: g10/tofu.c:2890
++#: g10/tofu.c:3187
 +msgid "Warning: you have only encrypted one message to this key!\n"
 +msgstr "Warning: you have only encrypted one message to this key!\n"
 +
- #: g10/tofu.c:2919
++#: g10/tofu.c:3216
 +#, c-format
 +msgid ""
 +"Warning: if you think you've seen more signatures by this key and user id, "
 +"then this key might be a forgery!  Carefully examine the email address for "
 +"small variations.  If the key is suspect, then use\n"
 +"  %s\n"
 +"to mark it as being bad.\n"
 +msgid_plural ""
 +"Warning: if you think you've seen more signatures by this key and these user "
 +"ids, then this key might be a forgery!  Carefully examine the email "
 +"addresses for small variations.  If the key is suspect, then use\n"
 +"  %s\n"
 +"to mark it as being bad.\n"
 +msgstr[0] ""
 +"Warning: if you think you've seen more signatures by this key and user id, "
 +"then this key might be a forgery!  Carefully examine the email address for "
 +"small variations.  If the key is suspect, then use\n"
 +"  %s\n"
 +"to mark it as being bad.\n"
 +msgstr[1] ""
 +"Warning: if you think you've seen more signatures by this key and these user "
 +"ids, then this key might be a forgery!  Carefully examine the email "
 +"addresses for small variations.  If the key is suspect, then use\n"
 +"  %s\n"
 +"to mark it as being bad.\n"
 +
- #: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
- #: g10/tofu.c:3480 g10/tofu.c:3572
++#: g10/tofu.c:3298 g10/tofu.c:3449 g10/tofu.c:3627 g10/tofu.c:3670
++#: g10/tofu.c:3784 g10/tofu.c:3859 g10/tofu.c:3894
 +#, c-format
 +msgid "error opening TOFU database: %s\n"
 +msgstr "error opening TOFU database: %s\n"
 +
- #: g10/tofu.c:3185
++#: g10/tofu.c:3482
 +#, c-format
- msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
- msgstr "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
++msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
++msgstr "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
 +
- #: g10/tofu.c:3515
++#: g10/tofu.c:3819
 +#, c-format
 +msgid "error setting policy for key %s, user id \"%s\": %s"
 +msgstr "error setting policy for key %s, user id “%s”: %s"
 +
 +#: g10/trustdb.c:216
 +#, c-format
 +msgid "'%s' is not a valid long keyID\n"
 +msgstr "‘%s’ is not a valid long keyID\n"
 +
 +#: g10/trustdb.c:242
 +#, c-format
 +msgid "key %s: accepted as trusted key\n"
 +msgstr "key %s: accepted as trusted key\n"
 +
 +#: g10/trustdb.c:280
 +#, 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:295
 +#, 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:305
 +#, c-format
 +msgid "key %s marked as ultimately trusted\n"
 +msgstr "key %s marked as ultimately trusted\n"
 +
- #: g10/trustdb.c:341
++#: g10/trustdb.c:348
 +#, 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:347
++#: g10/trustdb.c:354
 +#, 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:422
++#: g10/trustdb.c:429
 +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:431
++#: g10/trustdb.c:438
 +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:468
++#: g10/trustdb.c:475
 +#, 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:474
++#: g10/trustdb.c:481
 +#, c-format
 +msgid "using %s trust model\n"
 +msgstr "using %s trust model\n"
 +
- #: g10/trustdb.c:511
++#: g10/trustdb.c:518
 +msgid "no need for a trustdb check\n"
 +msgstr "no need for a trustdb check\n"
 +
- #: g10/trustdb.c:517 g10/trustdb.c:2160
++#: g10/trustdb.c:524 g10/trustdb.c:2187
 +#, c-format
 +msgid "next trustdb check due at %s\n"
 +msgstr "next trustdb check due at %s\n"
 +
- #: g10/trustdb.c:526
++#: g10/trustdb.c:533
 +#, 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:542
++#: g10/trustdb.c:549
 +#, 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:749 g10/trustdb.c:1313
++#: g10/trustdb.c:756 g10/trustdb.c:1340
 +#, c-format
 +msgid "public key %s not found: %s\n"
 +msgstr "public key %s not found: %s\n"
 +
- #: g10/trustdb.c:966
++#: g10/trustdb.c:973
 +msgid "please do a --check-trustdb\n"
 +msgstr "please do a --check-trustdb\n"
 +
- #: g10/trustdb.c:971
++#: g10/trustdb.c:978
 +msgid "checking the trustdb\n"
 +msgstr "checking the trustdb\n"
 +
- #: g10/trustdb.c:1883
++#: g10/trustdb.c:1910
 +#, c-format
 +msgid "%d key processed"
 +msgid_plural "%d keys processed"
 +msgstr[0] "%d key processed"
 +msgstr[1] "%d keys processed"
 +
- #: g10/trustdb.c:1886
++#: g10/trustdb.c:1913
 +#, 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:1956
++#: g10/trustdb.c:1983
 +msgid "no ultimately trusted keys found\n"
 +msgstr "no ultimately trusted keys found\n"
 +
- #: g10/trustdb.c:1970
++#: g10/trustdb.c:1997
 +#, 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:2087
++#: g10/trustdb.c:2114
 +#, 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:2167
++#: g10/trustdb.c:2194
 +#, 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:105
 +msgid "undefined"
 +msgstr "undefined"
 +
 +#: g10/trust.c:106
 +msgid "never"
 +msgstr "never"
 +
 +#: g10/trust.c:107
 +msgid "marginal"
 +msgstr "marginal"
 +
 +#: g10/trust.c:108
 +msgid "full"
 +msgstr "full"
 +
 +#: g10/trust.c:109
 +msgid "ultimate"
 +msgstr "ultimate"
 +
 +#. TRANSLATORS: these strings are similar to those in
 +#. trust_value_to_string(), but are a fixed length.  This is needed to
 +#. make attractive information listings where columns line up
 +#. properly.  The value "10" should be the length of the strings you
 +#. choose to translate to.  This is the length in printable columns.
 +#. 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:146
 +msgid "10 translator see trust.c:uid_trust_string_fixed"
 +msgstr "10 translator see trust.c:uid_trust_string_fixed"
 +
 +#: g10/trust.c:149
 +msgid "[ revoked]"
 +msgstr "[ revoked]"
 +
 +#: g10/trust.c:151 g10/trust.c:157
 +msgid "[ expired]"
 +msgstr "[ expired]"
 +
 +#: g10/trust.c:156
 +msgid "[ unknown]"
 +msgstr "[ unknown]"
 +
 +#: g10/trust.c:158
 +msgid "[  undef ]"
 +msgstr "[  undef ]"
 +
 +#: g10/trust.c:159
 +msgid "[  never ]"
 +msgstr "[  never ]"
 +
 +#: g10/trust.c:160
 +msgid "[marginal]"
 +msgstr "[marginal]"
 +
 +#: g10/trust.c:161
 +msgid "[  full  ]"
 +msgstr "[  full  ]"
 +
 +#: g10/trust.c:162
 +msgid "[ultimate]"
 +msgstr "[ultimate]"
 +
 +#: g10/verify.c:117
 +msgid ""
 +"the signature could not be verified.\n"
 +"Please remember that the signature file (.sig or .asc)\n"
 +"should be the first file given on the command line.\n"
 +msgstr ""
 +"the signature could not be verified.\n"
 +"Please remember that the signature file (.sig or .asc)\n"
 +"should be the first file given on the command line.\n"
 +
 +#: g10/verify.c:204
 +#, c-format
 +msgid "input line %u too long or missing LF\n"
 +msgstr "input line %u too long or missing LF\n"
 +
 +#: g10/verify.c:253
 +#, c-format
 +msgid "can't open fd %d: %s\n"
 +msgstr "can't open fd %d: %s\n"
 +
 +#: kbx/kbxutil.c:92
 +msgid "set debugging flags"
 +msgstr "set debugging flags"
 +
 +#: kbx/kbxutil.c:93
 +msgid "enable full debugging"
 +msgstr "enable full debugging"
 +
 +#: kbx/kbxutil.c:117
 +msgid "Usage: kbxutil [options] [files] (-h for help)"
 +msgstr "Usage: kbxutil [options] [files] (-h for help)"
 +
 +#: kbx/kbxutil.c:120
 +msgid ""
 +"Syntax: kbxutil [options] [files]\n"
 +"List, export, import Keybox data\n"
 +msgstr ""
 +"Syntax: kbxutil [options] [files]\n"
 +"List, export, import Keybox data\n"
 +
- #: scd/app-nks.c:718 scd/app-openpgp.c:3208
++#: scd/app-nks.c:718 scd/app-openpgp.c:3221
 +#, c-format
 +msgid "RSA modulus missing or not of size %d bits\n"
 +msgstr "RSA modulus missing or not of size %d bits\n"
 +
- #: scd/app-nks.c:726 scd/app-openpgp.c:3220
++#: scd/app-nks.c:726 scd/app-openpgp.c:3233
 +#, c-format
 +msgid "RSA public exponent missing or larger than %d bits\n"
 +msgstr "RSA public exponent missing or larger than %d bits\n"
 +
- #: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
- #: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
- #: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1965 scd/app-openpgp.c:1984
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2166 scd/app-openpgp.c:2430
++#: scd/app-openpgp.c:2477 scd/app-openpgp.c:2582 scd/app-dinsig.c:303
 +#, c-format
 +msgid "PIN callback returned error: %s\n"
 +msgstr "PIN callback returned error: %s\n"
 +
 +#: scd/app-nks.c:839
 +msgid "the NullPIN has not yet been changed\n"
 +msgstr "the NullPIN has not yet been changed\n"
 +
 +#: scd/app-nks.c:1100
 +msgid "|N|Please enter a new PIN for the standard keys."
 +msgstr "|N|Please enter a new PIN for the standard keys."
 +
 +#: scd/app-nks.c:1101
 +msgid "||Please enter the PIN for the standard keys."
 +msgstr "||Please enter the PIN for the standard keys."
 +
 +#: scd/app-nks.c:1107
 +msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 +msgstr ""
 +"|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 +
 +#: scd/app-nks.c:1109
 +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-nks.c:1117
 +msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 +msgstr "|N|Please enter a new PIN for the key to create qualified signatures."
 +
 +#: scd/app-nks.c:1119
 +msgid "||Please enter the PIN for the key to create qualified signatures."
 +msgstr "||Please enter the PIN for the key to create qualified signatures."
 +
 +#: scd/app-nks.c:1127
 +msgid ""
 +"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 +"qualified signatures."
 +msgstr ""
 +"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 +"qualified signatures."
 +
 +#: scd/app-nks.c:1129
 +msgid ""
 +"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 +"qualified signatures."
 +msgstr ""
 +"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 +"qualified signatures."
 +
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2511 scd/app-dinsig.c:532
 +#, c-format
 +msgid "error getting new PIN: %s\n"
 +msgstr "error getting new PIN: %s\n"
 +
- #: scd/app-openpgp.c:806
++#: scd/app-openpgp.c:801
 +#, c-format
 +msgid "failed to store the fingerprint: %s\n"
 +msgstr "failed to store the fingerprint: %s\n"
 +
- #: scd/app-openpgp.c:819
++#: scd/app-openpgp.c:814
 +#, c-format
 +msgid "failed to store the creation date: %s\n"
 +msgstr "failed to store the creation date: %s\n"
 +
- #: scd/app-openpgp.c:1236
++#: scd/app-openpgp.c:1247
 +msgid "response does not contain the RSA modulus\n"
 +msgstr "response does not contain the RSA modulus\n"
 +
- #: scd/app-openpgp.c:1243
++#: scd/app-openpgp.c:1254
 +msgid "response does not contain the RSA public exponent\n"
 +msgstr "response does not contain the RSA public exponent\n"
 +
- #: scd/app-openpgp.c:1353
++#: scd/app-openpgp.c:1364
 +msgid "response does not contain the EC public key\n"
 +msgstr "response does not contain the EC public key\n"
 +
- #: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:1464 scd/app-openpgp.c:3825
 +msgid "response does not contain the public key data\n"
 +msgstr "response does not contain the public key data\n"
 +
- #: scd/app-openpgp.c:1551
++#: scd/app-openpgp.c:1564
 +#, c-format
 +msgid "reading public key failed: %s\n"
 +msgstr "reading public key failed: %s\n"
 +
- #: scd/app-openpgp.c:1903
++#: scd/app-openpgp.c:1916
 +#, c-format
 +msgid "using default PIN as %s\n"
 +msgstr "using default PIN as %s\n"
 +
- #: scd/app-openpgp.c:1910
++#: scd/app-openpgp.c:1923
 +#, c-format
 +msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 +msgstr "failed to use default PIN as %s: %s - disabling further default use\n"
 +
- #: scd/app-openpgp.c:1925
++#: scd/app-openpgp.c:1938
 +#, c-format
 +msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 +msgstr "||Please enter the PIN%%0A[sigs done: %lu]"
 +
- #: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
++#: scd/app-openpgp.c:1949 scd/app-openpgp.c:2424
 +msgid "||Please enter the PIN"
 +msgstr "||Please enter the PIN"
 +
- #: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2173 scd/app-openpgp.c:2437
 +#, c-format
 +msgid "PIN for CHV%d is too short; minimum length is %d\n"
 +msgstr "PIN for CHV%d is too short; minimum length is %d\n"
 +
- #: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
- #: scd/app-openpgp.c:4114
++#: scd/app-openpgp.c:2004 scd/app-openpgp.c:2043 scd/app-openpgp.c:2185
++#: scd/app-openpgp.c:4126
 +#, c-format
 +msgid "verify CHV%d failed: %s\n"
 +msgstr "verify CHV%d failed: %s\n"
 +
- #: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
++#: scd/app-openpgp.c:2072 scd/app-openpgp.c:2458 scd/app-openpgp.c:4556
 +msgid "error retrieving CHV status from card\n"
 +msgstr "error retrieving CHV status from card\n"
 +
- #: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
++#: scd/app-openpgp.c:2078 scd/app-openpgp.c:4565
 +msgid "card is permanently locked!\n"
 +msgstr "card is permanently locked!\n"
 +
- #: scd/app-openpgp.c:2072
++#: scd/app-openpgp.c:2085
 +#, c-format
 +msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 +msgid_plural ""
 +"%d Admin PIN attempts remaining before card is permanently locked\n"
 +msgstr[0] "%d Admin PIN attempt remaining before card is permanently locked\n"
 +msgstr[1] "%d Admin PIN attempts remaining before card is permanently locked\n"
 +
 +#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 +#. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:2082
++#: scd/app-openpgp.c:2095
 +#, c-format
 +msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 +msgstr "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 +
- #: scd/app-openpgp.c:2086
++#: scd/app-openpgp.c:2099
 +msgid "|A|Please enter the Admin PIN"
 +msgstr "|A|Please enter the Admin PIN"
 +
- #: scd/app-openpgp.c:2107
++#: scd/app-openpgp.c:2120
 +msgid "access to admin commands is not configured\n"
 +msgstr "access to admin commands is not configured\n"
 +
- #: scd/app-openpgp.c:2460
++#: scd/app-openpgp.c:2473
 +msgid "||Please enter the Reset Code for the card"
 +msgstr "||Please enter the Reset Code for the card"
 +
- #: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
++#: scd/app-openpgp.c:2483 scd/app-openpgp.c:2537
 +#, c-format
 +msgid "Reset Code is too short; minimum length is %d\n"
 +msgstr "Reset Code is too short; minimum length is %d\n"
 +
 +#. TRANSLATORS: Do not translate the "|*|" prefixes but
 +#. keep it at the start of the string.  We need this elsewhere
 +#. to get some infos on the string.
- #: scd/app-openpgp.c:2493
++#: scd/app-openpgp.c:2506
 +msgid "|RN|New Reset Code"
 +msgstr "|RN|New Reset Code"
 +
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
 +msgid "|AN|New Admin PIN"
 +msgstr "|AN|New Admin PIN"
 +
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
 +msgid "|N|New PIN"
 +msgstr "|N|New PIN"
 +
- #: scd/app-openpgp.c:2565
++#: scd/app-openpgp.c:2578
 +msgid "||Please enter the Admin PIN and New Admin PIN"
 +msgstr "||Please enter the Admin PIN and New Admin PIN"
 +
- #: scd/app-openpgp.c:2566
++#: scd/app-openpgp.c:2579
 +msgid "||Please enter the PIN and New PIN"
 +msgstr "||Please enter the PIN and New PIN"
 +
- #: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
++#: scd/app-openpgp.c:2635 scd/app-openpgp.c:3885
 +msgid "error reading application data\n"
 +msgstr "error reading application data\n"
 +
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
++#: scd/app-openpgp.c:2641 scd/app-openpgp.c:3892
 +msgid "error reading fingerprint DO\n"
 +msgstr "error reading fingerprint DO\n"
 +
- #: scd/app-openpgp.c:2638
++#: scd/app-openpgp.c:2651
 +msgid "key already exists\n"
 +msgstr "key already exists\n"
 +
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2655
 +msgid "existing key will be replaced\n"
 +msgstr "existing key will be replaced\n"
 +
- #: scd/app-openpgp.c:2644
++#: scd/app-openpgp.c:2657
 +msgid "generating new key\n"
 +msgstr "generating new key\n"
 +
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2659
 +msgid "writing new key\n"
 +msgstr "writing new key\n"
 +
- #: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
++#: scd/app-openpgp.c:3201 scd/app-openpgp.c:3553
 +msgid "creation timestamp missing\n"
 +msgstr "creation timestamp missing\n"
 +
- #: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
++#: scd/app-openpgp.c:3243 scd/app-openpgp.c:3251
 +#, c-format
 +msgid "RSA prime %s missing or not of size %d bits\n"
 +msgstr "RSA prime %s missing or not of size %d bits\n"
 +
- #: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
++#: scd/app-openpgp.c:3384 scd/app-openpgp.c:3647
 +#, c-format
 +msgid "failed to store the key: %s\n"
 +msgstr "failed to store the key: %s\n"
 +
- #: scd/app-openpgp.c:3534
++#: scd/app-openpgp.c:3547
 +msgid "unsupported curve\n"
 +msgstr "unsupported curve\n"
 +
- #: scd/app-openpgp.c:3790
++#: scd/app-openpgp.c:3802
 +msgid "please wait while key is being generated ...\n"
 +msgstr "please wait while key is being generated ...\n"
 +
- #: scd/app-openpgp.c:3798
++#: scd/app-openpgp.c:3810
 +msgid "generating key failed\n"
 +msgstr "generating key failed\n"
 +
- #: scd/app-openpgp.c:3804
++#: scd/app-openpgp.c:3816
 +#, c-format
 +msgid "key generation completed (%d second)\n"
 +msgid_plural "key generation completed (%d seconds)\n"
 +msgstr[0] "key generation completed (%d second)\n"
 +msgstr[1] "key generation completed (%d seconds)\n"
 +
- #: scd/app-openpgp.c:3838
++#: scd/app-openpgp.c:3850
 +msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 +msgstr "invalid structure of OpenPGP card (DO 0x93)\n"
 +
- #: scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:3900
 +msgid "fingerprint on card does not match requested one\n"
 +msgstr "fingerprint on card does not match requested one\n"
 +
- #: scd/app-openpgp.c:4004
++#: scd/app-openpgp.c:4016
 +#, c-format
 +msgid "card does not support digest algorithm %s\n"
 +msgstr "card does not support digest algorithm %s\n"
 +
- #: scd/app-openpgp.c:4089
++#: scd/app-openpgp.c:4101
 +#, c-format
 +msgid "signatures created so far: %lu\n"
 +msgstr "signatures created so far: %lu\n"
 +
- #: scd/app-openpgp.c:4551
++#: scd/app-openpgp.c:4570
 +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:4854 scd/app-openpgp.c:4865
++#: scd/app-openpgp.c:4871 scd/app-openpgp.c:4882
 +#, c-format
 +msgid "can't access %s - invalid OpenPGP card?\n"
 +msgstr "can't access %s - invalid OpenPGP card?\n"
 +
 +#: scd/app-dinsig.c:299
 +msgid "||Please enter your PIN at the reader's pinpad"
 +msgstr "||Please enter your PIN at the reader's pinpad"
 +
 +#. TRANSLATORS: Do not translate the "|*|" prefixes but
 +#. keep it at the start of the string.  We need this elsewhere
 +#. to get some infos on the string.
 +#: scd/app-dinsig.c:529
 +msgid "|N|Initial New PIN"
 +msgstr "|N|Initial New PIN"
 +
 +#: scd/scdaemon.c:114
 +msgid "run in multi server mode (foreground)"
 +msgstr "run in multi server mode (foreground)"
 +
- #: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
 +msgid "|LEVEL|set the debugging level to LEVEL"
 +msgstr "|LEVEL|set the debugging level to LEVEL"
 +
 +#: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
 +msgid "|FILE|write a log to FILE"
 +msgstr "|FILE|write a log to FILE"
 +
 +#: scd/scdaemon.c:134
 +msgid "|N|connect to reader at port N"
 +msgstr "|N|connect to reader at port N"
 +
 +#: scd/scdaemon.c:136
 +msgid "|NAME|use NAME as ct-API driver"
 +msgstr "|NAME|use NAME as ct-API driver"
 +
 +#: scd/scdaemon.c:138
 +msgid "|NAME|use NAME as PC/SC driver"
 +msgstr "|NAME|use NAME as PC/SC driver"
 +
 +#: scd/scdaemon.c:141
 +msgid "do not use the internal CCID driver"
 +msgstr "do not use the internal CCID driver"
 +
 +#: scd/scdaemon.c:147
 +msgid "|N|disconnect the card after N seconds of inactivity"
 +msgstr "|N|disconnect the card after N seconds of inactivity"
 +
 +#: scd/scdaemon.c:150
 +msgid "do not use a reader's pinpad"
 +msgstr "do not use a reader's pinpad"
 +
 +#: scd/scdaemon.c:155
 +msgid "deny the use of admin card commands"
 +msgstr "deny the use of admin card commands"
 +
 +#: scd/scdaemon.c:158
 +msgid "use variable length input for pinpad"
 +msgstr "use variable length input for pinpad"
 +
- #: scd/scdaemon.c:287
++#: scd/scdaemon.c:286
 +msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 +msgstr "Usage: @SCDAEMON@ [options] (-h for help)"
 +
- #: scd/scdaemon.c:289
++#: scd/scdaemon.c:288
 +msgid ""
 +"Syntax: scdaemon [options] [command [args]]\n"
 +"Smartcard daemon for @GNUPG@\n"
 +msgstr ""
 +"Syntax: scdaemon [options] [command [args]]\n"
 +"Smartcard daemon for @GNUPG@\n"
 +
- #: scd/scdaemon.c:786
++#: scd/scdaemon.c:784
 +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:1160 dirmngr/dirmngr.c:1900
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1904
 +#, c-format
 +msgid "handler for fd %d started\n"
 +msgstr "handler for fd %d started\n"
 +
- #: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
++#: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1909
 +#, c-format
 +msgid "handler for fd %d terminated\n"
 +msgstr "handler for fd %d terminated\n"
 +
 +#: sm/base64.c:327
 +#, c-format
 +msgid "invalid radix64 character %02x skipped\n"
 +msgstr "invalid radix64 character %02x skipped\n"
 +
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
 +msgid "no dirmngr running in this session\n"
 +msgstr "no dirmngr running in this session\n"
 +
 +#: sm/certchain.c:194
 +#, c-format
 +msgid "validation model requested by certificate: %s"
 +msgstr "validation model requested by certificate: %s"
 +
 +#: sm/certchain.c:195 sm/certchain.c:1937
 +msgid "chain"
 +msgstr "chain"
 +
 +#: sm/certchain.c:196 sm/certchain.c:1937
 +msgid "shell"
 +msgstr "shell"
 +
 +#: sm/certchain.c:256 dirmngr/validate.c:107
 +#, c-format
 +msgid "critical certificate extension %s is not supported"
 +msgstr "critical certificate extension %s is not supported"
 +
 +#: sm/certchain.c:295 dirmngr/validate.c:205
 +msgid "issuer certificate is not marked as a CA"
 +msgstr "issuer certificate is not marked as a CA"
 +
 +#: sm/certchain.c:333
 +msgid "critical marked policy without configured policies"
 +msgstr "critical marked policy without configured policies"
 +
 +#: sm/certchain.c:343
 +#, c-format
 +msgid "failed to open '%s': %s\n"
 +msgstr "failed to open '%s': %s\n"
 +
 +#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
 +msgid "Note: non-critical certificate policy not allowed"
 +msgstr "Note: non-critical certificate policy not allowed"
 +
 +#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
 +msgid "certificate policy not allowed"
 +msgstr "certificate policy not allowed"
 +
 +#: sm/certchain.c:538
 +msgid "looking up issuer at external location\n"
 +msgstr "looking up issuer at external location\n"
 +
 +#: sm/certchain.c:558
 +#, c-format
 +msgid "number of issuers matching: %d\n"
 +msgstr "number of issuers matching: %d\n"
 +
 +#: sm/certchain.c:606
 +msgid "looking up issuer from the Dirmngr cache\n"
 +msgstr "looking up issuer from the Dirmngr cache\n"
 +
 +#: sm/certchain.c:631
 +#, c-format
 +msgid "number of matching certificates: %d\n"
 +msgstr "number of matching certificates: %d\n"
 +
 +#: sm/certchain.c:634
 +#, c-format
 +msgid "dirmngr cache-only key lookup failed: %s\n"
 +msgstr "dirmngr cache-only key lookup failed: %s\n"
 +
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
 +#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
 +msgid "failed to allocate keyDB handle\n"
 +msgstr "failed to allocate keyDB handle\n"
 +
 +#: sm/certchain.c:999
 +msgid "certificate has been revoked"
 +msgstr "certificate has been revoked"
 +
 +#: sm/certchain.c:1014
 +msgid "the status of the certificate is unknown"
 +msgstr "the status of the certificate is unknown"
 +
 +#: sm/certchain.c:1021
 +msgid "please make sure that the \"dirmngr\" is properly installed\n"
 +msgstr "please make sure that the “dirmngr” is properly installed\n"
 +
 +#: sm/certchain.c:1027
 +#, c-format
 +msgid "checking the CRL failed: %s"
 +msgstr "checking the CRL failed: %s"
 +
 +#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
 +#, c-format
 +msgid "certificate with invalid validity: %s"
 +msgstr "certificate with invalid validity: %s"
 +
 +#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
 +msgid "certificate not yet valid"
 +msgstr "certificate not yet valid"
 +
 +#: sm/certchain.c:1072 sm/certchain.c:1157
 +msgid "root certificate not yet valid"
 +msgstr "root certificate not yet valid"
 +
 +#: sm/certchain.c:1073 sm/certchain.c:1158
 +msgid "intermediate certificate not yet valid"
 +msgstr "intermediate certificate not yet valid"
 +
 +#: sm/certchain.c:1086 dirmngr/validate.c:498
 +msgid "certificate has expired"
 +msgstr "certificate has expired"
 +
 +#: sm/certchain.c:1087
 +msgid "root certificate has expired"
 +msgstr "root certificate has expired"
 +
 +#: sm/certchain.c:1088
 +msgid "intermediate certificate has expired"
 +msgstr "intermediate certificate has expired"
 +
 +#: sm/certchain.c:1130
 +#, c-format
 +msgid "required certificate attributes missing: %s%s%s"
 +msgstr "required certificate attributes missing: %s%s%s"
 +
 +#: sm/certchain.c:1139
 +msgid "certificate with invalid validity"
 +msgstr "certificate with invalid validity"
 +
 +#: sm/certchain.c:1176
 +msgid "signature not created during lifetime of certificate"
 +msgstr "signature not created during lifetime of certificate"
 +
 +#: sm/certchain.c:1178
 +msgid "certificate not created during lifetime of issuer"
 +msgstr "certificate not created during lifetime of issuer"
 +
 +#: sm/certchain.c:1179
 +msgid "intermediate certificate not created during lifetime of issuer"
 +msgstr "intermediate certificate not created during lifetime of issuer"
 +
 +#: sm/certchain.c:1183
 +msgid "  (  signature created at "
 +msgstr "  (  signature created at "
 +
 +#: sm/certchain.c:1184
 +msgid "  (certificate created at "
 +msgstr "  (certificate created at "
 +
 +#: sm/certchain.c:1187
 +msgid "  (certificate valid from "
 +msgstr "  (certificate valid from "
 +
 +#: sm/certchain.c:1188
 +msgid "  (     issuer valid from "
 +msgstr "  (     issuer valid from "
 +
 +#: sm/certchain.c:1218 dirmngr/validate.c:548
 +#, c-format
 +msgid "fingerprint=%s\n"
 +msgstr "fingerprint=%s\n"
 +
 +#: sm/certchain.c:1227
 +msgid "root certificate has now been marked as trusted\n"
 +msgstr "root certificate has now been marked as trusted\n"
 +
 +#: sm/certchain.c:1240
 +msgid "interactive marking as trusted not enabled in gpg-agent\n"
 +msgstr "interactive marking as trusted not enabled in gpg-agent\n"
 +
 +#: sm/certchain.c:1246
 +msgid "interactive marking as trusted disabled for this session\n"
 +msgstr "interactive marking as trusted disabled for this session\n"
 +
 +#: sm/certchain.c:1304
 +msgid "WARNING: creation time of signature not known - assuming current time"
 +msgstr "WARNING: creation time of signature not known - assuming current time"
 +
 +#: sm/certchain.c:1368
 +msgid "no issuer found in certificate"
 +msgstr "no issuer found in certificate"
 +
 +#: sm/certchain.c:1446
 +msgid "self-signed certificate has a BAD signature"
 +msgstr "self-signed certificate has a BAD signature"
 +
 +#: sm/certchain.c:1515 dirmngr/validate.c:546
 +msgid "root certificate is not marked trusted"
 +msgstr "root certificate is not marked trusted"
 +
 +#: sm/certchain.c:1531
 +#, c-format
 +msgid "checking the trust list failed: %s\n"
 +msgstr "checking the trust list failed: %s\n"
 +
 +#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
 +msgid "certificate chain too long\n"
 +msgstr "certificate chain too long\n"
 +
 +#: sm/certchain.c:1574 dirmngr/validate.c:613
 +msgid "issuer certificate not found"
 +msgstr "issuer certificate not found"
 +
 +#: sm/certchain.c:1607 dirmngr/validate.c:639
 +msgid "certificate has a BAD signature"
 +msgstr "certificate has a BAD signature"
 +
 +#: sm/certchain.c:1639 dirmngr/validate.c:663
 +msgid "found another possible matching CA certificate - trying again"
 +msgstr "found another possible matching CA certificate - trying again"
 +
 +#: sm/certchain.c:1698 dirmngr/validate.c:688
 +#, c-format
 +msgid "certificate chain longer than allowed by CA (%d)"
 +msgstr "certificate chain longer than allowed by CA (%d)"
 +
 +#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
 +msgid "certificate is good\n"
 +msgstr "certificate is good\n"
 +
 +#: sm/certchain.c:1741
 +msgid "intermediate certificate is good\n"
 +msgstr "intermediate certificate is good\n"
 +
 +#: sm/certchain.c:1742
 +msgid "root certificate is good\n"
 +msgstr "root certificate is good\n"
 +
 +#: sm/certchain.c:1924
 +msgid "switching to chain model"
 +msgstr "switching to chain model"
 +
 +#: sm/certchain.c:1933
 +#, c-format
 +msgid "validation model used: %s"
 +msgstr "validation model used: %s"
 +
 +#: sm/certcheck.c:107
 +#, c-format
 +msgid "a %u bit hash is not valid for a %u bit %s key\n"
 +msgstr "a %u bit hash is not valid for a %u bit %s key\n"
 +
 +#: sm/certcheck.c:244 sm/verify.c:202
 +msgid "(this is the MD2 algorithm)\n"
 +msgstr "(this is the MD2 algorithm)\n"
 +
 +#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
 +msgid "none"
 +msgstr "none"
 +
 +#: sm/certdump.c:552 sm/certdump.c:617
 +msgid "[Error - invalid encoding]"
 +msgstr "[Error - invalid encoding]"
 +
 +#: sm/certdump.c:560
 +msgid "[Error - out of core]"
 +msgstr "[Error - out of core]"
 +
 +#: sm/certdump.c:596
 +msgid "[Error - No name]"
 +msgstr "[Error - No name]"
 +
 +#: sm/certdump.c:623
 +msgid "[Error - invalid DN]"
 +msgstr "[Error - invalid DN]"
 +
 +#: sm/certdump.c:833
 +#, c-format
 +msgid ""
 +"Please enter the passphrase to unlock the secret key for the X.509 "
 +"certificate:\n"
 +"\"%s\"\n"
 +"S/N %s, ID 0x%08lX,\n"
 +"created %s, expires %s.\n"
 +msgstr ""
 +"Please enter the passphrase to unlock the secret key for the X.509 "
 +"certificate:\n"
 +"“%s”\n"
 +"S/N %s, ID 0x%08lX,\n"
 +"created %s, expires %s.\n"
 +
 +#: sm/certlist.c:122 dirmngr/validate.c:1075
 +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:274 dirmngr/validate.c:1085
 +#, c-format
 +msgid "error getting key usage information: %s\n"
 +msgstr "error getting key usage information: %s\n"
 +
 +#: sm/certlist.c:142 dirmngr/validate.c:1095
 +msgid "certificate should not have been used for certification\n"
 +msgstr "certificate should not have been used for certification\n"
 +
 +#: sm/certlist.c:154 dirmngr/validate.c:1107
 +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:165 dirmngr/validate.c:1127
 +msgid "certificate should not have been used for encryption\n"
 +msgstr "certificate should not have been used for encryption\n"
 +
 +#: sm/certlist.c:166 dirmngr/validate.c:1129
 +msgid "certificate should not have been used for signing\n"
 +msgstr "certificate should not have been used for signing\n"
 +
 +#: sm/certlist.c:167 dirmngr/validate.c:1130
 +msgid "certificate is not usable for encryption\n"
 +msgstr "certificate is not usable for encryption\n"
 +
 +#: sm/certlist.c:168 dirmngr/validate.c:1131
 +msgid "certificate is not usable for signing\n"
 +msgstr "certificate is not usable for signing\n"
 +
 +#: sm/certreqgen.c:464
 +#, c-format
 +msgid "line %d: invalid algorithm\n"
 +msgstr "line %d: invalid algorithm\n"
 +
 +#: sm/certreqgen.c:478
 +#, c-format
 +msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 +msgstr "line %d: invalid key length %u (valid are %d to %d)\n"
 +
 +#: sm/certreqgen.c:496
 +#, c-format
 +msgid "line %d: no subject name given\n"
 +msgstr "line %d: no subject name given\n"
 +
 +#: sm/certreqgen.c:505
 +#, c-format
 +msgid "line %d: invalid subject name label '%.*s'\n"
 +msgstr "line %d: invalid subject name label ‘%.*s’\n"
 +
 +#: sm/certreqgen.c:508
 +#, c-format
 +msgid "line %d: invalid subject name '%s' at pos %d\n"
 +msgstr "line %d: invalid subject name ‘%s’ at pos %d\n"
 +
 +#: sm/certreqgen.c:525
 +#, c-format
 +msgid "line %d: not a valid email address\n"
 +msgstr "line %d: not a valid email address\n"
 +
 +#: sm/certreqgen.c:544
 +#, c-format
 +msgid "line %d: invalid serial number\n"
 +msgstr "line %d: invalid serial number\n"
 +
 +#: sm/certreqgen.c:560
 +#, c-format
 +msgid "line %d: invalid issuer name label '%.*s'\n"
 +msgstr "line %d: invalid issuer name label ‘%.*s’\n"
 +
 +#: sm/certreqgen.c:563
 +#, c-format
 +msgid "line %d: invalid issuer name '%s' at pos %d\n"
 +msgstr "line %d: invalid issuer name ‘%s’ at pos %d\n"
 +
 +#: sm/certreqgen.c:575 sm/certreqgen.c:586
 +#, c-format
 +msgid "line %d: invalid date given\n"
 +msgstr "line %d: invalid date given\n"
 +
 +#: sm/certreqgen.c:599
 +#, c-format
 +msgid "line %d: error getting signing key by keygrip '%s': %s\n"
 +msgstr "line %d: error getting signing key by keygrip '%s': %s\n"
 +
 +#: sm/certreqgen.c:618
 +#, c-format
 +msgid "line %d: invalid hash algorithm given\n"
 +msgstr "line %d: invalid hash algorithm given\n"
 +
 +#: sm/certreqgen.c:633
 +#, c-format
 +msgid "line %d: invalid authority-key-id\n"
 +msgstr "line %d: invalid authority-key-id\n"
 +
 +#: sm/certreqgen.c:648
 +#, c-format
 +msgid "line %d: invalid subject-key-id\n"
 +msgstr "line %d: invalid subject-key-id\n"
 +
 +#: sm/certreqgen.c:686
 +#, c-format
 +msgid "line %d: invalid extension syntax\n"
 +msgstr "line %d: invalid extension syntax\n"
 +
 +#: sm/certreqgen.c:699
 +#, c-format
 +msgid "line %d: error reading key '%s' from card: %s\n"
 +msgstr "line %d: error reading key ‘%s’ from card: %s\n"
 +
 +#: sm/certreqgen.c:712
 +#, c-format
 +msgid "line %d: error getting key by keygrip '%s': %s\n"
 +msgstr "line %d: error getting key by keygrip '%s': %s\n"
 +
 +#: sm/certreqgen.c:729
 +#, c-format
 +msgid "line %d: key generation failed: %s <%s>\n"
 +msgstr "line %d: key generation failed: %s <%s>\n"
 +
 +#: sm/certreqgen.c:1324
 +msgid ""
 +"To complete this certificate request please enter the passphrase for the key "
 +"you just created once more.\n"
 +msgstr ""
 +"To complete this certificate request please enter the passphrase for the key "
 +"you just created once more.\n"
 +
 +#: sm/certreqgen-ui.c:162
 +#, c-format
 +msgid "   (%d) RSA\n"
 +msgstr "   (%d) RSA\n"
 +
 +#: sm/certreqgen-ui.c:163
 +#, c-format
 +msgid "   (%d) Existing key\n"
 +msgstr "   (%d) Existing key\n"
 +
 +#: sm/certreqgen-ui.c:164
 +#, c-format
 +msgid "   (%d) Existing key from card\n"
 +msgstr "   (%d) Existing key from card\n"
 +
 +#: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
 +#, c-format
 +msgid "error reading the card: %s\n"
 +msgstr "error reading the card: %s\n"
 +
 +#: sm/certreqgen-ui.c:237
 +#, c-format
 +msgid "Serial number of the card: %s\n"
 +msgstr "Serial number of the card: %s\n"
 +
 +#: sm/certreqgen-ui.c:249
 +msgid "Available keys:\n"
 +msgstr "Available keys:\n"
 +
 +#: sm/certreqgen-ui.c:280
 +#, c-format
 +msgid "Possible actions for a %s key:\n"
 +msgstr "Possible actions for a %s key:\n"
 +
 +#: sm/certreqgen-ui.c:281
 +#, c-format
 +msgid "   (%d) sign, encrypt\n"
 +msgstr "   (%d) sign, encrypt\n"
 +
 +#: sm/certreqgen-ui.c:282
 +#, c-format
 +msgid "   (%d) sign\n"
 +msgstr "   (%d) sign\n"
 +
 +#: sm/certreqgen-ui.c:283
 +#, c-format
 +msgid "   (%d) encrypt\n"
 +msgstr "   (%d) encrypt\n"
 +
 +#: sm/certreqgen-ui.c:307
 +msgid "Enter the X.509 subject name: "
 +msgstr "Enter the X.509 subject name: "
 +
 +#: sm/certreqgen-ui.c:311
 +msgid "No subject name given\n"
 +msgstr "No subject name given\n"
 +
 +#: sm/certreqgen-ui.c:315
 +#, c-format
 +msgid "Invalid subject name label '%.*s'\n"
 +msgstr "Invalid subject name label ‘%.*s’\n"
 +
 +#. TRANSLATORS: The 22 in the second string is the
 +#. length of the first string up to the "%s".  Please
 +#. adjust it do the length of your translation.  The
 +#. second string is merely passed to atoi so you can
 +#. drop everything after the number.
 +#: sm/certreqgen-ui.c:324
 +#, c-format
 +msgid "Invalid subject name '%s'\n"
 +msgstr "Invalid subject name ‘%s’\n"
 +
 +#: sm/certreqgen-ui.c:326
 +msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
 +msgstr "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
 +
 +#: sm/certreqgen-ui.c:338
 +msgid "Enter email addresses"
 +msgstr "Enter email addresses"
 +
 +#: sm/certreqgen-ui.c:339
 +msgid " (end with an empty line):\n"
 +msgstr " (end with an empty line):\n"
 +
 +#: sm/certreqgen-ui.c:343
 +msgid "Enter DNS names"
 +msgstr "Enter DNS names"
 +
 +#: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
 +msgid " (optional; end with an empty line):\n"
 +msgstr " (optional; end with an empty line):\n"
 +
 +#: sm/certreqgen-ui.c:348
 +msgid "Enter URIs"
 +msgstr "Enter URIs"
 +
 +#: sm/certreqgen-ui.c:355
 +msgid "Create self-signed certificate? (y/N) "
 +msgstr "Create self-signed certificate? (y/N) "
 +
 +#: sm/certreqgen-ui.c:382
 +msgid "These parameters are used:\n"
 +msgstr "These parameters are used:\n"
 +
 +#: sm/certreqgen-ui.c:400
 +msgid "Now creating self-signed certificate.  "
 +msgstr "Now creating self-signed certificate.  "
 +
 +#: sm/certreqgen-ui.c:402
 +msgid "Now creating certificate request.  "
 +msgstr "Now creating certificate request.  "
 +
 +#: sm/certreqgen-ui.c:403
 +msgid "This may take a while ...\n"
 +msgstr "This may take a while ...\n"
 +
 +#: sm/certreqgen-ui.c:414
 +msgid "Ready.\n"
 +msgstr "Ready.\n"
 +
 +#: sm/certreqgen-ui.c:417
 +msgid "Ready.  You should now send this request to your CA.\n"
 +msgstr "Ready.  You should now send this request to your CA.\n"
 +
 +#: sm/certreqgen-ui.c:423
 +msgid "resource problem: out of core\n"
 +msgstr "resource problem: out of core\n"
 +
- #: sm/decrypt.c:330
++#: sm/decrypt.c:332
 +msgid "(this is the RC2 algorithm)\n"
 +msgstr "(this is the RC2 algorithm)\n"
 +
- #: sm/decrypt.c:332
++#: sm/decrypt.c:334
 +msgid "(this does not seem to be an encrypted message)\n"
 +msgstr "(this does not seem to be an encrypted message)\n"
 +
 +#: sm/delete.c:51 sm/delete.c:112
 +#, c-format
 +msgid "certificate '%s' not found: %s\n"
 +msgstr "certificate ‘%s’ not found: %s\n"
 +
 +#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
 +#, c-format
 +msgid "error locking keybox: %s\n"
 +msgstr "error locking keybox: %s\n"
 +
 +#: sm/delete.c:143
 +#, c-format
 +msgid "duplicated certificate '%s' deleted\n"
 +msgstr "duplicated certificate ‘%s’ deleted\n"
 +
 +#: sm/delete.c:145
 +#, c-format
 +msgid "certificate '%s' deleted\n"
 +msgstr "certificate ‘%s’ deleted\n"
 +
 +#: sm/delete.c:175
 +#, c-format
 +msgid "deleting certificate \"%s\" failed: %s\n"
 +msgstr "deleting certificate “%s” failed: %s\n"
 +
 +#: sm/encrypt.c:328
 +msgid "no valid recipients given\n"
 +msgstr "no valid recipients given\n"
 +
 +#: sm/gpgsm.c:209
 +msgid "list external keys"
 +msgstr "list external keys"
 +
 +#: sm/gpgsm.c:211
 +msgid "list certificate chain"
 +msgstr "list certificate chain"
 +
- #: sm/gpgsm.c:218
++#: sm/gpgsm.c:219
 +msgid "import certificates"
 +msgstr "import certificates"
 +
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
 +msgid "export certificates"
 +msgstr "export certificates"
 +
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:228
 +msgid "register a smartcard"
 +msgstr "register a smartcard"
 +
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:231
 +msgid "pass a command to the dirmngr"
 +msgstr "pass a command to the dirmngr"
 +
- #: sm/gpgsm.c:232
++#: sm/gpgsm.c:233
 +msgid "invoke gpg-protect-tool"
 +msgstr "invoke gpg-protect-tool"
 +
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:250
 +msgid "create base-64 encoded output"
 +msgstr "create base-64 encoded output"
 +
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
 +msgid "assume input is in PEM format"
 +msgstr "assume input is in PEM format"
 +
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
 +msgid "assume input is in base-64 format"
 +msgstr "assume input is in base-64 format"
 +
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:262
 +msgid "assume input is in binary format"
 +msgstr "assume input is in binary format"
 +
- #: sm/gpgsm.c:267
++#: sm/gpgsm.c:269
 +msgid "never consult a CRL"
 +msgstr "never consult a CRL"
 +
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:279
 +msgid "check validity using OCSP"
 +msgstr "check validity using OCSP"
 +
- #: sm/gpgsm.c:282
++#: sm/gpgsm.c:284
 +msgid "|N|number of certificates to include"
 +msgstr "|N|number of certificates to include"
 +
- #: sm/gpgsm.c:285
++#: sm/gpgsm.c:287
 +msgid "|FILE|take policy information from FILE"
 +msgstr "|FILE|take policy information from FILE"
 +
- #: sm/gpgsm.c:288
++#: sm/gpgsm.c:290
 +msgid "do not check certificate policies"
 +msgstr "do not check certificate policies"
 +
- #: sm/gpgsm.c:292
++#: sm/gpgsm.c:294
 +msgid "fetch missing issuer certificates"
 +msgstr "fetch missing issuer certificates"
 +
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
 +msgid "don't use the terminal at all"
 +msgstr "don't use the terminal at all"
 +
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:307
 +msgid "|FILE|write a server mode log to FILE"
 +msgstr "|FILE|write a server mode log to FILE"
 +
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:312
 +msgid "|FILE|write an audit log to FILE"
 +msgstr "|FILE|write an audit log to FILE"
 +
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
 +msgid "batch mode: never ask"
 +msgstr "batch mode: never ask"
 +
- #: sm/gpgsm.c:314
++#: sm/gpgsm.c:316
 +msgid "assume yes on most questions"
 +msgstr "assume yes on most questions"
 +
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:317
 +msgid "assume no on most questions"
 +msgstr "assume no on most questions"
 +
- #: sm/gpgsm.c:318
++#: sm/gpgsm.c:320
 +msgid "|FILE|add keyring to the list of keyrings"
 +msgstr "|FILE|add keyring to the list of keyrings"
 +
- #: sm/gpgsm.c:321
++#: sm/gpgsm.c:323
 +msgid "|USER-ID|use USER-ID as default secret key"
 +msgstr "|USER-ID|use USER-ID as default secret key"
 +
- #: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
 +msgid "|SPEC|use this keyserver to lookup keys"
 +msgstr "|SPEC|use this keyserver to lookup keys"
 +
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
 +msgid "|NAME|use cipher algorithm NAME"
 +msgstr "|NAME|use cipher algorithm NAME"
 +
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:352
 +msgid "|NAME|use message digest algorithm NAME"
 +msgstr "|NAME|use message digest algorithm NAME"
 +
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:559
 +msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 +msgstr "Usage: @GPGSM@ [options] [files] (-h for help)"
 +
- #: sm/gpgsm.c:570
++#: sm/gpgsm.c:562
 +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 ""
 +"Syntax: @GPGSM@ [options] [files]\n"
 +"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
 +"Default operation depends on the input data\n"
 +
- #: sm/gpgsm.c:774
++#: sm/gpgsm.c:766
 +#, 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:785
++#: sm/gpgsm.c:777
 +#, c-format
 +msgid "unknown validation model '%s'\n"
 +msgstr "unknown validation model ‘%s’\n"
 +
- #: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
 +#, c-format
 +msgid "%s:%u: no hostname given\n"
 +msgstr "%s:%u: no hostname given\n"
 +
- #: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
 +#, c-format
 +msgid "%s:%u: password given without user\n"
 +msgstr "%s:%u: password given without user\n"
 +
- #: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
 +#, c-format
 +msgid "%s:%u: skipping this line\n"
 +msgstr "%s:%u: skipping this line\n"
 +
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1427
 +msgid "could not parse keyserver\n"
 +msgstr "could not parse keyserver\n"
 +
- #: sm/gpgsm.c:1636
++#: sm/gpgsm.c:1630
 +#, c-format
 +msgid "importing common certificates '%s'\n"
 +msgstr "importing common certificates ‘%s’\n"
 +
- #: sm/gpgsm.c:1677
++#: sm/gpgsm.c:1671
 +#, c-format
 +msgid "can't sign using '%s': %s\n"
 +msgstr "can't sign using '%s': %s\n"
 +
- #: sm/gpgsm.c:2033
++#: sm/gpgsm.c:2028
 +msgid "invalid command (there is no implicit command)\n"
 +msgstr "invalid command (there is no implicit command)\n"
 +
 +#: sm/import.c:127
 +#, c-format
 +msgid "total number processed: %lu\n"
 +msgstr "total number processed: %lu\n"
 +
 +#: sm/import.c:246
 +msgid "error storing certificate\n"
 +msgstr "error storing certificate\n"
 +
 +#: sm/import.c:254
 +msgid "basic certificate checks failed - not imported\n"
 +msgstr "basic certificate checks failed - not imported\n"
 +
 +#: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
 +#, c-format
 +msgid "error getting stored flags: %s\n"
 +msgstr "error getting stored flags: %s\n"
 +
 +#: sm/import.c:526 sm/import.c:558
 +#, c-format
 +msgid "error importing certificate: %s\n"
 +msgstr "error importing certificate: %s\n"
 +
 +#: sm/import.c:746 tools/gpg-connect-agent.c:1433
 +#, c-format
 +msgid "error reading input: %s\n"
 +msgstr "error reading input: %s\n"
 +
 +#: sm/keydb.c:1126 sm/keydb.c:1212
 +msgid "failed to get the fingerprint\n"
 +msgstr "failed to get the fingerprint\n"
 +
 +#: sm/keydb.c:1168
 +#, c-format
 +msgid "problem looking for existing certificate: %s\n"
 +msgstr "problem looking for existing certificate: %s\n"
 +
 +#: sm/keydb.c:1180
 +#, c-format
 +msgid "error finding writable keyDB: %s\n"
 +msgstr "error finding writable keyDB: %s\n"
 +
 +#: sm/keydb.c:1188
 +#, c-format
 +msgid "error storing certificate: %s\n"
 +msgstr "error storing certificate: %s\n"
 +
 +#: sm/keydb.c:1240
 +#, c-format
 +msgid "problem re-searching certificate: %s\n"
 +msgstr "problem re-searching certificate: %s\n"
 +
 +#: sm/keydb.c:1261 sm/keydb.c:1350
 +#, c-format
 +msgid "error storing flags: %s\n"
 +msgstr "error storing flags: %s\n"
 +
 +#: sm/keylist.c:657
 +msgid "Error - "
 +msgstr "Error - "
 +
 +#: sm/misc.c:58
 +msgid "GPG_TTY has not been set - using maybe bogus default\n"
 +msgstr "GPG_TTY has not been set - using maybe bogus default\n"
 +
 +#: sm/qualified.c:105
 +#, c-format
 +msgid "invalid formatted fingerprint in '%s', line %d\n"
 +msgstr "invalid formatted fingerprint in '%s', line %d\n"
 +
 +#: sm/qualified.c:123
 +#, c-format
 +msgid "invalid country code in '%s', line %d\n"
 +msgstr "invalid country code in '%s', line %d\n"
 +
 +#: sm/qualified.c:206
 +#, c-format
 +msgid ""
 +"You are about to create a signature using your certificate:\n"
 +"\"%s\"\n"
 +"This will create a qualified signature by law equated to a handwritten "
 +"signature.\n"
 +"\n"
 +"%s%sAre you really sure that you want to do this?"
 +msgstr ""
 +"You are about to create a signature using your certificate:\n"
 +"“%s”\n"
 +"This will create a qualified signature by law equated to a handwritten "
 +"signature.\n"
 +"\n"
 +"%s%sAre you really sure that you want to do this?"
 +
 +#: sm/qualified.c:215 sm/verify.c:617
 +msgid ""
 +"Note, that this software is not officially approved to create or verify such "
 +"signatures.\n"
 +msgstr ""
 +"Note, that this software is not officially approved to create or verify such "
 +"signatures.\n"
 +
 +#: sm/qualified.c:282
 +#, c-format
 +msgid ""
 +"You are about to create a signature using your certificate:\n"
 +"\"%s\"\n"
 +"Note, that this certificate will NOT create a qualified signature!"
 +msgstr ""
 +"You are about to create a signature using your certificate:\n"
 +"“%s”\n"
 +"Note, that this certificate will NOT create a qualified signature!"
 +
 +#: sm/sign.c:451
 +#, c-format
 +msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 +msgstr "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 +
 +#: sm/sign.c:465
 +#, c-format
 +msgid "hash algorithm used for signer %d: %s (%s)\n"
 +msgstr "hash algorithm used for signer %d: %s (%s)\n"
 +
 +#: sm/sign.c:517
 +#, c-format
 +msgid "checking for qualified certificate failed: %s\n"
 +msgstr "checking for qualified certificate failed: %s\n"
 +
 +#: sm/verify.c:450
 +msgid "Signature made "
 +msgstr "Signature made "
 +
 +#: sm/verify.c:454
 +msgid "[date not given]"
 +msgstr "[date not given]"
 +
 +#: sm/verify.c:455
 +#, c-format
 +msgid " using certificate ID 0x%08lX\n"
 +msgstr " using certificate ID 0x%08lX\n"
 +
 +#: sm/verify.c:474
 +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:595
 +msgid "Good signature from"
 +msgstr "Good signature from"
 +
 +#: sm/verify.c:596
 +msgid "                aka"
 +msgstr "                aka"
 +
 +#: sm/verify.c:614
 +msgid "This is a qualified signature\n"
 +msgstr "This is a qualified signature\n"
 +
 +#: dirmngr/certcache.c:106
 +#, c-format
 +msgid "can't initialize certificate cache lock: %s\n"
 +msgstr "can't initialize certificate cache lock: %s\n"
 +
 +#: dirmngr/certcache.c:117
 +#, c-format
 +msgid "can't acquire read lock on the certificate cache: %s\n"
 +msgstr "can't acquire read lock on the certificate cache: %s\n"
 +
 +#: dirmngr/certcache.c:128
 +#, c-format
 +msgid "can't acquire write lock on the certificate cache: %s\n"
 +msgstr "can't acquire write lock on the certificate cache: %s\n"
 +
 +#: dirmngr/certcache.c:139
 +#, c-format
 +msgid "can't release lock on the certificate cache: %s\n"
 +msgstr "can't release lock on the certificate cache: %s\n"
 +
 +#: dirmngr/certcache.c:267
 +#, c-format
 +msgid "dropping %u certificates from the cache\n"
 +msgstr "dropping %u certificates from the cache\n"
 +
 +#: dirmngr/certcache.c:387
 +#, c-format
 +msgid "can't parse certificate '%s': %s\n"
 +msgstr "can't parse certificate '%s': %s\n"
 +
 +#: dirmngr/certcache.c:395
 +#, c-format
 +msgid "certificate '%s' already cached\n"
 +msgstr "certificate ‘%s’ already cached\n"
 +
 +#: dirmngr/certcache.c:399
 +#, c-format
 +msgid "trusted certificate '%s' loaded\n"
 +msgstr "trusted certificate ‘%s’ loaded\n"
 +
 +#: dirmngr/certcache.c:401
 +#, c-format
 +msgid "certificate '%s' loaded\n"
 +msgstr "certificate ‘%s’ loaded\n"
 +
 +#: dirmngr/certcache.c:405
 +#, c-format
 +msgid "  SHA1 fingerprint = %s\n"
 +msgstr "  SHA1 fingerprint = %s\n"
 +
 +#: dirmngr/certcache.c:408
 +msgid "   issuer ="
 +msgstr "   issuer ="
 +
 +#: dirmngr/certcache.c:409
 +msgid "  subject ="
 +msgstr "  subject ="
 +
 +#: dirmngr/certcache.c:413
 +#, c-format
 +msgid "error loading certificate '%s': %s\n"
 +msgstr "error loading certificate '%s': %s\n"
 +
 +#: dirmngr/certcache.c:489
 +#, c-format
 +msgid "permanently loaded certificates: %u\n"
 +msgstr "permanently loaded certificates: %u\n"
 +
 +#: dirmngr/certcache.c:491
 +#, c-format
 +msgid "    runtime cached certificates: %u\n"
 +msgstr "    runtime cached certificates: %u\n"
 +
 +#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
 +msgid "certificate already cached\n"
 +msgstr "certificate already cached\n"
 +
 +#: dirmngr/certcache.c:508
 +msgid "certificate cached\n"
 +msgstr "certificate cached\n"
 +
 +#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
 +#: dirmngr/dirmngr-client.c:389
 +#, c-format
 +msgid "error caching certificate: %s\n"
 +msgstr "error caching certificate: %s\n"
 +
 +#: dirmngr/certcache.c:593
 +#, c-format
 +msgid "invalid SHA1 fingerprint string '%s'\n"
 +msgstr "invalid SHA1 fingerprint string ‘%s’\n"
 +
 +#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
 +#, c-format
 +msgid "error fetching certificate by S/N: %s\n"
 +msgstr "error fetching certificate by S/N: %s\n"
 +
 +#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
 +#, c-format
 +msgid "error fetching certificate by subject: %s\n"
 +msgstr "error fetching certificate by subject: %s\n"
 +
 +#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
 +msgid "no issuer found in certificate\n"
 +msgstr "no issuer found in certificate\n"
 +
 +#: dirmngr/certcache.c:1325
 +#, c-format
 +msgid "error getting authorityKeyIdentifier: %s\n"
 +msgstr "error getting authorityKeyIdentifier: %s\n"
 +
 +#: dirmngr/crlcache.c:213
 +#, c-format
 +msgid "creating directory '%s'\n"
 +msgstr "creating directory ‘%s’\n"
 +
 +#: dirmngr/crlcache.c:217
 +#, c-format
 +msgid "error creating directory '%s': %s\n"
 +msgstr "error creating directory '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:245
 +#, c-format
 +msgid "ignoring database dir '%s'\n"
 +msgstr "ignoring database dir ‘%s’\n"
 +
 +#: dirmngr/crlcache.c:254
 +#, c-format
 +msgid "error reading directory '%s': %s\n"
 +msgstr "error reading directory '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:275
 +#, c-format
 +msgid "removing cache file '%s'\n"
 +msgstr "removing cache file ‘%s’\n"
 +
 +#: dirmngr/crlcache.c:284
 +#, c-format
 +msgid "not removing file '%s'\n"
 +msgstr "not removing file ‘%s’\n"
 +
 +#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
 +#, c-format
 +msgid "error closing cache file: %s\n"
 +msgstr "error closing cache file: %s\n"
 +
 +#: dirmngr/crlcache.c:411 dirmngr/crlcache.c:795
 +#, c-format
 +msgid "failed to open cache dir file '%s': %s\n"
 +msgstr "failed to open cache dir file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:421
 +#, c-format
 +msgid "error creating new cache dir file '%s': %s\n"
 +msgstr "error creating new cache dir file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:428
 +#, c-format
 +msgid "error writing new cache dir file '%s': %s\n"
 +msgstr "error writing new cache dir file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:435
 +#, c-format
 +msgid "error closing new cache dir file '%s': %s\n"
 +msgstr "error closing new cache dir file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:440
 +#, c-format
 +msgid "new cache dir file '%s' created\n"
 +msgstr "new cache dir file ‘%s’ created\n"
 +
 +#: dirmngr/crlcache.c:445
 +#, c-format
 +msgid "failed to re-open cache dir file '%s': %s\n"
 +msgstr "failed to re-open cache dir file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:473
 +#, c-format
 +msgid "first record of '%s' is not the version\n"
 +msgstr "first record of ‘%s’ is not the version\n"
 +
 +#: dirmngr/crlcache.c:488
 +msgid "old version of cache directory - cleaning up\n"
 +msgstr "old version of cache directory - cleaning up\n"
 +
 +#: dirmngr/crlcache.c:504
 +msgid "old version of cache directory - giving up\n"
 +msgstr "old version of cache directory - giving up\n"
 +
 +#: dirmngr/crlcache.c:615
 +#, c-format
 +msgid "extra field detected in crl record of '%s' line %u\n"
 +msgstr "extra field detected in crl record of ‘%s’ line %u\n"
 +
 +#: dirmngr/crlcache.c:623
 +#, c-format
 +msgid "invalid line detected in '%s' line %u\n"
 +msgstr "invalid line detected in ‘%s’ line %u\n"
 +
 +#: dirmngr/crlcache.c:632
 +#, c-format
 +msgid "duplicate entry detected in '%s' line %u\n"
 +msgstr "duplicate entry detected in ‘%s’ line %u\n"
 +
 +#: dirmngr/crlcache.c:647
 +#, c-format
 +msgid "unsupported record type in '%s' line %u skipped\n"
 +msgstr "unsupported record type in ‘%s’ line %u skipped\n"
 +
 +#: dirmngr/crlcache.c:673
 +#, c-format
 +msgid "invalid issuer hash in '%s' line %u\n"
 +msgstr "invalid issuer hash in ‘%s’ line %u\n"
 +
 +#: dirmngr/crlcache.c:679
 +#, c-format
 +msgid "no issuer DN in '%s' line %u\n"
 +msgstr "no issuer DN in ‘%s’ line %u\n"
 +
 +#: dirmngr/crlcache.c:686
 +#, c-format
 +msgid "invalid timestamp in '%s' line %u\n"
 +msgstr "invalid timestamp in ‘%s’ line %u\n"
 +
 +#: dirmngr/crlcache.c:692
 +#, c-format
 +msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 +msgstr "WARNING: invalid cache file hash in ‘%s’ line %u\n"
 +
 +#: dirmngr/crlcache.c:698
 +msgid "detected errors in cache dir file\n"
 +msgstr "detected errors in cache dir file\n"
 +
 +#: dirmngr/crlcache.c:699
 +msgid "please check the reason and manually delete that file\n"
 +msgstr "please check the reason and manually delete that file\n"
 +
 +#: dirmngr/crlcache.c:827 dirmngr/crlcache.c:841
 +#, c-format
 +msgid "failed to create temporary cache dir file '%s': %s\n"
 +msgstr "failed to create temporary cache dir file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:937
 +#, c-format
 +msgid "error closing '%s': %s\n"
 +msgstr "error closing '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:949
 +#, c-format
 +msgid "error renaming '%s' to '%s': %s\n"
 +msgstr "error renaming ‘%s’ to '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:1003
 +#, c-format
 +msgid "can't hash '%s': %s\n"
 +msgstr "can't hash '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:1011
 +#, c-format
 +msgid "error setting up MD5 hash context: %s\n"
 +msgstr "error setting up MD5 hash context: %s\n"
 +
 +#: dirmngr/crlcache.c:1027
 +#, c-format
 +msgid "error hashing '%s': %s\n"
 +msgstr "error hashing '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:1055
 +#, c-format
 +msgid "invalid formatted checksum for '%s'\n"
 +msgstr "invalid formatted checksum for ‘%s’\n"
 +
 +#: dirmngr/crlcache.c:1108
 +msgid "too many open cache files; can't open anymore\n"
 +msgstr "too many open cache files; can't open anymore\n"
 +
 +#: dirmngr/crlcache.c:1126
 +#, c-format
 +msgid "opening cache file '%s'\n"
 +msgstr "opening cache file ‘%s’\n"
 +
 +#: dirmngr/crlcache.c:1145
 +#, c-format
 +msgid "error opening cache file '%s': %s\n"
 +msgstr "error opening cache file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:1154
 +#, c-format
 +msgid "error initializing cache file '%s' for reading: %s\n"
 +msgstr "error initializing cache file ‘%s’ for reading: %s\n"
 +
 +#: dirmngr/crlcache.c:1175
 +msgid "calling unlock_db_file on a closed file\n"
 +msgstr "calling unlock_db_file on a closed file\n"
 +
 +#: dirmngr/crlcache.c:1177
 +msgid "calling unlock_db_file on an unlocked file\n"
 +msgstr "calling unlock_db_file on an unlocked file\n"
 +
 +#: dirmngr/crlcache.c:1231
 +#, c-format
 +msgid "failed to create a new cache object: %s\n"
 +msgstr "failed to create a new cache object: %s\n"
 +
 +#: dirmngr/crlcache.c:1286
 +#, c-format
 +msgid "no CRL available for issuer id %s\n"
 +msgstr "no CRL available for issuer id %s\n"
 +
 +#: dirmngr/crlcache.c:1293
 +#, c-format
 +msgid "cached CRL for issuer id %s too old; update required\n"
 +msgstr "cached CRL for issuer id %s too old; update required\n"
 +
 +#: dirmngr/crlcache.c:1307
 +#, c-format
 +msgid ""
 +"force-crl-refresh active and %d minutes passed for issuer id %s; update "
 +"required\n"
 +msgstr ""
 +"force-crl-refresh active and %d minutes passed for issuer id %s; update "
 +"required\n"
 +
 +#: dirmngr/crlcache.c:1315
 +#, c-format
 +msgid "force-crl-refresh active for issuer id %s; update required\n"
 +msgstr "force-crl-refresh active for issuer id %s; update required\n"
 +
 +#: dirmngr/crlcache.c:1324
 +#, c-format
 +msgid "available CRL for issuer ID %s can't be used\n"
 +msgstr "available CRL for issuer ID %s can't be used\n"
 +
 +#: dirmngr/crlcache.c:1335
 +#, c-format
 +msgid "cached CRL for issuer id %s tampered; we need to update\n"
 +msgstr "cached CRL for issuer id %s tampered; we need to update\n"
 +
 +#: dirmngr/crlcache.c:1347
 +msgid "WARNING: invalid cache record length for S/N "
 +msgstr "WARNING: invalid cache record length for S/N "
 +
 +#: dirmngr/crlcache.c:1357
 +#, c-format
 +msgid "problem reading cache record for S/N %s: %s\n"
 +msgstr "problem reading cache record for S/N %s: %s\n"
 +
 +#: dirmngr/crlcache.c:1360
 +#, c-format
 +msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
 +msgstr "S/N %s is not valid; reason=%02X  date=%.15s\n"
 +
 +#: dirmngr/crlcache.c:1371
 +#, c-format
 +msgid "S/N %s is valid, it is not listed in the CRL\n"
 +msgstr "S/N %s is valid, it is not listed in the CRL\n"
 +
 +#: dirmngr/crlcache.c:1379
 +#, c-format
 +msgid "error getting data from cache file: %s\n"
 +msgstr "error getting data from cache file: %s\n"
 +
 +#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
 +#, c-format
 +msgid "unknown hash algorithm '%s'\n"
 +msgstr "unknown hash algorithm ‘%s’\n"
 +
 +#: dirmngr/crlcache.c:1549
 +#, c-format
 +msgid "gcry_md_open for algorithm %d failed: %s\n"
 +msgstr "gcry_md_open for algorithm %d failed: %s\n"
 +
 +#: dirmngr/crlcache.c:1586 dirmngr/crlcache.c:1605
 +msgid "got an invalid S-expression from libksba\n"
 +msgstr "got an invalid S-expression from libksba\n"
 +
 +#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
 +#, c-format
 +msgid "converting S-expression failed: %s\n"
 +msgstr "converting S-expression failed: %s\n"
 +
 +#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
 +#, c-format
 +msgid "creating S-expression failed: %s\n"
 +msgstr "creating S-expression failed: %s\n"
 +
 +#: dirmngr/crlcache.c:1699
 +#, c-format
 +msgid "ksba_crl_parse failed: %s\n"
 +msgstr "ksba_crl_parse failed: %s\n"
 +
 +#: dirmngr/crlcache.c:1714
 +#, c-format
 +msgid "error getting update times of CRL: %s\n"
 +msgstr "error getting update times of CRL: %s\n"
 +
 +#: dirmngr/crlcache.c:1721
 +#, c-format
 +msgid "update times of this CRL: this=%s next=%s\n"
 +msgstr "update times of this CRL: this=%s next=%s\n"
 +
 +#: dirmngr/crlcache.c:1725
 +msgid "nextUpdate not given; assuming a validity period of one day\n"
 +msgstr "nextUpdate not given; assuming a validity period of one day\n"
 +
 +#: dirmngr/crlcache.c:1745
 +#, c-format
 +msgid "error getting CRL item: %s\n"
 +msgstr "error getting CRL item: %s\n"
 +
 +#: dirmngr/crlcache.c:1760
 +#, c-format
 +msgid "error inserting item into temporary cache file: %s\n"
 +msgstr "error inserting item into temporary cache file: %s\n"
 +
 +#: dirmngr/crlcache.c:1787
 +#, c-format
 +msgid "no CRL issuer found in CRL: %s\n"
 +msgstr "no CRL issuer found in CRL: %s\n"
 +
 +#: dirmngr/crlcache.c:1802
 +msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 +msgstr "locating CRL issuer certificate by authorityKeyIdentifier\n"
 +
 +#: dirmngr/crlcache.c:1847
 +#, c-format
 +msgid "CRL signature verification failed: %s\n"
 +msgstr "CRL signature verification failed: %s\n"
 +
 +#: dirmngr/crlcache.c:1858
 +#, c-format
 +msgid "error checking validity of CRL issuer certificate: %s\n"
 +msgstr "error checking validity of CRL issuer certificate: %s\n"
 +
 +#: dirmngr/crlcache.c:2001
 +#, c-format
 +msgid "ksba_crl_new failed: %s\n"
 +msgstr "ksba_crl_new failed: %s\n"
 +
 +#: dirmngr/crlcache.c:2008
 +#, c-format
 +msgid "ksba_crl_set_reader failed: %s\n"
 +msgstr "ksba_crl_set_reader failed: %s\n"
 +
 +#: dirmngr/crlcache.c:2042
 +#, c-format
 +msgid "removed stale temporary cache file '%s'\n"
 +msgstr "removed stale temporary cache file ‘%s’\n"
 +
 +#: dirmngr/crlcache.c:2046
 +#, c-format
 +msgid "problem removing stale temporary cache file '%s': %s\n"
 +msgstr "problem removing stale temporary cache file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:2056
 +#, c-format
 +msgid "error creating temporary cache file '%s': %s\n"
 +msgstr "error creating temporary cache file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:2066
 +#, c-format
 +msgid "crl_parse_insert failed: %s\n"
 +msgstr "crl_parse_insert failed: %s\n"
 +
 +#: dirmngr/crlcache.c:2076
 +#, c-format
 +msgid "error finishing temporary cache file '%s': %s\n"
 +msgstr "error finishing temporary cache file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:2083
 +#, c-format
 +msgid "error closing temporary cache file '%s': %s\n"
 +msgstr "error closing temporary cache file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:2108
 +#, c-format
 +msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 +msgstr "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 +
 +#: dirmngr/crlcache.c:2112
 +#, c-format
 +msgid "new CRL still too old; it expired on %s\n"
 +msgstr "new CRL still too old; it expired on %s\n"
 +
 +#: dirmngr/crlcache.c:2128
 +#, c-format
 +msgid "unknown critical CRL extension %s\n"
 +msgstr "unknown critical CRL extension %s\n"
 +
 +#: dirmngr/crlcache.c:2138
 +#, c-format
 +msgid "error reading CRL extensions: %s\n"
 +msgstr "error reading CRL extensions: %s\n"
 +
 +#: dirmngr/crlcache.c:2189
 +#, c-format
 +msgid "creating cache file '%s'\n"
 +msgstr "creating cache file ‘%s’\n"
 +
 +#: dirmngr/crlcache.c:2221
 +#, c-format
 +msgid "problem renaming '%s' to '%s': %s\n"
 +msgstr "problem renaming ‘%s’ to '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:2235
 +msgid ""
 +"updating the DIR file failed - cache entry will get lost with the next "
 +"program start\n"
 +msgstr ""
 +"updating the DIR file failed - cache entry will get lost with the next "
 +"program start\n"
 +
 +#: dirmngr/crlcache.c:2272
 +#, c-format
 +msgid "Begin CRL dump (retrieved via %s)\n"
 +msgstr "Begin CRL dump (retrieved via %s)\n"
 +
 +#: dirmngr/crlcache.c:2295
 +msgid ""
 +" ERROR: The CRL will not be used because it was still too old after an "
 +"update!\n"
 +msgstr ""
 +" ERROR: The CRL will not be used because it was still too old after an "
 +"update!\n"
 +
 +#: dirmngr/crlcache.c:2298
 +msgid ""
 +" ERROR: The CRL will not be used due to an unknown critical extension!\n"
 +msgstr ""
 +" ERROR: The CRL will not be used due to an unknown critical extension!\n"
 +
 +#: dirmngr/crlcache.c:2301
 +msgid " ERROR: The CRL will not be used\n"
 +msgstr " ERROR: The CRL will not be used\n"
 +
 +#: dirmngr/crlcache.c:2308
 +msgid " ERROR: This cached CRL may have been tampered with!\n"
 +msgstr " ERROR: This cached CRL may have been tampered with!\n"
 +
 +#: dirmngr/crlcache.c:2326
 +msgid " WARNING: invalid cache record length\n"
 +msgstr " WARNING: invalid cache record length\n"
 +
 +#: dirmngr/crlcache.c:2333
 +#, c-format
 +msgid "problem reading cache record: %s\n"
 +msgstr "problem reading cache record: %s\n"
 +
 +#: dirmngr/crlcache.c:2344
 +#, c-format
 +msgid "problem reading cache key: %s\n"
 +msgstr "problem reading cache key: %s\n"
 +
 +#: dirmngr/crlcache.c:2375
 +#, c-format
 +msgid "error reading cache entry from db: %s\n"
 +msgstr "error reading cache entry from db: %s\n"
 +
 +#: dirmngr/crlcache.c:2378
 +msgid "End CRL dump\n"
 +msgstr "End CRL dump\n"
 +
 +#: dirmngr/crlcache.c:2499
 +#, c-format
 +msgid "crl_fetch via DP failed: %s\n"
 +msgstr "crl_fetch via DP failed: %s\n"
 +
 +#: dirmngr/crlcache.c:2510
 +#, c-format
 +msgid "crl_cache_insert via DP failed: %s\n"
 +msgstr "crl_cache_insert via DP failed: %s\n"
 +
 +#: dirmngr/crlcache.c:2570
 +#, c-format
 +msgid "crl_cache_insert via issuer failed: %s\n"
 +msgstr "crl_cache_insert via issuer failed: %s\n"
 +
 +#: dirmngr/crlfetch.c:74
 +msgid "reader to file mapping table full - waiting\n"
 +msgstr "reader to file mapping table full - waiting\n"
 +
 +#: dirmngr/crlfetch.c:182
 +msgid "using \"http\" instead of \"https\"\n"
 +msgstr "using “http” instead of “https”\n"
 +
 +#: dirmngr/crlfetch.c:193 dirmngr/crlfetch.c:289 dirmngr/crlfetch.c:327
 +#: dirmngr/crlfetch.c:359
 +#, c-format
 +msgid "CRL access not possible due to disabled %s\n"
 +msgstr "CRL access not possible due to disabled %s\n"
 +
 +#: dirmngr/crlfetch.c:223 dirmngr/ldap-wrapper-ce.c:488
- #: dirmngr/ldap-wrapper.c:742 dirmngr/misc.c:563
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:563
 +#, c-format
 +msgid "error initializing reader object: %s\n"
 +msgstr "error initializing reader object: %s\n"
 +
 +#: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
 +#, c-format
 +msgid "URL '%s' redirected to '%s' (%u)\n"
 +msgstr "URL ‘%s’ redirected to ‘%s’ (%u)\n"
 +
 +#: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
 +msgid "too many redirections\n"
 +msgstr "too many redirections\n"
 +
 +#: dirmngr/crlfetch.c:274
 +#, c-format
 +msgid "error retrieving '%s': %s\n"
 +msgstr "error retrieving '%s': %s\n"
 +
 +#: dirmngr/crlfetch.c:279
 +#, c-format
 +msgid "error retrieving '%s': http status %u\n"
 +msgstr "error retrieving '%s': http status %u\n"
 +
 +#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
 +#: dirmngr/crlfetch.c:381
 +msgid "CRL access not possible due to Tor mode\n"
 +msgstr "CRL access not possible due to Tor mode\n"
 +
 +#: dirmngr/crlfetch.c:386
 +#, c-format
 +msgid "certificate search not possible due to disabled %s\n"
 +msgstr "certificate search not possible due to disabled %s\n"
 +
 +#: dirmngr/dirmngr-client.c:71
 +msgid "use OCSP instead of CRLs"
 +msgstr "use OCSP instead of CRLs"
 +
 +#: dirmngr/dirmngr-client.c:72
 +msgid "check whether a dirmngr is running"
 +msgstr "check whether a dirmngr is running"
 +
 +#: dirmngr/dirmngr-client.c:73
 +msgid "add a certificate to the cache"
 +msgstr "add a certificate to the cache"
 +
 +#: dirmngr/dirmngr-client.c:74
 +msgid "validate a certificate"
 +msgstr "validate a certificate"
 +
 +#: dirmngr/dirmngr-client.c:75
 +msgid "lookup a certificate"
 +msgstr "lookup a certificate"
 +
 +#: dirmngr/dirmngr-client.c:76
 +msgid "lookup only locally stored certificates"
 +msgstr "lookup only locally stored certificates"
 +
 +#: dirmngr/dirmngr-client.c:77
 +msgid "expect an URL for --lookup"
 +msgstr "expect an URL for --lookup"
 +
 +#: dirmngr/dirmngr-client.c:78
 +msgid "load a CRL into the dirmngr"
 +msgstr "load a CRL into the dirmngr"
 +
 +#: dirmngr/dirmngr-client.c:79
 +msgid "special mode for use by Squid"
 +msgstr "special mode for use by Squid"
 +
 +#: dirmngr/dirmngr-client.c:80
 +msgid "expect certificates in PEM format"
 +msgstr "expect certificates in PEM format"
 +
 +#: dirmngr/dirmngr-client.c:82
 +msgid "force the use of the default OCSP responder"
 +msgstr "force the use of the default OCSP responder"
 +
 +#: dirmngr/dirmngr-client.c:169
 +msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 +msgstr "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 +
 +#: dirmngr/dirmngr-client.c:173
 +msgid ""
 +"Syntax: dirmngr-client [options] [certfile|pattern]\n"
 +"Test an X.509 certificate against a CRL or do an OCSP check\n"
 +"The process returns 0 if the certificate is valid, 1 if it is\n"
 +"not valid and other error codes for general failures\n"
 +msgstr ""
 +"Syntax: dirmngr-client [options] [certfile|pattern]\n"
 +"Test an X.509 certificate against a CRL or do an OCSP check\n"
 +"The process returns 0 if the certificate is valid, 1 if it is\n"
 +"not valid and other error codes for general failures\n"
 +
 +#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
 +#, c-format
 +msgid "error reading certificate from stdin: %s\n"
 +msgstr "error reading certificate from stdin: %s\n"
 +
 +#: dirmngr/dirmngr-client.c:281
 +#, c-format
 +msgid "error reading certificate from '%s': %s\n"
 +msgstr "error reading certificate from '%s': %s\n"
 +
 +#: dirmngr/dirmngr-client.c:295
 +msgid "certificate too large to make any sense\n"
 +msgstr "certificate too large to make any sense\n"
 +
 +#: dirmngr/dirmngr-client.c:310
 +#, c-format
 +msgid "can't connect to the dirmngr: %s\n"
 +msgstr "can't connect to the dirmngr: %s\n"
 +
 +#: dirmngr/dirmngr-client.c:332
 +#, c-format
 +msgid "lookup failed: %s\n"
 +msgstr "lookup failed: %s\n"
 +
 +#: dirmngr/dirmngr-client.c:347
 +#, c-format
 +msgid "loading CRL '%s' failed: %s\n"
 +msgstr "loading CRL ‘%s’ failed: %s\n"
 +
 +#: dirmngr/dirmngr-client.c:375
 +msgid "a dirmngr daemon is up and running\n"
 +msgstr "a dirmngr daemon is up and running\n"
 +
 +#: dirmngr/dirmngr-client.c:397
 +#, c-format
 +msgid "validation of certificate failed: %s\n"
 +msgstr "validation of certificate failed: %s\n"
 +
 +#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
 +msgid "certificate is valid\n"
 +msgstr "certificate is valid\n"
 +
 +#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
 +msgid "certificate has been revoked\n"
 +msgstr "certificate has been revoked\n"
 +
 +#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
 +#, c-format
 +msgid "certificate check failed: %s\n"
 +msgstr "certificate check failed: %s\n"
 +
 +#: dirmngr/dirmngr-client.c:428
 +#, c-format
 +msgid "got status: '%s'\n"
 +msgstr "got status: ‘%s’\n"
 +
 +#: dirmngr/dirmngr-client.c:443
 +#, c-format
 +msgid "error writing base64 encoding: %s\n"
 +msgstr "error writing base64 encoding: %s\n"
 +
 +#: dirmngr/dirmngr-client.c:701
 +#, c-format
 +msgid "unsupported inquiry '%s'\n"
 +msgstr "unsupported inquiry ‘%s’\n"
 +
 +#: dirmngr/dirmngr-client.c:803
 +msgid "absolute file name expected\n"
 +msgstr "absolute file name expected\n"
 +
 +#: dirmngr/dirmngr-client.c:848
 +#, c-format
 +msgid "looking up '%s'\n"
 +msgstr "looking up ‘%s’\n"
 +
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:160
 +msgid "list the contents of the CRL cache"
 +msgstr "list the contents of the CRL cache"
 +
- #: dirmngr/dirmngr.c:158
++#: dirmngr/dirmngr.c:161
 +msgid "|FILE|load CRL from FILE into cache"
 +msgstr "|FILE|load CRL from FILE into cache"
 +
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:162
 +msgid "|URL|fetch a CRL from URL"
 +msgstr "|URL|fetch a CRL from URL"
 +
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:163
 +msgid "shutdown the dirmngr"
 +msgstr "shutdown the dirmngr"
 +
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:164
 +msgid "flush the cache"
 +msgstr "flush the cache"
 +
- #: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
- #: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
++#: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
 +msgid "|FILE|write server mode logs to FILE"
 +msgstr "|FILE|write server mode logs to FILE"
 +
- #: dirmngr/dirmngr.c:177
++#: dirmngr/dirmngr.c:180
 +msgid "run without asking a user"
 +msgstr "run without asking a user"
 +
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:181
 +msgid "force loading of outdated CRLs"
 +msgstr "force loading of outdated CRLs"
 +
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:182
 +msgid "allow sending OCSP requests"
 +msgstr "allow sending OCSP requests"
 +
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:184
 +msgid "allow online software version check"
 +msgstr "allow online software version check"
 +
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:185
 +msgid "inhibit the use of HTTP"
 +msgstr "inhibit the use of HTTP"
 +
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:186
 +msgid "inhibit the use of LDAP"
 +msgstr "inhibit the use of LDAP"
 +
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:188
 +msgid "ignore HTTP CRL distribution points"
 +msgstr "ignore HTTP CRL distribution points"
 +
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
 +msgid "ignore LDAP CRL distribution points"
 +msgstr "ignore LDAP CRL distribution points"
 +
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:192
 +msgid "ignore certificate contained OCSP service URLs"
 +msgstr "ignore certificate contained OCSP service URLs"
 +
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
 +msgid "|URL|redirect all HTTP requests to URL"
 +msgstr "|URL|redirect all HTTP requests to URL"
 +
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
 +msgid "|HOST|use HOST for LDAP queries"
 +msgstr "|HOST|use HOST for LDAP queries"
 +
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
 +msgid "do not use fallback hosts with --ldap-proxy"
 +msgstr "do not use fallback hosts with --ldap-proxy"
 +
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:202
 +msgid "|FILE|read LDAP server list from FILE"
 +msgstr "|FILE|read LDAP server list from FILE"
 +
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
 +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:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
 +msgid "|N|set LDAP timeout to N seconds"
 +msgstr "|N|set LDAP timeout to N seconds"
 +
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:210
 +msgid "|URL|use OCSP responder at URL"
 +msgstr "|URL|use OCSP responder at URL"
 +
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:212
 +msgid "|FPR|OCSP response signed by FPR"
 +msgstr "|FPR|OCSP response signed by FPR"
 +
- #: dirmngr/dirmngr.c:215
++#: 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:220
++#: dirmngr/dirmngr.c:223
 +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:222
++#: dirmngr/dirmngr.c:225
 +msgid "route all network traffic via Tor"
 +msgstr "route all network traffic via Tor"
 +
- #: dirmngr/dirmngr.c:240
++#: dirmngr/dirmngr.c:246
 +msgid ""
 +"@\n"
 +"(See the \"info\" manual for a complete listing of all commands and "
 +"options)\n"
 +msgstr ""
 +"@\n"
 +"(See the “info” manual for a complete listing of all commands and "
 +"options)\n"
 +
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:361
 +msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 +msgstr "Usage: @DIRMNGR@ [options] (-h for help)"
 +
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:363
 +msgid ""
 +"Syntax: @DIRMNGR@ [options] [command [args]]\n"
 +"Keyserver, CRL, and OCSP access for @GNUPG@\n"
 +msgstr ""
 +"Syntax: @DIRMNGR@ [options] [command [args]]\n"
 +"Keyserver, CRL, and OCSP access for @GNUPG@\n"
 +
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:443
 +#, c-format
 +msgid "valid debug levels are: %s\n"
 +msgstr "valid debug levels are: %s\n"
 +
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
- #: tools/gpgconf.c:648
++#: dirmngr/dirmngr.c:496 tools/gpgconf.c:550 tools/gpgconf.c:585
++#: tools/gpgconf.c:656
 +#, c-format
 +msgid "usage: %s [options] "
 +msgstr "usage: %s [options] "
 +
- #: dirmngr/dirmngr.c:1062
++#: dirmngr/dirmngr.c:1074
 +msgid "colons are not allowed in the socket name\n"
 +msgstr "colons are not allowed in the socket name\n"
 +
- #: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
++#: dirmngr/dirmngr.c:1300 dirmngr/server.c:1585
 +#, c-format
 +msgid "fetching CRL from '%s' failed: %s\n"
 +msgstr "fetching CRL from ‘%s’ failed: %s\n"
 +
- #: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
++#: dirmngr/dirmngr.c:1306 dirmngr/server.c:1591
 +#, c-format
 +msgid "processing CRL from '%s' failed: %s\n"
 +msgstr "processing CRL from ‘%s’ failed: %s\n"
 +
- #: dirmngr/dirmngr.c:1484
++#: dirmngr/dirmngr.c:1487
 +#, c-format
 +msgid "%s:%u: line too long - skipped\n"
 +msgstr "%s:%u: line too long - skipped\n"
 +
- #: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
++#: dirmngr/dirmngr.c:1542 dirmngr/dirmngr.c:1626
 +#, c-format
 +msgid "%s:%u: invalid fingerprint detected\n"
 +msgstr "%s:%u: invalid fingerprint detected\n"
 +
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
++#: dirmngr/dirmngr.c:1578 dirmngr/dirmngr.c:1604 tools/gpgconf-comp.c:4032
 +#, c-format
 +msgid "%s:%u: read error: %s\n"
 +msgstr "%s:%u: read error: %s\n"
 +
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1633
 +#, 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:1697
++#: dirmngr/dirmngr.c:1700
 +msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 +msgstr "SIGHUP received - re-reading configuration and flushing caches\n"
 +
- #: dirmngr/dirmngr.c:1734
++#: dirmngr/dirmngr.c:1738
 +msgid "SIGUSR2 received - no action defined\n"
 +msgstr "SIGUSR2 received - no action defined\n"
 +
- #: dirmngr/dirmngr.c:1739
++#: dirmngr/dirmngr.c:1743
 +msgid "SIGTERM received - shutting down ...\n"
 +msgstr "SIGTERM received - shutting down ...\n"
 +
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1745
 +#, c-format
 +msgid "SIGTERM received - still %d active connections\n"
 +msgstr "SIGTERM received - still %d active connections\n"
 +
- #: dirmngr/dirmngr.c:1746
++#: dirmngr/dirmngr.c:1750
 +msgid "shutdown forced\n"
 +msgstr "shutdown forced\n"
 +
- #: dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1758
 +msgid "SIGINT received - immediate shutdown\n"
 +msgstr "SIGINT received - immediate shutdown\n"
 +
- #: dirmngr/dirmngr.c:1761
++#: dirmngr/dirmngr.c:1765
 +#, c-format
 +msgid "signal %d received - no action defined\n"
 +msgstr "signal %d received - no action defined\n"
 +
 +#: dirmngr/dirmngr_ldap.c:138
 +msgid "return all values in a record oriented format"
 +msgstr "return all values in a record oriented format"
 +
 +#: dirmngr/dirmngr_ldap.c:141
 +msgid "|NAME|ignore host part and connect through NAME"
 +msgstr "|NAME|ignore host part and connect through NAME"
 +
 +#: dirmngr/dirmngr_ldap.c:142
 +msgid "|NAME|connect to host NAME"
 +msgstr "|NAME|connect to host NAME"
 +
 +#: dirmngr/dirmngr_ldap.c:143
 +msgid "|N|connect to port N"
 +msgstr "|N|connect to port N"
 +
 +#: dirmngr/dirmngr_ldap.c:144
 +msgid "|NAME|use user NAME for authentication"
 +msgstr "|NAME|use user NAME for authentication"
 +
 +#: dirmngr/dirmngr_ldap.c:145
 +msgid "|PASS|use password PASS for authentication"
 +msgstr "|PASS|use password PASS for authentication"
 +
 +#: dirmngr/dirmngr_ldap.c:147
 +msgid "take password from $DIRMNGR_LDAP_PASS"
 +msgstr "take password from $DIRMNGR_LDAP_PASS"
 +
 +#: dirmngr/dirmngr_ldap.c:148
 +msgid "|STRING|query DN STRING"
 +msgstr "|STRING|query DN STRING"
 +
 +#: dirmngr/dirmngr_ldap.c:149
 +msgid "|STRING|use STRING as filter expression"
 +msgstr "|STRING|use STRING as filter expression"
 +
 +#: dirmngr/dirmngr_ldap.c:150
 +msgid "|STRING|return the attribute STRING"
 +msgstr "|STRING|return the attribute STRING"
 +
 +#: dirmngr/dirmngr_ldap.c:209
 +msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 +msgstr "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 +
 +#: dirmngr/dirmngr_ldap.c:212
 +msgid ""
 +"Syntax: dirmngr_ldap [options] [URL]\n"
 +"Internal LDAP helper for Dirmngr\n"
 +"Interface and options may change without notice\n"
 +msgstr ""
 +"Syntax: dirmngr_ldap [options] [URL]\n"
 +"Internal LDAP helper for Dirmngr\n"
 +"Interface and options may change without notice\n"
 +
 +#: dirmngr/dirmngr_ldap.c:337
 +#, c-format
 +msgid "invalid port number %d\n"
 +msgstr "invalid port number %d\n"
 +
 +#: dirmngr/dirmngr_ldap.c:413
 +#, c-format
 +msgid "scanning result for attribute '%s'\n"
 +msgstr "scanning result for attribute ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:420 dirmngr/dirmngr_ldap.c:503
 +#: dirmngr/dirmngr_ldap.c:527 dirmngr/dirmngr_ldap.c:539
 +#: dirmngr/dirmngr_ldap.c:677
 +#, c-format
 +msgid "error writing to stdout: %s\n"
 +msgstr "error writing to stdout: %s\n"
 +
 +#: dirmngr/dirmngr_ldap.c:437
 +#, c-format
 +msgid "          available attribute '%s'\n"
 +msgstr "          available attribute ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:475
 +#, c-format
 +msgid "attribute '%s' not found\n"
 +msgstr "attribute ‘%s’ not found\n"
 +
 +#: dirmngr/dirmngr_ldap.c:482
 +#, c-format
 +msgid "found attribute '%s'\n"
 +msgstr "found attribute ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:591
 +#, c-format
 +msgid "processing url '%s'\n"
 +msgstr "processing url ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:593
 +#, c-format
 +msgid "          user '%s'\n"
 +msgstr "          user ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:595
 +#, c-format
 +msgid "          pass '%s'\n"
 +msgstr "          pass ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:597
 +#, c-format
 +msgid "          host '%s'\n"
 +msgstr "          host ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:598
 +#, c-format
 +msgid "          port %d\n"
 +msgstr "          port %d\n"
 +
 +#: dirmngr/dirmngr_ldap.c:600
 +#, c-format
 +msgid "            DN '%s'\n"
 +msgstr "            DN ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:602
 +#, c-format
 +msgid "        filter '%s'\n"
 +msgstr "        filter ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:607 dirmngr/dirmngr_ldap.c:610
 +#, c-format
 +msgid "          attr '%s'\n"
 +msgstr "          attr ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:616
 +#, c-format
 +msgid "no host name in '%s'\n"
 +msgstr "no host name in ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:621
 +#, c-format
 +msgid "no attribute given for query '%s'\n"
 +msgstr "no attribute given for query ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:627
 +msgid "WARNING: using first attribute only\n"
 +msgstr "WARNING: using first attribute only\n"
 +
 +#: dirmngr/dirmngr_ldap.c:636
 +#, c-format
 +msgid "LDAP init to '%s:%d' failed: %s\n"
 +msgstr "LDAP init to ‘%s:%d’ failed: %s\n"
 +
 +#: dirmngr/dirmngr_ldap.c:659
 +#, c-format
 +msgid "binding to '%s:%d' failed: %s\n"
 +msgstr "binding to ‘%s:%d’ failed: %s\n"
 +
 +#: dirmngr/dirmngr_ldap.c:686
 +#, c-format
 +msgid "searching '%s' failed: %s\n"
 +msgstr "searching ‘%s’ failed: %s\n"
 +
 +#: dirmngr/dirmngr_ldap.c:718
 +#, c-format
 +msgid "'%s' is not an LDAP URL\n"
 +msgstr "‘%s’ is not an LDAP URL\n"
 +
 +#: dirmngr/dirmngr_ldap.c:724
 +#, c-format
 +msgid "'%s' is an invalid LDAP URL\n"
 +msgstr "‘%s’ is an invalid LDAP URL\n"
 +
 +#: dirmngr/ldap-wrapper.c:207
 +#, c-format
 +msgid "error printing log line: %s\n"
 +msgstr "error printing log line: %s\n"
 +
 +#: dirmngr/ldap-wrapper.c:236
 +#, c-format
 +msgid "error reading log from ldap wrapper %d: %s\n"
 +msgstr "error reading log from ldap wrapper %d: %s\n"
 +
 +#: dirmngr/ldap-wrapper.c:304
 +#, c-format
 +msgid "npth_select failed: %s - waiting 1s\n"
 +msgstr "npth_select failed: %s - waiting 1s\n"
 +
 +#: dirmngr/ldap-wrapper.c:343
 +#, c-format
 +msgid "ldap wrapper %d ready"
 +msgstr "ldap wrapper %d ready"
 +
 +#: dirmngr/ldap-wrapper.c:352
 +#, c-format
 +msgid "ldap wrapper %d ready: timeout\n"
 +msgstr "ldap wrapper %d ready: timeout\n"
 +
 +#: dirmngr/ldap-wrapper.c:355
 +#, c-format
 +msgid "ldap wrapper %d ready: exitcode=%d\n"
 +msgstr "ldap wrapper %d ready: exitcode=%d\n"
 +
 +#: dirmngr/ldap-wrapper.c:364
 +#, c-format
 +msgid "waiting for ldap wrapper %d failed: %s\n"
 +msgstr "waiting for ldap wrapper %d failed: %s\n"
 +
 +#: dirmngr/ldap-wrapper.c:376
 +#, c-format
 +msgid "ldap wrapper %d stalled - killing\n"
 +msgstr "ldap wrapper %d stalled - killing\n"
 +
 +#: dirmngr/ldap-wrapper.c:444
 +#, c-format
 +msgid "error spawning ldap wrapper reaper thread: %s\n"
 +msgstr "error spawning ldap wrapper reaper thread: %s\n"
 +
 +#: dirmngr/ldap-wrapper.c:496 dirmngr/ldap-wrapper.c:517
 +#, c-format
 +msgid "reading from ldap wrapper %d failed: %s\n"
 +msgstr "reading from ldap wrapper %d failed: %s\n"
 +
 +#: dirmngr/ldap.c:91
 +#, c-format
 +msgid "invalid char 0x%02x in host name - not added\n"
 +msgstr "invalid char 0x%02x in host name - not added\n"
 +
 +#: dirmngr/ldap.c:95
 +#, c-format
 +msgid "adding '%s:%d' to the ldap server list\n"
 +msgstr "adding ‘%s:%d’ to the ldap server list\n"
 +
 +#: dirmngr/ldap.c:98 dirmngr/misc.c:502
 +#, c-format
 +msgid "malloc failed: %s\n"
 +msgstr "malloc failed: %s\n"
 +
 +#: dirmngr/ldap.c:627
 +#, c-format
 +msgid "start_cert_fetch: invalid pattern '%s'\n"
 +msgstr "start_cert_fetch: invalid pattern ‘%s’\n"
 +
 +#: dirmngr/ldap.c:840
 +msgid "ldap_search hit the size limit of the server\n"
 +msgstr "ldap_search hit the size limit of the server\n"
 +
 +#: dirmngr/misc.c:170
 +msgid "invalid canonical S-expression found\n"
 +msgstr "invalid canonical S-expression found\n"
 +
 +#: dirmngr/misc.c:194 dirmngr/misc.c:228
 +#, c-format
 +msgid "gcry_md_open failed: %s\n"
 +msgstr "gcry_md_open failed: %s\n"
 +
 +#: dirmngr/misc.c:199 dirmngr/misc.c:233
 +#, c-format
 +msgid "oops: ksba_cert_hash failed: %s\n"
 +msgstr "oops: ksba_cert_hash failed: %s\n"
 +
 +#: dirmngr/misc.c:518
 +msgid "bad URL encoding detected\n"
 +msgstr "bad URL encoding detected\n"
 +
 +#: dirmngr/ocsp.c:80
 +#, c-format
 +msgid "error reading from responder: %s\n"
 +msgstr "error reading from responder: %s\n"
 +
 +#: dirmngr/ocsp.c:98
 +#, c-format
 +msgid "response from server too large; limit is %d bytes\n"
 +msgstr "response from server too large; limit is %d bytes\n"
 +
 +#: dirmngr/ocsp.c:139
 +msgid "OCSP request not possible due to Tor mode\n"
 +msgstr "OCSP request not possible due to Tor mode\n"
 +
 +#: dirmngr/ocsp.c:145
 +msgid "OCSP request not possible due to disabled HTTP\n"
 +msgstr "OCSP request not possible due to disabled HTTP\n"
 +
 +#: dirmngr/ocsp.c:152
 +#, c-format
 +msgid "error setting OCSP target: %s\n"
 +msgstr "error setting OCSP target: %s\n"
 +
 +#: dirmngr/ocsp.c:170
 +#, c-format
 +msgid "error building OCSP request: %s\n"
 +msgstr "error building OCSP request: %s\n"
 +
 +#: dirmngr/ocsp.c:181
 +#, c-format
 +msgid "error connecting to '%s': %s\n"
 +msgstr "error connecting to '%s': %s\n"
 +
 +#: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
 +#, c-format
 +msgid "error reading HTTP response for '%s': %s\n"
 +msgstr "error reading HTTP response for '%s': %s\n"
 +
 +#: dirmngr/ocsp.c:240
 +#, c-format
 +msgid "error accessing '%s': http status %u\n"
 +msgstr "error accessing '%s': http status %u\n"
 +
 +#: dirmngr/ocsp.c:265
 +#, c-format
 +msgid "error parsing OCSP response for '%s': %s\n"
 +msgstr "error parsing OCSP response for '%s': %s\n"
 +
 +#: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
 +#, c-format
 +msgid "OCSP responder at '%s' status: %s\n"
 +msgstr "OCSP responder at ‘%s’ status: %s\n"
 +
 +#: dirmngr/ocsp.c:293
 +#, c-format
 +msgid "hashing the OCSP response for '%s' failed: %s\n"
 +msgstr "hashing the OCSP response for ‘%s’ failed: %s\n"
 +
 +#: dirmngr/ocsp.c:328
 +msgid "not signed by a default OCSP signer's certificate"
 +msgstr "not signed by a default OCSP signer's certificate"
 +
 +#: dirmngr/ocsp.c:413
 +msgid "only SHA-1 is supported for OCSP responses\n"
 +msgstr "only SHA-1 is supported for OCSP responses\n"
 +
 +#: dirmngr/ocsp.c:464
 +#, c-format
 +msgid "allocating list item failed: %s\n"
 +msgstr "allocating list item failed: %s\n"
 +
 +#: dirmngr/ocsp.c:479
 +#, c-format
 +msgid "error getting responder ID: %s\n"
 +msgstr "error getting responder ID: %s\n"
 +
 +#: dirmngr/ocsp.c:514
 +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:553 dirmngr/validate.c:619
 +#, c-format
 +msgid "issuer certificate not found: %s\n"
 +msgstr "issuer certificate not found: %s\n"
 +
 +#: dirmngr/ocsp.c:563
 +msgid "caller did not return the target certificate\n"
 +msgstr "caller did not return the target certificate\n"
 +
 +#: dirmngr/ocsp.c:570
 +msgid "caller did not return the issuing certificate\n"
 +msgstr "caller did not return the issuing certificate\n"
 +
 +#: dirmngr/ocsp.c:580
 +#, c-format
 +msgid "failed to allocate OCSP context: %s\n"
 +msgstr "failed to allocate OCSP context: %s\n"
 +
 +#: dirmngr/ocsp.c:614
 +#, c-format
 +msgid "can't get authorityInfoAccess: %s\n"
 +msgstr "can't get authorityInfoAccess: %s\n"
 +
 +#: dirmngr/ocsp.c:621
 +msgid "no default OCSP responder defined\n"
 +msgstr "no default OCSP responder defined\n"
 +
 +#: dirmngr/ocsp.c:627
 +msgid "no default OCSP signer defined\n"
 +msgstr "no default OCSP signer defined\n"
 +
 +#: dirmngr/ocsp.c:634
 +#, c-format
 +msgid "using default OCSP responder '%s'\n"
 +msgstr "using default OCSP responder ‘%s’\n"
 +
 +#: dirmngr/ocsp.c:639
 +#, c-format
 +msgid "using OCSP responder '%s'\n"
 +msgstr "using OCSP responder ‘%s’\n"
 +
 +#: dirmngr/ocsp.c:646
 +#, c-format
 +msgid "failed to establish a hashing context for OCSP: %s\n"
 +msgstr "failed to establish a hashing context for OCSP: %s\n"
 +
 +#: dirmngr/ocsp.c:676
 +#, 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:701
 +#, 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:702
 +msgid "good"
 +msgstr "good"
 +
 +#: dirmngr/ocsp.c:708
 +#, 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:743
 +msgid "OCSP responder returned a status in the future\n"
 +msgstr "OCSP responder returned a status in the future\n"
 +
 +#: dirmngr/ocsp.c:755
 +msgid "OCSP responder returned a non-current status\n"
 +msgstr "OCSP responder returned a non-current status\n"
 +
 +#: dirmngr/ocsp.c:770
 +msgid "OCSP responder returned an too old status\n"
 +msgstr "OCSP responder returned an too old status\n"
 +
 +#: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
 +#, c-format
 +msgid "assuan_inquire(%s) failed: %s\n"
 +msgstr "assuan_inquire(%s) failed: %s\n"
 +
 +#: dirmngr/server.c:938
 +msgid "ldapserver missing"
 +msgstr "ldapserver missing"
 +
 +#: dirmngr/server.c:1012
 +msgid "serialno missing in cert ID"
 +msgstr "serialno missing in cert ID"
 +
 +#: dirmngr/server.c:1148 dirmngr/server.c:1234 dirmngr/server.c:1670
 +#: dirmngr/server.c:1721 dirmngr/server.c:2213 dirmngr/server.c:2229
 +#, c-format
 +msgid "assuan_inquire failed: %s\n"
 +msgstr "assuan_inquire failed: %s\n"
 +
 +#: dirmngr/server.c:1277
 +#, c-format
 +msgid "fetch_cert_by_url failed: %s\n"
 +msgstr "fetch_cert_by_url failed: %s\n"
 +
 +#: dirmngr/server.c:1289 dirmngr/server.c:1320 dirmngr/server.c:1479
 +#, c-format
 +msgid "error sending data: %s\n"
 +msgstr "error sending data: %s\n"
 +
 +#: dirmngr/server.c:1427
 +#, c-format
 +msgid "start_cert_fetch failed: %s\n"
 +msgstr "start_cert_fetch failed: %s\n"
 +
 +#: dirmngr/server.c:1460
 +#, c-format
 +msgid "fetch_next_cert failed: %s\n"
 +msgstr "fetch_next_cert failed: %s\n"
 +
 +#: dirmngr/server.c:1487
 +#, c-format
 +msgid "max_replies %d exceeded\n"
 +msgstr "max_replies %d exceeded\n"
 +
- #: dirmngr/server.c:2463
++#: dirmngr/server.c:2469
 +#, c-format
 +msgid "can't allocate control structure: %s\n"
 +msgstr "can't allocate control structure: %s\n"
 +
- #: dirmngr/server.c:2474
++#: dirmngr/server.c:2480
 +#, c-format
 +msgid "failed to allocate assuan context: %s\n"
 +msgstr "failed to allocate assuan context: %s\n"
 +
- #: dirmngr/server.c:2495
++#: dirmngr/server.c:2501
 +#, c-format
 +msgid "failed to initialize the server: %s\n"
 +msgstr "failed to initialize the server: %s\n"
 +
- #: dirmngr/server.c:2503
++#: dirmngr/server.c:2509
 +#, 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:2534
++#: dirmngr/server.c:2540
 +#, c-format
 +msgid "Assuan accept problem: %s\n"
 +msgstr "Assuan accept problem: %s\n"
 +
- #: dirmngr/server.c:2553
++#: dirmngr/server.c:2559
 +#, c-format
 +msgid "Assuan processing failed: %s\n"
 +msgstr "Assuan processing failed: %s\n"
 +
 +#: dirmngr/validate.c:201
 +msgid "accepting root CA not marked as a CA"
 +msgstr "accepting root CA not marked as a CA"
 +
 +#: dirmngr/validate.c:227
 +msgid "CRL checking too deeply nested\n"
 +msgstr "CRL checking too deeply nested\n"
 +
 +#: dirmngr/validate.c:245
 +msgid "not checking CRL for"
 +msgstr "not checking CRL for"
 +
 +#: dirmngr/validate.c:250
 +msgid "checking CRL for"
 +msgstr "checking CRL for"
 +
 +#: dirmngr/validate.c:528
 +msgid "selfsigned certificate has a BAD signature"
 +msgstr "selfsigned certificate has a BAD signature"
 +
 +#: dirmngr/validate.c:561
 +#, c-format
 +msgid "checking trustworthiness of root certificate failed: %s\n"
 +msgstr "checking trustworthiness of root certificate failed: %s\n"
 +
 +#: dirmngr/validate.c:738
 +msgid "certificate chain is good\n"
 +msgstr "certificate chain is good\n"
 +
 +#: dirmngr/validate.c:968
 +msgid "DSA requires the use of a 160 bit hash algorithm\n"
 +msgstr "DSA requires the use of a 160 bit hash algorithm\n"
 +
 +#: dirmngr/validate.c:1116
 +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:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:167
 +msgid "quiet"
 +msgstr "quiet"
 +
 +#: tools/gpg-connect-agent.c:79
 +msgid "print data out hex encoded"
 +msgstr "print data out hex encoded"
 +
 +#: tools/gpg-connect-agent.c:80
 +msgid "decode received data lines"
 +msgstr "decode received data lines"
 +
 +#: tools/gpg-connect-agent.c:81
 +msgid "connect to the dirmngr"
 +msgstr "connect to the dirmngr"
 +
 +#: tools/gpg-connect-agent.c:84
 +msgid "|NAME|connect to Assuan socket NAME"
 +msgstr "|NAME|connect to Assuan socket NAME"
 +
 +#: tools/gpg-connect-agent.c:86
 +msgid "|ADDR|connect to Assuan server at ADDR"
 +msgstr "|ADDR|connect to Assuan server at ADDR"
 +
 +#: tools/gpg-connect-agent.c:88
 +msgid "run the Assuan server given on the command line"
 +msgstr "run the Assuan server given on the command line"
 +
 +#: tools/gpg-connect-agent.c:90
 +msgid "do not use extended connect mode"
 +msgstr "do not use extended connect mode"
 +
 +#: tools/gpg-connect-agent.c:92
 +msgid "|FILE|run commands from FILE on startup"
 +msgstr "|FILE|run commands from FILE on startup"
 +
 +#: tools/gpg-connect-agent.c:93
 +msgid "run /subst on startup"
 +msgstr "run /subst on startup"
 +
 +#: tools/gpg-connect-agent.c:205
 +msgid "Usage: @GPG at -connect-agent [options] (-h for help)"
 +msgstr "Usage: @GPG at -connect-agent [options] (-h for help)"
 +
 +#: tools/gpg-connect-agent.c:208
 +msgid ""
 +"Syntax: @GPG at -connect-agent [options]\n"
 +"Connect to a running agent and send commands\n"
 +msgstr ""
 +"Syntax: @GPG at -connect-agent [options]\n"
 +"Connect to a running agent and send commands\n"
 +
 +#: tools/gpg-connect-agent.c:1247
 +#, c-format
 +msgid "option \"%s\" requires a program and optional arguments\n"
 +msgstr "option “%s” requires a program and optional arguments\n"
 +
 +#: tools/gpg-connect-agent.c:1258 tools/gpg-connect-agent.c:1264
 +#: tools/gpg-connect-agent.c:1270
 +#, c-format
 +msgid "option \"%s\" ignored due to \"%s\"\n"
 +msgstr "option “%s” ignored due to “%s”\n"
 +
 +#: tools/gpg-connect-agent.c:1368 tools/gpg-connect-agent.c:1863
 +#, c-format
 +msgid "receiving line failed: %s\n"
 +msgstr "receiving line failed: %s\n"
 +
 +#: tools/gpg-connect-agent.c:1458
 +msgid "line too long - skipped\n"
 +msgstr "line too long - skipped\n"
 +
 +#: tools/gpg-connect-agent.c:1462
 +msgid "line shortened due to embedded Nul character\n"
 +msgstr "line shortened due to embedded Nul character\n"
 +
 +#: tools/gpg-connect-agent.c:1837
 +#, c-format
 +msgid "unknown command '%s'\n"
 +msgstr "unknown command ‘%s’\n"
 +
 +#: tools/gpg-connect-agent.c:1855
 +#, c-format
 +msgid "sending line failed: %s\n"
 +msgstr "sending line failed: %s\n"
 +
 +#: tools/gpg-connect-agent.c:2251
 +#, c-format
 +msgid "error sending standard options: %s\n"
 +msgstr "error sending standard options: %s\n"
 +
 +#: tools/gpgconf-comp.c:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
- #: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
++#: tools/gpgconf-comp.c:766 tools/gpgconf-comp.c:865
 +msgid "Options controlling the diagnostic output"
 +msgstr "Options controlling the diagnostic output"
 +
 +#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
- #: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
++#: tools/gpgconf-comp.c:779 tools/gpgconf-comp.c:888
 +msgid "Options controlling the configuration"
 +msgstr "Options controlling the configuration"
 +
- #: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
- #: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
++#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:723
++#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:901
 +msgid "Options useful for debugging"
 +msgstr "Options useful for debugging"
 +
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
 +msgid "Options controlling the security"
 +msgstr "Options controlling the security"
 +
 +#: tools/gpgconf-comp.c:528
 +msgid "|N|expire SSH keys after N seconds"
 +msgstr "|N|expire SSH keys after N seconds"
 +
 +#: tools/gpgconf-comp.c:532
 +msgid "|N|set maximum PIN cache lifetime to N seconds"
 +msgstr "|N|set maximum PIN cache lifetime to N seconds"
 +
 +#: tools/gpgconf-comp.c:536
 +msgid "|N|set maximum SSH key lifetime to N seconds"
 +msgstr "|N|set maximum SSH key lifetime to N seconds"
 +
 +#: tools/gpgconf-comp.c:560
 +msgid "Options enforcing a passphrase policy"
 +msgstr "Options enforcing a passphrase policy"
 +
 +#: tools/gpgconf-comp.c:563
 +msgid "do not allow bypassing the passphrase policy"
 +msgstr "do not allow bypassing the passphrase policy"
 +
 +#: tools/gpgconf-comp.c:567
 +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:571
 +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:575
 +msgid "|FILE|check new passphrases against pattern in FILE"
 +msgstr "|FILE|check new passphrases against pattern in FILE"
 +
 +#: tools/gpgconf-comp.c:579
 +msgid "|N|expire the passphrase after N days"
 +msgstr "|N|expire the passphrase after N days"
 +
 +#: tools/gpgconf-comp.c:583
 +msgid "do not allow the reuse of old passphrases"
 +msgstr "do not allow the reuse of old passphrases"
 +
 +#: tools/gpgconf-comp.c:587
 +msgid "|N|set the Pinentry timeout to N seconds"
 +msgstr "|N|set the Pinentry timeout to N seconds"
 +
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
++#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
 +msgid "|NAME|use NAME as default secret key"
 +msgstr "|NAME|use NAME as default secret key"
 +
- #: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
++#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:784
 +msgid "|NAME|encrypt to user ID NAME as well"
 +msgstr "|NAME|encrypt to user ID NAME as well"
 +
 +#: tools/gpgconf-comp.c:704
 +msgid "|SPEC|set up email aliases"
 +msgstr "|SPEC|set up email aliases"
 +
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
++#: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
 +msgid "Configuration for Keyservers"
 +msgstr "Configuration for Keyservers"
 +
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
++#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
 +msgid "|URL|use keyserver at URL"
 +msgstr "|URL|use keyserver at URL"
 +
- #: tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:741
 +msgid "allow PKA lookups (DNS requests)"
 +msgstr "allow PKA lookups (DNS requests)"
 +
- #: tools/gpgconf-comp.c:738
++#: tools/gpgconf-comp.c:744
 +msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 +msgstr "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 +
- #: tools/gpgconf-comp.c:787
++#: tools/gpgconf-comp.c:793
 +msgid "disable all access to the dirmngr"
 +msgstr "disable all access to the dirmngr"
 +
- #: tools/gpgconf-comp.c:790
++#: tools/gpgconf-comp.c:796
 +msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 +msgstr "|NAME|use encoding NAME for PKCS#12 passphrases"
 +
- #: tools/gpgconf-comp.c:820
++#: tools/gpgconf-comp.c:829
 +msgid "do not check CRLs for root certificates"
 +msgstr "do not check CRLs for root certificates"
 +
- #: tools/gpgconf-comp.c:869
++#: tools/gpgconf-comp.c:878
 +msgid "Options controlling the format of the output"
 +msgstr "Options controlling the format of the output"
 +
- #: tools/gpgconf-comp.c:905
++#: tools/gpgconf-comp.c:920
 +msgid "Options controlling the interactivity and enforcement"
 +msgstr "Options controlling the interactivity and enforcement"
 +
- #: tools/gpgconf-comp.c:918
++#: tools/gpgconf-comp.c:933
 +msgid "Options controlling the use of Tor"
 +msgstr "Options controlling the use of Tor"
 +
- #: tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:947
 +msgid "Configuration for HTTP servers"
 +msgstr "Configuration for HTTP servers"
 +
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:958
 +msgid "use system's HTTP proxy setting"
 +msgstr "use system's HTTP proxy setting"
 +
- #: tools/gpgconf-comp.c:948
++#: tools/gpgconf-comp.c:963
 +msgid "Configuration of LDAP servers to use"
 +msgstr "Configuration of LDAP servers to use"
 +
- #: tools/gpgconf-comp.c:977
++#: tools/gpgconf-comp.c:992
 +msgid "LDAP server list"
 +msgstr "LDAP server list"
 +
- #: tools/gpgconf-comp.c:985
++#: tools/gpgconf-comp.c:1000
 +msgid "Configuration for OCSP"
 +msgstr "Configuration for OCSP"
 +
- #: tools/gpgconf-comp.c:1066
++#: tools/gpgconf-comp.c:1081
 +msgid "OpenPGP"
 +msgstr "OpenPGP"
 +
- #: tools/gpgconf-comp.c:1067
++#: tools/gpgconf-comp.c:1082
 +msgid "Private Keys"
 +msgstr "Private Keys"
 +
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1083
 +msgid "Smartcards"
 +msgstr "Smartcards"
 +
- #: tools/gpgconf-comp.c:1069
++#: tools/gpgconf-comp.c:1084
 +msgid "S/MIME"
 +msgstr "S/MIME"
 +
- #: tools/gpgconf-comp.c:1070
++#: tools/gpgconf-comp.c:1085
 +msgid "Network"
 +msgstr "Network"
 +
- #: tools/gpgconf-comp.c:1071
++#: tools/gpgconf-comp.c:1086
 +msgid "Passphrase Entry"
 +msgstr "Passphrase Entry"
 +
- #: tools/gpgconf-comp.c:1225
++#: tools/gpgconf-comp.c:1240
 +msgid "Component not suitable for launching"
 +msgstr "Component not suitable for launching"
 +
- #: tools/gpgconf-comp.c:3283
++#: tools/gpgconf-comp.c:3311
 +#, c-format
 +msgid "External verification of component %s failed"
 +msgstr "External verification of component %s failed"
 +
- #: tools/gpgconf-comp.c:3434
++#: tools/gpgconf-comp.c:3462
 +msgid "Note that group specifications are ignored\n"
 +msgstr "Note that group specifications are ignored\n"
 +
- #: tools/gpgconf.c:71
++#: tools/gpgconf-comp.c:4036
++#, c-format
++msgid "error closing '%s'\n"
++msgstr "error closing ‘%s’\n"
++
++#: tools/gpgconf-comp.c:4038
++#, c-format
++msgid "error parsing '%s'\n"
++msgstr "error parsing ‘%s’\n"
++
++#: tools/gpgconf.c:73
 +msgid "list all components"
 +msgstr "list all components"
 +
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
 +msgid "check all programs"
 +msgstr "check all programs"
 +
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
 +msgid "|COMPONENT|list options"
 +msgstr "|COMPONENT|list options"
 +
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
 +msgid "|COMPONENT|change options"
 +msgstr "|COMPONENT|change options"
 +
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
 +msgid "|COMPONENT|check options"
 +msgstr "|COMPONENT|check options"
 +
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
 +msgid "apply global default values"
 +msgstr "apply global default values"
 +
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
++msgid "|FILE|update configuration files using FILE"
++msgstr "|FILE|update configuration files using FILE"
++
++#: tools/gpgconf.c:83
 +msgid "get the configuration directories for @GPGCONF@"
 +msgstr "get the configuration directories for @GPGCONF@"
 +
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:85
 +msgid "list global configuration file"
 +msgstr "list global configuration file"
 +
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
 +msgid "check global configuration file"
 +msgstr "check global configuration file"
 +
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:89
 +msgid "query the software version database"
 +msgstr "query the software version database"
 +
- #: tools/gpgconf.c:86
++#: tools/gpgconf.c:90
 +msgid "reload all or a given component"
 +msgstr "reload all or a given component"
 +
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:91
 +msgid "launch a given component"
 +msgstr "launch a given component"
 +
- #: tools/gpgconf.c:88
++#: tools/gpgconf.c:92
 +msgid "kill a given component"
 +msgstr "kill a given component"
 +
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
 +msgid "use as output file"
 +msgstr "use as output file"
 +
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:102
 +msgid "activate changes at runtime, if possible"
 +msgstr "activate changes at runtime, if possible"
 +
- #: tools/gpgconf.c:122
++#: tools/gpgconf.c:127
 +msgid "Usage: @GPGCONF@ [options] (-h for help)"
 +msgstr "Usage: @GPGCONF@ [options] (-h for help)"
 +
- #: tools/gpgconf.c:125
++#: tools/gpgconf.c:130
 +msgid ""
 +"Syntax: @GPGCONF@ [options]\n"
 +"Manage configuration options for tools of the @GNUPG@ system\n"
 +msgstr ""
 +"Syntax: @GPGCONF@ [options]\n"
 +"Manage configuration options for tools of the @GNUPG@ system\n"
 +
- #: tools/gpgconf.c:545 tools/gpgconf.c:579
++#: tools/gpgconf.c:552 tools/gpgconf.c:587
 +msgid "Need one component argument"
 +msgstr "Need one component argument"
 +
- #: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
++#: tools/gpgconf.c:561 tools/gpgconf.c:599 tools/gpgconf.c:632
 +msgid "Component not found"
 +msgstr "Component not found"
 +
- #: tools/gpgconf.c:650
++#: tools/gpgconf.c:658
 +msgid "No argument allowed"
 +msgstr "No argument allowed"
 +
 +#: tools/symcryptrun.c:154
 +msgid ""
 +"@\n"
 +"Commands:\n"
 +" "
 +msgstr ""
 +"@\n"
 +"Commands:\n"
 +" "
 +
 +#: tools/symcryptrun.c:156
 +msgid "decryption modus"
 +msgstr "decryption modus"
 +
 +#: tools/symcryptrun.c:157
 +msgid "encryption modus"
 +msgstr "encryption modus"
 +
 +#: tools/symcryptrun.c:161
 +msgid "tool class (confucius)"
 +msgstr "tool class (confucius)"
 +
 +#: tools/symcryptrun.c:162
 +msgid "program filename"
 +msgstr "program filename"
 +
 +#: tools/symcryptrun.c:164
 +msgid "secret key file (required)"
 +msgstr "secret key file (required)"
 +
 +#: tools/symcryptrun.c:165
 +msgid "input file name (default stdin)"
 +msgstr "input file name (default stdin)"
 +
 +#: tools/symcryptrun.c:209
 +msgid "Usage: symcryptrun [options] (-h for help)"
 +msgstr "Usage: symcryptrun [options] (-h for help)"
 +
 +#: tools/symcryptrun.c:212
 +msgid ""
 +"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 +"[options...] COMMAND [inputfile]\n"
 +"Call a simple symmetric encryption tool\n"
 +msgstr ""
 +"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 +"[options...] COMMAND [inputfile]\n"
 +"Call a simple symmetric encryption tool\n"
 +
 +#: tools/symcryptrun.c:278
 +#, c-format
 +msgid "%s on %s aborted with status %i\n"
 +msgstr "%s on %s aborted with status %i\n"
 +
 +#: tools/symcryptrun.c:285
 +#, c-format
 +msgid "%s on %s failed with status %i\n"
 +msgstr "%s on %s failed with status %i\n"
 +
 +#: tools/symcryptrun.c:317
 +#, c-format
 +msgid "can't create temporary directory '%s': %s\n"
 +msgstr "can't create temporary directory '%s': %s\n"
 +
 +#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
 +#, c-format
 +msgid "could not open %s for writing: %s\n"
 +msgstr "could not open %s for writing: %s\n"
 +
 +#: tools/symcryptrun.c:385
 +#, c-format
 +msgid "error writing to %s: %s\n"
 +msgstr "error writing to %s: %s\n"
 +
 +#: tools/symcryptrun.c:392
 +#, c-format
 +msgid "error reading from %s: %s\n"
 +msgstr "error reading from %s: %s\n"
 +
 +#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
 +#, c-format
 +msgid "error closing %s: %s\n"
 +msgstr "error closing %s: %s\n"
 +
 +#: tools/symcryptrun.c:490
 +msgid "no --program option provided\n"
 +msgstr "no --program option provided\n"
 +
 +#: tools/symcryptrun.c:496
 +msgid "only --decrypt and --encrypt are supported\n"
 +msgstr "only --decrypt and --encrypt are supported\n"
 +
 +#: tools/symcryptrun.c:502
 +msgid "no --keyfile option provided\n"
 +msgstr "no --keyfile option provided\n"
 +
 +#: tools/symcryptrun.c:513
 +msgid "cannot allocate args vector\n"
 +msgstr "cannot allocate args vector\n"
 +
 +#: tools/symcryptrun.c:531
 +#, c-format
 +msgid "could not create pipe: %s\n"
 +msgstr "could not create pipe: %s\n"
 +
 +#: tools/symcryptrun.c:538
 +#, c-format
 +msgid "could not create pty: %s\n"
 +msgstr "could not create pty: %s\n"
 +
 +#: tools/symcryptrun.c:554
 +#, c-format
 +msgid "could not fork: %s\n"
 +msgstr "could not fork: %s\n"
 +
 +#: tools/symcryptrun.c:582
 +#, c-format
 +msgid "execv failed: %s\n"
 +msgstr "execv failed: %s\n"
 +
 +#: tools/symcryptrun.c:611
 +#, c-format
 +msgid "select failed: %s\n"
 +msgstr "select failed: %s\n"
 +
 +#: tools/symcryptrun.c:628
 +#, c-format
 +msgid "read failed: %s\n"
 +msgstr "read failed: %s\n"
 +
 +#: tools/symcryptrun.c:680
 +#, c-format
 +msgid "pty read failed: %s\n"
 +msgstr "pty read failed: %s\n"
 +
 +#: tools/symcryptrun.c:732
 +#, c-format
 +msgid "waitpid failed: %s\n"
 +msgstr "waitpid failed: %s\n"
 +
 +#: tools/symcryptrun.c:746
 +#, c-format
 +msgid "child aborted with status %i\n"
 +msgstr "child aborted with status %i\n"
 +
 +#: tools/symcryptrun.c:801
 +#, c-format
 +msgid "cannot allocate infile string: %s\n"
 +msgstr "cannot allocate infile string: %s\n"
 +
 +#: tools/symcryptrun.c:814
 +#, c-format
 +msgid "cannot allocate outfile string: %s\n"
 +msgstr "cannot allocate outfile string: %s\n"
 +
 +#: tools/symcryptrun.c:987
 +#, c-format
 +msgid "either %s or %s must be given\n"
 +msgstr "either %s or %s must be given\n"
 +
 +#: tools/symcryptrun.c:1009
 +msgid "no class provided\n"
 +msgstr "no class provided\n"
 +
 +#: tools/symcryptrun.c:1018
 +#, c-format
 +msgid "class %s is not supported\n"
 +msgstr "class %s is not supported\n"
 +
 +#: tools/gpg-check-pattern.c:144
 +msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
 +msgstr "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
 +
 +#: tools/gpg-check-pattern.c:147
 +msgid ""
 +"Syntax: gpg-check-pattern [options] patternfile\n"
 +"Check a passphrase given on stdin against the patternfile\n"
 +msgstr ""
 +"Syntax: gpg-check-pattern [options] patternfile\n"
 +"Check a passphrase given on stdin against the patternfile\n"
diff --cc po/en at quot.po
index a11fd60,0000000..c71df10
mode 100644,000000..100644
--- a/po/en at quot.po
+++ b/po/en at quot.po
@@@ -1,10622 -1,0 +1,10656 @@@
 +# English translations for GNU gnupg package.
 +# Copyright (C) 2016 Free Software Foundation, Inc.
 +# This file is distributed under the same license as the GNU gnupg package.
 +# Automatically generated, 2016.
 +#
 +# All this catalog "translates" are quotation characters.
 +# The msgids must be ASCII and therefore cannot contain real quotation
 +# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
 +# and double quote (0x22). These substitutes look strange; see
 +# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
 +#
 +# This catalog translates grave accent (0x60) and apostrophe (0x27) to
 +# left single quotation mark (U+2018) and right single quotation mark (U+2019).
 +# It also translates pairs of apostrophe (0x27) to
 +# left single quotation mark (U+2018) and right single quotation mark (U+2019)
 +# and pairs of quotation mark (0x22) to
 +# left double quotation mark (U+201C) and right double quotation mark (U+201D).
 +#
 +# When output to an UTF-8 terminal, the quotation characters appear perfectly.
 +# When output to an ISO-8859-1 terminal, the single quotation marks are
 +# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
 +# grave/acute accent (by libiconv), and the double quotation marks are
 +# transliterated to 0x22.
 +# When output to an ASCII terminal, the single quotation marks are
 +# transliterated to apostrophes, and the double quotation marks are
 +# transliterated to 0x22.
 +#
 +msgid ""
 +msgstr ""
- "Project-Id-Version: GNU gnupg 2.1.16\n"
++"Project-Id-Version: GNU gnupg 2.1.17\n"
 +"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-11-18 16:54+0100\n"
- "PO-Revision-Date: 2016-11-18 16:54+0100\n"
++"POT-Creation-Date: 2016-12-20 11:28+0100\n"
++"PO-Revision-Date: 2016-12-20 11:28+0100\n"
 +"Last-Translator: Automatically generated\n"
 +"Language-Team: none\n"
 +"Language: en\n"
 +"MIME-Version: 1.0\n"
 +"Content-Type: text/plain; charset=UTF-8\n"
 +"Content-Transfer-Encoding: 8bit\n"
 +"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 +
 +#: agent/call-pinentry.c:259
 +#, c-format
 +msgid "failed to acquire the pinentry lock: %s\n"
 +msgstr "failed to acquire the pinentry lock: %s\n"
 +
 +#. TRANSLATORS: These are labels for buttons etc used in
 +#. Pinentries.  An underscore indicates that the next letter
 +#. should be used as an accelerator.  Double the underscore for
 +#. a literal one.  The actual to be translated text starts after
 +#. the second vertical bar.  Note that gpg-agent has been set to
 +#. utf-8 so that the strings are in the expected encoding.
 +#: agent/call-pinentry.c:462
 +msgid "|pinentry-label|_OK"
 +msgstr "|pinentry-label|_OK"
 +
 +#: agent/call-pinentry.c:463
 +msgid "|pinentry-label|_Cancel"
 +msgstr "|pinentry-label|_Cancel"
 +
 +#: agent/call-pinentry.c:464
 +msgid "|pinentry-label|_Yes"
 +msgstr "|pinentry-label|_Yes"
 +
 +#: agent/call-pinentry.c:465
 +msgid "|pinentry-label|_No"
 +msgstr "|pinentry-label|_No"
 +
 +#: agent/call-pinentry.c:466
 +msgid "|pinentry-label|PIN:"
 +msgstr "|pinentry-label|PIN:"
 +
 +#: agent/call-pinentry.c:467
 +msgid "|pinentry-label|_Save in password manager"
 +msgstr "|pinentry-label|_Save in password manager"
 +
 +#: agent/call-pinentry.c:468
 +msgid "Do you really want to make your passphrase visible on the screen?"
 +msgstr "Do you really want to make your passphrase visible on the screen?"
 +
 +#: agent/call-pinentry.c:470
 +msgid "|pinentry-tt|Make passphrase visible"
 +msgstr "|pinentry-tt|Make passphrase visible"
 +
 +#: agent/call-pinentry.c:471
 +msgid "|pinentry-tt|Hide passphrase"
 +msgstr "|pinentry-tt|Hide passphrase"
 +
 +#. TRANSLATORS: This string is displayed by Pinentry as the label
 +#. for the quality bar.
 +#: agent/call-pinentry.c:772
 +msgid "Quality:"
 +msgstr "Quality:"
 +
 +#. TRANSLATORS: This string is a tooltip, shown by pinentry when
 +#. hovering over the quality bar.  Please use an appropriate
 +#. string to describe what this is about.  The length of the
 +#. tooltip is limited to about 900 characters.  If you do not
 +#. translate this entry, a default english text (see source)
 +#. will be used.
 +#: agent/call-pinentry.c:793
 +msgid "pinentry.qualitybar.tooltip"
 +msgstr "pinentry.qualitybar.tooltip"
 +
 +#: agent/call-pinentry.c:902
 +msgid ""
 +"Please enter your PIN, so that the secret key can be unlocked for this "
 +"session"
 +msgstr ""
 +"Please enter your PIN, so that the secret key can be unlocked for this "
 +"session"
 +
 +#: agent/call-pinentry.c:905
 +msgid ""
 +"Please enter your passphrase, so that the secret key can be unlocked for "
 +"this session"
 +msgstr ""
 +"Please enter your passphrase, so that the secret key can be unlocked for "
 +"this session"
 +
 +#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
 +msgid "PIN:"
 +msgstr "PIN:"
 +
 +#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
 +msgid "Passphrase:"
 +msgstr "Passphrase:"
 +
 +#: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
 +msgid "does not match - try again"
 +msgstr "does not match - try again"
 +
 +#. TRANSLATORS: The string is appended to an error message in
 +#. the pinentry.  The %s is the actual error message, the
 +#. two %d give the current and maximum number of tries.
 +#: agent/call-pinentry.c:989
 +#, c-format
 +msgid "SETERROR %s (try %d of %d)"
 +msgstr "SETERROR %s (try %d of %d)"
 +
 +#: agent/call-pinentry.c:1000
 +msgid "Repeat:"
 +msgstr "Repeat:"
 +
 +#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
 +msgid "PIN too long"
 +msgstr "PIN too long"
 +
 +#: agent/call-pinentry.c:1030
 +msgid "Passphrase too long"
 +msgstr "Passphrase too long"
 +
 +#: agent/call-pinentry.c:1038
 +msgid "Invalid characters in PIN"
 +msgstr "Invalid characters in PIN"
 +
 +#: agent/call-pinentry.c:1043
 +msgid "PIN too short"
 +msgstr "PIN too short"
 +
 +#: agent/call-pinentry.c:1056
 +msgid "Bad PIN"
 +msgstr "Bad PIN"
 +
 +#: agent/call-pinentry.c:1056
 +msgid "Bad Passphrase"
 +msgstr "Bad Passphrase"
 +
 +#: agent/command-ssh.c:635 agent/command-ssh.c:730
 +#, 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:838 common/dotlock.c:839 g10/card-util.c:839
- #: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1306 g10/keygen.c:4577
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
++#: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
 +#, c-format
 +msgid "can't create '%s': %s\n"
 +msgstr "can't create '%s': %s\n"
 +
 +#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
- #: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1307
++#: g10/import.c:305 g10/import.c:448 g10/import.c:621 g10/keygen.c:3681
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
- #: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
- #: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:825 g10/sign.c:1025
++#: g10/sign.c:1130 g10/sign.c:1275 g10/tdbdump.c:143 g10/tdbdump.c:151
++#: g10/tdbio.c:720 g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161
++#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
++#: dirmngr/certcache.c:368 dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1564
 +#, c-format
 +msgid "can't open '%s': %s\n"
 +msgstr "can't open '%s': %s\n"
 +
 +#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
 +#, c-format
 +msgid "error getting serial number of card: %s\n"
 +msgstr "error getting serial number of card: %s\n"
 +
 +#: agent/command-ssh.c:2419
 +#, c-format
 +msgid "detected card with S/N: %s\n"
 +msgstr "detected card with S/N: %s\n"
 +
 +#: agent/command-ssh.c:2424
 +#, 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:2444
 +#, c-format
 +msgid "no suitable card key found: %s\n"
 +msgstr "no suitable card key found: %s\n"
 +
 +#: agent/command-ssh.c:2709
 +#, c-format
 +msgid ""
 +"An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 +"allow this?"
 +msgstr ""
 +"An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 +"allow this?"
 +
 +#: agent/command-ssh.c:2716
 +msgid "Allow"
 +msgstr "Allow"
 +
 +#: agent/command-ssh.c:2716
 +msgid "Deny"
 +msgstr "Deny"
 +
 +#: agent/command-ssh.c:2725
 +#, 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:2964 agent/genkey.c:351
 +msgid "Please re-enter this passphrase"
 +msgstr "Please re-enter this passphrase"
 +
 +#: agent/command-ssh.c:2991
 +#, c-format
 +msgid ""
 +"Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 +"%s%%0Awithin gpg-agent's key storage"
 +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:3511
 +#, c-format
 +msgid "failed to create stream from socket: %s\n"
 +msgstr "failed to create stream from socket: %s\n"
 +
- #: agent/divert-scd.c:92 g10/call-agent.c:1100
++#: agent/divert-scd.c:92 g10/call-agent.c:1101
 +msgid "Please insert the card with serial number"
 +msgstr "Please insert the card with serial number"
 +
- #: agent/divert-scd.c:93 g10/call-agent.c:1101
++#: agent/divert-scd.c:93 g10/call-agent.c:1102
 +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:204
 +msgid "Admin PIN"
 +msgstr "Admin PIN"
 +
 +#. TRANSLATORS: A PUK is the Personal Unblocking Code
 +#. used to unblock a PIN.
 +#: agent/divert-scd.c:209
 +msgid "PUK"
 +msgstr "PUK"
 +
 +#: agent/divert-scd.c:216
 +msgid "Reset Code"
 +msgstr "Reset Code"
 +
 +#: agent/divert-scd.c:242
 +#, c-format
 +msgid "%s%%0A%%0AUse the reader's pinpad for input."
 +msgstr "%s%%0A%%0AUse the reader's pinpad for input."
 +
 +#: agent/divert-scd.c:291
 +msgid "Repeat this Reset Code"
 +msgstr "Repeat this Reset Code"
 +
 +#: agent/divert-scd.c:293
 +msgid "Repeat this PUK"
 +msgstr "Repeat this PUK"
 +
 +#: agent/divert-scd.c:294
 +msgid "Repeat this PIN"
 +msgstr "Repeat this PIN"
 +
 +#: agent/divert-scd.c:299
 +msgid "Reset Code not correctly repeated; try again"
 +msgstr "Reset Code not correctly repeated; try again"
 +
 +#: agent/divert-scd.c:301
 +msgid "PUK not correctly repeated; try again"
 +msgstr "PUK not correctly repeated; try again"
 +
 +#: agent/divert-scd.c:302
 +msgid "PIN not correctly repeated; try again"
 +msgstr "PIN not correctly repeated; try again"
 +
 +#: agent/divert-scd.c:314
 +#, 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:110 sm/certreqgen-ui.c:394
 +#, c-format
 +msgid "error creating temporary file: %s\n"
 +msgstr "error creating temporary file: %s\n"
 +
 +#: agent/genkey.c:117
 +#, c-format
 +msgid "error writing to temporary file: %s\n"
 +msgstr "error writing to temporary file: %s\n"
 +
 +#: agent/genkey.c:158 agent/genkey.c:164
 +msgid "Enter new passphrase"
 +msgstr "Enter new passphrase"
 +
 +#: agent/genkey.c:172
 +msgid "Take this one anyway"
 +msgstr "Take this one anyway"
 +
 +#: agent/genkey.c:202
 +#, 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:204
 +#, 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 ""
 +"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:216
 +msgid "Yes, protection is not needed"
 +msgstr "Yes, protection is not needed"
 +
 +#: agent/genkey.c:233
 +#, 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:252
 +#, 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] ""
 +"A passphrase should contain at least %u digit or%%0Aspecial character."
 +msgstr[1] ""
 +"A passphrase should contain at least %u digits or%%0Aspecial characters."
 +
 +#: agent/genkey.c:278
 +#, 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:293
 +msgid "Warning: You have entered an insecure passphrase."
 +msgstr "Warning: You have entered an insecure passphrase."
 +
 +#: agent/genkey.c:480
 +#, 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:606
 +msgid "Please enter the new passphrase"
 +msgstr "Please enter the new passphrase"
 +
 +#: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
 +#: tools/gpg-check-pattern.c:69
 +msgid ""
 +"@Options:\n"
 +" "
 +msgstr ""
 +"@Options:\n"
 +" "
 +
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
 +msgid "run in daemon mode (background)"
 +msgstr "run in daemon mode (background)"
 +
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
 +msgid "run in server mode (foreground)"
 +msgstr "run in server mode (foreground)"
 +
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
 +msgid "run in supervised mode"
 +msgstr "run in supervised mode"
 +
- #: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:170 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:166
 +msgid "verbose"
 +msgstr "verbose"
 +
 +#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
 +#: dirmngr/dirmngr_ldap.c:136
 +msgid "be somewhat more quiet"
 +msgstr "be somewhat more quiet"
 +
- #: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
 +msgid "sh-style command output"
 +msgstr "sh-style command output"
 +
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
 +msgid "csh-style command output"
 +msgstr "csh-style command output"
 +
- #: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
- #: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
++#: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
 +msgid "|FILE|read options from FILE"
 +msgstr "|FILE|read options from FILE"
 +
- #: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:177
 +msgid "do not detach from the console"
 +msgstr "do not detach from the console"
 +
 +#: agent/gpg-agent.c:170
 +msgid "do not grab keyboard and mouse"
 +msgstr "do not grab keyboard and mouse"
 +
 +#: agent/gpg-agent.c:171 tools/symcryptrun.c:168
 +msgid "use a log file for the server"
 +msgstr "use a log file for the server"
 +
 +#: agent/gpg-agent.c:173
 +msgid "|PGM|use PGM as the PIN-Entry program"
 +msgstr "|PGM|use PGM as the PIN-Entry program"
 +
 +#: agent/gpg-agent.c:178
 +msgid "|PGM|use PGM as the SCdaemon program"
 +msgstr "|PGM|use PGM as the SCdaemon program"
 +
 +#: agent/gpg-agent.c:180
 +msgid "do not use the SCdaemon"
 +msgstr "do not use the SCdaemon"
 +
 +#: agent/gpg-agent.c:184
 +msgid "|NAME|accept some commands via NAME"
 +msgstr "|NAME|accept some commands via NAME"
 +
 +#: agent/gpg-agent.c:200
 +msgid "ignore requests to change the TTY"
 +msgstr "ignore requests to change the TTY"
 +
 +#: agent/gpg-agent.c:202
 +msgid "ignore requests to change the X display"
 +msgstr "ignore requests to change the X display"
 +
 +#: agent/gpg-agent.c:205
 +msgid "|N|expire cached PINs after N seconds"
 +msgstr "|N|expire cached PINs after N seconds"
 +
 +#: agent/gpg-agent.c:219
 +msgid "do not use the PIN cache when signing"
 +msgstr "do not use the PIN cache when signing"
 +
 +#: agent/gpg-agent.c:221
 +msgid "disallow the use of an external password cache"
 +msgstr "disallow the use of an external password cache"
 +
 +#: agent/gpg-agent.c:223
 +msgid "disallow clients to mark keys as \"trusted\""
 +msgstr "disallow clients to mark keys as “trusted”"
 +
 +#: agent/gpg-agent.c:226
 +msgid "allow presetting passphrase"
 +msgstr "allow presetting passphrase"
 +
 +#: agent/gpg-agent.c:228
 +msgid "disallow caller to override the pinentry"
 +msgstr "disallow caller to override the pinentry"
 +
 +#: agent/gpg-agent.c:231
 +msgid "allow passphrase to be prompted through Emacs"
 +msgstr "allow passphrase to be prompted through Emacs"
 +
 +#: agent/gpg-agent.c:233
 +msgid "enable ssh support"
 +msgstr "enable ssh support"
 +
 +#: agent/gpg-agent.c:236
 +msgid "enable putty support"
 +msgstr "enable putty support"
 +
 +#. 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:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:481 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1025 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:358
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:124 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
 +msgid "Please report bugs to <@EMAIL@>.\n"
 +msgstr "Please report bugs to <@EMAIL@>.\n"
 +
- #: agent/gpg-agent.c:491
++#: agent/gpg-agent.c:490
 +msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 +msgstr "Usage: @GPG_AGENT@ [options] (-h for help)"
 +
- #: agent/gpg-agent.c:493
++#: agent/gpg-agent.c:492
 +msgid ""
 +"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 +"Secret key management for @GNUPG@\n"
 +msgstr ""
 +"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 +"Secret key management for @GNUPG@\n"
 +
- #: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:537 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:442
 +#, c-format
 +msgid "invalid debug-level '%s' given\n"
 +msgstr "invalid debug-level ‘%s’ given\n"
 +
- #: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:793
++#: agent/gpg-agent.c:1082 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:812
 +#, c-format
 +msgid "Note: no default option file '%s'\n"
 +msgstr "Note: no default option file ‘%s’\n"
 +
- #: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
- #: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1093 agent/gpg-agent.c:1935 g10/gpg.c:2510
++#: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:817
++#: dirmngr/dirmngr.c:1670 tools/symcryptrun.c:932
 +#, c-format
 +msgid "option file '%s': %s\n"
 +msgstr "option file '%s': %s\n"
 +
- #: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:806
++#: agent/gpg-agent.c:1101 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:825
 +#, c-format
 +msgid "reading options from '%s'\n"
 +msgstr "reading options from ‘%s’\n"
 +
- #: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
- #: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
++#: agent/gpg-agent.c:1223 g10/gpg.c:3643 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:936 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:527
 +#, c-format
 +msgid "Note: '%s' is not considered an option\n"
 +msgstr "Note: ‘%s’ is not considered an option\n"
 +
- #: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
++#: agent/gpg-agent.c:2080 scd/scdaemon.c:1073 dirmngr/dirmngr.c:1081
 +#, c-format
 +msgid "can't create socket: %s\n"
 +msgstr "can't create socket: %s\n"
 +
- #: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
++#: agent/gpg-agent.c:2097 scd/scdaemon.c:1086 dirmngr/dirmngr.c:1094
 +#, c-format
 +msgid "socket name '%s' is too long\n"
 +msgstr "socket name ‘%s’ is too long\n"
 +
- #: agent/gpg-agent.c:2134
++#: agent/gpg-agent.c:2135
 +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:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
++#: agent/gpg-agent.c:2145 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1126
 +msgid "error getting nonce for the socket\n"
 +msgstr "error getting nonce for the socket\n"
 +
- #: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
++#: agent/gpg-agent.c:2150 scd/scdaemon.c:1113 dirmngr/dirmngr.c:1129
 +#, c-format
 +msgid "error binding socket to '%s': %s\n"
 +msgstr "error binding socket to '%s': %s\n"
 +
- #: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
- #: dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2160 agent/gpg-agent.c:2197 scd/scdaemon.c:1121
++#: dirmngr/dirmngr.c:1138
 +#, c-format
 +msgid "can't set permissions of '%s': %s\n"
 +msgstr "can't set permissions of '%s': %s\n"
 +
- #: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:2165 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1143
 +#, c-format
 +msgid "listen() failed: %s\n"
 +msgstr "listen() failed: %s\n"
 +
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
++#: agent/gpg-agent.c:2172 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1149
 +#, c-format
 +msgid "listening on socket '%s'\n"
 +msgstr "listening on socket ‘%s’\n"
 +
- #: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: agent/gpg-agent.c:2191 agent/gpg-agent.c:2234 g10/exec.c:199
 +#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
 +#, c-format
 +msgid "can't create directory '%s': %s\n"
 +msgstr "can't create directory '%s': %s\n"
 +
- #: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: agent/gpg-agent.c:2194 agent/gpg-agent.c:2239 g10/openfile.c:491
 +#: g10/openfile.c:520 sm/keydb.c:103
 +#, c-format
 +msgid "directory '%s' created\n"
 +msgstr "directory ‘%s’ created\n"
 +
- #: agent/gpg-agent.c:2244
++#: agent/gpg-agent.c:2245
 +#, c-format
 +msgid "stat() failed for '%s': %s\n"
 +msgstr "stat() failed for '%s': %s\n"
 +
- #: agent/gpg-agent.c:2248
++#: agent/gpg-agent.c:2249
 +#, c-format
 +msgid "can't use '%s' as home directory\n"
 +msgstr "can't use ‘%s’ as home directory\n"
 +
- #: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
++#: agent/gpg-agent.c:2392 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1871
 +#, c-format
 +msgid "error reading nonce on fd %d: %s\n"
 +msgstr "error reading nonce on fd %d: %s\n"
 +
- #: agent/gpg-agent.c:2598
++#: agent/gpg-agent.c:2599
 +#, c-format
 +msgid "handler 0x%lx for fd %d started\n"
 +msgstr "handler 0x%lx for fd %d started\n"
 +
- #: agent/gpg-agent.c:2603
++#: agent/gpg-agent.c:2604
 +#, c-format
 +msgid "handler 0x%lx for fd %d terminated\n"
 +msgstr "handler 0x%lx for fd %d terminated\n"
 +
- #: agent/gpg-agent.c:2678
++#: agent/gpg-agent.c:2679
 +#, 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:2683
++#: agent/gpg-agent.c:2684
 +#, 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:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
++#: agent/gpg-agent.c:2881 scd/scdaemon.c:1272 dirmngr/dirmngr.c:2075
 +#, c-format
 +msgid "npth_pselect failed: %s - waiting 1s\n"
 +msgstr "npth_pselect failed: %s - waiting 1s\n"
 +
- #: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2954 scd/scdaemon.c:1321
 +#, c-format
 +msgid "%s %s stopped\n"
 +msgstr "%s %s stopped\n"
 +
- #: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
++#: agent/gpg-agent.c:3092 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
 +msgid "no gpg-agent running in this session\n"
 +msgstr "no gpg-agent running in this session\n"
 +
 +#: agent/preset-passphrase.c:99
 +msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 +msgstr "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 +
 +#: agent/preset-passphrase.c:102
 +msgid ""
 +"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 +"Password cache maintenance\n"
 +msgstr ""
 +"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 +"Password cache maintenance\n"
 +
- #: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
++#: agent/protect-tool.c:106 g10/gpg.c:424 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:153 tools/gpgconf.c:71
 +msgid ""
 +"@Commands:\n"
 +" "
 +msgstr ""
 +"@Commands:\n"
 +" "
 +
- #: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
- #: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:92 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:168 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:96 tools/symcryptrun.c:159
 +msgid ""
 +"@\n"
 +"Options:\n"
 +" "
 +msgstr ""
 +"@\n"
 +"Options:\n"
 +" "
 +
 +#: agent/protect-tool.c:154
 +msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 +msgstr "Usage: gpg-protect-tool [options] (-h for help)\n"
 +
 +#: agent/protect-tool.c:156
 +msgid ""
 +"Syntax: gpg-protect-tool [options] [args]\n"
 +"Secret key maintenance tool\n"
 +msgstr ""
 +"Syntax: gpg-protect-tool [options] [args]\n"
 +"Secret key maintenance tool\n"
 +
 +#: agent/protect-tool.c:693
 +msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 +msgstr "Please enter the passphrase to unprotect the PKCS#12 object."
 +
 +#: agent/protect-tool.c:698
 +msgid "Please enter the passphrase to protect the new PKCS#12 object."
 +msgstr "Please enter the passphrase to protect the new PKCS#12 object."
 +
 +#: agent/protect-tool.c:704
 +msgid ""
 +"Please enter the passphrase to protect the imported object within the GnuPG "
 +"system."
 +msgstr ""
 +"Please enter the passphrase to protect the imported object within the GnuPG "
 +"system."
 +
 +#: agent/protect-tool.c:709
 +msgid ""
 +"Please enter the passphrase or the PIN\n"
 +"needed to complete this operation."
 +msgstr ""
 +"Please enter the passphrase or the PIN\n"
 +"needed to complete this operation."
 +
 +#: agent/protect-tool.c:720 tools/symcryptrun.c:450
 +msgid "cancelled\n"
 +msgstr "cancelled\n"
 +
 +#: agent/protect-tool.c:722 tools/symcryptrun.c:446
 +#, c-format
 +msgid "error while asking for the passphrase: %s\n"
 +msgstr "error while asking for the passphrase: %s\n"
 +
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
- #: tools/gpgconf.c:323
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1472
++#: tools/gpgconf.c:328
 +#, 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
 +#, c-format
 +msgid "file '%s', line %d: %s\n"
 +msgstr "file '%s', line %d: %s\n"
 +
 +#: agent/trustlist.c:192 agent/trustlist.c:200
 +#, c-format
 +msgid "statement \"%s\" ignored in '%s', line %d\n"
 +msgstr "statement “%s” ignored in '%s', line %d\n"
 +
 +#: agent/trustlist.c:206
 +#, c-format
 +msgid "system trustlist '%s' not available\n"
 +msgstr "system trustlist ‘%s’ not available\n"
 +
 +#: agent/trustlist.c:250
 +#, c-format
 +msgid "bad fingerprint in '%s', line %d\n"
 +msgstr "bad fingerprint in '%s', line %d\n"
 +
 +#: agent/trustlist.c:275 agent/trustlist.c:282
 +#, c-format
 +msgid "invalid keyflag in '%s', line %d\n"
 +msgstr "invalid keyflag in '%s', line %d\n"
 +
 +#: agent/trustlist.c:316 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:434 agent/trustlist.c:503
 +msgid "error reading list of trusted root certificates\n"
 +msgstr "error reading list of trusted root certificates\n"
 +
 +#. TRANSLATORS: This prompt is shown by the Pinentry
 +#. and has one special property: A "%%0A" is used by
 +#. Pinentry to insert a line break.  The double
 +#. percent sign is actually needed because it is also
 +#. a printf format string.  If you need to insert a
 +#. plain % sign, you need to encode it as "%%25".  The
 +#. "%s" gets replaced by the name as stored in the
 +#. certificate.
 +#: agent/trustlist.c:664
 +#, c-format
 +msgid ""
 +"Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 +"certificates?"
 +msgstr ""
 +"Do you ultimately trust%%0A  “%s”%%0Ato correctly certify user certificates?"
 +
 +#: agent/trustlist.c:673 common/audit.c:467
 +msgid "Yes"
 +msgstr "Yes"
 +
 +#: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
 +#: common/audit.c:469
 +msgid "No"
 +msgstr "No"
 +
 +#. TRANSLATORS: This prompt is shown by the Pinentry and has
 +#. one special property: A "%%0A" is used by Pinentry to
 +#. insert a line break.  The double percent sign is actually
 +#. needed because it is also a printf format string.  If you
 +#. need to insert a plain % sign, you need to encode it as
 +#. "%%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:707
 +#, c-format
 +msgid ""
 +"Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
 +"fingerprint:%%0A  %s"
 +msgstr ""
 +"Please verify that the certificate identified as:%%0A  “%s”%%0Ahas the "
 +"fingerprint:%%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:721
 +msgid "Correct"
 +msgstr "Correct"
 +
 +#: agent/trustlist.c:721
 +msgid "Wrong"
 +msgstr "Wrong"
 +
 +#: agent/findkey.c:261
 +#, 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:277
 +#, c-format
 +msgid ""
 +"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 +"it now."
 +msgstr ""
 +"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 +"it now."
 +
 +#: agent/findkey.c:291 agent/findkey.c:298
 +msgid "Change passphrase"
 +msgstr "Change passphrase"
 +
 +#: agent/findkey.c:299
 +msgid "I'll change it later"
 +msgstr "I'll change it later"
 +
 +#: agent/findkey.c:1438
 +#, c-format
 +msgid ""
 +"Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 +"%%0A?"
 +msgstr ""
 +"Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 +"%%0A?"
 +
 +#: agent/findkey.c:1462 agent/findkey.c:1476
 +msgid "Delete key"
 +msgstr "Delete key"
 +
 +#: agent/findkey.c:1473
 +msgid ""
 +"Warning: This key is also listed for use with SSH!\n"
 +"Deleting the key might remove your ability to access remote machines."
 +msgstr ""
 +"Warning: This key is also listed for use with SSH!\n"
 +"Deleting the key might remove your ability to access remote machines."
 +
 +#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
 +msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 +msgstr "DSA requires the hash length to be a multiple of 8 bits\n"
 +
 +#: agent/pksign.c:187 sm/certcheck.c:97
 +#, c-format
 +msgid "%s key uses an unsafe (%u bit) hash\n"
 +msgstr "%s key uses an unsafe (%u bit) hash\n"
 +
 +#: agent/pksign.c:202
 +#, c-format
 +msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 +msgstr "a %zu bit hash is not valid for a %u bit %s key\n"
 +
 +#: agent/pksign.c:508
 +#, c-format
 +msgid "checking created signature failed: %s\n"
 +msgstr "checking created signature failed: %s\n"
 +
 +#: agent/cvt-openpgp.c:338
 +msgid "secret key parts are not available\n"
 +msgstr "secret key parts are not available\n"
 +
 +#: agent/cvt-openpgp.c:344
 +#, c-format
 +msgid "public key algorithm %d (%s) is not supported\n"
 +msgstr "public key algorithm %d (%s) is not supported\n"
 +
 +#: agent/cvt-openpgp.c:448
 +#, c-format
 +msgid "protection algorithm %d (%s) is not supported\n"
 +msgstr "protection algorithm %d (%s) is not supported\n"
 +
 +#: agent/cvt-openpgp.c:455
 +#, c-format
 +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:438
 +#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
- #: dirmngr/ldap-wrapper.c:710
++#: dirmngr/ldap-wrapper.c:711
 +#, 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:344
 +#: common/exechelp-w32.c:448 common/exechelp-w32.c:472
 +#: common/exechelp-w32.c:502
 +#, 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:848 dirmngr/dirmngr.c:1155
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1167
 +#, c-format
 +msgid "error forking process: %s\n"
 +msgstr "error forking process: %s\n"
 +
 +#: common/exechelp-posix.c:669 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:792
 +#, 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:799
 +#: common/exechelp-w32.c:785 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:807
 +#, c-format
 +msgid "error running '%s': terminated\n"
 +msgstr "error running '%s': terminated\n"
 +
 +#: common/exechelp-posix.c:750 common/exechelp-w32.c:766
 +#, c-format
 +msgid "waiting for processes to terminate failed: %s\n"
 +msgstr "waiting for processes to terminate failed: %s\n"
 +
 +#: common/exechelp-w32.c:778 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"
 +
 +#: common/simple-pwquery.c:260
 +#, c-format
 +msgid "can't connect to '%s': %s\n"
 +msgstr "can't connect to '%s': %s\n"
 +
 +#: common/simple-pwquery.c:270
 +msgid "problem setting the gpg-agent options\n"
 +msgstr "problem setting the gpg-agent options\n"
 +
- #: common/sysutils.c:144
++#: common/sysutils.c:148
 +#, c-format
 +msgid "can't disable core dumps: %s\n"
 +msgstr "can't disable core dumps: %s\n"
 +
- #: common/sysutils.c:239
++#: common/sysutils.c:250
 +#, c-format
 +msgid "Warning: unsafe ownership on %s \"%s\"\n"
 +msgstr "Warning: unsafe ownership on %s “%s”\n"
 +
- #: common/sysutils.c:271
++#: common/sysutils.c:282
 +#, c-format
 +msgid "Warning: unsafe permissions on %s \"%s\"\n"
 +msgstr "Warning: unsafe permissions on %s “%s”\n"
 +
- #: common/sysutils.c:659
++#: common/sysutils.c:693
 +#, c-format
 +msgid "waiting for file '%s' to become accessible ...\n"
 +msgstr "waiting for file ‘%s’ to become accessible ...\n"
 +
- #: common/sysutils.c:685
++#: common/sysutils.c:719
 +#, c-format
 +msgid "renaming '%s' to '%s' failed: %s\n"
 +msgstr "renaming ‘%s’ to ‘%s’ failed: %s\n"
 +
 +#. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:45 common/yesno.c:82
 +msgid "yes"
 +msgstr "yes"
 +
 +#: common/yesno.c:46 common/yesno.c:87
 +msgid "yY"
 +msgstr "yY"
 +
 +#. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:48 common/yesno.c:84
 +msgid "no"
 +msgstr "no"
 +
 +#: common/yesno.c:49 common/yesno.c:88
 +msgid "nN"
 +msgstr "nN"
 +
 +#. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:86
 +msgid "quit"
 +msgstr "quit"
 +
 +#: common/yesno.c:89
 +msgid "qQ"
 +msgstr "qQ"
 +
 +#. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:123
 +msgid "okay|okay"
 +msgstr "okay|okay"
 +
 +#. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:125
 +msgid "cancel|cancel"
 +msgstr "cancel|cancel"
 +
 +#: common/yesno.c:126
 +msgid "oO"
 +msgstr "oO"
 +
 +#: common/yesno.c:127
 +msgid "cC"
 +msgstr "cC"
 +
 +#: common/miscellaneous.c:86
 +#, c-format
 +msgid "out of core in secure memory while allocating %lu bytes"
 +msgstr "out of core in secure memory while allocating %lu bytes"
 +
 +#: common/miscellaneous.c:89
 +#, c-format
 +msgid "out of core while allocating %lu bytes"
 +msgstr "out of core while allocating %lu bytes"
 +
 +#: common/miscellaneous.c:115 g10/card-util.c:800 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
 +#, 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
 +#, 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:554
++#: common/miscellaneous.c:556
 +#, c-format
 +msgid "unknown debug flag '%s' ignored\n"
 +msgstr "unknown debug flag ‘%s’ ignored\n"
 +
 +#: common/asshelp.c:380
 +#, c-format
 +msgid "no running gpg-agent - starting '%s'\n"
 +msgstr "no running gpg-agent - starting ‘%s’\n"
 +
 +#: common/asshelp.c:440
 +#, c-format
 +msgid "waiting for the agent to come up ... (%ds)\n"
 +msgstr "waiting for the agent to come up ... (%ds)\n"
 +
 +#: common/asshelp.c:448
 +msgid "connection to agent established\n"
 +msgstr "connection to agent established\n"
 +
 +#: common/asshelp.c:488
 +msgid "connection to agent is in restricted mode\n"
 +msgstr "connection to agent is in restricted mode\n"
 +
 +#: common/asshelp.c:545
 +#, c-format
 +msgid "no running Dirmngr - starting '%s'\n"
 +msgstr "no running Dirmngr - starting ‘%s’\n"
 +
 +#: common/asshelp.c:593
 +#, c-format
 +msgid "waiting for the dirmngr to come up ... (%ds)\n"
 +msgstr "waiting for the dirmngr to come up ... (%ds)\n"
 +
 +#: common/asshelp.c:602
 +msgid "connection to the dirmngr established\n"
 +msgstr "connection to the dirmngr established\n"
 +
 +#. TRANSLATORS: Copy the prefix between the vertical bars
 +#. verbatim.  It will not be printed.
 +#: common/audit.c:474
 +msgid "|audit-log-result|Good"
 +msgstr "|audit-log-result|Good"
 +
 +#: common/audit.c:477
 +msgid "|audit-log-result|Bad"
 +msgstr "|audit-log-result|Bad"
 +
 +#: common/audit.c:479
 +msgid "|audit-log-result|Not supported"
 +msgstr "|audit-log-result|Not supported"
 +
 +#: common/audit.c:481
 +msgid "|audit-log-result|No certificate"
 +msgstr "|audit-log-result|No certificate"
 +
 +#: common/audit.c:483
 +msgid "|audit-log-result|Not enabled"
 +msgstr "|audit-log-result|Not enabled"
 +
 +#: common/audit.c:485
 +msgid "|audit-log-result|Error"
 +msgstr "|audit-log-result|Error"
 +
 +#: common/audit.c:487
 +msgid "|audit-log-result|Not used"
 +msgstr "|audit-log-result|Not used"
 +
 +#: common/audit.c:489
 +msgid "|audit-log-result|Okay"
 +msgstr "|audit-log-result|Okay"
 +
 +#: common/audit.c:491
 +msgid "|audit-log-result|Skipped"
 +msgstr "|audit-log-result|Skipped"
 +
 +#: common/audit.c:493
 +msgid "|audit-log-result|Some"
 +msgstr "|audit-log-result|Some"
 +
 +#: common/audit.c:726
 +msgid "Certificate chain available"
 +msgstr "Certificate chain available"
 +
 +#: common/audit.c:733
 +msgid "root certificate missing"
 +msgstr "root certificate missing"
 +
 +#: common/audit.c:759
 +msgid "Data encryption succeeded"
 +msgstr "Data encryption succeeded"
 +
 +#: common/audit.c:764 common/audit.c:830 common/audit.c:906 common/audit.c:997
 +msgid "Data available"
 +msgstr "Data available"
 +
 +#: common/audit.c:767
 +msgid "Session key created"
 +msgstr "Session key created"
 +
 +#: common/audit.c:772 common/audit.c:912 common/audit.c:919
 +#, c-format
 +msgid "algorithm: %s"
 +msgstr "algorithm: %s"
 +
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3098
++#: scd/app-openpgp.c:3111
 +#, c-format
 +msgid "unsupported algorithm: %s"
 +msgstr "unsupported algorithm: %s"
 +
 +#: common/audit.c:778 common/audit.c:925
 +msgid "seems to be not encrypted"
 +msgstr "seems to be not encrypted"
 +
 +#: common/audit.c:784 common/audit.c:933
 +msgid "Number of recipients"
 +msgstr "Number of recipients"
 +
 +#: common/audit.c:792 common/audit.c:956
 +#, c-format
 +msgid "Recipient %d"
 +msgstr "Recipient %d"
 +
 +#: common/audit.c:825
 +msgid "Data signing succeeded"
 +msgstr "Data signing succeeded"
 +
 +#: common/audit.c:839 common/audit.c:1033 common/audit.c:1060
 +#, c-format
 +msgid "data hash algorithm: %s"
 +msgstr "data hash algorithm: %s"
 +
 +#: common/audit.c:862
 +#, c-format
 +msgid "Signer %d"
 +msgstr "Signer %d"
 +
 +#: common/audit.c:866 common/audit.c:1065
 +#, c-format
 +msgid "attr hash algorithm: %s"
 +msgstr "attr hash algorithm: %s"
 +
 +#: common/audit.c:901
 +msgid "Data decryption succeeded"
 +msgstr "Data decryption succeeded"
 +
 +#: common/audit.c:910
 +msgid "Encryption algorithm supported"
 +msgstr "Encryption algorithm supported"
 +
 +#: common/audit.c:993
 +msgid "Data verification succeeded"
 +msgstr "Data verification succeeded"
 +
 +#: common/audit.c:1002
 +msgid "Signature available"
 +msgstr "Signature available"
 +
 +#: common/audit.c:1024
 +msgid "Parsing data succeeded"
 +msgstr "Parsing data succeeded"
 +
 +#: common/audit.c:1036
 +#, c-format
 +msgid "bad data hash algorithm: %s"
 +msgstr "bad data hash algorithm: %s"
 +
 +#: common/audit.c:1051
 +#, c-format
 +msgid "Signature %d"
 +msgstr "Signature %d"
 +
 +#: common/audit.c:1079
 +msgid "Certificate chain valid"
 +msgstr "Certificate chain valid"
 +
 +#: common/audit.c:1090
 +msgid "Root certificate trustworthy"
 +msgstr "Root certificate trustworthy"
 +
 +#: common/audit.c:1111 sm/certchain.c:1009
 +msgid "no CRL found for certificate"
 +msgstr "no CRL found for certificate"
 +
 +#: common/audit.c:1114 sm/certchain.c:1019
 +msgid "the available CRL is too old"
 +msgstr "the available CRL is too old"
 +
 +#: common/audit.c:1119
 +msgid "CRL/OCSP check of certificates"
 +msgstr "CRL/OCSP check of certificates"
 +
 +#: common/audit.c:1139
 +msgid "Included certificates"
 +msgstr "Included certificates"
 +
 +#: common/audit.c:1194
 +msgid "No audit log entries."
 +msgstr "No audit log entries."
 +
 +#: common/audit.c:1243
 +msgid "Unknown operation"
 +msgstr "Unknown operation"
 +
 +#: common/audit.c:1261
 +msgid "Gpg-Agent usable"
 +msgstr "Gpg-Agent usable"
 +
 +#: common/audit.c:1271
 +msgid "Dirmngr usable"
 +msgstr "Dirmngr usable"
 +
 +#: common/audit.c:1307
 +#, c-format
 +msgid "No help available for '%s'."
 +msgstr "No help available for '%s'."
 +
 +#: common/helpfile.c:90
 +msgid "ignoring garbage line"
 +msgstr "ignoring garbage line"
 +
 +#: common/gettime.c:887
 +msgid "[none]"
 +msgstr "[none]"
 +
 +#: common/argparse.c:365
 +msgid "argument not expected"
 +msgstr "argument not expected"
 +
 +#: common/argparse.c:367
 +msgid "read error"
 +msgstr "read error"
 +
 +#: common/argparse.c:369
 +msgid "keyword too long"
 +msgstr "keyword too long"
 +
 +#: common/argparse.c:371
 +msgid "missing argument"
 +msgstr "missing argument"
 +
 +#: common/argparse.c:373
 +msgid "invalid argument"
 +msgstr "invalid argument"
 +
 +#: common/argparse.c:375
 +msgid "invalid command"
 +msgstr "invalid command"
 +
 +#: common/argparse.c:377
 +msgid "invalid alias definition"
 +msgstr "invalid alias definition"
 +
 +#: common/argparse.c:379
 +msgid "out of core"
 +msgstr "out of core"
 +
 +#: common/argparse.c:381
 +msgid "invalid option"
 +msgstr "invalid option"
 +
 +#: common/argparse.c:389
 +#, c-format
 +msgid "missing argument for option \"%.50s\"\n"
 +msgstr "missing argument for option “%.50s”\n"
 +
 +#: common/argparse.c:391
 +#, c-format
 +msgid "invalid argument for option \"%.50s\"\n"
 +msgstr "invalid argument for option “%.50s”\n"
 +
 +#: common/argparse.c:393
 +#, c-format
 +msgid "option \"%.50s\" does not expect an argument\n"
 +msgstr "option “%.50s” does not expect an argument\n"
 +
 +#: common/argparse.c:395
 +#, c-format
 +msgid "invalid command \"%.50s\"\n"
 +msgstr "invalid command “%.50s”\n"
 +
 +#: common/argparse.c:397
 +#, c-format
 +msgid "option \"%.50s\" is ambiguous\n"
 +msgstr "option “%.50s” is ambiguous\n"
 +
 +#: common/argparse.c:399
 +#, c-format
 +msgid "command \"%.50s\" is ambiguous\n"
 +msgstr "command “%.50s” is ambiguous\n"
 +
- #: common/argparse.c:401 dirmngr/dirmngr.c:1173
++#: common/argparse.c:401 dirmngr/dirmngr.c:1185
 +msgid "out of core\n"
 +msgstr "out of core\n"
 +
 +#: common/argparse.c:403
 +#, c-format
 +msgid "invalid option \"%.50s\"\n"
 +msgstr "invalid option “%.50s”\n"
 +
 +#: common/utf8conv.c:123
 +#, c-format
 +msgid "conversion from '%s' to '%s' not available\n"
 +msgstr "conversion from ‘%s’ to ‘%s’ not available\n"
 +
 +#: common/utf8conv.c:131
 +#, c-format
 +msgid "iconv_open failed: %s\n"
 +msgstr "iconv_open failed: %s\n"
 +
 +#: common/utf8conv.c:385 common/utf8conv.c:651
 +#, c-format
 +msgid "conversion from '%s' to '%s' failed: %s\n"
 +msgstr "conversion from ‘%s’ to ‘%s’ failed: %s\n"
 +
 +#: common/dotlock.c:707
 +#, c-format
 +msgid "failed to create temporary file '%s': %s\n"
 +msgstr "failed to create temporary file '%s': %s\n"
 +
 +#: common/dotlock.c:771
 +#, c-format
 +msgid "error writing to '%s': %s\n"
 +msgstr "error writing to '%s': %s\n"
 +
 +#: common/dotlock.c:1116
 +#, c-format
 +msgid "removing stale lockfile (created by %d)\n"
 +msgstr "removing stale lockfile (created by %d)\n"
 +
 +#: common/dotlock.c:1152
 +#, 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:1153
 +msgid "(deadlock?) "
 +msgstr "(deadlock?) "
 +
 +#: common/dotlock.c:1192
 +#, c-format
 +msgid "lock '%s' not made: %s\n"
 +msgstr "lock ‘%s’ not made: %s\n"
 +
 +#: common/dotlock.c:1219
 +#, c-format
 +msgid "waiting for lock %s...\n"
 +msgstr "waiting for lock %s...\n"
 +
- #: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
- #: dirmngr/dirmngr.c:715
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:725
++#: dirmngr/dirmngr.c:734
 +#, c-format
 +msgid "%s is too old (need %s, have %s)\n"
 +msgstr "%s is too old (need %s, have %s)\n"
 +
 +#: g10/armor.c:424
 +#, c-format
 +msgid "armor: %s\n"
 +msgstr "armor: %s\n"
 +
 +#: g10/armor.c:463
 +msgid "invalid armor header: "
 +msgstr "invalid armor header: "
 +
 +#: g10/armor.c:474
 +msgid "armor header: "
 +msgstr "armor header: "
 +
 +#: g10/armor.c:487
 +msgid "invalid clearsig header\n"
 +msgstr "invalid clearsig header\n"
 +
 +#: g10/armor.c:500
 +msgid "unknown armor header: "
 +msgstr "unknown armor header: "
 +
 +#: g10/armor.c:553
 +msgid "nested clear text signatures\n"
 +msgstr "nested clear text signatures\n"
 +
 +#: g10/armor.c:688
 +msgid "unexpected armor: "
 +msgstr "unexpected armor: "
 +
 +#: g10/armor.c:701
 +msgid "invalid dash escaped line: "
 +msgstr "invalid dash escaped line: "
 +
- #: g10/armor.c:873 g10/armor.c:1490
++#: g10/armor.c:873 g10/armor.c:1493
 +#, c-format
 +msgid "invalid radix64 character %02X skipped\n"
 +msgstr "invalid radix64 character %02X skipped\n"
 +
 +#: g10/armor.c:916
 +msgid "premature eof (no CRC)\n"
 +msgstr "premature eof (no CRC)\n"
 +
 +#: g10/armor.c:950
 +msgid "premature eof (in CRC)\n"
 +msgstr "premature eof (in CRC)\n"
 +
 +#: g10/armor.c:958
 +msgid "malformed CRC\n"
 +msgstr "malformed CRC\n"
 +
- #: g10/armor.c:962 g10/armor.c:1527
++#: g10/armor.c:962 g10/armor.c:1530
 +#, c-format
 +msgid "CRC error; %06lX - %06lX\n"
 +msgstr "CRC error; %06lX - %06lX\n"
 +
 +#: g10/armor.c:982
 +msgid "premature eof (in trailer)\n"
 +msgstr "premature eof (in trailer)\n"
 +
 +#: g10/armor.c:986
 +msgid "error in trailer line\n"
 +msgstr "error in trailer line\n"
 +
- #: g10/armor.c:1303
++#: g10/armor.c:1306
 +msgid "no valid OpenPGP data found.\n"
 +msgstr "no valid OpenPGP data found.\n"
 +
- #: g10/armor.c:1308
++#: g10/armor.c:1311
 +#, c-format
 +msgid "invalid armor: line longer than %d characters\n"
 +msgstr "invalid armor: line longer than %d characters\n"
 +
- #: g10/armor.c:1312
++#: g10/armor.c:1315
 +msgid ""
 +"quoted printable character in armor - probably a buggy MTA has been used\n"
 +msgstr ""
 +"quoted printable character in armor - probably a buggy MTA has been used\n"
 +
 +#: g10/build-packet.c:1110
 +#, c-format
 +msgid "[ not human readable (%zu bytes: %s%s) ]"
 +msgstr "[ not human readable (%zu bytes: %s%s) ]"
 +
 +#: g10/build-packet.c:1162
 +msgid ""
 +"a notation name must have only printable characters or spaces, and end with "
 +"an '='\n"
 +msgstr ""
 +"a notation name must have only printable characters or spaces, and end with "
 +"an ‘=’\n"
 +
 +#: g10/build-packet.c:1174 g10/build-packet.c:1270
 +msgid "a user notation name must contain the '@' character\n"
 +msgstr "a user notation name must contain the ‘@’ character\n"
 +
 +#: g10/build-packet.c:1180 g10/build-packet.c:1276
 +msgid "a notation name must not contain more than one '@' character\n"
 +msgstr "a notation name must not contain more than one ‘@’ character\n"
 +
 +#: g10/build-packet.c:1198
 +msgid "a notation value must not use any control characters\n"
 +msgstr "a notation value must not use any control characters\n"
 +
 +#: g10/build-packet.c:1254
 +msgid "a notation name may not contain an '=' character\n"
 +msgstr "a notation name may not contain an ‘=’ character\n"
 +
 +#: g10/build-packet.c:1260
 +msgid "a notation name must have only printable characters or spaces\n"
 +msgstr "a notation name must have only printable characters or spaces\n"
 +
 +#: g10/build-packet.c:1319 g10/build-packet.c:1330
 +msgid "WARNING: invalid notation data found\n"
 +msgstr "WARNING: invalid notation data found\n"
 +
 +#: g10/call-agent.c:144 sm/call-agent.c:199
 +#, c-format
 +msgid "failed to proxy %s inquiry to client\n"
 +msgstr "failed to proxy %s inquiry to client\n"
 +
 +#: g10/call-agent.c:169
 +msgid "Enter passphrase: "
 +msgstr "Enter passphrase: "
 +
 +#: g10/call-agent.c:196 sm/call-agent.c:98 sm/call-dirmngr.c:165
 +#, c-format
 +msgid "error getting version from '%s': %s\n"
 +msgstr "error getting version from '%s': %s\n"
 +
 +#: g10/call-agent.c:202 sm/call-agent.c:104 sm/call-dirmngr.c:171
 +#, c-format
 +msgid "server '%s' is older than us (%s < %s)"
 +msgstr "server ‘%s’ is older than us (%s < %s)"
 +
 +#: g10/call-agent.c:208 sm/call-agent.c:110 sm/call-dirmngr.c:177
 +#, c-format
 +msgid "WARNING: %s\n"
 +msgstr "WARNING: %s\n"
 +
 +#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1705
 +#, 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:1711
 +#, c-format
 +msgid "OpenPGP card no. %s detected\n"
 +msgstr "OpenPGP card no. %s detected\n"
 +
- #: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
- #: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2030
++#: g10/keygen.c:4087 g10/revoke.c:215 g10/revoke.c:618
 +msgid "can't do this in batch mode\n"
 +msgstr "can't do this in batch mode\n"
 +
 +#: g10/card-util.c:107
 +msgid "This command is only available for version 2 cards\n"
 +msgstr "This command is only available for version 2 cards\n"
 +
- #: g10/card-util.c:109 scd/app-openpgp.c:2454
++#: g10/card-util.c:109 scd/app-openpgp.c:2467
 +msgid "Reset Code not or not anymore available\n"
 +msgstr "Reset Code not or not anymore available\n"
 +
 +#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
- #: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
- #: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1768
++#: g10/keygen.c:1945 g10/keygen.c:2313 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
 +msgid "Your selection? "
 +msgstr "Your selection? "
 +
 +#: g10/card-util.c:279 g10/card-util.c:330
 +msgid "[not set]"
 +msgstr "[not set]"
 +
 +#: g10/card-util.c:533
 +msgid "male"
 +msgstr "male"
 +
 +#: g10/card-util.c:534
 +msgid "female"
 +msgstr "female"
 +
 +#: g10/card-util.c:534
 +msgid "unspecified"
 +msgstr "unspecified"
 +
 +#: g10/card-util.c:561
 +msgid "not forced"
 +msgstr "not forced"
 +
 +#: g10/card-util.c:561
 +msgid "forced"
 +msgstr "forced"
 +
 +#: g10/card-util.c:647
 +msgid "Error: Only plain ASCII is currently allowed.\n"
 +msgstr "Error: Only plain ASCII is currently allowed.\n"
 +
 +#: g10/card-util.c:649
 +msgid "Error: The \"<\" character may not be used.\n"
 +msgstr "Error: The “<” character may not be used.\n"
 +
 +#: g10/card-util.c:651
 +msgid "Error: Double spaces are not allowed.\n"
 +msgstr "Error: Double spaces are not allowed.\n"
 +
 +#: g10/card-util.c:668
 +msgid "Cardholder's surname: "
 +msgstr "Cardholder's surname: "
 +
 +#: g10/card-util.c:670
 +msgid "Cardholder's given name: "
 +msgstr "Cardholder's given name: "
 +
 +#: g10/card-util.c:688
 +#, 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:709
 +msgid "URL to retrieve public key: "
 +msgstr "URL to retrieve public key: "
 +
 +#: g10/card-util.c:717
 +#, c-format
 +msgid "Error: URL too long (limit is %d characters).\n"
 +msgstr "Error: URL too long (limit is %d characters).\n"
 +
- #: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
- #: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:334
++#: g10/import.c:592 g10/import.c:640 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
++#: dirmngr/dirmngr.c:1510 tools/gpgconf.c:341 tools/gpgconf.c:387
 +#, c-format
 +msgid "error reading '%s': %s\n"
 +msgstr "error reading '%s': %s\n"
 +
 +#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2319
 +#: dirmngr/crlcache.c:926
 +#, c-format
 +msgid "error writing '%s': %s\n"
 +msgstr "error writing '%s': %s\n"
 +
 +#: g10/card-util.c:872
 +msgid "Login data (account name): "
 +msgstr "Login data (account name): "
 +
 +#: g10/card-util.c:882
 +#, c-format
 +msgid "Error: Login data too long (limit is %d characters).\n"
 +msgstr "Error: Login data too long (limit is %d characters).\n"
 +
 +#: g10/card-util.c:918
 +msgid "Private DO data: "
 +msgstr "Private DO data: "
 +
 +#: g10/card-util.c:928
 +#, c-format
 +msgid "Error: Private DO too long (limit is %d characters).\n"
 +msgstr "Error: Private DO too long (limit is %d characters).\n"
 +
 +#: g10/card-util.c:1011
 +msgid "Language preferences: "
 +msgstr "Language preferences: "
 +
 +#: g10/card-util.c:1019
 +msgid "Error: invalid length of preference string.\n"
 +msgstr "Error: invalid length of preference string.\n"
 +
 +#: g10/card-util.c:1028
 +msgid "Error: invalid characters in preference string.\n"
 +msgstr "Error: invalid characters in preference string.\n"
 +
 +#: g10/card-util.c:1050
 +msgid "Sex ((M)ale, (F)emale or space): "
 +msgstr "Sex ((M)ale, (F)emale or space): "
 +
 +#: g10/card-util.c:1064
 +msgid "Error: invalid response.\n"
 +msgstr "Error: invalid response.\n"
 +
 +#: g10/card-util.c:1086
 +msgid "CA fingerprint: "
 +msgstr "CA fingerprint: "
 +
 +#: g10/card-util.c:1109
 +msgid "Error: invalid formatted fingerprint.\n"
 +msgstr "Error: invalid formatted fingerprint.\n"
 +
 +#: g10/card-util.c:1159
 +#, c-format
 +msgid "key operation not possible: %s\n"
 +msgstr "key operation not possible: %s\n"
 +
 +#: g10/card-util.c:1160
 +msgid "not an OpenPGP card"
 +msgstr "not an OpenPGP card"
 +
- #: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
++#: g10/card-util.c:1173 g10/keygen.c:4106 g10/keygen.c:5092
 +#, c-format
 +msgid "error getting current key info: %s\n"
 +msgstr "error getting current key info: %s\n"
 +
 +#: g10/card-util.c:1260
 +msgid "Replace existing key? (y/N) "
 +msgstr "Replace existing key? (y/N) "
 +
 +#: g10/card-util.c:1277
 +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 ""
 +"Note: There is no guarantee that the card supports the requested size.\n"
 +"      If the key generation does not succeed, please check the\n"
 +"      documentation of your card to see what sizes are allowed.\n"
 +
 +#: g10/card-util.c:1302
 +#, c-format
 +msgid "What keysize do you want for the Signature key? (%u) "
 +msgstr "What keysize do you want for the Signature key? (%u) "
 +
 +#: g10/card-util.c:1304
 +#, c-format
 +msgid "What keysize do you want for the Encryption key? (%u) "
 +msgstr "What keysize do you want for the Encryption key? (%u) "
 +
 +#: g10/card-util.c:1305
 +#, c-format
 +msgid "What keysize do you want for the Authentication key? (%u) "
 +msgstr "What keysize do you want for the Authentication key? (%u) "
 +
- #: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
++#: g10/card-util.c:1316 g10/keygen.c:2122 g10/keygen.c:2154
 +#: sm/certreqgen-ui.c:198
 +#, c-format
 +msgid "rounded up to %u bits\n"
 +msgstr "rounded up to %u bits\n"
 +
- #: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2207 sm/certreqgen-ui.c:188
 +#, 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:1329
 +#, 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:1349
 +#, c-format
 +msgid "error changing size of key %d to %u bits: %s\n"
 +msgstr "error changing size of key %d to %u bits: %s\n"
 +
 +#: g10/card-util.c:1373
 +msgid "Make off-card backup of encryption key? (Y/n) "
 +msgstr "Make off-card backup of encryption key? (Y/n) "
 +
 +#: g10/card-util.c:1387
 +msgid "Note: keys are already stored on the card!\n"
 +msgstr "Note: keys are already stored on the card!\n"
 +
 +#: g10/card-util.c:1390
 +msgid "Replace existing keys? (y/N) "
 +msgstr "Replace existing keys? (y/N) "
 +
 +#: g10/card-util.c:1402
 +#, c-format
 +msgid ""
 +"Please note that the factory settings of the PINs are\n"
 +"   PIN = '%s'     Admin PIN = '%s'\n"
 +"You should change them using the command --change-pin\n"
 +msgstr ""
 +"Please note that the factory settings of the PINs are\n"
 +"   PIN = ‘%s’     Admin PIN = ‘%s’\n"
 +"You should change them using the command --change-pin\n"
 +
 +#: g10/card-util.c:1462
 +msgid "Please select the type of key to generate:\n"
 +msgstr "Please select the type of key to generate:\n"
 +
 +#: g10/card-util.c:1464 g10/card-util.c:1578
 +msgid "   (1) Signature key\n"
 +msgstr "   (1) Signature key\n"
 +
 +#: g10/card-util.c:1465 g10/card-util.c:1580
 +msgid "   (2) Encryption key\n"
 +msgstr "   (2) Encryption key\n"
 +
 +#: g10/card-util.c:1466 g10/card-util.c:1582
 +msgid "   (3) Authentication key\n"
 +msgstr "   (3) Authentication key\n"
 +
- #: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
- #: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
- #: g10/keygen.c:2314 g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1508
++#: g10/keygen.c:1794 g10/keygen.c:1822 g10/keygen.c:1952 g10/keygen.c:2060
++#: g10/keygen.c:2336 g10/revoke.c:820
 +msgid "Invalid selection.\n"
 +msgstr "Invalid selection.\n"
 +
 +#: g10/card-util.c:1575
 +msgid "Please select where to store the key:\n"
 +msgstr "Please select where to store the key:\n"
 +
 +#: g10/card-util.c:1621
 +#, c-format
 +msgid "KEYTOCARD failed: %s\n"
 +msgstr "KEYTOCARD failed: %s\n"
 +
 +#: g10/card-util.c:1717
 +msgid "This command is not supported by this card\n"
 +msgstr "This command is not supported by this card\n"
 +
 +#: g10/card-util.c:1722
 +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:1725
 +msgid "Continue? (y/N) "
 +msgstr "Continue? (y/N) "
 +
 +#: g10/card-util.c:1730
 +msgid "Really do a factory reset? (enter \"yes\") "
 +msgstr "Really do a factory reset? (enter “yes”) "
 +
- #: g10/card-util.c:1816 g10/keyedit.c:1867
++#: g10/card-util.c:1816 g10/keyedit.c:1868
 +msgid "quit this menu"
 +msgstr "quit this menu"
 +
 +#: g10/card-util.c:1818
 +msgid "show admin commands"
 +msgstr "show admin commands"
 +
- #: g10/card-util.c:1819 g10/keyedit.c:1870
++#: g10/card-util.c:1819 g10/keyedit.c:1871
 +msgid "show this help"
 +msgstr "show this help"
 +
 +#: g10/card-util.c:1821
 +msgid "list all available data"
 +msgstr "list all available data"
 +
 +#: g10/card-util.c:1824
 +msgid "change card holder's name"
 +msgstr "change card holder's name"
 +
 +#: g10/card-util.c:1825
 +msgid "change URL to retrieve key"
 +msgstr "change URL to retrieve key"
 +
 +#: g10/card-util.c:1826
 +msgid "fetch the key specified in the card URL"
 +msgstr "fetch the key specified in the card URL"
 +
 +#: g10/card-util.c:1827
 +msgid "change the login name"
 +msgstr "change the login name"
 +
 +#: g10/card-util.c:1828
 +msgid "change the language preferences"
 +msgstr "change the language preferences"
 +
 +#: g10/card-util.c:1829
 +msgid "change card holder's sex"
 +msgstr "change card holder's sex"
 +
 +#: g10/card-util.c:1830
 +msgid "change a CA fingerprint"
 +msgstr "change a CA fingerprint"
 +
 +#: g10/card-util.c:1831
 +msgid "toggle the signature force PIN flag"
 +msgstr "toggle the signature force PIN flag"
 +
 +#: g10/card-util.c:1832
 +msgid "generate new keys"
 +msgstr "generate new keys"
 +
 +#: g10/card-util.c:1833
 +msgid "menu to change or unblock the PIN"
 +msgstr "menu to change or unblock the PIN"
 +
 +#: g10/card-util.c:1834
 +msgid "verify the PIN and list all data"
 +msgstr "verify the PIN and list all data"
 +
 +#: g10/card-util.c:1835
 +msgid "unblock the PIN using a Reset Code"
 +msgstr "unblock the PIN using a Reset Code"
 +
 +#: g10/card-util.c:1836
 +msgid "destroy all keys and data"
 +msgstr "destroy all keys and data"
 +
 +#: g10/card-util.c:1958
 +msgid "gpg/card> "
 +msgstr "gpg/card> "
 +
 +#: g10/card-util.c:1999
 +msgid "Admin-only command\n"
 +msgstr "Admin-only command\n"
 +
 +#: g10/card-util.c:2030
 +msgid "Admin commands are allowed\n"
 +msgstr "Admin commands are allowed\n"
 +
 +#: g10/card-util.c:2032
 +msgid "Admin commands are not allowed\n"
 +msgstr "Admin commands are not allowed\n"
 +
- #: g10/card-util.c:2127 g10/keyedit.c:2816
++#: g10/card-util.c:2127 g10/keyedit.c:2817
 +msgid "Invalid command  (try \"help\")\n"
 +msgstr "Invalid command  (try “help”)\n"
 +
- #: g10/decrypt.c:191 g10/encrypt.c:955
++#: g10/decrypt.c:190 g10/encrypt.c:955
 +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:4851 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4904 g10/keyring.c:398 g10/keyring.c:771
 +#, c-format
 +msgid "can't open '%s'\n"
 +msgstr "can't open ‘%s’\n"
 +
 +#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
- #: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
- #: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4858 g10/keyedit.c:2051
++#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2163
 +#, c-format
 +msgid "key \"%s\" not found: %s\n"
 +msgstr "key “%s” not found: %s\n"
 +
- #: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
- #: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
- #: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4866 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:645 g10/tofu.c:2171
 +#, c-format
 +msgid "error reading keyblock: %s\n"
 +msgstr "error reading keyblock: %s\n"
 +
 +#: g10/delkey.c:118 g10/getkey.c:579
 +#, c-format
 +msgid "key \"%s\" not found\n"
 +msgstr "key “%s” not found\n"
 +
 +#: g10/delkey.c:129 g10/delkey.c:136
 +msgid "(unless you specify the key by fingerprint)\n"
 +msgstr "(unless you specify the key by fingerprint)\n"
 +
 +#: g10/delkey.c:135
 +msgid "can't do this in batch mode without \"--yes\"\n"
 +msgstr "can't do this in batch mode without “--yes”\n"
 +
 +#: g10/delkey.c:148
 +msgid "Delete this key from the keyring? (y/N) "
 +msgstr "Delete this key from the keyring? (y/N) "
 +
 +#: g10/delkey.c:158
 +msgid "This is a secret key! - really delete? (y/N) "
 +msgstr "This is a secret key! - really delete? (y/N) "
 +
 +#: g10/delkey.c:201
 +#, c-format
 +msgid "deleting secret %s failed: %s\n"
 +msgstr "deleting secret %s failed: %s\n"
 +
 +#: g10/delkey.c:203
 +msgid "key"
 +msgstr "key"
 +
 +#: g10/delkey.c:203
 +msgid "subkey"
 +msgstr "subkey"
 +
 +#: g10/delkey.c:226
 +#, c-format
 +msgid "deleting keyblock failed: %s\n"
 +msgstr "deleting keyblock failed: %s\n"
 +
 +#: g10/delkey.c:239
 +msgid "ownertrust information cleared\n"
 +msgstr "ownertrust information cleared\n"
 +
 +#: g10/delkey.c:275
 +#, c-format
 +msgid "there is a secret key for public key \"%s\"!\n"
 +msgstr "there is a secret key for public key “%s”!\n"
 +
 +#: g10/delkey.c:277
 +msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 +msgstr "use option “--delete-secret-keys” to delete it first.\n"
 +
- #: g10/encrypt.c:232 g10/sign.c:1292
++#: g10/encrypt.c:232 g10/sign.c:1294
 +#, c-format
 +msgid "error creating passphrase: %s\n"
 +msgstr "error creating passphrase: %s\n"
 +
 +#: g10/encrypt.c:239
 +msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 +msgstr "can't use a symmetric ESK packet due to the S2K mode\n"
 +
 +#: g10/encrypt.c:253
 +#, c-format
 +msgid "using cipher %s\n"
 +msgstr "using cipher %s\n"
 +
 +#: g10/encrypt.c:263 g10/encrypt.c:624
 +#, c-format
 +msgid "'%s' already compressed\n"
 +msgstr "‘%s’ already compressed\n"
 +
- #: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:610
 +#, c-format
 +msgid "WARNING: '%s' is an empty file\n"
 +msgstr "WARNING: ‘%s’ is an empty file\n"
 +
 +#: g10/encrypt.c:557
 +#, c-format
 +msgid "reading from '%s'\n"
 +msgstr "reading from ‘%s’\n"
 +
 +#: g10/encrypt.c:605
 +#, c-format
 +msgid ""
 +"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 +msgstr ""
 +"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 +
- #: g10/encrypt.c:707 g10/sign.c:984
++#: g10/encrypt.c:707 g10/sign.c:986
 +#, c-format
 +msgid ""
 +"WARNING: forcing compression algorithm %s (%d) violates recipient "
 +"preferences\n"
 +msgstr ""
 +"WARNING: forcing compression algorithm %s (%d) violates recipient "
 +"preferences\n"
 +
 +#: g10/encrypt.c:817
 +#, 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:903
 +#, c-format
 +msgid "%s/%s encrypted for: \"%s\"\n"
 +msgstr "%s/%s encrypted for: “%s”\n"
 +
 +#: g10/encrypt.c:931 g10/pkclist.c:1029 g10/pkclist.c:1080
 +#, c-format
 +msgid "you may not use %s while in %s mode\n"
 +msgstr "you may not use %s while in %s mode\n"
 +
 +#: g10/decrypt-data.c:93 g10/mainproc.c:304
 +#, c-format
 +msgid "%s encrypted data\n"
 +msgstr "%s encrypted data\n"
 +
 +#: g10/decrypt-data.c:96 g10/mainproc.c:308
 +#, c-format
 +msgid "encrypted with unknown algorithm %d\n"
 +msgstr "encrypted with unknown algorithm %d\n"
 +
- #: g10/decrypt-data.c:164 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:129
 +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:176
 +msgid "problem handling encrypted packet\n"
 +msgstr "problem handling encrypted packet\n"
 +
 +#: g10/exec.c:60
 +msgid "no remote program execution supported\n"
 +msgstr "no remote program execution supported\n"
 +
 +#: g10/exec.c:319
 +msgid ""
 +"external program calls are disabled due to unsafe options file permissions\n"
 +msgstr ""
 +"external program calls are disabled due to unsafe options file permissions\n"
 +
 +#: g10/exec.c:349
 +msgid "this platform requires temporary files when calling external programs\n"
 +msgstr ""
 +"this platform requires temporary files when calling external programs\n"
 +
 +#: g10/exec.c:427
 +#, c-format
 +msgid "unable to execute program '%s': %s\n"
 +msgstr "unable to execute program '%s': %s\n"
 +
 +#: g10/exec.c:430
 +#, c-format
 +msgid "unable to execute shell '%s': %s\n"
 +msgstr "unable to execute shell '%s': %s\n"
 +
 +#: g10/exec.c:521
 +#, c-format
 +msgid "system error while calling external program: %s\n"
 +msgstr "system error while calling external program: %s\n"
 +
 +#: g10/exec.c:532 g10/exec.c:599
 +msgid "unnatural exit of external program\n"
 +msgstr "unnatural exit of external program\n"
 +
 +#: g10/exec.c:547
 +msgid "unable to execute external program\n"
 +msgstr "unable to execute external program\n"
 +
 +#: g10/exec.c:564
 +#, c-format
 +msgid "unable to read external program response: %s\n"
 +msgstr "unable to read external program response: %s\n"
 +
 +#: g10/exec.c:610 g10/exec.c:617
 +#, c-format
 +msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 +msgstr "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 +
 +#: g10/exec.c:622
 +#, c-format
 +msgid "WARNING: unable to remove temp directory '%s': %s\n"
 +msgstr "WARNING: unable to remove temp directory '%s': %s\n"
 +
 +#: g10/export.c:106
 +msgid "export signatures that are marked as local-only"
 +msgstr "export signatures that are marked as local-only"
 +
 +#: g10/export.c:108
 +msgid "export attribute user IDs (generally photo IDs)"
 +msgstr "export attribute user IDs (generally photo IDs)"
 +
 +#: g10/export.c:110
 +msgid "export revocation keys marked as \"sensitive\""
 +msgstr "export revocation keys marked as “sensitive”"
 +
 +#: g10/export.c:112
 +msgid "remove unusable parts from key during export"
 +msgstr "remove unusable parts from key during export"
 +
 +#: g10/export.c:114
 +msgid "remove as much as possible from key during export"
 +msgstr "remove as much as possible from key during export"
 +
 +#: g10/export.c:1218
 +msgid " - skipped"
 +msgstr " - skipped"
 +
- #: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:845 g10/sign.c:1148
++#: g10/export.c:1251 g10/import.c:1543 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:847 g10/sign.c:1150
 +#, c-format
 +msgid "writing to '%s'\n"
 +msgstr "writing to ‘%s’\n"
 +
 +#: g10/export.c:1675
 +#, c-format
 +msgid "key %s: key material on-card - skipped\n"
 +msgstr "key %s: key material on-card - skipped\n"
 +
 +#: g10/export.c:1861
 +msgid "exporting secret keys not allowed\n"
 +msgstr "exporting secret keys not allowed\n"
 +
 +#: g10/export.c:1938
 +#, c-format
 +msgid "key %s: PGP 2.x style key - skipped\n"
 +msgstr "key %s: PGP 2.x style key - skipped\n"
 +
 +#: g10/export.c:2026
 +msgid "WARNING: nothing exported\n"
 +msgstr "WARNING: nothing exported\n"
 +
- #: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
- #: g10/plaintext.c:151 g10/plaintext.c:174
++#: g10/export.c:2283 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/plaintext.c:167 g10/plaintext.c:190
 +#, c-format
 +msgid "error creating '%s': %s\n"
 +msgstr "error creating '%s': %s\n"
 +
 +#: g10/getkey.c:257
 +msgid "[User ID not found]"
 +msgstr "[User ID not found]"
 +
 +#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1876
 +#: g10/pkclist.c:989
 +#, c-format
 +msgid "(check argument of option '%s')\n"
 +msgstr "(check argument of option '%s')\n"
 +
 +#: g10/getkey.c:516
 +#, c-format
 +msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
 +msgstr "Warning: ‘%s’ should be a long key ID or a fingerprint\n"
 +
 +#: g10/getkey.c:546
 +#, c-format
 +msgid "error looking up: %s\n"
 +msgstr "error looking up: %s\n"
 +
 +#: g10/getkey.c:636
 +#, c-format
 +msgid "Warning: %s appears in the keyring %d times\n"
 +msgstr "Warning: %s appears in the keyring %d times\n"
 +
 +#: g10/getkey.c:1437
 +#, c-format
 +msgid "automatically retrieved '%s' via %s\n"
 +msgstr "automatically retrieved ‘%s’ via %s\n"
 +
 +#: g10/getkey.c:1443
 +#, c-format
 +msgid "error retrieving '%s' via %s: %s\n"
 +msgstr "error retrieving ‘%s’ via %s: %s\n"
 +
 +#: g10/getkey.c:1445
 +msgid "No fingerprint"
 +msgstr "No fingerprint"
 +
- #: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
- #: g10/revoke.c:701
++#: g10/getkey.c:1873 g10/keyedit.c:2929 g10/keyedit.c:3016 g10/revoke.c:637
++#: g10/revoke.c:702
 +#, c-format
 +msgid "secret key \"%s\" not found: %s\n"
 +msgstr "secret key “%s” not found: %s\n"
 +
 +#: g10/getkey.c:1956
 +#, c-format
 +msgid "Warning: not using '%s' as default key: %s\n"
 +msgstr "Warning: not using ‘%s’ as default key: %s\n"
 +
 +#: g10/getkey.c:1964
 +#, c-format
 +msgid "using \"%s\" as default secret key for signing\n"
 +msgstr "using “%s” as default secret key for signing\n"
 +
 +#: g10/getkey.c:1971
 +#, c-format
 +msgid "all values passed to '%s' ignored\n"
 +msgstr "all values passed to ‘%s’ ignored\n"
 +
 +#: g10/getkey.c:2777
 +#, c-format
 +msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 +msgstr "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 +
 +#: g10/getkey.c:3611
 +#, c-format
 +msgid "using subkey %s instead of primary key %s\n"
 +msgstr "using subkey %s instead of primary key %s\n"
 +
- #: g10/gpg.c:424 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:200
 +msgid "make a signature"
 +msgstr "make a signature"
 +
- #: g10/gpg.c:425
++#: g10/gpg.c:427
 +msgid "make a clear text signature"
 +msgstr "make a clear text signature"
 +
- #: g10/gpg.c:426 sm/gpgsm.c:202
++#: g10/gpg.c:429 sm/gpgsm.c:202
 +msgid "make a detached signature"
 +msgstr "make a detached signature"
 +
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:430 sm/gpgsm.c:203
 +msgid "encrypt data"
 +msgstr "encrypt data"
 +
- #: g10/gpg.c:429
++#: g10/gpg.c:432
 +msgid "encryption only with symmetric cipher"
 +msgstr "encryption only with symmetric cipher"
 +
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:434 sm/gpgsm.c:205
 +msgid "decrypt data (default)"
 +msgstr "decrypt data (default)"
 +
- #: g10/gpg.c:433 sm/gpgsm.c:206
++#: g10/gpg.c:436 sm/gpgsm.c:206
 +msgid "verify a signature"
 +msgstr "verify a signature"
 +
- #: g10/gpg.c:435 sm/gpgsm.c:207
++#: g10/gpg.c:438 sm/gpgsm.c:207
 +msgid "list keys"
 +msgstr "list keys"
 +
- #: g10/gpg.c:437
++#: g10/gpg.c:440
 +msgid "list keys and signatures"
 +msgstr "list keys and signatures"
 +
- #: g10/gpg.c:438
++#: g10/gpg.c:443
 +msgid "list and check key signatures"
 +msgstr "list and check key signatures"
 +
- #: g10/gpg.c:439 sm/gpgsm.c:212
++#: g10/gpg.c:445 sm/gpgsm.c:212
 +msgid "list keys and fingerprints"
 +msgstr "list keys and fingerprints"
 +
- #: g10/gpg.c:440 sm/gpgsm.c:210
++#: g10/gpg.c:446 sm/gpgsm.c:210
 +msgid "list secret keys"
 +msgstr "list secret keys"
 +
- #: g10/gpg.c:442 sm/gpgsm.c:213
++#: g10/gpg.c:448 sm/gpgsm.c:213
 +msgid "generate a new key pair"
 +msgstr "generate a new key pair"
 +
- #: g10/gpg.c:444
++#: g10/gpg.c:451
 +msgid "quickly generate a new key pair"
 +msgstr "quickly generate a new key pair"
 +
- #: g10/gpg.c:446
++#: g10/gpg.c:454
 +msgid "quickly add a new user-id"
 +msgstr "quickly add a new user-id"
 +
- #: g10/gpg.c:449
++#: g10/gpg.c:459
 +msgid "quickly revoke a user-id"
 +msgstr "quickly revoke a user-id"
 +
- #: g10/gpg.c:451
++#: g10/gpg.c:462
++msgid "quickly set a new expiration date"
++msgstr "quickly set a new expiration date"
++
++#: g10/gpg.c:464
 +msgid "full featured key pair generation"
 +msgstr "full featured key pair generation"
 +
- #: g10/gpg.c:452
++#: g10/gpg.c:467
 +msgid "generate a revocation certificate"
 +msgstr "generate a revocation certificate"
 +
- #: g10/gpg.c:454 sm/gpgsm.c:215
++#: g10/gpg.c:470 sm/gpgsm.c:216
 +msgid "remove keys from the public keyring"
 +msgstr "remove keys from the public keyring"
 +
- #: g10/gpg.c:456
++#: g10/gpg.c:472
 +msgid "remove keys from the secret keyring"
 +msgstr "remove keys from the secret keyring"
 +
- #: g10/gpg.c:458
++#: g10/gpg.c:474
 +msgid "quickly sign a key"
 +msgstr "quickly sign a key"
 +
- #: g10/gpg.c:460
++#: g10/gpg.c:476
 +msgid "quickly sign a key locally"
 +msgstr "quickly sign a key locally"
 +
- #: g10/gpg.c:461
++#: g10/gpg.c:477
 +msgid "sign a key"
 +msgstr "sign a key"
 +
- #: g10/gpg.c:462
++#: g10/gpg.c:478
 +msgid "sign a key locally"
 +msgstr "sign a key locally"
 +
- #: g10/gpg.c:463
++#: g10/gpg.c:479
 +msgid "sign or edit a key"
 +msgstr "sign or edit a key"
 +
- #: g10/gpg.c:465 sm/gpgsm.c:233
++#: g10/gpg.c:481 sm/gpgsm.c:234
 +msgid "change a passphrase"
 +msgstr "change a passphrase"
 +
- #: g10/gpg.c:467
++#: g10/gpg.c:485
 +msgid "export keys"
 +msgstr "export keys"
 +
- #: g10/gpg.c:468
++#: g10/gpg.c:486
 +msgid "export keys to a keyserver"
 +msgstr "export keys to a keyserver"
 +
- #: g10/gpg.c:469
++#: g10/gpg.c:487
 +msgid "import keys from a keyserver"
 +msgstr "import keys from a keyserver"
 +
- #: g10/gpg.c:471
++#: g10/gpg.c:490
 +msgid "search for keys on a keyserver"
 +msgstr "search for keys on a keyserver"
 +
- #: g10/gpg.c:473
++#: g10/gpg.c:492
 +msgid "update all keys from a keyserver"
 +msgstr "update all keys from a keyserver"
 +
- #: g10/gpg.c:479
++#: g10/gpg.c:498
 +msgid "import/merge keys"
 +msgstr "import/merge keys"
 +
- #: g10/gpg.c:482
++#: g10/gpg.c:501
 +msgid "print the card status"
 +msgstr "print the card status"
 +
- #: g10/gpg.c:483
++#: g10/gpg.c:502
 +msgid "change data on a card"
 +msgstr "change data on a card"
 +
- #: g10/gpg.c:484
++#: g10/gpg.c:504
 +msgid "change a card's PIN"
 +msgstr "change a card's PIN"
 +
- #: g10/gpg.c:496
++#: g10/gpg.c:516
 +msgid "update the trust database"
 +msgstr "update the trust database"
 +
- #: g10/gpg.c:505
++#: g10/gpg.c:525
 +msgid "print message digests"
 +msgstr "print message digests"
 +
- #: g10/gpg.c:508 sm/gpgsm.c:228
++#: g10/gpg.c:528 sm/gpgsm.c:229
 +msgid "run in server mode"
 +msgstr "run in server mode"
 +
- #: g10/gpg.c:510
++#: g10/gpg.c:530
 +msgid "|VALUE|set the TOFU policy for a key"
 +msgstr "|VALUE|set the TOFU policy for a key"
 +
- #: g10/gpg.c:514 sm/gpgsm.c:246
++#: g10/gpg.c:534 sm/gpgsm.c:248
 +msgid "create ascii armored output"
 +msgstr "create ascii armored output"
 +
- #: g10/gpg.c:517 sm/gpgsm.c:262
++#: g10/gpg.c:537 sm/gpgsm.c:264
 +msgid "|USER-ID|encrypt for USER-ID"
 +msgstr "|USER-ID|encrypt for USER-ID"
 +
- #: g10/gpg.c:533 sm/gpgsm.c:298
++#: g10/gpg.c:553 sm/gpgsm.c:300
 +msgid "|USER-ID|use USER-ID to sign or decrypt"
 +msgstr "|USER-ID|use USER-ID to sign or decrypt"
 +
- #: g10/gpg.c:539
++#: g10/gpg.c:559
 +msgid "|N|set compress level to N (0 disables)"
 +msgstr "|N|set compress level to N (0 disables)"
 +
- #: g10/gpg.c:546
++#: g10/gpg.c:566
 +msgid "use canonical text mode"
 +msgstr "use canonical text mode"
 +
- #: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
++#: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
 +msgid "|FILE|write output to FILE"
 +msgstr "|FILE|write output to FILE"
 +
- #: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
++#: g10/gpg.c:598 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
 +msgid "do not make any changes"
 +msgstr "do not make any changes"
 +
- #: g10/gpg.c:579
++#: g10/gpg.c:599
 +msgid "prompt before overwriting"
 +msgstr "prompt before overwriting"
 +
- #: g10/gpg.c:628
++#: g10/gpg.c:648
 +msgid "use strict OpenPGP behavior"
 +msgstr "use strict OpenPGP behavior"
 +
- #: g10/gpg.c:654 sm/gpgsm.c:355
++#: g10/gpg.c:674 sm/gpgsm.c:357
 +msgid ""
 +"@\n"
 +"(See the man page for a complete listing of all commands and options)\n"
 +msgstr ""
 +"@\n"
 +"(See the man page for a complete listing of all commands and options)\n"
 +
- #: g10/gpg.c:657 sm/gpgsm.c:358
++#: g10/gpg.c:677
 +msgid ""
 +"@\n"
 +"Examples:\n"
 +"\n"
 +" -se -r Bob [file]          sign and encrypt for user Bob\n"
- " --clearsign [file]         make a clear text signature\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"
 +msgstr ""
 +"@\n"
 +"Examples:\n"
 +"\n"
 +" -se -r Bob [file]          sign and encrypt for user Bob\n"
- " --clearsign [file]         make a clear text signature\n"
++" --clear-sign [file]        make a clear text signature\n"
 +" --detach-sign [file]       make a detached signature\n"
 +" --list-keys [names]        show keys\n"
 +" --fingerprint [names]      show fingerprints\n"
 +
- #: g10/gpg.c:1026
++#: g10/gpg.c:1047
 +msgid "Usage: @GPG@ [options] [files] (-h for help)"
 +msgstr "Usage: @GPG@ [options] [files] (-h for help)"
 +
- #: g10/gpg.c:1029
++#: g10/gpg.c:1050
 +msgid ""
 +"Syntax: @GPG@ [options] [files]\n"
 +"Sign, check, encrypt or decrypt\n"
 +"Default operation depends on the input data\n"
 +msgstr ""
 +"Syntax: @GPG@ [options] [files]\n"
 +"Sign, check, encrypt or decrypt\n"
 +"Default operation depends on the input data\n"
 +
- #: g10/gpg.c:1040 sm/gpgsm.c:588
++#: g10/gpg.c:1061 sm/gpgsm.c:580
 +msgid ""
 +"\n"
 +"Supported algorithms:\n"
 +msgstr ""
 +"\n"
 +"Supported algorithms:\n"
 +
- #: g10/gpg.c:1043
++#: g10/gpg.c:1064
 +msgid "Pubkey: "
 +msgstr "Pubkey: "
 +
- #: g10/gpg.c:1050 g10/keyedit.c:3402
++#: g10/gpg.c:1071 g10/keyedit.c:3483
 +msgid "Cipher: "
 +msgstr "Cipher: "
 +
- #: g10/gpg.c:1057
++#: g10/gpg.c:1078
 +msgid "Hash: "
 +msgstr "Hash: "
 +
- #: g10/gpg.c:1064 g10/keyedit.c:3451
++#: g10/gpg.c:1085 g10/keyedit.c:3532
 +msgid "Compression: "
 +msgstr "Compression: "
 +
- #: g10/gpg.c:1133 sm/gpgsm.c:662
++#: g10/gpg.c:1154 sm/gpgsm.c:654
 +#, c-format
 +msgid "usage: %s [options] %s\n"
 +msgstr "usage: %s [options] %s\n"
 +
- #: g10/gpg.c:1321 sm/gpgsm.c:751
++#: g10/gpg.c:1342 sm/gpgsm.c:743
 +msgid "conflicting commands\n"
 +msgstr "conflicting commands\n"
 +
- #: g10/gpg.c:1339
++#: g10/gpg.c:1360
 +#, c-format
 +msgid "no = sign found in group definition '%s'\n"
 +msgstr "no = sign found in group definition ‘%s’\n"
 +
- #: g10/gpg.c:1537
++#: g10/gpg.c:1558
 +#, c-format
 +msgid "WARNING: unsafe ownership on homedir '%s'\n"
 +msgstr "WARNING: unsafe ownership on homedir ‘%s’\n"
 +
- #: g10/gpg.c:1540
++#: g10/gpg.c:1561
 +#, c-format
 +msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 +msgstr "WARNING: unsafe ownership on configuration file ‘%s’\n"
 +
- #: g10/gpg.c:1543
++#: g10/gpg.c:1564
 +#, c-format
 +msgid "WARNING: unsafe ownership on extension '%s'\n"
 +msgstr "WARNING: unsafe ownership on extension ‘%s’\n"
 +
- #: g10/gpg.c:1549
++#: g10/gpg.c:1570
 +#, c-format
 +msgid "WARNING: unsafe permissions on homedir '%s'\n"
 +msgstr "WARNING: unsafe permissions on homedir ‘%s’\n"
 +
- #: g10/gpg.c:1552
++#: g10/gpg.c:1573
 +#, c-format
 +msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 +msgstr "WARNING: unsafe permissions on configuration file ‘%s’\n"
 +
- #: g10/gpg.c:1555
++#: g10/gpg.c:1576
 +#, c-format
 +msgid "WARNING: unsafe permissions on extension '%s'\n"
 +msgstr "WARNING: unsafe permissions on extension ‘%s’\n"
 +
- #: g10/gpg.c:1561
++#: g10/gpg.c:1582
 +#, 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:1564
++#: g10/gpg.c:1585
 +#, 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:1567
++#: g10/gpg.c:1588
 +#, 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:1573
++#: g10/gpg.c:1594
 +#, 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:1576
++#: g10/gpg.c:1597
 +#, 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:1579
++#: g10/gpg.c:1600
 +#, 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:1786
++#: g10/gpg.c:1816
 +#, c-format
 +msgid "unknown configuration item '%s'\n"
 +msgstr "unknown configuration item ‘%s’\n"
 +
- #: g10/gpg.c:1893
++#: g10/gpg.c:1925
 +msgid "display photo IDs during key listings"
 +msgstr "display photo IDs during key listings"
 +
- #: g10/gpg.c:1895
++#: g10/gpg.c:1927
 +msgid "show key usage information during key listings"
 +msgstr "show key usage information during key listings"
 +
- #: g10/gpg.c:1897
++#: g10/gpg.c:1929
 +msgid "show policy URLs during signature listings"
 +msgstr "show policy URLs during signature listings"
 +
- #: g10/gpg.c:1899
++#: g10/gpg.c:1931
 +msgid "show all notations during signature listings"
 +msgstr "show all notations during signature listings"
 +
- #: g10/gpg.c:1901
++#: g10/gpg.c:1933
 +msgid "show IETF standard notations during signature listings"
 +msgstr "show IETF standard notations during signature listings"
 +
- #: g10/gpg.c:1905
++#: g10/gpg.c:1937
 +msgid "show user-supplied notations during signature listings"
 +msgstr "show user-supplied notations during signature listings"
 +
- #: g10/gpg.c:1907
++#: g10/gpg.c:1939
 +msgid "show preferred keyserver URLs during signature listings"
 +msgstr "show preferred keyserver URLs during signature listings"
 +
- #: g10/gpg.c:1909
++#: g10/gpg.c:1941
 +msgid "show user ID validity during key listings"
 +msgstr "show user ID validity during key listings"
 +
- #: g10/gpg.c:1911
++#: g10/gpg.c:1943
 +msgid "show revoked and expired user IDs in key listings"
 +msgstr "show revoked and expired user IDs in key listings"
 +
- #: g10/gpg.c:1913
++#: g10/gpg.c:1945
 +msgid "show revoked and expired subkeys in key listings"
 +msgstr "show revoked and expired subkeys in key listings"
 +
- #: g10/gpg.c:1915
++#: g10/gpg.c:1947
 +msgid "show the keyring name in key listings"
 +msgstr "show the keyring name in key listings"
 +
- #: g10/gpg.c:1917
++#: g10/gpg.c:1949
 +msgid "show expiration dates during signature listings"
 +msgstr "show expiration dates during signature listings"
 +
- #: g10/gpg.c:2019 g10/gpg.c:2056
++#: g10/gpg.c:2051 g10/gpg.c:2088
 +#, c-format
 +msgid "valid values for option '%s':\n"
 +msgstr "valid values for option '%s':\n"
 +
- #: g10/gpg.c:2030
++#: g10/gpg.c:2062
 +#, c-format
 +msgid "unknown TOFU policy '%s'\n"
 +msgstr "unknown TOFU policy ‘%s’\n"
 +
- #: g10/gpg.c:2032 g10/gpg.c:2068
++#: g10/gpg.c:2064 g10/gpg.c:2100
 +msgid "(use \"help\" to list choices)\n"
 +msgstr "(use “help” to list choices)\n"
 +
- #: g10/gpg.c:2066
++#: g10/gpg.c:2098 g10/keygen.c:167
 +#, c-format
 +msgid "invalid value for option '%s'\n"
 +msgstr "invalid value for option ‘%s’\n"
 +
- #: g10/gpg.c:2203
++#: g10/gpg.c:2235
 +#, c-format
 +msgid "Note: old default options file '%s' ignored\n"
 +msgstr "Note: old default options file ‘%s’ ignored\n"
 +
- #: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
++#: g10/gpg.c:2839 g10/gpg.c:3610 g10/gpg.c:3622
 +#, c-format
 +msgid "Note: %s is not for normal use!\n"
 +msgstr "Note: %s is not for normal use!\n"
 +
- #: g10/gpg.c:2978 g10/gpg.c:2990
++#: g10/gpg.c:3011 g10/gpg.c:3023
 +#, c-format
 +msgid "'%s' is not a valid signature expiration\n"
 +msgstr "‘%s’ is not a valid signature expiration\n"
 +
- #: g10/gpg.c:3012
++#: g10/gpg.c:3045
 +#, c-format
 +msgid "\"%s\" is not a proper mail address\n"
 +msgstr "“%s” is not a proper mail address\n"
 +
- #: g10/gpg.c:3044 sm/gpgsm.c:1166
++#: g10/gpg.c:3077 sm/gpgsm.c:1158
 +#, c-format
 +msgid "invalid pinentry mode '%s'\n"
 +msgstr "invalid pinentry mode ‘%s’\n"
 +
- #: g10/gpg.c:3097
++#: g10/gpg.c:3130
 +#, c-format
 +msgid "'%s' is not a valid character set\n"
 +msgstr "‘%s’ is not a valid character set\n"
 +
- #: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
++#: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
 +msgid "could not parse keyserver URL\n"
 +msgstr "could not parse keyserver URL\n"
 +
- #: g10/gpg.c:3137
++#: g10/gpg.c:3170
 +#, c-format
 +msgid "%s:%d: invalid keyserver options\n"
 +msgstr "%s:%d: invalid keyserver options\n"
 +
- #: g10/gpg.c:3140
++#: g10/gpg.c:3173
 +msgid "invalid keyserver options\n"
 +msgstr "invalid keyserver options\n"
 +
- #: g10/gpg.c:3147
++#: g10/gpg.c:3180
 +#, c-format
 +msgid "%s:%d: invalid import options\n"
 +msgstr "%s:%d: invalid import options\n"
 +
- #: g10/gpg.c:3150
++#: g10/gpg.c:3183
 +msgid "invalid import options\n"
 +msgstr "invalid import options\n"
 +
- #: g10/gpg.c:3156 g10/gpg.c:3171
++#: g10/gpg.c:3189 g10/gpg.c:3204
 +#, c-format
 +msgid "invalid filter option: %s\n"
 +msgstr "invalid filter option: %s\n"
 +
- #: g10/gpg.c:3162
++#: g10/gpg.c:3195
 +#, c-format
 +msgid "%s:%d: invalid export options\n"
 +msgstr "%s:%d: invalid export options\n"
 +
- #: g10/gpg.c:3165
++#: g10/gpg.c:3198
 +msgid "invalid export options\n"
 +msgstr "invalid export options\n"
 +
- #: g10/gpg.c:3177
++#: g10/gpg.c:3210
 +#, c-format
 +msgid "%s:%d: invalid list options\n"
 +msgstr "%s:%d: invalid list options\n"
 +
- #: g10/gpg.c:3180
++#: g10/gpg.c:3213
 +msgid "invalid list options\n"
 +msgstr "invalid list options\n"
 +
- #: g10/gpg.c:3188
++#: g10/gpg.c:3221
 +msgid "display photo IDs during signature verification"
 +msgstr "display photo IDs during signature verification"
 +
- #: g10/gpg.c:3190
++#: g10/gpg.c:3223
 +msgid "show policy URLs during signature verification"
 +msgstr "show policy URLs during signature verification"
 +
- #: g10/gpg.c:3192
++#: g10/gpg.c:3225
 +msgid "show all notations during signature verification"
 +msgstr "show all notations during signature verification"
 +
- #: g10/gpg.c:3194
++#: g10/gpg.c:3227
 +msgid "show IETF standard notations during signature verification"
 +msgstr "show IETF standard notations during signature verification"
 +
- #: g10/gpg.c:3198
++#: g10/gpg.c:3231
 +msgid "show user-supplied notations during signature verification"
 +msgstr "show user-supplied notations during signature verification"
 +
- #: g10/gpg.c:3200
++#: g10/gpg.c:3233
 +msgid "show preferred keyserver URLs during signature verification"
 +msgstr "show preferred keyserver URLs during signature verification"
 +
- #: g10/gpg.c:3202
++#: g10/gpg.c:3235
 +msgid "show user ID validity during signature verification"
 +msgstr "show user ID validity during signature verification"
 +
- #: g10/gpg.c:3204
++#: g10/gpg.c:3237
 +msgid "show revoked and expired user IDs in signature verification"
 +msgstr "show revoked and expired user IDs in signature verification"
 +
- #: g10/gpg.c:3206
++#: g10/gpg.c:3239
 +msgid "show only the primary user ID in signature verification"
 +msgstr "show only the primary user ID in signature verification"
 +
- #: g10/gpg.c:3208
++#: g10/gpg.c:3241
 +msgid "validate signatures with PKA data"
 +msgstr "validate signatures with PKA data"
 +
- #: g10/gpg.c:3210
++#: g10/gpg.c:3243
 +msgid "elevate the trust of signatures with valid PKA data"
 +msgstr "elevate the trust of signatures with valid PKA data"
 +
- #: g10/gpg.c:3217
++#: g10/gpg.c:3250
 +#, c-format
 +msgid "%s:%d: invalid verify options\n"
 +msgstr "%s:%d: invalid verify options\n"
 +
- #: g10/gpg.c:3220
++#: g10/gpg.c:3253
 +msgid "invalid verify options\n"
 +msgstr "invalid verify options\n"
 +
- #: g10/gpg.c:3227
++#: g10/gpg.c:3260
 +#, c-format
 +msgid "unable to set exec-path to %s\n"
 +msgstr "unable to set exec-path to %s\n"
 +
- #: g10/gpg.c:3417
++#: g10/gpg.c:3452
 +#, c-format
 +msgid "%s:%d: invalid auto-key-locate list\n"
 +msgstr "%s:%d: invalid auto-key-locate list\n"
 +
- #: g10/gpg.c:3420
++#: g10/gpg.c:3455
 +msgid "invalid auto-key-locate list\n"
 +msgstr "invalid auto-key-locate list\n"
 +
- #: g10/gpg.c:3553 sm/gpgsm.c:1507
++#: g10/gpg.c:3592 sm/gpgsm.c:1501
 +msgid "WARNING: program may create a core file!\n"
 +msgstr "WARNING: program may create a core file!\n"
 +
- #: g10/gpg.c:3564
++#: g10/gpg.c:3603
 +#, c-format
 +msgid "WARNING: %s overrides %s\n"
 +msgstr "WARNING: %s overrides %s\n"
 +
- #: g10/gpg.c:3573
++#: g10/gpg.c:3612
 +#, c-format
 +msgid "%s not allowed with %s!\n"
 +msgstr "%s not allowed with %s!\n"
 +
- #: g10/gpg.c:3576
++#: g10/gpg.c:3615
 +#, c-format
 +msgid "%s makes no sense with %s!\n"
 +msgstr "%s makes no sense with %s!\n"
 +
- #: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
++#: g10/gpg.c:3630 sm/gpgsm.c:1518 dirmngr/dirmngr.c:951
 +msgid "WARNING: running with faked system time: "
 +msgstr "WARNING: running with faked system time: "
 +
- #: g10/gpg.c:3612
++#: g10/gpg.c:3651
 +#, 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:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
++#: g10/gpg.c:3686 g10/gpg.c:3710 sm/gpgsm.c:1585
 +msgid "selected cipher algorithm is invalid\n"
 +msgstr "selected cipher algorithm is invalid\n"
 +
- #: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
++#: g10/gpg.c:3692 g10/gpg.c:3716 sm/gpgsm.c:1591 sm/gpgsm.c:1597
 +msgid "selected digest algorithm is invalid\n"
 +msgstr "selected digest algorithm is invalid\n"
 +
- #: g10/gpg.c:3659
++#: g10/gpg.c:3698
 +msgid "selected compression algorithm is invalid\n"
 +msgstr "selected compression algorithm is invalid\n"
 +
- #: g10/gpg.c:3665
++#: g10/gpg.c:3704
 +msgid "selected certification digest algorithm is invalid\n"
 +msgstr "selected certification digest algorithm is invalid\n"
 +
- #: g10/gpg.c:3680
++#: g10/gpg.c:3719
 +msgid "completes-needed must be greater than 0\n"
 +msgstr "completes-needed must be greater than 0\n"
 +
- #: g10/gpg.c:3682
++#: g10/gpg.c:3721
 +msgid "marginals-needed must be greater than 1\n"
 +msgstr "marginals-needed must be greater than 1\n"
 +
- #: g10/gpg.c:3684
++#: g10/gpg.c:3723
 +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:3686
++#: g10/gpg.c:3725
 +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:3688
++#: g10/gpg.c:3727
 +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:3691
++#: g10/gpg.c:3730
 +msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 +msgstr "Note: simple S2K mode (0) is strongly discouraged\n"
 +
- #: g10/gpg.c:3695
++#: g10/gpg.c:3734
 +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:3702
++#: g10/gpg.c:3741
 +msgid "invalid default preferences\n"
 +msgstr "invalid default preferences\n"
 +
- #: g10/gpg.c:3706
++#: g10/gpg.c:3745
 +msgid "invalid personal cipher preferences\n"
 +msgstr "invalid personal cipher preferences\n"
 +
- #: g10/gpg.c:3710
++#: g10/gpg.c:3749
 +msgid "invalid personal digest preferences\n"
 +msgstr "invalid personal digest preferences\n"
 +
- #: g10/gpg.c:3714
++#: g10/gpg.c:3753
 +msgid "invalid personal compress preferences\n"
 +msgstr "invalid personal compress preferences\n"
 +
- #: g10/gpg.c:3750
++#: g10/gpg.c:3789
 +#, c-format
 +msgid "%s does not yet work with %s\n"
 +msgstr "%s does not yet work with %s\n"
 +
- #: g10/gpg.c:3797
++#: g10/gpg.c:3836
 +#, c-format
 +msgid "you may not use cipher algorithm '%s' while in %s mode\n"
 +msgstr "you may not use cipher algorithm ‘%s’ while in %s mode\n"
 +
- #: g10/gpg.c:3802
++#: g10/gpg.c:3841
 +#, c-format
 +msgid "you may not use digest algorithm '%s' while in %s mode\n"
 +msgstr "you may not use digest algorithm ‘%s’ while in %s mode\n"
 +
- #: g10/gpg.c:3807
++#: g10/gpg.c:3846
 +#, c-format
 +msgid "you may not use compression algorithm '%s' while in %s mode\n"
 +msgstr "you may not use compression algorithm ‘%s’ while in %s mode\n"
 +
- #: g10/gpg.c:3906
++#: g10/gpg.c:3945
 +#, c-format
 +msgid "failed to initialize the TrustDB: %s\n"
 +msgstr "failed to initialize the TrustDB: %s\n"
 +
- #: g10/gpg.c:3918
++#: g10/gpg.c:3957
 +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:3975
- msgid "--store [filename]"
- msgstr "--store [filename]"
- 
- #: g10/gpg.c:3985
- msgid "--symmetric [filename]"
- msgstr "--symmetric [filename]"
- 
- #: g10/gpg.c:3989
++#: g10/gpg.c:4028
 +#, c-format
 +msgid "symmetric encryption of '%s' failed: %s\n"
 +msgstr "symmetric encryption of ‘%s’ failed: %s\n"
 +
- #: g10/gpg.c:4000
- msgid "--encrypt [filename]"
- msgstr "--encrypt [filename]"
- 
- #: g10/gpg.c:4016
- msgid "--symmetric --encrypt [filename]"
- msgstr "--symmetric --encrypt [filename]"
- 
- #: g10/gpg.c:4018
++#: g10/gpg.c:4057
 +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:4021
++#: g10/gpg.c:4060
 +#, c-format
 +msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 +msgstr "you cannot use --symmetric --encrypt while in %s mode\n"
 +
- #: g10/gpg.c:4042
- msgid "--sign [filename]"
- msgstr "--sign [filename]"
- 
- #: g10/gpg.c:4058
- msgid "--sign --encrypt [filename]"
- msgstr "--sign --encrypt [filename]"
- 
- #: g10/gpg.c:4076
- msgid "--symmetric --sign --encrypt [filename]"
- msgstr "--symmetric --sign --encrypt [filename]"
- 
- #: g10/gpg.c:4078
++#: g10/gpg.c:4117
 +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:4081
++#: g10/gpg.c:4120
 +#, c-format
 +msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 +msgstr "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 +
- #: g10/gpg.c:4105
- msgid "--sign --symmetric [filename]"
- msgstr "--sign --symmetric [filename]"
- 
- #: g10/gpg.c:4117
- msgid "--clearsign [filename]"
- msgstr "--clearsign [filename]"
- 
- #: g10/gpg.c:4147
- msgid "--decrypt [filename]"
- msgstr "--decrypt [filename]"
- 
- #: g10/gpg.c:4174
- msgid "--sign-key user-id"
- msgstr "--sign-key user-id"
- 
- #: g10/gpg.c:4178
- msgid "--lsign-key user-id"
- msgstr "--lsign-key user-id"
- 
- #: g10/gpg.c:4199
- msgid "--edit-key user-id [commands]"
- msgstr "--edit-key user-id [commands]"
- 
- #: g10/gpg.c:4215
- msgid "--passwd <user-id>"
- msgstr "--passwd <user-id>"
- 
- #: g10/gpg.c:4411 g10/keyserver.c:1837
++#: g10/gpg.c:4462 g10/keyserver.c:1837
 +#, c-format
 +msgid "keyserver send failed: %s\n"
 +msgstr "keyserver send failed: %s\n"
 +
- #: g10/gpg.c:4416
++#: g10/gpg.c:4467
 +#, c-format
 +msgid "keyserver receive failed: %s\n"
 +msgstr "keyserver receive failed: %s\n"
 +
- #: g10/gpg.c:4422
++#: g10/gpg.c:4473
 +#, c-format
 +msgid "key export failed: %s\n"
 +msgstr "key export failed: %s\n"
 +
- #: g10/gpg.c:4435
++#: g10/gpg.c:4486
 +#, c-format
 +msgid "export as ssh key failed: %s\n"
 +msgstr "export as ssh key failed: %s\n"
 +
- #: g10/gpg.c:4447
++#: g10/gpg.c:4498
 +#, c-format
 +msgid "keyserver search failed: %s\n"
 +msgstr "keyserver search failed: %s\n"
 +
- #: g10/gpg.c:4460
++#: g10/gpg.c:4511
 +#, c-format
 +msgid "keyserver refresh failed: %s\n"
 +msgstr "keyserver refresh failed: %s\n"
 +
- #: g10/gpg.c:4527
++#: g10/gpg.c:4578
 +#, c-format
 +msgid "dearmoring failed: %s\n"
 +msgstr "dearmoring failed: %s\n"
 +
- #: g10/gpg.c:4538
++#: g10/gpg.c:4589
 +#, c-format
 +msgid "enarmoring failed: %s\n"
 +msgstr "enarmoring failed: %s\n"
 +
- #: g10/gpg.c:4630
++#: g10/gpg.c:4681
 +#, c-format
 +msgid "invalid hash algorithm '%s'\n"
 +msgstr "invalid hash algorithm ‘%s’\n"
 +
- #: g10/gpg.c:4776 g10/tofu.c:2002
++#: g10/gpg.c:4827 g10/tofu.c:2151
 +#, c-format
 +msgid "error parsing key specification '%s': %s\n"
 +msgstr "error parsing key specification '%s': %s\n"
 +
- #: g10/gpg.c:4788
++#: g10/gpg.c:4839
 +#, 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:4835
- msgid "[filename]"
- msgstr "[filename]"
- 
- #: g10/gpg.c:4841
++#: g10/gpg.c:4894
 +msgid "Go ahead and type your message ...\n"
 +msgstr "Go ahead and type your message ...\n"
 +
- #: g10/gpg.c:5179
++#: g10/gpg.c:5232
 +msgid "the given certification policy URL is invalid\n"
 +msgstr "the given certification policy URL is invalid\n"
 +
- #: g10/gpg.c:5181
++#: g10/gpg.c:5234
 +msgid "the given signature policy URL is invalid\n"
 +msgstr "the given signature policy URL is invalid\n"
 +
- #: g10/gpg.c:5214
++#: g10/gpg.c:5267
 +msgid "the given preferred keyserver URL is invalid\n"
 +msgstr "the given preferred keyserver URL is invalid\n"
 +
 +#: g10/gpgv.c:77
 +msgid "|FILE|take the keys from the keyring FILE"
 +msgstr "|FILE|take the keys from the keyring FILE"
 +
 +#: g10/gpgv.c:80
 +msgid "make timestamp conflicts only a warning"
 +msgstr "make timestamp conflicts only a warning"
 +
- #: g10/gpgv.c:82 sm/gpgsm.c:345
++#: g10/gpgv.c:82 sm/gpgsm.c:347
 +msgid "|FD|write status info to this FD"
 +msgstr "|FD|write status info to this FD"
 +
 +#: g10/gpgv.c:86
 +msgid "|ALGO|reject signatures made with ALGO"
 +msgstr "|ALGO|reject signatures made with ALGO"
 +
 +#: g10/gpgv.c:124
 +msgid "Usage: gpgv [options] [files] (-h for help)"
 +msgstr "Usage: gpgv [options] [files] (-h for help)"
 +
 +#: g10/gpgv.c:126
 +msgid ""
 +"Syntax: gpgv [options] [files]\n"
 +"Check signatures against known trusted keys\n"
 +msgstr ""
 +"Syntax: gpgv [options] [files]\n"
 +"Check signatures against known trusted keys\n"
 +
 +#: g10/helptext.c:72
 +msgid "No help available"
 +msgstr "No help available"
 +
 +#: g10/helptext.c:82
 +#, c-format
 +msgid "No help available for '%s'"
 +msgstr "No help available for ‘%s’"
 +
- #: g10/import.c:151
++#: g10/import.c:152
 +msgid "import signatures that are marked as local-only"
 +msgstr "import signatures that are marked as local-only"
 +
- #: g10/import.c:154
++#: g10/import.c:155
 +msgid "repair damage from the pks keyserver during import"
 +msgstr "repair damage from the pks keyserver during import"
 +
- #: g10/import.c:157
++#: g10/import.c:158
 +msgid "do not clear the ownertrust values during import"
 +msgstr "do not clear the ownertrust values during import"
 +
- #: g10/import.c:160
++#: g10/import.c:161
 +msgid "do not update the trustdb after import"
 +msgstr "do not update the trustdb after import"
 +
- #: g10/import.c:163
++#: g10/import.c:164
 +msgid "show key during import"
 +msgstr "show key during import"
 +
- #: g10/import.c:166
++#: g10/import.c:167
 +msgid "only accept updates to existing keys"
 +msgstr "only accept updates to existing keys"
 +
- #: g10/import.c:169
++#: g10/import.c:170
 +msgid "remove unusable parts from key after import"
 +msgstr "remove unusable parts from key after import"
 +
- #: g10/import.c:172
++#: g10/import.c:173
 +msgid "remove as much as possible from key after import"
 +msgstr "remove as much as possible from key after import"
 +
- #: g10/import.c:175
++#: g10/import.c:176
 +msgid "run import filters and export key immediately"
 +msgstr "run import filters and export key immediately"
 +
- #: g10/import.c:326 g10/import.c:568
++#: g10/import.c:327 g10/import.c:569
 +#, c-format
 +msgid "skipping block of type %d\n"
 +msgstr "skipping block of type %d\n"
 +
- #: g10/import.c:585
++#: g10/import.c:586
 +#, c-format
 +msgid "%lu keys processed so far\n"
 +msgstr "%lu keys processed so far\n"
 +
- #: g10/import.c:655
++#: g10/import.c:656
 +#, c-format
 +msgid "Total number processed: %lu\n"
 +msgstr "Total number processed: %lu\n"
 +
- #: g10/import.c:658
++#: g10/import.c:659
 +#, c-format
 +msgid "    skipped PGP-2 keys: %lu\n"
 +msgstr "    skipped PGP-2 keys: %lu\n"
 +
- #: g10/import.c:660
++#: g10/import.c:661
 +#, c-format
 +msgid "      skipped new keys: %lu\n"
 +msgstr "      skipped new keys: %lu\n"
 +
- #: g10/import.c:663
++#: g10/import.c:664
 +#, c-format
 +msgid "          w/o user IDs: %lu\n"
 +msgstr "          w/o user IDs: %lu\n"
 +
- #: g10/import.c:666 sm/import.c:130
++#: g10/import.c:667 sm/import.c:130
 +#, c-format
 +msgid "              imported: %lu"
 +msgstr "              imported: %lu"
 +
- #: g10/import.c:670 sm/import.c:134
++#: g10/import.c:671 sm/import.c:134
 +#, c-format
 +msgid "             unchanged: %lu\n"
 +msgstr "             unchanged: %lu\n"
 +
- #: g10/import.c:672
++#: g10/import.c:673
 +#, c-format
 +msgid "          new user IDs: %lu\n"
 +msgstr "          new user IDs: %lu\n"
 +
- #: g10/import.c:674
++#: g10/import.c:675
 +#, c-format
 +msgid "           new subkeys: %lu\n"
 +msgstr "           new subkeys: %lu\n"
 +
- #: g10/import.c:676
++#: g10/import.c:677
 +#, c-format
 +msgid "        new signatures: %lu\n"
 +msgstr "        new signatures: %lu\n"
 +
- #: g10/import.c:678
++#: g10/import.c:679
 +#, c-format
 +msgid "   new key revocations: %lu\n"
 +msgstr "   new key revocations: %lu\n"
 +
- #: g10/import.c:680 sm/import.c:136
++#: g10/import.c:681 sm/import.c:136
 +#, c-format
 +msgid "      secret keys read: %lu\n"
 +msgstr "      secret keys read: %lu\n"
 +
- #: g10/import.c:682 sm/import.c:138
++#: g10/import.c:683 sm/import.c:138
 +#, c-format
 +msgid "  secret keys imported: %lu\n"
 +msgstr "  secret keys imported: %lu\n"
 +
- #: g10/import.c:684 sm/import.c:140
++#: g10/import.c:685 sm/import.c:140
 +#, c-format
 +msgid " secret keys unchanged: %lu\n"
 +msgstr " secret keys unchanged: %lu\n"
 +
- #: g10/import.c:686 sm/import.c:142
++#: g10/import.c:687 sm/import.c:142
 +#, c-format
 +msgid "          not imported: %lu\n"
 +msgstr "          not imported: %lu\n"
 +
- #: g10/import.c:688
++#: g10/import.c:689
 +#, c-format
 +msgid "    signatures cleaned: %lu\n"
 +msgstr "    signatures cleaned: %lu\n"
 +
- #: g10/import.c:690
++#: g10/import.c:691
 +#, c-format
 +msgid "      user IDs cleaned: %lu\n"
 +msgstr "      user IDs cleaned: %lu\n"
 +
- #: g10/import.c:1034
++#: g10/import.c:1035
 +#, c-format
 +msgid ""
 +"WARNING: key %s contains preferences for unavailable\n"
 +"algorithms on these user IDs:\n"
 +msgstr ""
 +"WARNING: key %s contains preferences for unavailable\n"
 +"algorithms on these user IDs:\n"
 +
- #: g10/import.c:1076
++#: g10/import.c:1077
 +#, c-format
 +msgid "         \"%s\": preference for cipher algorithm %s\n"
 +msgstr "         “%s”: preference for cipher algorithm %s\n"
 +
- #: g10/import.c:1091
++#: g10/import.c:1092
 +#, c-format
 +msgid "         \"%s\": preference for digest algorithm %s\n"
 +msgstr "         “%s”: preference for digest algorithm %s\n"
 +
- #: g10/import.c:1103
++#: g10/import.c:1104
 +#, c-format
 +msgid "         \"%s\": preference for compression algorithm %s\n"
 +msgstr "         “%s”: preference for compression algorithm %s\n"
 +
- #: g10/import.c:1116
++#: g10/import.c:1117
 +msgid "it is strongly suggested that you update your preferences and\n"
 +msgstr "it is strongly suggested that you update your preferences and\n"
 +
- #: g10/import.c:1118
++#: g10/import.c:1119
 +msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 +msgstr ""
 +"re-distribute this key to avoid potential algorithm mismatch problems\n"
 +
- #: g10/import.c:1143
++#: g10/import.c:1144
 +#, c-format
 +msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 +msgstr "you can update your preferences with: gpg --edit-key %s updpref save\n"
 +
- #: g10/import.c:1379 g10/import.c:2167
++#: g10/import.c:1380 g10/import.c:2168
 +#, c-format
 +msgid "key %s: no user ID\n"
 +msgstr "key %s: no user ID\n"
 +
- #: g10/import.c:1385
++#: g10/import.c:1386
 +#, c-format
 +msgid "key %s: %s\n"
 +msgstr "key %s: %s\n"
 +
- #: g10/import.c:1386 g10/import.c:2141
++#: g10/import.c:1387 g10/import.c:2142
 +msgid "rejected by import screener"
 +msgstr "rejected by import screener"
 +
- #: g10/import.c:1416
++#: g10/import.c:1417
 +#, c-format
 +msgid "key %s: PKS subkey corruption repaired\n"
 +msgstr "key %s: PKS subkey corruption repaired\n"
 +
- #: g10/import.c:1434
++#: g10/import.c:1435
 +#, c-format
 +msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 +msgstr "key %s: accepted non self-signed user ID “%s”\n"
 +
- #: g10/import.c:1444 g10/import.c:1475
++#: g10/import.c:1445 g10/import.c:1476
 +#, c-format
 +msgid "key %s: no valid user IDs\n"
 +msgstr "key %s: no valid user IDs\n"
 +
- #: g10/import.c:1446
++#: g10/import.c:1447
 +msgid "this may be caused by a missing self-signature\n"
 +msgstr "this may be caused by a missing self-signature\n"
 +
- #: g10/import.c:1516 g10/import.c:2318
++#: g10/import.c:1517 g10/import.c:2319
 +#, c-format
 +msgid "key %s: public key not found: %s\n"
 +msgstr "key %s: public key not found: %s\n"
 +
- #: g10/import.c:1522
++#: g10/import.c:1523
 +#, c-format
 +msgid "key %s: new key - skipped\n"
 +msgstr "key %s: new key - skipped\n"
 +
- #: g10/import.c:1537
++#: g10/import.c:1538
 +#, c-format
 +msgid "no writable keyring found: %s\n"
 +msgstr "no writable keyring found: %s\n"
 +
- #: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
++#: g10/import.c:1547 g10/import.c:1648 g10/import.c:2385
 +#, c-format
 +msgid "error writing keyring '%s': %s\n"
 +msgstr "error writing keyring '%s': %s\n"
 +
- #: g10/import.c:1566
++#: g10/import.c:1567
 +#, c-format
 +msgid "key %s: public key \"%s\" imported\n"
 +msgstr "key %s: public key “%s” imported\n"
 +
- #: g10/import.c:1590
++#: g10/import.c:1591
 +#, c-format
 +msgid "key %s: doesn't match our copy\n"
 +msgstr "key %s: doesn't match our copy\n"
 +
- #: g10/import.c:1606 g10/import.c:2342
++#: g10/import.c:1607 g10/import.c:2343
 +#, c-format
 +msgid "key %s: can't locate original keyblock: %s\n"
 +msgstr "key %s: can't locate original keyblock: %s\n"
 +
- #: g10/import.c:1614 g10/import.c:2349
++#: g10/import.c:1615 g10/import.c:2350
 +#, c-format
 +msgid "key %s: can't read original keyblock: %s\n"
 +msgstr "key %s: can't read original keyblock: %s\n"
 +
- #: g10/import.c:1657
++#: g10/import.c:1658
 +#, c-format
 +msgid "key %s: \"%s\" 1 new user ID\n"
 +msgstr "key %s: “%s” 1 new user ID\n"
 +
- #: g10/import.c:1660
++#: g10/import.c:1661
 +#, c-format
 +msgid "key %s: \"%s\" %d new user IDs\n"
 +msgstr "key %s: “%s” %d new user IDs\n"
 +
- #: g10/import.c:1663
++#: g10/import.c:1664
 +#, c-format
 +msgid "key %s: \"%s\" 1 new signature\n"
 +msgstr "key %s: “%s” 1 new signature\n"
 +
- #: g10/import.c:1666
++#: g10/import.c:1667
 +#, c-format
 +msgid "key %s: \"%s\" %d new signatures\n"
 +msgstr "key %s: “%s” %d new signatures\n"
 +
- #: g10/import.c:1669
++#: g10/import.c:1670
 +#, c-format
 +msgid "key %s: \"%s\" 1 new subkey\n"
 +msgstr "key %s: “%s” 1 new subkey\n"
 +
- #: g10/import.c:1672
++#: g10/import.c:1673
 +#, c-format
 +msgid "key %s: \"%s\" %d new subkeys\n"
 +msgstr "key %s: “%s” %d new subkeys\n"
 +
- #: g10/import.c:1675
++#: g10/import.c:1676
 +#, c-format
 +msgid "key %s: \"%s\" %d signature cleaned\n"
 +msgstr "key %s: “%s” %d signature cleaned\n"
 +
- #: g10/import.c:1678
++#: g10/import.c:1679
 +#, c-format
 +msgid "key %s: \"%s\" %d signatures cleaned\n"
 +msgstr "key %s: “%s” %d signatures cleaned\n"
 +
- #: g10/import.c:1681
++#: g10/import.c:1682
 +#, c-format
 +msgid "key %s: \"%s\" %d user ID cleaned\n"
 +msgstr "key %s: “%s” %d user ID cleaned\n"
 +
- #: g10/import.c:1684
++#: g10/import.c:1685
 +#, c-format
 +msgid "key %s: \"%s\" %d user IDs cleaned\n"
 +msgstr "key %s: “%s” %d user IDs cleaned\n"
 +
- #: g10/import.c:1707
++#: g10/import.c:1708
 +#, c-format
 +msgid "key %s: \"%s\" not changed\n"
 +msgstr "key %s: “%s” not changed\n"
 +
- #: g10/import.c:2019 g10/import.c:2264
++#: g10/import.c:2020 g10/import.c:2265
 +#, c-format
 +msgid "key %s: secret key imported\n"
 +msgstr "key %s: secret key imported\n"
 +
- #: g10/import.c:2027
++#: g10/import.c:2028
 +#, c-format
 +msgid "key %s: secret key already exists\n"
 +msgstr "key %s: secret key already exists\n"
 +
- #: g10/import.c:2035
++#: g10/import.c:2036
 +#, c-format
 +msgid "key %s: error sending to agent: %s\n"
 +msgstr "key %s: error sending to agent: %s\n"
 +
- #: g10/import.c:2140
++#: g10/import.c:2141
 +#, c-format
 +msgid "secret key %s: %s\n"
 +msgstr "secret key %s: %s\n"
 +
- #: g10/import.c:2160 g10/import.c:2195
++#: g10/import.c:2161 g10/import.c:2196
 +msgid "importing secret keys not allowed\n"
 +msgstr "importing secret keys not allowed\n"
 +
- #: g10/import.c:2184
++#: g10/import.c:2185
 +#, c-format
 +msgid "key %s: secret key with invalid cipher %d - skipped\n"
 +msgstr "key %s: secret key with invalid cipher %d - skipped\n"
 +
 +#. TRANSLATORS: For smartcard, each private key on
 +#. host has a reference (stub) to a smartcard and
 +#. actual private key data is stored on the card.  A
 +#. single smartcard can have up to three private key
 +#. data.  Importing private key stub is always
 +#. skipped in 2.1, and it returns
 +#. GPG_ERR_NOT_PROCESSED.  Instead, user should be
 +#. suggested to run 'gpg --card-status', then,
 +#. references to a card will be automatically
 +#. created again.
- #: g10/import.c:2256
++#: g10/import.c:2257
 +#, c-format
 +msgid "To migrate '%s', with each smartcard, run: %s\n"
 +msgstr "To migrate '%s', with each smartcard, run: %s\n"
 +
- #: g10/import.c:2311
++#: g10/import.c:2312
 +#, c-format
 +msgid "key %s: no public key - can't apply revocation certificate\n"
 +msgstr "key %s: no public key - can't apply revocation certificate\n"
 +
- #: g10/import.c:2360
++#: g10/import.c:2361
 +#, c-format
 +msgid "key %s: invalid revocation certificate: %s - rejected\n"
 +msgstr "key %s: invalid revocation certificate: %s - rejected\n"
 +
- #: g10/import.c:2393
++#: g10/import.c:2394
 +#, c-format
 +msgid "key %s: \"%s\" revocation certificate imported\n"
 +msgstr "key %s: “%s” revocation certificate imported\n"
 +
- #: g10/import.c:2469
++#: g10/import.c:2470
 +#, c-format
 +msgid "key %s: no user ID for signature\n"
 +msgstr "key %s: no user ID for signature\n"
 +
- #: g10/import.c:2486
++#: g10/import.c:2487
 +#, c-format
 +msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 +msgstr "key %s: unsupported public key algorithm on user ID “%s”\n"
 +
- #: g10/import.c:2488
++#: g10/import.c:2489
 +#, c-format
 +msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 +msgstr "key %s: invalid self-signature on user ID “%s”\n"
 +
- #: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
++#: g10/import.c:2506 g10/import.c:2532 g10/import.c:2583
 +#, c-format
 +msgid "key %s: unsupported public key algorithm\n"
 +msgstr "key %s: unsupported public key algorithm\n"
 +
- #: g10/import.c:2506
++#: g10/import.c:2507
 +#, c-format
 +msgid "key %s: invalid direct key signature\n"
 +msgstr "key %s: invalid direct key signature\n"
 +
- #: g10/import.c:2520
++#: g10/import.c:2521
 +#, c-format
 +msgid "key %s: no subkey for key binding\n"
 +msgstr "key %s: no subkey for key binding\n"
 +
- #: g10/import.c:2533
++#: g10/import.c:2534
 +#, c-format
 +msgid "key %s: invalid subkey binding\n"
 +msgstr "key %s: invalid subkey binding\n"
 +
- #: g10/import.c:2549
++#: g10/import.c:2550
 +#, c-format
 +msgid "key %s: removed multiple subkey binding\n"
 +msgstr "key %s: removed multiple subkey binding\n"
 +
- #: g10/import.c:2571
++#: g10/import.c:2572
 +#, c-format
 +msgid "key %s: no subkey for key revocation\n"
 +msgstr "key %s: no subkey for key revocation\n"
 +
- #: g10/import.c:2584
++#: g10/import.c:2585
 +#, c-format
 +msgid "key %s: invalid subkey revocation\n"
 +msgstr "key %s: invalid subkey revocation\n"
 +
- #: g10/import.c:2599
++#: g10/import.c:2600
 +#, c-format
 +msgid "key %s: removed multiple subkey revocation\n"
 +msgstr "key %s: removed multiple subkey revocation\n"
 +
- #: g10/import.c:2641
++#: g10/import.c:2642
 +#, c-format
 +msgid "key %s: skipped user ID \"%s\"\n"
 +msgstr "key %s: skipped user ID “%s”\n"
 +
- #: g10/import.c:2665
++#: g10/import.c:2666
 +#, c-format
 +msgid "key %s: skipped subkey\n"
 +msgstr "key %s: skipped subkey\n"
 +
- #: g10/import.c:2694
++#: g10/import.c:2695
 +#, c-format
 +msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 +msgstr "key %s: non exportable signature (class 0x%02X) - skipped\n"
 +
- #: g10/import.c:2705
++#: g10/import.c:2706
 +#, c-format
 +msgid "key %s: revocation certificate at wrong place - skipped\n"
 +msgstr "key %s: revocation certificate at wrong place - skipped\n"
 +
- #: g10/import.c:2723
++#: g10/import.c:2724
 +#, c-format
 +msgid "key %s: invalid revocation certificate: %s - skipped\n"
 +msgstr "key %s: invalid revocation certificate: %s - skipped\n"
 +
- #: g10/import.c:2737
++#: g10/import.c:2738
 +#, c-format
 +msgid "key %s: subkey signature in wrong place - skipped\n"
 +msgstr "key %s: subkey signature in wrong place - skipped\n"
 +
- #: g10/import.c:2745
++#: g10/import.c:2746
 +#, c-format
 +msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 +msgstr "key %s: unexpected signature class (0x%02X) - skipped\n"
 +
- #: g10/import.c:2887
++#: g10/import.c:2888
 +#, c-format
 +msgid "key %s: duplicated user ID detected - merged\n"
 +msgstr "key %s: duplicated user ID detected - merged\n"
 +
- #: g10/import.c:2951
++#: g10/import.c:2952
 +#, c-format
 +msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 +msgstr "WARNING: key %s may be revoked: fetching revocation key %s\n"
 +
- #: g10/import.c:2967
++#: g10/import.c:2968
 +#, c-format
 +msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 +msgstr "WARNING: key %s may be revoked: revocation key %s not present.\n"
 +
- #: g10/import.c:3031
++#: g10/import.c:3032
 +#, c-format
 +msgid "key %s: \"%s\" revocation certificate added\n"
 +msgstr "key %s: “%s” revocation certificate added\n"
 +
- #: g10/import.c:3069
++#: g10/import.c:3070
 +#, c-format
 +msgid "key %s: direct key signature added\n"
 +msgstr "key %s: direct key signature added\n"
 +
 +#: g10/keydb.c:404 g10/keydb.c:431 sm/keydb.c:213 sm/keydb.c:226
 +#, c-format
 +msgid "error creating keybox '%s': %s\n"
 +msgstr "error creating keybox '%s': %s\n"
 +
 +#: g10/keydb.c:407 g10/keydb.c:434
 +#, c-format
 +msgid "error creating keyring '%s': %s\n"
 +msgstr "error creating keyring '%s': %s\n"
 +
 +#: g10/keydb.c:443 sm/keydb.c:232
 +#, c-format
 +msgid "keybox '%s' created\n"
 +msgstr "keybox ‘%s’ created\n"
 +
 +#: g10/keydb.c:445
 +#, c-format
 +msgid "keyring '%s' created\n"
 +msgstr "keyring ‘%s’ created\n"
 +
 +#: g10/keydb.c:823
 +#, c-format
 +msgid "keyblock resource '%s': %s\n"
 +msgstr "keyblock resource '%s': %s\n"
 +
 +#: g10/keydb.c:911
 +#, c-format
 +msgid "error opening key DB: %s\n"
 +msgstr "error opening key DB: %s\n"
 +
- #: g10/keydb.c:1782
++#: g10/keydb.c:1786
 +#, c-format
 +msgid "failed to rebuild keyring cache: %s\n"
 +msgstr "failed to rebuild keyring cache: %s\n"
 +
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
 +msgid "[revocation]"
 +msgstr "[revocation]"
 +
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
 +msgid "[self-signature]"
 +msgstr "[self-signature]"
 +
- #: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
++#: g10/keyedit.c:433 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: dirmngr/ldap-wrapper.c:694
 +#, c-format
 +msgid "error allocating memory: %s\n"
 +msgstr "error allocating memory: %s\n"
 +
- #: g10/keyedit.c:629
++#: g10/keyedit.c:630
 +#, c-format
 +msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
 +msgstr ""
 +"can't check signature with unsupported public-key algorithm (%d): %s.\n"
 +
- #: g10/keyedit.c:638
++#: g10/keyedit.c:639
 +#, c-format
 +msgid ""
 +"can't check signature with unsupported message-digest algorithm %d: %s.\n"
 +msgstr ""
 +"can't check signature with unsupported message-digest algorithm %d: %s.\n"
 +
- #: g10/keyedit.c:800
++#: g10/keyedit.c:801
 +msgid " (reordered signatures follow)"
 +msgstr " (reordered signatures follow)"
 +
- #: g10/keyedit.c:913
++#: g10/keyedit.c:914
 +#, c-format
 +msgid "key %s:\n"
 +msgstr "key %s:\n"
 +
- #: g10/keyedit.c:916
++#: g10/keyedit.c:917
 +#, c-format
 +msgid "%d duplicate signature removed\n"
 +msgid_plural "%d duplicate signatures removed\n"
 +msgstr[0] "%d duplicate signature removed\n"
 +msgstr[1] "%d duplicate signatures removed\n"
 +
- #: g10/keyedit.c:919 g10/keylist.c:480
++#: g10/keyedit.c:920 g10/keylist.c:480
 +#, c-format
 +msgid "%d signature not checked due to a missing key\n"
 +msgid_plural "%d signatures not checked due to missing keys\n"
 +msgstr[0] "%d signature not checked due to a missing key\n"
 +msgstr[1] "%d signatures not checked due to missing keys\n"
 +
- #: g10/keyedit.c:923 g10/keylist.c:476
++#: g10/keyedit.c:924 g10/keylist.c:476
 +#, c-format
 +msgid "%d bad signature\n"
 +msgid_plural "%d bad signatures\n"
 +msgstr[0] "%d bad signature\n"
 +msgstr[1] "%d bad signatures\n"
 +
- #: g10/keyedit.c:927
++#: g10/keyedit.c:928
 +#, c-format
 +msgid "%d signature reordered\n"
 +msgid_plural "%d signatures reordered\n"
 +msgstr[0] "%d signature reordered\n"
 +msgstr[1] "%d signatures reordered\n"
 +
- #: g10/keyedit.c:932
++#: g10/keyedit.c:933
 +#, c-format
 +msgid ""
 +"Warning: errors found and only checked self-signatures, run '%s' to check "
 +"all signatures.\n"
 +msgstr ""
 +"Warning: errors found and only checked self-signatures, run ‘%s’ to check "
 +"all signatures.\n"
 +
- #: g10/keyedit.c:992 g10/pkclist.c:274
++#: g10/keyedit.c:993 g10/pkclist.c:274
 +msgid ""
 +"Please decide how far you trust this user to correctly verify other users' "
 +"keys\n"
 +"(by looking at passports, checking fingerprints from different sources, "
 +"etc.)\n"
 +msgstr ""
 +"Please decide how far you trust this user to correctly verify other users' "
 +"keys\n"
 +"(by looking at passports, checking fingerprints from different sources, "
 +"etc.)\n"
 +
- #: g10/keyedit.c:996 g10/pkclist.c:286
++#: g10/keyedit.c:997 g10/pkclist.c:286
 +#, c-format
 +msgid "  %d = I trust marginally\n"
 +msgstr "  %d = I trust marginally\n"
 +
- #: g10/keyedit.c:997 g10/pkclist.c:288
++#: g10/keyedit.c:998 g10/pkclist.c:288
 +#, c-format
 +msgid "  %d = I trust fully\n"
 +msgstr "  %d = I trust fully\n"
 +
- #: g10/keyedit.c:1015
++#: g10/keyedit.c:1016
 +msgid ""
 +"Please enter the depth of this trust signature.\n"
 +"A depth greater than 1 allows the key you are signing to make\n"
 +"trust signatures on your behalf.\n"
 +msgstr ""
 +"Please enter the depth of this trust signature.\n"
 +"A depth greater than 1 allows the key you are signing to make\n"
 +"trust signatures on your behalf.\n"
 +
- #: g10/keyedit.c:1032
++#: g10/keyedit.c:1033
 +msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 +msgstr "Please enter a domain to restrict this signature, or enter for none.\n"
 +
- #: g10/keyedit.c:1160
++#: g10/keyedit.c:1161
 +#, c-format
 +msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 +msgstr "Skipping user ID “%s”, which is not a text ID.\n"
 +
- #: g10/keyedit.c:1168
++#: g10/keyedit.c:1169
 +#, c-format
 +msgid "User ID \"%s\" is revoked."
 +msgstr "User ID “%s” is revoked."
 +
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
- #: g10/keyedit.c:2246
++#: g10/keyedit.c:1178 g10/keyedit.c:1206 g10/keyedit.c:1233 g10/keyedit.c:1417
++#: g10/keyedit.c:2247
 +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:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
- #: g10/keyedit.c:2251 g10/keyedit.c:3177
++#: g10/keyedit.c:1192 g10/keyedit.c:1220 g10/keyedit.c:1247 g10/keyedit.c:1423
++#: g10/keyedit.c:2252 g10/keyedit.c:3178
 +msgid "  Unable to sign.\n"
 +msgstr "  Unable to sign.\n"
 +
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1197
 +#, c-format
 +msgid "User ID \"%s\" is expired."
 +msgstr "User ID “%s” is expired."
 +
- #: g10/keyedit.c:1224
++#: g10/keyedit.c:1225
 +#, c-format
 +msgid "User ID \"%s\" is not self-signed."
 +msgstr "User ID “%s” is not self-signed."
 +
- #: g10/keyedit.c:1253
++#: g10/keyedit.c:1254
 +#, c-format
 +msgid "User ID \"%s\" is signable.  "
 +msgstr "User ID “%s” is signable.  "
 +
- #: g10/keyedit.c:1255
++#: g10/keyedit.c:1256
 +msgid "Sign it? (y/N) "
 +msgstr "Sign it? (y/N) "
 +
- #: g10/keyedit.c:1282
++#: g10/keyedit.c:1283
 +#, c-format
 +msgid ""
 +"The self-signature on \"%s\"\n"
 +"is a PGP 2.x-style signature.\n"
 +msgstr ""
 +"The self-signature on “%s”\n"
 +"is a PGP 2.x-style signature.\n"
 +
- #: g10/keyedit.c:1291
++#: g10/keyedit.c:1292
 +msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 +msgstr "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 +
- #: g10/keyedit.c:1304
++#: g10/keyedit.c:1305
 +#, c-format
 +msgid ""
 +"Your current signature on \"%s\"\n"
 +"has expired.\n"
 +msgstr ""
 +"Your current signature on “%s”\n"
 +"has expired.\n"
 +
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:1310
 +msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 +msgstr ""
 +"Do you want to issue a new signature to replace the expired one? (y/N) "
 +
- #: g10/keyedit.c:1330
++#: g10/keyedit.c:1331
 +#, c-format
 +msgid ""
 +"Your current signature on \"%s\"\n"
 +"is a local signature.\n"
 +msgstr ""
 +"Your current signature on “%s”\n"
 +"is a local signature.\n"
 +
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:1336
 +msgid "Do you want to promote it to a full exportable signature? (y/N) "
 +msgstr "Do you want to promote it to a full exportable signature? (y/N) "
 +
- #: g10/keyedit.c:1355
++#: g10/keyedit.c:1356
 +#, c-format
 +msgid "\"%s\" was already locally signed by key %s\n"
 +msgstr "“%s” was already locally signed by key %s\n"
 +
- #: g10/keyedit.c:1359
++#: g10/keyedit.c:1360
 +#, c-format
 +msgid "\"%s\" was already signed by key %s\n"
 +msgstr "“%s” was already signed by key %s\n"
 +
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:1365
 +msgid "Do you want to sign it again anyway? (y/N) "
 +msgstr "Do you want to sign it again anyway? (y/N) "
 +
- #: g10/keyedit.c:1386
++#: g10/keyedit.c:1387
 +#, c-format
 +msgid "Nothing to sign with key %s\n"
 +msgstr "Nothing to sign with key %s\n"
 +
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1411
 +msgid "This key has expired!"
 +msgstr "This key has expired!"
 +
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1429
 +#, c-format
 +msgid "This key is due to expire on %s.\n"
 +msgstr "This key is due to expire on %s.\n"
 +
- #: g10/keyedit.c:1434
++#: g10/keyedit.c:1435
 +msgid "Do you want your signature to expire at the same time? (Y/n) "
 +msgstr "Do you want your signature to expire at the same time? (Y/n) "
 +
- #: g10/keyedit.c:1475
++#: g10/keyedit.c:1476
 +msgid ""
 +"How carefully have you verified the key you are about to sign actually "
 +"belongs\n"
 +"to the person named above?  If you don't know what to answer, enter \"0\".\n"
 +msgstr ""
 +"How carefully have you verified the key you are about to sign actually "
 +"belongs\n"
 +"to the person named above?  If you don't know what to answer, enter “0”.\n"
 +
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1481
 +#, c-format
 +msgid "   (0) I will not answer.%s\n"
 +msgstr "   (0) I will not answer.%s\n"
 +
- #: g10/keyedit.c:1482
++#: g10/keyedit.c:1483
 +#, c-format
 +msgid "   (1) I have not checked at all.%s\n"
 +msgstr "   (1) I have not checked at all.%s\n"
 +
- #: g10/keyedit.c:1484
++#: g10/keyedit.c:1485
 +#, c-format
 +msgid "   (2) I have done casual checking.%s\n"
 +msgstr "   (2) I have done casual checking.%s\n"
 +
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:1488
 +#, c-format
 +msgid "   (3) I have done very careful checking.%s\n"
 +msgstr "   (3) I have done very careful checking.%s\n"
 +
- #: g10/keyedit.c:1494
++#: g10/keyedit.c:1495
 +msgid "Your selection? (enter '?' for more information): "
 +msgstr "Your selection? (enter ‘?’ for more information): "
 +
- #: g10/keyedit.c:1521
++#: g10/keyedit.c:1522
 +#, c-format
 +msgid ""
 +"Are you sure that you want to sign this key with your\n"
 +"key \"%s\" (%s)\n"
 +msgstr ""
 +"Are you sure that you want to sign this key with your\n"
 +"key “%s” (%s)\n"
 +
- #: g10/keyedit.c:1529
++#: g10/keyedit.c:1530
 +msgid "This will be a self-signature.\n"
 +msgstr "This will be a self-signature.\n"
 +
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:1535
 +msgid "WARNING: the signature will not be marked as non-exportable.\n"
 +msgstr "WARNING: the signature will not be marked as non-exportable.\n"
 +
- #: g10/keyedit.c:1541
++#: g10/keyedit.c:1542
 +msgid "WARNING: the signature will not be marked as non-revocable.\n"
 +msgstr "WARNING: the signature will not be marked as non-revocable.\n"
 +
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1552
 +msgid "The signature will be marked as non-exportable.\n"
 +msgstr "The signature will be marked as non-exportable.\n"
 +
- #: g10/keyedit.c:1558
++#: g10/keyedit.c:1559
 +msgid "The signature will be marked as non-revocable.\n"
 +msgstr "The signature will be marked as non-revocable.\n"
 +
- #: g10/keyedit.c:1565
++#: g10/keyedit.c:1566
 +msgid "I have not checked this key at all.\n"
 +msgstr "I have not checked this key at all.\n"
 +
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:1571
 +msgid "I have checked this key casually.\n"
 +msgstr "I have checked this key casually.\n"
 +
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:1576
 +msgid "I have checked this key very carefully.\n"
 +msgstr "I have checked this key very carefully.\n"
 +
- #: g10/keyedit.c:1587
++#: g10/keyedit.c:1588
 +msgid "Really sign? (y/N) "
 +msgstr "Really sign? (y/N) "
 +
- #: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
- #: g10/keyedit.c:6463 g10/sign.c:323
++#: g10/keyedit.c:1639 g10/keyedit.c:6308 g10/keyedit.c:6391 g10/keyedit.c:6500
++#: g10/keyedit.c:6562 g10/sign.c:325
 +#, c-format
 +msgid "signing failed: %s\n"
 +msgstr "signing failed: %s\n"
 +
- #: g10/keyedit.c:1725
++#: g10/keyedit.c:1726
 +msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 +msgstr "Key has only stub or on-card key items - no passphrase to change.\n"
 +
- #: g10/keyedit.c:1755
++#: g10/keyedit.c:1756
 +#, c-format
 +msgid "key %s: error changing passphrase: %s\n"
 +msgstr "key %s: error changing passphrase: %s\n"
 +
- #: g10/keyedit.c:1869
++#: g10/keyedit.c:1870
 +msgid "save and quit"
 +msgstr "save and quit"
 +
- #: g10/keyedit.c:1872
++#: g10/keyedit.c:1873
 +msgid "show key fingerprint"
 +msgstr "show key fingerprint"
 +
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1874
 +msgid "show the keygrip"
 +msgstr "show the keygrip"
 +
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1875
 +msgid "list key and user IDs"
 +msgstr "list key and user IDs"
 +
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1877
 +msgid "select user ID N"
 +msgstr "select user ID N"
 +
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1878
 +msgid "select subkey N"
 +msgstr "select subkey N"
 +
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1879
 +msgid "check signatures"
 +msgstr "check signatures"
 +
- #: g10/keyedit.c:1884
++#: g10/keyedit.c:1885
 +msgid "sign selected user IDs [* see below for related commands]"
 +msgstr "sign selected user IDs [* see below for related commands]"
 +
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1890
 +msgid "sign selected user IDs locally"
 +msgstr "sign selected user IDs locally"
 +
- #: g10/keyedit.c:1890
++#: g10/keyedit.c:1891
 +msgid "sign selected user IDs with a trust signature"
 +msgstr "sign selected user IDs with a trust signature"
 +
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1893
 +msgid "sign selected user IDs with a non-revocable signature"
 +msgstr "sign selected user IDs with a non-revocable signature"
 +
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1895
 +msgid "add a user ID"
 +msgstr "add a user ID"
 +
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1897
 +msgid "add a photo ID"
 +msgstr "add a photo ID"
 +
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1898
 +msgid "delete selected user IDs"
 +msgstr "delete selected user IDs"
 +
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1901
 +msgid "add a subkey"
 +msgstr "add a subkey"
 +
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1904
 +msgid "add a key to a smartcard"
 +msgstr "add a key to a smartcard"
 +
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1906
 +msgid "move a key to a smartcard"
 +msgstr "move a key to a smartcard"
 +
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1908
 +msgid "move a backup key to a smartcard"
 +msgstr "move a backup key to a smartcard"
 +
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1910
 +msgid "delete selected subkeys"
 +msgstr "delete selected subkeys"
 +
- #: g10/keyedit.c:1911
++#: g10/keyedit.c:1912
 +msgid "add a revocation key"
 +msgstr "add a revocation key"
 +
- #: g10/keyedit.c:1913
++#: g10/keyedit.c:1914
 +msgid "delete signatures from the selected user IDs"
 +msgstr "delete signatures from the selected user IDs"
 +
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1916
 +msgid "change the expiration date for the key or selected subkeys"
 +msgstr "change the expiration date for the key or selected subkeys"
 +
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1918
 +msgid "flag the selected user ID as primary"
 +msgstr "flag the selected user ID as primary"
 +
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1921
 +msgid "list preferences (expert)"
 +msgstr "list preferences (expert)"
 +
- #: g10/keyedit.c:1921
++#: g10/keyedit.c:1922
 +msgid "list preferences (verbose)"
 +msgstr "list preferences (verbose)"
 +
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:1924
 +msgid "set preference list for the selected user IDs"
 +msgstr "set preference list for the selected user IDs"
 +
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1927
 +msgid "set the preferred keyserver URL for the selected user IDs"
 +msgstr "set the preferred keyserver URL for the selected user IDs"
 +
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1929
 +msgid "set a notation for the selected user IDs"
 +msgstr "set a notation for the selected user IDs"
 +
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1931
 +msgid "change the passphrase"
 +msgstr "change the passphrase"
 +
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1934
 +msgid "change the ownertrust"
 +msgstr "change the ownertrust"
 +
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1937
 +msgid "revoke signatures on the selected user IDs"
 +msgstr "revoke signatures on the selected user IDs"
 +
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1939
 +msgid "revoke selected user IDs"
 +msgstr "revoke selected user IDs"
 +
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1942
 +msgid "revoke key or selected subkeys"
 +msgstr "revoke key or selected subkeys"
 +
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1944
 +msgid "enable key"
 +msgstr "enable key"
 +
- #: g10/keyedit.c:1944
++#: g10/keyedit.c:1945
 +msgid "disable key"
 +msgstr "disable key"
 +
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1947
 +msgid "show selected photo IDs"
 +msgstr "show selected photo IDs"
 +
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1949
 +msgid "compact unusable user IDs and remove unusable signatures from key"
 +msgstr "compact unusable user IDs and remove unusable signatures from key"
 +
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:1951
 +msgid "compact unusable user IDs and remove all signatures from key"
 +msgstr "compact unusable user IDs and remove all signatures from key"
 +
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2063
 +msgid "Secret key is available.\n"
 +msgstr "Secret key is available.\n"
 +
- #: g10/keyedit.c:2162
++#: g10/keyedit.c:2163
 +msgid "Need the secret key to do this.\n"
 +msgstr "Need the secret key to do this.\n"
 +
- #: g10/keyedit.c:2183
++#: g10/keyedit.c:2184
 +msgid ""
 +"* The 'sign' command may be prefixed with an 'l' for local signatures "
 +"(lsign),\n"
 +"  a 't' for trust signatures (tsign), an 'nr' for non-revocable signatures\n"
 +"  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 +msgstr ""
 +"* The ‘sign’ command may be prefixed with an ‘l’ for local signatures "
 +"(lsign),\n"
 +"  a ‘t’ for trust signatures (tsign), an ‘nr’ for non-revocable signatures\n"
 +"  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 +
- #: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
++#: g10/keyedit.c:2240 g10/keyedit.c:3178 g10/keyedit.c:3317 g10/keyedit.c:3379
 +msgid "Key is revoked."
 +msgstr "Key is revoked."
 +
- #: g10/keyedit.c:2262
++#: g10/keyedit.c:2263
 +msgid "Really sign all user IDs? (y/N) "
 +msgstr "Really sign all user IDs? (y/N) "
 +
- #: g10/keyedit.c:2266
++#: g10/keyedit.c:2267
 +msgid "Really sign all text user IDs? (y/N) "
 +msgstr "Really sign all text user IDs? (y/N) "
 +
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2275
 +msgid "Hint: Select the user IDs to sign\n"
 +msgstr "Hint: Select the user IDs to sign\n"
 +
- #: g10/keyedit.c:2285
++#: g10/keyedit.c:2286
 +#, c-format
 +msgid "Unknown signature type '%s'\n"
 +msgstr "Unknown signature type ‘%s’\n"
 +
- #: g10/keyedit.c:2309
++#: g10/keyedit.c:2310
 +#, 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/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
++#: g10/keyedit.c:2332 g10/keyedit.c:2356 g10/keyedit.c:2550
 +msgid "You must select at least one user ID.\n"
 +msgstr "You must select at least one user ID.\n"
 +
- #: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
++#: g10/keyedit.c:2334 g10/keyedit.c:2358 g10/keyedit.c:2512 g10/keyedit.c:2552
 +#, c-format
 +msgid "(Use the '%s' command.)\n"
 +msgstr "(Use the ‘%s’ command.)\n"
 +
- #: g10/keyedit.c:2336
++#: g10/keyedit.c:2337
 +msgid "You can't delete the last user ID!\n"
 +msgstr "You can't delete the last user ID!\n"
 +
- #: g10/keyedit.c:2339
++#: g10/keyedit.c:2340
 +msgid "Really remove all selected user IDs? (y/N) "
 +msgstr "Really remove all selected user IDs? (y/N) "
 +
- #: g10/keyedit.c:2340
++#: g10/keyedit.c:2341
 +msgid "Really remove this user ID? (y/N) "
 +msgstr "Really remove this user ID? (y/N) "
 +
 +#. TRANSLATORS: Please take care: This is about
 +#. moving the key and not about removing it.
- #: g10/keyedit.c:2397
++#: g10/keyedit.c:2398
 +msgid "Really move the primary key? (y/N) "
 +msgstr "Really move the primary key? (y/N) "
 +
- #: g10/keyedit.c:2409 g10/keyedit.c:4866
++#: g10/keyedit.c:2410 g10/keyedit.c:4964
 +msgid "You must select exactly one key.\n"
 +msgstr "You must select exactly one key.\n"
 +
- #: g10/keyedit.c:2436
++#: g10/keyedit.c:2437
 +msgid "Command expects a filename argument\n"
 +msgstr "Command expects a filename argument\n"
 +
- #: g10/keyedit.c:2457
++#: g10/keyedit.c:2458
 +#, c-format
 +msgid "Can't open '%s': %s\n"
 +msgstr "Can't open '%s': %s\n"
 +
- #: g10/keyedit.c:2474
++#: g10/keyedit.c:2475
 +#, c-format
 +msgid "Error reading backup key from '%s': %s\n"
 +msgstr "Error reading backup key from '%s': %s\n"
 +
- #: g10/keyedit.c:2509
++#: g10/keyedit.c:2510
 +msgid "You must select at least one key.\n"
 +msgstr "You must select at least one key.\n"
 +
- #: g10/keyedit.c:2515
++#: g10/keyedit.c:2516
 +msgid "Do you really want to delete the selected keys? (y/N) "
 +msgstr "Do you really want to delete the selected keys? (y/N) "
 +
- #: g10/keyedit.c:2517
++#: g10/keyedit.c:2518
 +msgid "Do you really want to delete this key? (y/N) "
 +msgstr "Do you really want to delete this key? (y/N) "
 +
- #: g10/keyedit.c:2555
++#: g10/keyedit.c:2556
 +msgid "Really revoke all selected user IDs? (y/N) "
 +msgstr "Really revoke all selected user IDs? (y/N) "
 +
- #: g10/keyedit.c:2556
++#: g10/keyedit.c:2557
 +msgid "Really revoke this user ID? (y/N) "
 +msgstr "Really revoke this user ID? (y/N) "
 +
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2575
 +msgid "Do you really want to revoke the entire key? (y/N) "
 +msgstr "Do you really want to revoke the entire key? (y/N) "
 +
- #: g10/keyedit.c:2585
++#: g10/keyedit.c:2586
 +msgid "Do you really want to revoke the selected subkeys? (y/N) "
 +msgstr "Do you really want to revoke the selected subkeys? (y/N) "
 +
- #: g10/keyedit.c:2587
++#: g10/keyedit.c:2588
 +msgid "Do you really want to revoke this subkey? (y/N) "
 +msgstr "Do you really want to revoke this subkey? (y/N) "
 +
- #: g10/keyedit.c:2645
++#: g10/keyedit.c:2646
 +msgid "Owner trust may not be set while using a user provided trust database\n"
 +msgstr ""
 +"Owner trust may not be set while using a user provided trust database\n"
 +
- #: g10/keyedit.c:2690
++#: g10/keyedit.c:2691
 +msgid "Set preference list to:\n"
 +msgstr "Set preference list to:\n"
 +
- #: g10/keyedit.c:2697
++#: g10/keyedit.c:2698
 +msgid "Really update the preferences for the selected user IDs? (y/N) "
 +msgstr "Really update the preferences for the selected user IDs? (y/N) "
 +
- #: g10/keyedit.c:2699
++#: g10/keyedit.c:2700
 +msgid "Really update the preferences? (y/N) "
 +msgstr "Really update the preferences? (y/N) "
 +
- #: g10/keyedit.c:2773
++#: g10/keyedit.c:2774
 +msgid "Save changes? (y/N) "
 +msgstr "Save changes? (y/N) "
 +
- #: g10/keyedit.c:2777
++#: g10/keyedit.c:2778
 +msgid "Quit without saving? (y/N) "
 +msgstr "Quit without saving? (y/N) "
 +
- #: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
- #: g10/keyedit.c:3267 g10/keyedit.c:3332
++#: g10/keyedit.c:2789 g10/keyedit.c:2799 g10/keyedit.c:2943 g10/keyedit.c:3046
++#: g10/keyedit.c:3268 g10/keyedit.c:3333 g10/keyedit.c:3409
 +#, c-format
 +msgid "update failed: %s\n"
 +msgstr "update failed: %s\n"
 +
- #: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
++#: g10/keyedit.c:2805 g10/keyedit.c:3273 g10/keyedit.c:3338 g10/keyedit.c:3416
 +msgid "Key not changed so no update needed.\n"
 +msgstr "Key not changed so no update needed.\n"
 +
- #: g10/keyedit.c:3038
++#: g10/keyedit.c:3039
 +#, c-format
 +msgid "User ID revocation failed: %s\n"
 +msgstr "User ID revocation failed: %s\n"
 +
- #: g10/keyedit.c:3083
++#: g10/keyedit.c:3084
 +#, c-format
 +msgid "\"%s\" is not a fingerprint\n"
 +msgstr "“%s” is not a fingerprint\n"
 +
- #: g10/keyedit.c:3112
++#: g10/keyedit.c:3113
 +#, c-format
 +msgid "\"%s\" is not the primary fingerprint\n"
 +msgstr "“%s” is not the primary fingerprint\n"
 +
- #: g10/keyedit.c:3248 g10/keyedit.c:3251
++#: g10/keyedit.c:3249 g10/keyedit.c:3252
 +#, c-format
 +msgid "Invalid user ID '%s': %s\n"
 +msgstr "Invalid user ID '%s': %s\n"
 +
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
 +msgid "No matching user IDs."
 +msgstr "No matching user IDs."
 +
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
 +msgid "Nothing to sign.\n"
 +msgstr "Nothing to sign.\n"
 +
- #: g10/keyedit.c:3427
++#: g10/keyedit.c:3388
++#, c-format
++msgid "'%s' is not a valid expiration time\n"
++msgstr "‘%s’ is not a valid expiration time\n"
++
++#: g10/keyedit.c:3508
 +msgid "Digest: "
 +msgstr "Digest: "
 +
- #: g10/keyedit.c:3484
++#: g10/keyedit.c:3565
 +msgid "Features: "
 +msgstr "Features: "
 +
- #: g10/keyedit.c:3495
++#: g10/keyedit.c:3576
 +msgid "Keyserver no-modify"
 +msgstr "Keyserver no-modify"
 +
- #: g10/keyedit.c:3510 g10/keylist.c:377
++#: g10/keyedit.c:3591 g10/keylist.c:377
 +msgid "Preferred keyserver: "
 +msgstr "Preferred keyserver: "
 +
- #: g10/keyedit.c:3518 g10/keyedit.c:3519
++#: g10/keyedit.c:3599 g10/keyedit.c:3600
 +msgid "Notations: "
 +msgstr "Notations: "
 +
- #: g10/keyedit.c:3764
++#: g10/keyedit.c:3845
 +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:3836
++#: g10/keyedit.c:3917
 +#, 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:3860
++#: g10/keyedit.c:3941
 +#, 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:3866
++#: g10/keyedit.c:3947
 +msgid "(sensitive)"
 +msgstr "(sensitive)"
 +
- #: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3989 g10/keyedit.c:4131 g10/keylist.c:262 g10/keyserver.c:538
 +#, c-format
 +msgid "created: %s"
 +msgstr "created: %s"
 +
- #: g10/keyedit.c:3911 g10/keylist.c:1852
++#: g10/keyedit.c:3992 g10/keylist.c:1852
 +#, c-format
 +msgid "revoked: %s"
 +msgstr "revoked: %s"
 +
- #: g10/keyedit.c:3913 g10/keylist.c:1858
++#: g10/keyedit.c:3994 g10/keylist.c:1858
 +#, c-format
 +msgid "expired: %s"
 +msgstr "expired: %s"
 +
- #: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyedit.c:3996 g10/keyedit.c:4133 g10/keylist.c:264 g10/keylist.c:1864
 +#: g10/keyserver.c:544
 +#, c-format
 +msgid "expires: %s"
 +msgstr "expires: %s"
 +
- #: g10/keyedit.c:3917
++#: g10/keyedit.c:3998
 +#, c-format
 +msgid "usage: %s"
 +msgstr "usage: %s"
 +
- #: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
++#: g10/keyedit.c:4006 g10/keyedit.c:4026 g10/keylist.c:267
 +msgid "card-no: "
 +msgstr "card-no: "
 +
- #: g10/keyedit.c:3984
++#: g10/keyedit.c:4065
 +#, c-format
 +msgid "trust: %s"
 +msgstr "trust: %s"
 +
- #: g10/keyedit.c:3988
++#: g10/keyedit.c:4069
 +#, c-format
 +msgid "validity: %s"
 +msgstr "validity: %s"
 +
- #: g10/keyedit.c:3995
++#: g10/keyedit.c:4076
 +msgid "This key has been disabled"
 +msgstr "This key has been disabled"
 +
- #: g10/keyedit.c:4013
++#: g10/keyedit.c:4094
 +msgid ""
 +"Please note that the shown key validity is not necessarily correct\n"
 +"unless you restart the program.\n"
 +msgstr ""
 +"Please note that the shown key validity is not necessarily correct\n"
 +"unless you restart the program.\n"
 +
- #: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
- #: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: g10/keyedit.c:4150 g10/keyedit.c:4581 g10/keyserver.c:548
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:712
 +#: dirmngr/ocsp.c:703
 +msgid "revoked"
 +msgstr "revoked"
 +
- #: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
- #: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4152 g10/keyedit.c:4583 g10/keyserver.c:552
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:714
 +msgid "expired"
 +msgstr "expired"
 +
- #: g10/keyedit.c:4188
++#: g10/keyedit.c:4269
 +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 ""
 +"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:4240
++#: g10/keyedit.c:4321
 +msgid "WARNING: Your encryption subkey expires soon.\n"
 +msgstr "WARNING: Your encryption subkey expires soon.\n"
 +
- #: g10/keyedit.c:4241
++#: g10/keyedit.c:4322
 +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:4300
++#: g10/keyedit.c:4381
 +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 ""
 +"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 +"versions\n"
 +"         of PGP to reject this key.\n"
 +
- #: g10/keyedit.c:4305 g10/keyedit.c:4595
++#: g10/keyedit.c:4386 g10/keyedit.c:4676
 +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:4311
++#: g10/keyedit.c:4392
 +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:4326 g10/keygen.c:2697
++#: g10/keyedit.c:4407 g10/keygen.c:2719
 +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:4428
++#: g10/keyedit.c:4509
 +msgid "Delete this good signature? (y/N/q)"
 +msgstr "Delete this good signature? (y/N/q)"
 +
- #: g10/keyedit.c:4438
++#: g10/keyedit.c:4519
 +msgid "Delete this invalid signature? (y/N/q)"
 +msgstr "Delete this invalid signature? (y/N/q)"
 +
- #: g10/keyedit.c:4442
++#: g10/keyedit.c:4523
 +msgid "Delete this unknown signature? (y/N/q)"
 +msgstr "Delete this unknown signature? (y/N/q)"
 +
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4530
 +msgid "Really delete this self-signature? (y/N)"
 +msgstr "Really delete this self-signature? (y/N)"
 +
- #: g10/keyedit.c:4465
++#: g10/keyedit.c:4546
 +#, 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:4469
++#: g10/keyedit.c:4550
 +msgid "Nothing deleted.\n"
 +msgstr "Nothing deleted.\n"
 +
- #: g10/keyedit.c:4504 g10/trust.c:693
++#: g10/keyedit.c:4585 g10/trust.c:716
 +msgid "invalid"
 +msgstr "invalid"
 +
- #: g10/keyedit.c:4506
++#: g10/keyedit.c:4587
 +#, c-format
 +msgid "User ID \"%s\" compacted: %s\n"
 +msgstr "User ID “%s” compacted: %s\n"
 +
- #: g10/keyedit.c:4512
++#: g10/keyedit.c:4593
 +#, 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:4520
++#: g10/keyedit.c:4601
 +#, c-format
 +msgid "User ID \"%s\": already minimized\n"
 +msgstr "User ID “%s”: already minimized\n"
 +
- #: g10/keyedit.c:4521
++#: g10/keyedit.c:4602
 +#, c-format
 +msgid "User ID \"%s\": already clean\n"
 +msgstr "User ID “%s”: already clean\n"
 +
- #: g10/keyedit.c:4590
++#: g10/keyedit.c:4671
 +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 ""
 +"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"
 +
- #: g10/keyedit.c:4601
++#: g10/keyedit.c:4682
 +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:4618
++#: g10/keyedit.c:4699
 +msgid "Enter the user ID of the designated revoker: "
 +msgstr "Enter the user ID of the designated revoker: "
 +
- #: g10/keyedit.c:4643
++#: g10/keyedit.c:4724
 +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:4658
++#: g10/keyedit.c:4739
 +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:4680
++#: g10/keyedit.c:4761
 +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:4698
++#: g10/keyedit.c:4779
 +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:4704
++#: g10/keyedit.c:4785
 +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:4755
++#: g10/keyedit.c:4848
 +msgid ""
 +"Are you sure you want to change the expiration time for multiple subkeys? (y/"
 +"N) "
 +msgstr ""
 +"Are you sure you want to change the expiration time for multiple subkeys? (y/"
 +"N) "
 +
- #: g10/keyedit.c:4760
++#: g10/keyedit.c:4853
 +msgid "Changing expiration time for a subkey.\n"
 +msgstr "Changing expiration time for a subkey.\n"
 +
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:4856
 +msgid "Changing expiration time for the primary key.\n"
 +msgstr "Changing expiration time for the primary key.\n"
 +
- #: g10/keyedit.c:4814
++#: g10/keyedit.c:4910
 +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:4987
++#: g10/keyedit.c:5085
 +#, c-format
 +msgid "signing subkey %s is already cross-certified\n"
 +msgstr "signing subkey %s is already cross-certified\n"
 +
- #: g10/keyedit.c:4993
++#: g10/keyedit.c:5091
 +#, 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:5108
++#: g10/keyedit.c:5206
 +msgid "Please select exactly one user ID.\n"
 +msgstr "Please select exactly one user ID.\n"
 +
- #: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
++#: g10/keyedit.c:5247 g10/keyedit.c:5361 g10/keyedit.c:5474 g10/keyedit.c:5611
 +#, 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:5320
++#: g10/keyedit.c:5418
 +msgid "Enter your preferred keyserver URL: "
 +msgstr "Enter your preferred keyserver URL: "
 +
- #: g10/keyedit.c:5399
++#: g10/keyedit.c:5497
 +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:5400
++#: g10/keyedit.c:5498
 +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:5459
++#: g10/keyedit.c:5557
 +msgid "Enter the notation: "
 +msgstr "Enter the notation: "
 +
- #: g10/keyedit.c:5606
++#: g10/keyedit.c:5704
 +msgid "Proceed? (y/N) "
 +msgstr "Proceed? (y/N) "
 +
- #: g10/keyedit.c:5676
++#: g10/keyedit.c:5774
 +#, c-format
 +msgid "No user ID with index %d\n"
 +msgstr "No user ID with index %d\n"
 +
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5836
 +#, c-format
 +msgid "No user ID with hash %s\n"
 +msgstr "No user ID with hash %s\n"
 +
- #: g10/keyedit.c:5839
++#: g10/keyedit.c:5937
 +#, c-format
 +msgid "No subkey with key ID '%s'.\n"
 +msgstr "No subkey with key ID '%s'.\n"
 +
- #: g10/keyedit.c:5861
++#: g10/keyedit.c:5959
 +#, c-format
 +msgid "No subkey with index %d\n"
 +msgstr "No subkey with index %d\n"
 +
- #: g10/keyedit.c:6002
++#: g10/keyedit.c:6100
 +#, c-format
 +msgid "user ID: \"%s\"\n"
 +msgstr "user ID: “%s”\n"
 +
- #: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
++#: g10/keyedit.c:6103 g10/keyedit.c:6205 g10/keyedit.c:6253
 +#, 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:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
++#: g10/keyedit.c:6105 g10/keyedit.c:6207 g10/keyedit.c:6255
 +msgid " (non-exportable)"
 +msgstr " (non-exportable)"
 +
- #: g10/keyedit.c:6011
++#: g10/keyedit.c:6109
 +#, c-format
 +msgid "This signature expired on %s.\n"
 +msgstr "This signature expired on %s.\n"
 +
- #: g10/keyedit.c:6016
++#: g10/keyedit.c:6114
 +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:6021
++#: g10/keyedit.c:6119
 +msgid "Create a revocation certificate for this signature? (y/N) "
 +msgstr "Create a revocation certificate for this signature? (y/N) "
 +
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6173
 +msgid "Not signed by you.\n"
 +msgstr "Not signed by you.\n"
 +
- #: g10/keyedit.c:6081
++#: g10/keyedit.c:6179
 +#, 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:6110
++#: g10/keyedit.c:6208
 +msgid " (non-revocable)"
 +msgstr " (non-revocable)"
 +
- #: g10/keyedit.c:6117
++#: g10/keyedit.c:6215
 +#, c-format
 +msgid "revoked by your key %s on %s\n"
 +msgstr "revoked by your key %s on %s\n"
 +
- #: g10/keyedit.c:6142
++#: g10/keyedit.c:6240
 +msgid "You are about to revoke these signatures:\n"
 +msgstr "You are about to revoke these signatures:\n"
 +
- #: g10/keyedit.c:6165
++#: g10/keyedit.c:6263
 +msgid "Really create the revocation certificates? (y/N) "
 +msgstr "Really create the revocation certificates? (y/N) "
 +
- #: g10/keyedit.c:6198
++#: g10/keyedit.c:6296
 +msgid "no secret key\n"
 +msgstr "no secret key\n"
 +
- #: g10/keyedit.c:6246
++#: g10/keyedit.c:6344
 +#, 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:6256
++#: g10/keyedit.c:6354
 +#, c-format
 +msgid "user ID \"%s\" is already revoked\n"
 +msgstr "user ID “%s” is already revoked\n"
 +
- #: g10/keyedit.c:6273
++#: g10/keyedit.c:6371
 +#, 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:6386
++#: g10/keyedit.c:6485
 +#, c-format
 +msgid "Key %s is already revoked.\n"
 +msgstr "Key %s is already revoked.\n"
 +
- #: g10/keyedit.c:6448
++#: g10/keyedit.c:6547
 +#, c-format
 +msgid "Subkey %s is already revoked.\n"
 +msgstr "Subkey %s is already revoked.\n"
 +
- #: g10/keyedit.c:6545
++#: g10/keyedit.c:6644
 +#, c-format
 +msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 +msgstr "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 +
- #: g10/keygen.c:305
++#: g10/keygen.c:316
 +#, c-format
 +msgid "preference '%s' duplicated\n"
 +msgstr "preference ‘%s’ duplicated\n"
 +
- #: g10/keygen.c:312
++#: g10/keygen.c:323
 +msgid "too many cipher preferences\n"
 +msgstr "too many cipher preferences\n"
 +
- #: g10/keygen.c:314
++#: g10/keygen.c:325
 +msgid "too many digest preferences\n"
 +msgstr "too many digest preferences\n"
 +
- #: g10/keygen.c:316
++#: g10/keygen.c:327
 +msgid "too many compression preferences\n"
 +msgstr "too many compression preferences\n"
 +
- #: g10/keygen.c:457
++#: g10/keygen.c:468
 +#, c-format
 +msgid "invalid item '%s' in preference string\n"
 +msgstr "invalid item ‘%s’ in preference string\n"
 +
- #: g10/keygen.c:936
++#: g10/keygen.c:947
 +msgid "writing direct signature\n"
 +msgstr "writing direct signature\n"
 +
- #: g10/keygen.c:982
++#: g10/keygen.c:993
 +msgid "writing self signature\n"
 +msgstr "writing self signature\n"
 +
- #: g10/keygen.c:1038
++#: g10/keygen.c:1049
 +msgid "writing key binding signature\n"
 +msgstr "writing key binding signature\n"
 +
- #: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
- #: g10/keygen.c:1610 g10/keygen.c:1615
++#: g10/keygen.c:1413 g10/keygen.c:1418 g10/keygen.c:1470 g10/keygen.c:1475
++#: g10/keygen.c:1622 g10/keygen.c:1627
 +#, c-format
 +msgid "keysize invalid; using %u bits\n"
 +msgstr "keysize invalid; using %u bits\n"
 +
- #: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
++#: g10/keygen.c:1424 g10/keygen.c:1481 g10/keygen.c:1489 g10/keygen.c:1633
 +#, c-format
 +msgid "keysize rounded up to %u bits\n"
 +msgstr "keysize rounded up to %u bits\n"
 +
- #: g10/keygen.c:1503
++#: g10/keygen.c:1515
 +msgid ""
 +"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 +msgstr ""
 +"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 +
- #: g10/keygen.c:1677
++#: g10/keygen.c:1689
 +msgid "Sign"
 +msgstr "Sign"
 +
- #: g10/keygen.c:1680
++#: g10/keygen.c:1692
 +msgid "Certify"
 +msgstr "Certify"
 +
- #: g10/keygen.c:1683
++#: g10/keygen.c:1695
 +msgid "Encrypt"
 +msgstr "Encrypt"
 +
- #: g10/keygen.c:1686
++#: g10/keygen.c:1698
 +msgid "Authenticate"
 +msgstr "Authenticate"
 +
 +#. TRANSLATORS: Please use only plain ASCII characters for the
 +#. translation.  If this is not possible use single digits.  The
 +#. string needs to 8 bytes long. Here is a description of the
 +#. functions:
 +#.
 +#. s = Toggle signing capability
 +#. e = Toggle encryption capability
 +#. a = Toggle authentication capability
 +#. q = Finish
 +#.
- #: g10/keygen.c:1705
++#: g10/keygen.c:1717
 +msgid "SsEeAaQq"
 +msgstr "SsEeAaQq"
 +
- #: g10/keygen.c:1732
++#: g10/keygen.c:1744
 +#, c-format
 +msgid "Possible actions for a %s key: "
 +msgstr "Possible actions for a %s key: "
 +
- #: g10/keygen.c:1738
++#: g10/keygen.c:1750
 +msgid "Current allowed actions: "
 +msgstr "Current allowed actions: "
 +
- #: g10/keygen.c:1743
++#: g10/keygen.c:1755
 +#, c-format
 +msgid "   (%c) Toggle the sign capability\n"
 +msgstr "   (%c) Toggle the sign capability\n"
 +
- #: g10/keygen.c:1746
++#: g10/keygen.c:1758
 +#, c-format
 +msgid "   (%c) Toggle the encrypt capability\n"
 +msgstr "   (%c) Toggle the encrypt capability\n"
 +
- #: g10/keygen.c:1749
++#: g10/keygen.c:1761
 +#, c-format
 +msgid "   (%c) Toggle the authenticate capability\n"
 +msgstr "   (%c) Toggle the authenticate capability\n"
 +
- #: g10/keygen.c:1752
++#: g10/keygen.c:1764
 +#, c-format
 +msgid "   (%c) Finished\n"
 +msgstr "   (%c) Finished\n"
 +
- #: g10/keygen.c:1881 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1893 sm/certreqgen-ui.c:161
 +msgid "Please select what kind of key you want:\n"
 +msgstr "Please select what kind of key you want:\n"
 +
- #: g10/keygen.c:1885
++#: g10/keygen.c:1897
 +#, c-format
 +msgid "   (%d) RSA and RSA (default)\n"
 +msgstr "   (%d) RSA and RSA (default)\n"
 +
- #: g10/keygen.c:1889
++#: g10/keygen.c:1901
 +#, c-format
 +msgid "   (%d) DSA and Elgamal\n"
 +msgstr "   (%d) DSA and Elgamal\n"
 +
- #: g10/keygen.c:1892
++#: g10/keygen.c:1904
 +#, c-format
 +msgid "   (%d) DSA (sign only)\n"
 +msgstr "   (%d) DSA (sign only)\n"
 +
- #: g10/keygen.c:1894
++#: g10/keygen.c:1906
 +#, c-format
 +msgid "   (%d) RSA (sign only)\n"
 +msgstr "   (%d) RSA (sign only)\n"
 +
- #: g10/keygen.c:1900
++#: g10/keygen.c:1912
 +#, c-format
 +msgid "   (%d) Elgamal (encrypt only)\n"
 +msgstr "   (%d) Elgamal (encrypt only)\n"
 +
- #: g10/keygen.c:1902
++#: g10/keygen.c:1914
 +#, c-format
 +msgid "   (%d) RSA (encrypt only)\n"
 +msgstr "   (%d) RSA (encrypt only)\n"
 +
- #: g10/keygen.c:1908
++#: g10/keygen.c:1920
 +#, c-format
 +msgid "   (%d) DSA (set your own capabilities)\n"
 +msgstr "   (%d) DSA (set your own capabilities)\n"
 +
- #: g10/keygen.c:1910
++#: g10/keygen.c:1922
 +#, c-format
 +msgid "   (%d) RSA (set your own capabilities)\n"
 +msgstr "   (%d) RSA (set your own capabilities)\n"
 +
- #: g10/keygen.c:1916
++#: g10/keygen.c:1928
 +#, c-format
 +msgid "   (%d) ECC and ECC\n"
 +msgstr "   (%d) ECC and ECC\n"
 +
- #: g10/keygen.c:1918
++#: g10/keygen.c:1930
 +#, c-format
 +msgid "  (%d) ECC (sign only)\n"
 +msgstr "  (%d) ECC (sign only)\n"
 +
- #: g10/keygen.c:1920
++#: g10/keygen.c:1932
 +#, c-format
 +msgid "  (%d) ECC (set your own capabilities)\n"
 +msgstr "  (%d) ECC (set your own capabilities)\n"
 +
- #: g10/keygen.c:1922
++#: g10/keygen.c:1934
 +#, c-format
 +msgid "  (%d) ECC (encrypt only)\n"
 +msgstr "  (%d) ECC (encrypt only)\n"
 +
- #: g10/keygen.c:1926
++#: g10/keygen.c:1938
 +#, c-format
 +msgid "  (%d) Existing key\n"
 +msgstr "  (%d) Existing key\n"
 +
- #: g10/keygen.c:2022 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:206
 +msgid "Enter the keygrip: "
 +msgstr "Enter the keygrip: "
 +
- #: g10/keygen.c:2035 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2047 sm/certreqgen-ui.c:214
 +msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 +msgstr "Not a valid keygrip (expecting 40 hex digits)\n"
 +
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2049 sm/certreqgen-ui.c:216
 +msgid "No key with this keygrip\n"
 +msgstr "No key with this keygrip\n"
 +
- #: g10/keygen.c:2111 g10/keygen.c:2125
++#: g10/keygen.c:2133 g10/keygen.c:2147
 +#, c-format
 +msgid "rounded to %u bits\n"
 +msgstr "rounded to %u bits\n"
 +
- #: g10/keygen.c:2166
++#: g10/keygen.c:2188
 +#, c-format
 +msgid "%s keys may be between %u and %u bits long.\n"
 +msgstr "%s keys may be between %u and %u bits long.\n"
 +
- #: g10/keygen.c:2174
++#: g10/keygen.c:2196
 +#, c-format
 +msgid "What keysize do you want for the subkey? (%u) "
 +msgstr "What keysize do you want for the subkey? (%u) "
 +
- #: g10/keygen.c:2177 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2199 sm/certreqgen-ui.c:183
 +#, c-format
 +msgid "What keysize do you want? (%u) "
 +msgstr "What keysize do you want? (%u) "
 +
- #: g10/keygen.c:2191 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2213 sm/certreqgen-ui.c:193
 +#, c-format
 +msgid "Requested keysize is %u bits\n"
 +msgstr "Requested keysize is %u bits\n"
 +
- #: g10/keygen.c:2237
++#: g10/keygen.c:2259
 +msgid "Please select which elliptic curve you want:\n"
 +msgstr "Please select which elliptic curve you want:\n"
 +
- #: g10/keygen.c:2409
++#: g10/keygen.c:2431
 +msgid ""
 +"Please specify how long the key should be valid.\n"
 +"         0 = key does not expire\n"
 +"      <n>  = key expires in n days\n"
 +"      <n>w = key expires in n weeks\n"
 +"      <n>m = key expires in n months\n"
 +"      <n>y = key expires in n years\n"
 +msgstr ""
 +"Please specify how long the key should be valid.\n"
 +"         0 = key does not expire\n"
 +"      <n>  = key expires in n days\n"
 +"      <n>w = key expires in n weeks\n"
 +"      <n>m = key expires in n months\n"
 +"      <n>y = key expires in n years\n"
 +
- #: g10/keygen.c:2420
++#: g10/keygen.c:2442
 +msgid ""
 +"Please specify how long the signature should be valid.\n"
 +"         0 = signature does not expire\n"
 +"      <n>  = signature expires in n days\n"
 +"      <n>w = signature expires in n weeks\n"
 +"      <n>m = signature expires in n months\n"
 +"      <n>y = signature expires in n years\n"
 +msgstr ""
 +"Please specify how long the signature should be valid.\n"
 +"         0 = signature does not expire\n"
 +"      <n>  = signature expires in n days\n"
 +"      <n>w = signature expires in n weeks\n"
 +"      <n>m = signature expires in n months\n"
 +"      <n>y = signature expires in n years\n"
 +
- #: g10/keygen.c:2443
++#: g10/keygen.c:2465
 +msgid "Key is valid for? (0) "
 +msgstr "Key is valid for? (0) "
 +
- #: g10/keygen.c:2448
++#: g10/keygen.c:2470
 +#, c-format
 +msgid "Signature is valid for? (%s) "
 +msgstr "Signature is valid for? (%s) "
 +
- #: g10/keygen.c:2461 g10/keygen.c:2486
++#: g10/keygen.c:2483 g10/keygen.c:2508
 +msgid "invalid value\n"
 +msgstr "invalid value\n"
 +
- #: g10/keygen.c:2468
++#: g10/keygen.c:2490
 +msgid "Key does not expire at all\n"
 +msgstr "Key does not expire at all\n"
 +
- #: g10/keygen.c:2469
++#: g10/keygen.c:2491
 +msgid "Signature does not expire at all\n"
 +msgstr "Signature does not expire at all\n"
 +
- #: g10/keygen.c:2474
++#: g10/keygen.c:2496
 +#, c-format
 +msgid "Key expires at %s\n"
 +msgstr "Key expires at %s\n"
 +
- #: g10/keygen.c:2475
++#: g10/keygen.c:2497
 +#, c-format
 +msgid "Signature expires at %s\n"
 +msgstr "Signature expires at %s\n"
 +
- #: g10/keygen.c:2479
++#: g10/keygen.c:2501
 +msgid ""
 +"Your system can't display dates beyond 2038.\n"
 +"However, it will be correctly handled up to 2106.\n"
 +msgstr ""
 +"Your system can't display dates beyond 2038.\n"
 +"However, it will be correctly handled up to 2106.\n"
 +
- #: g10/keygen.c:2492
++#: g10/keygen.c:2514
 +msgid "Is this correct? (y/N) "
 +msgstr "Is this correct? (y/N) "
 +
- #: g10/keygen.c:2560
++#: g10/keygen.c:2582
 +msgid ""
 +"\n"
 +"GnuPG needs to construct a user ID to identify your key.\n"
 +"\n"
 +msgstr ""
 +"\n"
 +"GnuPG needs to construct a user ID to identify your key.\n"
 +"\n"
 +
 +#. TRANSLATORS: This string is in general not anymore used
 +#. but you should keep your existing translation.  In case
 +#. the new string is not translated this old string will
 +#. be used.
- #: g10/keygen.c:2575
++#: g10/keygen.c:2597
 +msgid ""
 +"\n"
 +"You need a user ID to identify your key; the software constructs the user "
 +"ID\n"
 +"from the Real Name, Comment and Email Address in this form:\n"
 +"    \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
 +"\n"
 +msgstr ""
 +"\n"
 +"You need a user ID to identify your key; the software constructs the user "
 +"ID\n"
 +"from the Real Name, Comment and Email Address in this form:\n"
 +"    “Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>”\n"
 +"\n"
 +
- #: g10/keygen.c:2594
++#: g10/keygen.c:2616
 +msgid "Real name: "
 +msgstr "Real name: "
 +
- #: g10/keygen.c:2603
++#: g10/keygen.c:2625
 +msgid "Invalid character in name\n"
 +msgstr "Invalid character in name\n"
 +
- #: g10/keygen.c:2604
++#: g10/keygen.c:2626
 +#, c-format
 +msgid "The characters '%s' and '%s' may not appear in name\n"
 +msgstr "The characters ‘%s’ and ‘%s’ may not appear in name\n"
 +
- #: g10/keygen.c:2608
++#: g10/keygen.c:2630
 +msgid "Name may not start with a digit\n"
 +msgstr "Name may not start with a digit\n"
 +
- #: g10/keygen.c:2611
++#: g10/keygen.c:2633
 +msgid "Name must be at least 5 characters long\n"
 +msgstr "Name must be at least 5 characters long\n"
 +
- #: g10/keygen.c:2621
++#: g10/keygen.c:2643
 +msgid "Email address: "
 +msgstr "Email address: "
 +
- #: g10/keygen.c:2627
++#: g10/keygen.c:2649
 +msgid "Not a valid email address\n"
 +msgstr "Not a valid email address\n"
 +
- #: g10/keygen.c:2636
++#: g10/keygen.c:2658
 +msgid "Comment: "
 +msgstr "Comment: "
 +
- #: g10/keygen.c:2642
++#: g10/keygen.c:2664
 +msgid "Invalid character in comment\n"
 +msgstr "Invalid character in comment\n"
 +
- #: g10/keygen.c:2678
++#: g10/keygen.c:2700
 +#, c-format
 +msgid "You are using the '%s' character set.\n"
 +msgstr "You are using the ‘%s’ character set.\n"
 +
- #: g10/keygen.c:2684
++#: g10/keygen.c:2706
 +#, c-format
 +msgid ""
 +"You selected this USER-ID:\n"
 +"    \"%s\"\n"
 +"\n"
 +msgstr ""
 +"You selected this USER-ID:\n"
 +"    “%s”\n"
 +"\n"
 +
- #: g10/keygen.c:2689
++#: g10/keygen.c:2711
 +msgid "Please don't put the email address into the real name or the comment\n"
 +msgstr "Please don't put the email address into the real name or the comment\n"
 +
 +#. TRANSLATORS: These are the allowed answers in
 +#. lower and uppercase.  Below you will find the matching
 +#. string which should be translated accordingly and the
 +#. letter changed to match the one in the answer string.
 +#.
 +#. n = Change name
 +#. c = Change comment
 +#. e = Change email
 +#. o = Okay (ready, continue)
 +#. q = Quit
 +#.
- #: g10/keygen.c:2714
++#: g10/keygen.c:2736
 +msgid "NnCcEeOoQq"
 +msgstr "NnCcEeOoQq"
 +
- #: g10/keygen.c:2724
++#: g10/keygen.c:2746
 +msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 +msgstr "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 +
- #: g10/keygen.c:2725
++#: g10/keygen.c:2747
 +msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 +msgstr "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 +
- #: g10/keygen.c:2730
++#: g10/keygen.c:2752
 +msgid "Change (N)ame, (E)mail, or (Q)uit? "
 +msgstr "Change (N)ame, (E)mail, or (Q)uit? "
 +
- #: g10/keygen.c:2731
++#: g10/keygen.c:2753
 +msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 +msgstr "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 +
- #: g10/keygen.c:2750
++#: g10/keygen.c:2772
 +msgid "Please correct the error first\n"
 +msgstr "Please correct the error first\n"
 +
- #: g10/keygen.c:2796
++#: g10/keygen.c:2818
 +msgid ""
 +"We need to generate a lot of random bytes. It is a good idea to perform\n"
 +"some other action (type on the keyboard, move the mouse, utilize the\n"
 +"disks) during the prime generation; this gives the random number\n"
 +"generator a better chance to gain enough entropy.\n"
 +msgstr ""
 +"We need to generate a lot of random bytes. It is a good idea to perform\n"
 +"some other action (type on the keyboard, move the mouse, utilize the\n"
 +"disks) during the prime generation; this gives the random number\n"
 +"generator a better chance to gain enough entropy.\n"
 +
- #: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
- #: g10/keygen.c:4777 g10/keygen.c:4882
++#: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
++#: g10/keygen.c:4330 g10/keygen.c:4803 g10/keygen.c:5064 g10/keygen.c:5169
 +#, c-format
 +msgid "Key generation failed: %s\n"
 +msgstr "Key generation failed: %s\n"
 +
- #: g10/keygen.c:3598
++#: g10/keygen.c:3922
 +#, c-format
 +msgid ""
 +"About to create a key for:\n"
 +"    \"%s\"\n"
 +"\n"
 +msgstr ""
 +"About to create a key for:\n"
 +"    “%s”\n"
 +"\n"
 +
- #: g10/keygen.c:3600
++#: g10/keygen.c:3924
 +msgid "Continue? (Y/n) "
 +msgstr "Continue? (Y/n) "
 +
- #: g10/keygen.c:3621
++#: g10/keygen.c:3945
 +#, c-format
 +msgid "A key for \"%s\" already exists\n"
 +msgstr "A key for “%s” already exists\n"
 +
- #: g10/keygen.c:3626
++#: g10/keygen.c:3950
 +msgid "Create anyway? (y/N) "
 +msgstr "Create anyway? (y/N) "
 +
- #: g10/keygen.c:3632
++#: g10/keygen.c:3956
 +msgid "creating anyway\n"
 +msgstr "creating anyway\n"
 +
- #: g10/keygen.c:3981
++#: g10/keygen.c:4315
 +#, c-format
 +msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 +msgstr "Note: Use “%s %s” for a full featured key generation dialog.\n"
 +
- #: g10/keygen.c:4013
++#: g10/keygen.c:4358
 +msgid "Key generation canceled.\n"
 +msgstr "Key generation canceled.\n"
 +
- #: g10/keygen.c:4073
++#: g10/keygen.c:4418
 +#, c-format
 +msgid "can't create backup file '%s': %s\n"
 +msgstr "can't create backup file '%s': %s\n"
 +
- #: g10/keygen.c:4093
++#: g10/keygen.c:4438
 +#, c-format
 +msgid "Note: backup of card key saved to '%s'\n"
 +msgstr "Note: backup of card key saved to ‘%s’\n"
 +
- #: g10/keygen.c:4244 g10/keygen.c:4393
++#: g10/keygen.c:4589 g10/keygen.c:4738
 +#, c-format
 +msgid "writing public key to '%s'\n"
 +msgstr "writing public key to ‘%s’\n"
 +
- #: g10/keygen.c:4387
++#: g10/keygen.c:4732
 +#, c-format
 +msgid "no writable public keyring found: %s\n"
 +msgstr "no writable public keyring found: %s\n"
 +
- #: g10/keygen.c:4401
++#: g10/keygen.c:4746
 +#, c-format
 +msgid "error writing public keyring '%s': %s\n"
 +msgstr "error writing public keyring '%s': %s\n"
 +
- #: g10/keygen.c:4433
++#: g10/keygen.c:4778
 +msgid "public and secret key created and signed.\n"
 +msgstr "public and secret key created and signed.\n"
 +
- #: g10/keygen.c:4445
++#: g10/keygen.c:4790
 +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 ""
 +"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:4649 g10/keygen.c:4833
++#: g10/keygen.c:4936 g10/keygen.c:5120
 +#, 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:4651 g10/keygen.c:4835
++#: g10/keygen.c:4938 g10/keygen.c:5122
 +#, 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:4662 g10/keygen.c:4846
++#: g10/keygen.c:4949 g10/keygen.c:5133
 +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:4674 g10/keygen.c:4676
++#: g10/keygen.c:4961 g10/keygen.c:4963
 +msgid "Secret parts of primary key are not available.\n"
 +msgstr "Secret parts of primary key are not available.\n"
 +
- #: g10/keygen.c:4683 g10/keygen.c:4685
++#: g10/keygen.c:4970 g10/keygen.c:4972
 +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:4704 g10/keygen.c:4860
++#: g10/keygen.c:4991 g10/keygen.c:5147
 +msgid "Really create? (y/N) "
 +msgstr "Really create? (y/N) "
 +
 +#: g10/keyid.c:664 g10/keyid.c:677 g10/keyid.c:690
 +msgid "never     "
 +msgstr "never     "
 +
 +#: g10/keylist.c:331
 +msgid "Critical signature policy: "
 +msgstr "Critical signature policy: "
 +
 +#: g10/keylist.c:333
 +msgid "Signature policy: "
 +msgstr "Signature policy: "
 +
 +#: g10/keylist.c:375
 +msgid "Critical preferred keyserver: "
 +msgstr "Critical preferred keyserver: "
 +
 +#: g10/keylist.c:428
 +msgid "Critical signature notation: "
 +msgstr "Critical signature notation: "
 +
 +#: g10/keylist.c:430
 +msgid "Signature notation: "
 +msgstr "Signature notation: "
 +
 +#: g10/keylist.c:472
 +#, c-format
 +msgid "%d good signature\n"
 +msgid_plural "%d good signatures\n"
 +msgstr[0] "%d good signature\n"
 +msgstr[1] "%d good signatures\n"
 +
 +#: g10/keylist.c:485
 +#, c-format
 +msgid "%d signature not checked due to an error\n"
 +msgid_plural "%d signatures not checked due to errors\n"
 +msgstr[0] "%d signature not checked due to an error\n"
 +msgstr[1] "%d signatures not checked due to errors\n"
 +
 +#: g10/keylist.c:567
 +#, c-format
 +msgid "Warning: %lu key skipped due to its large size\n"
 +msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
 +msgstr[0] "Warning: %lu key skipped due to its large size\n"
 +msgstr[1] "Warning: %lu keys skipped due to their large sizes\n"
 +
 +#: g10/keylist.c:589
 +msgid "Keyring"
 +msgstr "Keyring"
 +
 +#: g10/keylist.c:1719
 +msgid "Primary key fingerprint:"
 +msgstr "Primary key fingerprint:"
 +
 +#: g10/keylist.c:1721
 +msgid "     Subkey fingerprint:"
 +msgstr "     Subkey fingerprint:"
 +
 +#. TRANSLATORS: this should fit into 24 bytes so that the
 +#. * fingerprint data is properly aligned with the user ID
 +#: g10/keylist.c:1729
 +msgid " Primary key fingerprint:"
 +msgstr " Primary key fingerprint:"
 +
 +#: g10/keylist.c:1731 g10/keylist.c:1741
 +msgid "      Subkey fingerprint:"
 +msgstr "      Subkey fingerprint:"
 +
 +#: g10/keylist.c:1736 g10/keylist.c:1752
 +msgid "      Key fingerprint ="
 +msgstr "      Key fingerprint ="
 +
 +#: g10/keylist.c:1803
 +msgid "      Card serial no. ="
 +msgstr "      Card serial no. ="
 +
 +#: g10/keyring.c:1498
 +#, c-format
 +msgid "caching keyring '%s'\n"
 +msgstr "caching keyring ‘%s’\n"
 +
 +#: g10/keyring.c:1572
 +#, c-format
 +msgid "%lu keys cached so far (%lu signature)\n"
 +msgid_plural "%lu keys cached so far (%lu signatures)\n"
 +msgstr[0] "%lu keys cached so far (%lu signature)\n"
 +msgstr[1] "%lu keys cached so far (%lu signatures)\n"
 +
 +#: g10/keyring.c:1588
 +#, c-format
 +msgid "%lu key cached"
 +msgid_plural "%lu keys cached"
 +msgstr[0] "%lu key cached"
 +msgstr[1] "%lu keys cached"
 +
 +#: g10/keyring.c:1590
 +#, c-format
 +msgid " (%lu signature)\n"
 +msgid_plural " (%lu signatures)\n"
 +msgstr[0] " (%lu signature)\n"
 +msgstr[1] " (%lu signatures)\n"
 +
 +#: g10/keyring.c:1665
 +#, c-format
 +msgid "%s: keyring created\n"
 +msgstr "%s: keyring created\n"
 +
 +#: g10/keyserver.c:91
 +msgid "override proxy options set for dirmngr"
 +msgstr "override proxy options set for dirmngr"
 +
 +#: g10/keyserver.c:93
 +msgid "include revoked keys in search results"
 +msgstr "include revoked keys in search results"
 +
 +#: g10/keyserver.c:94
 +msgid "include subkeys when searching by key ID"
 +msgstr "include subkeys when searching by key ID"
 +
 +#: g10/keyserver.c:96
 +msgid "override timeout options set for dirmngr"
 +msgstr "override timeout options set for dirmngr"
 +
 +#: g10/keyserver.c:100
 +msgid "automatically retrieve keys when verifying signatures"
 +msgstr "automatically retrieve keys when verifying signatures"
 +
 +#: g10/keyserver.c:102
 +msgid "honor the preferred keyserver URL set on the key"
 +msgstr "honor the preferred keyserver URL set on the key"
 +
 +#: g10/keyserver.c:104
 +msgid "honor the PKA record set on a key when retrieving keys"
 +msgstr "honor the PKA record set on a key when retrieving keys"
 +
 +#: g10/keyserver.c:550
 +msgid "disabled"
 +msgstr "disabled"
 +
 +#: g10/keyserver.c:754
 +msgid "Enter number(s), N)ext, or Q)uit > "
 +msgstr "Enter number(s), N)ext, or Q)uit > "
 +
 +#: g10/keyserver.c:860
 +#, c-format
 +msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 +msgstr "invalid keyserver protocol (us %d!=handler %d)\n"
 +
 +#: g10/keyserver.c:1001 g10/keyserver.c:1116
 +#, c-format
 +msgid "\"%s\" not a key ID: skipping\n"
 +msgstr "“%s” not a key ID: skipping\n"
 +
 +#: g10/keyserver.c:1421 g10/keyserver.c:1454
 +#, c-format
 +msgid "refreshing %d key from %s\n"
 +msgid_plural "refreshing %d keys from %s\n"
 +msgstr[0] "refreshing %d key from %s\n"
 +msgstr[1] "refreshing %d keys from %s\n"
 +
 +#: g10/keyserver.c:1428
 +#, c-format
 +msgid "WARNING: unable to refresh key %s via %s: %s\n"
 +msgstr "WARNING: unable to refresh key %s via %s: %s\n"
 +
 +#: g10/keyserver.c:1532
 +#, c-format
 +msgid "key \"%s\" not found on keyserver\n"
 +msgstr "key “%s” not found on keyserver\n"
 +
 +#: g10/keyserver.c:1535
 +msgid "key not found on keyserver\n"
 +msgstr "key not found on keyserver\n"
 +
 +#: g10/keyserver.c:1539
 +msgid "no keyserver known (use option --keyserver)\n"
 +msgstr "no keyserver known (use option --keyserver)\n"
 +
 +#: g10/keyserver.c:1704
 +#, c-format
 +msgid "requesting key %s from %s server %s\n"
 +msgstr "requesting key %s from %s server %s\n"
 +
 +#: g10/keyserver.c:1708
 +#, c-format
 +msgid "requesting key %s from %s\n"
 +msgstr "requesting key %s from %s\n"
 +
 +#: g10/keyserver.c:1809 g10/keyserver.c:1965
 +msgid "no keyserver known\n"
 +msgstr "no keyserver known\n"
 +
 +#: g10/keyserver.c:1824 g10/skclist.c:196 g10/skclist.c:224
 +#, c-format
 +msgid "skipped \"%s\": %s\n"
 +msgstr "skipped “%s”: %s\n"
 +
 +#: g10/keyserver.c:1827
 +#, c-format
 +msgid "sending key %s to %s\n"
 +msgstr "sending key %s to %s\n"
 +
 +#: g10/keyserver.c:1868
 +#, c-format
 +msgid "requesting key from '%s'\n"
 +msgstr "requesting key from ‘%s’\n"
 +
 +#: g10/keyserver.c:1884
 +#, c-format
 +msgid "WARNING: unable to fetch URI %s: %s\n"
 +msgstr "WARNING: unable to fetch URI %s: %s\n"
 +
 +#: g10/mainproc.c:254
 +#, 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:302
 +#, c-format
 +msgid "%s encrypted session key\n"
 +msgstr "%s encrypted session key\n"
 +
 +#: g10/mainproc.c:312
 +#, c-format
 +msgid "passphrase generated with unknown digest algorithm %d\n"
 +msgstr "passphrase generated with unknown digest algorithm %d\n"
 +
 +#: g10/mainproc.c:378
 +#, c-format
 +msgid "public key is %s\n"
 +msgstr "public key is %s\n"
 +
 +#: g10/mainproc.c:456
 +msgid "public key encrypted data: good DEK\n"
 +msgstr "public key encrypted data: good DEK\n"
 +
 +#: g10/mainproc.c:489
 +#, 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:493 g10/pkclist.c:228
 +#, c-format
 +msgid "      \"%s\"\n"
 +msgstr "      “%s”\n"
 +
 +#: g10/mainproc.c:497
 +#, c-format
 +msgid "encrypted with %s key, ID %s\n"
 +msgstr "encrypted with %s key, ID %s\n"
 +
 +#: g10/mainproc.c:514
 +#, c-format
 +msgid "public key decryption failed: %s\n"
 +msgstr "public key decryption failed: %s\n"
 +
 +#: g10/mainproc.c:530
 +#, c-format
 +msgid "encrypted with %lu passphrases\n"
 +msgstr "encrypted with %lu passphrases\n"
 +
 +#: g10/mainproc.c:532
 +msgid "encrypted with 1 passphrase\n"
 +msgstr "encrypted with 1 passphrase\n"
 +
 +#: g10/mainproc.c:566 g10/mainproc.c:587
 +#, c-format
 +msgid "assuming %s encrypted data\n"
 +msgstr "assuming %s encrypted data\n"
 +
 +#: g10/mainproc.c:573
 +#, 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:618 g10/mainproc.c:632
 +msgid "WARNING: message was not integrity protected\n"
 +msgstr "WARNING: message was not integrity protected\n"
 +
 +#: g10/mainproc.c:628
 +msgid "decryption okay\n"
 +msgstr "decryption okay\n"
 +
 +#: g10/mainproc.c:637
 +msgid "WARNING: encrypted message has been manipulated!\n"
 +msgstr "WARNING: encrypted message has been manipulated!\n"
 +
 +#: g10/mainproc.c:653
 +#, c-format
 +msgid "decryption failed: %s\n"
 +msgstr "decryption failed: %s\n"
 +
 +#: g10/mainproc.c:676
 +msgid "Note: sender requested \"for-your-eyes-only\"\n"
 +msgstr "Note: sender requested “for-your-eyes-only”\n"
 +
 +#: g10/mainproc.c:678
 +#, c-format
 +msgid "original file name='%.*s'\n"
 +msgstr "original file name='%.*s'\n"
 +
 +#: g10/mainproc.c:748
 +msgid "WARNING: multiple plaintexts seen\n"
 +msgstr "WARNING: multiple plaintexts seen\n"
 +
 +#: g10/mainproc.c:923
 +msgid "standalone revocation - use \"gpg --import\" to apply\n"
 +msgstr "standalone revocation - use “gpg --import” to apply\n"
 +
- #: g10/mainproc.c:1233 g10/mainproc.c:1276
++#: g10/mainproc.c:1238 g10/mainproc.c:1281
 +msgid "no signature found\n"
 +msgstr "no signature found\n"
 +
- #: g10/mainproc.c:1607
++#: g10/mainproc.c:1612
 +#, c-format
 +msgid "BAD signature from \"%s\""
 +msgstr "BAD signature from “%s”"
 +
- #: g10/mainproc.c:1609
++#: g10/mainproc.c:1614
 +#, c-format
 +msgid "Expired signature from \"%s\""
 +msgstr "Expired signature from “%s”"
 +
- #: g10/mainproc.c:1611
++#: g10/mainproc.c:1616
 +#, c-format
 +msgid "Good signature from \"%s\""
 +msgstr "Good signature from “%s”"
 +
- #: g10/mainproc.c:1630
++#: g10/mainproc.c:1635
 +msgid "signature verification suppressed\n"
 +msgstr "signature verification suppressed\n"
 +
- #: g10/mainproc.c:1739
++#: g10/mainproc.c:1744
 +msgid "can't handle this ambiguous signature data\n"
 +msgstr "can't handle this ambiguous signature data\n"
 +
- #: g10/mainproc.c:1753 g10/mainproc.c:1761
++#: g10/mainproc.c:1758 g10/mainproc.c:1766
 +#, c-format
 +msgid "Signature made %s\n"
 +msgstr "Signature made %s\n"
 +
- #: g10/mainproc.c:1754 g10/mainproc.c:1762
++#: g10/mainproc.c:1759 g10/mainproc.c:1767
 +#, c-format
 +msgid "               using %s key %s\n"
 +msgstr "               using %s key %s\n"
 +
- #: g10/mainproc.c:1766
++#: g10/mainproc.c:1771
 +#, 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:1772
++#: g10/mainproc.c:1777
 +#, c-format
 +msgid "               issuer \"%s\"\n"
 +msgstr "               issuer “%s”\n"
 +
- #: g10/mainproc.c:1789
++#: g10/mainproc.c:1794
 +msgid "Key available at: "
 +msgstr "Key available at: "
 +
- #: g10/mainproc.c:2024
++#: g10/mainproc.c:2029
 +msgid "[uncertain]"
 +msgstr "[uncertain]"
 +
- #: g10/mainproc.c:2062
++#: g10/mainproc.c:2067
 +#, c-format
 +msgid "                aka \"%s\""
 +msgstr "                aka “%s”"
 +
- #: g10/mainproc.c:2145
++#: g10/mainproc.c:2150
 +#, c-format
 +msgid "Signature expired %s\n"
 +msgstr "Signature expired %s\n"
 +
- #: g10/mainproc.c:2149
++#: g10/mainproc.c:2154
 +#, c-format
 +msgid "Signature expires %s\n"
 +msgstr "Signature expires %s\n"
 +
- #: g10/mainproc.c:2160
++#: g10/mainproc.c:2165
 +#, c-format
 +msgid "%s signature, digest algorithm %s%s%s\n"
 +msgstr "%s signature, digest algorithm %s%s%s\n"
 +
- #: g10/mainproc.c:2161
++#: g10/mainproc.c:2166
 +msgid "binary"
 +msgstr "binary"
 +
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2167
 +msgid "textmode"
 +msgstr "textmode"
 +
- #: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
 +msgid "unknown"
 +msgstr "unknown"
 +
- #: g10/mainproc.c:2164
++#: g10/mainproc.c:2169
 +msgid ", key algorithm "
 +msgstr ", key algorithm "
 +
- #: g10/mainproc.c:2199
++#: g10/mainproc.c:2204
 +#, 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:2229
++#: g10/mainproc.c:2234
 +#, c-format
 +msgid "Can't check signature: %s\n"
 +msgstr "Can't check signature: %s\n"
 +
- #: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
++#: g10/mainproc.c:2327 g10/mainproc.c:2346 g10/mainproc.c:2470
 +msgid "not a detached signature\n"
 +msgstr "not a detached signature\n"
 +
- #: g10/mainproc.c:2375
++#: g10/mainproc.c:2380
 +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:2384
++#: g10/mainproc.c:2389
 +#, c-format
 +msgid "standalone signature of class 0x%02x\n"
 +msgstr "standalone signature of class 0x%02x\n"
 +
- #: g10/mainproc.c:2469
++#: g10/mainproc.c:2474
 +msgid "old style (PGP 2.x) signature\n"
 +msgstr "old style (PGP 2.x) signature\n"
 +
 +#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
 +#, c-format
 +msgid "fstat of '%s' failed in %s: %s\n"
 +msgstr "fstat of ‘%s’ failed in %s: %s\n"
 +
 +#: g10/misc.c:170
 +#, c-format
 +msgid "fstat(%d) failed in %s: %s\n"
 +msgstr "fstat(%d) failed in %s: %s\n"
 +
 +#: g10/misc.c:279
 +#, c-format
 +msgid "WARNING: using experimental public key algorithm %s\n"
 +msgstr "WARNING: using experimental public key algorithm %s\n"
 +
 +#: g10/misc.c:286
 +msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 +msgstr "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 +
 +#: g10/misc.c:300
 +#, c-format
 +msgid "WARNING: using experimental cipher algorithm %s\n"
 +msgstr "WARNING: using experimental cipher algorithm %s\n"
 +
 +#: g10/misc.c:319
 +#, c-format
 +msgid "WARNING: using experimental digest algorithm %s\n"
 +msgstr "WARNING: using experimental digest algorithm %s\n"
 +
 +#: g10/misc.c:328
 +#, c-format
 +msgid "WARNING: digest algorithm %s is deprecated\n"
 +msgstr "WARNING: digest algorithm %s is deprecated\n"
 +
 +#: g10/misc.c:353
 +#, c-format
 +msgid "Note: signatures using the %s algorithm are rejected\n"
 +msgstr "Note: signatures using the %s algorithm are rejected\n"
 +
 +#: g10/misc.c:375
 +#, c-format
 +msgid "(reported error: %s)\n"
 +msgstr "(reported error: %s)\n"
 +
 +#: g10/misc.c:378
 +#, c-format
 +msgid "(reported error: %s <%s>)\n"
 +msgstr "(reported error: %s <%s>)\n"
 +
 +#: g10/misc.c:397
 +msgid "(further info: "
 +msgstr "(further info: "
 +
 +#: g10/misc.c:1056
 +#, c-format
 +msgid "%s:%d: deprecated option \"%s\"\n"
 +msgstr "%s:%d: deprecated option “%s”\n"
 +
 +#: g10/misc.c:1060
 +#, c-format
 +msgid "WARNING: \"%s\" is a deprecated option\n"
 +msgstr "WARNING: “%s” is a deprecated option\n"
 +
 +#: g10/misc.c:1062
 +#, c-format
 +msgid "please use \"%s%s\" instead\n"
 +msgstr "please use “%s%s” instead\n"
 +
 +#: g10/misc.c:1069
 +#, 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:1079
 +#, 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:1083
 +#, 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:1147
 +msgid "Uncompressed"
 +msgstr "Uncompressed"
 +
 +#. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: g10/misc.c:1172
 +msgid "uncompressed|none"
 +msgstr "uncompressed|none"
 +
 +#: g10/misc.c:1297
 +#, 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:1472
 +#, c-format
 +msgid "ambiguous option '%s'\n"
 +msgstr "ambiguous option ‘%s’\n"
 +
 +#: g10/misc.c:1497
 +#, c-format
 +msgid "unknown option '%s'\n"
 +msgstr "unknown option ‘%s’\n"
 +
 +#: g10/misc.c:1735
 +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:1757
 +#, c-format
 +msgid "unknown weak digest '%s'\n"
 +msgstr "unknown weak digest ‘%s’\n"
 +
 +#: g10/openfile.c:84
 +#, c-format
 +msgid "File '%s' exists. "
 +msgstr "File ‘%s’ exists. "
 +
 +#: g10/openfile.c:88
 +msgid "Overwrite? (y/N) "
 +msgstr "Overwrite? (y/N) "
 +
 +#: g10/openfile.c:123
 +#, c-format
 +msgid "%s: unknown suffix\n"
 +msgstr "%s: unknown suffix\n"
 +
 +#: g10/openfile.c:147
 +msgid "Enter new filename"
 +msgstr "Enter new filename"
 +
 +#: g10/openfile.c:218
 +msgid "writing to stdout\n"
 +msgstr "writing to stdout\n"
 +
 +#: g10/openfile.c:366
 +#, c-format
 +msgid "assuming signed data in '%s'\n"
 +msgstr "assuming signed data in ‘%s’\n"
 +
 +#: g10/openfile.c:457
 +#, c-format
 +msgid "new configuration file '%s' created\n"
 +msgstr "new configuration file ‘%s’ created\n"
 +
 +#: g10/openfile.c:498
 +#, c-format
 +msgid "WARNING: options in '%s' are not yet active during this run\n"
 +msgstr "WARNING: options in ‘%s’ are not yet active during this run\n"
 +
 +#: g10/parse-packet.c:257
 +#, c-format
 +msgid "can't handle public key algorithm %d\n"
 +msgstr "can't handle public key algorithm %d\n"
 +
 +#: g10/parse-packet.c:1113
 +msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 +msgstr "WARNING: potentially insecure symmetrically encrypted session key\n"
 +
 +#: g10/parse-packet.c:1649
 +#, c-format
 +msgid "subpacket of type %d has critical bit set\n"
 +msgstr "subpacket of type %d has critical bit set\n"
 +
 +#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
 +#, c-format
 +msgid "problem with the agent: %s\n"
 +msgstr "problem with the agent: %s\n"
 +
 +#: g10/passphrase.c:241
 +msgid "Enter passphrase\n"
 +msgstr "Enter passphrase\n"
 +
 +#: g10/passphrase.c:252
 +msgid "cancelled by user\n"
 +msgstr "cancelled by user\n"
 +
 +#: g10/passphrase.c:489
 +#, c-format
 +msgid " (main key ID %s)"
 +msgstr " (main key ID %s)"
 +
 +#: g10/passphrase.c:496
 +msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 +msgstr "Please enter the passphrase to unlock the OpenPGP secret key:"
 +
 +#: g10/passphrase.c:500
 +msgid "Please enter the passphrase to import the OpenPGP secret key:"
 +msgstr "Please enter the passphrase to import the OpenPGP secret key:"
 +
 +#: g10/passphrase.c:505
 +msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 +msgstr "Please enter the passphrase to export the OpenPGP secret subkey:"
 +
 +#: g10/passphrase.c:508
 +msgid "Please enter the passphrase to export the OpenPGP secret key:"
 +msgstr "Please enter the passphrase to export the OpenPGP secret key:"
 +
 +#: g10/passphrase.c:513
 +msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 +msgstr ""
 +"Do you really want to permanently delete the OpenPGP secret subkey key:"
 +
 +#: g10/passphrase.c:516
 +msgid "Do you really want to permanently delete the OpenPGP secret key:"
 +msgstr "Do you really want to permanently delete the OpenPGP secret key:"
 +
 +#: g10/passphrase.c:525
 +#, c-format
 +msgid ""
 +"%s\n"
 +"\"%.*s\"\n"
 +"%u-bit %s key, ID %s,\n"
 +"created %s%s.\n"
 +"%s"
 +msgstr ""
 +"%s\n"
 +"“%.*s”\n"
 +"%u-bit %s key, ID %s,\n"
 +"created %s%s.\n"
 +"%s"
 +
 +#: g10/photoid.c:77
 +msgid ""
 +"\n"
 +"Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
 +"Remember that the image is stored within your public key.  If you use a\n"
 +"very large picture, your key will become very large as well!\n"
 +"Keeping the image close to 240x288 is a good size to use.\n"
 +msgstr ""
 +"\n"
 +"Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
 +"Remember that the image is stored within your public key.  If you use a\n"
 +"very large picture, your key will become very large as well!\n"
 +"Keeping the image close to 240x288 is a good size to use.\n"
 +
 +#: g10/photoid.c:99
 +msgid "Enter JPEG filename for photo ID: "
 +msgstr "Enter JPEG filename for photo ID: "
 +
 +#: g10/photoid.c:120
 +#, c-format
 +msgid "unable to open JPEG file '%s': %s\n"
 +msgstr "unable to open JPEG file '%s': %s\n"
 +
 +#: g10/photoid.c:131
 +#, c-format
 +msgid "This JPEG is really large (%d bytes) !\n"
 +msgstr "This JPEG is really large (%d bytes) !\n"
 +
 +#: g10/photoid.c:133
 +msgid "Are you sure you want to use it? (y/N) "
 +msgstr "Are you sure you want to use it? (y/N) "
 +
 +#: g10/photoid.c:149
 +#, c-format
 +msgid "'%s' is not a JPEG file\n"
 +msgstr "‘%s’ is not a JPEG file\n"
 +
 +#: g10/photoid.c:168
 +msgid "Is this photo correct (y/N/q)? "
 +msgstr "Is this photo correct (y/N/q)? "
 +
 +#: g10/photoid.c:380
 +msgid "unable to display photo ID!\n"
 +msgstr "unable to display photo ID!\n"
 +
- #: g10/pkclist.c:72 g10/revoke.c:757
++#: g10/pkclist.c:72 g10/revoke.c:758
 +msgid "No reason specified"
 +msgstr "No reason specified"
 +
- #: g10/pkclist.c:74 g10/revoke.c:759
++#: g10/pkclist.c:74 g10/revoke.c:760
 +msgid "Key is superseded"
 +msgstr "Key is superseded"
 +
- #: g10/pkclist.c:76 g10/revoke.c:758
++#: g10/pkclist.c:76 g10/revoke.c:759
 +msgid "Key has been compromised"
 +msgstr "Key has been compromised"
 +
- #: g10/pkclist.c:78 g10/revoke.c:760
++#: g10/pkclist.c:78 g10/revoke.c:761
 +msgid "Key is no longer used"
 +msgstr "Key is no longer used"
 +
- #: g10/pkclist.c:80 g10/revoke.c:761
++#: g10/pkclist.c:80 g10/revoke.c:762
 +msgid "User ID is no longer valid"
 +msgstr "User ID is no longer valid"
 +
 +#: g10/pkclist.c:84
 +msgid "reason for revocation: "
 +msgstr "reason for revocation: "
 +
 +#: g10/pkclist.c:100
 +msgid "revocation comment: "
 +msgstr "revocation comment: "
 +
 +#. TRANSLATORS: These are the allowed answers in lower and
 +#. uppercase.  Below you will find the matching strings which
 +#. should be translated accordingly and the letter changed to
 +#. match the one in the answer string.
 +#.
 +#. i = please show me more information
 +#. m = back to the main menu
 +#. s = skip this key
 +#. q = quit
 +#.
 +#: g10/pkclist.c:216
 +msgid "iImMqQsS"
 +msgstr "iImMqQsS"
 +
 +#: g10/pkclist.c:224
 +msgid "No trust value assigned to:\n"
 +msgstr "No trust value assigned to:\n"
 +
 +#: g10/pkclist.c:257
 +#, c-format
 +msgid "  aka \"%s\"\n"
 +msgstr "  aka “%s”\n"
 +
 +#: g10/pkclist.c:267
 +msgid ""
 +"How much do you trust that this key actually belongs to the named user?\n"
 +msgstr ""
 +"How much do you trust that this key actually belongs to the named user?\n"
 +
 +#: g10/pkclist.c:282
 +#, c-format
 +msgid "  %d = I don't know or won't say\n"
 +msgstr "  %d = I don't know or won't say\n"
 +
 +#: g10/pkclist.c:284
 +#, c-format
 +msgid "  %d = I do NOT trust\n"
 +msgstr "  %d = I do NOT trust\n"
 +
 +#: g10/pkclist.c:290
 +#, c-format
 +msgid "  %d = I trust ultimately\n"
 +msgstr "  %d = I trust ultimately\n"
 +
 +#: g10/pkclist.c:296
 +msgid "  m = back to the main menu\n"
 +msgstr "  m = back to the main menu\n"
 +
 +#: g10/pkclist.c:299
 +msgid "  s = skip this key\n"
 +msgstr "  s = skip this key\n"
 +
 +#: g10/pkclist.c:300
 +msgid "  q = quit\n"
 +msgstr "  q = quit\n"
 +
 +#: g10/pkclist.c:304
 +#, c-format
 +msgid ""
 +"The minimum trust level for this key is: %s\n"
 +"\n"
 +msgstr ""
 +"The minimum trust level for this key is: %s\n"
 +"\n"
 +
- #: g10/pkclist.c:310 g10/revoke.c:786
++#: g10/pkclist.c:310 g10/revoke.c:787
 +msgid "Your decision? "
 +msgstr "Your decision? "
 +
 +#: g10/pkclist.c:331
 +msgid "Do you really want to set this key to ultimate trust? (y/N) "
 +msgstr "Do you really want to set this key to ultimate trust? (y/N) "
 +
 +#: g10/pkclist.c:345
 +msgid "Certificates leading to an ultimately trusted key:\n"
 +msgstr "Certificates leading to an ultimately trusted key:\n"
 +
 +#: g10/pkclist.c:434
 +#, c-format
 +msgid "%s: There is no assurance this key belongs to the named user\n"
 +msgstr "%s: There is no assurance this key belongs to the named user\n"
 +
 +#: g10/pkclist.c:439
 +#, c-format
 +msgid "%s: There is limited assurance this key belongs to the named user\n"
 +msgstr "%s: There is limited assurance this key belongs to the named user\n"
 +
 +#: g10/pkclist.c:445
 +msgid "This key probably belongs to the named user\n"
 +msgstr "This key probably belongs to the named user\n"
 +
 +#: g10/pkclist.c:450
 +msgid "This key belongs to us\n"
 +msgstr "This key belongs to us\n"
 +
 +#: g10/pkclist.c:456
 +#, c-format
 +msgid "%s: This key is bad!  It has been marked as untrusted!\n"
 +msgstr "%s: This key is bad!  It has been marked as untrusted!\n"
 +
 +#: g10/pkclist.c:484
 +msgid ""
- "This key has is bad!  It has been marked as untrusted!  If you\n"
++"This key is bad!  It has been marked as untrusted!  If you\n"
 +"*really* know what you are doing, you may answer the next\n"
 +"question with yes.\n"
 +msgstr ""
- "This key has is bad!  It has been marked as untrusted!  If you\n"
++"This key is bad!  It has been marked as untrusted!  If you\n"
 +"*really* know what you are doing, you may answer the next\n"
 +"question with yes.\n"
 +
 +#: g10/pkclist.c:489
 +msgid ""
 +"It is NOT certain that the key belongs to the person named\n"
 +"in the user ID.  If you *really* know what you are doing,\n"
 +"you may answer the next question with yes.\n"
 +msgstr ""
 +"It is NOT certain that the key belongs to the person named\n"
 +"in the user ID.  If you *really* know what you are doing,\n"
 +"you may answer the next question with yes.\n"
 +
 +#: g10/pkclist.c:508
 +msgid "Use this key anyway? (y/N) "
 +msgstr "Use this key anyway? (y/N) "
 +
 +#: g10/pkclist.c:562
 +msgid "WARNING: Using untrusted key!\n"
 +msgstr "WARNING: Using untrusted key!\n"
 +
 +#: g10/pkclist.c:569
 +msgid "WARNING: this key might be revoked (revocation key not present)\n"
 +msgstr "WARNING: this key might be revoked (revocation key not present)\n"
 +
 +#: g10/pkclist.c:578
 +msgid "WARNING: This key has been revoked by its designated revoker!\n"
 +msgstr "WARNING: This key has been revoked by its designated revoker!\n"
 +
 +#: g10/pkclist.c:581
 +msgid "WARNING: This key has been revoked by its owner!\n"
 +msgstr "WARNING: This key has been revoked by its owner!\n"
 +
 +#: g10/pkclist.c:582
 +msgid "         This could mean that the signature is forged.\n"
 +msgstr "         This could mean that the signature is forged.\n"
 +
 +#: g10/pkclist.c:588
 +msgid "WARNING: This subkey has been revoked by its owner!\n"
 +msgstr "WARNING: This subkey has been revoked by its owner!\n"
 +
 +#: g10/pkclist.c:593
 +msgid "Note: This key has been disabled.\n"
 +msgstr "Note: This key has been disabled.\n"
 +
 +#: g10/pkclist.c:613
 +#, c-format
 +msgid "Note: Verified signer's address is '%s'\n"
 +msgstr "Note: Verified signer's address is ‘%s’\n"
 +
 +#: g10/pkclist.c:620
 +#, c-format
 +msgid "Note: Signer's address '%s' does not match DNS entry\n"
 +msgstr "Note: Signer's address ‘%s’ does not match DNS entry\n"
 +
 +#: g10/pkclist.c:632
 +msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 +msgstr "trustlevel adjusted to FULL due to valid PKA info\n"
 +
 +#: g10/pkclist.c:640
 +msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 +msgstr "trustlevel adjusted to NEVER due to bad PKA info\n"
 +
 +#: g10/pkclist.c:651
 +msgid "Note: This key has expired!\n"
 +msgstr "Note: This key has expired!\n"
 +
 +#: g10/pkclist.c:662
 +msgid "WARNING: This key is not certified with a trusted signature!\n"
 +msgstr "WARNING: This key is not certified with a trusted signature!\n"
 +
 +#: g10/pkclist.c:664
 +msgid ""
 +"         There is no indication that the signature belongs to the owner.\n"
 +msgstr ""
 +"         There is no indication that the signature belongs to the owner.\n"
 +
 +#: g10/pkclist.c:673
 +msgid "WARNING: We do NOT trust this key!\n"
 +msgstr "WARNING: We do NOT trust this key!\n"
 +
 +#: g10/pkclist.c:674
 +msgid "         The signature is probably a FORGERY.\n"
 +msgstr "         The signature is probably a FORGERY.\n"
 +
 +#: g10/pkclist.c:682
 +msgid ""
 +"WARNING: This key is not certified with sufficiently trusted signatures!\n"
 +msgstr ""
 +"WARNING: This key is not certified with sufficiently trusted signatures!\n"
 +
 +#: g10/pkclist.c:684
 +msgid "         It is not certain that the signature belongs to the owner.\n"
 +msgstr "         It is not certain that the signature belongs to the owner.\n"
 +
 +#: g10/pkclist.c:847 g10/pkclist.c:865 g10/pkclist.c:1050 g10/pkclist.c:1092
 +#, c-format
 +msgid "%s: skipped: %s\n"
 +msgstr "%s: skipped: %s\n"
 +
 +#: g10/pkclist.c:880
 +#, c-format
 +msgid "%s: skipped: public key is disabled\n"
 +msgstr "%s: skipped: public key is disabled\n"
 +
 +#: g10/pkclist.c:899 g10/pkclist.c:1063
 +#, c-format
 +msgid "%s: skipped: public key already present\n"
 +msgstr "%s: skipped: public key already present\n"
 +
 +#: g10/pkclist.c:987
 +#, c-format
 +msgid "can't encrypt to '%s'\n"
 +msgstr "can't encrypt to ‘%s’\n"
 +
 +#: g10/pkclist.c:1002
 +#, c-format
 +msgid "option '%s' given, but no valid default keys given\n"
 +msgstr "option ‘%s’ given, but no valid default keys given\n"
 +
 +#: g10/pkclist.c:1009
 +#, c-format
 +msgid "option '%s' given, but option '%s' not given\n"
 +msgstr "option ‘%s’ given, but option ‘%s’ not given\n"
 +
 +#: g10/pkclist.c:1112
 +msgid "You did not specify a user ID. (you may use \"-r\")\n"
 +msgstr "You did not specify a user ID. (you may use “-r”)\n"
 +
 +#: g10/pkclist.c:1136
 +msgid "Current recipients:\n"
 +msgstr "Current recipients:\n"
 +
 +#: g10/pkclist.c:1162
 +msgid ""
 +"\n"
 +"Enter the user ID.  End with an empty line: "
 +msgstr ""
 +"\n"
 +"Enter the user ID.  End with an empty line: "
 +
 +#: g10/pkclist.c:1186
 +msgid "No such user ID.\n"
 +msgstr "No such user ID.\n"
 +
- #: g10/pkclist.c:1197 g10/pkclist.c:1273
++#: g10/pkclist.c:1197 g10/pkclist.c:1274
 +msgid "skipped: public key already set as default recipient\n"
 +msgstr "skipped: public key already set as default recipient\n"
 +
- #: g10/pkclist.c:1218
++#: g10/pkclist.c:1219
 +msgid "Public key is disabled.\n"
 +msgstr "Public key is disabled.\n"
 +
- #: g10/pkclist.c:1228
++#: g10/pkclist.c:1229
 +msgid "skipped: public key already set\n"
 +msgstr "skipped: public key already set\n"
 +
- #: g10/pkclist.c:1263
++#: g10/pkclist.c:1264
 +#, c-format
 +msgid "unknown default recipient \"%s\"\n"
 +msgstr "unknown default recipient “%s”\n"
 +
- #: g10/pkclist.c:1312
++#: g10/pkclist.c:1313
 +msgid "no valid addressees\n"
 +msgstr "no valid addressees\n"
 +
- #: g10/pkclist.c:1665
++#: g10/pkclist.c:1666
 +#, c-format
 +msgid "Note: key %s has no %s feature\n"
 +msgstr "Note: key %s has no %s feature\n"
 +
- #: g10/pkclist.c:1690
++#: g10/pkclist.c:1691
 +#, c-format
 +msgid "Note: key %s has no preference for %s\n"
 +msgstr "Note: key %s has no preference for %s\n"
 +
 +#: g10/plaintext.c:84
 +msgid "data not saved; use option \"--output\" to save it\n"
 +msgstr "data not saved; use option “--output” to save it\n"
 +
- #: g10/plaintext.c:598
++#: g10/plaintext.c:614
 +msgid "Detached signature.\n"
 +msgstr "Detached signature.\n"
 +
- #: g10/plaintext.c:606
++#: g10/plaintext.c:622
 +msgid "Please enter name of data file: "
 +msgstr "Please enter name of data file: "
 +
- #: g10/plaintext.c:643
++#: g10/plaintext.c:659
 +msgid "reading stdin ...\n"
 +msgstr "reading stdin ...\n"
 +
- #: g10/plaintext.c:688
++#: g10/plaintext.c:704
 +msgid "no signed data\n"
 +msgstr "no signed data\n"
 +
- #: g10/plaintext.c:706
++#: g10/plaintext.c:722
 +#, c-format
 +msgid "can't open signed data '%s'\n"
 +msgstr "can't open signed data ‘%s’\n"
 +
- #: g10/plaintext.c:741
++#: g10/plaintext.c:757
 +#, c-format
 +msgid "can't open signed data fd=%d: %s\n"
 +msgstr "can't open signed data fd=%d: %s\n"
 +
 +#: g10/pubkey-enc.c:116
 +#, c-format
 +msgid "anonymous recipient; trying secret key %s ...\n"
 +msgstr "anonymous recipient; trying secret key %s ...\n"
 +
 +#: g10/pubkey-enc.c:123
 +msgid "okay, we are the anonymous recipient.\n"
 +msgstr "okay, we are the anonymous recipient.\n"
 +
 +#: g10/pubkey-enc.c:282
 +msgid "old encoding of the DEK is not supported\n"
 +msgstr "old encoding of the DEK is not supported\n"
 +
 +#: g10/pubkey-enc.c:310
 +#, c-format
 +msgid "cipher algorithm %d%s is unknown or disabled\n"
 +msgstr "cipher algorithm %d%s is unknown or disabled\n"
 +
 +#: g10/pubkey-enc.c:352
 +#, c-format
 +msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 +msgstr "WARNING: cipher algorithm %s not found in recipient preferences\n"
 +
 +#: g10/pubkey-enc.c:377
 +#, c-format
 +msgid "Note: secret key %s expired at %s\n"
 +msgstr "Note: secret key %s expired at %s\n"
 +
 +#: g10/pubkey-enc.c:384
 +msgid "Note: key has been revoked"
 +msgstr "Note: key has been revoked"
 +
 +#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
 +#: g10/revoke.c:500
 +#, c-format
 +msgid "build_packet failed: %s\n"
 +msgstr "build_packet failed: %s\n"
 +
 +#: g10/revoke.c:144
 +#, c-format
 +msgid "key %s has no user IDs\n"
 +msgstr "key %s has no user IDs\n"
 +
 +#: g10/revoke.c:312
 +msgid "To be revoked by:\n"
 +msgstr "To be revoked by:\n"
 +
 +#: g10/revoke.c:316
 +msgid "(This is a sensitive revocation key)\n"
 +msgstr "(This is a sensitive revocation key)\n"
 +
 +#: g10/revoke.c:322
 +msgid "Secret key is not available.\n"
 +msgstr "Secret key is not available.\n"
 +
 +#: g10/revoke.c:327
 +msgid "Create a designated revocation certificate for this key? (y/N) "
 +msgstr "Create a designated revocation certificate for this key? (y/N) "
 +
- #: g10/revoke.c:336 g10/revoke.c:727
++#: g10/revoke.c:336 g10/revoke.c:728
 +msgid "ASCII armored output forced.\n"
 +msgstr "ASCII armored output forced.\n"
 +
 +#: g10/revoke.c:352 g10/revoke.c:479
 +#, c-format
 +msgid "make_keysig_packet failed: %s\n"
 +msgstr "make_keysig_packet failed: %s\n"
 +
 +#: g10/revoke.c:415
 +msgid "Revocation certificate created.\n"
 +msgstr "Revocation certificate created.\n"
 +
 +#: g10/revoke.c:421
 +#, c-format
 +msgid "no revocation keys found for \"%s\"\n"
 +msgstr "no revocation keys found for “%s”\n"
 +
 +#: g10/revoke.c:551
 +msgid "This is a revocation certificate for the OpenPGP key:"
 +msgstr "This is a revocation certificate for the OpenPGP key:"
 +
 +#: g10/revoke.c:567
 +msgid ""
 +"A revocation certificate is a kind of \"kill switch\" to publicly\n"
 +"declare that a key shall not anymore be used.  It is not possible\n"
 +"to retract such a revocation certificate once it has been published."
 +msgstr ""
 +"A revocation certificate is a kind of “kill switch” to publicly\n"
 +"declare that a key shall not anymore be used.  It is not possible\n"
 +"to retract such a revocation certificate once it has been published."
 +
 +#: g10/revoke.c:570
 +msgid ""
 +"Use it to revoke this key in case of a compromise or loss of\n"
 +"the secret key.  However, if the secret key is still accessible,\n"
 +"it is better to generate a new revocation certificate and give\n"
 +"a reason for the revocation.  For details see the description of\n"
- "of the gpg command \"--gen-revoke\" in the GnuPG manual."
++"of the gpg command \"--generate-revocation\" in the GnuPG manual."
 +msgstr ""
 +"Use it to revoke this key in case of a compromise or loss of\n"
 +"the secret key.  However, if the secret key is still accessible,\n"
 +"it is better to generate a new revocation certificate and give\n"
 +"a reason for the revocation.  For details see the description of\n"
- "of the gpg command “--gen-revoke” in the GnuPG manual."
++"of the gpg command “--generate-revocation” in the GnuPG manual."
 +
- #: g10/revoke.c:575
++#: g10/revoke.c:576
 +msgid ""
 +"To avoid an accidental use of this file, a colon has been inserted\n"
 +"before the 5 dashes below.  Remove this colon with a text editor\n"
 +"before importing and publishing this revocation certificate."
 +msgstr ""
 +"To avoid an accidental use of this file, a colon has been inserted\n"
 +"before the 5 dashes below.  Remove this colon with a text editor\n"
 +"before importing and publishing this revocation certificate."
 +
- #: g10/revoke.c:590
++#: g10/revoke.c:591
 +#, c-format
 +msgid "revocation certificate stored as '%s.rev'\n"
 +msgstr "revocation certificate stored as ‘%s.rev’\n"
 +
- #: g10/revoke.c:634
++#: g10/revoke.c:635
 +#, c-format
 +msgid "secret key \"%s\" not found\n"
 +msgstr "secret key “%s” not found\n"
 +
 +#. TRANSLATORS: The %s prints a key specification which
 +#. for example has been given at the command line.  Several lines
 +#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:661
++#: g10/revoke.c:662
 +#, c-format
 +msgid "'%s' matches multiple secret keys:\n"
 +msgstr "‘%s’ matches multiple secret keys:\n"
 +
- #: g10/revoke.c:688
++#: g10/revoke.c:689
 +#, c-format
 +msgid "error searching the keyring: %s\n"
 +msgstr "error searching the keyring: %s\n"
 +
- #: g10/revoke.c:711
++#: g10/revoke.c:712
 +msgid "Create a revocation certificate for this key? (y/N) "
 +msgstr "Create a revocation certificate for this key? (y/N) "
 +
- #: g10/revoke.c:735
++#: g10/revoke.c:736
 +msgid ""
 +"Revocation certificate created.\n"
 +"\n"
 +"Please move it to a medium which you can hide away; if Mallory gets\n"
 +"access to this certificate he can use it to make your key unusable.\n"
 +"It is smart to print this certificate and store it away, just in case\n"
 +"your media become unreadable.  But have some caution:  The print system of\n"
 +"your machine might store the data and make it available to others!\n"
 +msgstr ""
 +"Revocation certificate created.\n"
 +"\n"
 +"Please move it to a medium which you can hide away; if Mallory gets\n"
 +"access to this certificate he can use it to make your key unusable.\n"
 +"It is smart to print this certificate and store it away, just in case\n"
 +"your media become unreadable.  But have some caution:  The print system of\n"
 +"your machine might store the data and make it available to others!\n"
 +
- #: g10/revoke.c:769
++#: g10/revoke.c:770
 +msgid "Please select the reason for the revocation:\n"
 +msgstr "Please select the reason for the revocation:\n"
 +
- #: g10/revoke.c:779
++#: g10/revoke.c:780
 +msgid "Cancel"
 +msgstr "Cancel"
 +
- #: g10/revoke.c:781
++#: g10/revoke.c:782
 +#, c-format
 +msgid "(Probably you want to select %d here)\n"
 +msgstr "(Probably you want to select %d here)\n"
 +
- #: g10/revoke.c:822
++#: g10/revoke.c:823
 +msgid "Enter an optional description; end it with an empty line:\n"
 +msgstr "Enter an optional description; end it with an empty line:\n"
 +
- #: g10/revoke.c:850
++#: g10/revoke.c:851
 +#, c-format
 +msgid "Reason for revocation: %s\n"
 +msgstr "Reason for revocation: %s\n"
 +
- #: g10/revoke.c:852
++#: g10/revoke.c:853
 +msgid "(No description given)\n"
 +msgstr "(No description given)\n"
 +
- #: g10/revoke.c:857
++#: g10/revoke.c:858
 +msgid "Is this okay? (y/N) "
 +msgstr "Is this okay? (y/N) "
 +
 +#: g10/seskey.c:62 sm/encrypt.c:123
 +msgid "weak key created - retrying\n"
 +msgstr "weak key created - retrying\n"
 +
 +#: g10/seskey.c:66
 +#, c-format
 +msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 +msgstr "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 +
 +#: g10/seskey.c:306
 +#, c-format
 +msgid "%s key %s uses an unsafe (%zu bit) hash\n"
 +msgstr "%s key %s uses an unsafe (%zu bit) hash\n"
 +
 +#: g10/seskey.c:324
 +#, c-format
 +msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 +msgstr "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 +
 +#: g10/sig-check.c:122
 +msgid "WARNING: signature digest conflict in message\n"
 +msgstr "WARNING: signature digest conflict in message\n"
 +
 +#: g10/sig-check.c:149
 +#, c-format
 +msgid "WARNING: signing subkey %s is not cross-certified\n"
 +msgstr "WARNING: signing subkey %s is not cross-certified\n"
 +
 +#: g10/sig-check.c:151
 +#, c-format
 +msgid "please see %s for more information\n"
 +msgstr "please see %s for more information\n"
 +
 +#: g10/sig-check.c:161
 +#, c-format
 +msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 +msgstr "WARNING: signing subkey %s has an invalid cross-certification\n"
 +
 +#: g10/sig-check.c:281
 +#, c-format
 +msgid "public key %s is %lu second newer than the signature\n"
 +msgid_plural "public key %s is %lu seconds newer than the signature\n"
 +msgstr[0] "public key %s is %lu second newer than the signature\n"
 +msgstr[1] "public key %s is %lu seconds newer than the signature\n"
 +
 +#: g10/sig-check.c:290
 +#, c-format
 +msgid "public key %s is %lu day newer than the signature\n"
 +msgid_plural "public key %s is %lu days newer than the signature\n"
 +msgstr[0] "public key %s is %lu day newer than the signature\n"
 +msgstr[1] "public key %s is %lu days newer than the signature\n"
 +
 +#: g10/sig-check.c:304 g10/sign.c:266
 +#, c-format
 +msgid ""
 +"key %s was created %lu second in the future (time warp or clock problem)\n"
 +msgid_plural ""
 +"key %s was created %lu seconds in the future (time warp or clock problem)\n"
 +msgstr[0] ""
 +"key %s was created %lu second in the future (time warp or clock problem)\n"
 +msgstr[1] ""
 +"key %s was created %lu seconds in the future (time warp or clock problem)\n"
 +
 +#: g10/sig-check.c:313
 +#, c-format
 +msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
 +msgid_plural ""
 +"key %s was created %lu days in the future (time warp or clock problem)\n"
 +msgstr[0] ""
 +"key %s was created %lu day in the future (time warp or clock problem)\n"
 +msgstr[1] ""
 +"key %s was created %lu days in the future (time warp or clock problem)\n"
 +
 +#: g10/sig-check.c:330
 +#, c-format
 +msgid "Note: signature key %s expired %s\n"
 +msgstr "Note: signature key %s expired %s\n"
 +
 +#: g10/sig-check.c:341
 +#, c-format
 +msgid "Note: signature key %s has been revoked\n"
 +msgstr "Note: signature key %s has been revoked\n"
 +
 +#: g10/sig-check.c:475
 +#, c-format
 +msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 +msgstr "assuming bad signature from key %s due to an unknown critical bit\n"
 +
 +#: g10/sig-check.c:1052
 +#, c-format
 +msgid "key %s: no subkey for subkey revocation signature\n"
 +msgstr "key %s: no subkey for subkey revocation signature\n"
 +
 +#: g10/sig-check.c:1055
 +#, c-format
 +msgid "key %s: no subkey for subkey binding signature\n"
 +msgstr "key %s: no subkey for subkey binding signature\n"
 +
 +#: g10/sign.c:88
 +#, c-format
 +msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 +msgstr ""
 +"WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 +
 +#: g10/sign.c:114
 +#, c-format
 +msgid ""
 +"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 +msgstr ""
 +"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 +
 +#: g10/sign.c:137
 +#, c-format
 +msgid ""
 +"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 +"unexpanded.\n"
 +msgstr ""
 +"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 +"unexpanded.\n"
 +
- #: g10/sign.c:329
++#: g10/sign.c:331
 +#, c-format
 +msgid "%s/%s signature from: \"%s\"\n"
 +msgstr "%s/%s signature from: “%s”\n"
 +
- #: g10/sign.c:878
++#: g10/sign.c:880
 +#, c-format
 +msgid ""
 +"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 +msgstr ""
 +"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 +
- #: g10/sign.c:1009
++#: g10/sign.c:1011
 +msgid "signing:"
 +msgstr "signing:"
 +
- #: g10/sign.c:1286
++#: g10/sign.c:1288
 +#, c-format
 +msgid "%s encryption will be used\n"
 +msgstr "%s encryption will be used\n"
 +
 +#: g10/skclist.c:155 g10/skclist.c:236
 +msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 +msgstr "key is not flagged as insecure - can't use it with the faked RNG!\n"
 +
 +#: g10/skclist.c:187
 +#, c-format
 +msgid "skipped \"%s\": duplicated\n"
 +msgstr "skipped “%s”: duplicated\n"
 +
 +#: g10/skclist.c:206
 +msgid "skipped: secret key already present\n"
 +msgstr "skipped: secret key already present\n"
 +
 +#: g10/skclist.c:225
 +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:362
++#: g10/tdbdump.c:57 g10/trustdb.c:369
 +#, c-format
 +msgid "trust record %lu, type %d: write failed: %s\n"
 +msgstr "trust record %lu, type %d: write failed: %s\n"
 +
 +#: g10/tdbdump.c:105
 +#, c-format
 +msgid ""
 +"# List of assigned trustvalues, created %s\n"
 +"# (Use \"gpg --import-ownertrust\" to restore them)\n"
 +msgstr ""
 +"# List of assigned trustvalues, created %s\n"
 +"# (Use “gpg --import-ownertrust” to restore them)\n"
 +
 +#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
 +#, c-format
 +msgid "error in '%s': %s\n"
 +msgstr "error in '%s': %s\n"
 +
 +#: g10/tdbdump.c:162
 +msgid "line too long"
 +msgstr "line too long"
 +
 +#: g10/tdbdump.c:170
 +msgid "colon missing"
 +msgstr "colon missing"
 +
 +#: g10/tdbdump.c:176
 +msgid "invalid fingerprint"
 +msgstr "invalid fingerprint"
 +
 +#: g10/tdbdump.c:181
 +msgid "ownertrust value missing"
 +msgstr "ownertrust value missing"
 +
 +#: g10/tdbdump.c:217
 +#, c-format
 +msgid "error finding trust record in '%s': %s\n"
 +msgstr "error finding trust record in '%s': %s\n"
 +
 +#: g10/tdbdump.c:221
 +#, c-format
 +msgid "read error in '%s': %s\n"
 +msgstr "read error in '%s': %s\n"
 +
- #: g10/tdbdump.c:230 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:384
 +#, c-format
 +msgid "trustdb: sync failed: %s\n"
 +msgstr "trustdb: sync failed: %s\n"
 +
 +#: g10/tdbio.c:141 sm/keydb.c:356
 +#, c-format
 +msgid "can't create lock for '%s'\n"
 +msgstr "can't create lock for ‘%s’\n"
 +
 +#: g10/tdbio.c:146
 +#, c-format
 +msgid "can't lock '%s'\n"
 +msgstr "can't lock ‘%s’\n"
 +
 +#: g10/tdbio.c:205 g10/tdbio.c:1787
 +#, c-format
 +msgid "trustdb rec %lu: lseek failed: %s\n"
 +msgstr "trustdb rec %lu: lseek failed: %s\n"
 +
 +#: g10/tdbio.c:213 g10/tdbio.c:1798
 +#, c-format
 +msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 +msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
 +
 +#: g10/tdbio.c:352
 +msgid "trustdb transaction too large\n"
 +msgstr "trustdb transaction too large\n"
 +
 +#: g10/tdbio.c:682
 +#, c-format
 +msgid "%s: directory does not exist!\n"
 +msgstr "%s: directory does not exist!\n"
 +
 +#: g10/tdbio.c:703 dirmngr/http.c:501
 +#, c-format
 +msgid "can't access '%s': %s\n"
 +msgstr "can't access '%s': %s\n"
 +
 +#: g10/tdbio.c:724
 +#, c-format
 +msgid "%s: failed to create version record: %s"
 +msgstr "%s: failed to create version record: %s"
 +
 +#: g10/tdbio.c:729
 +#, c-format
 +msgid "%s: invalid trustdb created\n"
 +msgstr "%s: invalid trustdb created\n"
 +
 +#: g10/tdbio.c:732
 +#, c-format
 +msgid "%s: trustdb created\n"
 +msgstr "%s: trustdb created\n"
 +
 +#: g10/tdbio.c:788
 +msgid "Note: trustdb not writable\n"
 +msgstr "Note: trustdb not writable\n"
 +
 +#: g10/tdbio.c:797
 +#, c-format
 +msgid "%s: invalid trustdb\n"
 +msgstr "%s: invalid trustdb\n"
 +
 +#: g10/tdbio.c:834
 +#, c-format
 +msgid "%s: failed to create hashtable: %s\n"
 +msgstr "%s: failed to create hashtable: %s\n"
 +
 +#: g10/tdbio.c:842
 +#, c-format
 +msgid "%s: error updating version record: %s\n"
 +msgstr "%s: error updating version record: %s\n"
 +
 +#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
 +#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
 +#, c-format
 +msgid "%s: error reading version record: %s\n"
 +msgstr "%s: error reading version record: %s\n"
 +
 +#: g10/tdbio.c:938
 +#, c-format
 +msgid "%s: error writing version record: %s\n"
 +msgstr "%s: error writing version record: %s\n"
 +
 +#: g10/tdbio.c:1461
 +#, c-format
 +msgid "trustdb: lseek failed: %s\n"
 +msgstr "trustdb: lseek failed: %s\n"
 +
 +#: g10/tdbio.c:1472
 +#, c-format
 +msgid "trustdb: read failed (n=%d): %s\n"
 +msgstr "trustdb: read failed (n=%d): %s\n"
 +
 +#: g10/tdbio.c:1497
 +#, c-format
 +msgid "%s: not a trustdb file\n"
 +msgstr "%s: not a trustdb file\n"
 +
 +#: g10/tdbio.c:1522
 +#, c-format
 +msgid "%s: version record with recnum %lu\n"
 +msgstr "%s: version record with recnum %lu\n"
 +
 +#: g10/tdbio.c:1528
 +#, c-format
 +msgid "%s: invalid file version %d\n"
 +msgstr "%s: invalid file version %d\n"
 +
 +#: g10/tdbio.c:1748
 +#, c-format
 +msgid "%s: error reading free record: %s\n"
 +msgstr "%s: error reading free record: %s\n"
 +
 +#: g10/tdbio.c:1757
 +#, c-format
 +msgid "%s: error writing dir record: %s\n"
 +msgstr "%s: error writing dir record: %s\n"
 +
 +#: g10/tdbio.c:1768
 +#, c-format
 +msgid "%s: failed to zero a record: %s\n"
 +msgstr "%s: failed to zero a record: %s\n"
 +
 +#: g10/tdbio.c:1804
 +#, c-format
 +msgid "%s: failed to append a record: %s\n"
 +msgstr "%s: failed to append a record: %s\n"
 +
 +#: g10/tdbio.c:1865
 +msgid "Error: The trustdb is corrupted.\n"
 +msgstr "Error: The trustdb is corrupted.\n"
 +
 +#: g10/textfilter.c:146
 +#, c-format
 +msgid "can't handle text lines longer than %d characters\n"
 +msgstr "can't handle text lines longer than %d characters\n"
 +
 +#: g10/textfilter.c:241
 +#, c-format
 +msgid "input line longer than %d characters\n"
 +msgstr "input line longer than %d characters\n"
 +
- #: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
++#: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
 +#, c-format
 +msgid "error beginning transaction on TOFU database: %s\n"
 +msgstr "error beginning transaction on TOFU database: %s\n"
 +
- #: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
++#: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
 +#, c-format
 +msgid "error committing transaction on TOFU database: %s\n"
 +msgstr "error committing transaction on TOFU database: %s\n"
 +
- #: g10/tofu.c:357 g10/tofu.c:699
++#: g10/tofu.c:355 g10/tofu.c:888
 +#, c-format
 +msgid "error rolling back transaction on TOFU database: %s\n"
 +msgstr "error rolling back transaction on TOFU database: %s\n"
 +
- #: g10/tofu.c:501
++#: g10/tofu.c:505
 +#, c-format
 +msgid "unsupported TOFU database version: %s\n"
 +msgstr "unsupported TOFU database version: %s\n"
 +
- #: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
- #: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
- #: g10/tofu.c:3056
++#: g10/tofu.c:538
++#, c-format
++msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
++msgstr "error creating ‘ultimately_trusted_keys’ TOFU table: %s\n"
++
++#: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
++msgid "TOFU DB error"
++msgstr "TOFU DB error"
++
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2340 g10/tofu.c:2359
++#: g10/tofu.c:2372 g10/tofu.c:2384 g10/tofu.c:2399 g10/tofu.c:2411
++#: g10/tofu.c:2980 g10/tofu.c:2997 g10/tofu.c:3033 g10/tofu.c:3050
++#: g10/tofu.c:3353
 +#, c-format
 +msgid "error reading TOFU database: %s\n"
 +msgstr "error reading TOFU database: %s\n"
 +
- #: g10/tofu.c:566 g10/tofu.c:574
++#: g10/tofu.c:716 g10/tofu.c:724
 +#, c-format
 +msgid "error determining TOFU database's version: %s\n"
 +msgstr "error determining TOFU database's version: %s\n"
 +
- #: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
++#: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
 +#, c-format
 +msgid "error initializing TOFU database: %s\n"
 +msgstr "error initializing TOFU database: %s\n"
 +
- #: g10/tofu.c:765
++#: g10/tofu.c:844
++#, c-format
++msgid "error creating 'encryptions' TOFU table: %s\n"
++msgstr "error creating ‘encryptions’ TOFU table: %s\n"
++
++#: g10/tofu.c:874
++#, c-format
++msgid "adding column effective_policy to bindings DB: %s\n"
++msgstr "adding column effective_policy to bindings DB: %s\n"
++
++#: g10/tofu.c:956
 +#, c-format
 +msgid "error opening TOFU database '%s': %s\n"
 +msgstr "error opening TOFU database '%s': %s\n"
 +
- #: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
++#: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
 +#, c-format
 +msgid "error updating TOFU database: %s\n"
 +msgstr "error updating TOFU database: %s\n"
 +
- #: g10/tofu.c:1239
++#: g10/tofu.c:1328
 +#, c-format
 +msgid ""
 +"This is the first time the email address \"%s\" is being used with key %s."
 +msgstr ""
 +"This is the first time the email address “%s” is being used with key %s."
 +
- #: g10/tofu.c:1247
++#: g10/tofu.c:1337
 +#, c-format
- msgid "The email address \"%s\" is associated with %d keys!"
- msgstr "The email address “%s” is associated with %d keys!"
++msgid "The email address \"%s\" is associated with %d key!"
++msgid_plural "The email address \"%s\" is associated with %d keys!"
++msgstr[0] "The email address “%s” is associated with %d key!"
++msgstr[1] "The email address “%s” is associated with %d keys!"
 +
- #: g10/tofu.c:1251
++#: g10/tofu.c:1343
 +msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
 +msgstr ""
 +"  Since this binding's policy was 'auto', it has been changed to 'ask'."
 +
- #: g10/tofu.c:1257
++#: g10/tofu.c:1349
 +#, c-format
 +msgid ""
 +"Please indicate whether this email address should be associated with key %s "
 +"or whether you think someone is impersonating \"%s\"."
 +msgstr ""
 +"Please indicate whether this email address should be associated with key %s "
 +"or whether you think someone is impersonating “%s”."
 +
- #: g10/tofu.c:1513
++#: g10/tofu.c:1605
 +#, c-format
 +msgid "error gathering other user IDs: %s\n"
 +msgstr "error gathering other user IDs: %s\n"
 +
- #: g10/tofu.c:1523
++#: g10/tofu.c:1615
 +msgid "This key's user IDs:\n"
 +msgstr "This key's user IDs:\n"
 +
- #: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
++#: g10/tofu.c:1631 g10/tofu.c:1796
 +#, c-format
 +msgid "policy: %s"
 +msgstr "policy: %s"
 +
- #: g10/tofu.c:1630
++#: g10/tofu.c:1722
 +#, c-format
 +msgid "error gathering signature stats: %s\n"
 +msgstr "error gathering signature stats: %s\n"
 +
- #: g10/tofu.c:1634
++#: g10/tofu.c:1726
 +#, c-format
 +msgid "The email address \"%s\" is associated with %d key:\n"
 +msgid_plural "The email address \"%s\" is associated with %d keys:\n"
 +msgstr[0] "The email address “%s” is associated with %d key:\n"
 +msgstr[1] "The email address “%s” is associated with %d keys:\n"
 +
- #: g10/tofu.c:1651
++#: g10/tofu.c:1744
 +#, c-format
 +msgid "Statistics for keys with the email address \"%s\":\n"
 +msgstr "Statistics for keys with the email address “%s”:\n"
 +
- #: g10/tofu.c:1684 g10/tofu.c:1689
++#: g10/tofu.c:1785 g10/tofu.c:1790
 +msgid ", "
 +msgstr ", "
 +
- #: g10/tofu.c:1693
++#: g10/tofu.c:1794
 +msgid "this key"
 +msgstr "this key"
 +
- #: g10/tofu.c:1715
++#: g10/tofu.c:1820
++#, c-format
++msgid "Verified %d message."
++msgid_plural "Verified %d messages."
++msgstr[0] "Verified %d message."
++msgstr[1] "Verified %d messages."
++
++#: g10/tofu.c:1824
++#, c-format
++msgid "Encrypted %d message."
++msgid_plural "Encrypted %d messages."
++msgstr[0] "Encrypted %d message."
++msgstr[1] "Encrypted %d messages."
++
++#: g10/tofu.c:1831
 +#, c-format
- msgid "Verified %d message"
- msgid_plural "Verified %d messages"
- msgstr[0] "Verified %d message"
- msgstr[1] "Verified %d messages"
++msgid "Verified %d message in the future."
++msgid_plural "Verified %d messages in the future."
++msgstr[0] "Verified %d message in the future."
++msgstr[1] "Verified %d messages in the future."
 +
- #: g10/tofu.c:1719
++#: g10/tofu.c:1835
 +#, c-format
- msgid "Encrypted %d message"
- msgid_plural "Encrypted %d messages"
- msgstr[0] "Encrypted %d message"
- msgstr[1] "Encrypted %d messages"
++msgid "Encrypted %d message in the future."
++msgid_plural "Encrypted %d messages in the future."
++msgstr[0] "Encrypted %d message in the future."
++msgstr[1] "Encrypted %d messages in the future."
 +
- #: g10/tofu.c:1734
++#: g10/tofu.c:1849
 +#, c-format
- msgid " over the past day."
- msgid_plural " over the past %d days."
- msgstr[0] " over the past day."
- msgstr[1] " over the past %d days."
++msgid "Messages verified over the past %d day: %d."
++msgid_plural "Messages verified over the past %d days: %d."
++msgstr[0] "Messages verified over the past %d day: %d."
++msgstr[1] "Messages verified over the past %d days: %d."
 +
- #: g10/tofu.c:1740
++#: g10/tofu.c:1855
 +#, c-format
- msgid " over the past month."
- msgid_plural " over the past %d months."
- msgstr[0] " over the past month."
- msgstr[1] " over the past %d months."
++msgid "Messages encrypted over the past %d day: %d."
++msgid_plural "Messages encrypted over the past %d days: %d."
++msgstr[0] "Messages encrypted over the past %d day: %d."
++msgstr[1] "Messages encrypted over the past %d days: %d."
 +
- #: g10/tofu.c:1746
++#: g10/tofu.c:1865
 +#, c-format
- msgid " over the past year."
- msgid_plural " over the past %d years."
- msgstr[0] " over the past year."
- msgstr[1] " over the past %d years."
++msgid "Messages verified over the past %d month: %d."
++msgid_plural "Messages verified over the past %d months: %d."
++msgstr[0] "Messages verified over the past %d month: %d."
++msgstr[1] "Messages verified over the past %d months: %d."
 +
- #: g10/tofu.c:1752
- msgid " in the past."
- msgstr " in the past."
++#: g10/tofu.c:1871
++#, c-format
++msgid "Messages encrypted over the past %d month: %d."
++msgid_plural "Messages encrypted over the past %d months: %d."
++msgstr[0] "Messages encrypted over the past %d month: %d."
++msgstr[1] "Messages encrypted over the past %d months: %d."
++
++#: g10/tofu.c:1881
++#, c-format
++msgid "Messages verified over the past %d year: %d."
++msgid_plural "Messages verified over the past %d years: %d."
++msgstr[0] "Messages verified over the past %d year: %d."
++msgstr[1] "Messages verified over the past %d years: %d."
++
++#: g10/tofu.c:1887
++#, c-format
++msgid "Messages encrypted over the past %d year: %d."
++msgid_plural "Messages encrypted over the past %d years: %d."
++msgstr[0] "Messages encrypted over the past %d year: %d."
++msgstr[1] "Messages encrypted over the past %d years: %d."
++
++#: g10/tofu.c:1895
++#, c-format
++msgid "Messages verified in the past: %d."
++msgstr "Messages verified in the past: %d."
++
++#: g10/tofu.c:1899
++#, c-format
++msgid "Messages encrypted in the past: %d."
++msgstr "Messages encrypted in the past: %d."
 +
 +#. TRANSLATORS: Please translate the text found in the source
 +#. * file below.  We don't directly internationalize that text so
 +#. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1767
++#: g10/tofu.c:1916
 +msgid "TOFU detected a binding conflict"
 +msgstr "TOFU detected a binding conflict"
 +
 +#. TRANSLATORS: Two letters (normally the lower and upper case
 +#. * version of the hotkey) for each of the five choices.  If
 +#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1809
++#: g10/tofu.c:1958
 +msgid "gGaAuUrRbB"
 +msgstr "gGaAuUrRbB"
 +
- #: g10/tofu.c:1815
++#: g10/tofu.c:1964
 +msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 +msgstr "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 +
- #: g10/tofu.c:1823
++#: g10/tofu.c:1972
 +msgid "Defaulting to unknown."
 +msgstr "Defaulting to unknown."
 +
- #: g10/tofu.c:1938 g10/tofu.c:2074
++#: g10/tofu.c:2087 g10/tofu.c:2223
 +msgid "TOFU db corruption detected.\n"
 +msgstr "TOFU db corruption detected.\n"
 +
- #: g10/tofu.c:1994
++#: g10/tofu.c:2143
 +#, c-format
 +msgid "resetting keydb: %s\n"
 +msgstr "resetting keydb: %s\n"
 +
- #: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
- #: g10/tofu.c:2425
++#: g10/tofu.c:2601
 +#, c-format
- msgid "error setting TOFU binding's trust level to %s\n"
- msgstr "error setting TOFU binding's trust level to %s\n"
++msgid "error setting TOFU binding's policy to %s\n"
++msgstr "error setting TOFU binding's policy to %s\n"
 +
- #: g10/tofu.c:2473
++#: g10/tofu.c:2794
 +#, c-format
 +msgid "error changing TOFU policy: %s\n"
 +msgstr "error changing TOFU policy: %s\n"
 +
- #. TRANSLATORS: The tilde ('~') is used here to indicate a
- #. * non-breakable space
- #: g10/tofu.c:2574
++#: g10/tofu.c:2839
 +#, c-format
- msgid "%d~year"
- msgid_plural "%d~years"
- msgstr[0] "%d~year"
- msgstr[1] "%d~years"
++msgid "%lld~year"
++msgid_plural "%lld~years"
++msgstr[0] "%lld~year"
++msgstr[1] "%lld~years"
 +
- #: g10/tofu.c:2583
++#: g10/tofu.c:2844
 +#, c-format
- msgid "%d~month"
- msgid_plural "%d~months"
- msgstr[0] "%d~month"
- msgstr[1] "%d~months"
++msgid "%lld~month"
++msgid_plural "%lld~months"
++msgstr[0] "%lld~month"
++msgstr[1] "%lld~months"
 +
- #: g10/tofu.c:2592
++#: g10/tofu.c:2849
 +#, c-format
- msgid "%d~day"
- msgid_plural "%d~days"
- msgstr[0] "%d~day"
- msgstr[1] "%d~days"
++msgid "%lld~week"
++msgid_plural "%lld~weeks"
++msgstr[0] "%lld~week"
++msgstr[1] "%lld~weeks"
 +
- #: g10/tofu.c:2601
++#: g10/tofu.c:2854
 +#, c-format
- msgid "%d~hour"
- msgid_plural "%d~hours"
- msgstr[0] "%d~hour"
- msgstr[1] "%d~hours"
++msgid "%lld~day"
++msgid_plural "%lld~days"
++msgstr[0] "%lld~day"
++msgstr[1] "%lld~days"
 +
- #: g10/tofu.c:2610
++#: g10/tofu.c:2859
 +#, c-format
- msgid "%d~minute"
- msgid_plural "%d~minutes"
- msgstr[0] "%d~minute"
- msgstr[1] "%d~minutes"
++msgid "%lld~hour"
++msgid_plural "%lld~hours"
++msgstr[0] "%lld~hour"
++msgstr[1] "%lld~hours"
 +
- #: g10/tofu.c:2619
++#: g10/tofu.c:2864
 +#, c-format
- msgid "%d~second"
- msgid_plural "%d~seconds"
- msgstr[0] "%d~second"
- msgstr[1] "%d~seconds"
++msgid "%lld~minute"
++msgid_plural "%lld~minutes"
++msgstr[0] "%lld~minute"
++msgstr[1] "%lld~minutes"
 +
- #: g10/tofu.c:2802
++#: g10/tofu.c:2866
 +#, c-format
- msgid "%s: "
- msgstr "%s: "
++msgid "%lld~second"
++msgid_plural "%lld~seconds"
++msgstr[0] "%lld~second"
++msgstr[1] "%lld~seconds"
 +
- #: g10/tofu.c:2806
++#: g10/tofu.c:3103
 +#, c-format
- msgid "Verified %ld signatures"
- msgstr "Verified %ld signatures"
++msgid "%s: Verified 0~signatures and encrypted 0~messages."
++msgstr "%s: Verified 0~signatures and encrypted 0~messages."
 +
- #: g10/tofu.c:2816
++#: g10/tofu.c:3109
 +#, c-format
- msgid "Verified %ld signature in the past %s"
- msgid_plural "Verified %ld signatures in the past %s"
- msgstr[0] "Verified %ld signature in the past %s"
- msgstr[1] "Verified %ld signatures in the past %s"
++msgid "%s: Verified 0 signatures."
++msgstr "%s: Verified 0 signatures."
 +
- #: g10/tofu.c:2826
++#: g10/tofu.c:3117
 +#, c-format
- msgid ", and encrypted %ld messages"
- msgstr ", and encrypted %ld messages"
++msgid "%s: Verified %ld~signature in the past %s."
++msgid_plural "%s: Verified %ld~signatures in the past %s."
++msgstr[0] "%s: Verified %ld~signature in the past %s."
++msgstr[1] "%s: Verified %ld~signatures in the past %s."
++
++#: g10/tofu.c:3127
++msgid "Encrypted 0 messages."
++msgstr "Encrypted 0 messages."
 +
- #: g10/tofu.c:2835
++#: g10/tofu.c:3135
 +#, c-format
- msgid ", and encrypted %ld message in the past %s"
- msgid_plural ", and encrypted %ld messages in the past %s"
- msgstr[0] ", and encrypted %ld message in the past %s"
- msgstr[1] ", and encrypted %ld messages in the past %s"
++msgid "Encrypted %ld~message in the past %s."
++msgid_plural "Encrypted %ld~messages in the past %s."
++msgstr[0] "Encrypted %ld~message in the past %s."
++msgstr[1] "Encrypted %ld~messages in the past %s."
 +
- #: g10/tofu.c:2880
++#: g10/tofu.c:3146
++#, c-format
++msgid "(policy: %s)"
++msgstr "(policy: %s)"
++
++#: g10/tofu.c:3177
 +msgid ""
 +"Warning: we have yet to see a message signed using this key and user id!\n"
 +msgstr ""
 +"Warning: we have yet to see a message signed using this key and user id!\n"
 +
- #: g10/tofu.c:2883
++#: g10/tofu.c:3180
 +msgid ""
 +"Warning: we've only seen one message signed using this key and user id!\n"
 +msgstr ""
 +"Warning: we've only seen one message signed using this key and user id!\n"
 +
- #: g10/tofu.c:2887
++#: g10/tofu.c:3184
 +msgid "Warning: you have yet to encrypt a message to this key!\n"
 +msgstr "Warning: you have yet to encrypt a message to this key!\n"
 +
- #: g10/tofu.c:2890
++#: g10/tofu.c:3187
 +msgid "Warning: you have only encrypted one message to this key!\n"
 +msgstr "Warning: you have only encrypted one message to this key!\n"
 +
- #: g10/tofu.c:2919
++#: g10/tofu.c:3216
 +#, c-format
 +msgid ""
 +"Warning: if you think you've seen more signatures by this key and user id, "
 +"then this key might be a forgery!  Carefully examine the email address for "
 +"small variations.  If the key is suspect, then use\n"
 +"  %s\n"
 +"to mark it as being bad.\n"
 +msgid_plural ""
 +"Warning: if you think you've seen more signatures by this key and these user "
 +"ids, then this key might be a forgery!  Carefully examine the email "
 +"addresses for small variations.  If the key is suspect, then use\n"
 +"  %s\n"
 +"to mark it as being bad.\n"
 +msgstr[0] ""
 +"Warning: if you think you've seen more signatures by this key and user id, "
 +"then this key might be a forgery!  Carefully examine the email address for "
 +"small variations.  If the key is suspect, then use\n"
 +"  %s\n"
 +"to mark it as being bad.\n"
 +msgstr[1] ""
 +"Warning: if you think you've seen more signatures by this key and these user "
 +"ids, then this key might be a forgery!  Carefully examine the email "
 +"addresses for small variations.  If the key is suspect, then use\n"
 +"  %s\n"
 +"to mark it as being bad.\n"
 +
- #: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
- #: g10/tofu.c:3480 g10/tofu.c:3572
++#: g10/tofu.c:3298 g10/tofu.c:3449 g10/tofu.c:3627 g10/tofu.c:3670
++#: g10/tofu.c:3784 g10/tofu.c:3859 g10/tofu.c:3894
 +#, c-format
 +msgid "error opening TOFU database: %s\n"
 +msgstr "error opening TOFU database: %s\n"
 +
- #: g10/tofu.c:3185
++#: g10/tofu.c:3482
 +#, c-format
- msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
- msgstr "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
++msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
++msgstr "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
 +
- #: g10/tofu.c:3515
++#: g10/tofu.c:3819
 +#, c-format
 +msgid "error setting policy for key %s, user id \"%s\": %s"
 +msgstr "error setting policy for key %s, user id “%s”: %s"
 +
 +#: g10/trustdb.c:216
 +#, c-format
 +msgid "'%s' is not a valid long keyID\n"
 +msgstr "‘%s’ is not a valid long keyID\n"
 +
 +#: g10/trustdb.c:242
 +#, c-format
 +msgid "key %s: accepted as trusted key\n"
 +msgstr "key %s: accepted as trusted key\n"
 +
 +#: g10/trustdb.c:280
 +#, 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:295
 +#, 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:305
 +#, c-format
 +msgid "key %s marked as ultimately trusted\n"
 +msgstr "key %s marked as ultimately trusted\n"
 +
- #: g10/trustdb.c:341
++#: g10/trustdb.c:348
 +#, 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:347
++#: g10/trustdb.c:354
 +#, 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:422
++#: g10/trustdb.c:429
 +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:431
++#: g10/trustdb.c:438
 +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:468
++#: g10/trustdb.c:475
 +#, 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:474
++#: g10/trustdb.c:481
 +#, c-format
 +msgid "using %s trust model\n"
 +msgstr "using %s trust model\n"
 +
- #: g10/trustdb.c:511
++#: g10/trustdb.c:518
 +msgid "no need for a trustdb check\n"
 +msgstr "no need for a trustdb check\n"
 +
- #: g10/trustdb.c:517 g10/trustdb.c:2160
++#: g10/trustdb.c:524 g10/trustdb.c:2187
 +#, c-format
 +msgid "next trustdb check due at %s\n"
 +msgstr "next trustdb check due at %s\n"
 +
- #: g10/trustdb.c:526
++#: g10/trustdb.c:533
 +#, 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:542
++#: g10/trustdb.c:549
 +#, 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:749 g10/trustdb.c:1313
++#: g10/trustdb.c:756 g10/trustdb.c:1340
 +#, c-format
 +msgid "public key %s not found: %s\n"
 +msgstr "public key %s not found: %s\n"
 +
- #: g10/trustdb.c:966
++#: g10/trustdb.c:973
 +msgid "please do a --check-trustdb\n"
 +msgstr "please do a --check-trustdb\n"
 +
- #: g10/trustdb.c:971
++#: g10/trustdb.c:978
 +msgid "checking the trustdb\n"
 +msgstr "checking the trustdb\n"
 +
- #: g10/trustdb.c:1883
++#: g10/trustdb.c:1910
 +#, c-format
 +msgid "%d key processed"
 +msgid_plural "%d keys processed"
 +msgstr[0] "%d key processed"
 +msgstr[1] "%d keys processed"
 +
- #: g10/trustdb.c:1886
++#: g10/trustdb.c:1913
 +#, 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:1956
++#: g10/trustdb.c:1983
 +msgid "no ultimately trusted keys found\n"
 +msgstr "no ultimately trusted keys found\n"
 +
- #: g10/trustdb.c:1970
++#: g10/trustdb.c:1997
 +#, 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:2087
++#: g10/trustdb.c:2114
 +#, 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:2167
++#: g10/trustdb.c:2194
 +#, 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:105
 +msgid "undefined"
 +msgstr "undefined"
 +
 +#: g10/trust.c:106
 +msgid "never"
 +msgstr "never"
 +
 +#: g10/trust.c:107
 +msgid "marginal"
 +msgstr "marginal"
 +
 +#: g10/trust.c:108
 +msgid "full"
 +msgstr "full"
 +
 +#: g10/trust.c:109
 +msgid "ultimate"
 +msgstr "ultimate"
 +
 +#. TRANSLATORS: these strings are similar to those in
 +#. trust_value_to_string(), but are a fixed length.  This is needed to
 +#. make attractive information listings where columns line up
 +#. properly.  The value "10" should be the length of the strings you
 +#. choose to translate to.  This is the length in printable columns.
 +#. 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:146
 +msgid "10 translator see trust.c:uid_trust_string_fixed"
 +msgstr "10 translator see trust.c:uid_trust_string_fixed"
 +
 +#: g10/trust.c:149
 +msgid "[ revoked]"
 +msgstr "[ revoked]"
 +
 +#: g10/trust.c:151 g10/trust.c:157
 +msgid "[ expired]"
 +msgstr "[ expired]"
 +
 +#: g10/trust.c:156
 +msgid "[ unknown]"
 +msgstr "[ unknown]"
 +
 +#: g10/trust.c:158
 +msgid "[  undef ]"
 +msgstr "[  undef ]"
 +
 +#: g10/trust.c:159
 +msgid "[  never ]"
 +msgstr "[  never ]"
 +
 +#: g10/trust.c:160
 +msgid "[marginal]"
 +msgstr "[marginal]"
 +
 +#: g10/trust.c:161
 +msgid "[  full  ]"
 +msgstr "[  full  ]"
 +
 +#: g10/trust.c:162
 +msgid "[ultimate]"
 +msgstr "[ultimate]"
 +
 +#: g10/verify.c:117
 +msgid ""
 +"the signature could not be verified.\n"
 +"Please remember that the signature file (.sig or .asc)\n"
 +"should be the first file given on the command line.\n"
 +msgstr ""
 +"the signature could not be verified.\n"
 +"Please remember that the signature file (.sig or .asc)\n"
 +"should be the first file given on the command line.\n"
 +
 +#: g10/verify.c:204
 +#, c-format
 +msgid "input line %u too long or missing LF\n"
 +msgstr "input line %u too long or missing LF\n"
 +
 +#: g10/verify.c:253
 +#, c-format
 +msgid "can't open fd %d: %s\n"
 +msgstr "can't open fd %d: %s\n"
 +
 +#: kbx/kbxutil.c:92
 +msgid "set debugging flags"
 +msgstr "set debugging flags"
 +
 +#: kbx/kbxutil.c:93
 +msgid "enable full debugging"
 +msgstr "enable full debugging"
 +
 +#: kbx/kbxutil.c:117
 +msgid "Usage: kbxutil [options] [files] (-h for help)"
 +msgstr "Usage: kbxutil [options] [files] (-h for help)"
 +
 +#: kbx/kbxutil.c:120
 +msgid ""
 +"Syntax: kbxutil [options] [files]\n"
 +"List, export, import Keybox data\n"
 +msgstr ""
 +"Syntax: kbxutil [options] [files]\n"
 +"List, export, import Keybox data\n"
 +
- #: scd/app-nks.c:718 scd/app-openpgp.c:3208
++#: scd/app-nks.c:718 scd/app-openpgp.c:3221
 +#, c-format
 +msgid "RSA modulus missing or not of size %d bits\n"
 +msgstr "RSA modulus missing or not of size %d bits\n"
 +
- #: scd/app-nks.c:726 scd/app-openpgp.c:3220
++#: scd/app-nks.c:726 scd/app-openpgp.c:3233
 +#, c-format
 +msgid "RSA public exponent missing or larger than %d bits\n"
 +msgstr "RSA public exponent missing or larger than %d bits\n"
 +
- #: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
- #: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
- #: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1965 scd/app-openpgp.c:1984
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2166 scd/app-openpgp.c:2430
++#: scd/app-openpgp.c:2477 scd/app-openpgp.c:2582 scd/app-dinsig.c:303
 +#, c-format
 +msgid "PIN callback returned error: %s\n"
 +msgstr "PIN callback returned error: %s\n"
 +
 +#: scd/app-nks.c:839
 +msgid "the NullPIN has not yet been changed\n"
 +msgstr "the NullPIN has not yet been changed\n"
 +
 +#: scd/app-nks.c:1100
 +msgid "|N|Please enter a new PIN for the standard keys."
 +msgstr "|N|Please enter a new PIN for the standard keys."
 +
 +#: scd/app-nks.c:1101
 +msgid "||Please enter the PIN for the standard keys."
 +msgstr "||Please enter the PIN for the standard keys."
 +
 +#: scd/app-nks.c:1107
 +msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 +msgstr ""
 +"|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 +
 +#: scd/app-nks.c:1109
 +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-nks.c:1117
 +msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 +msgstr "|N|Please enter a new PIN for the key to create qualified signatures."
 +
 +#: scd/app-nks.c:1119
 +msgid "||Please enter the PIN for the key to create qualified signatures."
 +msgstr "||Please enter the PIN for the key to create qualified signatures."
 +
 +#: scd/app-nks.c:1127
 +msgid ""
 +"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 +"qualified signatures."
 +msgstr ""
 +"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 +"qualified signatures."
 +
 +#: scd/app-nks.c:1129
 +msgid ""
 +"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 +"qualified signatures."
 +msgstr ""
 +"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 +"qualified signatures."
 +
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2511 scd/app-dinsig.c:532
 +#, c-format
 +msgid "error getting new PIN: %s\n"
 +msgstr "error getting new PIN: %s\n"
 +
- #: scd/app-openpgp.c:806
++#: scd/app-openpgp.c:801
 +#, c-format
 +msgid "failed to store the fingerprint: %s\n"
 +msgstr "failed to store the fingerprint: %s\n"
 +
- #: scd/app-openpgp.c:819
++#: scd/app-openpgp.c:814
 +#, c-format
 +msgid "failed to store the creation date: %s\n"
 +msgstr "failed to store the creation date: %s\n"
 +
- #: scd/app-openpgp.c:1236
++#: scd/app-openpgp.c:1247
 +msgid "response does not contain the RSA modulus\n"
 +msgstr "response does not contain the RSA modulus\n"
 +
- #: scd/app-openpgp.c:1243
++#: scd/app-openpgp.c:1254
 +msgid "response does not contain the RSA public exponent\n"
 +msgstr "response does not contain the RSA public exponent\n"
 +
- #: scd/app-openpgp.c:1353
++#: scd/app-openpgp.c:1364
 +msgid "response does not contain the EC public key\n"
 +msgstr "response does not contain the EC public key\n"
 +
- #: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:1464 scd/app-openpgp.c:3825
 +msgid "response does not contain the public key data\n"
 +msgstr "response does not contain the public key data\n"
 +
- #: scd/app-openpgp.c:1551
++#: scd/app-openpgp.c:1564
 +#, c-format
 +msgid "reading public key failed: %s\n"
 +msgstr "reading public key failed: %s\n"
 +
- #: scd/app-openpgp.c:1903
++#: scd/app-openpgp.c:1916
 +#, c-format
 +msgid "using default PIN as %s\n"
 +msgstr "using default PIN as %s\n"
 +
- #: scd/app-openpgp.c:1910
++#: scd/app-openpgp.c:1923
 +#, c-format
 +msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 +msgstr "failed to use default PIN as %s: %s - disabling further default use\n"
 +
- #: scd/app-openpgp.c:1925
++#: scd/app-openpgp.c:1938
 +#, c-format
 +msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 +msgstr "||Please enter the PIN%%0A[sigs done: %lu]"
 +
- #: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
++#: scd/app-openpgp.c:1949 scd/app-openpgp.c:2424
 +msgid "||Please enter the PIN"
 +msgstr "||Please enter the PIN"
 +
- #: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2173 scd/app-openpgp.c:2437
 +#, c-format
 +msgid "PIN for CHV%d is too short; minimum length is %d\n"
 +msgstr "PIN for CHV%d is too short; minimum length is %d\n"
 +
- #: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
- #: scd/app-openpgp.c:4114
++#: scd/app-openpgp.c:2004 scd/app-openpgp.c:2043 scd/app-openpgp.c:2185
++#: scd/app-openpgp.c:4126
 +#, c-format
 +msgid "verify CHV%d failed: %s\n"
 +msgstr "verify CHV%d failed: %s\n"
 +
- #: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
++#: scd/app-openpgp.c:2072 scd/app-openpgp.c:2458 scd/app-openpgp.c:4556
 +msgid "error retrieving CHV status from card\n"
 +msgstr "error retrieving CHV status from card\n"
 +
- #: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
++#: scd/app-openpgp.c:2078 scd/app-openpgp.c:4565
 +msgid "card is permanently locked!\n"
 +msgstr "card is permanently locked!\n"
 +
- #: scd/app-openpgp.c:2072
++#: scd/app-openpgp.c:2085
 +#, c-format
 +msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 +msgid_plural ""
 +"%d Admin PIN attempts remaining before card is permanently locked\n"
 +msgstr[0] "%d Admin PIN attempt remaining before card is permanently locked\n"
 +msgstr[1] "%d Admin PIN attempts remaining before card is permanently locked\n"
 +
 +#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 +#. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:2082
++#: scd/app-openpgp.c:2095
 +#, c-format
 +msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 +msgstr "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 +
- #: scd/app-openpgp.c:2086
++#: scd/app-openpgp.c:2099
 +msgid "|A|Please enter the Admin PIN"
 +msgstr "|A|Please enter the Admin PIN"
 +
- #: scd/app-openpgp.c:2107
++#: scd/app-openpgp.c:2120
 +msgid "access to admin commands is not configured\n"
 +msgstr "access to admin commands is not configured\n"
 +
- #: scd/app-openpgp.c:2460
++#: scd/app-openpgp.c:2473
 +msgid "||Please enter the Reset Code for the card"
 +msgstr "||Please enter the Reset Code for the card"
 +
- #: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
++#: scd/app-openpgp.c:2483 scd/app-openpgp.c:2537
 +#, c-format
 +msgid "Reset Code is too short; minimum length is %d\n"
 +msgstr "Reset Code is too short; minimum length is %d\n"
 +
 +#. TRANSLATORS: Do not translate the "|*|" prefixes but
 +#. keep it at the start of the string.  We need this elsewhere
 +#. to get some infos on the string.
- #: scd/app-openpgp.c:2493
++#: scd/app-openpgp.c:2506
 +msgid "|RN|New Reset Code"
 +msgstr "|RN|New Reset Code"
 +
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
 +msgid "|AN|New Admin PIN"
 +msgstr "|AN|New Admin PIN"
 +
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
 +msgid "|N|New PIN"
 +msgstr "|N|New PIN"
 +
- #: scd/app-openpgp.c:2565
++#: scd/app-openpgp.c:2578
 +msgid "||Please enter the Admin PIN and New Admin PIN"
 +msgstr "||Please enter the Admin PIN and New Admin PIN"
 +
- #: scd/app-openpgp.c:2566
++#: scd/app-openpgp.c:2579
 +msgid "||Please enter the PIN and New PIN"
 +msgstr "||Please enter the PIN and New PIN"
 +
- #: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
++#: scd/app-openpgp.c:2635 scd/app-openpgp.c:3885
 +msgid "error reading application data\n"
 +msgstr "error reading application data\n"
 +
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
++#: scd/app-openpgp.c:2641 scd/app-openpgp.c:3892
 +msgid "error reading fingerprint DO\n"
 +msgstr "error reading fingerprint DO\n"
 +
- #: scd/app-openpgp.c:2638
++#: scd/app-openpgp.c:2651
 +msgid "key already exists\n"
 +msgstr "key already exists\n"
 +
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2655
 +msgid "existing key will be replaced\n"
 +msgstr "existing key will be replaced\n"
 +
- #: scd/app-openpgp.c:2644
++#: scd/app-openpgp.c:2657
 +msgid "generating new key\n"
 +msgstr "generating new key\n"
 +
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2659
 +msgid "writing new key\n"
 +msgstr "writing new key\n"
 +
- #: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
++#: scd/app-openpgp.c:3201 scd/app-openpgp.c:3553
 +msgid "creation timestamp missing\n"
 +msgstr "creation timestamp missing\n"
 +
- #: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
++#: scd/app-openpgp.c:3243 scd/app-openpgp.c:3251
 +#, c-format
 +msgid "RSA prime %s missing or not of size %d bits\n"
 +msgstr "RSA prime %s missing or not of size %d bits\n"
 +
- #: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
++#: scd/app-openpgp.c:3384 scd/app-openpgp.c:3647
 +#, c-format
 +msgid "failed to store the key: %s\n"
 +msgstr "failed to store the key: %s\n"
 +
- #: scd/app-openpgp.c:3534
++#: scd/app-openpgp.c:3547
 +msgid "unsupported curve\n"
 +msgstr "unsupported curve\n"
 +
- #: scd/app-openpgp.c:3790
++#: scd/app-openpgp.c:3802
 +msgid "please wait while key is being generated ...\n"
 +msgstr "please wait while key is being generated ...\n"
 +
- #: scd/app-openpgp.c:3798
++#: scd/app-openpgp.c:3810
 +msgid "generating key failed\n"
 +msgstr "generating key failed\n"
 +
- #: scd/app-openpgp.c:3804
++#: scd/app-openpgp.c:3816
 +#, c-format
 +msgid "key generation completed (%d second)\n"
 +msgid_plural "key generation completed (%d seconds)\n"
 +msgstr[0] "key generation completed (%d second)\n"
 +msgstr[1] "key generation completed (%d seconds)\n"
 +
- #: scd/app-openpgp.c:3838
++#: scd/app-openpgp.c:3850
 +msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 +msgstr "invalid structure of OpenPGP card (DO 0x93)\n"
 +
- #: scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:3900
 +msgid "fingerprint on card does not match requested one\n"
 +msgstr "fingerprint on card does not match requested one\n"
 +
- #: scd/app-openpgp.c:4004
++#: scd/app-openpgp.c:4016
 +#, c-format
 +msgid "card does not support digest algorithm %s\n"
 +msgstr "card does not support digest algorithm %s\n"
 +
- #: scd/app-openpgp.c:4089
++#: scd/app-openpgp.c:4101
 +#, c-format
 +msgid "signatures created so far: %lu\n"
 +msgstr "signatures created so far: %lu\n"
 +
- #: scd/app-openpgp.c:4551
++#: scd/app-openpgp.c:4570
 +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:4854 scd/app-openpgp.c:4865
++#: scd/app-openpgp.c:4871 scd/app-openpgp.c:4882
 +#, c-format
 +msgid "can't access %s - invalid OpenPGP card?\n"
 +msgstr "can't access %s - invalid OpenPGP card?\n"
 +
 +#: scd/app-dinsig.c:299
 +msgid "||Please enter your PIN at the reader's pinpad"
 +msgstr "||Please enter your PIN at the reader's pinpad"
 +
 +#. TRANSLATORS: Do not translate the "|*|" prefixes but
 +#. keep it at the start of the string.  We need this elsewhere
 +#. to get some infos on the string.
 +#: scd/app-dinsig.c:529
 +msgid "|N|Initial New PIN"
 +msgstr "|N|Initial New PIN"
 +
 +#: scd/scdaemon.c:114
 +msgid "run in multi server mode (foreground)"
 +msgstr "run in multi server mode (foreground)"
 +
- #: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
 +msgid "|LEVEL|set the debugging level to LEVEL"
 +msgstr "|LEVEL|set the debugging level to LEVEL"
 +
 +#: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
 +msgid "|FILE|write a log to FILE"
 +msgstr "|FILE|write a log to FILE"
 +
 +#: scd/scdaemon.c:134
 +msgid "|N|connect to reader at port N"
 +msgstr "|N|connect to reader at port N"
 +
 +#: scd/scdaemon.c:136
 +msgid "|NAME|use NAME as ct-API driver"
 +msgstr "|NAME|use NAME as ct-API driver"
 +
 +#: scd/scdaemon.c:138
 +msgid "|NAME|use NAME as PC/SC driver"
 +msgstr "|NAME|use NAME as PC/SC driver"
 +
 +#: scd/scdaemon.c:141
 +msgid "do not use the internal CCID driver"
 +msgstr "do not use the internal CCID driver"
 +
 +#: scd/scdaemon.c:147
 +msgid "|N|disconnect the card after N seconds of inactivity"
 +msgstr "|N|disconnect the card after N seconds of inactivity"
 +
 +#: scd/scdaemon.c:150
 +msgid "do not use a reader's pinpad"
 +msgstr "do not use a reader's pinpad"
 +
 +#: scd/scdaemon.c:155
 +msgid "deny the use of admin card commands"
 +msgstr "deny the use of admin card commands"
 +
 +#: scd/scdaemon.c:158
 +msgid "use variable length input for pinpad"
 +msgstr "use variable length input for pinpad"
 +
- #: scd/scdaemon.c:287
++#: scd/scdaemon.c:286
 +msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 +msgstr "Usage: @SCDAEMON@ [options] (-h for help)"
 +
- #: scd/scdaemon.c:289
++#: scd/scdaemon.c:288
 +msgid ""
 +"Syntax: scdaemon [options] [command [args]]\n"
 +"Smartcard daemon for @GNUPG@\n"
 +msgstr ""
 +"Syntax: scdaemon [options] [command [args]]\n"
 +"Smartcard daemon for @GNUPG@\n"
 +
- #: scd/scdaemon.c:786
++#: scd/scdaemon.c:784
 +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:1160 dirmngr/dirmngr.c:1900
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1904
 +#, c-format
 +msgid "handler for fd %d started\n"
 +msgstr "handler for fd %d started\n"
 +
- #: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
++#: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1909
 +#, c-format
 +msgid "handler for fd %d terminated\n"
 +msgstr "handler for fd %d terminated\n"
 +
 +#: sm/base64.c:327
 +#, c-format
 +msgid "invalid radix64 character %02x skipped\n"
 +msgstr "invalid radix64 character %02x skipped\n"
 +
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
 +msgid "no dirmngr running in this session\n"
 +msgstr "no dirmngr running in this session\n"
 +
 +#: sm/certchain.c:194
 +#, c-format
 +msgid "validation model requested by certificate: %s"
 +msgstr "validation model requested by certificate: %s"
 +
 +#: sm/certchain.c:195 sm/certchain.c:1937
 +msgid "chain"
 +msgstr "chain"
 +
 +#: sm/certchain.c:196 sm/certchain.c:1937
 +msgid "shell"
 +msgstr "shell"
 +
 +#: sm/certchain.c:256 dirmngr/validate.c:107
 +#, c-format
 +msgid "critical certificate extension %s is not supported"
 +msgstr "critical certificate extension %s is not supported"
 +
 +#: sm/certchain.c:295 dirmngr/validate.c:205
 +msgid "issuer certificate is not marked as a CA"
 +msgstr "issuer certificate is not marked as a CA"
 +
 +#: sm/certchain.c:333
 +msgid "critical marked policy without configured policies"
 +msgstr "critical marked policy without configured policies"
 +
 +#: sm/certchain.c:343
 +#, c-format
 +msgid "failed to open '%s': %s\n"
 +msgstr "failed to open '%s': %s\n"
 +
 +#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
 +msgid "Note: non-critical certificate policy not allowed"
 +msgstr "Note: non-critical certificate policy not allowed"
 +
 +#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
 +msgid "certificate policy not allowed"
 +msgstr "certificate policy not allowed"
 +
 +#: sm/certchain.c:538
 +msgid "looking up issuer at external location\n"
 +msgstr "looking up issuer at external location\n"
 +
 +#: sm/certchain.c:558
 +#, c-format
 +msgid "number of issuers matching: %d\n"
 +msgstr "number of issuers matching: %d\n"
 +
 +#: sm/certchain.c:606
 +msgid "looking up issuer from the Dirmngr cache\n"
 +msgstr "looking up issuer from the Dirmngr cache\n"
 +
 +#: sm/certchain.c:631
 +#, c-format
 +msgid "number of matching certificates: %d\n"
 +msgstr "number of matching certificates: %d\n"
 +
 +#: sm/certchain.c:634
 +#, c-format
 +msgid "dirmngr cache-only key lookup failed: %s\n"
 +msgstr "dirmngr cache-only key lookup failed: %s\n"
 +
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
 +#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
 +msgid "failed to allocate keyDB handle\n"
 +msgstr "failed to allocate keyDB handle\n"
 +
 +#: sm/certchain.c:999
 +msgid "certificate has been revoked"
 +msgstr "certificate has been revoked"
 +
 +#: sm/certchain.c:1014
 +msgid "the status of the certificate is unknown"
 +msgstr "the status of the certificate is unknown"
 +
 +#: sm/certchain.c:1021
 +msgid "please make sure that the \"dirmngr\" is properly installed\n"
 +msgstr "please make sure that the “dirmngr” is properly installed\n"
 +
 +#: sm/certchain.c:1027
 +#, c-format
 +msgid "checking the CRL failed: %s"
 +msgstr "checking the CRL failed: %s"
 +
 +#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
 +#, c-format
 +msgid "certificate with invalid validity: %s"
 +msgstr "certificate with invalid validity: %s"
 +
 +#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
 +msgid "certificate not yet valid"
 +msgstr "certificate not yet valid"
 +
 +#: sm/certchain.c:1072 sm/certchain.c:1157
 +msgid "root certificate not yet valid"
 +msgstr "root certificate not yet valid"
 +
 +#: sm/certchain.c:1073 sm/certchain.c:1158
 +msgid "intermediate certificate not yet valid"
 +msgstr "intermediate certificate not yet valid"
 +
 +#: sm/certchain.c:1086 dirmngr/validate.c:498
 +msgid "certificate has expired"
 +msgstr "certificate has expired"
 +
 +#: sm/certchain.c:1087
 +msgid "root certificate has expired"
 +msgstr "root certificate has expired"
 +
 +#: sm/certchain.c:1088
 +msgid "intermediate certificate has expired"
 +msgstr "intermediate certificate has expired"
 +
 +#: sm/certchain.c:1130
 +#, c-format
 +msgid "required certificate attributes missing: %s%s%s"
 +msgstr "required certificate attributes missing: %s%s%s"
 +
 +#: sm/certchain.c:1139
 +msgid "certificate with invalid validity"
 +msgstr "certificate with invalid validity"
 +
 +#: sm/certchain.c:1176
 +msgid "signature not created during lifetime of certificate"
 +msgstr "signature not created during lifetime of certificate"
 +
 +#: sm/certchain.c:1178
 +msgid "certificate not created during lifetime of issuer"
 +msgstr "certificate not created during lifetime of issuer"
 +
 +#: sm/certchain.c:1179
 +msgid "intermediate certificate not created during lifetime of issuer"
 +msgstr "intermediate certificate not created during lifetime of issuer"
 +
 +#: sm/certchain.c:1183
 +msgid "  (  signature created at "
 +msgstr "  (  signature created at "
 +
 +#: sm/certchain.c:1184
 +msgid "  (certificate created at "
 +msgstr "  (certificate created at "
 +
 +#: sm/certchain.c:1187
 +msgid "  (certificate valid from "
 +msgstr "  (certificate valid from "
 +
 +#: sm/certchain.c:1188
 +msgid "  (     issuer valid from "
 +msgstr "  (     issuer valid from "
 +
 +#: sm/certchain.c:1218 dirmngr/validate.c:548
 +#, c-format
 +msgid "fingerprint=%s\n"
 +msgstr "fingerprint=%s\n"
 +
 +#: sm/certchain.c:1227
 +msgid "root certificate has now been marked as trusted\n"
 +msgstr "root certificate has now been marked as trusted\n"
 +
 +#: sm/certchain.c:1240
 +msgid "interactive marking as trusted not enabled in gpg-agent\n"
 +msgstr "interactive marking as trusted not enabled in gpg-agent\n"
 +
 +#: sm/certchain.c:1246
 +msgid "interactive marking as trusted disabled for this session\n"
 +msgstr "interactive marking as trusted disabled for this session\n"
 +
 +#: sm/certchain.c:1304
 +msgid "WARNING: creation time of signature not known - assuming current time"
 +msgstr "WARNING: creation time of signature not known - assuming current time"
 +
 +#: sm/certchain.c:1368
 +msgid "no issuer found in certificate"
 +msgstr "no issuer found in certificate"
 +
 +#: sm/certchain.c:1446
 +msgid "self-signed certificate has a BAD signature"
 +msgstr "self-signed certificate has a BAD signature"
 +
 +#: sm/certchain.c:1515 dirmngr/validate.c:546
 +msgid "root certificate is not marked trusted"
 +msgstr "root certificate is not marked trusted"
 +
 +#: sm/certchain.c:1531
 +#, c-format
 +msgid "checking the trust list failed: %s\n"
 +msgstr "checking the trust list failed: %s\n"
 +
 +#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
 +msgid "certificate chain too long\n"
 +msgstr "certificate chain too long\n"
 +
 +#: sm/certchain.c:1574 dirmngr/validate.c:613
 +msgid "issuer certificate not found"
 +msgstr "issuer certificate not found"
 +
 +#: sm/certchain.c:1607 dirmngr/validate.c:639
 +msgid "certificate has a BAD signature"
 +msgstr "certificate has a BAD signature"
 +
 +#: sm/certchain.c:1639 dirmngr/validate.c:663
 +msgid "found another possible matching CA certificate - trying again"
 +msgstr "found another possible matching CA certificate - trying again"
 +
 +#: sm/certchain.c:1698 dirmngr/validate.c:688
 +#, c-format
 +msgid "certificate chain longer than allowed by CA (%d)"
 +msgstr "certificate chain longer than allowed by CA (%d)"
 +
 +#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
 +msgid "certificate is good\n"
 +msgstr "certificate is good\n"
 +
 +#: sm/certchain.c:1741
 +msgid "intermediate certificate is good\n"
 +msgstr "intermediate certificate is good\n"
 +
 +#: sm/certchain.c:1742
 +msgid "root certificate is good\n"
 +msgstr "root certificate is good\n"
 +
 +#: sm/certchain.c:1924
 +msgid "switching to chain model"
 +msgstr "switching to chain model"
 +
 +#: sm/certchain.c:1933
 +#, c-format
 +msgid "validation model used: %s"
 +msgstr "validation model used: %s"
 +
 +#: sm/certcheck.c:107
 +#, c-format
 +msgid "a %u bit hash is not valid for a %u bit %s key\n"
 +msgstr "a %u bit hash is not valid for a %u bit %s key\n"
 +
 +#: sm/certcheck.c:244 sm/verify.c:202
 +msgid "(this is the MD2 algorithm)\n"
 +msgstr "(this is the MD2 algorithm)\n"
 +
 +#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
 +msgid "none"
 +msgstr "none"
 +
 +#: sm/certdump.c:552 sm/certdump.c:617
 +msgid "[Error - invalid encoding]"
 +msgstr "[Error - invalid encoding]"
 +
 +#: sm/certdump.c:560
 +msgid "[Error - out of core]"
 +msgstr "[Error - out of core]"
 +
 +#: sm/certdump.c:596
 +msgid "[Error - No name]"
 +msgstr "[Error - No name]"
 +
 +#: sm/certdump.c:623
 +msgid "[Error - invalid DN]"
 +msgstr "[Error - invalid DN]"
 +
 +#: sm/certdump.c:833
 +#, c-format
 +msgid ""
 +"Please enter the passphrase to unlock the secret key for the X.509 "
 +"certificate:\n"
 +"\"%s\"\n"
 +"S/N %s, ID 0x%08lX,\n"
 +"created %s, expires %s.\n"
 +msgstr ""
 +"Please enter the passphrase to unlock the secret key for the X.509 "
 +"certificate:\n"
 +"“%s”\n"
 +"S/N %s, ID 0x%08lX,\n"
 +"created %s, expires %s.\n"
 +
 +#: sm/certlist.c:122 dirmngr/validate.c:1075
 +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:274 dirmngr/validate.c:1085
 +#, c-format
 +msgid "error getting key usage information: %s\n"
 +msgstr "error getting key usage information: %s\n"
 +
 +#: sm/certlist.c:142 dirmngr/validate.c:1095
 +msgid "certificate should not have been used for certification\n"
 +msgstr "certificate should not have been used for certification\n"
 +
 +#: sm/certlist.c:154 dirmngr/validate.c:1107
 +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:165 dirmngr/validate.c:1127
 +msgid "certificate should not have been used for encryption\n"
 +msgstr "certificate should not have been used for encryption\n"
 +
 +#: sm/certlist.c:166 dirmngr/validate.c:1129
 +msgid "certificate should not have been used for signing\n"
 +msgstr "certificate should not have been used for signing\n"
 +
 +#: sm/certlist.c:167 dirmngr/validate.c:1130
 +msgid "certificate is not usable for encryption\n"
 +msgstr "certificate is not usable for encryption\n"
 +
 +#: sm/certlist.c:168 dirmngr/validate.c:1131
 +msgid "certificate is not usable for signing\n"
 +msgstr "certificate is not usable for signing\n"
 +
 +#: sm/certreqgen.c:464
 +#, c-format
 +msgid "line %d: invalid algorithm\n"
 +msgstr "line %d: invalid algorithm\n"
 +
 +#: sm/certreqgen.c:478
 +#, c-format
 +msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 +msgstr "line %d: invalid key length %u (valid are %d to %d)\n"
 +
 +#: sm/certreqgen.c:496
 +#, c-format
 +msgid "line %d: no subject name given\n"
 +msgstr "line %d: no subject name given\n"
 +
 +#: sm/certreqgen.c:505
 +#, c-format
 +msgid "line %d: invalid subject name label '%.*s'\n"
 +msgstr "line %d: invalid subject name label ‘%.*s’\n"
 +
 +#: sm/certreqgen.c:508
 +#, c-format
 +msgid "line %d: invalid subject name '%s' at pos %d\n"
 +msgstr "line %d: invalid subject name ‘%s’ at pos %d\n"
 +
 +#: sm/certreqgen.c:525
 +#, c-format
 +msgid "line %d: not a valid email address\n"
 +msgstr "line %d: not a valid email address\n"
 +
 +#: sm/certreqgen.c:544
 +#, c-format
 +msgid "line %d: invalid serial number\n"
 +msgstr "line %d: invalid serial number\n"
 +
 +#: sm/certreqgen.c:560
 +#, c-format
 +msgid "line %d: invalid issuer name label '%.*s'\n"
 +msgstr "line %d: invalid issuer name label ‘%.*s’\n"
 +
 +#: sm/certreqgen.c:563
 +#, c-format
 +msgid "line %d: invalid issuer name '%s' at pos %d\n"
 +msgstr "line %d: invalid issuer name ‘%s’ at pos %d\n"
 +
 +#: sm/certreqgen.c:575 sm/certreqgen.c:586
 +#, c-format
 +msgid "line %d: invalid date given\n"
 +msgstr "line %d: invalid date given\n"
 +
 +#: sm/certreqgen.c:599
 +#, c-format
 +msgid "line %d: error getting signing key by keygrip '%s': %s\n"
 +msgstr "line %d: error getting signing key by keygrip '%s': %s\n"
 +
 +#: sm/certreqgen.c:618
 +#, c-format
 +msgid "line %d: invalid hash algorithm given\n"
 +msgstr "line %d: invalid hash algorithm given\n"
 +
 +#: sm/certreqgen.c:633
 +#, c-format
 +msgid "line %d: invalid authority-key-id\n"
 +msgstr "line %d: invalid authority-key-id\n"
 +
 +#: sm/certreqgen.c:648
 +#, c-format
 +msgid "line %d: invalid subject-key-id\n"
 +msgstr "line %d: invalid subject-key-id\n"
 +
 +#: sm/certreqgen.c:686
 +#, c-format
 +msgid "line %d: invalid extension syntax\n"
 +msgstr "line %d: invalid extension syntax\n"
 +
 +#: sm/certreqgen.c:699
 +#, c-format
 +msgid "line %d: error reading key '%s' from card: %s\n"
 +msgstr "line %d: error reading key ‘%s’ from card: %s\n"
 +
 +#: sm/certreqgen.c:712
 +#, c-format
 +msgid "line %d: error getting key by keygrip '%s': %s\n"
 +msgstr "line %d: error getting key by keygrip '%s': %s\n"
 +
 +#: sm/certreqgen.c:729
 +#, c-format
 +msgid "line %d: key generation failed: %s <%s>\n"
 +msgstr "line %d: key generation failed: %s <%s>\n"
 +
 +#: sm/certreqgen.c:1324
 +msgid ""
 +"To complete this certificate request please enter the passphrase for the key "
 +"you just created once more.\n"
 +msgstr ""
 +"To complete this certificate request please enter the passphrase for the key "
 +"you just created once more.\n"
 +
 +#: sm/certreqgen-ui.c:162
 +#, c-format
 +msgid "   (%d) RSA\n"
 +msgstr "   (%d) RSA\n"
 +
 +#: sm/certreqgen-ui.c:163
 +#, c-format
 +msgid "   (%d) Existing key\n"
 +msgstr "   (%d) Existing key\n"
 +
 +#: sm/certreqgen-ui.c:164
 +#, c-format
 +msgid "   (%d) Existing key from card\n"
 +msgstr "   (%d) Existing key from card\n"
 +
 +#: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
 +#, c-format
 +msgid "error reading the card: %s\n"
 +msgstr "error reading the card: %s\n"
 +
 +#: sm/certreqgen-ui.c:237
 +#, c-format
 +msgid "Serial number of the card: %s\n"
 +msgstr "Serial number of the card: %s\n"
 +
 +#: sm/certreqgen-ui.c:249
 +msgid "Available keys:\n"
 +msgstr "Available keys:\n"
 +
 +#: sm/certreqgen-ui.c:280
 +#, c-format
 +msgid "Possible actions for a %s key:\n"
 +msgstr "Possible actions for a %s key:\n"
 +
 +#: sm/certreqgen-ui.c:281
 +#, c-format
 +msgid "   (%d) sign, encrypt\n"
 +msgstr "   (%d) sign, encrypt\n"
 +
 +#: sm/certreqgen-ui.c:282
 +#, c-format
 +msgid "   (%d) sign\n"
 +msgstr "   (%d) sign\n"
 +
 +#: sm/certreqgen-ui.c:283
 +#, c-format
 +msgid "   (%d) encrypt\n"
 +msgstr "   (%d) encrypt\n"
 +
 +#: sm/certreqgen-ui.c:307
 +msgid "Enter the X.509 subject name: "
 +msgstr "Enter the X.509 subject name: "
 +
 +#: sm/certreqgen-ui.c:311
 +msgid "No subject name given\n"
 +msgstr "No subject name given\n"
 +
 +#: sm/certreqgen-ui.c:315
 +#, c-format
 +msgid "Invalid subject name label '%.*s'\n"
 +msgstr "Invalid subject name label ‘%.*s’\n"
 +
 +#. TRANSLATORS: The 22 in the second string is the
 +#. length of the first string up to the "%s".  Please
 +#. adjust it do the length of your translation.  The
 +#. second string is merely passed to atoi so you can
 +#. drop everything after the number.
 +#: sm/certreqgen-ui.c:324
 +#, c-format
 +msgid "Invalid subject name '%s'\n"
 +msgstr "Invalid subject name ‘%s’\n"
 +
 +#: sm/certreqgen-ui.c:326
 +msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
 +msgstr "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
 +
 +#: sm/certreqgen-ui.c:338
 +msgid "Enter email addresses"
 +msgstr "Enter email addresses"
 +
 +#: sm/certreqgen-ui.c:339
 +msgid " (end with an empty line):\n"
 +msgstr " (end with an empty line):\n"
 +
 +#: sm/certreqgen-ui.c:343
 +msgid "Enter DNS names"
 +msgstr "Enter DNS names"
 +
 +#: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
 +msgid " (optional; end with an empty line):\n"
 +msgstr " (optional; end with an empty line):\n"
 +
 +#: sm/certreqgen-ui.c:348
 +msgid "Enter URIs"
 +msgstr "Enter URIs"
 +
 +#: sm/certreqgen-ui.c:355
 +msgid "Create self-signed certificate? (y/N) "
 +msgstr "Create self-signed certificate? (y/N) "
 +
 +#: sm/certreqgen-ui.c:382
 +msgid "These parameters are used:\n"
 +msgstr "These parameters are used:\n"
 +
 +#: sm/certreqgen-ui.c:400
 +msgid "Now creating self-signed certificate.  "
 +msgstr "Now creating self-signed certificate.  "
 +
 +#: sm/certreqgen-ui.c:402
 +msgid "Now creating certificate request.  "
 +msgstr "Now creating certificate request.  "
 +
 +#: sm/certreqgen-ui.c:403
 +msgid "This may take a while ...\n"
 +msgstr "This may take a while ...\n"
 +
 +#: sm/certreqgen-ui.c:414
 +msgid "Ready.\n"
 +msgstr "Ready.\n"
 +
 +#: sm/certreqgen-ui.c:417
 +msgid "Ready.  You should now send this request to your CA.\n"
 +msgstr "Ready.  You should now send this request to your CA.\n"
 +
 +#: sm/certreqgen-ui.c:423
 +msgid "resource problem: out of core\n"
 +msgstr "resource problem: out of core\n"
 +
- #: sm/decrypt.c:330
++#: sm/decrypt.c:332
 +msgid "(this is the RC2 algorithm)\n"
 +msgstr "(this is the RC2 algorithm)\n"
 +
- #: sm/decrypt.c:332
++#: sm/decrypt.c:334
 +msgid "(this does not seem to be an encrypted message)\n"
 +msgstr "(this does not seem to be an encrypted message)\n"
 +
 +#: sm/delete.c:51 sm/delete.c:112
 +#, c-format
 +msgid "certificate '%s' not found: %s\n"
 +msgstr "certificate ‘%s’ not found: %s\n"
 +
 +#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
 +#, c-format
 +msgid "error locking keybox: %s\n"
 +msgstr "error locking keybox: %s\n"
 +
 +#: sm/delete.c:143
 +#, c-format
 +msgid "duplicated certificate '%s' deleted\n"
 +msgstr "duplicated certificate ‘%s’ deleted\n"
 +
 +#: sm/delete.c:145
 +#, c-format
 +msgid "certificate '%s' deleted\n"
 +msgstr "certificate ‘%s’ deleted\n"
 +
 +#: sm/delete.c:175
 +#, c-format
 +msgid "deleting certificate \"%s\" failed: %s\n"
 +msgstr "deleting certificate “%s” failed: %s\n"
 +
 +#: sm/encrypt.c:328
 +msgid "no valid recipients given\n"
 +msgstr "no valid recipients given\n"
 +
 +#: sm/gpgsm.c:209
 +msgid "list external keys"
 +msgstr "list external keys"
 +
 +#: sm/gpgsm.c:211
 +msgid "list certificate chain"
 +msgstr "list certificate chain"
 +
- #: sm/gpgsm.c:218
++#: sm/gpgsm.c:219
 +msgid "import certificates"
 +msgstr "import certificates"
 +
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
 +msgid "export certificates"
 +msgstr "export certificates"
 +
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:228
 +msgid "register a smartcard"
 +msgstr "register a smartcard"
 +
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:231
 +msgid "pass a command to the dirmngr"
 +msgstr "pass a command to the dirmngr"
 +
- #: sm/gpgsm.c:232
++#: sm/gpgsm.c:233
 +msgid "invoke gpg-protect-tool"
 +msgstr "invoke gpg-protect-tool"
 +
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:250
 +msgid "create base-64 encoded output"
 +msgstr "create base-64 encoded output"
 +
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
 +msgid "assume input is in PEM format"
 +msgstr "assume input is in PEM format"
 +
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
 +msgid "assume input is in base-64 format"
 +msgstr "assume input is in base-64 format"
 +
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:262
 +msgid "assume input is in binary format"
 +msgstr "assume input is in binary format"
 +
- #: sm/gpgsm.c:267
++#: sm/gpgsm.c:269
 +msgid "never consult a CRL"
 +msgstr "never consult a CRL"
 +
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:279
 +msgid "check validity using OCSP"
 +msgstr "check validity using OCSP"
 +
- #: sm/gpgsm.c:282
++#: sm/gpgsm.c:284
 +msgid "|N|number of certificates to include"
 +msgstr "|N|number of certificates to include"
 +
- #: sm/gpgsm.c:285
++#: sm/gpgsm.c:287
 +msgid "|FILE|take policy information from FILE"
 +msgstr "|FILE|take policy information from FILE"
 +
- #: sm/gpgsm.c:288
++#: sm/gpgsm.c:290
 +msgid "do not check certificate policies"
 +msgstr "do not check certificate policies"
 +
- #: sm/gpgsm.c:292
++#: sm/gpgsm.c:294
 +msgid "fetch missing issuer certificates"
 +msgstr "fetch missing issuer certificates"
 +
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
 +msgid "don't use the terminal at all"
 +msgstr "don't use the terminal at all"
 +
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:307
 +msgid "|FILE|write a server mode log to FILE"
 +msgstr "|FILE|write a server mode log to FILE"
 +
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:312
 +msgid "|FILE|write an audit log to FILE"
 +msgstr "|FILE|write an audit log to FILE"
 +
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
 +msgid "batch mode: never ask"
 +msgstr "batch mode: never ask"
 +
- #: sm/gpgsm.c:314
++#: sm/gpgsm.c:316
 +msgid "assume yes on most questions"
 +msgstr "assume yes on most questions"
 +
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:317
 +msgid "assume no on most questions"
 +msgstr "assume no on most questions"
 +
- #: sm/gpgsm.c:318
++#: sm/gpgsm.c:320
 +msgid "|FILE|add keyring to the list of keyrings"
 +msgstr "|FILE|add keyring to the list of keyrings"
 +
- #: sm/gpgsm.c:321
++#: sm/gpgsm.c:323
 +msgid "|USER-ID|use USER-ID as default secret key"
 +msgstr "|USER-ID|use USER-ID as default secret key"
 +
- #: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
 +msgid "|SPEC|use this keyserver to lookup keys"
 +msgstr "|SPEC|use this keyserver to lookup keys"
 +
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
 +msgid "|NAME|use cipher algorithm NAME"
 +msgstr "|NAME|use cipher algorithm NAME"
 +
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:352
 +msgid "|NAME|use message digest algorithm NAME"
 +msgstr "|NAME|use message digest algorithm NAME"
 +
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:559
 +msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 +msgstr "Usage: @GPGSM@ [options] [files] (-h for help)"
 +
- #: sm/gpgsm.c:570
++#: sm/gpgsm.c:562
 +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 ""
 +"Syntax: @GPGSM@ [options] [files]\n"
 +"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
 +"Default operation depends on the input data\n"
 +
- #: sm/gpgsm.c:774
++#: sm/gpgsm.c:766
 +#, 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:785
++#: sm/gpgsm.c:777
 +#, c-format
 +msgid "unknown validation model '%s'\n"
 +msgstr "unknown validation model ‘%s’\n"
 +
- #: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
 +#, c-format
 +msgid "%s:%u: no hostname given\n"
 +msgstr "%s:%u: no hostname given\n"
 +
- #: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
 +#, c-format
 +msgid "%s:%u: password given without user\n"
 +msgstr "%s:%u: password given without user\n"
 +
- #: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
 +#, c-format
 +msgid "%s:%u: skipping this line\n"
 +msgstr "%s:%u: skipping this line\n"
 +
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1427
 +msgid "could not parse keyserver\n"
 +msgstr "could not parse keyserver\n"
 +
- #: sm/gpgsm.c:1636
++#: sm/gpgsm.c:1630
 +#, c-format
 +msgid "importing common certificates '%s'\n"
 +msgstr "importing common certificates ‘%s’\n"
 +
- #: sm/gpgsm.c:1677
++#: sm/gpgsm.c:1671
 +#, c-format
 +msgid "can't sign using '%s': %s\n"
 +msgstr "can't sign using '%s': %s\n"
 +
- #: sm/gpgsm.c:2033
++#: sm/gpgsm.c:2028
 +msgid "invalid command (there is no implicit command)\n"
 +msgstr "invalid command (there is no implicit command)\n"
 +
 +#: sm/import.c:127
 +#, c-format
 +msgid "total number processed: %lu\n"
 +msgstr "total number processed: %lu\n"
 +
 +#: sm/import.c:246
 +msgid "error storing certificate\n"
 +msgstr "error storing certificate\n"
 +
 +#: sm/import.c:254
 +msgid "basic certificate checks failed - not imported\n"
 +msgstr "basic certificate checks failed - not imported\n"
 +
 +#: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
 +#, c-format
 +msgid "error getting stored flags: %s\n"
 +msgstr "error getting stored flags: %s\n"
 +
 +#: sm/import.c:526 sm/import.c:558
 +#, c-format
 +msgid "error importing certificate: %s\n"
 +msgstr "error importing certificate: %s\n"
 +
 +#: sm/import.c:746 tools/gpg-connect-agent.c:1433
 +#, c-format
 +msgid "error reading input: %s\n"
 +msgstr "error reading input: %s\n"
 +
 +#: sm/keydb.c:1126 sm/keydb.c:1212
 +msgid "failed to get the fingerprint\n"
 +msgstr "failed to get the fingerprint\n"
 +
 +#: sm/keydb.c:1168
 +#, c-format
 +msgid "problem looking for existing certificate: %s\n"
 +msgstr "problem looking for existing certificate: %s\n"
 +
 +#: sm/keydb.c:1180
 +#, c-format
 +msgid "error finding writable keyDB: %s\n"
 +msgstr "error finding writable keyDB: %s\n"
 +
 +#: sm/keydb.c:1188
 +#, c-format
 +msgid "error storing certificate: %s\n"
 +msgstr "error storing certificate: %s\n"
 +
 +#: sm/keydb.c:1240
 +#, c-format
 +msgid "problem re-searching certificate: %s\n"
 +msgstr "problem re-searching certificate: %s\n"
 +
 +#: sm/keydb.c:1261 sm/keydb.c:1350
 +#, c-format
 +msgid "error storing flags: %s\n"
 +msgstr "error storing flags: %s\n"
 +
 +#: sm/keylist.c:657
 +msgid "Error - "
 +msgstr "Error - "
 +
 +#: sm/misc.c:58
 +msgid "GPG_TTY has not been set - using maybe bogus default\n"
 +msgstr "GPG_TTY has not been set - using maybe bogus default\n"
 +
 +#: sm/qualified.c:105
 +#, c-format
 +msgid "invalid formatted fingerprint in '%s', line %d\n"
 +msgstr "invalid formatted fingerprint in '%s', line %d\n"
 +
 +#: sm/qualified.c:123
 +#, c-format
 +msgid "invalid country code in '%s', line %d\n"
 +msgstr "invalid country code in '%s', line %d\n"
 +
 +#: sm/qualified.c:206
 +#, c-format
 +msgid ""
 +"You are about to create a signature using your certificate:\n"
 +"\"%s\"\n"
 +"This will create a qualified signature by law equated to a handwritten "
 +"signature.\n"
 +"\n"
 +"%s%sAre you really sure that you want to do this?"
 +msgstr ""
 +"You are about to create a signature using your certificate:\n"
 +"“%s”\n"
 +"This will create a qualified signature by law equated to a handwritten "
 +"signature.\n"
 +"\n"
 +"%s%sAre you really sure that you want to do this?"
 +
 +#: sm/qualified.c:215 sm/verify.c:617
 +msgid ""
 +"Note, that this software is not officially approved to create or verify such "
 +"signatures.\n"
 +msgstr ""
 +"Note, that this software is not officially approved to create or verify such "
 +"signatures.\n"
 +
 +#: sm/qualified.c:282
 +#, c-format
 +msgid ""
 +"You are about to create a signature using your certificate:\n"
 +"\"%s\"\n"
 +"Note, that this certificate will NOT create a qualified signature!"
 +msgstr ""
 +"You are about to create a signature using your certificate:\n"
 +"“%s”\n"
 +"Note, that this certificate will NOT create a qualified signature!"
 +
 +#: sm/sign.c:451
 +#, c-format
 +msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 +msgstr "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 +
 +#: sm/sign.c:465
 +#, c-format
 +msgid "hash algorithm used for signer %d: %s (%s)\n"
 +msgstr "hash algorithm used for signer %d: %s (%s)\n"
 +
 +#: sm/sign.c:517
 +#, c-format
 +msgid "checking for qualified certificate failed: %s\n"
 +msgstr "checking for qualified certificate failed: %s\n"
 +
 +#: sm/verify.c:450
 +msgid "Signature made "
 +msgstr "Signature made "
 +
 +#: sm/verify.c:454
 +msgid "[date not given]"
 +msgstr "[date not given]"
 +
 +#: sm/verify.c:455
 +#, c-format
 +msgid " using certificate ID 0x%08lX\n"
 +msgstr " using certificate ID 0x%08lX\n"
 +
 +#: sm/verify.c:474
 +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:595
 +msgid "Good signature from"
 +msgstr "Good signature from"
 +
 +#: sm/verify.c:596
 +msgid "                aka"
 +msgstr "                aka"
 +
 +#: sm/verify.c:614
 +msgid "This is a qualified signature\n"
 +msgstr "This is a qualified signature\n"
 +
 +#: dirmngr/certcache.c:106
 +#, c-format
 +msgid "can't initialize certificate cache lock: %s\n"
 +msgstr "can't initialize certificate cache lock: %s\n"
 +
 +#: dirmngr/certcache.c:117
 +#, c-format
 +msgid "can't acquire read lock on the certificate cache: %s\n"
 +msgstr "can't acquire read lock on the certificate cache: %s\n"
 +
 +#: dirmngr/certcache.c:128
 +#, c-format
 +msgid "can't acquire write lock on the certificate cache: %s\n"
 +msgstr "can't acquire write lock on the certificate cache: %s\n"
 +
 +#: dirmngr/certcache.c:139
 +#, c-format
 +msgid "can't release lock on the certificate cache: %s\n"
 +msgstr "can't release lock on the certificate cache: %s\n"
 +
 +#: dirmngr/certcache.c:267
 +#, c-format
 +msgid "dropping %u certificates from the cache\n"
 +msgstr "dropping %u certificates from the cache\n"
 +
 +#: dirmngr/certcache.c:387
 +#, c-format
 +msgid "can't parse certificate '%s': %s\n"
 +msgstr "can't parse certificate '%s': %s\n"
 +
 +#: dirmngr/certcache.c:395
 +#, c-format
 +msgid "certificate '%s' already cached\n"
 +msgstr "certificate ‘%s’ already cached\n"
 +
 +#: dirmngr/certcache.c:399
 +#, c-format
 +msgid "trusted certificate '%s' loaded\n"
 +msgstr "trusted certificate ‘%s’ loaded\n"
 +
 +#: dirmngr/certcache.c:401
 +#, c-format
 +msgid "certificate '%s' loaded\n"
 +msgstr "certificate ‘%s’ loaded\n"
 +
 +#: dirmngr/certcache.c:405
 +#, c-format
 +msgid "  SHA1 fingerprint = %s\n"
 +msgstr "  SHA1 fingerprint = %s\n"
 +
 +#: dirmngr/certcache.c:408
 +msgid "   issuer ="
 +msgstr "   issuer ="
 +
 +#: dirmngr/certcache.c:409
 +msgid "  subject ="
 +msgstr "  subject ="
 +
 +#: dirmngr/certcache.c:413
 +#, c-format
 +msgid "error loading certificate '%s': %s\n"
 +msgstr "error loading certificate '%s': %s\n"
 +
 +#: dirmngr/certcache.c:489
 +#, c-format
 +msgid "permanently loaded certificates: %u\n"
 +msgstr "permanently loaded certificates: %u\n"
 +
 +#: dirmngr/certcache.c:491
 +#, c-format
 +msgid "    runtime cached certificates: %u\n"
 +msgstr "    runtime cached certificates: %u\n"
 +
 +#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
 +msgid "certificate already cached\n"
 +msgstr "certificate already cached\n"
 +
 +#: dirmngr/certcache.c:508
 +msgid "certificate cached\n"
 +msgstr "certificate cached\n"
 +
 +#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
 +#: dirmngr/dirmngr-client.c:389
 +#, c-format
 +msgid "error caching certificate: %s\n"
 +msgstr "error caching certificate: %s\n"
 +
 +#: dirmngr/certcache.c:593
 +#, c-format
 +msgid "invalid SHA1 fingerprint string '%s'\n"
 +msgstr "invalid SHA1 fingerprint string ‘%s’\n"
 +
 +#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
 +#, c-format
 +msgid "error fetching certificate by S/N: %s\n"
 +msgstr "error fetching certificate by S/N: %s\n"
 +
 +#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
 +#, c-format
 +msgid "error fetching certificate by subject: %s\n"
 +msgstr "error fetching certificate by subject: %s\n"
 +
 +#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
 +msgid "no issuer found in certificate\n"
 +msgstr "no issuer found in certificate\n"
 +
 +#: dirmngr/certcache.c:1325
 +#, c-format
 +msgid "error getting authorityKeyIdentifier: %s\n"
 +msgstr "error getting authorityKeyIdentifier: %s\n"
 +
 +#: dirmngr/crlcache.c:213
 +#, c-format
 +msgid "creating directory '%s'\n"
 +msgstr "creating directory ‘%s’\n"
 +
 +#: dirmngr/crlcache.c:217
 +#, c-format
 +msgid "error creating directory '%s': %s\n"
 +msgstr "error creating directory '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:245
 +#, c-format
 +msgid "ignoring database dir '%s'\n"
 +msgstr "ignoring database dir ‘%s’\n"
 +
 +#: dirmngr/crlcache.c:254
 +#, c-format
 +msgid "error reading directory '%s': %s\n"
 +msgstr "error reading directory '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:275
 +#, c-format
 +msgid "removing cache file '%s'\n"
 +msgstr "removing cache file ‘%s’\n"
 +
 +#: dirmngr/crlcache.c:284
 +#, c-format
 +msgid "not removing file '%s'\n"
 +msgstr "not removing file ‘%s’\n"
 +
 +#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
 +#, c-format
 +msgid "error closing cache file: %s\n"
 +msgstr "error closing cache file: %s\n"
 +
 +#: dirmngr/crlcache.c:411 dirmngr/crlcache.c:795
 +#, c-format
 +msgid "failed to open cache dir file '%s': %s\n"
 +msgstr "failed to open cache dir file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:421
 +#, c-format
 +msgid "error creating new cache dir file '%s': %s\n"
 +msgstr "error creating new cache dir file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:428
 +#, c-format
 +msgid "error writing new cache dir file '%s': %s\n"
 +msgstr "error writing new cache dir file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:435
 +#, c-format
 +msgid "error closing new cache dir file '%s': %s\n"
 +msgstr "error closing new cache dir file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:440
 +#, c-format
 +msgid "new cache dir file '%s' created\n"
 +msgstr "new cache dir file ‘%s’ created\n"
 +
 +#: dirmngr/crlcache.c:445
 +#, c-format
 +msgid "failed to re-open cache dir file '%s': %s\n"
 +msgstr "failed to re-open cache dir file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:473
 +#, c-format
 +msgid "first record of '%s' is not the version\n"
 +msgstr "first record of ‘%s’ is not the version\n"
 +
 +#: dirmngr/crlcache.c:488
 +msgid "old version of cache directory - cleaning up\n"
 +msgstr "old version of cache directory - cleaning up\n"
 +
 +#: dirmngr/crlcache.c:504
 +msgid "old version of cache directory - giving up\n"
 +msgstr "old version of cache directory - giving up\n"
 +
 +#: dirmngr/crlcache.c:615
 +#, c-format
 +msgid "extra field detected in crl record of '%s' line %u\n"
 +msgstr "extra field detected in crl record of ‘%s’ line %u\n"
 +
 +#: dirmngr/crlcache.c:623
 +#, c-format
 +msgid "invalid line detected in '%s' line %u\n"
 +msgstr "invalid line detected in ‘%s’ line %u\n"
 +
 +#: dirmngr/crlcache.c:632
 +#, c-format
 +msgid "duplicate entry detected in '%s' line %u\n"
 +msgstr "duplicate entry detected in ‘%s’ line %u\n"
 +
 +#: dirmngr/crlcache.c:647
 +#, c-format
 +msgid "unsupported record type in '%s' line %u skipped\n"
 +msgstr "unsupported record type in ‘%s’ line %u skipped\n"
 +
 +#: dirmngr/crlcache.c:673
 +#, c-format
 +msgid "invalid issuer hash in '%s' line %u\n"
 +msgstr "invalid issuer hash in ‘%s’ line %u\n"
 +
 +#: dirmngr/crlcache.c:679
 +#, c-format
 +msgid "no issuer DN in '%s' line %u\n"
 +msgstr "no issuer DN in ‘%s’ line %u\n"
 +
 +#: dirmngr/crlcache.c:686
 +#, c-format
 +msgid "invalid timestamp in '%s' line %u\n"
 +msgstr "invalid timestamp in ‘%s’ line %u\n"
 +
 +#: dirmngr/crlcache.c:692
 +#, c-format
 +msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 +msgstr "WARNING: invalid cache file hash in ‘%s’ line %u\n"
 +
 +#: dirmngr/crlcache.c:698
 +msgid "detected errors in cache dir file\n"
 +msgstr "detected errors in cache dir file\n"
 +
 +#: dirmngr/crlcache.c:699
 +msgid "please check the reason and manually delete that file\n"
 +msgstr "please check the reason and manually delete that file\n"
 +
 +#: dirmngr/crlcache.c:827 dirmngr/crlcache.c:841
 +#, c-format
 +msgid "failed to create temporary cache dir file '%s': %s\n"
 +msgstr "failed to create temporary cache dir file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:937
 +#, c-format
 +msgid "error closing '%s': %s\n"
 +msgstr "error closing '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:949
 +#, c-format
 +msgid "error renaming '%s' to '%s': %s\n"
 +msgstr "error renaming ‘%s’ to '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:1003
 +#, c-format
 +msgid "can't hash '%s': %s\n"
 +msgstr "can't hash '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:1011
 +#, c-format
 +msgid "error setting up MD5 hash context: %s\n"
 +msgstr "error setting up MD5 hash context: %s\n"
 +
 +#: dirmngr/crlcache.c:1027
 +#, c-format
 +msgid "error hashing '%s': %s\n"
 +msgstr "error hashing '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:1055
 +#, c-format
 +msgid "invalid formatted checksum for '%s'\n"
 +msgstr "invalid formatted checksum for ‘%s’\n"
 +
 +#: dirmngr/crlcache.c:1108
 +msgid "too many open cache files; can't open anymore\n"
 +msgstr "too many open cache files; can't open anymore\n"
 +
 +#: dirmngr/crlcache.c:1126
 +#, c-format
 +msgid "opening cache file '%s'\n"
 +msgstr "opening cache file ‘%s’\n"
 +
 +#: dirmngr/crlcache.c:1145
 +#, c-format
 +msgid "error opening cache file '%s': %s\n"
 +msgstr "error opening cache file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:1154
 +#, c-format
 +msgid "error initializing cache file '%s' for reading: %s\n"
 +msgstr "error initializing cache file ‘%s’ for reading: %s\n"
 +
 +#: dirmngr/crlcache.c:1175
 +msgid "calling unlock_db_file on a closed file\n"
 +msgstr "calling unlock_db_file on a closed file\n"
 +
 +#: dirmngr/crlcache.c:1177
 +msgid "calling unlock_db_file on an unlocked file\n"
 +msgstr "calling unlock_db_file on an unlocked file\n"
 +
 +#: dirmngr/crlcache.c:1231
 +#, c-format
 +msgid "failed to create a new cache object: %s\n"
 +msgstr "failed to create a new cache object: %s\n"
 +
 +#: dirmngr/crlcache.c:1286
 +#, c-format
 +msgid "no CRL available for issuer id %s\n"
 +msgstr "no CRL available for issuer id %s\n"
 +
 +#: dirmngr/crlcache.c:1293
 +#, c-format
 +msgid "cached CRL for issuer id %s too old; update required\n"
 +msgstr "cached CRL for issuer id %s too old; update required\n"
 +
 +#: dirmngr/crlcache.c:1307
 +#, c-format
 +msgid ""
 +"force-crl-refresh active and %d minutes passed for issuer id %s; update "
 +"required\n"
 +msgstr ""
 +"force-crl-refresh active and %d minutes passed for issuer id %s; update "
 +"required\n"
 +
 +#: dirmngr/crlcache.c:1315
 +#, c-format
 +msgid "force-crl-refresh active for issuer id %s; update required\n"
 +msgstr "force-crl-refresh active for issuer id %s; update required\n"
 +
 +#: dirmngr/crlcache.c:1324
 +#, c-format
 +msgid "available CRL for issuer ID %s can't be used\n"
 +msgstr "available CRL for issuer ID %s can't be used\n"
 +
 +#: dirmngr/crlcache.c:1335
 +#, c-format
 +msgid "cached CRL for issuer id %s tampered; we need to update\n"
 +msgstr "cached CRL for issuer id %s tampered; we need to update\n"
 +
 +#: dirmngr/crlcache.c:1347
 +msgid "WARNING: invalid cache record length for S/N "
 +msgstr "WARNING: invalid cache record length for S/N "
 +
 +#: dirmngr/crlcache.c:1357
 +#, c-format
 +msgid "problem reading cache record for S/N %s: %s\n"
 +msgstr "problem reading cache record for S/N %s: %s\n"
 +
 +#: dirmngr/crlcache.c:1360
 +#, c-format
 +msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
 +msgstr "S/N %s is not valid; reason=%02X  date=%.15s\n"
 +
 +#: dirmngr/crlcache.c:1371
 +#, c-format
 +msgid "S/N %s is valid, it is not listed in the CRL\n"
 +msgstr "S/N %s is valid, it is not listed in the CRL\n"
 +
 +#: dirmngr/crlcache.c:1379
 +#, c-format
 +msgid "error getting data from cache file: %s\n"
 +msgstr "error getting data from cache file: %s\n"
 +
 +#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
 +#, c-format
 +msgid "unknown hash algorithm '%s'\n"
 +msgstr "unknown hash algorithm ‘%s’\n"
 +
 +#: dirmngr/crlcache.c:1549
 +#, c-format
 +msgid "gcry_md_open for algorithm %d failed: %s\n"
 +msgstr "gcry_md_open for algorithm %d failed: %s\n"
 +
 +#: dirmngr/crlcache.c:1586 dirmngr/crlcache.c:1605
 +msgid "got an invalid S-expression from libksba\n"
 +msgstr "got an invalid S-expression from libksba\n"
 +
 +#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
 +#, c-format
 +msgid "converting S-expression failed: %s\n"
 +msgstr "converting S-expression failed: %s\n"
 +
 +#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
 +#, c-format
 +msgid "creating S-expression failed: %s\n"
 +msgstr "creating S-expression failed: %s\n"
 +
 +#: dirmngr/crlcache.c:1699
 +#, c-format
 +msgid "ksba_crl_parse failed: %s\n"
 +msgstr "ksba_crl_parse failed: %s\n"
 +
 +#: dirmngr/crlcache.c:1714
 +#, c-format
 +msgid "error getting update times of CRL: %s\n"
 +msgstr "error getting update times of CRL: %s\n"
 +
 +#: dirmngr/crlcache.c:1721
 +#, c-format
 +msgid "update times of this CRL: this=%s next=%s\n"
 +msgstr "update times of this CRL: this=%s next=%s\n"
 +
 +#: dirmngr/crlcache.c:1725
 +msgid "nextUpdate not given; assuming a validity period of one day\n"
 +msgstr "nextUpdate not given; assuming a validity period of one day\n"
 +
 +#: dirmngr/crlcache.c:1745
 +#, c-format
 +msgid "error getting CRL item: %s\n"
 +msgstr "error getting CRL item: %s\n"
 +
 +#: dirmngr/crlcache.c:1760
 +#, c-format
 +msgid "error inserting item into temporary cache file: %s\n"
 +msgstr "error inserting item into temporary cache file: %s\n"
 +
 +#: dirmngr/crlcache.c:1787
 +#, c-format
 +msgid "no CRL issuer found in CRL: %s\n"
 +msgstr "no CRL issuer found in CRL: %s\n"
 +
 +#: dirmngr/crlcache.c:1802
 +msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 +msgstr "locating CRL issuer certificate by authorityKeyIdentifier\n"
 +
 +#: dirmngr/crlcache.c:1847
 +#, c-format
 +msgid "CRL signature verification failed: %s\n"
 +msgstr "CRL signature verification failed: %s\n"
 +
 +#: dirmngr/crlcache.c:1858
 +#, c-format
 +msgid "error checking validity of CRL issuer certificate: %s\n"
 +msgstr "error checking validity of CRL issuer certificate: %s\n"
 +
 +#: dirmngr/crlcache.c:2001
 +#, c-format
 +msgid "ksba_crl_new failed: %s\n"
 +msgstr "ksba_crl_new failed: %s\n"
 +
 +#: dirmngr/crlcache.c:2008
 +#, c-format
 +msgid "ksba_crl_set_reader failed: %s\n"
 +msgstr "ksba_crl_set_reader failed: %s\n"
 +
 +#: dirmngr/crlcache.c:2042
 +#, c-format
 +msgid "removed stale temporary cache file '%s'\n"
 +msgstr "removed stale temporary cache file ‘%s’\n"
 +
 +#: dirmngr/crlcache.c:2046
 +#, c-format
 +msgid "problem removing stale temporary cache file '%s': %s\n"
 +msgstr "problem removing stale temporary cache file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:2056
 +#, c-format
 +msgid "error creating temporary cache file '%s': %s\n"
 +msgstr "error creating temporary cache file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:2066
 +#, c-format
 +msgid "crl_parse_insert failed: %s\n"
 +msgstr "crl_parse_insert failed: %s\n"
 +
 +#: dirmngr/crlcache.c:2076
 +#, c-format
 +msgid "error finishing temporary cache file '%s': %s\n"
 +msgstr "error finishing temporary cache file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:2083
 +#, c-format
 +msgid "error closing temporary cache file '%s': %s\n"
 +msgstr "error closing temporary cache file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:2108
 +#, c-format
 +msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 +msgstr "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 +
 +#: dirmngr/crlcache.c:2112
 +#, c-format
 +msgid "new CRL still too old; it expired on %s\n"
 +msgstr "new CRL still too old; it expired on %s\n"
 +
 +#: dirmngr/crlcache.c:2128
 +#, c-format
 +msgid "unknown critical CRL extension %s\n"
 +msgstr "unknown critical CRL extension %s\n"
 +
 +#: dirmngr/crlcache.c:2138
 +#, c-format
 +msgid "error reading CRL extensions: %s\n"
 +msgstr "error reading CRL extensions: %s\n"
 +
 +#: dirmngr/crlcache.c:2189
 +#, c-format
 +msgid "creating cache file '%s'\n"
 +msgstr "creating cache file ‘%s’\n"
 +
 +#: dirmngr/crlcache.c:2221
 +#, c-format
 +msgid "problem renaming '%s' to '%s': %s\n"
 +msgstr "problem renaming ‘%s’ to '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:2235
 +msgid ""
 +"updating the DIR file failed - cache entry will get lost with the next "
 +"program start\n"
 +msgstr ""
 +"updating the DIR file failed - cache entry will get lost with the next "
 +"program start\n"
 +
 +#: dirmngr/crlcache.c:2272
 +#, c-format
 +msgid "Begin CRL dump (retrieved via %s)\n"
 +msgstr "Begin CRL dump (retrieved via %s)\n"
 +
 +#: dirmngr/crlcache.c:2295
 +msgid ""
 +" ERROR: The CRL will not be used because it was still too old after an "
 +"update!\n"
 +msgstr ""
 +" ERROR: The CRL will not be used because it was still too old after an "
 +"update!\n"
 +
 +#: dirmngr/crlcache.c:2298
 +msgid ""
 +" ERROR: The CRL will not be used due to an unknown critical extension!\n"
 +msgstr ""
 +" ERROR: The CRL will not be used due to an unknown critical extension!\n"
 +
 +#: dirmngr/crlcache.c:2301
 +msgid " ERROR: The CRL will not be used\n"
 +msgstr " ERROR: The CRL will not be used\n"
 +
 +#: dirmngr/crlcache.c:2308
 +msgid " ERROR: This cached CRL may have been tampered with!\n"
 +msgstr " ERROR: This cached CRL may have been tampered with!\n"
 +
 +#: dirmngr/crlcache.c:2326
 +msgid " WARNING: invalid cache record length\n"
 +msgstr " WARNING: invalid cache record length\n"
 +
 +#: dirmngr/crlcache.c:2333
 +#, c-format
 +msgid "problem reading cache record: %s\n"
 +msgstr "problem reading cache record: %s\n"
 +
 +#: dirmngr/crlcache.c:2344
 +#, c-format
 +msgid "problem reading cache key: %s\n"
 +msgstr "problem reading cache key: %s\n"
 +
 +#: dirmngr/crlcache.c:2375
 +#, c-format
 +msgid "error reading cache entry from db: %s\n"
 +msgstr "error reading cache entry from db: %s\n"
 +
 +#: dirmngr/crlcache.c:2378
 +msgid "End CRL dump\n"
 +msgstr "End CRL dump\n"
 +
 +#: dirmngr/crlcache.c:2499
 +#, c-format
 +msgid "crl_fetch via DP failed: %s\n"
 +msgstr "crl_fetch via DP failed: %s\n"
 +
 +#: dirmngr/crlcache.c:2510
 +#, c-format
 +msgid "crl_cache_insert via DP failed: %s\n"
 +msgstr "crl_cache_insert via DP failed: %s\n"
 +
 +#: dirmngr/crlcache.c:2570
 +#, c-format
 +msgid "crl_cache_insert via issuer failed: %s\n"
 +msgstr "crl_cache_insert via issuer failed: %s\n"
 +
 +#: dirmngr/crlfetch.c:74
 +msgid "reader to file mapping table full - waiting\n"
 +msgstr "reader to file mapping table full - waiting\n"
 +
 +#: dirmngr/crlfetch.c:182
 +msgid "using \"http\" instead of \"https\"\n"
 +msgstr "using “http” instead of “https”\n"
 +
 +#: dirmngr/crlfetch.c:193 dirmngr/crlfetch.c:289 dirmngr/crlfetch.c:327
 +#: dirmngr/crlfetch.c:359
 +#, c-format
 +msgid "CRL access not possible due to disabled %s\n"
 +msgstr "CRL access not possible due to disabled %s\n"
 +
 +#: dirmngr/crlfetch.c:223 dirmngr/ldap-wrapper-ce.c:488
- #: dirmngr/ldap-wrapper.c:742 dirmngr/misc.c:563
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:563
 +#, c-format
 +msgid "error initializing reader object: %s\n"
 +msgstr "error initializing reader object: %s\n"
 +
 +#: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
 +#, c-format
 +msgid "URL '%s' redirected to '%s' (%u)\n"
 +msgstr "URL ‘%s’ redirected to ‘%s’ (%u)\n"
 +
 +#: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
 +msgid "too many redirections\n"
 +msgstr "too many redirections\n"
 +
 +#: dirmngr/crlfetch.c:274
 +#, c-format
 +msgid "error retrieving '%s': %s\n"
 +msgstr "error retrieving '%s': %s\n"
 +
 +#: dirmngr/crlfetch.c:279
 +#, c-format
 +msgid "error retrieving '%s': http status %u\n"
 +msgstr "error retrieving '%s': http status %u\n"
 +
 +#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
 +#: dirmngr/crlfetch.c:381
 +msgid "CRL access not possible due to Tor mode\n"
 +msgstr "CRL access not possible due to Tor mode\n"
 +
 +#: dirmngr/crlfetch.c:386
 +#, c-format
 +msgid "certificate search not possible due to disabled %s\n"
 +msgstr "certificate search not possible due to disabled %s\n"
 +
 +#: dirmngr/dirmngr-client.c:71
 +msgid "use OCSP instead of CRLs"
 +msgstr "use OCSP instead of CRLs"
 +
 +#: dirmngr/dirmngr-client.c:72
 +msgid "check whether a dirmngr is running"
 +msgstr "check whether a dirmngr is running"
 +
 +#: dirmngr/dirmngr-client.c:73
 +msgid "add a certificate to the cache"
 +msgstr "add a certificate to the cache"
 +
 +#: dirmngr/dirmngr-client.c:74
 +msgid "validate a certificate"
 +msgstr "validate a certificate"
 +
 +#: dirmngr/dirmngr-client.c:75
 +msgid "lookup a certificate"
 +msgstr "lookup a certificate"
 +
 +#: dirmngr/dirmngr-client.c:76
 +msgid "lookup only locally stored certificates"
 +msgstr "lookup only locally stored certificates"
 +
 +#: dirmngr/dirmngr-client.c:77
 +msgid "expect an URL for --lookup"
 +msgstr "expect an URL for --lookup"
 +
 +#: dirmngr/dirmngr-client.c:78
 +msgid "load a CRL into the dirmngr"
 +msgstr "load a CRL into the dirmngr"
 +
 +#: dirmngr/dirmngr-client.c:79
 +msgid "special mode for use by Squid"
 +msgstr "special mode for use by Squid"
 +
 +#: dirmngr/dirmngr-client.c:80
 +msgid "expect certificates in PEM format"
 +msgstr "expect certificates in PEM format"
 +
 +#: dirmngr/dirmngr-client.c:82
 +msgid "force the use of the default OCSP responder"
 +msgstr "force the use of the default OCSP responder"
 +
 +#: dirmngr/dirmngr-client.c:169
 +msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 +msgstr "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 +
 +#: dirmngr/dirmngr-client.c:173
 +msgid ""
 +"Syntax: dirmngr-client [options] [certfile|pattern]\n"
 +"Test an X.509 certificate against a CRL or do an OCSP check\n"
 +"The process returns 0 if the certificate is valid, 1 if it is\n"
 +"not valid and other error codes for general failures\n"
 +msgstr ""
 +"Syntax: dirmngr-client [options] [certfile|pattern]\n"
 +"Test an X.509 certificate against a CRL or do an OCSP check\n"
 +"The process returns 0 if the certificate is valid, 1 if it is\n"
 +"not valid and other error codes for general failures\n"
 +
 +#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
 +#, c-format
 +msgid "error reading certificate from stdin: %s\n"
 +msgstr "error reading certificate from stdin: %s\n"
 +
 +#: dirmngr/dirmngr-client.c:281
 +#, c-format
 +msgid "error reading certificate from '%s': %s\n"
 +msgstr "error reading certificate from '%s': %s\n"
 +
 +#: dirmngr/dirmngr-client.c:295
 +msgid "certificate too large to make any sense\n"
 +msgstr "certificate too large to make any sense\n"
 +
 +#: dirmngr/dirmngr-client.c:310
 +#, c-format
 +msgid "can't connect to the dirmngr: %s\n"
 +msgstr "can't connect to the dirmngr: %s\n"
 +
 +#: dirmngr/dirmngr-client.c:332
 +#, c-format
 +msgid "lookup failed: %s\n"
 +msgstr "lookup failed: %s\n"
 +
 +#: dirmngr/dirmngr-client.c:347
 +#, c-format
 +msgid "loading CRL '%s' failed: %s\n"
 +msgstr "loading CRL ‘%s’ failed: %s\n"
 +
 +#: dirmngr/dirmngr-client.c:375
 +msgid "a dirmngr daemon is up and running\n"
 +msgstr "a dirmngr daemon is up and running\n"
 +
 +#: dirmngr/dirmngr-client.c:397
 +#, c-format
 +msgid "validation of certificate failed: %s\n"
 +msgstr "validation of certificate failed: %s\n"
 +
 +#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
 +msgid "certificate is valid\n"
 +msgstr "certificate is valid\n"
 +
 +#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
 +msgid "certificate has been revoked\n"
 +msgstr "certificate has been revoked\n"
 +
 +#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
 +#, c-format
 +msgid "certificate check failed: %s\n"
 +msgstr "certificate check failed: %s\n"
 +
 +#: dirmngr/dirmngr-client.c:428
 +#, c-format
 +msgid "got status: '%s'\n"
 +msgstr "got status: ‘%s’\n"
 +
 +#: dirmngr/dirmngr-client.c:443
 +#, c-format
 +msgid "error writing base64 encoding: %s\n"
 +msgstr "error writing base64 encoding: %s\n"
 +
 +#: dirmngr/dirmngr-client.c:701
 +#, c-format
 +msgid "unsupported inquiry '%s'\n"
 +msgstr "unsupported inquiry ‘%s’\n"
 +
 +#: dirmngr/dirmngr-client.c:803
 +msgid "absolute file name expected\n"
 +msgstr "absolute file name expected\n"
 +
 +#: dirmngr/dirmngr-client.c:848
 +#, c-format
 +msgid "looking up '%s'\n"
 +msgstr "looking up ‘%s’\n"
 +
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:160
 +msgid "list the contents of the CRL cache"
 +msgstr "list the contents of the CRL cache"
 +
- #: dirmngr/dirmngr.c:158
++#: dirmngr/dirmngr.c:161
 +msgid "|FILE|load CRL from FILE into cache"
 +msgstr "|FILE|load CRL from FILE into cache"
 +
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:162
 +msgid "|URL|fetch a CRL from URL"
 +msgstr "|URL|fetch a CRL from URL"
 +
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:163
 +msgid "shutdown the dirmngr"
 +msgstr "shutdown the dirmngr"
 +
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:164
 +msgid "flush the cache"
 +msgstr "flush the cache"
 +
- #: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
- #: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
++#: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
 +msgid "|FILE|write server mode logs to FILE"
 +msgstr "|FILE|write server mode logs to FILE"
 +
- #: dirmngr/dirmngr.c:177
++#: dirmngr/dirmngr.c:180
 +msgid "run without asking a user"
 +msgstr "run without asking a user"
 +
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:181
 +msgid "force loading of outdated CRLs"
 +msgstr "force loading of outdated CRLs"
 +
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:182
 +msgid "allow sending OCSP requests"
 +msgstr "allow sending OCSP requests"
 +
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:184
 +msgid "allow online software version check"
 +msgstr "allow online software version check"
 +
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:185
 +msgid "inhibit the use of HTTP"
 +msgstr "inhibit the use of HTTP"
 +
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:186
 +msgid "inhibit the use of LDAP"
 +msgstr "inhibit the use of LDAP"
 +
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:188
 +msgid "ignore HTTP CRL distribution points"
 +msgstr "ignore HTTP CRL distribution points"
 +
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
 +msgid "ignore LDAP CRL distribution points"
 +msgstr "ignore LDAP CRL distribution points"
 +
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:192
 +msgid "ignore certificate contained OCSP service URLs"
 +msgstr "ignore certificate contained OCSP service URLs"
 +
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
 +msgid "|URL|redirect all HTTP requests to URL"
 +msgstr "|URL|redirect all HTTP requests to URL"
 +
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
 +msgid "|HOST|use HOST for LDAP queries"
 +msgstr "|HOST|use HOST for LDAP queries"
 +
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
 +msgid "do not use fallback hosts with --ldap-proxy"
 +msgstr "do not use fallback hosts with --ldap-proxy"
 +
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:202
 +msgid "|FILE|read LDAP server list from FILE"
 +msgstr "|FILE|read LDAP server list from FILE"
 +
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
 +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:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
 +msgid "|N|set LDAP timeout to N seconds"
 +msgstr "|N|set LDAP timeout to N seconds"
 +
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:210
 +msgid "|URL|use OCSP responder at URL"
 +msgstr "|URL|use OCSP responder at URL"
 +
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:212
 +msgid "|FPR|OCSP response signed by FPR"
 +msgstr "|FPR|OCSP response signed by FPR"
 +
- #: dirmngr/dirmngr.c:215
++#: 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:220
++#: dirmngr/dirmngr.c:223
 +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:222
++#: dirmngr/dirmngr.c:225
 +msgid "route all network traffic via Tor"
 +msgstr "route all network traffic via Tor"
 +
- #: dirmngr/dirmngr.c:240
++#: dirmngr/dirmngr.c:246
 +msgid ""
 +"@\n"
 +"(See the \"info\" manual for a complete listing of all commands and "
 +"options)\n"
 +msgstr ""
 +"@\n"
 +"(See the “info” manual for a complete listing of all commands and options)\n"
 +
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:361
 +msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 +msgstr "Usage: @DIRMNGR@ [options] (-h for help)"
 +
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:363
 +msgid ""
 +"Syntax: @DIRMNGR@ [options] [command [args]]\n"
 +"Keyserver, CRL, and OCSP access for @GNUPG@\n"
 +msgstr ""
 +"Syntax: @DIRMNGR@ [options] [command [args]]\n"
 +"Keyserver, CRL, and OCSP access for @GNUPG@\n"
 +
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:443
 +#, c-format
 +msgid "valid debug levels are: %s\n"
 +msgstr "valid debug levels are: %s\n"
 +
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
- #: tools/gpgconf.c:648
++#: dirmngr/dirmngr.c:496 tools/gpgconf.c:550 tools/gpgconf.c:585
++#: tools/gpgconf.c:656
 +#, c-format
 +msgid "usage: %s [options] "
 +msgstr "usage: %s [options] "
 +
- #: dirmngr/dirmngr.c:1062
++#: dirmngr/dirmngr.c:1074
 +msgid "colons are not allowed in the socket name\n"
 +msgstr "colons are not allowed in the socket name\n"
 +
- #: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
++#: dirmngr/dirmngr.c:1300 dirmngr/server.c:1585
 +#, c-format
 +msgid "fetching CRL from '%s' failed: %s\n"
 +msgstr "fetching CRL from ‘%s’ failed: %s\n"
 +
- #: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
++#: dirmngr/dirmngr.c:1306 dirmngr/server.c:1591
 +#, c-format
 +msgid "processing CRL from '%s' failed: %s\n"
 +msgstr "processing CRL from ‘%s’ failed: %s\n"
 +
- #: dirmngr/dirmngr.c:1484
++#: dirmngr/dirmngr.c:1487
 +#, c-format
 +msgid "%s:%u: line too long - skipped\n"
 +msgstr "%s:%u: line too long - skipped\n"
 +
- #: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
++#: dirmngr/dirmngr.c:1542 dirmngr/dirmngr.c:1626
 +#, c-format
 +msgid "%s:%u: invalid fingerprint detected\n"
 +msgstr "%s:%u: invalid fingerprint detected\n"
 +
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
++#: dirmngr/dirmngr.c:1578 dirmngr/dirmngr.c:1604 tools/gpgconf-comp.c:4032
 +#, c-format
 +msgid "%s:%u: read error: %s\n"
 +msgstr "%s:%u: read error: %s\n"
 +
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1633
 +#, 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:1697
++#: dirmngr/dirmngr.c:1700
 +msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 +msgstr "SIGHUP received - re-reading configuration and flushing caches\n"
 +
- #: dirmngr/dirmngr.c:1734
++#: dirmngr/dirmngr.c:1738
 +msgid "SIGUSR2 received - no action defined\n"
 +msgstr "SIGUSR2 received - no action defined\n"
 +
- #: dirmngr/dirmngr.c:1739
++#: dirmngr/dirmngr.c:1743
 +msgid "SIGTERM received - shutting down ...\n"
 +msgstr "SIGTERM received - shutting down ...\n"
 +
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1745
 +#, c-format
 +msgid "SIGTERM received - still %d active connections\n"
 +msgstr "SIGTERM received - still %d active connections\n"
 +
- #: dirmngr/dirmngr.c:1746
++#: dirmngr/dirmngr.c:1750
 +msgid "shutdown forced\n"
 +msgstr "shutdown forced\n"
 +
- #: dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1758
 +msgid "SIGINT received - immediate shutdown\n"
 +msgstr "SIGINT received - immediate shutdown\n"
 +
- #: dirmngr/dirmngr.c:1761
++#: dirmngr/dirmngr.c:1765
 +#, c-format
 +msgid "signal %d received - no action defined\n"
 +msgstr "signal %d received - no action defined\n"
 +
 +#: dirmngr/dirmngr_ldap.c:138
 +msgid "return all values in a record oriented format"
 +msgstr "return all values in a record oriented format"
 +
 +#: dirmngr/dirmngr_ldap.c:141
 +msgid "|NAME|ignore host part and connect through NAME"
 +msgstr "|NAME|ignore host part and connect through NAME"
 +
 +#: dirmngr/dirmngr_ldap.c:142
 +msgid "|NAME|connect to host NAME"
 +msgstr "|NAME|connect to host NAME"
 +
 +#: dirmngr/dirmngr_ldap.c:143
 +msgid "|N|connect to port N"
 +msgstr "|N|connect to port N"
 +
 +#: dirmngr/dirmngr_ldap.c:144
 +msgid "|NAME|use user NAME for authentication"
 +msgstr "|NAME|use user NAME for authentication"
 +
 +#: dirmngr/dirmngr_ldap.c:145
 +msgid "|PASS|use password PASS for authentication"
 +msgstr "|PASS|use password PASS for authentication"
 +
 +#: dirmngr/dirmngr_ldap.c:147
 +msgid "take password from $DIRMNGR_LDAP_PASS"
 +msgstr "take password from $DIRMNGR_LDAP_PASS"
 +
 +#: dirmngr/dirmngr_ldap.c:148
 +msgid "|STRING|query DN STRING"
 +msgstr "|STRING|query DN STRING"
 +
 +#: dirmngr/dirmngr_ldap.c:149
 +msgid "|STRING|use STRING as filter expression"
 +msgstr "|STRING|use STRING as filter expression"
 +
 +#: dirmngr/dirmngr_ldap.c:150
 +msgid "|STRING|return the attribute STRING"
 +msgstr "|STRING|return the attribute STRING"
 +
 +#: dirmngr/dirmngr_ldap.c:209
 +msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 +msgstr "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 +
 +#: dirmngr/dirmngr_ldap.c:212
 +msgid ""
 +"Syntax: dirmngr_ldap [options] [URL]\n"
 +"Internal LDAP helper for Dirmngr\n"
 +"Interface and options may change without notice\n"
 +msgstr ""
 +"Syntax: dirmngr_ldap [options] [URL]\n"
 +"Internal LDAP helper for Dirmngr\n"
 +"Interface and options may change without notice\n"
 +
 +#: dirmngr/dirmngr_ldap.c:337
 +#, c-format
 +msgid "invalid port number %d\n"
 +msgstr "invalid port number %d\n"
 +
 +#: dirmngr/dirmngr_ldap.c:413
 +#, c-format
 +msgid "scanning result for attribute '%s'\n"
 +msgstr "scanning result for attribute ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:420 dirmngr/dirmngr_ldap.c:503
 +#: dirmngr/dirmngr_ldap.c:527 dirmngr/dirmngr_ldap.c:539
 +#: dirmngr/dirmngr_ldap.c:677
 +#, c-format
 +msgid "error writing to stdout: %s\n"
 +msgstr "error writing to stdout: %s\n"
 +
 +#: dirmngr/dirmngr_ldap.c:437
 +#, c-format
 +msgid "          available attribute '%s'\n"
 +msgstr "          available attribute ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:475
 +#, c-format
 +msgid "attribute '%s' not found\n"
 +msgstr "attribute ‘%s’ not found\n"
 +
 +#: dirmngr/dirmngr_ldap.c:482
 +#, c-format
 +msgid "found attribute '%s'\n"
 +msgstr "found attribute ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:591
 +#, c-format
 +msgid "processing url '%s'\n"
 +msgstr "processing url ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:593
 +#, c-format
 +msgid "          user '%s'\n"
 +msgstr "          user ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:595
 +#, c-format
 +msgid "          pass '%s'\n"
 +msgstr "          pass ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:597
 +#, c-format
 +msgid "          host '%s'\n"
 +msgstr "          host ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:598
 +#, c-format
 +msgid "          port %d\n"
 +msgstr "          port %d\n"
 +
 +#: dirmngr/dirmngr_ldap.c:600
 +#, c-format
 +msgid "            DN '%s'\n"
 +msgstr "            DN ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:602
 +#, c-format
 +msgid "        filter '%s'\n"
 +msgstr "        filter ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:607 dirmngr/dirmngr_ldap.c:610
 +#, c-format
 +msgid "          attr '%s'\n"
 +msgstr "          attr ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:616
 +#, c-format
 +msgid "no host name in '%s'\n"
 +msgstr "no host name in ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:621
 +#, c-format
 +msgid "no attribute given for query '%s'\n"
 +msgstr "no attribute given for query ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:627
 +msgid "WARNING: using first attribute only\n"
 +msgstr "WARNING: using first attribute only\n"
 +
 +#: dirmngr/dirmngr_ldap.c:636
 +#, c-format
 +msgid "LDAP init to '%s:%d' failed: %s\n"
 +msgstr "LDAP init to ‘%s:%d’ failed: %s\n"
 +
 +#: dirmngr/dirmngr_ldap.c:659
 +#, c-format
 +msgid "binding to '%s:%d' failed: %s\n"
 +msgstr "binding to ‘%s:%d’ failed: %s\n"
 +
 +#: dirmngr/dirmngr_ldap.c:686
 +#, c-format
 +msgid "searching '%s' failed: %s\n"
 +msgstr "searching ‘%s’ failed: %s\n"
 +
 +#: dirmngr/dirmngr_ldap.c:718
 +#, c-format
 +msgid "'%s' is not an LDAP URL\n"
 +msgstr "‘%s’ is not an LDAP URL\n"
 +
 +#: dirmngr/dirmngr_ldap.c:724
 +#, c-format
 +msgid "'%s' is an invalid LDAP URL\n"
 +msgstr "‘%s’ is an invalid LDAP URL\n"
 +
 +#: dirmngr/ldap-wrapper.c:207
 +#, c-format
 +msgid "error printing log line: %s\n"
 +msgstr "error printing log line: %s\n"
 +
 +#: dirmngr/ldap-wrapper.c:236
 +#, c-format
 +msgid "error reading log from ldap wrapper %d: %s\n"
 +msgstr "error reading log from ldap wrapper %d: %s\n"
 +
 +#: dirmngr/ldap-wrapper.c:304
 +#, c-format
 +msgid "npth_select failed: %s - waiting 1s\n"
 +msgstr "npth_select failed: %s - waiting 1s\n"
 +
 +#: dirmngr/ldap-wrapper.c:343
 +#, c-format
 +msgid "ldap wrapper %d ready"
 +msgstr "ldap wrapper %d ready"
 +
 +#: dirmngr/ldap-wrapper.c:352
 +#, c-format
 +msgid "ldap wrapper %d ready: timeout\n"
 +msgstr "ldap wrapper %d ready: timeout\n"
 +
 +#: dirmngr/ldap-wrapper.c:355
 +#, c-format
 +msgid "ldap wrapper %d ready: exitcode=%d\n"
 +msgstr "ldap wrapper %d ready: exitcode=%d\n"
 +
 +#: dirmngr/ldap-wrapper.c:364
 +#, c-format
 +msgid "waiting for ldap wrapper %d failed: %s\n"
 +msgstr "waiting for ldap wrapper %d failed: %s\n"
 +
 +#: dirmngr/ldap-wrapper.c:376
 +#, c-format
 +msgid "ldap wrapper %d stalled - killing\n"
 +msgstr "ldap wrapper %d stalled - killing\n"
 +
 +#: dirmngr/ldap-wrapper.c:444
 +#, c-format
 +msgid "error spawning ldap wrapper reaper thread: %s\n"
 +msgstr "error spawning ldap wrapper reaper thread: %s\n"
 +
 +#: dirmngr/ldap-wrapper.c:496 dirmngr/ldap-wrapper.c:517
 +#, c-format
 +msgid "reading from ldap wrapper %d failed: %s\n"
 +msgstr "reading from ldap wrapper %d failed: %s\n"
 +
 +#: dirmngr/ldap.c:91
 +#, c-format
 +msgid "invalid char 0x%02x in host name - not added\n"
 +msgstr "invalid char 0x%02x in host name - not added\n"
 +
 +#: dirmngr/ldap.c:95
 +#, c-format
 +msgid "adding '%s:%d' to the ldap server list\n"
 +msgstr "adding ‘%s:%d’ to the ldap server list\n"
 +
 +#: dirmngr/ldap.c:98 dirmngr/misc.c:502
 +#, c-format
 +msgid "malloc failed: %s\n"
 +msgstr "malloc failed: %s\n"
 +
 +#: dirmngr/ldap.c:627
 +#, c-format
 +msgid "start_cert_fetch: invalid pattern '%s'\n"
 +msgstr "start_cert_fetch: invalid pattern ‘%s’\n"
 +
 +#: dirmngr/ldap.c:840
 +msgid "ldap_search hit the size limit of the server\n"
 +msgstr "ldap_search hit the size limit of the server\n"
 +
 +#: dirmngr/misc.c:170
 +msgid "invalid canonical S-expression found\n"
 +msgstr "invalid canonical S-expression found\n"
 +
 +#: dirmngr/misc.c:194 dirmngr/misc.c:228
 +#, c-format
 +msgid "gcry_md_open failed: %s\n"
 +msgstr "gcry_md_open failed: %s\n"
 +
 +#: dirmngr/misc.c:199 dirmngr/misc.c:233
 +#, c-format
 +msgid "oops: ksba_cert_hash failed: %s\n"
 +msgstr "oops: ksba_cert_hash failed: %s\n"
 +
 +#: dirmngr/misc.c:518
 +msgid "bad URL encoding detected\n"
 +msgstr "bad URL encoding detected\n"
 +
 +#: dirmngr/ocsp.c:80
 +#, c-format
 +msgid "error reading from responder: %s\n"
 +msgstr "error reading from responder: %s\n"
 +
 +#: dirmngr/ocsp.c:98
 +#, c-format
 +msgid "response from server too large; limit is %d bytes\n"
 +msgstr "response from server too large; limit is %d bytes\n"
 +
 +#: dirmngr/ocsp.c:139
 +msgid "OCSP request not possible due to Tor mode\n"
 +msgstr "OCSP request not possible due to Tor mode\n"
 +
 +#: dirmngr/ocsp.c:145
 +msgid "OCSP request not possible due to disabled HTTP\n"
 +msgstr "OCSP request not possible due to disabled HTTP\n"
 +
 +#: dirmngr/ocsp.c:152
 +#, c-format
 +msgid "error setting OCSP target: %s\n"
 +msgstr "error setting OCSP target: %s\n"
 +
 +#: dirmngr/ocsp.c:170
 +#, c-format
 +msgid "error building OCSP request: %s\n"
 +msgstr "error building OCSP request: %s\n"
 +
 +#: dirmngr/ocsp.c:181
 +#, c-format
 +msgid "error connecting to '%s': %s\n"
 +msgstr "error connecting to '%s': %s\n"
 +
 +#: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
 +#, c-format
 +msgid "error reading HTTP response for '%s': %s\n"
 +msgstr "error reading HTTP response for '%s': %s\n"
 +
 +#: dirmngr/ocsp.c:240
 +#, c-format
 +msgid "error accessing '%s': http status %u\n"
 +msgstr "error accessing '%s': http status %u\n"
 +
 +#: dirmngr/ocsp.c:265
 +#, c-format
 +msgid "error parsing OCSP response for '%s': %s\n"
 +msgstr "error parsing OCSP response for '%s': %s\n"
 +
 +#: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
 +#, c-format
 +msgid "OCSP responder at '%s' status: %s\n"
 +msgstr "OCSP responder at ‘%s’ status: %s\n"
 +
 +#: dirmngr/ocsp.c:293
 +#, c-format
 +msgid "hashing the OCSP response for '%s' failed: %s\n"
 +msgstr "hashing the OCSP response for ‘%s’ failed: %s\n"
 +
 +#: dirmngr/ocsp.c:328
 +msgid "not signed by a default OCSP signer's certificate"
 +msgstr "not signed by a default OCSP signer's certificate"
 +
 +#: dirmngr/ocsp.c:413
 +msgid "only SHA-1 is supported for OCSP responses\n"
 +msgstr "only SHA-1 is supported for OCSP responses\n"
 +
 +#: dirmngr/ocsp.c:464
 +#, c-format
 +msgid "allocating list item failed: %s\n"
 +msgstr "allocating list item failed: %s\n"
 +
 +#: dirmngr/ocsp.c:479
 +#, c-format
 +msgid "error getting responder ID: %s\n"
 +msgstr "error getting responder ID: %s\n"
 +
 +#: dirmngr/ocsp.c:514
 +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:553 dirmngr/validate.c:619
 +#, c-format
 +msgid "issuer certificate not found: %s\n"
 +msgstr "issuer certificate not found: %s\n"
 +
 +#: dirmngr/ocsp.c:563
 +msgid "caller did not return the target certificate\n"
 +msgstr "caller did not return the target certificate\n"
 +
 +#: dirmngr/ocsp.c:570
 +msgid "caller did not return the issuing certificate\n"
 +msgstr "caller did not return the issuing certificate\n"
 +
 +#: dirmngr/ocsp.c:580
 +#, c-format
 +msgid "failed to allocate OCSP context: %s\n"
 +msgstr "failed to allocate OCSP context: %s\n"
 +
 +#: dirmngr/ocsp.c:614
 +#, c-format
 +msgid "can't get authorityInfoAccess: %s\n"
 +msgstr "can't get authorityInfoAccess: %s\n"
 +
 +#: dirmngr/ocsp.c:621
 +msgid "no default OCSP responder defined\n"
 +msgstr "no default OCSP responder defined\n"
 +
 +#: dirmngr/ocsp.c:627
 +msgid "no default OCSP signer defined\n"
 +msgstr "no default OCSP signer defined\n"
 +
 +#: dirmngr/ocsp.c:634
 +#, c-format
 +msgid "using default OCSP responder '%s'\n"
 +msgstr "using default OCSP responder ‘%s’\n"
 +
 +#: dirmngr/ocsp.c:639
 +#, c-format
 +msgid "using OCSP responder '%s'\n"
 +msgstr "using OCSP responder ‘%s’\n"
 +
 +#: dirmngr/ocsp.c:646
 +#, c-format
 +msgid "failed to establish a hashing context for OCSP: %s\n"
 +msgstr "failed to establish a hashing context for OCSP: %s\n"
 +
 +#: dirmngr/ocsp.c:676
 +#, 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:701
 +#, 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:702
 +msgid "good"
 +msgstr "good"
 +
 +#: dirmngr/ocsp.c:708
 +#, 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:743
 +msgid "OCSP responder returned a status in the future\n"
 +msgstr "OCSP responder returned a status in the future\n"
 +
 +#: dirmngr/ocsp.c:755
 +msgid "OCSP responder returned a non-current status\n"
 +msgstr "OCSP responder returned a non-current status\n"
 +
 +#: dirmngr/ocsp.c:770
 +msgid "OCSP responder returned an too old status\n"
 +msgstr "OCSP responder returned an too old status\n"
 +
 +#: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
 +#, c-format
 +msgid "assuan_inquire(%s) failed: %s\n"
 +msgstr "assuan_inquire(%s) failed: %s\n"
 +
 +#: dirmngr/server.c:938
 +msgid "ldapserver missing"
 +msgstr "ldapserver missing"
 +
 +#: dirmngr/server.c:1012
 +msgid "serialno missing in cert ID"
 +msgstr "serialno missing in cert ID"
 +
 +#: dirmngr/server.c:1148 dirmngr/server.c:1234 dirmngr/server.c:1670
 +#: dirmngr/server.c:1721 dirmngr/server.c:2213 dirmngr/server.c:2229
 +#, c-format
 +msgid "assuan_inquire failed: %s\n"
 +msgstr "assuan_inquire failed: %s\n"
 +
 +#: dirmngr/server.c:1277
 +#, c-format
 +msgid "fetch_cert_by_url failed: %s\n"
 +msgstr "fetch_cert_by_url failed: %s\n"
 +
 +#: dirmngr/server.c:1289 dirmngr/server.c:1320 dirmngr/server.c:1479
 +#, c-format
 +msgid "error sending data: %s\n"
 +msgstr "error sending data: %s\n"
 +
 +#: dirmngr/server.c:1427
 +#, c-format
 +msgid "start_cert_fetch failed: %s\n"
 +msgstr "start_cert_fetch failed: %s\n"
 +
 +#: dirmngr/server.c:1460
 +#, c-format
 +msgid "fetch_next_cert failed: %s\n"
 +msgstr "fetch_next_cert failed: %s\n"
 +
 +#: dirmngr/server.c:1487
 +#, c-format
 +msgid "max_replies %d exceeded\n"
 +msgstr "max_replies %d exceeded\n"
 +
- #: dirmngr/server.c:2463
++#: dirmngr/server.c:2469
 +#, c-format
 +msgid "can't allocate control structure: %s\n"
 +msgstr "can't allocate control structure: %s\n"
 +
- #: dirmngr/server.c:2474
++#: dirmngr/server.c:2480
 +#, c-format
 +msgid "failed to allocate assuan context: %s\n"
 +msgstr "failed to allocate assuan context: %s\n"
 +
- #: dirmngr/server.c:2495
++#: dirmngr/server.c:2501
 +#, c-format
 +msgid "failed to initialize the server: %s\n"
 +msgstr "failed to initialize the server: %s\n"
 +
- #: dirmngr/server.c:2503
++#: dirmngr/server.c:2509
 +#, 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:2534
++#: dirmngr/server.c:2540
 +#, c-format
 +msgid "Assuan accept problem: %s\n"
 +msgstr "Assuan accept problem: %s\n"
 +
- #: dirmngr/server.c:2553
++#: dirmngr/server.c:2559
 +#, c-format
 +msgid "Assuan processing failed: %s\n"
 +msgstr "Assuan processing failed: %s\n"
 +
 +#: dirmngr/validate.c:201
 +msgid "accepting root CA not marked as a CA"
 +msgstr "accepting root CA not marked as a CA"
 +
 +#: dirmngr/validate.c:227
 +msgid "CRL checking too deeply nested\n"
 +msgstr "CRL checking too deeply nested\n"
 +
 +#: dirmngr/validate.c:245
 +msgid "not checking CRL for"
 +msgstr "not checking CRL for"
 +
 +#: dirmngr/validate.c:250
 +msgid "checking CRL for"
 +msgstr "checking CRL for"
 +
 +#: dirmngr/validate.c:528
 +msgid "selfsigned certificate has a BAD signature"
 +msgstr "selfsigned certificate has a BAD signature"
 +
 +#: dirmngr/validate.c:561
 +#, c-format
 +msgid "checking trustworthiness of root certificate failed: %s\n"
 +msgstr "checking trustworthiness of root certificate failed: %s\n"
 +
 +#: dirmngr/validate.c:738
 +msgid "certificate chain is good\n"
 +msgstr "certificate chain is good\n"
 +
 +#: dirmngr/validate.c:968
 +msgid "DSA requires the use of a 160 bit hash algorithm\n"
 +msgstr "DSA requires the use of a 160 bit hash algorithm\n"
 +
 +#: dirmngr/validate.c:1116
 +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:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:167
 +msgid "quiet"
 +msgstr "quiet"
 +
 +#: tools/gpg-connect-agent.c:79
 +msgid "print data out hex encoded"
 +msgstr "print data out hex encoded"
 +
 +#: tools/gpg-connect-agent.c:80
 +msgid "decode received data lines"
 +msgstr "decode received data lines"
 +
 +#: tools/gpg-connect-agent.c:81
 +msgid "connect to the dirmngr"
 +msgstr "connect to the dirmngr"
 +
 +#: tools/gpg-connect-agent.c:84
 +msgid "|NAME|connect to Assuan socket NAME"
 +msgstr "|NAME|connect to Assuan socket NAME"
 +
 +#: tools/gpg-connect-agent.c:86
 +msgid "|ADDR|connect to Assuan server at ADDR"
 +msgstr "|ADDR|connect to Assuan server at ADDR"
 +
 +#: tools/gpg-connect-agent.c:88
 +msgid "run the Assuan server given on the command line"
 +msgstr "run the Assuan server given on the command line"
 +
 +#: tools/gpg-connect-agent.c:90
 +msgid "do not use extended connect mode"
 +msgstr "do not use extended connect mode"
 +
 +#: tools/gpg-connect-agent.c:92
 +msgid "|FILE|run commands from FILE on startup"
 +msgstr "|FILE|run commands from FILE on startup"
 +
 +#: tools/gpg-connect-agent.c:93
 +msgid "run /subst on startup"
 +msgstr "run /subst on startup"
 +
 +#: tools/gpg-connect-agent.c:205
 +msgid "Usage: @GPG at -connect-agent [options] (-h for help)"
 +msgstr "Usage: @GPG at -connect-agent [options] (-h for help)"
 +
 +#: tools/gpg-connect-agent.c:208
 +msgid ""
 +"Syntax: @GPG at -connect-agent [options]\n"
 +"Connect to a running agent and send commands\n"
 +msgstr ""
 +"Syntax: @GPG at -connect-agent [options]\n"
 +"Connect to a running agent and send commands\n"
 +
 +#: tools/gpg-connect-agent.c:1247
 +#, c-format
 +msgid "option \"%s\" requires a program and optional arguments\n"
 +msgstr "option “%s” requires a program and optional arguments\n"
 +
 +#: tools/gpg-connect-agent.c:1258 tools/gpg-connect-agent.c:1264
 +#: tools/gpg-connect-agent.c:1270
 +#, c-format
 +msgid "option \"%s\" ignored due to \"%s\"\n"
 +msgstr "option “%s” ignored due to “%s”\n"
 +
 +#: tools/gpg-connect-agent.c:1368 tools/gpg-connect-agent.c:1863
 +#, c-format
 +msgid "receiving line failed: %s\n"
 +msgstr "receiving line failed: %s\n"
 +
 +#: tools/gpg-connect-agent.c:1458
 +msgid "line too long - skipped\n"
 +msgstr "line too long - skipped\n"
 +
 +#: tools/gpg-connect-agent.c:1462
 +msgid "line shortened due to embedded Nul character\n"
 +msgstr "line shortened due to embedded Nul character\n"
 +
 +#: tools/gpg-connect-agent.c:1837
 +#, c-format
 +msgid "unknown command '%s'\n"
 +msgstr "unknown command ‘%s’\n"
 +
 +#: tools/gpg-connect-agent.c:1855
 +#, c-format
 +msgid "sending line failed: %s\n"
 +msgstr "sending line failed: %s\n"
 +
 +#: tools/gpg-connect-agent.c:2251
 +#, c-format
 +msgid "error sending standard options: %s\n"
 +msgstr "error sending standard options: %s\n"
 +
 +#: tools/gpgconf-comp.c:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
- #: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
++#: tools/gpgconf-comp.c:766 tools/gpgconf-comp.c:865
 +msgid "Options controlling the diagnostic output"
 +msgstr "Options controlling the diagnostic output"
 +
 +#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
- #: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
++#: tools/gpgconf-comp.c:779 tools/gpgconf-comp.c:888
 +msgid "Options controlling the configuration"
 +msgstr "Options controlling the configuration"
 +
- #: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
- #: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
++#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:723
++#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:901
 +msgid "Options useful for debugging"
 +msgstr "Options useful for debugging"
 +
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
 +msgid "Options controlling the security"
 +msgstr "Options controlling the security"
 +
 +#: tools/gpgconf-comp.c:528
 +msgid "|N|expire SSH keys after N seconds"
 +msgstr "|N|expire SSH keys after N seconds"
 +
 +#: tools/gpgconf-comp.c:532
 +msgid "|N|set maximum PIN cache lifetime to N seconds"
 +msgstr "|N|set maximum PIN cache lifetime to N seconds"
 +
 +#: tools/gpgconf-comp.c:536
 +msgid "|N|set maximum SSH key lifetime to N seconds"
 +msgstr "|N|set maximum SSH key lifetime to N seconds"
 +
 +#: tools/gpgconf-comp.c:560
 +msgid "Options enforcing a passphrase policy"
 +msgstr "Options enforcing a passphrase policy"
 +
 +#: tools/gpgconf-comp.c:563
 +msgid "do not allow bypassing the passphrase policy"
 +msgstr "do not allow bypassing the passphrase policy"
 +
 +#: tools/gpgconf-comp.c:567
 +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:571
 +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:575
 +msgid "|FILE|check new passphrases against pattern in FILE"
 +msgstr "|FILE|check new passphrases against pattern in FILE"
 +
 +#: tools/gpgconf-comp.c:579
 +msgid "|N|expire the passphrase after N days"
 +msgstr "|N|expire the passphrase after N days"
 +
 +#: tools/gpgconf-comp.c:583
 +msgid "do not allow the reuse of old passphrases"
 +msgstr "do not allow the reuse of old passphrases"
 +
 +#: tools/gpgconf-comp.c:587
 +msgid "|N|set the Pinentry timeout to N seconds"
 +msgstr "|N|set the Pinentry timeout to N seconds"
 +
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
++#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
 +msgid "|NAME|use NAME as default secret key"
 +msgstr "|NAME|use NAME as default secret key"
 +
- #: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
++#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:784
 +msgid "|NAME|encrypt to user ID NAME as well"
 +msgstr "|NAME|encrypt to user ID NAME as well"
 +
 +#: tools/gpgconf-comp.c:704
 +msgid "|SPEC|set up email aliases"
 +msgstr "|SPEC|set up email aliases"
 +
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
++#: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
 +msgid "Configuration for Keyservers"
 +msgstr "Configuration for Keyservers"
 +
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
++#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
 +msgid "|URL|use keyserver at URL"
 +msgstr "|URL|use keyserver at URL"
 +
- #: tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:741
 +msgid "allow PKA lookups (DNS requests)"
 +msgstr "allow PKA lookups (DNS requests)"
 +
- #: tools/gpgconf-comp.c:738
++#: tools/gpgconf-comp.c:744
 +msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 +msgstr "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 +
- #: tools/gpgconf-comp.c:787
++#: tools/gpgconf-comp.c:793
 +msgid "disable all access to the dirmngr"
 +msgstr "disable all access to the dirmngr"
 +
- #: tools/gpgconf-comp.c:790
++#: tools/gpgconf-comp.c:796
 +msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 +msgstr "|NAME|use encoding NAME for PKCS#12 passphrases"
 +
- #: tools/gpgconf-comp.c:820
++#: tools/gpgconf-comp.c:829
 +msgid "do not check CRLs for root certificates"
 +msgstr "do not check CRLs for root certificates"
 +
- #: tools/gpgconf-comp.c:869
++#: tools/gpgconf-comp.c:878
 +msgid "Options controlling the format of the output"
 +msgstr "Options controlling the format of the output"
 +
- #: tools/gpgconf-comp.c:905
++#: tools/gpgconf-comp.c:920
 +msgid "Options controlling the interactivity and enforcement"
 +msgstr "Options controlling the interactivity and enforcement"
 +
- #: tools/gpgconf-comp.c:918
++#: tools/gpgconf-comp.c:933
 +msgid "Options controlling the use of Tor"
 +msgstr "Options controlling the use of Tor"
 +
- #: tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:947
 +msgid "Configuration for HTTP servers"
 +msgstr "Configuration for HTTP servers"
 +
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:958
 +msgid "use system's HTTP proxy setting"
 +msgstr "use system's HTTP proxy setting"
 +
- #: tools/gpgconf-comp.c:948
++#: tools/gpgconf-comp.c:963
 +msgid "Configuration of LDAP servers to use"
 +msgstr "Configuration of LDAP servers to use"
 +
- #: tools/gpgconf-comp.c:977
++#: tools/gpgconf-comp.c:992
 +msgid "LDAP server list"
 +msgstr "LDAP server list"
 +
- #: tools/gpgconf-comp.c:985
++#: tools/gpgconf-comp.c:1000
 +msgid "Configuration for OCSP"
 +msgstr "Configuration for OCSP"
 +
- #: tools/gpgconf-comp.c:1066
++#: tools/gpgconf-comp.c:1081
 +msgid "OpenPGP"
 +msgstr "OpenPGP"
 +
- #: tools/gpgconf-comp.c:1067
++#: tools/gpgconf-comp.c:1082
 +msgid "Private Keys"
 +msgstr "Private Keys"
 +
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1083
 +msgid "Smartcards"
 +msgstr "Smartcards"
 +
- #: tools/gpgconf-comp.c:1069
++#: tools/gpgconf-comp.c:1084
 +msgid "S/MIME"
 +msgstr "S/MIME"
 +
- #: tools/gpgconf-comp.c:1070
++#: tools/gpgconf-comp.c:1085
 +msgid "Network"
 +msgstr "Network"
 +
- #: tools/gpgconf-comp.c:1071
++#: tools/gpgconf-comp.c:1086
 +msgid "Passphrase Entry"
 +msgstr "Passphrase Entry"
 +
- #: tools/gpgconf-comp.c:1225
++#: tools/gpgconf-comp.c:1240
 +msgid "Component not suitable for launching"
 +msgstr "Component not suitable for launching"
 +
- #: tools/gpgconf-comp.c:3283
++#: tools/gpgconf-comp.c:3311
 +#, c-format
 +msgid "External verification of component %s failed"
 +msgstr "External verification of component %s failed"
 +
- #: tools/gpgconf-comp.c:3434
++#: tools/gpgconf-comp.c:3462
 +msgid "Note that group specifications are ignored\n"
 +msgstr "Note that group specifications are ignored\n"
 +
- #: tools/gpgconf.c:71
++#: tools/gpgconf-comp.c:4036
++#, c-format
++msgid "error closing '%s'\n"
++msgstr "error closing ‘%s’\n"
++
++#: tools/gpgconf-comp.c:4038
++#, c-format
++msgid "error parsing '%s'\n"
++msgstr "error parsing ‘%s’\n"
++
++#: tools/gpgconf.c:73
 +msgid "list all components"
 +msgstr "list all components"
 +
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
 +msgid "check all programs"
 +msgstr "check all programs"
 +
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
 +msgid "|COMPONENT|list options"
 +msgstr "|COMPONENT|list options"
 +
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
 +msgid "|COMPONENT|change options"
 +msgstr "|COMPONENT|change options"
 +
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
 +msgid "|COMPONENT|check options"
 +msgstr "|COMPONENT|check options"
 +
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
 +msgid "apply global default values"
 +msgstr "apply global default values"
 +
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
++msgid "|FILE|update configuration files using FILE"
++msgstr "|FILE|update configuration files using FILE"
++
++#: tools/gpgconf.c:83
 +msgid "get the configuration directories for @GPGCONF@"
 +msgstr "get the configuration directories for @GPGCONF@"
 +
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:85
 +msgid "list global configuration file"
 +msgstr "list global configuration file"
 +
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
 +msgid "check global configuration file"
 +msgstr "check global configuration file"
 +
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:89
 +msgid "query the software version database"
 +msgstr "query the software version database"
 +
- #: tools/gpgconf.c:86
++#: tools/gpgconf.c:90
 +msgid "reload all or a given component"
 +msgstr "reload all or a given component"
 +
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:91
 +msgid "launch a given component"
 +msgstr "launch a given component"
 +
- #: tools/gpgconf.c:88
++#: tools/gpgconf.c:92
 +msgid "kill a given component"
 +msgstr "kill a given component"
 +
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
 +msgid "use as output file"
 +msgstr "use as output file"
 +
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:102
 +msgid "activate changes at runtime, if possible"
 +msgstr "activate changes at runtime, if possible"
 +
- #: tools/gpgconf.c:122
++#: tools/gpgconf.c:127
 +msgid "Usage: @GPGCONF@ [options] (-h for help)"
 +msgstr "Usage: @GPGCONF@ [options] (-h for help)"
 +
- #: tools/gpgconf.c:125
++#: tools/gpgconf.c:130
 +msgid ""
 +"Syntax: @GPGCONF@ [options]\n"
 +"Manage configuration options for tools of the @GNUPG@ system\n"
 +msgstr ""
 +"Syntax: @GPGCONF@ [options]\n"
 +"Manage configuration options for tools of the @GNUPG@ system\n"
 +
- #: tools/gpgconf.c:545 tools/gpgconf.c:579
++#: tools/gpgconf.c:552 tools/gpgconf.c:587
 +msgid "Need one component argument"
 +msgstr "Need one component argument"
 +
- #: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
++#: tools/gpgconf.c:561 tools/gpgconf.c:599 tools/gpgconf.c:632
 +msgid "Component not found"
 +msgstr "Component not found"
 +
- #: tools/gpgconf.c:650
++#: tools/gpgconf.c:658
 +msgid "No argument allowed"
 +msgstr "No argument allowed"
 +
 +#: tools/symcryptrun.c:154
 +msgid ""
 +"@\n"
 +"Commands:\n"
 +" "
 +msgstr ""
 +"@\n"
 +"Commands:\n"
 +" "
 +
 +#: tools/symcryptrun.c:156
 +msgid "decryption modus"
 +msgstr "decryption modus"
 +
 +#: tools/symcryptrun.c:157
 +msgid "encryption modus"
 +msgstr "encryption modus"
 +
 +#: tools/symcryptrun.c:161
 +msgid "tool class (confucius)"
 +msgstr "tool class (confucius)"
 +
 +#: tools/symcryptrun.c:162
 +msgid "program filename"
 +msgstr "program filename"
 +
 +#: tools/symcryptrun.c:164
 +msgid "secret key file (required)"
 +msgstr "secret key file (required)"
 +
 +#: tools/symcryptrun.c:165
 +msgid "input file name (default stdin)"
 +msgstr "input file name (default stdin)"
 +
 +#: tools/symcryptrun.c:209
 +msgid "Usage: symcryptrun [options] (-h for help)"
 +msgstr "Usage: symcryptrun [options] (-h for help)"
 +
 +#: tools/symcryptrun.c:212
 +msgid ""
 +"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 +"[options...] COMMAND [inputfile]\n"
 +"Call a simple symmetric encryption tool\n"
 +msgstr ""
 +"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 +"[options...] COMMAND [inputfile]\n"
 +"Call a simple symmetric encryption tool\n"
 +
 +#: tools/symcryptrun.c:278
 +#, c-format
 +msgid "%s on %s aborted with status %i\n"
 +msgstr "%s on %s aborted with status %i\n"
 +
 +#: tools/symcryptrun.c:285
 +#, c-format
 +msgid "%s on %s failed with status %i\n"
 +msgstr "%s on %s failed with status %i\n"
 +
 +#: tools/symcryptrun.c:317
 +#, c-format
 +msgid "can't create temporary directory '%s': %s\n"
 +msgstr "can't create temporary directory '%s': %s\n"
 +
 +#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
 +#, c-format
 +msgid "could not open %s for writing: %s\n"
 +msgstr "could not open %s for writing: %s\n"
 +
 +#: tools/symcryptrun.c:385
 +#, c-format
 +msgid "error writing to %s: %s\n"
 +msgstr "error writing to %s: %s\n"
 +
 +#: tools/symcryptrun.c:392
 +#, c-format
 +msgid "error reading from %s: %s\n"
 +msgstr "error reading from %s: %s\n"
 +
 +#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
 +#, c-format
 +msgid "error closing %s: %s\n"
 +msgstr "error closing %s: %s\n"
 +
 +#: tools/symcryptrun.c:490
 +msgid "no --program option provided\n"
 +msgstr "no --program option provided\n"
 +
 +#: tools/symcryptrun.c:496
 +msgid "only --decrypt and --encrypt are supported\n"
 +msgstr "only --decrypt and --encrypt are supported\n"
 +
 +#: tools/symcryptrun.c:502
 +msgid "no --keyfile option provided\n"
 +msgstr "no --keyfile option provided\n"
 +
 +#: tools/symcryptrun.c:513
 +msgid "cannot allocate args vector\n"
 +msgstr "cannot allocate args vector\n"
 +
 +#: tools/symcryptrun.c:531
 +#, c-format
 +msgid "could not create pipe: %s\n"
 +msgstr "could not create pipe: %s\n"
 +
 +#: tools/symcryptrun.c:538
 +#, c-format
 +msgid "could not create pty: %s\n"
 +msgstr "could not create pty: %s\n"
 +
 +#: tools/symcryptrun.c:554
 +#, c-format
 +msgid "could not fork: %s\n"
 +msgstr "could not fork: %s\n"
 +
 +#: tools/symcryptrun.c:582
 +#, c-format
 +msgid "execv failed: %s\n"
 +msgstr "execv failed: %s\n"
 +
 +#: tools/symcryptrun.c:611
 +#, c-format
 +msgid "select failed: %s\n"
 +msgstr "select failed: %s\n"
 +
 +#: tools/symcryptrun.c:628
 +#, c-format
 +msgid "read failed: %s\n"
 +msgstr "read failed: %s\n"
 +
 +#: tools/symcryptrun.c:680
 +#, c-format
 +msgid "pty read failed: %s\n"
 +msgstr "pty read failed: %s\n"
 +
 +#: tools/symcryptrun.c:732
 +#, c-format
 +msgid "waitpid failed: %s\n"
 +msgstr "waitpid failed: %s\n"
 +
 +#: tools/symcryptrun.c:746
 +#, c-format
 +msgid "child aborted with status %i\n"
 +msgstr "child aborted with status %i\n"
 +
 +#: tools/symcryptrun.c:801
 +#, c-format
 +msgid "cannot allocate infile string: %s\n"
 +msgstr "cannot allocate infile string: %s\n"
 +
 +#: tools/symcryptrun.c:814
 +#, c-format
 +msgid "cannot allocate outfile string: %s\n"
 +msgstr "cannot allocate outfile string: %s\n"
 +
 +#: tools/symcryptrun.c:987
 +#, c-format
 +msgid "either %s or %s must be given\n"
 +msgstr "either %s or %s must be given\n"
 +
 +#: tools/symcryptrun.c:1009
 +msgid "no class provided\n"
 +msgstr "no class provided\n"
 +
 +#: tools/symcryptrun.c:1018
 +#, c-format
 +msgid "class %s is not supported\n"
 +msgstr "class %s is not supported\n"
 +
 +#: tools/gpg-check-pattern.c:144
 +msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
 +msgstr "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
 +
 +#: tools/gpg-check-pattern.c:147
 +msgid ""
 +"Syntax: gpg-check-pattern [options] patternfile\n"
 +"Check a passphrase given on stdin against the patternfile\n"
 +msgstr ""
 +"Syntax: gpg-check-pattern [options] patternfile\n"
 +"Check a passphrase given on stdin against the patternfile\n"
diff --cc po/eo.po
index 5bc5246,af5252e..9edfd65
--- a/po/eo.po
+++ b/po/eo.po
@@@ -8,7 -8,6 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg 1.0.6d\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-11-18 16:54+0100\n"
++"POT-Creation-Date: 2016-12-20 11:28+0100\n"
  "PO-Revision-Date: 2002-04-14 14:33+0100\n"
  "Last-Translator: Edmund GRIMLEY EVANS <edmundo at rano.org>\n"
  "Language-Team: Esperanto <translation-team-eo at lists.sourceforge.net>\n"
@@@ -158,25 -129,11 +158,25 @@@ msgstr "malbona pasfrazo
  msgid "ssh keys greater than %d bits are not supported\n"
  msgstr "protekto-metodo %d%s ne estas realigita\n"
  
 +#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
- #: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1306 g10/keygen.c:4577
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
++#: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't create '%s': %s\n"
  msgstr "ne povas krei '%s': %s\n"
  
 +#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
- #: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1307
++#: g10/import.c:305 g10/import.c:448 g10/import.c:621 g10/keygen.c:3681
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
- #: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
- #: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:825 g10/sign.c:1025
++#: g10/sign.c:1130 g10/sign.c:1275 g10/tdbdump.c:143 g10/tdbdump.c:151
++#: g10/tdbio.c:720 g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161
++#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
++#: dirmngr/certcache.c:368 dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1564
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
@@@ -239,11 -185,9 +239,11 @@@ msgstr "Bonvolu doni la pasfrazon; tio 
  msgid "failed to create stream from socket: %s\n"
  msgstr "%s: malsukcesis krei haktabelon: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1100
++#: agent/divert-scd.c:92 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1101
++#: agent/divert-scd.c:93 g10/call-agent.c:1102
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  
@@@ -387,48 -305,33 +387,48 @@@ msgstr "
  "Opcioj:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
  #, fuzzy
  #| msgid "Key is superseded"
  msgid "run in supervised mode"
  msgstr "Ŝlosilo estas anstataŭigita."
  
- #: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:170 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "detala eligo"
  
 +#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "iom malpli da informoj"
  
- #: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
  msgid "csh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
- #: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
++#: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
  #, fuzzy
  msgid "|FILE|read options from FILE"
  msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
  
- #: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:177
  msgid "do not detach from the console"
  msgstr ""
  
@@@ -513,160 -399,118 +513,160 @@@ msgstr "ne realigita
  #. 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:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:481 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1025 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:358
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:124 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  #, fuzzy
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr "Bonvolu raporti cimojn al <gnupg-bugs at gnu.org>.\n"
  
- #: agent/gpg-agent.c:491
++#: agent/gpg-agent.c:490
  #, fuzzy
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
  
- #: agent/gpg-agent.c:493
++#: agent/gpg-agent.c:492
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:537 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:442
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:793
++#: agent/gpg-agent.c:1082 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:812
  #, 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"
  
- #: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
- #: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1093 agent/gpg-agent.c:1935 g10/gpg.c:2510
++#: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:817
++#: dirmngr/dirmngr.c:1670 tools/symcryptrun.c:932
  #, fuzzy, c-format
  #| msgid "option file `%s': %s\n"
  msgid "option file '%s': %s\n"
  msgstr "opcio-dosiero '%s': %s\n"
  
- #: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:806
++#: agent/gpg-agent.c:1101 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:825
  #, 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:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
- #: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
++#: agent/gpg-agent.c:1223 g10/gpg.c:3643 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:936 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:527
  #, fuzzy, c-format
  msgid "Note: '%s' is not considered an option\n"
  msgstr "AVERTO: '%s' estas malplena dosiero\n"
  
- #: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
++#: agent/gpg-agent.c:2080 scd/scdaemon.c:1073 dirmngr/dirmngr.c:1081
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
  msgstr "ne povas krei %s: %s\n"
  
- #: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
++#: agent/gpg-agent.c:2097 scd/scdaemon.c:1086 dirmngr/dirmngr.c:1094
  #, fuzzy, c-format
  msgid "socket name '%s' is too long\n"
  msgstr "Valida atestilrevoko"
  
- #: agent/gpg-agent.c:2134
++#: agent/gpg-agent.c:2135
  #, fuzzy
  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:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
++#: agent/gpg-agent.c:2145 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1126
  #, fuzzy
  msgid "error getting nonce for the socket\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
++#: agent/gpg-agent.c:2150 scd/scdaemon.c:1113 dirmngr/dirmngr.c:1129
  #, fuzzy, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "eraro dum sendo al '%s': %s\n"
  
- #: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
- #: dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2160 agent/gpg-agent.c:2197 scd/scdaemon.c:1121
++#: dirmngr/dirmngr.c:1138
  #, fuzzy, c-format
  msgid "can't set permissions of '%s': %s\n"
  msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
  
- #: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:2165 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1143
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
  msgstr "aktualigo malsukcesis: %s\n"
  
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
++#: agent/gpg-agent.c:2172 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1149
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
  msgstr "skribas sekretan ŝlosilon al '%s'\n"
  
- #: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: agent/gpg-agent.c:2191 agent/gpg-agent.c:2234 g10/exec.c:199
 +#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, fuzzy, c-format
  msgid "can't create directory '%s': %s\n"
  msgstr "%s: ne povas krei dosierujon: %s\n"
  
- #: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: agent/gpg-agent.c:2194 agent/gpg-agent.c:2239 g10/openfile.c:491
 +#: g10/openfile.c:520 sm/keydb.c:103
  #, fuzzy, c-format
  msgid "directory '%s' created\n"
  msgstr "%s: dosierujo kreita\n"
  
- #: agent/gpg-agent.c:2244
++#: agent/gpg-agent.c:2245
  #, fuzzy, c-format
  msgid "stat() failed for '%s': %s\n"
  msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
  
- #: agent/gpg-agent.c:2248
++#: agent/gpg-agent.c:2249
  #, fuzzy, c-format
  msgid "can't use '%s' as home directory\n"
  msgstr "%s: ne povas krei dosierujon: %s\n"
  
- #: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
++#: agent/gpg-agent.c:2392 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1871
  #, fuzzy, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "eraro dum legado de '%s': %s\n"
  
- #: agent/gpg-agent.c:2598
++#: agent/gpg-agent.c:2599
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2603
++#: agent/gpg-agent.c:2604
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2678
++#: agent/gpg-agent.c:2679
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2683
++#: agent/gpg-agent.c:2684
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
++#: agent/gpg-agent.c:2881 scd/scdaemon.c:1272 dirmngr/dirmngr.c:2075
  #, fuzzy, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "aktualigo de sekreto malsukcesis: %s\n"
  
- #: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2954 scd/scdaemon.c:1321
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
  msgstr "\t%lu ŝlosiloj ignoritaj\n"
  
- #: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
++#: agent/gpg-agent.c:3092 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  #, fuzzy
  msgid "no gpg-agent running in this session\n"
  msgstr "gpg-agent ne estas disponata en ĉi tiu sesio\n"
@@@ -682,8 -524,6 +682,8 @@@ msgid "
  "Password cache maintenance\n"
  msgstr ""
  
- #: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
++#: agent/protect-tool.c:106 g10/gpg.c:424 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:153 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -691,9 -531,6 +691,9 @@@ msgstr "
  "@Komandoj:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
- #: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:92 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:168 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -747,8 -576,6 +747,8 @@@ 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:362 dirmngr/dirmngr.c:1469
- #: tools/gpgconf.c:323
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1472
++#: tools/gpgconf.c:328
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
  msgstr "eraro dum legado de '%s': %s\n"
@@@ -918,9 -716,6 +918,9 @@@ msgstr "protekto-metodo %d%s ne estas r
  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:438
 +#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
- #: dirmngr/ldap-wrapper.c:710
++#: dirmngr/ldap-wrapper.c:711
  #, fuzzy, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
@@@ -932,8 -724,6 +932,8 @@@
  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:848 dirmngr/dirmngr.c:1155
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1167
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
  msgstr "eraro dum legado de '%s': %s\n"
@@@ -980,27 -761,22 +980,27 @@@ msgstr "ne povas konektiĝi al '%s': %s
  msgid "problem setting the gpg-agent options\n"
  msgstr "problemo kun agento: agento redonas 0x%lx\n"
  
- #: common/sysutils.c:144
++#: common/sysutils.c:148
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "ne povas malŝalti kreadon de core-dosieroj: %s\n"
  
- #: common/sysutils.c:239
++#: common/sysutils.c:250
  #, fuzzy, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
  
- #: common/sysutils.c:271
++#: common/sysutils.c:282
  #, fuzzy, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
  
- #: common/sysutils.c:659
++#: common/sysutils.c:693
  #, fuzzy, c-format
  msgid "waiting for file '%s' to become accessible ...\n"
  msgstr "aktualigo malsukcesis: %s\n"
  
- #: common/sysutils.c:685
++#: common/sysutils.c:719
  #, fuzzy, c-format
  msgid "renaming '%s' to '%s' failed: %s\n"
  msgstr "enkirasigo malsukcesis: %s\n"
@@@ -1077,7 -838,6 +1077,7 @@@ msgstr "
  msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
  msgstr "AVERTO: '%s' estas malplena dosiero\n"
  
- #: common/miscellaneous.c:554
++#: common/miscellaneous.c:556
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
@@@ -1194,8 -931,6 +1194,8 @@@ msgstr "%s: ŝlosilaro kreita\n
  msgid "algorithm: %s"
  msgstr "kiraso: %s\n"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3098
++#: scd/app-openpgp.c:3111
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
@@@ -1409,7 -1102,6 +1409,7 @@@ msgstr "
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr ""
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1173
++#: common/argparse.c:401 dirmngr/dirmngr.c:1185
  #, fuzzy
  msgid "out of core\n"
  msgstr "ne traktita"
@@@ -1468,8 -1149,6 +1468,8 @@@ msgstr "publika ŝlosilo %08lX ne trovi
  msgid "waiting for lock %s...\n"
  msgstr "skribas sekretan ŝlosilon al '%s'\n"
  
- #: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
- #: dirmngr/dirmngr.c:715
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:725
++#: dirmngr/dirmngr.c:734
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
@@@ -1509,7 -1180,6 +1509,7 @@@ msgstr "neatendita kiraso:
  msgid "invalid dash escaped line: "
  msgstr "nevalida strek-eskapita linio: "
  
- #: g10/armor.c:873 g10/armor.c:1490
++#: g10/armor.c:873 g10/armor.c:1493
  #, fuzzy, c-format
  msgid "invalid radix64 character %02X skipped\n"
  msgstr "nevalida signo %02x en bazo 64 ignorita\n"
@@@ -1526,7 -1193,6 +1526,7 @@@ msgstr "tro frua dosierfino (en CRC)\n
  msgid "malformed CRC\n"
  msgstr "misformita CRC\n"
  
- #: g10/armor.c:962 g10/armor.c:1527
++#: g10/armor.c:962 g10/armor.c:1530
  #, fuzzy, c-format
  msgid "CRC error; %06lX - %06lX\n"
  msgstr "CRC-eraro; %06lx - %06lx\n"
@@@ -1540,16 -1204,13 +1540,16 @@@ msgstr "tro frua dosierfino (en vosto)\
  msgid "error in trailer line\n"
  msgstr "eraro en vostolinio\n"
  
- #: g10/armor.c:1303
++#: g10/armor.c:1306
  msgid "no valid OpenPGP data found.\n"
  msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
  
- #: g10/armor.c:1308
++#: g10/armor.c:1311
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
  msgstr "nevalida kiraso: linio pli longa ol %d signojn\n"
  
- #: g10/armor.c:1312
++#: g10/armor.c:1315
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr ""
@@@ -1637,8 -1283,6 +1637,8 @@@ msgstr "sekreta ŝlosilo ne havebla
  msgid "OpenPGP card no. %s detected\n"
  msgstr ""
  
- #: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
- #: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2030
++#: g10/keygen.c:4087 g10/revoke.c:215 g10/revoke.c:618
  #, fuzzy
  msgid "can't do this in batch mode\n"
  msgstr "ne povas fari tion en neinteraga reĝimo\n"
@@@ -1648,15 -1291,10 +1648,15 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2454
++#: g10/card-util.c:109 scd/app-openpgp.c:2467
  #, fuzzy
  msgid "Reset Code not or not anymore available\n"
  msgstr "sekretaj ŝlosilpartoj ne estas disponataj\n"
  
 +#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
- #: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
- #: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1768
++#: g10/keygen.c:1945 g10/keygen.c:2313 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "Via elekto? "
  
@@@ -1723,10 -1347,6 +1723,10 @@@ msgstr "skribas publikan ŝlosilon al '
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
- #: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:334
++#: g10/import.c:592 g10/import.c:640 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
++#: dirmngr/dirmngr.c:1510 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
@@@ -1800,7 -1405,6 +1800,7 @@@ msgstr "Kreado de ŝlosiloj malsukcesis
  msgid "not an OpenPGP card"
  msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
  
- #: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
++#: g10/card-util.c:1173 g10/keygen.c:4106 g10/keygen.c:5092
  #, fuzzy, c-format
  msgid "error getting current key info: %s\n"
  msgstr "eraro dum skribado de sekreta ŝlosilaro '%s': %s\n"
@@@ -1831,13 -1430,10 +1831,13 @@@ msgstr "Kiun ŝlosilgrandon vi deziras
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "Kiun ŝlosilgrandon vi deziras? (1024) "
  
- #: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
++#: g10/card-util.c:1316 g10/keygen.c:2122 g10/keygen.c:2154
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "rondigita ĝis %u bitoj\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2207 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr ""
@@@ -1892,9 -1478,6 +1892,9 @@@ msgstr "   (%d) RSA (nur ĉifri)\n
  msgid "   (3) Authentication key\n"
  msgstr ""
  
- #: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
- #: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
- #: g10/keygen.c:2314 g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1508
++#: g10/keygen.c:1794 g10/keygen.c:1822 g10/keygen.c:1952 g10/keygen.c:2060
++#: g10/keygen.c:2336 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Nevalida elekto.\n"
  
@@@ -1928,7 -1505,6 +1928,7 @@@ msgstr "Ĉu vere subskribi? 
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1816 g10/keyedit.c:1867
++#: g10/card-util.c:1816 g10/keyedit.c:1868
  msgid "quit this menu"
  msgstr "forlasi ĉi tiun menuon"
  
@@@ -1937,7 -1512,6 +1937,7 @@@
  msgid "show admin commands"
  msgstr "malkongruaj komandoj\n"
  
- #: g10/card-util.c:1819 g10/keyedit.c:1870
++#: g10/card-util.c:1819 g10/keyedit.c:1871
  msgid "show this help"
  msgstr "montri ĉi tiun helpon"
  
@@@ -2021,31 -1577,21 +2021,31 @@@ msgstr "malkongruaj komandoj\n
  msgid "Admin commands are not allowed\n"
  msgstr "skribas sekretan ŝlosilon al '%s'\n"
  
- #: g10/card-util.c:2127 g10/keyedit.c:2816
++#: g10/card-util.c:2127 g10/keyedit.c:2817
  msgid "Invalid command  (try \"help\")\n"
  msgstr "Nevalida komando (provu per \"helpo\")\n"
  
- #: g10/decrypt.c:191 g10/encrypt.c:955
++#: g10/decrypt.c:190 g10/encrypt.c:955
  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:4851 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4904 g10/keyring.c:398 g10/keyring.c:771
  #, fuzzy, c-format
  #| msgid "can't open `%s'\n"
  msgid "can't open '%s'\n"
  msgstr "ne povas malfermi '%s'\n"
  
 +#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
- #: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
- #: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4858 g10/keyedit.c:2051
++#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2163
  #, fuzzy, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "ŝlosilo '%s' ne trovita: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
- #: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
- #: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4866 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:645 g10/tofu.c:2171
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "eraro dum legado de ŝlosilbloko: %s\n"
@@@ -2106,7 -1640,6 +2106,7 @@@ msgstr "estas sekreta ŝlosilo por la p
  msgid "use option \"--delete-secret-keys\" to delete it first.\n"
  msgstr "uzu la opcion \"--delete-secret-key\" por forviŝi ĝin unue.\n"
  
- #: g10/encrypt.c:232 g10/sign.c:1292
++#: g10/encrypt.c:232 g10/sign.c:1294
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
@@@ -2126,7 -1656,6 +2126,7 @@@ msgstr "subskribado malsukcesis: %s\n
  msgid "'%s' already compressed\n"
  msgstr "'%s' jam densigita\n"
  
- #: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:610
  #, fuzzy, c-format
  #| msgid "WARNING: `%s' is an empty file\n"
  msgid "WARNING: '%s' is an empty file\n"
@@@ -2144,7 -1671,6 +2144,7 @@@ msgid "
  "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
  msgstr "NOTO: ĉifrad-metodo %d ne trovita en preferoj\n"
  
- #: g10/encrypt.c:707 g10/sign.c:984
++#: g10/encrypt.c:707 g10/sign.c:986
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2176,7 -1697,6 +2176,7 @@@ msgstr "%s-ĉifritaj datenoj\n
  msgid "encrypted with unknown algorithm %d\n"
  msgstr "ĉifrita per nekonata metodo %d\n"
  
- #: g10/decrypt-data.c:164 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:129
  msgid ""
  "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
  msgstr ""
@@@ -2268,8 -1770,6 +2268,8 @@@ msgstr "
  msgid " - skipped"
  msgstr "%s: ignorita: %s\n"
  
- #: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:845 g10/sign.c:1148
++#: g10/export.c:1251 g10/import.c:1543 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:847 g10/sign.c:1150
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
@@@ -2294,8 -1790,6 +2294,8 @@@ msgstr "ŝlosilo %08lX: PGP-2.x-stila �
  msgid "WARNING: nothing exported\n"
  msgstr "AVERTO: nenio estis eksportita\n"
  
- #: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
- #: g10/plaintext.c:151 g10/plaintext.c:174
++#: g10/export.c:2283 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/plaintext.c:167 g10/plaintext.c:190
  #, fuzzy, c-format
  #| msgid "error creating `%s': %s\n"
  msgid "error creating '%s': %s\n"
@@@ -2343,8 -1828,6 +2343,8 @@@ msgstr "eraro dum kreado de '%s': %s\n
  msgid "No fingerprint"
  msgstr "Fingrospuro:"
  
- #: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
- #: g10/revoke.c:701
++#: g10/getkey.c:1873 g10/keyedit.c:2929 g10/keyedit.c:3016 g10/revoke.c:637
++#: g10/revoke.c:702
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "ŝlosilo '%s' ne trovita: %s\n"
@@@ -2376,218 -1854,174 +2376,224 @@@ msgstr "Nevalida ŝlosilo %08lX validig
  msgid "using subkey %s instead of primary key %s\n"
  msgstr "uzas flankan ŝlosilon %08lX anstataŭ la ĉefa ŝlosilo %08lX\n"
  
- #: g10/gpg.c:424 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:200
  #, fuzzy
  msgid "make a signature"
  msgstr "fari apartan subskribon"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:427
  #, fuzzy
  msgid "make a clear text signature"
  msgstr "|[dosiero]|fari klartekstan subskribon"
  
- #: g10/gpg.c:426 sm/gpgsm.c:202
++#: g10/gpg.c:429 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "fari apartan subskribon"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:430 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "ĉifri datenojn"
  
- #: g10/gpg.c:429
++#: g10/gpg.c:432
  msgid "encryption only with symmetric cipher"
  msgstr "ĉifri nur kun simetria ĉifro"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:434 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "malĉifri datenojn (implicita elekto)"
  
- #: g10/gpg.c:433 sm/gpgsm.c:206
++#: g10/gpg.c:436 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "kontroli subskribon"
  
- #: g10/gpg.c:435 sm/gpgsm.c:207
++#: g10/gpg.c:438 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "listigi ŝlosilojn"
  
- #: g10/gpg.c:437
++#: g10/gpg.c:440
  msgid "list keys and signatures"
  msgstr "listigi ŝlosilojn kaj subskribojn"
  
- #: g10/gpg.c:438
++#: g10/gpg.c:443
  #, fuzzy
  msgid "list and check key signatures"
  msgstr "kontroli ŝlosilsubskribojn"
  
- #: g10/gpg.c:439 sm/gpgsm.c:212
++#: g10/gpg.c:445 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "listigi ŝlosilojn kaj fingroŝpurojn"
  
- #: g10/gpg.c:440 sm/gpgsm.c:210
++#: g10/gpg.c:446 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "listigi sekretajn ŝlosilojn"
  
- #: g10/gpg.c:442 sm/gpgsm.c:213
++#: g10/gpg.c:448 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "krei novan ŝlosilparon"
  
- #: g10/gpg.c:444
++#: g10/gpg.c:451
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly generate a new key pair"
  msgstr "krei novan ŝlosilparon"
  
- #: g10/gpg.c:446
++#: g10/gpg.c:454
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly add a new user-id"
  msgstr "krei novan ŝlosilparon"
  
- #: g10/gpg.c:449
++#: g10/gpg.c:459
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly revoke a user-id"
  msgstr "krei novan ŝlosilparon"
  
- #: g10/gpg.c:451
++#: g10/gpg.c:462
+ #, fuzzy
+ #| msgid "generate a new key pair"
+ msgid "quickly set a new expiration date"
+ msgstr "krei novan ŝlosilparon"
+ 
++#: g10/gpg.c:464
  msgid "full featured key pair generation"
  msgstr ""
  
- #: g10/gpg.c:452
++#: g10/gpg.c:467
  msgid "generate a revocation certificate"
  msgstr "krei revokatestilon"
  
- #: g10/gpg.c:454 sm/gpgsm.c:215
++#: g10/gpg.c:470 sm/gpgsm.c:216
  msgid "remove keys from the public keyring"
  msgstr "forigi ŝlosilojn de la publika ŝlosilaro"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:472
  msgid "remove keys from the secret keyring"
  msgstr "forigi ŝlosilojn de la sekreta ŝlosilaro"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:474
  #, fuzzy
  #| msgid "sign a key"
  msgid "quickly sign a key"
  msgstr "subskribi ŝlosilon"
  
- #: g10/gpg.c:460
++#: g10/gpg.c:476
  #, fuzzy
  #| msgid "sign a key locally"
  msgid "quickly sign a key locally"
  msgstr "subskribi ŝlosilon loke"
  
- #: g10/gpg.c:461
++#: g10/gpg.c:477
  msgid "sign a key"
  msgstr "subskribi ŝlosilon"
  
- #: g10/gpg.c:462
++#: g10/gpg.c:478
  msgid "sign a key locally"
  msgstr "subskribi ŝlosilon loke"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:479
  msgid "sign or edit a key"
  msgstr "subskribi aŭ redakti ŝlosilon"
  
- #: g10/gpg.c:465 sm/gpgsm.c:233
++#: g10/gpg.c:481 sm/gpgsm.c:234
  #, fuzzy
  msgid "change a passphrase"
  msgstr "ŝanĝi la pasfrazon"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:485
  msgid "export keys"
  msgstr "eksporti ŝlosilojn"
  
- #: g10/gpg.c:468
++#: g10/gpg.c:486
  msgid "export keys to a keyserver"
  msgstr "eksporti ŝlosilojn al ŝlosilservilo"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:487
  msgid "import keys from a keyserver"
  msgstr "importi ŝlosilojn de ŝlosilservilo"
  
- #: g10/gpg.c:471
++#: g10/gpg.c:490
  msgid "search for keys on a keyserver"
  msgstr "serĉi ŝlosilojn ĉe ŝlosilservilo"
  
- #: g10/gpg.c:473
++#: g10/gpg.c:492
  msgid "update all keys from a keyserver"
  msgstr "aktualigi ĉiujn ŝlosilojn de ŝlosilservilo"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:498
  msgid "import/merge keys"
  msgstr "importi/kunfandi ŝlosilojn"
  
- #: g10/gpg.c:482
++#: g10/gpg.c:501
  msgid "print the card status"
  msgstr ""
  
- #: g10/gpg.c:483
++#: g10/gpg.c:502
  msgid "change data on a card"
  msgstr ""
  
- #: g10/gpg.c:484
++#: g10/gpg.c:504
  msgid "change a card's PIN"
  msgstr ""
  
- #: g10/gpg.c:496
++#: g10/gpg.c:516
  msgid "update the trust database"
  msgstr "aktualigi la fido-datenaron"
  
- #: g10/gpg.c:505
++#: g10/gpg.c:525
  #, fuzzy
  msgid "print message digests"
  msgstr "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
  
- #: g10/gpg.c:508 sm/gpgsm.c:228
++#: g10/gpg.c:528 sm/gpgsm.c:229
  msgid "run in server mode"
  msgstr ""
  
- #: g10/gpg.c:510
++#: g10/gpg.c:530
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:514 sm/gpgsm.c:246
++#: g10/gpg.c:534 sm/gpgsm.c:248
  msgid "create ascii armored output"
  msgstr "krei eligon en askia kiraso"
  
- #: g10/gpg.c:517 sm/gpgsm.c:262
++#: g10/gpg.c:537 sm/gpgsm.c:264
  #, fuzzy
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|NOMO|ĉifri por NOMO"
  
- #: g10/gpg.c:533 sm/gpgsm.c:298
++#: g10/gpg.c:553 sm/gpgsm.c:300
  #, fuzzy
  msgid "|USER-ID|use USER-ID to sign or decrypt"
  msgstr "uzi ĉi tiun uzantidentigilon por subskribi aŭ malĉifri"
  
- #: g10/gpg.c:539
++#: g10/gpg.c:559
  #, fuzzy
  msgid "|N|set compress level to N (0 disables)"
  msgstr "|N|difini densig-nivelon N (0=nenia)"
  
- #: g10/gpg.c:546
++#: g10/gpg.c:566
  msgid "use canonical text mode"
  msgstr "uzi tekstan reĝimon"
  
- #: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
++#: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
  #, fuzzy
  msgid "|FILE|write output to FILE"
  msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
  
- #: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
++#: g10/gpg.c:598 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
  msgid "do not make any changes"
  msgstr "fari neniajn ŝanĝojn"
  
- #: g10/gpg.c:579
++#: g10/gpg.c:599
  msgid "prompt before overwriting"
  msgstr ""
  
- #: g10/gpg.c:628
++#: g10/gpg.c:648
  msgid "use strict OpenPGP behavior"
  msgstr ""
  
- #: g10/gpg.c:654 sm/gpgsm.c:355
++#: g10/gpg.c:674 sm/gpgsm.c:357
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2595,7 -2029,16 +2601,17 @@@ msgstr "
  "@\n"
  "(Vidu la manpaĝon por kompleta listo de ĉiuj komandoj kaj opcioj)\n"
  
- #: g10/gpg.c:657 sm/gpgsm.c:358
++#: g10/gpg.c:677
+ #, fuzzy
+ #| msgid ""
+ #| "@\n"
+ #| "Examples:\n"
+ #| "\n"
+ #| " -se -r Bob [file]          sign and encrypt for user Bob\n"
+ #| " --clear-sign [file]         make a clear text signature\n"
+ #| " --detach-sign [file]       make a detached signature\n"
+ #| " --list-keys [names]        show keys\n"
+ #| " --fingerprint [names]      show fingerprints\n"
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2615,13 -2058,11 +2631,13 @@@ msgstr "
  " --list-keys [nomoj]        montri ŝlosilojn\n"
  " --fingerprint [nomoj]      montri fingroŝpurojn\n"
  
- #: g10/gpg.c:1026
++#: g10/gpg.c:1047
  #, 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:1029
++#: g10/gpg.c:1050
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg [options] [files]\n"
@@@ -2636,7 -2077,6 +2652,7 @@@ msgstr "
  "subskribi, kontroli, ĉifri aŭ malĉifri\n"
  "implicita operacio dependas de la enigataj datenoj\n"
  
- #: g10/gpg.c:1040 sm/gpgsm.c:588
++#: g10/gpg.c:1061 sm/gpgsm.c:580
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2644,612 -2084,434 +2660,549 @@@ msgstr "
  "\n"
  "Realigitaj metodoj:\n"
  
- #: g10/gpg.c:1043
++#: g10/gpg.c:1064
  msgid "Pubkey: "
  msgstr ""
  
- #: g10/gpg.c:1050 g10/keyedit.c:3402
++#: g10/gpg.c:1071 g10/keyedit.c:3483
  msgid "Cipher: "
  msgstr ""
  
- #: g10/gpg.c:1057
++#: g10/gpg.c:1078
  msgid "Hash: "
  msgstr ""
  
- #: g10/gpg.c:1064 g10/keyedit.c:3451
++#: g10/gpg.c:1085 g10/keyedit.c:3532
  #, fuzzy
  msgid "Compression: "
  msgstr "Komento: "
  
- #: g10/gpg.c:1133 sm/gpgsm.c:662
++#: g10/gpg.c:1154 sm/gpgsm.c:654
  #, fuzzy, c-format
  msgid "usage: %s [options] %s\n"
  msgstr "uzado: gpg [opcioj] "
  
- #: g10/gpg.c:1321 sm/gpgsm.c:751
++#: g10/gpg.c:1342 sm/gpgsm.c:743
  msgid "conflicting commands\n"
  msgstr "malkongruaj komandoj\n"
  
- #: g10/gpg.c:1339
++#: g10/gpg.c:1360
  #, c-format
  msgid "no = sign found in group definition '%s'\n"
  msgstr ""
  
- #: g10/gpg.c:1537
++#: g10/gpg.c:1558
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
  
- #: g10/gpg.c:1540
++#: g10/gpg.c:1561
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
  msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
  
- #: g10/gpg.c:1543
++#: g10/gpg.c:1564
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on extension '%s'\n"
  msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
  
- #: g10/gpg.c:1549
++#: g10/gpg.c:1570
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
  msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
  
- #: g10/gpg.c:1552
++#: g10/gpg.c:1573
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
  msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
  
- #: g10/gpg.c:1555
++#: g10/gpg.c:1576
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on extension '%s'\n"
  msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
  
- #: g10/gpg.c:1561
++#: g10/gpg.c:1582
  #, fuzzy, c-format
  msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
  msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
  
- #: g10/gpg.c:1564
++#: g10/gpg.c:1585
  #, 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:1567
++#: g10/gpg.c:1588
  #, fuzzy, c-format
  msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
  msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
  
- #: g10/gpg.c:1573
++#: g10/gpg.c:1594
  #, fuzzy, c-format
  msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
  msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
  
- #: g10/gpg.c:1576
++#: g10/gpg.c:1597
  #, 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:1579
++#: g10/gpg.c:1600
  #, fuzzy, c-format
  msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
  msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
  
- #: g10/gpg.c:1786
++#: g10/gpg.c:1816
  #, fuzzy, c-format
  msgid "unknown configuration item '%s'\n"
  msgstr "%s: nova opcio-dosiero kreita\n"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1925
  msgid "display photo IDs during key listings"
  msgstr ""
  
- #: g10/gpg.c:1895
++#: g10/gpg.c:1927
  #, fuzzy
  msgid "show key usage information during key listings"
  msgstr "Mankas responda subskribo en sekreta ŝlosilaro\n"
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1929
  msgid "show policy URLs during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1931
  #, fuzzy
  msgid "show all notations during signature listings"
  msgstr "Mankas responda subskribo en sekreta ŝlosilaro\n"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1933
  msgid "show IETF standard notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1937
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1939
  #, fuzzy
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1941
  msgid "show user ID validity during key listings"
  msgstr ""
  
- #: g10/gpg.c:1911
++#: g10/gpg.c:1943
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  
- #: g10/gpg.c:1913
++#: g10/gpg.c:1945
  msgid "show revoked and expired subkeys in key listings"
  msgstr ""
  
- #: g10/gpg.c:1915
++#: g10/gpg.c:1947
  #, fuzzy
  msgid "show the keyring name in key listings"
  msgstr "montri, en kiu ŝlosilaro estas listigita ŝlosilo"
  
- #: g10/gpg.c:1917
++#: g10/gpg.c:1949
  #, fuzzy
  msgid "show expiration dates during signature listings"
  msgstr "Mankas responda subskribo en sekreta ŝlosilaro\n"
  
- #: g10/gpg.c:2019 g10/gpg.c:2056
++#: g10/gpg.c:2051 g10/gpg.c:2088
  #, fuzzy, c-format
  msgid "valid values for option '%s':\n"
  msgstr "nevalida kiraso"
  
- #: g10/gpg.c:2030
++#: g10/gpg.c:2062
  #, fuzzy, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "nekonata implicita ricevonto '%s'\n"
  
- #: g10/gpg.c:2032 g10/gpg.c:2068
++#: g10/gpg.c:2064 g10/gpg.c:2100
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2066
++#: g10/gpg.c:2098 g10/keygen.c:167
  #, fuzzy, c-format
  msgid "invalid value for option '%s'\n"
  msgstr "nevalida kiraso"
  
- #: g10/gpg.c:2203
++#: g10/gpg.c:2235
  #, fuzzy, c-format
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
  
- #: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
++#: g10/gpg.c:2839 g10/gpg.c:3610 g10/gpg.c:3622
  #, 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:2978 g10/gpg.c:2990
++#: g10/gpg.c:3011 g10/gpg.c:3023
  #, fuzzy, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "%s ne estas valida signaro\n"
  
- #: g10/gpg.c:3012
++#: g10/gpg.c:3045
  #, fuzzy, c-format
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "Nevalida retadreso\n"
  
- #: g10/gpg.c:3044 sm/gpgsm.c:1166
++#: g10/gpg.c:3077 sm/gpgsm.c:1158
  #, fuzzy, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "nevalida kompendi-metodo '%s'\n"
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3130
  #, fuzzy, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "%s ne estas valida signaro\n"
  
- #: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
++#: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
  #, fuzzy
  msgid "could not parse keyserver URL\n"
  msgstr "ne povis analizi URI de ŝlosilservilo\n"
  
- #: g10/gpg.c:3137
++#: g10/gpg.c:3170
  #, fuzzy, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "AVERTO: '%s' estas malplena dosiero\n"
  
- #: g10/gpg.c:3140
++#: g10/gpg.c:3173
  #, fuzzy
  msgid "invalid keyserver options\n"
  msgstr "nevalida ŝlosilaro"
  
- #: g10/gpg.c:3147
++#: g10/gpg.c:3180
  #, fuzzy, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "AVERTO: '%s' estas malplena dosiero\n"
  
- #: g10/gpg.c:3150
++#: g10/gpg.c:3183
  #, fuzzy
  msgid "invalid import options\n"
  msgstr "nevalida kiraso"
  
- #: g10/gpg.c:3156 g10/gpg.c:3171
++#: g10/gpg.c:3189 g10/gpg.c:3204
  #, fuzzy, c-format
  msgid "invalid filter option: %s\n"
  msgstr "nevalida kiraso"
  
- #: g10/gpg.c:3162
++#: g10/gpg.c:3195
  #, fuzzy, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "AVERTO: '%s' estas malplena dosiero\n"
  
- #: g10/gpg.c:3165
++#: g10/gpg.c:3198
  #, fuzzy
  msgid "invalid export options\n"
  msgstr "nevalida ŝlosilaro"
  
- #: g10/gpg.c:3177
++#: g10/gpg.c:3210
  #, fuzzy, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "AVERTO: '%s' estas malplena dosiero\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3213
  #, fuzzy
  msgid "invalid list options\n"
  msgstr "nevalida kiraso"
  
- #: g10/gpg.c:3188
++#: g10/gpg.c:3221
  msgid "display photo IDs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3190
++#: g10/gpg.c:3223
  msgid "show policy URLs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3192
++#: g10/gpg.c:3225
  #, fuzzy
  msgid "show all notations during signature verification"
  msgstr "%s ne estas valida signaro\n"
  
- #: g10/gpg.c:3194
++#: g10/gpg.c:3227
  msgid "show IETF standard notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3231
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3200
++#: g10/gpg.c:3233
  #, fuzzy
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
  
- #: g10/gpg.c:3202
++#: g10/gpg.c:3235
  #, fuzzy
  msgid "show user ID validity during signature verification"
  msgstr "%s ne estas valida signaro\n"
  
- #: g10/gpg.c:3204
++#: g10/gpg.c:3237
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  
- #: g10/gpg.c:3206
++#: g10/gpg.c:3239
  #, fuzzy
  msgid "show only the primary user ID in signature verification"
  msgstr "%s ne estas valida signaro\n"
  
- #: g10/gpg.c:3208
++#: g10/gpg.c:3241
  msgid "validate signatures with PKA data"
  msgstr ""
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3243
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr ""
  
- #: g10/gpg.c:3217
++#: g10/gpg.c:3250
  #, fuzzy, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "AVERTO: '%s' estas malplena dosiero\n"
  
- #: g10/gpg.c:3220
++#: g10/gpg.c:3253
  #, fuzzy
  msgid "invalid verify options\n"
  msgstr "nevalida ŝlosilaro"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3260
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr ""
  
- #: g10/gpg.c:3417
++#: g10/gpg.c:3452
  #, fuzzy, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "AVERTO: '%s' estas malplena dosiero\n"
  
- #: g10/gpg.c:3420
++#: g10/gpg.c:3455
  msgid "invalid auto-key-locate list\n"
  msgstr ""
  
- #: g10/gpg.c:3553 sm/gpgsm.c:1507
++#: g10/gpg.c:3592 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
  msgstr "AVERTO: programo povas krei core-dosieron!\n"
  
- #: g10/gpg.c:3564
++#: g10/gpg.c:3603
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "AVERTO: %s nuligas %s\n"
  
- #: g10/gpg.c:3573
++#: g10/gpg.c:3612
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s ne eblas kun %s!\n"
  
- #: g10/gpg.c:3576
++#: g10/gpg.c:3615
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s ne havas sencon kun %s!\n"
  
- #: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
++#: g10/gpg.c:3630 sm/gpgsm.c:1518 dirmngr/dirmngr.c:951
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3651
  #, fuzzy, c-format
  msgid "will not run with insecure memory due to %s\n"
  msgstr "skribas sekretan ŝlosilon al '%s'\n"
  
- #: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
++#: g10/gpg.c:3686 g10/gpg.c:3710 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "elektita ĉifrad-metodo ne validas\n"
  
- #: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
++#: g10/gpg.c:3692 g10/gpg.c:3716 sm/gpgsm.c:1591 sm/gpgsm.c:1597
  msgid "selected digest algorithm is invalid\n"
  msgstr "elektita kompendi-metodo ne validas\n"
  
- #: g10/gpg.c:3659
++#: g10/gpg.c:3698
  #, fuzzy
  msgid "selected compression algorithm is invalid\n"
  msgstr "elektita ĉifrad-metodo ne validas\n"
  
- #: g10/gpg.c:3665
++#: g10/gpg.c:3704
  #, fuzzy
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "elektita kompendi-metodo ne validas\n"
  
- #: g10/gpg.c:3680
++#: g10/gpg.c:3719
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed devas esti pli granda ol 0\n"
  
- #: g10/gpg.c:3682
++#: g10/gpg.c:3721
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed devas esti pli granda ol 1\n"
  
- #: g10/gpg.c:3684
++#: g10/gpg.c:3723
  #, fuzzy
  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:3686
++#: g10/gpg.c:3725
  #, fuzzy
  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:3688
++#: g10/gpg.c:3727
  #, fuzzy
  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:3691
++#: g10/gpg.c:3730
  #, fuzzy
  #| 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:3695
++#: g10/gpg.c:3734
  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:3702
++#: g10/gpg.c:3741
  #, fuzzy
  msgid "invalid default preferences\n"
  msgstr "nevalidaj preferoj\n"
  
- #: g10/gpg.c:3706
++#: g10/gpg.c:3745
  #, fuzzy
  msgid "invalid personal cipher preferences\n"
  msgstr "nevalidaj preferoj\n"
  
- #: g10/gpg.c:3710
++#: g10/gpg.c:3749
  #, fuzzy
  msgid "invalid personal digest preferences\n"
  msgstr "nevalidaj preferoj\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3753
  #, fuzzy
  msgid "invalid personal compress preferences\n"
  msgstr "nevalidaj preferoj\n"
  
- #: g10/gpg.c:3750
++#: g10/gpg.c:3789
  #, fuzzy, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s ne havas sencon kun %s!\n"
  
- #: g10/gpg.c:3797
++#: g10/gpg.c:3836
  #, fuzzy, c-format
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
  
- #: g10/gpg.c:3802
++#: g10/gpg.c:3841
  #, fuzzy, c-format
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
  
- #: g10/gpg.c:3807
++#: g10/gpg.c:3846
  #, fuzzy, c-format
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
  
- #: g10/gpg.c:3906
++#: g10/gpg.c:3945
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:3957
  msgid "WARNING: recipients (-r) given without using public key encryption\n"
  msgstr ""
  
- #: g10/gpg.c:3975
- msgid "--store [filename]"
- msgstr "--store [dosiero]"
- 
- #: g10/gpg.c:3985
- msgid "--symmetric [filename]"
- msgstr "--symmetric [dosiero]"
- 
- #: g10/gpg.c:3989
++#: g10/gpg.c:4028
  #, fuzzy, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "malĉifrado malsukcesis: %s\n"
  
- #: g10/gpg.c:4000
- msgid "--encrypt [filename]"
- msgstr "--encrypt [dosiero]"
- 
- #: g10/gpg.c:4016
- #, fuzzy
- msgid "--symmetric --encrypt [filename]"
- msgstr "--sign --encrypt [dosiero]"
- 
- #: g10/gpg.c:4018
++#: g10/gpg.c:4057
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4021
++#: g10/gpg.c:4060
  #, fuzzy, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
  
- #: g10/gpg.c:4042
- msgid "--sign [filename]"
- msgstr "--sign [dosiero]"
- 
- #: g10/gpg.c:4058
- msgid "--sign --encrypt [filename]"
- msgstr "--sign --encrypt [dosiero]"
- 
- #: g10/gpg.c:4076
- #, fuzzy
- msgid "--symmetric --sign --encrypt [filename]"
- msgstr "--sign --encrypt [dosiero]"
- 
- #: g10/gpg.c:4078
++#: g10/gpg.c:4117
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4081
++#: g10/gpg.c:4120
  #, fuzzy, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
  
- #: g10/gpg.c:4105
- msgid "--sign --symmetric [filename]"
- msgstr "--sign --symmetric [dosiero]"
- 
- #: g10/gpg.c:4117
- msgid "--clearsign [filename]"
- msgstr "--clearsign [dosiero]"
- 
- #: g10/gpg.c:4147
- msgid "--decrypt [filename]"
- msgstr "--decrypt [dosiero]"
- 
- #: g10/gpg.c:4174
- msgid "--sign-key user-id"
- msgstr "--sign-key uzantidentigilo"
- 
- #: g10/gpg.c:4178
- msgid "--lsign-key user-id"
- msgstr "--lsign-key uzantidentigilo"
- 
- #: g10/gpg.c:4199
- msgid "--edit-key user-id [commands]"
- msgstr "--edit-key uzantidentigilo [komandoj]"
- 
- #: g10/gpg.c:4215
- #, fuzzy
- msgid "--passwd <user-id>"
- msgstr "--sign-key uzantidentigilo"
- 
- #: g10/gpg.c:4411 g10/keyserver.c:1837
++#: g10/gpg.c:4462 g10/keyserver.c:1837
  #, fuzzy, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
  
- #: g10/gpg.c:4416
++#: g10/gpg.c:4467
  #, fuzzy, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "listigo de sekretaj ŝlosiloj malsukcesis: %s\n"
  
- #: g10/gpg.c:4422
++#: g10/gpg.c:4473
  #, fuzzy, c-format
  msgid "key export failed: %s\n"
  msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4486
  #, fuzzy, c-format
  msgid "export as ssh key failed: %s\n"
  msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
  
- #: g10/gpg.c:4447
++#: g10/gpg.c:4498
  #, fuzzy, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "get_dir_record: search_record malsukcesis: %s\n"
  
- #: g10/gpg.c:4460
++#: g10/gpg.c:4511
  #, fuzzy, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "listigo de sekretaj ŝlosiloj malsukcesis: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4578
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "elkirasigo malsukcesis: %s\n"
  
- #: g10/gpg.c:4538
++#: g10/gpg.c:4589
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "enkirasigo malsukcesis: %s\n"
  
- #: g10/gpg.c:4630
++#: g10/gpg.c:4681
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
  msgstr "nevalida kompendi-metodo '%s'\n"
  
- #: g10/gpg.c:4776 g10/tofu.c:2002
++#: g10/gpg.c:4827 g10/tofu.c:2151
  #, fuzzy, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: g10/gpg.c:4788
++#: g10/gpg.c:4839
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4835
- msgid "[filename]"
- msgstr "[dosiero]"
- 
- #: g10/gpg.c:4841
++#: g10/gpg.c:4894
  msgid "Go ahead and type your message ...\n"
  msgstr "Ektajpu vian mesaĝon ...\n"
  
- #: g10/gpg.c:5179
++#: g10/gpg.c:5232
  msgid "the given certification policy URL is invalid\n"
  msgstr "la donita gvidlinia URL por atestado ne validas\n"
  
- #: g10/gpg.c:5181
++#: g10/gpg.c:5234
  msgid "the given signature policy URL is invalid\n"
  msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
  
- #: g10/gpg.c:5214
++#: g10/gpg.c:5267
  #, fuzzy
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
@@@ -3264,7 -2524,6 +3217,7 @@@ msgstr "Ĉu forviŝi ĉi tiun ŝlosilo
  msgid "make timestamp conflicts only a warning"
  msgstr "malkongruo de tempostampoj"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:345
++#: g10/gpgv.c:82 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
  
@@@ -3293,328 -2547,262 +3246,328 @@@ msgstr "Nenia helpo disponata
  msgid "No help available for '%s'"
  msgstr "Nenia helpo disponata por '%s'"
  
- #: g10/import.c:151
++#: g10/import.c:152
  msgid "import signatures that are marked as local-only"
  msgstr ""
  
- #: g10/import.c:154
++#: g10/import.c:155
  msgid "repair damage from the pks keyserver during import"
  msgstr ""
  
- #: g10/import.c:157
++#: g10/import.c:158
  #, fuzzy
  msgid "do not clear the ownertrust values during import"
  msgstr "aktualigi la fido-datenaron"
  
- #: g10/import.c:160
++#: g10/import.c:161
  #, fuzzy
  msgid "do not update the trustdb after import"
  msgstr "aktualigi la fido-datenaron"
  
- #: g10/import.c:163
++#: g10/import.c:164
  #, fuzzy
  msgid "show key during import"
  msgstr "montri fingrospuron"
  
- #: g10/import.c:166
++#: g10/import.c:167
  msgid "only accept updates to existing keys"
  msgstr ""
  
- #: g10/import.c:169
++#: g10/import.c:170
  #, fuzzy
  msgid "remove unusable parts from key after import"
  msgstr "neuzebla sekreta ŝlosilo"
  
- #: g10/import.c:172
++#: g10/import.c:173
  msgid "remove as much as possible from key after import"
  msgstr ""
  
- #: g10/import.c:175
++#: g10/import.c:176
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:326 g10/import.c:568
++#: g10/import.c:327 g10/import.c:569
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "ignoras blokon de speco %d\n"
  
- #: g10/import.c:585
++#: g10/import.c:586
  #, fuzzy, c-format
  msgid "%lu keys processed so far\n"
  msgstr "%lu ŝlosiloj jam traktitaj\n"
  
- #: g10/import.c:655
++#: g10/import.c:656
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "      Nombro traktita entute: %lu\n"
  
- #: g10/import.c:658
++#: g10/import.c:659
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "    ignoritaj novaj ŝlosiloj: %lu\n"
  
- #: g10/import.c:660
++#: g10/import.c:661
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "    ignoritaj novaj ŝlosiloj: %lu\n"
  
- #: g10/import.c:663
++#: g10/import.c:664
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "         sen uzantidentigilo: %lu\n"
  
- #: g10/import.c:666 sm/import.c:130
++#: g10/import.c:667 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "                  importitaj: %lu"
  
- #: g10/import.c:670 sm/import.c:134
++#: g10/import.c:671 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "                  neŝanĝitaj: %lu\n"
  
- #: g10/import.c:672
++#: g10/import.c:673
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "      novaj uzantidentigiloj: %lu\n"
  
- #: g10/import.c:674
++#: g10/import.c:675
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "           novaj subŝlosiloj: %lu\n"
  
- #: g10/import.c:676
++#: g10/import.c:677
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "            novaj subskriboj: %lu\n"
  
- #: g10/import.c:678
++#: g10/import.c:679
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "         novaj ŝlosilrevokoj: %lu\n"
  
- #: g10/import.c:680 sm/import.c:136
++#: g10/import.c:681 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "   sekretaj ŝlosiloj legitaj: %lu\n"
  
- #: g10/import.c:682 sm/import.c:138
++#: g10/import.c:683 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "sekretaj ŝlosiloj importitaj: %lu\n"
  
- #: g10/import.c:684 sm/import.c:140
++#: g10/import.c:685 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr "sekretaj ŝlosiloj neŝanĝitaj: %lu\n"
  
- #: g10/import.c:686 sm/import.c:142
++#: g10/import.c:687 sm/import.c:142
  #, fuzzy, c-format
  msgid "          not imported: %lu\n"
  msgstr "                  importitaj: %lu"
  
- #: g10/import.c:688
++#: g10/import.c:689
  #, fuzzy, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "            novaj subskriboj: %lu\n"
  
- #: g10/import.c:690
++#: g10/import.c:691
  #, fuzzy, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "   sekretaj ŝlosiloj legitaj: %lu\n"
  
- #: g10/import.c:1034
++#: g10/import.c:1035
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
  "algorithms on these user IDs:\n"
  msgstr ""
  
- #: g10/import.c:1076
++#: g10/import.c:1077
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1091
++#: g10/import.c:1092
  #, fuzzy, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "%s-subskribo de: %s\n"
  
- #: g10/import.c:1103
++#: g10/import.c:1104
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1116
++#: g10/import.c:1117
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr ""
  
- #: g10/import.c:1118
++#: g10/import.c:1119
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  
- #: g10/import.c:1143
++#: g10/import.c:1144
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  
- #: g10/import.c:1379 g10/import.c:2167
++#: g10/import.c:1380 g10/import.c:2168
  #, fuzzy, c-format
  msgid "key %s: no user ID\n"
  msgstr "ŝlosilo %08lX: mankas uzantidentigilo\n"
  
- #: g10/import.c:1385
++#: g10/import.c:1386
  #, fuzzy, c-format
  msgid "key %s: %s\n"
  msgstr "ignoris '%s': %s\n"
  
- #: g10/import.c:1386 g10/import.c:2141
++#: g10/import.c:1387 g10/import.c:2142
  msgid "rejected by import screener"
  msgstr ""
  
- #: g10/import.c:1416
++#: g10/import.c:1417
  #, fuzzy, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "ŝlosilo %08lX: mankas subŝlosilo por ŝlosilbindado\n"
  
- #: g10/import.c:1434
++#: g10/import.c:1435
  #, fuzzy, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "ŝlosilo %08lX: akceptis ne-mem-subskribitan uzantidentigilon '"
  
- #: g10/import.c:1444 g10/import.c:1475
++#: g10/import.c:1445 g10/import.c:1476
  #, fuzzy, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "ŝlosilo %08lX: mankas valida uzantidentigilo\n"
  
- #: g10/import.c:1446
++#: g10/import.c:1447
  msgid "this may be caused by a missing self-signature\n"
  msgstr "tio povas esti kaŭzata de mankanta mem-subskribo\n"
  
- #: g10/import.c:1516 g10/import.c:2318
++#: g10/import.c:1517 g10/import.c:2319
  #, fuzzy, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "ŝlosilo %08lX: publika ŝlosilo ne trovita: %s\n"
  
- #: g10/import.c:1522
++#: g10/import.c:1523
  #, fuzzy, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "ŝlosilo %08lX: nova ŝlosilo - ignorita\n"
  
- #: g10/import.c:1537
++#: g10/import.c:1538
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "neniu skribebla ŝlosilaro trovita: %s\n"
  
- #: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
++#: g10/import.c:1547 g10/import.c:1648 g10/import.c:2385
  #, fuzzy, c-format
  #| msgid "error writing keyring `%s': %s\n"
  msgid "error writing keyring '%s': %s\n"
  msgstr "eraro dum skribado de ŝlosilaro '%s': %s\n"
  
- #: g10/import.c:1566
++#: g10/import.c:1567
  #, fuzzy, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "ŝlosilo %08lX: publika ŝlosilo importita\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1591
  #, fuzzy, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "ŝlosilo %08lX: diferencas de nia kopio\n"
  
- #: g10/import.c:1606 g10/import.c:2342
++#: g10/import.c:1607 g10/import.c:2343
  #, fuzzy, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "ŝlosilo %08lX: ne povas trovi originalan ŝlosilblokon: %s\n"
  
- #: g10/import.c:1614 g10/import.c:2349
++#: g10/import.c:1615 g10/import.c:2350
  #, fuzzy, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "ŝlosilo %08lX: ne povas legi originalan ŝlosilblokon: %s\n"
  
- #: g10/import.c:1657
++#: g10/import.c:1658
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "ŝlosilo %08lX: 1 nova uzantidentigilo\n"
  
- #: g10/import.c:1660
++#: g10/import.c:1661
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "ŝlosilo %08lX: %d novaj uzantidentigiloj\n"
  
- #: g10/import.c:1663
++#: g10/import.c:1664
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "ŝlosilo %08lX: 1 nova subskribo\n"
  
- #: g10/import.c:1666
++#: g10/import.c:1667
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "ŝlosilo %08lX: %d novaj subskriboj\n"
  
- #: g10/import.c:1669
++#: g10/import.c:1670
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "ŝlosilo %08lX: 1 nova subŝlosilo\n"
  
- #: g10/import.c:1672
++#: g10/import.c:1673
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "ŝlosilo %08lX: %d novaj subŝlosiloj\n"
  
- #: g10/import.c:1675
++#: g10/import.c:1676
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "ŝlosilo %08lX: %d novaj subskriboj\n"
  
- #: g10/import.c:1678
++#: g10/import.c:1679
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "ŝlosilo %08lX: %d novaj subskriboj\n"
  
- #: g10/import.c:1681
++#: g10/import.c:1682
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "ŝlosilo %08lX: %d novaj uzantidentigiloj\n"
  
- #: g10/import.c:1684
++#: g10/import.c:1685
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "ŝlosilo %08lX: %d novaj uzantidentigiloj\n"
  
- #: g10/import.c:1707
++#: g10/import.c:1708
  #, fuzzy, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "ŝlosilo %08lX: ne ŝanĝita\n"
  
- #: g10/import.c:2019 g10/import.c:2264
++#: g10/import.c:2020 g10/import.c:2265
  #, fuzzy, c-format
  msgid "key %s: secret key imported\n"
  msgstr "ŝlosilo %08lX: sekreta ŝlosilo importita\n"
  
- #: g10/import.c:2027
++#: g10/import.c:2028
  #, fuzzy, c-format
  #| msgid "skipped: secret key already present\n"
  msgid "key %s: secret key already exists\n"
  msgstr "ignorita: sekreta ŝlosilo jam ĉeestas\n"
  
- #: g10/import.c:2035
++#: g10/import.c:2036
  #, fuzzy, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "eraro dum sendo al '%s': %s\n"
  
- #: g10/import.c:2140
++#: g10/import.c:2141
  #, fuzzy, c-format
  msgid "secret key %s: %s\n"
  msgstr "ŝlosilo '%s' ne trovita: %s\n"
  
- #: g10/import.c:2160 g10/import.c:2195
++#: g10/import.c:2161 g10/import.c:2196
  #, fuzzy
  msgid "importing secret keys not allowed\n"
  msgstr "skribas sekretan ŝlosilon al '%s'\n"
  
- #: g10/import.c:2184
++#: g10/import.c:2185
  #, fuzzy, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr "ŝlosilo %08lX: sekreta ŝlosilo sen publika ŝlosilo - ignorita\n"
@@@ -3629,138 -2817,111 +3582,138 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2256
++#: g10/import.c:2257
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2311
++#: g10/import.c:2312
  #, fuzzy, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
  "ŝlosilo %08lX: publika ŝlosilo mankas - ne povas apliki revokatestilon\n"
  
- #: g10/import.c:2360
++#: g10/import.c:2361
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "ŝlosilo %08lX: nevalida revokatestilo: %s - malakceptita\n"
  
- #: g10/import.c:2393
++#: g10/import.c:2394
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "ŝlosilo %08lX: revokatestilo importita\n"
  
- #: g10/import.c:2469
++#: g10/import.c:2470
  #, fuzzy, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "ŝlosilo %08lX: mankas uzantidentigilo por subskribo\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2487
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr "ŝlosilo %08lX: nerealigita publikŝlosila metodo\n"
  
- #: g10/import.c:2488
++#: g10/import.c:2489
  #, fuzzy, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "ŝlosilo %08lX: nevalida mem-subskribo\n"
  
- #: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
++#: g10/import.c:2506 g10/import.c:2532 g10/import.c:2583
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "ŝlosilo %08lX: nerealigita publikŝlosila metodo\n"
  
- #: g10/import.c:2506
++#: g10/import.c:2507
  #, fuzzy, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "ŝlosilo %08lX: rekta ŝlosilsubskribo aldonita\n"
  
- #: g10/import.c:2520
++#: g10/import.c:2521
  #, fuzzy, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "ŝlosilo %08lX: mankas subŝlosilo por ŝlosilbindado\n"
  
- #: g10/import.c:2533
++#: g10/import.c:2534
  #, fuzzy, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "ŝlosilo %08lX: nevalida subŝlosila bindado\n"
  
- #: g10/import.c:2549
++#: g10/import.c:2550
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "ŝlosilo %08lX: nevalida subŝlosila bindado\n"
  
- #: g10/import.c:2571
++#: g10/import.c:2572
  #, fuzzy, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "ŝlosilo %08lX: mankas subŝlosilo por ŝlosilbindado\n"
  
- #: g10/import.c:2584
++#: g10/import.c:2585
  #, fuzzy, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "ŝlosilo %08lX.%lu: Valida subŝlosilrevoko\n"
  
- #: g10/import.c:2599
++#: g10/import.c:2600
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "ŝlosilo %08lX: nevalida subŝlosila bindado\n"
  
- #: g10/import.c:2641
++#: g10/import.c:2642
  #, fuzzy, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "ŝlosilo %08lX: ignoris uzantidentigilon '"
  
- #: g10/import.c:2665
++#: g10/import.c:2666
  #, fuzzy, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "ŝlosilo %08lX: ignoris subŝlosilon\n"
  
- #: g10/import.c:2694
++#: g10/import.c:2695
  #, fuzzy, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "ŝlosilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
  
- #: g10/import.c:2705
++#: g10/import.c:2706
  #, fuzzy, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "ŝlosilo %08lX: revokatestilo en malĝusta loko - ignorita\n"
  
- #: g10/import.c:2723
++#: g10/import.c:2724
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "ŝlosilo %08lX: nevalida revokatestilo: %s - ignorita\n"
  
- #: g10/import.c:2737
++#: g10/import.c:2738
  #, fuzzy, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "ŝlosilo %08lX: revokatestilo en malĝusta loko - ignorita\n"
  
- #: g10/import.c:2745
++#: g10/import.c:2746
  #, fuzzy, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "ŝlosilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
  
- #: g10/import.c:2887
++#: g10/import.c:2888
  #, fuzzy, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "ŝlosilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
  
- #: g10/import.c:2951
++#: g10/import.c:2952
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr "AVERTO: Ĉi tiu ŝlosilo estas revokita de sia posedanto!\n"
  
- #: g10/import.c:2967
++#: g10/import.c:2968
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr "AVERTO: Ĉi tiu ŝlosilo estas revokita de sia posedanto!\n"
  
- #: g10/import.c:3031
++#: g10/import.c:3032
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "ŝlosilo %08lX: revokatestilo aldonita\n"
  
- #: g10/import.c:3069
++#: g10/import.c:3070
  #, fuzzy, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "ŝlosilo %08lX: rekta ŝlosilsubskribo aldonita\n"
@@@ -3797,54 -2952,43 +3750,54 @@@ msgstr "eraro dum kreado de '%s': %s\n
  msgid "error opening key DB: %s\n"
  msgstr "eraro dum legado de '%s': %s\n"
  
- #: g10/keydb.c:1782
++#: g10/keydb.c:1786
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "malsukcesis rekonstrui ŝlosilaran staplon: %s\n"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[revocation]"
  msgstr "[revoko]"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[self-signature]"
  msgstr "[mem-subskribo]"
  
- #: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
++#: g10/keyedit.c:433 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: dirmngr/ldap-wrapper.c:694
  #, fuzzy, c-format
  msgid "error allocating memory: %s\n"
  msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
  
- #: g10/keyedit.c:629
++#: g10/keyedit.c:630
  #, fuzzy, c-format
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr "ŝlosilo %08lX: nerealigita publikŝlosila metodo\n"
  
- #: g10/keyedit.c:638
++#: g10/keyedit.c:639
  #, fuzzy, c-format
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "%s-subskribo de: %s\n"
  
- #: g10/keyedit.c:800
++#: g10/keyedit.c:801
  #, fuzzy
  msgid " (reordered signatures follow)"
  msgstr "Bona subskribo de \""
  
- #: g10/keyedit.c:913
++#: g10/keyedit.c:914
  #, fuzzy, c-format
  msgid "key %s:\n"
  msgstr "ignoris '%s': %s\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:917
  #, fuzzy, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
  msgstr[0] "Uzantidentigilo \"%s\" estas revokita.\n"
  msgstr[1] "Uzantidentigilo \"%s\" estas revokita.\n"
  
- #: g10/keyedit.c:919 g10/keylist.c:480
++#: g10/keyedit.c:920 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
@@@ -3852,7 -2996,6 +3805,7 @@@ msgid_plural "%d signatures not checke
  msgstr[0] "1 subskribo ne kontrolita pro manko de ŝlosilo\n"
  msgstr[1] "1 subskribo ne kontrolita pro manko de ŝlosilo\n"
  
- #: g10/keyedit.c:923 g10/keylist.c:476
++#: g10/keyedit.c:924 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
@@@ -3860,21 -3003,18 +3813,21 @@@ msgid_plural "%d bad signatures\n
  msgstr[0] "%d malbonaj subskriboj\n"
  msgstr[1] "%d malbonaj subskriboj\n"
  
- #: g10/keyedit.c:927
++#: g10/keyedit.c:928
  #, fuzzy, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
  msgstr[0] "Bona subskribo de \""
  msgstr[1] "Bona subskribo de \""
  
- #: g10/keyedit.c:932
++#: g10/keyedit.c:933
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:992 g10/pkclist.c:274
++#: g10/keyedit.c:993 g10/pkclist.c:274
  #, fuzzy
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
@@@ -3887,69 -3027,54 +3840,69 @@@ msgstr "
  "kontrolante fingrospurojn el diversaj fontoj ...)?\n"
  "\n"
  
- #: g10/keyedit.c:996 g10/pkclist.c:286
++#: g10/keyedit.c:997 g10/pkclist.c:286
  #, fuzzy, c-format
  msgid "  %d = I trust marginally\n"
  msgstr " %d = Mi fidas iomete\n"
  
- #: g10/keyedit.c:997 g10/pkclist.c:288
++#: g10/keyedit.c:998 g10/pkclist.c:288
  #, fuzzy, c-format
  msgid "  %d = I trust fully\n"
  msgstr " %d = Mi plene fidas\n"
  
- #: g10/keyedit.c:1015
++#: g10/keyedit.c:1016
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
  "trust signatures on your behalf.\n"
  msgstr ""
  
- #: g10/keyedit.c:1032
++#: g10/keyedit.c:1033
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  
- #: g10/keyedit.c:1160
++#: g10/keyedit.c:1161
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1168
++#: g10/keyedit.c:1169
  #, fuzzy, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
  
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
- #: g10/keyedit.c:2246
++#: g10/keyedit.c:1178 g10/keyedit.c:1206 g10/keyedit.c:1233 g10/keyedit.c:1417
++#: g10/keyedit.c:2247
  #, fuzzy
  msgid "Are you sure you still want to sign it? (y/N) "
  msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas subskribi ĝin?\n"
  
- #: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
- #: g10/keyedit.c:2251 g10/keyedit.c:3177
++#: g10/keyedit.c:1192 g10/keyedit.c:1220 g10/keyedit.c:1247 g10/keyedit.c:1423
++#: g10/keyedit.c:2252 g10/keyedit.c:3178
  msgid "  Unable to sign.\n"
  msgstr ""
  
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1197
  #, fuzzy, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
  
- #: g10/keyedit.c:1224
++#: g10/keyedit.c:1225
  #, fuzzy, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "AVERTO: '%s' estas malplena dosiero\n"
  
- #: g10/keyedit.c:1253
++#: g10/keyedit.c:1254
  #, fuzzy, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "AVERTO: '%s' estas malplena dosiero\n"
  
- #: g10/keyedit.c:1255
++#: g10/keyedit.c:1256
  #, fuzzy
  msgid "Sign it? (y/N) "
  msgstr "Ĉu vere subskribi? "
  
- #: g10/keyedit.c:1282
++#: g10/keyedit.c:1283
  #, fuzzy, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -3960,7 -3085,6 +3913,7 @@@ msgstr "
  "\n"
  "Ĉu vi volas igi ĝin plena eksportebla subskribo?\n"
  
- #: g10/keyedit.c:1291
++#: g10/keyedit.c:1292
  #, fuzzy
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr ""
@@@ -3969,7 -3093,6 +3922,7 @@@
  "\n"
  "Ĉu vi volas igi ĝin plena eksportebla subskribo?\n"
  
- #: g10/keyedit.c:1304
++#: g10/keyedit.c:1305
  #, fuzzy, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3980,12 -3103,10 +3933,12 @@@ msgstr "
  "\n"
  "Ĉu vi volas igi ĝin plena eksportebla subskribo?\n"
  
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:1310
  #, fuzzy
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr "Ĉu vi volas, ke via subskribo eksvalidiĝu je la sama tempo? (j/n) "
  
- #: g10/keyedit.c:1330
++#: g10/keyedit.c:1331
  #, fuzzy, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3996,7 -3117,6 +3949,7 @@@ msgstr "
  "\n"
  "Ĉu vi volas igi ĝin plena eksportebla subskribo?\n"
  
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:1336
  #, fuzzy
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr ""
@@@ -4005,41 -3125,33 +3958,41 @@@
  "\n"
  "Ĉu vi volas igi ĝin plena eksportebla subskribo?\n"
  
- #: g10/keyedit.c:1355
++#: g10/keyedit.c:1356
  #, fuzzy, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "\"%s\" jam estis %ssubskribita per ŝlosilo %08lX\n"
  
- #: g10/keyedit.c:1359
++#: g10/keyedit.c:1360
  #, fuzzy, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "\"%s\" jam estis %ssubskribita per ŝlosilo %08lX\n"
  
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:1365
  #, fuzzy
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas subskribi ĝin?\n"
  
- #: g10/keyedit.c:1386
++#: g10/keyedit.c:1387
  #, fuzzy, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "Nenio por subskribi per ŝlosilo %08lX\n"
  
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1411
  msgid "This key has expired!"
  msgstr "Ĉi tiu ŝlosilo eksvalidiĝis!"
  
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1429
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
  
- #: g10/keyedit.c:1434
++#: g10/keyedit.c:1435
  #, fuzzy
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr "Ĉu vi volas, ke via subskribo eksvalidiĝu je la sama tempo? (j/n) "
  
- #: g10/keyedit.c:1475
++#: g10/keyedit.c:1476
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -4048,32 -3160,26 +4001,32 @@@ msgstr "
  "Kiom zorge vi kontrolis, ke la ŝlosilo, kiun vi subskribos, vere apartenas\n"
  "al la supre nomita persono? Se vi ne scias la respondon, donu \"0\".\n"
  
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1481
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) Mi ne respondas.%s\n"
  
- #: g10/keyedit.c:1482
++#: g10/keyedit.c:1483
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) Mi tute ne kontrolis.%s\n"
  
- #: g10/keyedit.c:1484
++#: g10/keyedit.c:1485
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) Mi malzorge kontrolis.%s\n"
  
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:1488
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) Mi tre zorge kontrolis.%s\n"
  
- #: g10/keyedit.c:1494
++#: g10/keyedit.c:1495
  #, fuzzy
  msgid "Your selection? (enter '?' for more information): "
  msgstr " i = bonvolu montri pli da informoj\n"
  
- #: g10/keyedit.c:1521
++#: g10/keyedit.c:1522
  #, fuzzy, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -4082,264 -3188,210 +4035,264 @@@ msgstr "
  "Ĉu vi estas tute certa, ke vi volas subskribi ĉi tiun ŝlosilon\n"
  "per via ŝlosilo: \""
  
- #: g10/keyedit.c:1529
++#: g10/keyedit.c:1530
  #, fuzzy
  msgid "This will be a self-signature.\n"
  msgstr "tio povas esti kaŭzata de mankanta mem-subskribo\n"
  
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:1535
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr ""
  "\n"
  "La subskribo estos markita kiel neeksportebla.\n"
  
- #: g10/keyedit.c:1541
++#: g10/keyedit.c:1542
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr ""
  "\n"
  "La subskribo estos markita kiel nerevokebla.\n"
  
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1552
  #, fuzzy
  msgid "The signature will be marked as non-exportable.\n"
  msgstr ""
  "\n"
  "La subskribo estos markita kiel neeksportebla.\n"
  
- #: g10/keyedit.c:1558
++#: g10/keyedit.c:1559
  #, fuzzy
  msgid "The signature will be marked as non-revocable.\n"
  msgstr ""
  "\n"
  "La subskribo estos markita kiel nerevokebla.\n"
  
- #: g10/keyedit.c:1565
++#: g10/keyedit.c:1566
  #, fuzzy
  msgid "I have not checked this key at all.\n"
  msgstr ""
  "\n"
  "Mi tute ne kontrolis ĉi tiun ŝlosilon.\n"
  
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:1571
  #, fuzzy
  msgid "I have checked this key casually.\n"
  msgstr ""
  "\n"
  "Mi malzorge kontrolis ĉi tiun ŝlosilon.\n"
  
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:1576
  #, fuzzy
  msgid "I have checked this key very carefully.\n"
  msgstr ""
  "\n"
  "Mi tre zorge kontrolis ĉi tiun ŝlosilon.\n"
  
- #: g10/keyedit.c:1587
++#: g10/keyedit.c:1588
  #, fuzzy
  msgid "Really sign? (y/N) "
  msgstr "Ĉu vere subskribi? "
  
- #: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
- #: g10/keyedit.c:6463 g10/sign.c:323
++#: g10/keyedit.c:1639 g10/keyedit.c:6308 g10/keyedit.c:6391 g10/keyedit.c:6500
++#: g10/keyedit.c:6562 g10/sign.c:325
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "subskribado malsukcesis: %s\n"
  
- #: g10/keyedit.c:1725
++#: g10/keyedit.c:1726
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  
- #: g10/keyedit.c:1755
++#: g10/keyedit.c:1756
  #, fuzzy, c-format
  #| msgid "error creating passphrase: %s\n"
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: g10/keyedit.c:1869
++#: g10/keyedit.c:1870
  msgid "save and quit"
  msgstr "skribi kaj fini"
  
- #: g10/keyedit.c:1872
++#: g10/keyedit.c:1873
  #, fuzzy
  msgid "show key fingerprint"
  msgstr "montri fingrospuron"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1874
  #, fuzzy
  msgid "show the keygrip"
  msgstr "Subskribo-notacio: "
  
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1875
  msgid "list key and user IDs"
  msgstr "listigi ŝlosilojn kaj uzantidentigilojn"
  
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1877
  msgid "select user ID N"
  msgstr "elekti uzantidentigilon N"
  
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1878
  #, fuzzy
  msgid "select subkey N"
  msgstr "elekti uzantidentigilon N"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1879
  #, fuzzy
  msgid "check signatures"
  msgstr "revoki subskribojn"
  
- #: g10/keyedit.c:1884
++#: g10/keyedit.c:1885
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr ""
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1890
  #, fuzzy
  msgid "sign selected user IDs locally"
  msgstr "subskribi la ŝlosilon loke"
  
- #: g10/keyedit.c:1890
++#: g10/keyedit.c:1891
  #, fuzzy
  msgid "sign selected user IDs with a trust signature"
  msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1893
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr ""
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1895
  msgid "add a user ID"
  msgstr "aldoni uzantidentigilon"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1897
  msgid "add a photo ID"
  msgstr "aldoni foto-identigilon"
  
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1898
  #, fuzzy
  msgid "delete selected user IDs"
  msgstr "forviŝi uzantidentigilon"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1901
  #, fuzzy
  msgid "add a subkey"
  msgstr "al"
  
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1904
  msgid "add a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1906
  msgid "move a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1908
  msgid "move a backup key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1910
  #, fuzzy
  msgid "delete selected subkeys"
  msgstr "forviŝi flankan ŝlosilon"
  
- #: g10/keyedit.c:1911
++#: g10/keyedit.c:1912
  #, fuzzy
  msgid "add a revocation key"
  msgstr "aldoni flankan ŝlosilon"
  
- #: g10/keyedit.c:1913
++#: g10/keyedit.c:1914
  #, fuzzy
  msgid "delete signatures from the selected user IDs"
  msgstr "Ĉu vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1916
  #, fuzzy
  msgid "change the expiration date for the key or selected subkeys"
  msgstr "Vi ne povas ŝanĝi la daton de eksvalidiĝo de v3-ŝlosilo\n"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1918
  #, fuzzy
  msgid "flag the selected user ID as primary"
  msgstr "marku uzantidentigilon kiel ĉefan"
  
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1921
  msgid "list preferences (expert)"
  msgstr "listigi preferojn (spertula)"
  
- #: g10/keyedit.c:1921
++#: g10/keyedit.c:1922
  msgid "list preferences (verbose)"
  msgstr "listigi preferojn (detale)"
  
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:1924
  #, fuzzy
  msgid "set preference list for the selected user IDs"
  msgstr "Ĉu vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
  
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1927
  #, fuzzy
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr "ne povis analizi URI de ŝlosilservilo\n"
  
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1929
  #, fuzzy
  msgid "set a notation for the selected user IDs"
  msgstr "Ĉu vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1931
  msgid "change the passphrase"
  msgstr "ŝanĝi la pasfrazon"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1934
  msgid "change the ownertrust"
  msgstr "ŝanĝi la posedantofidon"
  
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1937
  #, fuzzy
  msgid "revoke signatures on the selected user IDs"
  msgstr "Ĉu vere forigi ĉiujn elektitajn uzantidentigilojn? "
  
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1939
  #, fuzzy
  msgid "revoke selected user IDs"
  msgstr "aldoni uzantidentigilon"
  
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1942
  #, fuzzy
  msgid "revoke key or selected subkeys"
  msgstr "revoki flankan ŝlosilon"
  
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1944
  #, fuzzy
  msgid "enable key"
  msgstr "ŝalti ŝlosilon"
  
- #: g10/keyedit.c:1944
++#: g10/keyedit.c:1945
  #, fuzzy
  msgid "disable key"
  msgstr "malŝalti ŝlosilon"
  
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1947
  #, fuzzy
  msgid "show selected photo IDs"
  msgstr "montri foto-identigilon"
  
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1949
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:1951
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2063
  msgid "Secret key is available.\n"
  msgstr "Sekreta ŝlosilo estas havebla.\n"
  
- #: g10/keyedit.c:2162
++#: g10/keyedit.c:2163
  msgid "Need the secret key to do this.\n"
  msgstr "Bezonas la sekretan ŝlosilon por fari tion.\n"
  
- #: g10/keyedit.c:2183
++#: g10/keyedit.c:2184
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4347,315 -3399,251 +4300,320 @@@
  "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
  msgstr ""
  
- #: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
++#: g10/keyedit.c:2240 g10/keyedit.c:3178 g10/keyedit.c:3317 g10/keyedit.c:3379
  #, fuzzy
  msgid "Key is revoked."
  msgstr "Ŝlosilo estas revokita.\n"
  
- #: g10/keyedit.c:2262
++#: g10/keyedit.c:2263
  #, fuzzy
  msgid "Really sign all user IDs? (y/N) "
  msgstr "Ĉu vere subskribi ĉiujn uzantidentigilojn? "
  
- #: g10/keyedit.c:2266
++#: g10/keyedit.c:2267
  #, fuzzy
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "Ĉu vere subskribi ĉiujn uzantidentigilojn? "
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2275
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
  
- #: g10/keyedit.c:2285
++#: g10/keyedit.c:2286
  #, fuzzy, c-format
  msgid "Unknown signature type '%s'\n"
  msgstr "nekonata klaso de subskribo"
  
- #: g10/keyedit.c:2309
++#: g10/keyedit.c:2310
  #, 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/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
++#: g10/keyedit.c:2332 g10/keyedit.c:2356 g10/keyedit.c:2550
  msgid "You must select at least one user ID.\n"
  msgstr "Vi devas elekti almenaŭ unu uzantidentigilon.\n"
  
- #: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
++#: g10/keyedit.c:2334 g10/keyedit.c:2358 g10/keyedit.c:2512 g10/keyedit.c:2552
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2336
++#: g10/keyedit.c:2337
  msgid "You can't delete the last user ID!\n"
  msgstr "Vi ne povas forviŝi la lastan uzantidentigilon!\n"
  
- #: g10/keyedit.c:2339
++#: g10/keyedit.c:2340
  #, fuzzy
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "Ĉu vere forigi ĉiujn elektitajn uzantidentigilojn? "
  
- #: g10/keyedit.c:2340
++#: g10/keyedit.c:2341
  #, fuzzy
  msgid "Really remove this user ID? (y/N) "
  msgstr "Ĉu vere forigi ĉi tiun uzantidentigilon? "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2397
++#: g10/keyedit.c:2398
  #, fuzzy
  msgid "Really move the primary key? (y/N) "
  msgstr "Ĉu vere forigi ĉi tiun uzantidentigilon? "
  
- #: g10/keyedit.c:2409 g10/keyedit.c:4866
++#: g10/keyedit.c:2410 g10/keyedit.c:4964
  #, fuzzy
  msgid "You must select exactly one key.\n"
  msgstr "Vi devas elekti almenaŭ unu ŝlosilon.\n"
  
- #: g10/keyedit.c:2436
++#: g10/keyedit.c:2437
  msgid "Command expects a filename argument\n"
  msgstr ""
  
- #: g10/keyedit.c:2457
++#: g10/keyedit.c:2458
  #, fuzzy, c-format
  msgid "Can't open '%s': %s\n"
  msgstr "ne povas malfermi '%s': %s\n"
  
- #: g10/keyedit.c:2474
++#: g10/keyedit.c:2475
  #, fuzzy, c-format
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
  
- #: g10/keyedit.c:2509
++#: g10/keyedit.c:2510
  msgid "You must select at least one key.\n"
  msgstr "Vi devas elekti almenaŭ unu ŝlosilon.\n"
  
- #: g10/keyedit.c:2515
++#: g10/keyedit.c:2516
  #, fuzzy
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "Ĉu vi vere volas forviŝi la elektitajn ŝlosilojn? "
  
- #: g10/keyedit.c:2517
++#: g10/keyedit.c:2518
  #, fuzzy
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "Ĉu vi vere volas forviŝi ĉi tiun ŝlosilon? "
  
- #: g10/keyedit.c:2555
++#: g10/keyedit.c:2556
  #, fuzzy
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr "Ĉu vere forigi ĉiujn elektitajn uzantidentigilojn? "
  
- #: g10/keyedit.c:2556
++#: g10/keyedit.c:2557
  #, fuzzy
  msgid "Really revoke this user ID? (y/N) "
  msgstr "Ĉu vere forigi ĉi tiun uzantidentigilon? "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2575
  #, fuzzy
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "Ĉu vi vere volas revoki ĉi tiun ŝlosilon? "
  
- #: g10/keyedit.c:2585
++#: g10/keyedit.c:2586
  #, fuzzy
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "Ĉu vi vere volas revoki la elektitajn ŝlosilojn? "
  
- #: g10/keyedit.c:2587
++#: g10/keyedit.c:2588
  #, fuzzy
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "Ĉu vi vere volas revoki ĉi tiun ŝlosilon? "
  
- #: g10/keyedit.c:2645
++#: g10/keyedit.c:2646
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  
- #: g10/keyedit.c:2690
++#: g10/keyedit.c:2691
  #, fuzzy
  msgid "Set preference list to:\n"
  msgstr "agordi liston de preferoj"
  
- #: g10/keyedit.c:2697
++#: g10/keyedit.c:2698
  #, fuzzy
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr "Ĉu vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
  
- #: g10/keyedit.c:2699
++#: g10/keyedit.c:2700
  #, fuzzy
  msgid "Really update the preferences? (y/N) "
  msgstr "Ĉu vere aktualigi la preferojn? "
  
- #: g10/keyedit.c:2773
++#: g10/keyedit.c:2774
  #, fuzzy
  msgid "Save changes? (y/N) "
  msgstr "Ĉu skribi ŝanĝojn? "
  
- #: g10/keyedit.c:2777
++#: g10/keyedit.c:2778
  #, fuzzy
  msgid "Quit without saving? (y/N) "
  msgstr "Ĉu fini sen skribi ŝanĝojn? "
  
- #: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
- #: g10/keyedit.c:3267 g10/keyedit.c:3332
++#: g10/keyedit.c:2789 g10/keyedit.c:2799 g10/keyedit.c:2943 g10/keyedit.c:3046
++#: g10/keyedit.c:3268 g10/keyedit.c:3333 g10/keyedit.c:3409
  #, c-format
  msgid "update failed: %s\n"
  msgstr "aktualigo malsukcesis: %s\n"
  
- #: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
++#: g10/keyedit.c:2805 g10/keyedit.c:3273 g10/keyedit.c:3338 g10/keyedit.c:3416
  msgid "Key not changed so no update needed.\n"
  msgstr "Ŝlosilo ne ŝanĝita, do aktualigo ne necesas.\n"
  
- #: g10/keyedit.c:3038
++#: g10/keyedit.c:3039
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
  msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
  
- #: g10/keyedit.c:3083
++#: g10/keyedit.c:3084
  #, fuzzy, c-format
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "%s: nevalida dosiero-versio %d\n"
  
- #: g10/keyedit.c:3112
++#: g10/keyedit.c:3113
  #, fuzzy, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
  
- #: g10/keyedit.c:3248 g10/keyedit.c:3251
++#: g10/keyedit.c:3249 g10/keyedit.c:3252
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
  msgstr "nevalida valoro\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  #, fuzzy
  #| msgid "No such user ID.\n"
  msgid "No matching user IDs."
  msgstr "Uzantidentigilo ne ekzistas.\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  #, fuzzy
  msgid "Nothing to sign.\n"
  msgstr "Nenio por subskribi per ŝlosilo %08lX\n"
  
- #: g10/keyedit.c:3427
++#: g10/keyedit.c:3388
+ #, fuzzy, c-format
+ msgid "'%s' is not a valid expiration time\n"
+ msgstr "%s ne estas valida signaro\n"
+ 
++#: g10/keyedit.c:3508
  msgid "Digest: "
  msgstr ""
  
- #: g10/keyedit.c:3484
++#: g10/keyedit.c:3565
  msgid "Features: "
  msgstr ""
  
- #: g10/keyedit.c:3495
++#: g10/keyedit.c:3576
  msgid "Keyserver no-modify"
  msgstr ""
  
- #: g10/keyedit.c:3510 g10/keylist.c:377
++#: g10/keyedit.c:3591 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr ""
  
- #: g10/keyedit.c:3518 g10/keyedit.c:3519
++#: g10/keyedit.c:3599 g10/keyedit.c:3600
  #, fuzzy
  msgid "Notations: "
  msgstr "Notacio: "
  
- #: g10/keyedit.c:3764
++#: g10/keyedit.c:3845
  msgid "There are no preferences on a PGP 2.x-style user ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:3836
++#: g10/keyedit.c:3917
  #, 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:3860
++#: g10/keyedit.c:3941
  #, 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:3866
++#: g10/keyedit.c:3947
  #, fuzzy
  msgid "(sensitive)"
  msgstr " (sentema)"
  
- #: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3989 g10/keyedit.c:4131 g10/keylist.c:262 g10/keyserver.c:538
  #, fuzzy, c-format
  msgid "created: %s"
  msgstr "ne povas krei %s: %s\n"
  
- #: g10/keyedit.c:3911 g10/keylist.c:1852
++#: g10/keyedit.c:3992 g10/keylist.c:1852
  #, fuzzy, c-format
  msgid "revoked: %s"
  msgstr "rev"
  
- #: g10/keyedit.c:3913 g10/keylist.c:1858
++#: g10/keyedit.c:3994 g10/keylist.c:1858
  #, fuzzy, c-format
  msgid "expired: %s"
  msgstr " [eksvalidiĝos: %s]"
  
- #: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyedit.c:3996 g10/keyedit.c:4133 g10/keylist.c:264 g10/keylist.c:1864
 +#: g10/keyserver.c:544
  #, fuzzy, c-format
  msgid "expires: %s"
  msgstr " [eksvalidiĝos: %s]"
  
- #: g10/keyedit.c:3917
++#: g10/keyedit.c:3998
  #, fuzzy, c-format
  msgid "usage: %s"
  msgstr " fido: %c/%c"
  
- #: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
++#: g10/keyedit.c:4006 g10/keyedit.c:4026 g10/keylist.c:267
  msgid "card-no: "
  msgstr ""
  
- #: g10/keyedit.c:3984
++#: g10/keyedit.c:4065
  #, fuzzy, c-format
  msgid "trust: %s"
  msgstr " fido: %c/%c"
  
- #: g10/keyedit.c:3988
++#: g10/keyedit.c:4069
  #, c-format
  msgid "validity: %s"
  msgstr ""
  
- #: g10/keyedit.c:3995
++#: g10/keyedit.c:4076
  msgid "This key has been disabled"
  msgstr "Ĉi tiu ŝlosilo estas malŝaltita"
  
- #: g10/keyedit.c:4013
++#: g10/keyedit.c:4094
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
  msgstr ""
  
- #: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
- #: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: g10/keyedit.c:4150 g10/keyedit.c:4581 g10/keyserver.c:548
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:712
 +#: dirmngr/ocsp.c:703
  #, fuzzy
  msgid "revoked"
  msgstr "rev"
  
- #: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
- #: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4152 g10/keyedit.c:4583 g10/keyserver.c:552
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:714
  #, fuzzy
  msgid "expired"
  msgstr "eksval"
  
- #: g10/keyedit.c:4188
++#: g10/keyedit.c:4269
  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:4240
++#: g10/keyedit.c:4321
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr ""
  
- #: g10/keyedit.c:4241
++#: g10/keyedit.c:4322
  #, fuzzy
  #| 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:4300
++#: g10/keyedit.c:4381
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4664,36 -3652,28 +4622,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:4305 g10/keyedit.c:4595
++#: g10/keyedit.c:4386 g10/keyedit.c:4676
  #, 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:4311
++#: g10/keyedit.c:4392
  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:4326 g10/keygen.c:2697
++#: g10/keyedit.c:4407 g10/keygen.c:2719
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4509
  msgid "Delete this good signature? (y/N/q)"
  msgstr "Ĉu forviŝi ĉi tiun bonan subskribon? (j/N/f)"
  
- #: g10/keyedit.c:4438
++#: g10/keyedit.c:4519
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "Ĉu forviŝi ĉi tiun nevalidan subskribon? (j/N/f)"
  
- #: g10/keyedit.c:4442
++#: g10/keyedit.c:4523
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "Ĉu forviŝi ĉi tiun nekonatan subskribon? (j/N/f)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4530
  msgid "Really delete this self-signature? (y/N)"
  msgstr "Ĉu vere forviŝi ĉi tiun mem-subskribon? (j/N)"
  
- #: g10/keyedit.c:4465
++#: g10/keyedit.c:4546
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
@@@ -4701,37 -3681,30 +4659,37 @@@ msgid_plural "Deleted %d signatures.\n
  msgstr[0] "Forviŝis %d subskribon.\n"
  msgstr[1] "Forviŝis %d subskribon.\n"
  
- #: g10/keyedit.c:4469
++#: g10/keyedit.c:4550
  msgid "Nothing deleted.\n"
  msgstr "Nenio estis forviŝita.\n"
  
- #: g10/keyedit.c:4504 g10/trust.c:693
++#: g10/keyedit.c:4585 g10/trust.c:716
  msgid "invalid"
  msgstr "nevalida"
  
- #: g10/keyedit.c:4506
++#: g10/keyedit.c:4587
  #, fuzzy, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
  
- #: g10/keyedit.c:4512
++#: g10/keyedit.c:4593
  #, 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:4520
++#: g10/keyedit.c:4601
  #, fuzzy, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
  
- #: g10/keyedit.c:4521
++#: g10/keyedit.c:4602
  #, fuzzy, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
  
- #: g10/keyedit.c:4590
++#: g10/keyedit.c:4671
  #, fuzzy
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
@@@ -4741,283 -3714,224 +4699,283 @@@ 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:4601
++#: g10/keyedit.c:4682
  #, 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:4618
++#: g10/keyedit.c:4699
  #, fuzzy
  msgid "Enter the user ID of the designated revoker: "
  msgstr "Donu la ŝlosilgrandon"
  
- #: g10/keyedit.c:4643
++#: g10/keyedit.c:4724
  msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
  msgstr ""
  
- #: g10/keyedit.c:4658
++#: g10/keyedit.c:4739
  msgid "you cannot appoint a key as its own designated revoker\n"
  msgstr ""
  
- #: g10/keyedit.c:4680
++#: g10/keyedit.c:4761
  #, fuzzy
  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:4698
++#: g10/keyedit.c:4779
  msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
  msgstr ""
  
- #: g10/keyedit.c:4704
++#: g10/keyedit.c:4785
  #, 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:4755
++#: g10/keyedit.c:4848
  #, 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:4760
++#: g10/keyedit.c:4853
  #, fuzzy
  msgid "Changing expiration time for a subkey.\n"
  msgstr "Ŝanĝas la daton de eksvalidiĝo de flanka ŝlosilo.\n"
  
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:4856
  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:4814
++#: g10/keyedit.c:4910
  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:4987
++#: g10/keyedit.c:5085
  #, fuzzy, c-format
  msgid "signing subkey %s is already cross-certified\n"
  msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
  
- #: g10/keyedit.c:4993
++#: g10/keyedit.c:5091
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr ""
  
- #: g10/keyedit.c:5108
++#: g10/keyedit.c:5206
  msgid "Please select exactly one user ID.\n"
  msgstr "Bonvolu elekti precize unu uzantidentigilon.\n"
  
- #: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
++#: g10/keyedit.c:5247 g10/keyedit.c:5361 g10/keyedit.c:5474 g10/keyedit.c:5611
  #, fuzzy, c-format
  msgid "skipping v3 self-signature on user ID \"%s\"\n"
  msgstr "ŝlosilo %08lX: nevalida mem-subskribo\n"
  
- #: g10/keyedit.c:5320
++#: g10/keyedit.c:5418
  msgid "Enter your preferred keyserver URL: "
  msgstr ""
  
- #: g10/keyedit.c:5399
++#: g10/keyedit.c:5497
  #, 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:5400
++#: g10/keyedit.c:5498
  #, 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:5459
++#: g10/keyedit.c:5557
  #, fuzzy
  msgid "Enter the notation: "
  msgstr "Subskribo-notacio: "
  
- #: g10/keyedit.c:5606
++#: g10/keyedit.c:5704
  #, fuzzy
  msgid "Proceed? (y/N) "
  msgstr "Ĉu surskribi (j/N)? "
  
- #: g10/keyedit.c:5676
++#: g10/keyedit.c:5774
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "Mankas uzantidentigilo kun indekso %d\n"
  
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5836
  #, fuzzy, c-format
  msgid "No user ID with hash %s\n"
  msgstr "Mankas uzantidentigilo kun indekso %d\n"
  
- #: g10/keyedit.c:5839
++#: g10/keyedit.c:5937
  #, fuzzy, c-format
  msgid "No subkey with key ID '%s'.\n"
  msgstr "Mankas uzantidentigilo kun indekso %d\n"
  
- #: g10/keyedit.c:5861
++#: g10/keyedit.c:5959
  #, fuzzy, c-format
  msgid "No subkey with index %d\n"
  msgstr "Mankas uzantidentigilo kun indekso %d\n"
  
- #: g10/keyedit.c:6002
++#: g10/keyedit.c:6100
  #, fuzzy, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "uzantidentigilo: \""
  
- #: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
++#: g10/keyedit.c:6103 g10/keyedit.c:6205 g10/keyedit.c:6253
  #, 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:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
++#: g10/keyedit.c:6105 g10/keyedit.c:6207 g10/keyedit.c:6255
  msgid " (non-exportable)"
  msgstr ""
  
- #: g10/keyedit.c:6011
++#: g10/keyedit.c:6109
  #, fuzzy, c-format
  msgid "This signature expired on %s.\n"
  msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
  
- #: g10/keyedit.c:6016
++#: g10/keyedit.c:6114
  #, 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:6021
++#: g10/keyedit.c:6119
  #, fuzzy
  msgid "Create a revocation certificate for this signature? (y/N) "
  msgstr "Ĉu krei revokatestilon por ĉi tiu subskribo? (j/N)"
  
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6173
  #, fuzzy
  msgid "Not signed by you.\n"
  msgstr "   subskribita per %08lX je %s%s\n"
  
- #: g10/keyedit.c:6081
++#: g10/keyedit.c:6179
  #, fuzzy, c-format
  msgid "You have signed these user IDs on key %s:\n"
  msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
  
- #: g10/keyedit.c:6110
++#: g10/keyedit.c:6208
  #, fuzzy
  msgid " (non-revocable)"
  msgstr "subskribi ŝlosilon nerevokeble"
  
- #: g10/keyedit.c:6117
++#: g10/keyedit.c:6215
  #, fuzzy, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "   revokita de %08lX je %s\n"
  
- #: g10/keyedit.c:6142
++#: g10/keyedit.c:6240
  msgid "You are about to revoke these signatures:\n"
  msgstr "Vi revokos la sekvajn subskribojn:\n"
  
- #: g10/keyedit.c:6165
++#: g10/keyedit.c:6263
  #, fuzzy
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "Ĉu vere krei la revokatestilojn? (j/N)"
  
- #: g10/keyedit.c:6198
++#: g10/keyedit.c:6296
  msgid "no secret key\n"
  msgstr "mankas sekreta ŝlosilo\n"
  
- #: g10/keyedit.c:6246
++#: g10/keyedit.c:6344
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6256
++#: g10/keyedit.c:6354
  #, fuzzy, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
  
- #: g10/keyedit.c:6273
++#: g10/keyedit.c:6371
  #, c-format
  msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
  msgstr ""
  
- #: g10/keyedit.c:6386
++#: g10/keyedit.c:6485
  #, fuzzy, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
  
- #: g10/keyedit.c:6448
++#: g10/keyedit.c:6547
  #, fuzzy, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
  
- #: g10/keyedit.c:6545
++#: g10/keyedit.c:6644
  #, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr ""
  
- #: g10/keygen.c:305
++#: g10/keygen.c:316
  #, fuzzy, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "prefero %c%lu ripetita\n"
  
- #: g10/keygen.c:312
++#: g10/keygen.c:323
  #, fuzzy
  msgid "too many cipher preferences\n"
  msgstr "tro da '%c'-preferoj\n"
  
- #: g10/keygen.c:314
++#: g10/keygen.c:325
  #, fuzzy
  msgid "too many digest preferences\n"
  msgstr "tro da '%c'-preferoj\n"
  
- #: g10/keygen.c:316
++#: g10/keygen.c:327
  #, fuzzy
  msgid "too many compression preferences\n"
  msgstr "tro da '%c'-preferoj\n"
  
- #: g10/keygen.c:457
++#: g10/keygen.c:468
  #, fuzzy, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "nevalida signo en signoĉeno\n"
  
- #: g10/keygen.c:936
++#: g10/keygen.c:947
  #, fuzzy
  msgid "writing direct signature\n"
  msgstr "skribas mem-subskribon\n"
  
- #: g10/keygen.c:982
++#: g10/keygen.c:993
  msgid "writing self signature\n"
  msgstr "skribas mem-subskribon\n"
  
- #: g10/keygen.c:1038
++#: g10/keygen.c:1049
  msgid "writing key binding signature\n"
  msgstr "skribas ŝlosilbindan subskribon\n"
  
- #: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
- #: g10/keygen.c:1610 g10/keygen.c:1615
++#: g10/keygen.c:1413 g10/keygen.c:1418 g10/keygen.c:1470 g10/keygen.c:1475
++#: g10/keygen.c:1622 g10/keygen.c:1627
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "ŝlosilgrando nevalida; uzas %u bitojn\n"
  
- #: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
++#: g10/keygen.c:1424 g10/keygen.c:1481 g10/keygen.c:1489 g10/keygen.c:1633
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "ŝlosilgrando rondigita ĝis %u bitoj\n"
  
- #: g10/keygen.c:1503
++#: g10/keygen.c:1515
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1677
++#: g10/keygen.c:1689
  #, fuzzy
  msgid "Sign"
  msgstr "subskribi"
  
- #: g10/keygen.c:1680
++#: g10/keygen.c:1692
  msgid "Certify"
  msgstr ""
  
- #: g10/keygen.c:1683
++#: g10/keygen.c:1695
  #, fuzzy
  msgid "Encrypt"
  msgstr "ĉifri datenojn"
  
- #: g10/keygen.c:1686
++#: g10/keygen.c:1698
  msgid "Authenticate"
  msgstr ""
  
@@@ -5031,157 -3945,126 +4989,157 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1705
++#: g10/keygen.c:1717
  msgid "SsEeAaQq"
  msgstr ""
  
- #: g10/keygen.c:1732
++#: g10/keygen.c:1744
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr ""
  
- #: g10/keygen.c:1738
++#: g10/keygen.c:1750
  msgid "Current allowed actions: "
  msgstr ""
  
- #: g10/keygen.c:1743
++#: g10/keygen.c:1755
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr ""
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1758
  #, fuzzy, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%d) ElGamal (nur ĉifri)\n"
  
- #: g10/keygen.c:1749
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr ""
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr ""
  
- #: g10/keygen.c:1881 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1893 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Bonvolu elekti, kian ŝlosilon vi deziras:\n"
  
- #: g10/keygen.c:1885
++#: g10/keygen.c:1897
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
  
- #: g10/keygen.c:1889
++#: g10/keygen.c:1901
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
  
- #: g10/keygen.c:1892
++#: g10/keygen.c:1904
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (nur subskribi)\n"
  
- #: g10/keygen.c:1894
++#: g10/keygen.c:1906
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (nur subskribi)\n"
  
- #: g10/keygen.c:1900
++#: g10/keygen.c:1912
  #, fuzzy, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) ElGamal (nur ĉifri)\n"
  
- #: g10/keygen.c:1902
++#: g10/keygen.c:1914
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (nur ĉifri)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1920
  #, fuzzy, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (nur ĉifri)\n"
  
- #: g10/keygen.c:1910
++#: g10/keygen.c:1922
  #, fuzzy, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (nur ĉifri)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1928
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
  
- #: g10/keygen.c:1918
++#: g10/keygen.c:1930
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (nur subskribi)\n"
  
- #: g10/keygen.c:1920
++#: g10/keygen.c:1932
  #, fuzzy, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) RSA (nur ĉifri)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1934
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) RSA (nur ĉifri)\n"
  
- #: g10/keygen.c:1926
++#: g10/keygen.c:1938
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) RSA (nur ĉifri)\n"
  
- #: g10/keygen.c:2022 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:206
  #, fuzzy
  msgid "Enter the keygrip: "
  msgstr "Subskribo-notacio: "
  
- #: g10/keygen.c:2035 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2047 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2049 sm/certreqgen-ui.c:216
  #, fuzzy
  msgid "No key with this keygrip\n"
  msgstr "Mankas uzantidentigilo kun indekso %d\n"
  
- #: g10/keygen.c:2111 g10/keygen.c:2125
++#: g10/keygen.c:2133 g10/keygen.c:2147
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
  msgstr "rondigita ĝis %u bitoj\n"
  
- #: g10/keygen.c:2166
++#: g10/keygen.c:2188
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr ""
  
- #: g10/keygen.c:2174
++#: g10/keygen.c:2196
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Kiun ŝlosilgrandon vi deziras? (1024) "
  
- #: g10/keygen.c:2177 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2199 sm/certreqgen-ui.c:183
  #, fuzzy, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Kiun ŝlosilgrandon vi deziras? (1024) "
  
- #: g10/keygen.c:2191 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2213 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Petita ŝlosilgrando estas %u bitoj\n"
  
- #: g10/keygen.c:2237
++#: g10/keygen.c:2259
  #, fuzzy
  #| msgid "Please select what kind of key you want:\n"
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Bonvolu elekti, kian ŝlosilon vi deziras:\n"
  
- #: g10/keygen.c:2409
++#: g10/keygen.c:2431
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5197,7 -4080,6 +5155,7 @@@ msgstr "
  "      <n>m = ŝlosilo eksvalidiĝos post n monatoj\n"
  "      <n>y = ŝlosilo eksvalidiĝos post n jaroj\n"
  
- #: g10/keygen.c:2420
++#: g10/keygen.c:2442
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5213,40 -4095,32 +5171,40 @@@ msgstr "
  "      <n>m = ŝlosilo eksvalidiĝos post n monatoj\n"
  "      <n>y = ŝlosilo eksvalidiĝos post n jaroj\n"
  
- #: g10/keygen.c:2443
++#: g10/keygen.c:2465
  msgid "Key is valid for? (0) "
  msgstr "Ŝlosilo validu ...? (0) "
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2470
  #, fuzzy, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Ŝlosilo validu por ...? (0) "
  
- #: g10/keygen.c:2461 g10/keygen.c:2486
++#: g10/keygen.c:2483 g10/keygen.c:2508
  msgid "invalid value\n"
  msgstr "nevalida valoro\n"
  
- #: g10/keygen.c:2468
++#: g10/keygen.c:2490
  #, fuzzy
  msgid "Key does not expire at all\n"
  msgstr "%s neniam eksvalidiĝos\n"
  
- #: g10/keygen.c:2469
++#: g10/keygen.c:2491
  #, fuzzy
  msgid "Signature does not expire at all\n"
  msgstr "%s neniam eksvalidiĝos\n"
  
- #: g10/keygen.c:2474
++#: g10/keygen.c:2496
  #, fuzzy, c-format
  msgid "Key expires at %s\n"
  msgstr "%s eksvalidiĝos je %s\n"
  
- #: g10/keygen.c:2475
++#: g10/keygen.c:2497
  #, fuzzy, c-format
  msgid "Signature expires at %s\n"
  msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
  
- #: g10/keygen.c:2479
++#: g10/keygen.c:2501
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5254,12 -4128,10 +5212,12 @@@ msgstr "
  "Via sistemo ne povas montri datojn post 2038.\n"
  "Tamen, ĝi estos ĝuste traktata ĝis 2106.\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2514
  #, fuzzy
  msgid "Is this correct? (y/N) "
  msgstr "Ĉu tio estas ĝusta (j/n)? "
  
- #: g10/keygen.c:2560
++#: g10/keygen.c:2582
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5270,7 -4142,6 +5228,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2575
++#: g10/keygen.c:2597
  #, fuzzy
  msgid ""
  "\n"
@@@ -5286,50 -4157,39 +5244,50 @@@ msgstr "
  "    \"Heinrich Heine (la poeto) <heinrichh at duesseldorf.de>\"\n"
  "\n"
  
- #: g10/keygen.c:2594
++#: g10/keygen.c:2616
  msgid "Real name: "
  msgstr "Vera nomo: "
  
- #: g10/keygen.c:2603
++#: g10/keygen.c:2625
  msgid "Invalid character in name\n"
  msgstr "Nevalida signo en nomo\n"
  
- #: g10/keygen.c:2604
++#: g10/keygen.c:2626
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2608
++#: g10/keygen.c:2630
  msgid "Name may not start with a digit\n"
  msgstr "Nomo ne povas komenciĝi per cifero\n"
  
- #: g10/keygen.c:2611
++#: g10/keygen.c:2633
  msgid "Name must be at least 5 characters long\n"
  msgstr "Nomo devas havi almenaŭ 5 signojn\n"
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2643
  msgid "Email address: "
  msgstr "Retadreso: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2649
  msgid "Not a valid email address\n"
  msgstr "Nevalida retadreso\n"
  
- #: g10/keygen.c:2636
++#: g10/keygen.c:2658
  msgid "Comment: "
  msgstr "Komento: "
  
- #: g10/keygen.c:2642
++#: g10/keygen.c:2664
  msgid "Invalid character in comment\n"
  msgstr "Nevalida signo en komento\n"
  
- #: g10/keygen.c:2678
++#: g10/keygen.c:2700
  #, fuzzy, c-format
  #| msgid "You are using the `%s' character set.\n"
  msgid "You are using the '%s' character set.\n"
  msgstr "Vi uzas la signaron '%s'.\n"
  
- #: g10/keygen.c:2684
++#: g10/keygen.c:2706
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5340,7 -4200,6 +5298,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2689
++#: g10/keygen.c:2711
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr "Bonvolu ne meti la retadreson en la veran nomon aŭ la komenton\n"
  
@@@ -5355,35 -4214,28 +5313,35 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2714
++#: g10/keygen.c:2736
  msgid "NnCcEeOoQq"
  msgstr "NnKkAaBbFf"
  
- #: g10/keygen.c:2724
++#: g10/keygen.c:2746
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "Ŝanĝu (N)omon, (K)omenton, (A)adreson, aŭ (F)ini? "
  
- #: g10/keygen.c:2725
++#: g10/keygen.c:2747
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr "Ŝanĝu (N)omon, (K)omenton, (A)adreson, aŭ (B)one/(F)ini? "
  
- #: g10/keygen.c:2730
++#: g10/keygen.c:2752
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "Ŝanĝu (N)omon, (K)omenton, (A)adreson, aŭ (F)ini? "
  
- #: g10/keygen.c:2731
++#: g10/keygen.c:2753
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "Ŝanĝu (N)omon, (K)omenton, (A)adreson, aŭ (B)one/(F)ini? "
  
- #: g10/keygen.c:2750
++#: g10/keygen.c:2772
  msgid "Please correct the error first\n"
  msgstr "Bonvolu korekti la eraron unue\n"
  
- #: g10/keygen.c:2796
++#: g10/keygen.c:2818
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5395,13 -4247,10 +5353,13 @@@ msgstr "
  "kreado de la primoj; tio donas al la stokastilo pli bonan ŝancon\n"
  "akiri sufiĉe da entropio.\n"
  
- #: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
- #: g10/keygen.c:4777 g10/keygen.c:4882
++#: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
++#: g10/keygen.c:4330 g10/keygen.c:4803 g10/keygen.c:5064 g10/keygen.c:5169
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
  
- #: g10/keygen.c:3598
++#: g10/keygen.c:3922
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5409,66 -4258,53 +5367,66 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3924
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3621
++#: g10/keygen.c:3945
  #, fuzzy, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "'%s' jam densigita\n"
  
- #: g10/keygen.c:3626
++#: g10/keygen.c:3950
  #, fuzzy
  msgid "Create anyway? (y/N) "
  msgstr "Ĉu tamen uzi ĉi tiun ŝlosilon? "
  
- #: g10/keygen.c:3632
++#: g10/keygen.c:3956
  #, fuzzy
  msgid "creating anyway\n"
  msgstr "Ĉu tamen uzi ĉi tiun ŝlosilon? "
  
- #: g10/keygen.c:3981
++#: g10/keygen.c:4315
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:4013
++#: g10/keygen.c:4358
  msgid "Key generation canceled.\n"
  msgstr "Kreado de ŝlosiloj nuligita.\n"
  
- #: g10/keygen.c:4073
++#: g10/keygen.c:4418
  #, fuzzy, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "ne povas krei '%s': %s\n"
  
- #: g10/keygen.c:4093
++#: g10/keygen.c:4438
  #, fuzzy, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "NOTO: sekreta ŝlosilo %08lX eksvalidiĝis je %s\n"
  
- #: g10/keygen.c:4244 g10/keygen.c:4393
++#: g10/keygen.c:4589 g10/keygen.c:4738
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
  msgstr "skribas publikan ŝlosilon al '%s'\n"
  
- #: g10/keygen.c:4387
++#: g10/keygen.c:4732
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "neniu skribebla publika ŝlosilaro trovita: %s\n"
  
- #: g10/keygen.c:4401
++#: g10/keygen.c:4746
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error writing public keyring '%s': %s\n"
  msgstr "eraro dum skribado de publika ŝlosilaro '%s': %s\n"
  
- #: g10/keygen.c:4433
++#: g10/keygen.c:4778
  msgid "public and secret key created and signed.\n"
  msgstr "publika kaj sekreta ŝlosiloj kreitaj kaj subskribitaj.\n"
  
- #: g10/keygen.c:4445
++#: g10/keygen.c:4790
  #, fuzzy
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
@@@ -5477,7 -4313,6 +5435,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:4649 g10/keygen.c:4833
++#: g10/keygen.c:4936 g10/keygen.c:5120
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5485,7 -4320,6 +5443,7 @@@ msgstr "
  "ŝlosilo estis kreita %lu sekundon en la estonteco (tempotordo aŭ "
  "horloĝeraro)\n"
  
- #: g10/keygen.c:4651 g10/keygen.c:4835
++#: g10/keygen.c:4938 g10/keygen.c:5122
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5493,22 -4327,18 +5451,22 @@@ msgstr "
  "ŝlosilo estis kreita %lu sekundojn en la estonteco (tempotordo aŭ "
  "horloĝeraro)\n"
  
- #: g10/keygen.c:4662 g10/keygen.c:4846
++#: g10/keygen.c:4949 g10/keygen.c:5133
  #, fuzzy
  #| 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:4674 g10/keygen.c:4676
++#: g10/keygen.c:4961 g10/keygen.c:4963
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Sekretaj partoj de ĉefa ŝlosilo ne estas disponataj.\n"
  
- #: g10/keygen.c:4683 g10/keygen.c:4685
++#: g10/keygen.c:4970 g10/keygen.c:4972
  #, fuzzy
  msgid "Secret parts of primary key are stored on-card.\n"
  msgstr "Sekretaj partoj de ĉefa ŝlosilo ne estas disponataj.\n"
  
- #: g10/keygen.c:4704 g10/keygen.c:4860
++#: g10/keygen.c:4991 g10/keygen.c:5147
  #, fuzzy
  msgid "Really create? (y/N) "
  msgstr "Ĉu vere krei? "
@@@ -5842,129 -4607,103 +5800,129 @@@ msgstr "
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
  msgstr "memstara revoko - uzu \"gpg --import\" por apliki ĝin\n"
  
- #: g10/mainproc.c:1233 g10/mainproc.c:1276
++#: g10/mainproc.c:1238 g10/mainproc.c:1281
  #, fuzzy
  msgid "no signature found\n"
  msgstr "Bona subskribo de \""
  
- #: g10/mainproc.c:1607
++#: g10/mainproc.c:1612
  #, fuzzy, c-format
  msgid "BAD signature from \"%s\""
  msgstr "MALBONA subskribo de \""
  
- #: g10/mainproc.c:1609
++#: g10/mainproc.c:1614
  #, fuzzy, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Eksvalidiĝinta subskribo de \""
  
- #: g10/mainproc.c:1611
++#: g10/mainproc.c:1616
  #, fuzzy, c-format
  msgid "Good signature from \"%s\""
  msgstr "Bona subskribo de \""
  
- #: g10/mainproc.c:1630
++#: g10/mainproc.c:1635
  msgid "signature verification suppressed\n"
  msgstr "kontrolo de subskribo estas malŝaltita\n"
  
- #: g10/mainproc.c:1739
++#: g10/mainproc.c:1744
  #, fuzzy
  msgid "can't handle this ambiguous signature data\n"
  msgstr "ne povas trakti ĉi tiujn pluroblajn subskribojn\n"
  
- #: g10/mainproc.c:1753 g10/mainproc.c:1761
++#: g10/mainproc.c:1758 g10/mainproc.c:1766
  #, fuzzy, c-format
  msgid "Signature made %s\n"
  msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
  
- #: g10/mainproc.c:1754 g10/mainproc.c:1762
++#: g10/mainproc.c:1759 g10/mainproc.c:1767
  #, fuzzy, c-format
  msgid "               using %s key %s\n"
  msgstr "            alinome \""
  
- #: g10/mainproc.c:1766
++#: g10/mainproc.c:1771
  #, 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:1772
++#: g10/mainproc.c:1777
  #, fuzzy, c-format
  msgid "               issuer \"%s\"\n"
  msgstr "            alinome \""
  
- #: g10/mainproc.c:1789
++#: g10/mainproc.c:1794
  #, fuzzy
  msgid "Key available at: "
  msgstr "Nenia helpo disponata"
  
- #: g10/mainproc.c:2024
++#: g10/mainproc.c:2029
  msgid "[uncertain]"
  msgstr "[malcerta]"
  
- #: g10/mainproc.c:2062
++#: g10/mainproc.c:2067
  #, fuzzy, c-format
  msgid "                aka \"%s\""
  msgstr "            alinome \""
  
- #: g10/mainproc.c:2145
++#: g10/mainproc.c:2150
  #, fuzzy, c-format
  msgid "Signature expired %s\n"
  msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
  
- #: g10/mainproc.c:2149
++#: g10/mainproc.c:2154
  #, fuzzy, c-format
  msgid "Signature expires %s\n"
  msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
  
- #: g10/mainproc.c:2160
++#: g10/mainproc.c:2165
  #, fuzzy, c-format
  msgid "%s signature, digest algorithm %s%s%s\n"
  msgstr "%s-subskribo de: %s\n"
  
- #: g10/mainproc.c:2161
++#: g10/mainproc.c:2166
  #, fuzzy
  msgid "binary"
  msgstr "ĉefa"
  
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2167
  msgid "textmode"
  msgstr ""
  
- #: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
  #, fuzzy
  msgid "unknown"
  msgstr "nekonata versio"
  
- #: g10/mainproc.c:2164
++#: g10/mainproc.c:2169
  #, fuzzy
  #| msgid "unknown pubkey algorithm"
  msgid ", key algorithm "
  msgstr "nekonata publikŝlosila metodo"
  
- #: g10/mainproc.c:2199
++#: g10/mainproc.c:2204
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2229
++#: g10/mainproc.c:2234
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "Ne povas kontroli subskribon: %s\n"
  
- #: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
++#: g10/mainproc.c:2327 g10/mainproc.c:2346 g10/mainproc.c:2470
  msgid "not a detached signature\n"
  msgstr "ne aparta subskribo\n"
  
- #: g10/mainproc.c:2375
++#: g10/mainproc.c:2380
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
  msgstr ""
  
- #: g10/mainproc.c:2384
++#: g10/mainproc.c:2389
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "memstara subskribo de klaso 0x%02x\n"
  
- #: g10/mainproc.c:2469
++#: g10/mainproc.c:2474
  msgid "old style (PGP 2.x) signature\n"
  msgstr "malnovstila subskribo (PGP 2.x)\n"
  
@@@ -6243,23 -4928,18 +6201,23 @@@ msgstr "Ĉu tio estas ĝusta (j/n)? 
  msgid "unable to display photo ID!\n"
  msgstr "ne povas malfermi %s: %s\n"
  
- #: g10/pkclist.c:72 g10/revoke.c:757
++#: g10/pkclist.c:72 g10/revoke.c:758
  msgid "No reason specified"
  msgstr "Nenia kialo specifita"
  
- #: g10/pkclist.c:74 g10/revoke.c:759
++#: g10/pkclist.c:74 g10/revoke.c:760
  msgid "Key is superseded"
  msgstr "Ŝlosilo estas anstataŭigita."
  
- #: g10/pkclist.c:76 g10/revoke.c:758
++#: g10/pkclist.c:76 g10/revoke.c:759
  msgid "Key has been compromised"
  msgstr "Ŝlosilo estas kompromitita"
  
- #: g10/pkclist.c:78 g10/revoke.c:760
++#: g10/pkclist.c:78 g10/revoke.c:761
  msgid "Key is no longer used"
  msgstr "Ŝlosilo estas ne plu uzata"
  
- #: g10/pkclist.c:80 g10/revoke.c:761
++#: g10/pkclist.c:80 g10/revoke.c:762
  msgid "User ID is no longer valid"
  msgstr "Uzantidentigilo ne plu validas"
  
@@@ -6342,7 -5009,6 +6300,7 @@@ msgid "
  "\n"
  msgstr ""
  
- #: g10/pkclist.c:310 g10/revoke.c:786
++#: g10/pkclist.c:310 g10/revoke.c:787
  msgid "Your decision? "
  msgstr "Via decido? "
  
@@@ -6383,10 -5042,9 +6341,10 @@@ msgstr "
  "Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
  "\n"
  
 +#: g10/pkclist.c:484
  #, fuzzy
  msgid ""
- "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "This key is bad!  It has been marked as untrusted!  If you\n"
  "*really* know what you are doing, you may answer the next\n"
  "question with yes.\n"
  msgstr ""
@@@ -6544,33 -5172,26 +6502,33 @@@ msgstr "
  msgid "No such user ID.\n"
  msgstr "Uzantidentigilo ne ekzistas.\n"
  
- #: g10/pkclist.c:1197 g10/pkclist.c:1273
++#: g10/pkclist.c:1197 g10/pkclist.c:1274
  msgid "skipped: public key already set as default recipient\n"
  msgstr "ignorita: publika ŝlosilo jam difinita kiel implicita ricevonto\n"
  
- #: g10/pkclist.c:1218
++#: g10/pkclist.c:1219
  msgid "Public key is disabled.\n"
  msgstr "Publika ŝlosilo estas malŝaltita.\n"
  
- #: g10/pkclist.c:1228
++#: g10/pkclist.c:1229
  msgid "skipped: public key already set\n"
  msgstr "ignorita: publika ŝlosilo jam agordita\n"
  
- #: g10/pkclist.c:1263
++#: g10/pkclist.c:1264
  #, fuzzy, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "nekonata implicita ricevonto '%s'\n"
  
- #: g10/pkclist.c:1312
++#: g10/pkclist.c:1313
  msgid "no valid addressees\n"
  msgstr "mankas validaj adresitoj\n"
  
- #: g10/pkclist.c:1665
++#: g10/pkclist.c:1666
  #, fuzzy, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "ŝlosilo %08lX: mankas uzantidentigilo\n"
  
- #: g10/pkclist.c:1690
++#: g10/pkclist.c:1691
  #, fuzzy, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "ŝlosilo %08lX: mankas uzantidentigilo\n"
@@@ -6579,29 -5199,23 +6537,29 @@@
  msgid "data not saved; use option \"--output\" to save it\n"
  msgstr "datenoj ne savitaj; uzu la opcion \"--output\" por savi ilin\n"
  
- #: g10/plaintext.c:598
++#: g10/plaintext.c:614
  msgid "Detached signature.\n"
  msgstr "Aparta subskribo.\n"
  
- #: g10/plaintext.c:606
++#: g10/plaintext.c:622
  msgid "Please enter name of data file: "
  msgstr "Bonvolu doni la nomon de la dosiero: "
  
- #: g10/plaintext.c:643
++#: g10/plaintext.c:659
  msgid "reading stdin ...\n"
  msgstr "legas la normalan enigon ...\n"
  
- #: g10/plaintext.c:688
++#: g10/plaintext.c:704
  msgid "no signed data\n"
  msgstr "mankas subskribitaj datenoj\n"
  
- #: g10/plaintext.c:706
++#: g10/plaintext.c:722
  #, fuzzy, c-format
  #| msgid "can't open signed data `%s'\n"
  msgid "can't open signed data '%s'\n"
  msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
  
- #: g10/plaintext.c:741
++#: g10/plaintext.c:757
  #, fuzzy, c-format
  msgid "can't open signed data fd=%d: %s\n"
  msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
@@@ -6669,7 -5269,6 +6627,7 @@@ msgstr "Sekreta ŝlosilo estas havebla.
  msgid "Create a designated revocation certificate for this key? (y/N) "
  msgstr "Ĉu krei revokatestilon por ĉi tiu subskribo? (j/N)"
  
- #: g10/revoke.c:336 g10/revoke.c:727
++#: g10/revoke.c:336 g10/revoke.c:728
  msgid "ASCII armored output forced.\n"
  msgstr ""
  
@@@ -6706,22 -5299,19 +6664,22 @@@ msgid "
  "the secret key.  However, if the secret key is still accessible,\n"
  "it is better to generate a new revocation certificate and give\n"
  "a reason for the revocation.  For details see the description of\n"
- "of the gpg command \"--gen-revoke\" in the GnuPG manual."
+ "of the gpg command \"--generate-revocation\" in the GnuPG manual."
  msgstr ""
  
- #: g10/revoke.c:575
++#: g10/revoke.c:576
  msgid ""
  "To avoid an accidental use of this file, a colon has been inserted\n"
  "before the 5 dashes below.  Remove this colon with a text editor\n"
  "before importing and publishing this revocation certificate."
  msgstr ""
  
- #: g10/revoke.c:590
++#: g10/revoke.c:591
  #, fuzzy, c-format
  msgid "revocation certificate stored as '%s.rev'\n"
  msgstr "ŝlosilo %08lX: revokatestilo aldonita\n"
  
- #: g10/revoke.c:634
++#: g10/revoke.c:635
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found\n"
  msgstr "ŝlosilo '%s' ne trovita: %s\n"
@@@ -6729,23 -5319,19 +6687,23 @@@
  #. TRANSLATORS: The %s prints a key specification which
  #. for example has been given at the command line.  Several lines
  #. lines with secret key infos are printed after this message.
- #: g10/revoke.c:661
++#: g10/revoke.c:662
  #, c-format
  msgid "'%s' matches multiple secret keys:\n"
  msgstr ""
  
- #: g10/revoke.c:688
++#: g10/revoke.c:689
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error searching the keyring: %s\n"
  msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
  
- #: g10/revoke.c:711
++#: g10/revoke.c:712
  #, fuzzy
  msgid "Create a revocation certificate for this key? (y/N) "
  msgstr "Ĉu krei revokatestilon por ĉi tiu subskribo? (j/N)"
  
- #: g10/revoke.c:735
++#: g10/revoke.c:736
  msgid ""
  "Revocation certificate created.\n"
  "\n"
@@@ -6756,37 -5342,30 +6714,37 @@@
  "your machine might store the data and make it available to others!\n"
  msgstr ""
  
- #: g10/revoke.c:769
++#: g10/revoke.c:770
  #, fuzzy
  msgid "Please select the reason for the revocation:\n"
  msgstr "Kialo por revoko: "
  
- #: g10/revoke.c:779
++#: g10/revoke.c:780
  msgid "Cancel"
  msgstr ""
  
- #: g10/revoke.c:781
++#: g10/revoke.c:782
  #, c-format
  msgid "(Probably you want to select %d here)\n"
  msgstr ""
  
- #: g10/revoke.c:822
++#: g10/revoke.c:823
  #, fuzzy
  msgid "Enter an optional description; end it with an empty line:\n"
  msgstr ""
  "\n"
  "Donu la uzantidentigilon. Finu per malplena linio: "
  
- #: g10/revoke.c:850
++#: g10/revoke.c:851
  #, fuzzy, c-format
  msgid "Reason for revocation: %s\n"
  msgstr "Kialo por revoko: "
  
- #: g10/revoke.c:852
++#: g10/revoke.c:853
  msgid "(No description given)\n"
  msgstr ""
  
- #: g10/revoke.c:857
++#: g10/revoke.c:858
  #, fuzzy
  msgid "Is this okay? (y/N) "
  msgstr "Ĉu tamen uzi ĉi tiun ŝlosilon? "
@@@ -6918,22 -5477,18 +6876,22 @@@ msgstr "
  "AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen "
  "kompletigo.\n"
  
- #: g10/sign.c:329
++#: g10/sign.c:331
  #, fuzzy, c-format
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s-subskribo de: %s\n"
  
- #: g10/sign.c:878
++#: g10/sign.c:880
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
  msgstr "NOTO: ĉifrad-metodo %d ne trovita en preferoj\n"
  
- #: g10/sign.c:1009
++#: g10/sign.c:1011
  msgid "signing:"
  msgstr "subskribas:"
  
- #: g10/sign.c:1286
++#: g10/sign.c:1288
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "%s ĉifrado estos aplikata\n"
@@@ -6960,7 -5511,6 +6918,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:362
++#: g10/tdbdump.c:57 g10/trustdb.c:369
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
@@@ -7006,7 -5548,6 +6964,7 @@@ msgstr "eraro dum legado de dosieruja r
  msgid "read error in '%s': %s\n"
  msgstr "kiraso: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "fido-datenaro: sync malsukcesis: %s\n"
@@@ -7151,297 -5663,304 +7109,370 @@@ msgstr "ne povas trakti tekstliniojn pl
  msgid "input line longer than %d characters\n"
  msgstr "enigata linio pli longa ol %d signojn\n"
  
- #: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
++#: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
  #, fuzzy, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "eraro dum sendo al '%s': %s\n"
  
- #: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
++#: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:357 g10/tofu.c:699
++#: g10/tofu.c:355 g10/tofu.c:888
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:501
++#: g10/tofu.c:505
  #, fuzzy, c-format
  msgid "unsupported TOFU database version: %s\n"
  msgstr ""
  "\n"
  "Realigitaj metodoj:\n"
  
- #: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
- #: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
- #: g10/tofu.c:3056
++#: g10/tofu.c:538
+ #, fuzzy, c-format
+ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
+ msgstr "eraro dum kreado de pasfrazo: %s\n"
+ 
++#: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
+ msgid "TOFU DB error"
+ msgstr ""
+ 
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2340 g10/tofu.c:2359
++#: g10/tofu.c:2372 g10/tofu.c:2384 g10/tofu.c:2399 g10/tofu.c:2411
++#: g10/tofu.c:2980 g10/tofu.c:2997 g10/tofu.c:3033 g10/tofu.c:3050
++#: g10/tofu.c:3353
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "eraro dum sendo al '%s': %s\n"
  
- #: g10/tofu.c:566 g10/tofu.c:574
++#: g10/tofu.c:716 g10/tofu.c:724
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error determining TOFU database's version: %s\n"
  msgstr "eraro dum skribado de sekreta ŝlosilaro '%s': %s\n"
  
- #: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
++#: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing TOFU database: %s\n"
  msgstr "%s: eraro dum skribo de dosieruja registro: %s\n"
  
- #: g10/tofu.c:765
++#: g10/tofu.c:844
+ #, fuzzy, c-format
+ msgid "error creating 'encryptions' TOFU table: %s\n"
+ msgstr "eraro dum sendo al '%s': %s\n"
+ 
++#: g10/tofu.c:874
+ #, c-format
+ msgid "adding column effective_policy to bindings DB: %s\n"
+ msgstr ""
+ 
++#: g10/tofu.c:956
  #, fuzzy, c-format
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "eraro dum legado de '%s': %s\n"
  
- #: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
++#: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "eraro dum sendo al '%s': %s\n"
  
- #: g10/tofu.c:1239
++#: g10/tofu.c:1328
  #, c-format
  msgid ""
  "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1247
++#: g10/tofu.c:1337
  #, c-format
- msgid "The email address \"%s\" is associated with %d keys!"
- msgstr ""
+ msgid "The email address \"%s\" is associated with %d key!"
+ msgid_plural "The email address \"%s\" is associated with %d keys!"
+ msgstr[0] ""
+ msgstr[1] ""
  
- #: g10/tofu.c:1251
++#: g10/tofu.c:1343
  msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  
- #: g10/tofu.c:1257
++#: g10/tofu.c:1349
  #, c-format
  msgid ""
  "Please indicate whether this email address should be associated with key %s "
  "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1513
++#: g10/tofu.c:1605
  #, fuzzy, c-format
  msgid "error gathering other user IDs: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: g10/tofu.c:1523
++#: g10/tofu.c:1615
  #, fuzzy
  #| msgid "list key and user IDs"
  msgid "This key's user IDs:\n"
  msgstr "listigi ŝlosilojn kaj uzantidentigilojn"
  
- #: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
++#: g10/tofu.c:1631 g10/tofu.c:1796
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "policy: %s"
  msgstr "Gvidlinio: "
  
- #: g10/tofu.c:1630
++#: g10/tofu.c:1722
  #, fuzzy, c-format
  msgid "error gathering signature stats: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: g10/tofu.c:1634
++#: g10/tofu.c:1726
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1651
++#: g10/tofu.c:1744
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1684 g10/tofu.c:1689
++#: g10/tofu.c:1785 g10/tofu.c:1790
  msgid ", "
  msgstr ""
  
- #: g10/tofu.c:1693
++#: g10/tofu.c:1794
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
  msgstr "listigi ŝlosilojn"
  
- #: g10/tofu.c:1715
++#: g10/tofu.c:1820
  #, fuzzy, c-format
- msgid "Verified %d message"
- msgid_plural "Verified %d messages"
+ msgid "Verified %d message."
+ msgid_plural "Verified %d messages."
  msgstr[0] "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
  msgstr[1] "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
  
- #: g10/tofu.c:1719
++#: g10/tofu.c:1824
+ #, fuzzy, c-format
+ msgid "Encrypted %d message."
+ msgid_plural "Encrypted %d messages."
+ msgstr[0] "Ripetu pasfrazon\n"
+ msgstr[1] "Ripetu pasfrazon\n"
+ 
++#: g10/tofu.c:1831
+ #, fuzzy, c-format
+ msgid "Verified %d message in the future."
+ msgid_plural "Verified %d messages in the future."
+ msgstr[0] "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
+ msgstr[1] "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
+ 
++#: g10/tofu.c:1835
+ #, fuzzy, c-format
+ msgid "Encrypted %d message in the future."
+ msgid_plural "Encrypted %d messages in the future."
+ msgstr[0] "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
+ msgstr[1] "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
+ 
++#: g10/tofu.c:1849
+ #, c-format
+ msgid "Messages verified over the past %d day: %d."
+ msgid_plural "Messages verified over the past %d days: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1855
+ #, c-format
+ msgid "Messages encrypted over the past %d day: %d."
+ msgid_plural "Messages encrypted over the past %d days: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1865
  #, c-format
- msgid "Encrypted %d message"
- msgid_plural "Encrypted %d messages"
+ msgid "Messages verified over the past %d month: %d."
+ msgid_plural "Messages verified over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1734
++#: g10/tofu.c:1871
  #, c-format
- msgid " over the past day."
- msgid_plural " over the past %d days."
+ msgid "Messages encrypted over the past %d month: %d."
+ msgid_plural "Messages encrypted over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1740
++#: g10/tofu.c:1881
  #, c-format
- msgid " over the past month."
- msgid_plural " over the past %d months."
+ msgid "Messages verified over the past %d year: %d."
+ msgid_plural "Messages verified over the past %d years: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1746
++#: g10/tofu.c:1887
  #, c-format
- msgid " over the past year."
- msgid_plural " over the past %d years."
+ msgid "Messages encrypted over the past %d year: %d."
+ msgid_plural "Messages encrypted over the past %d years: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1752
- msgid " in the past."
++#: g10/tofu.c:1895
+ #, c-format
+ msgid "Messages verified in the past: %d."
  msgstr ""
  
++#: g10/tofu.c:1899
+ #, fuzzy, c-format
+ msgid "Messages encrypted in the past: %d."
+ msgstr "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1767
++#: g10/tofu.c:1916
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1809
++#: g10/tofu.c:1958
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1815
++#: g10/tofu.c:1964
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1823
++#: g10/tofu.c:1972
  msgid "Defaulting to unknown."
  msgstr ""
  
- #: g10/tofu.c:1938 g10/tofu.c:2074
++#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
- #: g10/tofu.c:1994
++#: g10/tofu.c:2143
  #, fuzzy, c-format
  msgid "resetting keydb: %s\n"
  msgstr "eraro dum skribado de ŝlosilaro '%s': %s\n"
  
- #: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
- #: g10/tofu.c:2425
++#: g10/tofu.c:2601
  #, fuzzy, c-format
- msgid "error setting TOFU binding's trust level to %s\n"
+ msgid "error setting TOFU binding's policy to %s\n"
  msgstr "eraro dum legado de '%s': %s\n"
  
- #: g10/tofu.c:2473
++#: g10/tofu.c:2794
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #. TRANSLATORS: The tilde ('~') is used here to indicate a
- #. * non-breakable space
- #: g10/tofu.c:2574
++#: g10/tofu.c:2839
  #, c-format
- msgid "%d~year"
- msgid_plural "%d~years"
+ msgid "%lld~year"
+ msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2583
++#: g10/tofu.c:2844
  #, c-format
- msgid "%d~month"
- msgid_plural "%d~months"
+ msgid "%lld~month"
+ msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2592
++#: g10/tofu.c:2849
  #, c-format
- msgid "%d~day"
- msgid_plural "%d~days"
+ msgid "%lld~week"
+ msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2854
  #, c-format
- msgid "%d~hour"
- msgid_plural "%d~hours"
+ msgid "%lld~day"
+ msgid_plural "%lld~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2610
++#: g10/tofu.c:2859
  #, c-format
- msgid "%d~minute"
- msgid_plural "%d~minutes"
+ msgid "%lld~hour"
+ msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2619
++#: g10/tofu.c:2864
  #, c-format
- msgid "%d~second"
- msgid_plural "%d~seconds"
+ msgid "%lld~minute"
+ msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2802
++#: g10/tofu.c:2866
  #, c-format
- msgid "%s: "
+ msgid "%lld~second"
+ msgid_plural "%lld~seconds"
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:3103
+ #, c-format
+ msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:2806
++#: g10/tofu.c:3109
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
- msgid "Verified %ld signatures"
+ msgid "%s: Verified 0 signatures."
  msgstr "Forviŝis %d subskribojn.\n"
  
- #: g10/tofu.c:2816
++#: g10/tofu.c:3117
  #, fuzzy, c-format
- msgid "Verified %ld signature in the past %s"
- msgid_plural "Verified %ld signatures in the past %s"
+ msgid "%s: Verified %ld~signature in the past %s."
+ msgid_plural "%s: Verified %ld~signatures in the past %s."
  msgstr[0] "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
  msgstr[1] "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
  
- #: g10/tofu.c:2826
- #, fuzzy, c-format
- msgid ", and encrypted %ld messages"
++#: g10/tofu.c:3127
+ #, fuzzy
+ msgid "Encrypted 0 messages."
  msgstr "Ripetu pasfrazon\n"
  
- #: g10/tofu.c:2835
++#: g10/tofu.c:3135
  #, fuzzy, c-format
- msgid ", and encrypted %ld message in the past %s"
- msgid_plural ", and encrypted %ld messages in the past %s"
+ msgid "Encrypted %ld~message in the past %s."
+ msgid_plural "Encrypted %ld~messages in the past %s."
  msgstr[0] "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
  msgstr[1] "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
  
- #: g10/tofu.c:2880
++#: g10/tofu.c:3146
+ #, fuzzy, c-format
+ #| msgid "Policy: "
+ msgid "(policy: %s)"
+ msgstr "Gvidlinio: "
+ 
++#: g10/tofu.c:3177
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2883
++#: g10/tofu.c:3180
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2887
++#: g10/tofu.c:3184
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2890
++#: g10/tofu.c:3187
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2919
++#: g10/tofu.c:3216
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7458,18 -5977,14 +7489,18 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
- #: g10/tofu.c:3480 g10/tofu.c:3572
++#: g10/tofu.c:3298 g10/tofu.c:3449 g10/tofu.c:3627 g10/tofu.c:3670
++#: g10/tofu.c:3784 g10/tofu.c:3859 g10/tofu.c:3894
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "eraro dum sendo al '%s': %s\n"
  
- #: g10/tofu.c:3185
++#: g10/tofu.c:3482
  #, c-format
- msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
  msgstr ""
  
- #: g10/tofu.c:3515
++#: g10/tofu.c:3819
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7501,97 -6011,78 +7532,97 @@@ msgstr "ŝlosilo %08lX: mankas publika 
  msgid "key %s marked as ultimately trusted\n"
  msgstr "ŝlosilo markita kiel absolute fidata.\n"
  
- #: g10/trustdb.c:341
++#: g10/trustdb.c:348
  #, 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:347
++#: g10/trustdb.c:354
  #, 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:422
++#: g10/trustdb.c:429
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr ""
  
- #: g10/trustdb.c:431
++#: g10/trustdb.c:438
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:468
++#: g10/trustdb.c:475
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:474
++#: g10/trustdb.c:481
  #, c-format
  msgid "using %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:511
++#: g10/trustdb.c:518
  msgid "no need for a trustdb check\n"
  msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
  
- #: g10/trustdb.c:517 g10/trustdb.c:2160
++#: g10/trustdb.c:524 g10/trustdb.c:2187
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "sekva kontrolo de fido-datenaro je %s\n"
  
- #: g10/trustdb.c:526
++#: g10/trustdb.c:533
  #, 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:542
++#: g10/trustdb.c:549
  #, 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:749 g10/trustdb.c:1313
++#: g10/trustdb.c:756 g10/trustdb.c:1340
  #, fuzzy, c-format
  msgid "public key %s not found: %s\n"
  msgstr "publika ŝlosilo %08lX ne trovita: %s\n"
  
- #: g10/trustdb.c:966
++#: g10/trustdb.c:973
  msgid "please do a --check-trustdb\n"
  msgstr ""
  
- #: g10/trustdb.c:971
++#: g10/trustdb.c:978
  msgid "checking the trustdb\n"
  msgstr "kontrolas la fido-datenaron\n"
  
- #: g10/trustdb.c:1883
++#: g10/trustdb.c:1910
  #, 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:1886
++#: g10/trustdb.c:1913
  #, c-format
  msgid " (%d validity count cleared)\n"
  msgid_plural " (%d validity counts cleared)\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/trustdb.c:1956
++#: g10/trustdb.c:1983
  #, fuzzy
  msgid "no ultimately trusted keys found\n"
  msgstr "publika ŝlosilo de absolute fidata ŝlosilo %08lX ne trovita\n"
  
- #: g10/trustdb.c:1970
++#: g10/trustdb.c:1997
  #, 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:2087
++#: g10/trustdb.c:2114
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr ""
  
- #: g10/trustdb.c:2167
++#: g10/trustdb.c:2194
  #, fuzzy, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
@@@ -7703,19 -6173,14 +7734,19 @@@ msgid "
  "List, export, import Keybox data\n"
  msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3208
++#: scd/app-nks.c:718 scd/app-openpgp.c:3221
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3220
++#: scd/app-nks.c:726 scd/app-openpgp.c:3233
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
- #: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
- #: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1965 scd/app-openpgp.c:1984
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2166 scd/app-openpgp.c:2430
++#: scd/app-openpgp.c:2477 scd/app-openpgp.c:2582 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr ""
@@@ -7764,84 -6220,66 +7795,84 @@@ msgid "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2511 scd/app-dinsig.c:532
  #, fuzzy, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: scd/app-openpgp.c:806
++#: scd/app-openpgp.c:801
  #, fuzzy, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
  
- #: scd/app-openpgp.c:819
++#: scd/app-openpgp.c:814
  #, fuzzy, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "malsukcesis rekonstrui ŝlosilaran staplon: %s\n"
  
- #: scd/app-openpgp.c:1236
++#: scd/app-openpgp.c:1247
  msgid "response does not contain the RSA modulus\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1243
++#: scd/app-openpgp.c:1254
  msgid "response does not contain the RSA public exponent\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1353
++#: scd/app-openpgp.c:1364
  #, fuzzy
  #| msgid "remove keys from the public keyring"
  msgid "response does not contain the EC public key\n"
  msgstr "forigi ŝlosilojn de la publika ŝlosilaro"
  
- #: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:1464 scd/app-openpgp.c:3825
  msgid "response does not contain the public key data\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1551
++#: scd/app-openpgp.c:1564
  #, fuzzy, c-format
  msgid "reading public key failed: %s\n"
  msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
  
- #: scd/app-openpgp.c:1903
++#: scd/app-openpgp.c:1916
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1910
++#: scd/app-openpgp.c:1923
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1925
++#: scd/app-openpgp.c:1938
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr ""
  
- #: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
++#: scd/app-openpgp.c:1949 scd/app-openpgp.c:2424
  #, fuzzy
  msgid "||Please enter the PIN"
  msgstr "ŝanĝi la pasfrazon"
  
- #: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2173 scd/app-openpgp.c:2437
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
- #: scd/app-openpgp.c:4114
++#: scd/app-openpgp.c:2004 scd/app-openpgp.c:2043 scd/app-openpgp.c:2185
++#: scd/app-openpgp.c:4126
  #, fuzzy, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
  
- #: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
++#: scd/app-openpgp.c:2072 scd/app-openpgp.c:2458 scd/app-openpgp.c:4556
  msgid "error retrieving CHV status from card\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
++#: scd/app-openpgp.c:2078 scd/app-openpgp.c:4565
  msgid "card is permanently locked!\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2072
++#: scd/app-openpgp.c:2085
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7851,26 -6289,21 +7882,26 @@@ msgstr[1] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:2082
++#: scd/app-openpgp.c:2095
  #, fuzzy, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "ŝanĝi la pasfrazon"
  
- #: scd/app-openpgp.c:2086
++#: scd/app-openpgp.c:2099
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
  msgstr "ŝanĝi la pasfrazon"
  
- #: scd/app-openpgp.c:2107
++#: scd/app-openpgp.c:2120
  msgid "access to admin commands is not configured\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2460
++#: scd/app-openpgp.c:2473
  #, fuzzy
  msgid "||Please enter the Reset Code for the card"
  msgstr "Kialo por revoko: "
  
- #: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
++#: scd/app-openpgp.c:2483 scd/app-openpgp.c:2537
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr ""
@@@ -7878,117 -6311,93 +7909,117 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2493
++#: scd/app-openpgp.c:2506
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|AN|New Admin PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|N|New PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2565
++#: scd/app-openpgp.c:2578
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "ŝanĝi la pasfrazon"
  
- #: scd/app-openpgp.c:2566
++#: scd/app-openpgp.c:2579
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
  msgstr "ŝanĝi la pasfrazon"
  
- #: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
++#: scd/app-openpgp.c:2635 scd/app-openpgp.c:3885
  #, fuzzy
  msgid "error reading application data\n"
  msgstr "eraro dum legado de ŝlosilbloko: %s\n"
  
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
++#: scd/app-openpgp.c:2641 scd/app-openpgp.c:3892
  #, fuzzy
  msgid "error reading fingerprint DO\n"
  msgstr "%s: eraro dum legado de libera registro: %s\n"
  
- #: scd/app-openpgp.c:2638
++#: scd/app-openpgp.c:2651
  #, fuzzy
  msgid "key already exists\n"
  msgstr "'%s' jam densigita\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2655
  msgid "existing key will be replaced\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2644
++#: scd/app-openpgp.c:2657
  #, fuzzy
  msgid "generating new key\n"
  msgstr "krei novan ŝlosilparon"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2659
  #, fuzzy
  msgid "writing new key\n"
  msgstr "krei novan ŝlosilparon"
  
- #: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
++#: scd/app-openpgp.c:3201 scd/app-openpgp.c:3553
  msgid "creation timestamp missing\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
++#: scd/app-openpgp.c:3243 scd/app-openpgp.c:3251
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
++#: scd/app-openpgp.c:3384 scd/app-openpgp.c:3647
  #, fuzzy, c-format
  msgid "failed to store the key: %s\n"
  msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
  
- #: scd/app-openpgp.c:3534
++#: scd/app-openpgp.c:3547
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "nerealigita URI"
  
- #: scd/app-openpgp.c:3790
++#: scd/app-openpgp.c:3802
  msgid "please wait while key is being generated ...\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3798
++#: scd/app-openpgp.c:3810
  #, fuzzy
  msgid "generating key failed\n"
  msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
  
- #: scd/app-openpgp.c:3804
++#: scd/app-openpgp.c:3816
  #, fuzzy, c-format
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
  msgstr[0] "Kreado de ŝlosiloj malsukcesis: %s\n"
  msgstr[1] "Kreado de ŝlosiloj malsukcesis: %s\n"
  
- #: scd/app-openpgp.c:3838
++#: scd/app-openpgp.c:3850
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:3900
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4004
++#: scd/app-openpgp.c:4016
  #, fuzzy, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "%s-subskribo de: %s\n"
  
- #: scd/app-openpgp.c:4089
++#: scd/app-openpgp.c:4101
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4551
++#: scd/app-openpgp.c:4570
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
++#: scd/app-openpgp.c:4871 scd/app-openpgp.c:4882
  #, fuzzy, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
@@@ -8010,7 -6416,6 +8041,7 @@@ msgstr "Donu la uzantidentigilon: 
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
@@@ -8055,27 -6451,22 +8086,27 @@@ msgstr "malkongruaj komandoj\n
  msgid "use variable length input for pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:287
++#: scd/scdaemon.c:286
  #, fuzzy
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
  
- #: scd/scdaemon.c:289
++#: scd/scdaemon.c:288
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
  msgstr ""
  
- #: scd/scdaemon.c:786
++#: scd/scdaemon.c:784
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1904
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
++#: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1909
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
@@@ -8155,9 -6530,6 +8186,9 @@@ msgstr "eraro dum kreado de pasfrazo: %
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
  
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
 +#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  #, fuzzy
  msgid "failed to allocate keyDB handle\n"
  msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
@@@ -8665,11 -6935,9 +8696,11 @@@ msgstr "
  msgid "resource problem: out of core\n"
  msgstr ""
  
- #: sm/decrypt.c:330
++#: sm/decrypt.c:332
  msgid "(this is the RC2 algorithm)\n"
  msgstr ""
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:334
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr ""
  
@@@ -8713,124 -6973,96 +8744,124 @@@ msgstr "listigi sekretajn ŝlosilojn
  msgid "list certificate chain"
  msgstr "Valida atestilrevoko"
  
- #: sm/gpgsm.c:218
++#: sm/gpgsm.c:219
  #, fuzzy
  msgid "import certificates"
  msgstr "Bona atestilo"
  
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
  #, fuzzy
  msgid "export certificates"
  msgstr "Bona atestilo"
  
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:228
  msgid "register a smartcard"
  msgstr ""
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:231
  msgid "pass a command to the dirmngr"
  msgstr ""
  
- #: sm/gpgsm.c:232
++#: sm/gpgsm.c:233
  msgid "invoke gpg-protect-tool"
  msgstr ""
  
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:250
  #, fuzzy
  msgid "create base-64 encoded output"
  msgstr "krei eligon en askia kiraso"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in PEM format"
  msgstr ""
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in base-64 format"
  msgstr ""
  
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:262
  msgid "assume input is in binary format"
  msgstr ""
  
- #: sm/gpgsm.c:267
++#: sm/gpgsm.c:269
  msgid "never consult a CRL"
  msgstr ""
  
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:279
  msgid "check validity using OCSP"
  msgstr ""
  
- #: sm/gpgsm.c:282
++#: sm/gpgsm.c:284
  msgid "|N|number of certificates to include"
  msgstr ""
  
- #: sm/gpgsm.c:285
++#: sm/gpgsm.c:287
  msgid "|FILE|take policy information from FILE"
  msgstr ""
  
- #: sm/gpgsm.c:288
++#: sm/gpgsm.c:290
  msgid "do not check certificate policies"
  msgstr ""
  
- #: sm/gpgsm.c:292
++#: sm/gpgsm.c:294
  msgid "fetch missing issuer certificates"
  msgstr ""
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "don't use the terminal at all"
  msgstr "tute ne uzi la terminalon"
  
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:307
  msgid "|FILE|write a server mode log to FILE"
  msgstr ""
  
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:312
  #, fuzzy
  msgid "|FILE|write an audit log to FILE"
  msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "batch mode: never ask"
  msgstr "neinteraga reĝimo: neniam demandi"
  
- #: sm/gpgsm.c:314
++#: sm/gpgsm.c:316
  msgid "assume yes on most questions"
  msgstr "supozi \"jes\" ĉe la plej multaj demandoj"
  
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:317
  msgid "assume no on most questions"
  msgstr "supozi \"ne\" ĉe la plej multaj demandoj"
  
- #: sm/gpgsm.c:318
++#: sm/gpgsm.c:320
  #, fuzzy
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "aldoni ĉi tiun ŝlosilaron al la listo de ŝlosilaroj"
  
- #: sm/gpgsm.c:321
++#: sm/gpgsm.c:323
  #, fuzzy
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan ŝlosilon"
  
- #: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
  #, fuzzy
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|SERVILO|uzi ĉi tiun ŝlosilservilon por serĉi ŝlosilojn"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|NOMO|uzi ĉifrad-metodon NOMO"
  
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:352
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|NOMO|uzi kompendi-metodon NOMO"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:559
  #, 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:570
++#: sm/gpgsm.c:562
  #, fuzzy
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
@@@ -8841,47 -7073,38 +8872,47 @@@ msgstr "
  "subskribi, kontroli, ĉifri aŭ malĉifri\n"
  "implicita operacio dependas de la enigataj datenoj\n"
  
- #: sm/gpgsm.c:774
++#: sm/gpgsm.c:766
  #, 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:785
++#: sm/gpgsm.c:777
  #, fuzzy, c-format
  msgid "unknown validation model '%s'\n"
  msgstr "nekonata implicita ricevonto '%s'\n"
  
- #: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
  #, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr ""
  
- #: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr ""
  
- #: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
  #, fuzzy, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr " s = supersalti ĉi tiun ŝlosilon\n"
  
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1427
  #, fuzzy
  msgid "could not parse keyserver\n"
  msgstr "ne povis analizi URI de ŝlosilservilo\n"
  
- #: sm/gpgsm.c:1636
++#: sm/gpgsm.c:1630
  #, fuzzy, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "skribas al '%s'\n"
  
- #: sm/gpgsm.c:1677
++#: sm/gpgsm.c:1671
  #, fuzzy, c-format
  msgid "can't sign using '%s': %s\n"
  msgstr "ne povas fermi '%s': %s\n"
  
- #: sm/gpgsm.c:2033
++#: sm/gpgsm.c:2028
  msgid "invalid command (there is no implicit command)\n"
  msgstr ""
  
@@@ -9636,8 -7708,6 +9667,8 @@@ msgstr "
  msgid "CRL access not possible due to disabled %s\n"
  msgstr ""
  
 +#: dirmngr/crlfetch.c:223 dirmngr/ldap-wrapper-ce.c:488
- #: dirmngr/ldap-wrapper.c:742 dirmngr/misc.c:563
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:563
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
@@@ -9823,116 -7857,88 +9854,116 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:160
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:158
++#: dirmngr/dirmngr.c:161
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
  
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:162
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:163
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:164
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
- #: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
++#: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:177
++#: dirmngr/dirmngr.c:180
  #, fuzzy
  msgid "run without asking a user"
  msgstr "Ĉu fini sen skribi ŝanĝojn? "
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:181
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:182
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:184
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:185
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:186
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:188
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:192
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:202
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
  
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:210
  #, fuzzy
  msgid "|URL|use OCSP responder at URL"
  msgstr "ne povis analizi URI de ŝlosilservilo\n"
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:212
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:218
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:220
++#: dirmngr/dirmngr.c:223
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:225
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:240
++#: dirmngr/dirmngr.c:246
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -9945,91 -7951,72 +9976,91 @@@ msgstr "
  "@\n"
  "(Vidu la manpaĝon por kompleta listo de ĉiuj komandoj kaj opcioj)\n"
  
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:361
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
  
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:363
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:443
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
- #: tools/gpgconf.c:648
++#: dirmngr/dirmngr.c:496 tools/gpgconf.c:550 tools/gpgconf.c:585
++#: tools/gpgconf.c:656
  #, fuzzy, c-format
  msgid "usage: %s [options] "
  msgstr "uzado: gpg [opcioj] "
  
- #: dirmngr/dirmngr.c:1062
++#: dirmngr/dirmngr.c:1074
  #, fuzzy
  #| 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:1301 dirmngr/server.c:1585
++#: dirmngr/dirmngr.c:1300 dirmngr/server.c:1585
  #, fuzzy, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "enkirasigo malsukcesis: %s\n"
  
- #: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
++#: dirmngr/dirmngr.c:1306 dirmngr/server.c:1591
  #, fuzzy, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "enkirasigo malsukcesis: %s\n"
  
- #: dirmngr/dirmngr.c:1484
++#: dirmngr/dirmngr.c:1487
  #, fuzzy, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "pasfrazo estas tro longa\n"
  
- #: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
++#: dirmngr/dirmngr.c:1542 dirmngr/dirmngr.c:1626
  #, fuzzy, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "%s: nevalida dosiero-versio %d\n"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
++#: dirmngr/dirmngr.c:1578 dirmngr/dirmngr.c:1604 tools/gpgconf-comp.c:4032
  #, fuzzy, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "kiraso: %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1633
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1700
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1734
++#: dirmngr/dirmngr.c:1738
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1739
++#: dirmngr/dirmngr.c:1743
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1745
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1746
++#: dirmngr/dirmngr.c:1750
  #, fuzzy
  msgid "shutdown forced\n"
  msgstr "ne traktita"
  
- #: dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1758
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1761
++#: dirmngr/dirmngr.c:1765
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10509,33 -8397,27 +10540,33 @@@ msgstr "forviŝo de ŝlosilbloko malsuk
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2463
++#: dirmngr/server.c:2469
  #, fuzzy, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "ne povas krei '%s': %s\n"
  
- #: dirmngr/server.c:2474
++#: dirmngr/server.c:2480
  #, fuzzy, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "%s: malsukcesis krei haktabelon: %s\n"
  
- #: dirmngr/server.c:2495
++#: dirmngr/server.c:2501
  #, 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:2503
++#: dirmngr/server.c:2509
  #, fuzzy, c-format
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "malsukcesis rekonstrui ŝlosilaran staplon: %s\n"
  
- #: dirmngr/server.c:2534
++#: dirmngr/server.c:2540
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2553
++#: dirmngr/server.c:2559
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
@@@ -10583,7 -8456,6 +10614,7 @@@ msgstr "
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:167
  #, fuzzy
  msgid "quiet"
  msgstr "fini"
@@@ -10676,22 -8528,15 +10707,22 @@@ msgstr "subskribado malsukcesis: %s\n
  msgid "error sending standard options: %s\n"
  msgstr "eraro dum sendo al '%s': %s\n"
  
 +#: tools/gpgconf-comp.c:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
- #: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
++#: tools/gpgconf-comp.c:766 tools/gpgconf-comp.c:865
  msgid "Options controlling the diagnostic output"
  msgstr ""
  
 +#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
- #: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
++#: tools/gpgconf-comp.c:779 tools/gpgconf-comp.c:888
  msgid "Options controlling the configuration"
  msgstr ""
  
- #: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
- #: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
++#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:723
++#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:901
  msgid "Options useful for debugging"
  msgstr ""
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
  msgid "Options controlling the security"
  msgstr ""
  
@@@ -10741,11 -8575,9 +10772,11 @@@ msgstr "eraro dum kreado de pasfrazo: %
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
++#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
  msgid "|NAME|use NAME as default secret key"
  msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan ŝlosilon"
  
- #: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
++#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:784
  #, fuzzy
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NOMO|ĉifri por NOMO"
@@@ -10754,194 -8585,161 +10785,208 @@@
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
++#: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
  msgid "Configuration for Keyservers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
++#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
  #, fuzzy
  msgid "|URL|use keyserver at URL"
  msgstr "ne povis analizi URI de ŝlosilservilo\n"
  
- #: tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:741
  msgid "allow PKA lookups (DNS requests)"
  msgstr ""
  
- #: tools/gpgconf-comp.c:738
++#: tools/gpgconf-comp.c:744
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr ""
  
- #: tools/gpgconf-comp.c:787
++#: tools/gpgconf-comp.c:793
  msgid "disable all access to the dirmngr"
  msgstr ""
  
- #: tools/gpgconf-comp.c:790
++#: tools/gpgconf-comp.c:796
  #, fuzzy
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
  msgstr "|NOMO|uzi ĉifrad-metodon NOMO por pasfrazoj"
  
- #: tools/gpgconf-comp.c:820
++#: tools/gpgconf-comp.c:829
  msgid "do not check CRLs for root certificates"
  msgstr ""
  
- #: tools/gpgconf-comp.c:869
++#: tools/gpgconf-comp.c:878
  msgid "Options controlling the format of the output"
  msgstr ""
  
- #: tools/gpgconf-comp.c:905
++#: tools/gpgconf-comp.c:920
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:918
++#: tools/gpgconf-comp.c:933
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:947
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:958
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:948
++#: tools/gpgconf-comp.c:963
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:977
++#: tools/gpgconf-comp.c:992
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:985
++#: tools/gpgconf-comp.c:1000
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1066
++#: tools/gpgconf-comp.c:1081
  msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1067
++#: tools/gpgconf-comp.c:1082
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1083
  msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1069
++#: tools/gpgconf-comp.c:1084
  msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1070
++#: tools/gpgconf-comp.c:1085
  #, fuzzy
  #| msgid "network error"
  msgid "Network"
  msgstr "reteraro"
  
- #: tools/gpgconf-comp.c:1071
++#: tools/gpgconf-comp.c:1086
  #, fuzzy
  msgid "Passphrase Entry"
  msgstr "malbona pasfrazo"
  
- #: tools/gpgconf-comp.c:1225
++#: tools/gpgconf-comp.c:1240
  #, fuzzy
  msgid "Component not suitable for launching"
  msgstr "publika ŝlosilo ne trovita"
  
- #: tools/gpgconf-comp.c:3283
++#: tools/gpgconf-comp.c:3311
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3434
++#: tools/gpgconf-comp.c:3462
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf-comp.c:4036
+ #, fuzzy, c-format
+ msgid "error closing '%s'\n"
+ msgstr "eraro dum legado de '%s': %s\n"
+ 
++#: tools/gpgconf-comp.c:4038
+ #, fuzzy, c-format
+ msgid "error parsing '%s'\n"
+ msgstr "eraro dum legado de '%s': %s\n"
+ 
++#: tools/gpgconf.c:73
  msgid "list all components"
  msgstr ""
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "check all programs"
  msgstr ""
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|list options"
  msgstr ""
  
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
  msgid "|COMPONENT|change options"
  msgstr ""
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "|COMPONENT|check options"
  msgstr ""
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "apply global default values"
  msgstr ""
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
+ msgid "|FILE|update configuration files using FILE"
+ msgstr ""
+ 
++#: tools/gpgconf.c:83
  msgid "get the configuration directories for @GPGCONF@"
  msgstr ""
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:85
  #, fuzzy
  msgid "list global configuration file"
  msgstr "%s: nova opcio-dosiero kreita\n"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  #, fuzzy
  msgid "check global configuration file"
  msgstr "%s: nova opcio-dosiero kreita\n"
  
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:89
  #, fuzzy
  #| msgid "update the trust database"
  msgid "query the software version database"
  msgstr "aktualigi la fido-datenaron"
  
- #: tools/gpgconf.c:86
++#: tools/gpgconf.c:90
  msgid "reload all or a given component"
  msgstr ""
  
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:91
  msgid "launch a given component"
  msgstr ""
  
- #: tools/gpgconf.c:88
++#: tools/gpgconf.c:92
  msgid "kill a given component"
  msgstr ""
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "use as output file"
  msgstr "uzi dosieron por eligo"
  
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:102
  msgid "activate changes at runtime, if possible"
  msgstr ""
  
- #: tools/gpgconf.c:122
++#: tools/gpgconf.c:127
  #, fuzzy
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
  
- #: tools/gpgconf.c:125
++#: tools/gpgconf.c:130
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
  msgstr ""
  
- #: tools/gpgconf.c:545 tools/gpgconf.c:579
++#: tools/gpgconf.c:552 tools/gpgconf.c:587
  msgid "Need one component argument"
  msgstr ""
  
- #: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
++#: tools/gpgconf.c:561 tools/gpgconf.c:599 tools/gpgconf.c:632
  #, fuzzy
  msgid "Component not found"
  msgstr "publika ŝlosilo ne trovita"
  
- #: tools/gpgconf.c:650
++#: tools/gpgconf.c:658
  #, fuzzy
  msgid "No argument allowed"
  msgstr "skribas sekretan ŝlosilon al '%s'\n"
diff --cc po/es.po
index 6a96874,258c164..a45bad8
--- a/po/es.po
+++ b/po/es.po
@@@ -9,7 -9,6 +9,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg 2.0.9\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-11-18 16:54+0100\n"
++"POT-Creation-Date: 2016-12-20 11:28+0100\n"
  "PO-Revision-Date: 2015-10-09 17:10+0200\n"
  "Last-Translator: Jaime Suárez <jaime.suma at gmail.com>\n"
  "Language-Team: Spanish <es at li.org>\n"
@@@ -180,25 -151,11 +180,25 @@@ msgstr "Frase contraseña errónea
  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:838 common/dotlock.c:839 g10/card-util.c:839
- #: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1306 g10/keygen.c:4577
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
++#: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't create '%s': %s\n"
  msgstr "no se puede crear %s: %s\n"
  
 +#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
- #: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1307
++#: g10/import.c:305 g10/import.c:448 g10/import.c:621 g10/keygen.c:3681
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
- #: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
- #: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:825 g10/sign.c:1025
++#: g10/sign.c:1130 g10/sign.c:1275 g10/tdbdump.c:143 g10/tdbdump.c:151
++#: g10/tdbio.c:720 g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161
++#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
++#: dirmngr/certcache.c:368 dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1564
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
@@@ -269,11 -215,9 +269,11 @@@ msgstr "
  msgid "failed to create stream from socket: %s\n"
  msgstr "fallo al crear un flujo desde el socket: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1100
++#: agent/divert-scd.c:92 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr "Por favor inserte la tarjeta con número de serie"
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1101
++#: agent/divert-scd.c:93 g10/call-agent.c:1102
  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"
  
@@@ -433,47 -351,32 +433,47 @@@ msgstr "
  "@Opciones:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
  msgid "run in daemon mode (background)"
  msgstr "ejecutar en modo demonio (segundo plano)"
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
  msgid "run in server mode (foreground)"
  msgstr "ejecutar en modo servidor (primer plano)"
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
  #, fuzzy
  #| msgid "run in server mode"
  msgid "run in supervised mode"
  msgstr "ejecutar en modo servidor"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:170 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "prolijo"
  
 +#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "algo más discreto"
  
- #: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
  msgid "sh-style command output"
  msgstr "salida de datos estilo sh"
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
  msgid "csh-style command output"
  msgstr "salida de datos estilo csh"
  
- #: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
- #: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
++#: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
  msgid "|FILE|read options from FILE"
  msgstr "|FICHERO|lee opciones desde FICHERO"
  
- #: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:177
  msgid "do not detach from the console"
  msgstr "no independizarse de la consola"
  
@@@ -558,21 -444,14 +558,21 @@@ msgstr "no disponible
  #. 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:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:481 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1025 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:358
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:124 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr "Por favor, informe de posibles \"bugs\" a <@EMAIL@>.\n"
  
- #: agent/gpg-agent.c:491
++#: agent/gpg-agent.c:490
  #, fuzzy
  #| msgid "Usage: gpgconf [options] (-h for help)"
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "Uso: gpgconf [opciones] (-h para ayuda)"
  
- #: agent/gpg-agent.c:493
++#: agent/gpg-agent.c:492
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -584,150 -463,115 +584,150 @@@ msgstr "
  "Sintaxis: gpg-agent [opciones] [orden [argumentos]]\n"
  "Manejo de claves privadas por GnuPG\n"
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:537 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:442
  #, fuzzy, c-format
  #| msgid "invalid debug-level `%s' given\n"
  msgid "invalid debug-level '%s' given\n"
  msgstr "el nivel de depuración `%s` no es válido\n"
  
- #: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:793
++#: agent/gpg-agent.c:1082 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:812
  #, fuzzy, c-format
  #| msgid "NOTE: no default option file `%s'\n"
  msgid "Note: no default option file '%s'\n"
  msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
  
- #: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
- #: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1093 agent/gpg-agent.c:1935 g10/gpg.c:2510
++#: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:817
++#: dirmngr/dirmngr.c:1670 tools/symcryptrun.c:932
  #, fuzzy, c-format
  #| msgid "option file `%s': %s\n"
  msgid "option file '%s': %s\n"
  msgstr "fichero de opciones `%s': %s\n"
  
- #: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:806
++#: agent/gpg-agent.c:1101 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:825
  #, fuzzy, c-format
  #| msgid "reading options from `%s'\n"
  msgid "reading options from '%s'\n"
  msgstr "leyendo opciones desde `%s'\n"
  
- #: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
- #: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
++#: agent/gpg-agent.c:1223 g10/gpg.c:3643 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:936 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:527
  #, fuzzy, c-format
  #| msgid "WARNING: \"%s\" is a deprecated option\n"
  msgid "Note: '%s' is not considered an option\n"
  msgstr "ATENCIÓN: \"%s\" es una opción obsoleta\n"
  
- #: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
++#: agent/gpg-agent.c:2080 scd/scdaemon.c:1073 dirmngr/dirmngr.c:1081
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "no se puede crear el socket: %s\n"
  
- #: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
++#: agent/gpg-agent.c:2097 scd/scdaemon.c:1086 dirmngr/dirmngr.c:1094
  #, fuzzy, c-format
  #| msgid "socket name `%s' is too long\n"
  msgid "socket name '%s' is too long\n"
  msgstr "el nombre de socket `%s' es demasiado largo\n"
  
- #: agent/gpg-agent.c:2134
++#: agent/gpg-agent.c:2135
  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:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
++#: agent/gpg-agent.c:2145 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1126
  msgid "error getting nonce for the socket\n"
  msgstr "error obteniendo valor único para el socket\n"
  
- #: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
++#: agent/gpg-agent.c:2150 scd/scdaemon.c:1113 dirmngr/dirmngr.c:1129
  #, fuzzy, c-format
  #| msgid "error binding socket to `%s': %s\n"
  msgid "error binding socket to '%s': %s\n"
  msgstr "error enlazando el socket con `%s': %s\n"
  
- #: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
- #: dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2160 agent/gpg-agent.c:2197 scd/scdaemon.c:1121
++#: dirmngr/dirmngr.c:1138
  #, fuzzy, c-format
  #| msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgid "can't set permissions of '%s': %s\n"
  msgstr "Aviso: permisos inseguros en %s \"%s\"\n"
  
- #: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:2165 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1143
  #, c-format
  msgid "listen() failed: %s\n"
  msgstr "listen() falló: %s\n"
  
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
++#: agent/gpg-agent.c:2172 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1149
  #, fuzzy, c-format
  #| msgid "listening on socket `%s'\n"
  msgid "listening on socket '%s'\n"
  msgstr "escuchando el socket `%s'\n"
  
- #: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: agent/gpg-agent.c:2191 agent/gpg-agent.c:2234 g10/exec.c:199
 +#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, fuzzy, c-format
  #| msgid "can't create directory `%s': %s\n"
  msgid "can't create directory '%s': %s\n"
  msgstr "no se puede crear el directorio `%s': %s\n"
  
- #: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: agent/gpg-agent.c:2194 agent/gpg-agent.c:2239 g10/openfile.c:491
 +#: g10/openfile.c:520 sm/keydb.c:103
  #, fuzzy, c-format
  #| msgid "directory `%s' created\n"
  msgid "directory '%s' created\n"
  msgstr "directorio `%s' creado\n"
  
- #: agent/gpg-agent.c:2244
++#: agent/gpg-agent.c:2245
  #, fuzzy, c-format
  #| msgid "stat() failed for `%s': %s\n"
  msgid "stat() failed for '%s': %s\n"
  msgstr "stat() falló para `%s': %s\n"
  
- #: agent/gpg-agent.c:2248
++#: agent/gpg-agent.c:2249
  #, fuzzy, c-format
  #| msgid "can't use `%s' as home directory\n"
  msgid "can't use '%s' as home directory\n"
  msgstr "no puede usar `%s' como directorio personal\n"
  
- #: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
++#: agent/gpg-agent.c:2392 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1871
  #, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "error leyendo valor único en el descriptor %d: %s\n"
  
- #: agent/gpg-agent.c:2598
++#: agent/gpg-agent.c:2599
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr "manejador 0x%lx para descriptor %d iniciado\n"
  
- #: agent/gpg-agent.c:2603
++#: agent/gpg-agent.c:2604
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr "manejador 0x%lx pada descriptor %d finalizado\n"
  
- #: agent/gpg-agent.c:2678
++#: agent/gpg-agent.c:2679
  #, 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:2683
++#: agent/gpg-agent.c:2684
  #, 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:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
++#: agent/gpg-agent.c:2881 scd/scdaemon.c:1272 dirmngr/dirmngr.c:2075
  #, fuzzy, c-format
  #| msgid "pth_select failed: %s - waiting 1s\n"
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "pth_select falló: %s - espero 1s\n"
  
  # msgstr "clave %08lX: %d nuevas subclaves\n"
- #: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2954 scd/scdaemon.c:1321
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s detenido\n"
  
- #: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
++#: agent/gpg-agent.c:3092 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  msgid "no gpg-agent running in this session\n"
  msgstr "no hay un agente gpg ejecutándose en esta sesión\n"
  
@@@ -747,8 -589,6 +747,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:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
++#: agent/protect-tool.c:106 g10/gpg.c:424 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:153 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -756,9 -596,6 +756,9 @@@ msgstr "
  "@Órdenes:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
- #: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:92 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:168 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -812,8 -641,6 +812,8 @@@ 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:362 dirmngr/dirmngr.c:1469
- #: tools/gpgconf.c:323
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1472
++#: tools/gpgconf.c:328
  #, fuzzy, c-format
  #| msgid "error opening `%s': %s\n"
  msgid "error opening '%s': %s\n"
@@@ -998,9 -796,6 +998,9 @@@ msgstr "el algoritmo de protección %d%
  msgid "protection hash algorithm %d (%s) is not supported\n"
  msgstr "el algoritmo de protección %d%s no puede ser utilizado\n"
  
 +#: common/exechelp-posix.c:359 common/exechelp-w32.c:438
 +#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
- #: dirmngr/ldap-wrapper.c:710
++#: dirmngr/ldap-wrapper.c:711
  #, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "error creando tubería: %s\n"
@@@ -1013,8 -805,6 +1013,8 @@@
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "error creando tubería: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1155
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1167
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "error bifurcando procesos: %s\n"
@@@ -1064,28 -845,23 +1064,28 @@@ msgstr "no se puede conectar con `%s': 
  msgid "problem setting the gpg-agent options\n"
  msgstr "problema estableciendo opciones de gpg-agent\n"
  
- #: common/sysutils.c:144
++#: common/sysutils.c:148
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "no se pueden desactivar los volcados de core: %s\n"
  
- #: common/sysutils.c:239
++#: common/sysutils.c:250
  #, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "Aviso: propiedad insegura de %s \"%s\"\n"
  
- #: common/sysutils.c:271
++#: common/sysutils.c:282
  #, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "Aviso: permisos inseguros en %s \"%s\"\n"
  
- #: common/sysutils.c:659
++#: common/sysutils.c:693
  #, fuzzy, c-format
  #| msgid "waiting %d seconds for the agent to come up\n"
  msgid "waiting for file '%s' to become accessible ...\n"
  msgstr "esperando %d segundos para que el agente arranque\n"
  
- #: common/sysutils.c:685
++#: common/sysutils.c:719
  #, fuzzy, c-format
  #| msgid "renaming `%s' to `%s' failed: %s\n"
  msgid "renaming '%s' to '%s' failed: %s\n"
@@@ -1162,7 -923,6 +1162,7 @@@ msgstr "%s:%u: opción obsoleta \"%s\" 
  msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
  msgstr "ATENCIÓN: \"%s\" es una opción obsoleta - no tiene efecto\n"
  
- #: common/miscellaneous.c:554
++#: common/miscellaneous.c:556
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
@@@ -1274,8 -1011,6 +1274,8 @@@ msgstr "Creada clave de sesión
  msgid "algorithm: %s"
  msgstr "algoritmo: %s"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3098
++#: scd/app-openpgp.c:3111
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "algoritmo no disponible: %s"
@@@ -1465,7 -1158,6 +1465,7 @@@ msgstr "la opción \"%.50s\" es ambigua
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr "la orden \"%.50s\" es ambigua\n"
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1173
++#: common/argparse.c:401 dirmngr/dirmngr.c:1185
  msgid "out of core\n"
  msgstr "memoria desbordada\n"
  
@@@ -1528,8 -1209,6 +1528,8 @@@ msgstr "bloqueo `%s' no hecho: %s\n
  msgid "waiting for lock %s...\n"
  msgstr "esperando al bloqueo %s...\n"
  
- #: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
- #: dirmngr/dirmngr.c:715
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:725
++#: dirmngr/dirmngr.c:734
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr "%s es demasiado antiguo (necesita %s, tiene %s)\n"
@@@ -1567,7 -1238,6 +1567,7 @@@ msgstr "armadura inesperada: 
  msgid "invalid dash escaped line: "
  msgstr "Línea con guiones inválida: "
  
- #: g10/armor.c:873 g10/armor.c:1490
++#: g10/armor.c:873 g10/armor.c:1493
  #, c-format
  msgid "invalid radix64 character %02X skipped\n"
  msgstr "caracter inválido radix64 %02X omitido\n"
@@@ -1584,7 -1251,6 +1584,7 @@@ msgstr "Fin de suma de comprobación pr
  msgid "malformed CRC\n"
  msgstr "Suma de comprobación mal creada\n"
  
- #: g10/armor.c:962 g10/armor.c:1527
++#: g10/armor.c:962 g10/armor.c:1530
  #, c-format
  msgid "CRC error; %06lX - %06lX\n"
  msgstr "Error en suma de comprobación: %06lX - %06lX\n"
@@@ -1597,16 -1261,13 +1597,16 @@@ msgstr "fin de fichero prematuro (en e
  msgid "error in trailer line\n"
  msgstr "error en la línea de cierre\n"
  
- #: g10/armor.c:1303
++#: g10/armor.c:1306
  msgid "no valid OpenPGP data found.\n"
  msgstr "no se han encontrados datos OpenPGP válidos\n"
  
- #: g10/armor.c:1308
++#: g10/armor.c:1311
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
  msgstr "armadura incorrecta: línea más larga de %d caracteres\n"
  
- #: g10/armor.c:1312
++#: g10/armor.c:1315
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr ""
@@@ -1695,8 -1341,6 +1695,8 @@@ msgstr "tarjeta OpenPGP no disponible: 
  msgid "OpenPGP card no. %s detected\n"
  msgstr "tarjeta OpenPGP num. %s detectada\n"
  
- #: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
- #: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2030
++#: g10/keygen.c:4087 g10/revoke.c:215 g10/revoke.c:618
  msgid "can't do this in batch mode\n"
  msgstr "imposible hacer esto en modo de proceso por lotes\n"
  
@@@ -1704,14 -1347,9 +1704,14 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "Esta orden solo está disponible en tarjetas versión 2\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2454
++#: g10/card-util.c:109 scd/app-openpgp.c:2467
  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:142 g10/card-util.c:1471 g10/card-util.c:1587
- #: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
- #: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1768
++#: g10/keygen.c:1945 g10/keygen.c:2313 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "Su elección: "
  
@@@ -1773,10 -1397,6 +1773,10 @@@ msgstr "URL de donde recuperar la clav
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr "Error: URL demasiado larga (el máximo son %d caracteres).\n"
  
- #: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
- #: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:334
++#: g10/import.c:592 g10/import.c:640 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
++#: dirmngr/dirmngr.c:1510 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
@@@ -1845,7 -1450,6 +1845,7 @@@ msgstr "la operación con la clave no e
  msgid "not an OpenPGP card"
  msgstr "no es una tarjeta OpenPGP"
  
- #: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
++#: g10/card-util.c:1173 g10/keygen.c:4106 g10/keygen.c:5092
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr "error obteniendo la información actual de la clave: %s\n"
@@@ -1884,13 -1483,10 +1884,13 @@@ msgstr "¿De qué tamaño quiere la cla
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "¿De qué tamaño quiere la clave de Autenticación? (%u) "
  
- #: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
++#: g10/card-util.c:1316 g10/keygen.c:2122 g10/keygen.c:2154
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "redondeados a %u bits\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2207 sm/certreqgen-ui.c:188
  #, 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"
@@@ -1951,9 -1537,6 +1951,9 @@@ msgstr "   (2) Clave de cifrado\n
  msgid "   (3) Authentication key\n"
  msgstr "   (3) Clave de autentificación\n"
  
- #: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
- #: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
- #: g10/keygen.c:2314 g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1508
++#: g10/keygen.c:1794 g10/keygen.c:1822 g10/keygen.c:1952 g10/keygen.c:2060
++#: g10/keygen.c:2336 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Elección inválida.\n"
  
@@@ -1989,7 -1566,6 +1989,7 @@@ msgstr "¿Firmarlo? (s/N) 
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1816 g10/keyedit.c:1867
++#: g10/card-util.c:1816 g10/keyedit.c:1868
  msgid "quit this menu"
  msgstr "sale de este menú"
  
@@@ -1997,7 -1572,6 +1997,7 @@@
  msgid "show admin commands"
  msgstr "ver órdenes de administrador"
  
- #: g10/card-util.c:1819 g10/keyedit.c:1870
++#: g10/card-util.c:1819 g10/keyedit.c:1871
  msgid "show this help"
  msgstr "muestra esta ayuda"
  
@@@ -2073,31 -1629,21 +2073,31 @@@ msgstr "Se permiten órdenes de adminis
  msgid "Admin commands are not allowed\n"
  msgstr "No se permiten órdenes de administrador\n"
  
- #: g10/card-util.c:2127 g10/keyedit.c:2816
++#: g10/card-util.c:2127 g10/keyedit.c:2817
  msgid "Invalid command  (try \"help\")\n"
  msgstr "Orden inválida (pruebe \"help\")\n"
  
- #: g10/decrypt.c:191 g10/encrypt.c:955
++#: g10/decrypt.c:190 g10/encrypt.c:955
  msgid "--output doesn't work for this command\n"
  msgstr "--output no funciona con esta orden\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4904 g10/keyring.c:398 g10/keyring.c:771
  #, fuzzy, c-format
  #| msgid "can't open `%s'\n"
  msgid "can't open '%s'\n"
  msgstr "no se puede abrir `%s'\n"
  
 +#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
- #: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
- #: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4858 g10/keyedit.c:2051
++#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2163
  #, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "clave \"%s\" no encontrada: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
- #: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
- #: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4866 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:645 g10/tofu.c:2171
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "error leyendo bloque de claves: %s\n"
@@@ -2158,7 -1692,6 +2158,7 @@@ msgstr "¡hay una clave secreta para es
  msgid "use option \"--delete-secret-keys\" to delete it first.\n"
  msgstr "use antes la opción \"--delete-secret-key\" para borrarla.\n"
  
- #: g10/encrypt.c:232 g10/sign.c:1292
++#: g10/encrypt.c:232 g10/sign.c:1294
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "error creando frase contraseña: %s\n"
@@@ -2178,7 -1708,6 +2178,7 @@@ msgstr "usando cifrado %s\n
  msgid "'%s' already compressed\n"
  msgstr "`%s' ya está comprimido\n"
  
- #: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:610
  #, fuzzy, c-format
  #| msgid "WARNING: `%s' is an empty file\n"
  msgid "WARNING: '%s' is an empty file\n"
@@@ -2198,7 -1725,6 +2198,7 @@@ msgstr "
  "AVISO: forzar el cifrado simétrico %s (%d) viola las preferencias\n"
  "del destinatario\n"
  
- #: g10/encrypt.c:707 g10/sign.c:984
++#: g10/encrypt.c:707 g10/sign.c:986
  #, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2234,7 -1755,6 +2234,7 @@@ msgstr "datos cifrados %s\n
  msgid "encrypted with unknown algorithm %d\n"
  msgstr "cifrado con algoritmo desconocido %d\n"
  
- #: g10/decrypt-data.c:164 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:129
  msgid ""
  "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
  msgstr ""
@@@ -2329,8 -1831,6 +2329,8 @@@ msgstr "borrar tanto como sea posible d
  msgid " - skipped"
  msgstr "%s: omitido: %s\n"
  
- #: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:845 g10/sign.c:1148
++#: g10/export.c:1251 g10/import.c:1543 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:847 g10/sign.c:1150
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
@@@ -2354,8 -1850,6 +2354,8 @@@ msgstr "clave %s: clave estilo PGP 2.x 
  msgid "WARNING: nothing exported\n"
  msgstr "ATENCIÓN: no se ha exportado nada\n"
  
- #: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
- #: g10/plaintext.c:151 g10/plaintext.c:174
++#: g10/export.c:2283 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/plaintext.c:167 g10/plaintext.c:190
  #, fuzzy, c-format
  #| msgid "error creating `%s': %s\n"
  msgid "error creating '%s': %s\n"
@@@ -2405,8 -1890,6 +2405,8 @@@ msgstr "error recuperando `%s' vía %s
  msgid "No fingerprint"
  msgstr "No hay huella dactilar"
  
- #: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
- #: g10/revoke.c:701
++#: g10/getkey.c:1873 g10/keyedit.c:2929 g10/keyedit.c:3016 g10/revoke.c:637
++#: g10/revoke.c:702
  #, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "clave secreta \"%s\" no encontrada: %s\n"
@@@ -2438,205 -1916,162 +2438,211 @@@ msgstr "Clave %s inválida hecha válid
  msgid "using subkey %s instead of primary key %s\n"
  msgstr "usando subclave %s en vez de clave primaria %s\n"
  
- #: g10/gpg.c:424 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:200
  msgid "make a signature"
  msgstr "crea una firma"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:427
  msgid "make a clear text signature"
  msgstr "crea una firma en texto claro"
  
- #: g10/gpg.c:426 sm/gpgsm.c:202
++#: g10/gpg.c:429 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "crea una firma separada"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:430 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "cifra datos"
  
- #: g10/gpg.c:429
++#: g10/gpg.c:432
  msgid "encryption only with symmetric cipher"
  msgstr "cifra sólo con un cifrado simétrico"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:434 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "descifra datos (predefinido)"
  
- #: g10/gpg.c:433 sm/gpgsm.c:206
++#: g10/gpg.c:436 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "verifica una firma"
  
- #: g10/gpg.c:435 sm/gpgsm.c:207
++#: g10/gpg.c:438 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "lista claves"
  
- #: g10/gpg.c:437
++#: g10/gpg.c:440
  msgid "list keys and signatures"
  msgstr "lista claves y firmas"
  
- #: g10/gpg.c:438
++#: g10/gpg.c:443
  msgid "list and check key signatures"
  msgstr "lista y comprueba firmas de las claves"
  
- #: g10/gpg.c:439 sm/gpgsm.c:212
++#: g10/gpg.c:445 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "lista claves y huellas dactilares"
  
- #: g10/gpg.c:440 sm/gpgsm.c:210
++#: g10/gpg.c:446 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "lista claves secretas"
  
- #: g10/gpg.c:442 sm/gpgsm.c:213
++#: g10/gpg.c:448 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "genera un nuevo par de claves"
  
- #: g10/gpg.c:444
++#: g10/gpg.c:451
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly generate a new key pair"
  msgstr "genera un nuevo par de claves"
  
- #: g10/gpg.c:446
++#: g10/gpg.c:454
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly add a new user-id"
  msgstr "genera un nuevo par de claves"
  
- #: g10/gpg.c:449
++#: g10/gpg.c:459
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly revoke a user-id"
  msgstr "genera un nuevo par de claves"
  
- #: g10/gpg.c:451
++#: g10/gpg.c:462
+ #, fuzzy
+ #| msgid "generate a new key pair"
+ msgid "quickly set a new expiration date"
+ msgstr "genera un nuevo par de claves"
+ 
++#: g10/gpg.c:464
  msgid "full featured key pair generation"
  msgstr ""
  
- #: g10/gpg.c:452
++#: g10/gpg.c:467
  msgid "generate a revocation certificate"
  msgstr "genera un certificado de revocación"
  
- #: g10/gpg.c:454 sm/gpgsm.c:215
++#: g10/gpg.c:470 sm/gpgsm.c:216
  msgid "remove keys from the public keyring"
  msgstr "elimina claves del anillo público"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:472
  msgid "remove keys from the secret keyring"
  msgstr "elimina claves del anillo privado"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:474
  #, fuzzy
  #| msgid "sign a key"
  msgid "quickly sign a key"
  msgstr "firma la clave"
  
- #: g10/gpg.c:460
++#: g10/gpg.c:476
  #, fuzzy
  #| msgid "sign a key locally"
  msgid "quickly sign a key locally"
  msgstr "firma la clave localmente"
  
- #: g10/gpg.c:461
++#: g10/gpg.c:477
  msgid "sign a key"
  msgstr "firma la clave"
  
- #: g10/gpg.c:462
++#: g10/gpg.c:478
  msgid "sign a key locally"
  msgstr "firma la clave localmente"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:479
  msgid "sign or edit a key"
  msgstr "firma o modifica una clave"
  
- #: g10/gpg.c:465 sm/gpgsm.c:233
++#: g10/gpg.c:481 sm/gpgsm.c:234
  msgid "change a passphrase"
  msgstr "cambia una frase contraseña"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:485
  msgid "export keys"
  msgstr "exporta claves"
  
- #: g10/gpg.c:468
++#: g10/gpg.c:486
  msgid "export keys to a keyserver"
  msgstr "exporta claves a un servidor de claves"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:487
  msgid "import keys from a keyserver"
  msgstr "importa claves desde un servidor de claves"
  
- #: g10/gpg.c:471
++#: g10/gpg.c:490
  msgid "search for keys on a keyserver"
  msgstr "busca claves en un servidor de claves"
  
- #: g10/gpg.c:473
++#: g10/gpg.c:492
  msgid "update all keys from a keyserver"
  msgstr "actualiza todas las claves desde un servidor de claves"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:498
  msgid "import/merge keys"
  msgstr "importa/fusiona claves"
  
- #: g10/gpg.c:482
++#: g10/gpg.c:501
  msgid "print the card status"
  msgstr "escribir estado de la tarjeta"
  
- #: g10/gpg.c:483
++#: g10/gpg.c:502
  msgid "change data on a card"
  msgstr "cambiar datos en la tarjeta"
  
- #: g10/gpg.c:484
++#: g10/gpg.c:504
  msgid "change a card's PIN"
  msgstr "cambiar el PIN de la tarjeta"
  
- #: g10/gpg.c:496
++#: g10/gpg.c:516
  msgid "update the trust database"
  msgstr "actualiza la base de datos de confianza"
  
- #: g10/gpg.c:505
++#: g10/gpg.c:525
  msgid "print message digests"
  msgstr "imprime resúmenes de mensaje"
  
- #: g10/gpg.c:508 sm/gpgsm.c:228
++#: g10/gpg.c:528 sm/gpgsm.c:229
  msgid "run in server mode"
  msgstr "ejecutar en modo servidor"
  
- #: g10/gpg.c:510
++#: g10/gpg.c:530
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:514 sm/gpgsm.c:246
++#: g10/gpg.c:534 sm/gpgsm.c:248
  msgid "create ascii armored output"
  msgstr "crea una salida ascii con armadura"
  
- #: g10/gpg.c:517 sm/gpgsm.c:262
++#: g10/gpg.c:537 sm/gpgsm.c:264
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|ID-USUARIO|cifra para ID-USUARIO"
  
- #: g10/gpg.c:533 sm/gpgsm.c:298
++#: g10/gpg.c:553 sm/gpgsm.c:300
  msgid "|USER-ID|use USER-ID to sign or decrypt"
  msgstr "|ID-USUARIO|usa este identificador para firmar o descifrar"
  
- #: g10/gpg.c:539
++#: g10/gpg.c:559
  msgid "|N|set compress level to N (0 disables)"
  msgstr "|N|nivel de compresión N (0 desactiva)"
  
- #: g10/gpg.c:546
++#: g10/gpg.c:566
  msgid "use canonical text mode"
  msgstr "usa modo de texto canónico"
  
- #: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
++#: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
  msgid "|FILE|write output to FILE"
  msgstr "|FICHERO|volcar salida en FICHERO"
  
- #: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
++#: g10/gpg.c:598 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
  msgid "do not make any changes"
  msgstr "no hace ningún cambio"
  
- #: g10/gpg.c:579
++#: g10/gpg.c:599
  msgid "prompt before overwriting"
  msgstr "preguntar antes de sobreescribir"
  
- #: g10/gpg.c:628
++#: g10/gpg.c:648
  msgid "use strict OpenPGP behavior"
  msgstr "usar estilo OpenPGP estricto"
  
@@@ -2644,7 -2079,6 +2650,7 @@@
  # página man -> página de manual
  # Vale. ¿del manual mejor?
  # Hmm, no sé, en man-db se usa "de". La verdad es que no lo he pensado.
- #: g10/gpg.c:654 sm/gpgsm.c:355
++#: g10/gpg.c:674 sm/gpgsm.c:357
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2652,7 -2086,16 +2658,17 @@@ msgstr "
  "@\n"
  "(Véase en la página del manual la lista completo de órdenes y opciones)\n"
  
- #: g10/gpg.c:657 sm/gpgsm.c:358
++#: g10/gpg.c:677
+ #, fuzzy
+ #| msgid ""
+ #| "@\n"
+ #| "Examples:\n"
+ #| "\n"
+ #| " -se -r Bob [file]          sign and encrypt for user Bob\n"
+ #| " --clear-sign [file]         make a clear text signature\n"
+ #| " --detach-sign [file]       make a detached signature\n"
+ #| " --list-keys [names]        show keys\n"
+ #| " --fingerprint [names]      show fingerprints\n"
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2672,13 -2115,11 +2688,13 @@@ msgstr "
  " --list-keys [nombres]      muestra las claves\n"
  " --fingerprint [nombres]    muestra las huellas dactilares\n"
  
- #: g10/gpg.c:1026
++#: g10/gpg.c:1047
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
  msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
  
- #: g10/gpg.c:1029
++#: g10/gpg.c:1050
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg [options] [files]\n"
@@@ -2693,7 -2134,6 +2709,7 @@@ msgstr "
  "firma, comprueba, cifra o descifra\n"
  "la operación por defecto depende de los datos de entrada\n"
  
- #: g10/gpg.c:1040 sm/gpgsm.c:588
++#: g10/gpg.c:1061 sm/gpgsm.c:580
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2701,81 -2141,66 +2717,81 @@@ msgstr "
  "\n"
  "Algoritmos disponibles:\n"
  
- #: g10/gpg.c:1043
++#: g10/gpg.c:1064
  msgid "Pubkey: "
  msgstr "Clave pública: "
  
- #: g10/gpg.c:1050 g10/keyedit.c:3402
++#: g10/gpg.c:1071 g10/keyedit.c:3483
  msgid "Cipher: "
  msgstr "Cifrado: "
  
- #: g10/gpg.c:1057
++#: g10/gpg.c:1078
  msgid "Hash: "
  msgstr "Resumen: "
  
- #: g10/gpg.c:1064 g10/keyedit.c:3451
++#: g10/gpg.c:1085 g10/keyedit.c:3532
  msgid "Compression: "
  msgstr "Compresión: "
  
- #: g10/gpg.c:1133 sm/gpgsm.c:662
++#: g10/gpg.c:1154 sm/gpgsm.c:654
  #, fuzzy, c-format
  #| msgid "usage: gpgsm [options] "
  msgid "usage: %s [options] %s\n"
  msgstr "uso: gpgsm [opciones] "
  
- #: g10/gpg.c:1321 sm/gpgsm.c:751
++#: g10/gpg.c:1342 sm/gpgsm.c:743
  msgid "conflicting commands\n"
  msgstr "órdenes incompatibles\n"
  
- #: g10/gpg.c:1339
++#: g10/gpg.c:1360
  #, fuzzy, c-format
  #| msgid "no = sign found in group definition `%s'\n"
  msgid "no = sign found in group definition '%s'\n"
  msgstr "no se encontró el signo = en la definición de grupo `%s'\n"
  
- #: g10/gpg.c:1537
++#: g10/gpg.c:1558
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe ownership on homedir `%s'\n"
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr "AVISO: propiedad insegura del directorio personal `%s'\n"
  
- #: g10/gpg.c:1540
++#: g10/gpg.c:1561
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe ownership on configuration file `%s'\n"
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
  msgstr "AVISO: propiedad insegura del fichero de configuración `%s'\n"
  
- #: g10/gpg.c:1543
++#: g10/gpg.c:1564
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe ownership on extension `%s'\n"
  msgid "WARNING: unsafe ownership on extension '%s'\n"
  msgstr "AVISO: propiedad insegura de la extensión `%s'\n"
  
- #: g10/gpg.c:1549
++#: g10/gpg.c:1570
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe permissions on homedir `%s'\n"
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
  msgstr "AVISO: permisos inseguros del directorio personal `%s'\n"
  
- #: g10/gpg.c:1552
++#: g10/gpg.c:1573
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe permissions on configuration file `%s'\n"
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
  msgstr "AVISO: permisos inseguros del fichero de configuración `%s'\n"
  
- #: g10/gpg.c:1555
++#: g10/gpg.c:1576
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe permissions on extension `%s'\n"
  msgid "WARNING: unsafe permissions on extension '%s'\n"
  msgstr "AVISO: permisos inseguros de la extensión `%s'\n"
  
- #: g10/gpg.c:1561
++#: g10/gpg.c:1582
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
  msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
  msgstr "AVISO: propiedad insegura del directorio contenedor de `%s'\n"
  
- #: g10/gpg.c:1564
++#: g10/gpg.c:1585
  #, fuzzy, c-format
  #| msgid ""
  #| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2785,20 -2210,17 +2801,20 @@@ msgstr "
  "AVISO: propiedad insegura del directorio contenedor del fichero de\n"
  "configuración `%s'\n"
  
- #: g10/gpg.c:1567
++#: g10/gpg.c:1588
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
  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:1573
++#: g10/gpg.c:1594
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
  msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
  msgstr "AVISO: permisos inseguros del directorio contenedor de `%s'\n"
  
- #: g10/gpg.c:1576
++#: g10/gpg.c:1597
  #, fuzzy, c-format
  #| msgid ""
  #| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2809,496 -2231,347 +2825,440 @@@ msgstr "
  "AVISO: permisos inseguros del directorio contenedor del fichero de\n"
  "configuración `%s'\n"
  
- #: g10/gpg.c:1579
++#: g10/gpg.c:1600
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
  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:1786
++#: g10/gpg.c:1816
  #, fuzzy, c-format
  #| msgid "unknown configuration item `%s'\n"
  msgid "unknown configuration item '%s'\n"
  msgstr "artículo de configuración desconocido `%s'\n"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1925
  msgid "display photo IDs during key listings"
  msgstr "mostrar foto IDs al listar claves"
  
- #: g10/gpg.c:1895
++#: g10/gpg.c:1927
  #, fuzzy
  #| msgid "show user ID validity during key listings"
  msgid "show key usage information during key listings"
  msgstr "mostrar validez de la ID de usuario al listar claves"
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1929
  msgid "show policy URLs during signature listings"
  msgstr "mostrar URLS de política al listar firmas"
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1931
  msgid "show all notations during signature listings"
  msgstr "mostrar todas las notaciones al listar firmas"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1933
  msgid "show IETF standard notations during signature listings"
  msgstr "mostrar notaciones estándar IETF al listar firmas"
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1937
  msgid "show user-supplied notations during signature listings"
  msgstr "mostrar notaciones personalizadas al listar firmas"
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1939
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "mostrar URL del servidor de claves preferido al listar firmas"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1941
  msgid "show user ID validity during key listings"
  msgstr "mostrar validez de la ID de usuario al listar claves"
  
- #: g10/gpg.c:1911
++#: g10/gpg.c:1943
  msgid "show revoked and expired user IDs in key listings"
  msgstr "mostar IDs de usuario revocados y caducados al listar firmas"
  
- #: g10/gpg.c:1913
++#: g10/gpg.c:1945
  msgid "show revoked and expired subkeys in key listings"
  msgstr "mostrar subclaves revocadas y expiradas al listar claves"
  
- #: g10/gpg.c:1915
++#: g10/gpg.c:1947
  msgid "show the keyring name in key listings"
  msgstr "mostrar nombre de los anillos de claves al listar claves"
  
- #: g10/gpg.c:1917
++#: g10/gpg.c:1949
  msgid "show expiration dates during signature listings"
  msgstr "mostrar fechas de caducidad al listar firmas"
  
- #: g10/gpg.c:2019 g10/gpg.c:2056
++#: g10/gpg.c:2051 g10/gpg.c:2088
  #, fuzzy, c-format
  #| msgid "missing argument for option \"%.50s\"\n"
  msgid "valid values for option '%s':\n"
  msgstr "falta parámetro para la opción \"%.50s\"\n"
  
- #: g10/gpg.c:2030
++#: g10/gpg.c:2062
  #, fuzzy, c-format
  #| msgid "unknown option `%s'\n"
  msgid "unknown TOFU policy '%s'\n"
  msgstr "opción desconocida `%s'\n"
  
- #: g10/gpg.c:2032 g10/gpg.c:2068
++#: g10/gpg.c:2064 g10/gpg.c:2100
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2066
++#: g10/gpg.c:2098 g10/keygen.c:167
  #, fuzzy, c-format
  #| msgid "missing argument for option \"%.50s\"\n"
  msgid "invalid value for option '%s'\n"
  msgstr "falta parámetro para la opción \"%.50s\"\n"
  
- #: g10/gpg.c:2203
++#: g10/gpg.c:2235
  #, fuzzy, c-format
  #| msgid "NOTE: old default options file `%s' ignored\n"
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "NOTA: se ignora el antiguo fichero de opciones predefinidas `%s'\n"
  
- #: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
++#: g10/gpg.c:2839 g10/gpg.c:3610 g10/gpg.c:3622
  #, 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 es para uso normal!\n"
  
- #: g10/gpg.c:2978 g10/gpg.c:2990
++#: g10/gpg.c:3011 g10/gpg.c:3023
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid signature expiration\n"
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "`%s' no es una fecha de caducidad válida\n"
  
- #: g10/gpg.c:3012
++#: g10/gpg.c:3045
  #, fuzzy, c-format
  #| msgid "line %d: not a valid email address\n"
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "línea %d: no es una dirección de email válida\n"
  
- #: g10/gpg.c:3044 sm/gpgsm.c:1166
++#: g10/gpg.c:3077 sm/gpgsm.c:1158
  #, fuzzy, c-format
  #| msgid "invalid country code in `%s', line %d\n"
  msgid "invalid pinentry mode '%s'\n"
  msgstr "código de país inválido en `%s', línea %d\n"
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3130
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid character set\n"
  msgid "'%s' is not a valid character set\n"
  msgstr "`%s' no es un juego de caracteres válido\n"
  
- #: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
++#: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
  msgid "could not parse keyserver URL\n"
  msgstr "no se puede interpretar la URL del servidor de claves\n"
  
- #: g10/gpg.c:3137
++#: g10/gpg.c:3170
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: opciones del servidor de claves inválidas\n"
  
- #: g10/gpg.c:3140
++#: g10/gpg.c:3173
  msgid "invalid keyserver options\n"
  msgstr "opciones del servidor de claves inválidas\n"
  
- #: g10/gpg.c:3147
++#: g10/gpg.c:3180
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: opciones de importación inválidas\n"
  
- #: g10/gpg.c:3150
++#: g10/gpg.c:3183
  msgid "invalid import options\n"
  msgstr "opciones de importación inválidas\n"
  
- #: g10/gpg.c:3156 g10/gpg.c:3171
++#: g10/gpg.c:3189 g10/gpg.c:3204
  #, fuzzy, c-format
  #| msgid "invalid list options\n"
  msgid "invalid filter option: %s\n"
  msgstr "lista de opciones inválida\n"
  
- #: g10/gpg.c:3162
++#: g10/gpg.c:3195
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: opciones de exportación inválidas\n"
  
- #: g10/gpg.c:3165
++#: g10/gpg.c:3198
  msgid "invalid export options\n"
  msgstr "opciones de exportación inválidas\n"
  
- #: g10/gpg.c:3177
++#: g10/gpg.c:3210
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: lista de opciones inválida\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3213
  msgid "invalid list options\n"
  msgstr "lista de opciones inválida\n"
  
- #: g10/gpg.c:3188
++#: g10/gpg.c:3221
  msgid "display photo IDs during signature verification"
  msgstr "mostrar foto IDs al verificar firmas"
  
- #: g10/gpg.c:3190
++#: g10/gpg.c:3223
  msgid "show policy URLs during signature verification"
  msgstr "mostrar URLs de política al verificar firmas"
  
- #: g10/gpg.c:3192
++#: g10/gpg.c:3225
  msgid "show all notations during signature verification"
  msgstr "mostrar todas las notaciones al verificar firmas"
  
- #: g10/gpg.c:3194
++#: g10/gpg.c:3227
  msgid "show IETF standard notations during signature verification"
  msgstr "mostrar notaciones estándar IETF al verificar firmas"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3231
  msgid "show user-supplied notations during signature verification"
  msgstr "mostrar notaciones personalizadas al verificar firmas"
  
- #: g10/gpg.c:3200
++#: g10/gpg.c:3233
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "mostrar URLs del servidor de claves preferido al verificar firmas"
  
- #: g10/gpg.c:3202
++#: g10/gpg.c:3235
  msgid "show user ID validity during signature verification"
  msgstr "mostrar validez del ID de usuario al verificar firmas"
  
- #: g10/gpg.c:3204
++#: g10/gpg.c:3237
  msgid "show revoked and expired user IDs in signature verification"
  msgstr "mostrar IDs de usuario revocados y caducados al verificar firmas"
  
- #: g10/gpg.c:3206
++#: g10/gpg.c:3239
  msgid "show only the primary user ID in signature verification"
  msgstr "mostrar solo ID primario de usuario al verificar firmas"
  
- #: g10/gpg.c:3208
++#: g10/gpg.c:3241
  msgid "validate signatures with PKA data"
  msgstr "validar firmas con datos PKA"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3243
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr "aumentar confianza en las firmas con datos válidos PKA"
  
- #: g10/gpg.c:3217
++#: g10/gpg.c:3250
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: opciones de verificación inválidas\n"
  
- #: g10/gpg.c:3220
++#: g10/gpg.c:3253
  msgid "invalid verify options\n"
  msgstr "opciones de verificación inválidas\n"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3260
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "imposible establecer camino de ejecutables %s\n"
  
- #: g10/gpg.c:3417
++#: g10/gpg.c:3452
  #, 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:3420
++#: g10/gpg.c:3455
  msgid "invalid auto-key-locate list\n"
  msgstr "lista de auto-localización de claves inválida\n"
  
- #: g10/gpg.c:3553 sm/gpgsm.c:1507
++#: g10/gpg.c:3592 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
  msgstr "ATENCIÓN: ¡el programa podría volcar un fichero core!\n"
  
- #: g10/gpg.c:3564
++#: g10/gpg.c:3603
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "AVISO: %s sustituye a %s\n"
  
- #: g10/gpg.c:3573
++#: g10/gpg.c:3612
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "¡%s no permitido con %s!\n"
  
- #: g10/gpg.c:3576
++#: g10/gpg.c:3615
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "¡%s no tiene sentido con %s!\n"
  
- #: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
++#: g10/gpg.c:3630 sm/gpgsm.c:1518 dirmngr/dirmngr.c:951
  msgid "WARNING: running with faked system time: "
  msgstr "AVISO: ejecutándose con hora del sistema falsificada"
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3651
  #, 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:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
++#: g10/gpg.c:3686 g10/gpg.c:3710 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "el algoritmo de cifrado seleccionado es inválido\n"
  
- #: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
++#: g10/gpg.c:3692 g10/gpg.c:3716 sm/gpgsm.c:1591 sm/gpgsm.c:1597
  msgid "selected digest algorithm is invalid\n"
  msgstr "el algoritmo de resumen seleccionado no inválido\n"
  
- #: g10/gpg.c:3659
++#: g10/gpg.c:3698
  msgid "selected compression algorithm is invalid\n"
  msgstr "el algoritmo de compresión seleccionado es inválido\n"
  
- #: g10/gpg.c:3665
++#: g10/gpg.c:3704
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "el algoritmo de certificación por resumen elegido es inválido\n"
  
- #: g10/gpg.c:3680
++#: g10/gpg.c:3719
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed debe ser mayor que 0\n"
  
- #: g10/gpg.c:3682
++#: g10/gpg.c:3721
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed debe ser mayor que 1\n"
  
- #: g10/gpg.c:3684
++#: g10/gpg.c:3723
  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:3686
++#: g10/gpg.c:3725
  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:3688
++#: g10/gpg.c:3727
  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:3691
++#: g10/gpg.c:3730
  #, fuzzy
  #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
  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:3695
++#: g10/gpg.c:3734
  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:3702
++#: g10/gpg.c:3741
  msgid "invalid default preferences\n"
  msgstr "preferencias por defecto inválidas\n"
  
- #: g10/gpg.c:3706
++#: g10/gpg.c:3745
  msgid "invalid personal cipher preferences\n"
  msgstr "preferencias personales de cifrado inválidas\n"
  
- #: g10/gpg.c:3710
++#: g10/gpg.c:3749
  msgid "invalid personal digest preferences\n"
  msgstr "preferencias personales de algoritmo de resumen inválidas\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3753
  msgid "invalid personal compress preferences\n"
  msgstr "preferencias personales de compresión inválidas\n"
  
- #: g10/gpg.c:3750
++#: g10/gpg.c:3789
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s aún no funciona con %s\n"
  
- #: g10/gpg.c:3797
++#: g10/gpg.c:3836
  #, fuzzy, c-format
  #| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr "no puede usar el cifrado `%s' en modo %s\n"
  
- #: g10/gpg.c:3802
++#: g10/gpg.c:3841
  #, fuzzy, c-format
  #| msgid "you may not use digest algorithm `%s' while in %s mode\n"
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr "no puede usar el resumen `%s' en modo %s\n"
  
- #: g10/gpg.c:3807
++#: g10/gpg.c:3846
  #, fuzzy, c-format
  #| msgid "you may not use compression algorithm `%s' while in %s mode\n"
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr "no puede usar la compresión `%s' en modo %s\n"
  
- #: g10/gpg.c:3906
++#: g10/gpg.c:3945
  #, 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:3918
++#: g10/gpg.c:3957
  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:3975
- msgid "--store [filename]"
- msgstr "--store [nombre_fichero]"
- 
- #: g10/gpg.c:3985
- msgid "--symmetric [filename]"
- msgstr "--symmetric [nombre_fichero]"
- 
- #: g10/gpg.c:3989
++#: g10/gpg.c:4028
  #, fuzzy, c-format
  #| msgid "symmetric encryption of `%s' failed: %s\n"
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "el cifrado simétrico de `%s' falló: %s\n"
  
- #: g10/gpg.c:4000
- msgid "--encrypt [filename]"
- msgstr "--encrypt [nombre_fichero]"
- 
- #: g10/gpg.c:4016
- msgid "--symmetric --encrypt [filename]"
- msgstr "--symmetric --encrypt [nombre_fichero]"
- 
- #: g10/gpg.c:4018
++#: g10/gpg.c:4057
  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:4021
++#: g10/gpg.c:4060
  #, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr "no puede usar --symetric --encrypt en modo %s\n"
  
- #: g10/gpg.c:4042
- msgid "--sign [filename]"
- msgstr "--sign [nombre_fichero]"
- 
- #: g10/gpg.c:4058
- msgid "--sign --encrypt [filename]"
- msgstr "--sign --encrypt [nombre_fichero]"
- 
- #: g10/gpg.c:4076
- msgid "--symmetric --sign --encrypt [filename]"
- msgstr "--symmetric --sign --encrypt [nombre_fichero]"
- 
- #: g10/gpg.c:4078
++#: g10/gpg.c:4117
  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:4081
++#: g10/gpg.c:4120
  #, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr "no puede usar --symmetric --sign --encrypt en modo %s\n"
  
- #: g10/gpg.c:4105
- msgid "--sign --symmetric [filename]"
- msgstr "--sign --symmetric [nombre_fichero]"
- 
- #: g10/gpg.c:4117
- msgid "--clearsign [filename]"
- msgstr "--clearsign [nombre_fichero]"
- 
- #: g10/gpg.c:4147
- msgid "--decrypt [filename]"
- msgstr "--decrypt [nombre_fichero]"
- 
- #: g10/gpg.c:4174
- msgid "--sign-key user-id"
- msgstr "--sign-key id-usuario"
- 
- #: g10/gpg.c:4178
- msgid "--lsign-key user-id"
- msgstr "--lsign-key id-usuario"
- 
- #: g10/gpg.c:4199
- msgid "--edit-key user-id [commands]"
- msgstr "--edit-key id-usuario [órdenes]"
- 
- #: g10/gpg.c:4215
- msgid "--passwd <user-id>"
- msgstr "--passwd <id-usuario>"
- 
- #: g10/gpg.c:4411 g10/keyserver.c:1837
++#: g10/gpg.c:4462 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "envío al servidor de claves fallido: %s\n"
  
- #: g10/gpg.c:4416
++#: g10/gpg.c:4467
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "recepción del servidor de claves fallida: %s\n"
  
- #: g10/gpg.c:4422
++#: g10/gpg.c:4473
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "exportación de clave fallida: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4486
  #, fuzzy, c-format
  #| msgid "key export failed: %s\n"
  msgid "export as ssh key failed: %s\n"
  msgstr "exportación de clave fallida: %s\n"
  
- #: g10/gpg.c:4447
++#: g10/gpg.c:4498
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "búsqueda del servidor de claves fallida: %s\n"
  
- #: g10/gpg.c:4460
++#: g10/gpg.c:4511
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "renovación al servidor de claves fallida: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4578
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "eliminación de armadura fallida: %s\n"
  
- #: g10/gpg.c:4538
++#: g10/gpg.c:4589
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "creación de armadura fallida: %s\n"
  
- #: g10/gpg.c:4630
++#: g10/gpg.c:4681
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
  msgstr "algoritmo de distribución inválido `%s'\n"
  
- #: g10/gpg.c:4776 g10/tofu.c:2002
++#: g10/gpg.c:4827 g10/tofu.c:2151
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error parsing key specification '%s': %s\n"
  msgstr "error almacenando certificado: %s\n"
  
- #: g10/gpg.c:4788
++#: g10/gpg.c:4839
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
@@@ -3311,19 -2580,15 +3267,19 @@@
  # 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:4841
++#: g10/gpg.c:4894
  msgid "Go ahead and type your message ...\n"
  msgstr "Adelante, teclee su mensaje...\n"
  
- #: g10/gpg.c:5179
++#: g10/gpg.c:5232
  msgid "the given certification policy URL is invalid\n"
  msgstr "URL de política de certificado inválida\n"
  
- #: g10/gpg.c:5181
++#: g10/gpg.c:5234
  msgid "the given signature policy URL is invalid\n"
  msgstr "URL de política inválida\n"
  
- #: g10/gpg.c:5214
++#: g10/gpg.c:5267
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "la URL del servidor de claves preferido no es válida\n"
  
@@@ -3335,7 -2598,6 +3291,7 @@@ msgstr "|FICHERO|tomar las claves del a
  msgid "make timestamp conflicts only a warning"
  msgstr "hacer que los conflictos de fecha-hora sean sólo un aviso"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:345
++#: g10/gpgv.c:82 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|DF|escribe información de estado en este descriptor de fichero"
  
@@@ -3365,138 -2622,110 +3321,138 @@@ msgstr "Ayuda no disponible
  msgid "No help available for '%s'"
  msgstr "No hay ayuda disponible para `%s'"
  
- #: g10/import.c:151
++#: g10/import.c:152
  msgid "import signatures that are marked as local-only"
  msgstr "importar firmas marcadas como sólo locales"
  
- #: g10/import.c:154
++#: g10/import.c:155
  msgid "repair damage from the pks keyserver during import"
  msgstr "reparar daño del servidor de claves públicas al importar"
  
- #: g10/import.c:157
++#: g10/import.c:158
  #, fuzzy
  #| msgid "do not update the trustdb after import"
  msgid "do not clear the ownertrust values during import"
  msgstr "no actualiza la base de datos de confianza después de importar"
  
- #: g10/import.c:160
++#: g10/import.c:161
  msgid "do not update the trustdb after import"
  msgstr "no actualiza la base de datos de confianza después de importar"
  
- #: g10/import.c:163
++#: g10/import.c:164
  #, fuzzy
  #| msgid "show key fingerprint"
  msgid "show key during import"
  msgstr "muestra huella dactilar de la clave"
  
- #: g10/import.c:166
++#: g10/import.c:167
  msgid "only accept updates to existing keys"
  msgstr "sólo aceptar actualizaciones de claves ya existentes"
  
- #: g10/import.c:169
++#: g10/import.c:170
  msgid "remove unusable parts from key after import"
  msgstr "borrar partes inútiles de la clave después de importar"
  
- #: g10/import.c:172
++#: g10/import.c:173
  msgid "remove as much as possible from key after import"
  msgstr "borrar tanto como sea posible de la clave tras importar"
  
- #: g10/import.c:175
++#: g10/import.c:176
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:326 g10/import.c:568
++#: g10/import.c:327 g10/import.c:569
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "omitiendo bloque de tipo %d\n"
  
- #: g10/import.c:585
++#: g10/import.c:586
  #, c-format
  msgid "%lu keys processed so far\n"
  msgstr "%lu claves procesadas hasta ahora\n"
  
- #: g10/import.c:655
++#: g10/import.c:656
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "Cantidad total procesada: %lu\n"
  
- #: g10/import.c:658
++#: g10/import.c:659
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "      omitidas nuevas claves: %lu\n"
  
- #: g10/import.c:660
++#: g10/import.c:661
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "      omitidas nuevas claves: %lu\n"
  
- #: g10/import.c:663
++#: g10/import.c:664
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "          sin identificador: %lu\n"
  
- #: g10/import.c:666 sm/import.c:130
++#: g10/import.c:667 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "              importadas: %lu"
  
- #: g10/import.c:670 sm/import.c:134
++#: g10/import.c:671 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "             sin cambios: %lu\n"
  
- #: g10/import.c:672
++#: g10/import.c:673
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "     nuevos identificativos: %lu\n"
  
- #: g10/import.c:674
++#: g10/import.c:675
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "           nuevas subclaves: %lu\n"
  
- #: g10/import.c:676
++#: g10/import.c:677
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "              nuevas firmas: %lu\n"
  
- #: g10/import.c:678
++#: g10/import.c:679
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "        nuevas revocaciones de claves: %lu\n"
  
- #: g10/import.c:680 sm/import.c:136
++#: g10/import.c:681 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "     claves secretas leídas: %lu\n"
  
- #: g10/import.c:682 sm/import.c:138
++#: g10/import.c:683 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr " claves secretas importadas: %lu\n"
  
- #: g10/import.c:684 sm/import.c:140
++#: g10/import.c:685 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr "claves secretas sin cambios: %lu\n"
  
- #: g10/import.c:686 sm/import.c:142
++#: g10/import.c:687 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "          no importadas: %lu\n"
  
- #: g10/import.c:688
++#: g10/import.c:689
  #, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "    firmas limpiadas: %lu\n"
  
- #: g10/import.c:690
++#: g10/import.c:691
  #, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "      IDs de usuario limpiados: %lu\n"
  
- #: g10/import.c:1034
++#: g10/import.c:1035
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
@@@ -3505,195 -2734,157 +3461,195 @@@ msgstr "
  "AVISO: la clave %s contiene preferencias para algoritmos\n"
  "no disponibles en estos IDs de usuario:\n"
  
- #: g10/import.c:1076
++#: g10/import.c:1077
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr "         \"%s\": algoritmo de cifrado preferido %s\n"
  
- #: g10/import.c:1091
++#: g10/import.c:1092
  #, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "         \"%s\": algoritmo de resumen preferido %s\n"
  
- #: g10/import.c:1103
++#: g10/import.c:1104
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr "         \"%s\": algoritmo de compresión preferido %s\n"
  
- #: g10/import.c:1116
++#: g10/import.c:1117
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr "se recomienda encarecidamente que actualice sus preferencias y\n"
  
- #: g10/import.c:1118
++#: g10/import.c:1119
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  "re-dustribuya esta clave para evitar potenciales problemas de\n"
  "diferencias en los algoritmos.\n"
  
- #: g10/import.c:1143
++#: g10/import.c:1144
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  "puede actualizar sus preferencias con: gpg --edit-key %s updpref save\n"
  
- #: g10/import.c:1379 g10/import.c:2167
++#: g10/import.c:1380 g10/import.c:2168
  #, c-format
  msgid "key %s: no user ID\n"
  msgstr "clave %s: sin identificador de usuario\n"
  
- #: g10/import.c:1385
++#: g10/import.c:1386
  #, fuzzy, c-format
  #| msgid "skipped \"%s\": %s\n"
  msgid "key %s: %s\n"
  msgstr "omitido \"%s\": %s\n"
  
- #: g10/import.c:1386 g10/import.c:2141
++#: g10/import.c:1387 g10/import.c:2142
  msgid "rejected by import screener"
  msgstr ""
  
- #: g10/import.c:1416
++#: g10/import.c:1417
  #, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "clave %s: reparada la subclave PKS corrompida\n"
  
- #: g10/import.c:1434
++#: g10/import.c:1435
  #, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "clave %s: aceptado ID de usuario sin autofirma \"%s\"\n"
  
- #: g10/import.c:1444 g10/import.c:1475
++#: g10/import.c:1445 g10/import.c:1476
  #, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "clave %s: sin identificadores de usuario válidos\n"
  
- #: g10/import.c:1446
++#: g10/import.c:1447
  msgid "this may be caused by a missing self-signature\n"
  msgstr "esto puede ser debido a la ausencia de autofirma\n"
  
- #: g10/import.c:1516 g10/import.c:2318
++#: g10/import.c:1517 g10/import.c:2319
  #, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "clave %s: clave pública no encontrada: %s\n"
  
- #: g10/import.c:1522
++#: g10/import.c:1523
  #, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "clave %s: clave nueva - omitida\n"
  
- #: g10/import.c:1537
++#: g10/import.c:1538
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "anillo de claves no escribible encontrado: %s\n"
  
- #: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
++#: g10/import.c:1547 g10/import.c:1648 g10/import.c:2385
  #, fuzzy, c-format
  #| msgid "error writing keyring `%s': %s\n"
  msgid "error writing keyring '%s': %s\n"
  msgstr "error escribiendo anillo `%s': %s\n"
  
- #: g10/import.c:1566
++#: g10/import.c:1567
  #, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "clave %s: clave pública \"%s\" importada\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1591
  #, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "clave %s: no coincide con nuestra copia\n"
  
- #: g10/import.c:1606 g10/import.c:2342
++#: g10/import.c:1607 g10/import.c:2343
  #, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "clave %s: no puede localizarse el bloque de claves original: %s\n"
  
- #: g10/import.c:1614 g10/import.c:2349
++#: g10/import.c:1615 g10/import.c:2350
  #, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "clave %s: no puede leerse el bloque de claves original: %s\n"
  
- #: g10/import.c:1657
++#: g10/import.c:1658
  #, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "clave %s: \"%s\" 1 ID de usuario nuevo\n"
  
- #: g10/import.c:1660
++#: g10/import.c:1661
  #, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "clave %s: \"%s\" %d nuevos identificadores de usuario\n"
  
- #: g10/import.c:1663
++#: g10/import.c:1664
  #, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "clave %s: \"%s\" 1 firma nueva\n"
  
- #: g10/import.c:1666
++#: g10/import.c:1667
  #, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "clave %s: \"%s\" %d firmas nuevas\n"
  
- #: g10/import.c:1669
++#: g10/import.c:1670
  #, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "clave %s: \"%s\" 1 subclave nueva\n"
  
- #: g10/import.c:1672
++#: g10/import.c:1673
  #, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "clave %s: \"%s\" %d subclaves nuevas\n"
  
- #: g10/import.c:1675
++#: g10/import.c:1676
  #, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "clave %s: \"%s\" %d firmas limpiadas\n"
  
- #: g10/import.c:1678
++#: g10/import.c:1679
  #, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "clave %s: \"%s\" %d firmas limpiadas\n"
  
- #: g10/import.c:1681
++#: g10/import.c:1682
  #, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "clave %s: \"%s\" %d identificador de usuario limpiado\n"
  
- #: g10/import.c:1684
++#: g10/import.c:1685
  #, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "clave %s: \"%s\" %d identificadores de usuario limpiados\n"
  
- #: g10/import.c:1707
++#: g10/import.c:1708
  #, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "clave %s: \"%s\" sin cambios\n"
  
- #: g10/import.c:2019 g10/import.c:2264
++#: g10/import.c:2020 g10/import.c:2265
  #, c-format
  msgid "key %s: secret key imported\n"
  msgstr "clave %s: clave secreta importada\n"
  
- #: g10/import.c:2027
++#: g10/import.c:2028
  #, fuzzy, c-format
  #| msgid "skipped: secret key already present\n"
  msgid "key %s: secret key already exists\n"
  msgstr "omitido: clave secreta ya presente\n"
  
- #: g10/import.c:2035
++#: g10/import.c:2036
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "key %s: error sending to agent: %s\n"
  msgstr "error enviando orden %s: %s\n"
  
- #: g10/import.c:2140
++#: g10/import.c:2141
  #, fuzzy, c-format
  #| msgid "secret key \"%s\" not found: %s\n"
  msgid "secret key %s: %s\n"
  msgstr "clave secreta \"%s\" no encontrada: %s\n"
  
- #: g10/import.c:2160 g10/import.c:2195
++#: g10/import.c:2161 g10/import.c:2196
  msgid "importing secret keys not allowed\n"
  msgstr "no se permite importar claves secretas\n"
  
- #: g10/import.c:2184
++#: g10/import.c:2185
  #, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr "clave %s: clave secreta con cifrado inválido %d - omitida\n"
@@@ -3708,141 -2899,114 +3664,141 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2256
++#: g10/import.c:2257
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2311
++#: g10/import.c:2312
  #, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
  "clave %s: falta la clave pública - imposible emplear el\n"
  "certificado de revocación\n"
  
- #: g10/import.c:2360
++#: g10/import.c:2361
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "clave %s: certificado de revocación inválido: %s - rechazado\n"
  
- #: g10/import.c:2393
++#: g10/import.c:2394
  #, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "clave %s: \"%s\" certificado de revocación importado\n"
  
- #: g10/import.c:2469
++#: g10/import.c:2470
  #, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "clave %s: no hay identificador de usuario para la firma\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2487
  #, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr "clave %s: algoritmo de clave pública no disponible para ID \"%s\"\n"
  
- #: g10/import.c:2488
++#: g10/import.c:2489
  #, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "clave %s: autofirma inválida para el id \"%s\"\n"
  
- #: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
++#: g10/import.c:2506 g10/import.c:2532 g10/import.c:2583
  #, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "clave %s: algoritmo de clave pública no disponible\n"
  
- #: g10/import.c:2506
++#: g10/import.c:2507
  #, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "clave %s: firma directa de clave inválida\n"
  
- #: g10/import.c:2520
++#: g10/import.c:2521
  #, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "clave %s: no hay subclave que unir a la clave\n"
  
- #: g10/import.c:2533
++#: g10/import.c:2534
  #, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "clave %s: unión de subclave inválida\n"
  
- #: g10/import.c:2549
++#: g10/import.c:2550
  #, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "clave %s: borrado enlace de subclaves múltiples\n"
  
- #: g10/import.c:2571
++#: g10/import.c:2572
  #, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "clave %s: no hay subclave para la revocación de clave\n"
  
- #: g10/import.c:2584
++#: g10/import.c:2585
  #, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "clave %s: revocación de subclave inválida\n"
  
- #: g10/import.c:2599
++#: g10/import.c:2600
  #, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "clave %s: borrada revocación de subclave múltiple\n"
  
- #: g10/import.c:2641
++#: g10/import.c:2642
  #, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "clave %s: omitido ID de usuario \"%s\"\n"
  
- #: g10/import.c:2665
++#: g10/import.c:2666
  #, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "clave %s: subclave omitida\n"
  
- #: g10/import.c:2694
++#: g10/import.c:2695
  #, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "clave %s: firma no exportable (clase 0x%02x) - omitida\n"
  
- #: g10/import.c:2705
++#: g10/import.c:2706
  #, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "clave %s: certificado de revocación en lugar equivocado - omitido\n"
  
- #: g10/import.c:2723
++#: g10/import.c:2724
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "clave %s: certificado de revocación no valido: %s - omitido\n"
  
- #: g10/import.c:2737
++#: g10/import.c:2738
  #, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "clave %s: firma de subclave en lugar equivocado - omitida\n"
  
- #: g10/import.c:2745
++#: g10/import.c:2746
  #, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "clave %s: firma de clase (0x%02x) inesperada - omitida\n"
  
- #: g10/import.c:2887
++#: g10/import.c:2888
  #, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "clave %s: detectado usuario duplicado - fusionada\n"
  
- #: g10/import.c:2951
++#: g10/import.c:2952
  #, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr ""
  "AVISO: la clave %s puede estar revocada: recuperando clave de revocación %s\n"
  
- #: g10/import.c:2967
++#: g10/import.c:2968
  #, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr ""
  "AVISO: la clave %s puede estar revocada: falta clave de revocación %s.\n"
  
- #: g10/import.c:3031
++#: g10/import.c:3032
  #, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "clave %s: \"%s\" certificado de revocación añadido\n"
  
- #: g10/import.c:3069
++#: g10/import.c:3070
  #, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "clave %s: firma directa de clave añadida\n"
@@@ -3883,52 -3041,42 +3839,52 @@@ msgstr "recurso de bloque de claves: `%
  msgid "error opening key DB: %s\n"
  msgstr "error abriendo `%s': %s\n"
  
- #: g10/keydb.c:1782
++#: g10/keydb.c:1786
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "fallo reconstruyendo caché del anillo de claves: %s\n"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[revocation]"
  msgstr "[revocación]"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[self-signature]"
  msgstr "[autofirma]"
  
- #: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
++#: g10/keyedit.c:433 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: dirmngr/ldap-wrapper.c:694
  #, fuzzy, c-format
  #| msgid "error allocating enough memory: %s\n"
  msgid "error allocating memory: %s\n"
  msgstr "error reservando memoria: %s\n"
  
- #: g10/keyedit.c:629
++#: g10/keyedit.c:630
  #, fuzzy, c-format
  #| msgid "key %s: unsupported public key algorithm\n"
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr "clave %s: algoritmo de clave pública no disponible\n"
  
- #: g10/keyedit.c:638
++#: g10/keyedit.c:639
  #, fuzzy, c-format
  #| msgid "card does not support digest algorithm %s\n"
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "la tarjeta no permite usar el algoritmo de resumen %s\n"
  
- #: g10/keyedit.c:800
++#: g10/keyedit.c:801
  #, fuzzy
  #| msgid "revoke signatures"
  msgid " (reordered signatures follow)"
  msgstr "revoca firmas"
  
- #: g10/keyedit.c:913
++#: g10/keyedit.c:914
  #, fuzzy, c-format
  #| msgid "skipped \"%s\": %s\n"
  msgid "key %s:\n"
  msgstr "omitido \"%s\": %s\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:917
  #, fuzzy, c-format
  #| msgid "User ID \"%s\": %d signature removed\n"
  msgid "%d duplicate signature removed\n"
@@@ -3936,7 -3084,6 +3892,7 @@@ msgid_plural "%d duplicate signatures r
  msgstr[0] "ID de usuario \"%s\": %d firma borrada\n"
  msgstr[1] "ID de usuario \"%s\": %d firma borrada\n"
  
- #: g10/keyedit.c:919 g10/keylist.c:480
++#: g10/keyedit.c:920 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
@@@ -3944,7 -3091,6 +3900,7 @@@ msgid_plural "%d signatures not checke
  msgstr[0] "1 firma no comprobada por falta de clave\n"
  msgstr[1] "1 firma no comprobada por falta de clave\n"
  
- #: g10/keyedit.c:923 g10/keylist.c:476
++#: g10/keyedit.c:924 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
@@@ -3952,7 -3098,6 +3908,7 @@@ msgid_plural "%d bad signatures\n
  msgstr[0] "%d firmas incorrectas\n"
  msgstr[1] "%d firmas incorrectas\n"
  
- #: g10/keyedit.c:927
++#: g10/keyedit.c:928
  #, fuzzy, c-format
  #| msgid "Good signature from"
  msgid "%d signature reordered\n"
@@@ -3960,14 -3105,12 +3916,14 @@@ msgid_plural "%d signatures reordered\n
  msgstr[0] "Firma correcta de"
  msgstr[1] "Firma correcta de"
  
- #: g10/keyedit.c:932
++#: g10/keyedit.c:933
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:992 g10/pkclist.c:274
++#: g10/keyedit.c:993 g10/pkclist.c:274
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
  "keys\n"
@@@ -3979,17 -3122,14 +3935,17 @@@ msgstr "
  "pasaportes, comprobando huellas dactilares en diferentes fuentes...)\n"
  "\n"
  
- #: g10/keyedit.c:996 g10/pkclist.c:286
++#: g10/keyedit.c:997 g10/pkclist.c:286
  #, c-format
  msgid "  %d = I trust marginally\n"
  msgstr " %d = Confío un poco\n"
  
- #: g10/keyedit.c:997 g10/pkclist.c:288
++#: g10/keyedit.c:998 g10/pkclist.c:288
  #, c-format
  msgid "  %d = I trust fully\n"
  msgstr " %d = Confío totalmente\n"
  
- #: g10/keyedit.c:1015
++#: g10/keyedit.c:1016
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
@@@ -3999,50 -3139,38 +3955,50 @@@ msgstr "
  "Un nivel mayor que 1 permite que la clave que está firmando pueda\n"
  "hacer firmas de confianza en su nombre.\n"
  
- #: g10/keyedit.c:1032
++#: g10/keyedit.c:1033
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr "Introduzca un dominio para restringir esta firma, o intro para nada.\n"
  
- #: g10/keyedit.c:1160
++#: g10/keyedit.c:1161
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1168
++#: g10/keyedit.c:1169
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "ID de usuario \"%s\" revocado."
  
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
- #: g10/keyedit.c:2246
++#: g10/keyedit.c:1178 g10/keyedit.c:1206 g10/keyedit.c:1233 g10/keyedit.c:1417
++#: g10/keyedit.c:2247
  msgid "Are you sure you still want to sign it? (y/N) "
  msgstr "¿Seguro que todavía quiere firmarlo? (s/N) "
  
- #: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
- #: g10/keyedit.c:2251 g10/keyedit.c:3177
++#: g10/keyedit.c:1192 g10/keyedit.c:1220 g10/keyedit.c:1247 g10/keyedit.c:1423
++#: g10/keyedit.c:2252 g10/keyedit.c:3178
  msgid "  Unable to sign.\n"
  msgstr "  Imposible firmar.\n"
  
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1197
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "ID de usuario \"%s\" expirado."
  
- #: g10/keyedit.c:1224
++#: g10/keyedit.c:1225
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "ID de usuario \"%s\" no tiene autofirma."
  
- #: g10/keyedit.c:1253
++#: g10/keyedit.c:1254
  #, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "ID de usuario \"%s\" puede firmarse."
  
- #: g10/keyedit.c:1255
++#: g10/keyedit.c:1256
  msgid "Sign it? (y/N) "
  msgstr "¿Firmarlo? (s/N) "
  
- #: g10/keyedit.c:1282
++#: g10/keyedit.c:1283
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -4051,11 -3179,9 +4007,11 @@@ msgstr "
  "La autofirma en \"%s\"\n"
  "es una firma de tipo PGP 2.x.\n"
  
- #: g10/keyedit.c:1291
++#: g10/keyedit.c:1292
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr "Quiere convertirla en una autofirma OpenPGP? (s/N) "
  
- #: g10/keyedit.c:1304
++#: g10/keyedit.c:1305
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -4064,11 -3190,9 +4020,11 @@@ msgstr "
  "Su firma actual en \"%s\"\n"
  "ha expirado.\n"
  
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:1310
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr "¿Quiere producir una nueva firma que reemplace a la expirada? (s/N) "
  
- #: g10/keyedit.c:1330
++#: g10/keyedit.c:1331
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -4077,43 -3201,34 +4033,43 @@@ msgstr "
  "Su firma actual en \"%s\"\n"
  "es una firma local.\n"
  
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:1336
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr "Quiere convertirla en una clave totalmente exportable? (s/N) "
  
- #: g10/keyedit.c:1355
++#: g10/keyedit.c:1356
  #, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "\"%s\" ya estaba firmada localmente por la clave %s\n"
  
- #: g10/keyedit.c:1359
++#: g10/keyedit.c:1360
  #, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "\"%s\" ya estaba firmada por la clave %s\n"
  
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:1365
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "¿Quiere firmarlo aún así? (s/N) "
  
- #: g10/keyedit.c:1386
++#: g10/keyedit.c:1387
  #, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "Nada que firmar con la clave %s\n"
  
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1411
  msgid "This key has expired!"
  msgstr "¡Esta clave ha caducado!"
  
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1429
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "Esta clave expirará el %s.\n"
  
- #: g10/keyedit.c:1434
++#: g10/keyedit.c:1435
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr "¿Quiere que su firma caduque al mismo tiempo? (S/n) "
  
- #: g10/keyedit.c:1475
++#: g10/keyedit.c:1476
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -4123,33 -3238,27 +4079,33 @@@ msgstr "
  "firmar pertenece realmente a la persona arriba nombrada? Si no sabe que\n"
  "contestar, introduzca \"0\".\n"
  
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1481
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) No contesto.%s\n"
  
- #: g10/keyedit.c:1482
++#: g10/keyedit.c:1483
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) No lo he comprobado en absoluto.%s\n"
  
- #: g10/keyedit.c:1484
++#: g10/keyedit.c:1485
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) He hecho una comprobación informal.%s\n"
  
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:1488
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) Lo he comprobado meticulosamente.%s\n"
  
- #: g10/keyedit.c:1494
++#: g10/keyedit.c:1495
  #, fuzzy
  #| msgid "Your selection? (enter `?' for more information): "
  msgid "Your selection? (enter '?' for more information): "
  msgstr "¿Su elección? (escriba '?' si desea más información): "
  
- #: g10/keyedit.c:1521
++#: g10/keyedit.c:1522
  #, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -4158,223 -3267,169 +4114,223 @@@ msgstr "
  "¿Está realmente seguro de querer firmar esta clave\n"
  "con su clave: \"%s\" (%s)?\n"
  
- #: g10/keyedit.c:1529
++#: g10/keyedit.c:1530
  msgid "This will be a self-signature.\n"
  msgstr "Esto será una autofirma.\n"
  
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:1535
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr "ATENCION: la firma no se marcará como no exportable.\n"
  
- #: g10/keyedit.c:1541
++#: g10/keyedit.c:1542
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr "AVISO: la firma no se marcará como no revocable.\n"
  
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1552
  msgid "The signature will be marked as non-exportable.\n"
  msgstr "La firma se marcará como no exportable.\n"
  
- #: g10/keyedit.c:1558
++#: g10/keyedit.c:1559
  msgid "The signature will be marked as non-revocable.\n"
  msgstr "La firma se marcará como no revocable.\n"
  
- #: g10/keyedit.c:1565
++#: g10/keyedit.c:1566
  msgid "I have not checked this key at all.\n"
  msgstr "No he comprobado esta clave en absoluto.\n"
  
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:1571
  msgid "I have checked this key casually.\n"
  msgstr "He comprobado esta clave informalmente.\n"
  
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:1576
  msgid "I have checked this key very carefully.\n"
  msgstr "He comprobado esta clave meticulosamente.\n"
  
- #: g10/keyedit.c:1587
++#: g10/keyedit.c:1588
  msgid "Really sign? (y/N) "
  msgstr "¿Firmar de verdad? (s/N) "
  
- #: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
- #: g10/keyedit.c:6463 g10/sign.c:323
++#: g10/keyedit.c:1639 g10/keyedit.c:6308 g10/keyedit.c:6391 g10/keyedit.c:6500
++#: g10/keyedit.c:6562 g10/sign.c:325
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "firma fallida: %s\n"
  
- #: g10/keyedit.c:1725
++#: g10/keyedit.c:1726
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  "La clave tiene sólo un apuntador u objetos de clave en la propia tarjeta\n"
  "- no hay frase contraseña que cambiar.\n"
  
- #: g10/keyedit.c:1755
++#: g10/keyedit.c:1756
  #, fuzzy, c-format
  #| msgid "error creating passphrase: %s\n"
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "error creando frase contraseña: %s\n"
  
- #: g10/keyedit.c:1869
++#: g10/keyedit.c:1870
  msgid "save and quit"
  msgstr "graba y sale"
  
- #: g10/keyedit.c:1872
++#: g10/keyedit.c:1873
  msgid "show key fingerprint"
  msgstr "muestra huella dactilar de la clave"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1874
  #, fuzzy
  #| msgid "Enter the keygrip: "
  msgid "show the keygrip"
  msgstr "Introduzca keygrip: "
  
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1875
  msgid "list key and user IDs"
  msgstr "lista clave e identificadores de usuario"
  
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1877
  msgid "select user ID N"
  msgstr "selecciona identificador de usuario N"
  
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1878
  msgid "select subkey N"
  msgstr "selecciona subclave N"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1879
  msgid "check signatures"
  msgstr "comprueba firmas"
  
- #: g10/keyedit.c:1884
++#: g10/keyedit.c:1885
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr "firmar IDs seleccionadas [* ver debajo órdenes relacionadas]"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1890
  msgid "sign selected user IDs locally"
  msgstr "firma localmente los IDs de usuarios elegidos"
  
- #: g10/keyedit.c:1890
++#: g10/keyedit.c:1891
  msgid "sign selected user IDs with a trust signature"
  msgstr "firmar IDs seleccionados con firma de confianza"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1893
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr "firmar IDs seleccionados con firma no revocable"
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1895
  msgid "add a user ID"
  msgstr "añadir un identificador de usuario"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1897
  msgid "add a photo ID"
  msgstr "añadir un ID fotográfico"
  
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1898
  msgid "delete selected user IDs"
  msgstr "borrar identificadores de usuario seleccionados"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1901
  msgid "add a subkey"
  msgstr "añadir una subclave"
  
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1904
  msgid "add a key to a smartcard"
  msgstr "añadir clave a tarjeta"
  
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1906
  msgid "move a key to a smartcard"
  msgstr "mover una clave a la tarjeta"
  
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1908
  msgid "move a backup key to a smartcard"
  msgstr "mover una clave de respaldo a la tarjeta"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1910
  msgid "delete selected subkeys"
  msgstr "borrar clave secundaria"
  
- #: g10/keyedit.c:1911
++#: g10/keyedit.c:1912
  msgid "add a revocation key"
  msgstr "añadir una clave de revocación"
  
- #: g10/keyedit.c:1913
++#: g10/keyedit.c:1914
  msgid "delete signatures from the selected user IDs"
  msgstr "borrar firmas de los ID seleccionados"
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1916
  msgid "change the expiration date for the key or selected subkeys"
  msgstr "cambiar la fecha de caducidad para la clave o subclaves seleccionadas"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1918
  msgid "flag the selected user ID as primary"
  msgstr "marcar ID de usuario seleccionado como primario"
  
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1921
  msgid "list preferences (expert)"
  msgstr "mostrar preferencias (experto)"
  
- #: g10/keyedit.c:1921
++#: g10/keyedit.c:1922
  msgid "list preferences (verbose)"
  msgstr "mostrar preferencias (prolijo)"
  
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:1924
  msgid "set preference list for the selected user IDs"
  msgstr "establecer preferencias para todos los ID seleccionados"
  
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1927
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr "establecer URL del servidor de claves preferido por los IDs elegidos"
  
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1929
  msgid "set a notation for the selected user IDs"
  msgstr "establecer notación para los IDs de usuario seleccionados"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1931
  msgid "change the passphrase"
  msgstr "cambia la frase contraseña"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1934
  msgid "change the ownertrust"
  msgstr "cambia valores de confianza"
  
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1937
  msgid "revoke signatures on the selected user IDs"
  msgstr "revocar firmas de los identificadores seleccionados"
  
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1939
  msgid "revoke selected user IDs"
  msgstr "revocar los identificadores seleccionados"
  
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1942
  msgid "revoke key or selected subkeys"
  msgstr "revoca clave o subclaves seleccionadas"
  
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1944
  msgid "enable key"
  msgstr "habilita clave"
  
- #: g10/keyedit.c:1944
++#: g10/keyedit.c:1945
  msgid "disable key"
  msgstr "deshabilita clave"
  
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1947
  msgid "show selected photo IDs"
  msgstr "mostrar fotos de los ID seleccionados"
  
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1949
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr "compactar IDs inutilizables y borrar firmas inutilizables de la clave"
  
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:1951
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr "compactar IDs inutilizables y borrar todas las firmas de la clave"
  
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2063
  msgid "Secret key is available.\n"
  msgstr "Clave secreta disponible.\n"
  
- #: g10/keyedit.c:2162
++#: g10/keyedit.c:2163
  msgid "Need the secret key to do this.\n"
  msgstr "Se necesita la clave secreta para hacer esto.\n"
  
- #: g10/keyedit.c:2183
++#: g10/keyedit.c:2184
  #, fuzzy
  #| msgid ""
  #| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4392,270 -3447,216 +4348,276 @@@ 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:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
++#: g10/keyedit.c:2240 g10/keyedit.c:3178 g10/keyedit.c:3317 g10/keyedit.c:3379
  msgid "Key is revoked."
  msgstr "La clave está revocada."
  
- #: g10/keyedit.c:2262
++#: g10/keyedit.c:2263
  msgid "Really sign all user IDs? (y/N) "
  msgstr "¿Firmar realmente todos los IDs de usuario? (s/N) "
  
- #: g10/keyedit.c:2266
++#: g10/keyedit.c:2267
  #, fuzzy
  #| msgid "Really sign all user IDs? (y/N) "
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "¿Firmar realmente todos los IDs de usuario? (s/N) "
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2275
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Sugerencia: seleccione los identificadores de usuario que firmar\n"
  
- #: g10/keyedit.c:2285
++#: g10/keyedit.c:2286
  #, fuzzy, c-format
  #| msgid "Unknown signature type `%s'\n"
  msgid "Unknown signature type '%s'\n"
  msgstr "Clase de firma desconocida `%s'\n"
  
- #: g10/keyedit.c:2309
++#: g10/keyedit.c:2310
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
  msgstr "Esta orden no se permite en modo %s.\n"
  
- #: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
++#: g10/keyedit.c:2332 g10/keyedit.c:2356 g10/keyedit.c:2550
  msgid "You must select at least one user ID.\n"
  msgstr "Debe seleccionar por lo menos un identificador de usuario.\n"
  
- #: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
++#: g10/keyedit.c:2334 g10/keyedit.c:2358 g10/keyedit.c:2512 g10/keyedit.c:2552
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2336
++#: g10/keyedit.c:2337
  msgid "You can't delete the last user ID!\n"
  msgstr "¡No puede borrar el último identificador de usuario!\n"
  
- #: g10/keyedit.c:2339
++#: g10/keyedit.c:2340
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "¿Borrar realmente todos los identificadores seleccionados? (s/N) "
  
- #: g10/keyedit.c:2340
++#: g10/keyedit.c:2341
  msgid "Really remove this user ID? (y/N) "
  msgstr "¿Borrar realmente este identificador de usuario? (s/N) "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2397
++#: g10/keyedit.c:2398
  msgid "Really move the primary key? (y/N) "
  msgstr "¿Realmente cambiar de sitio la clave primaria? (s/N)"
  
- #: g10/keyedit.c:2409 g10/keyedit.c:4866
++#: g10/keyedit.c:2410 g10/keyedit.c:4964
  msgid "You must select exactly one key.\n"
  msgstr "Debe seleccionar exactamente una clave.\n"
  
- #: g10/keyedit.c:2436
++#: g10/keyedit.c:2437
  msgid "Command expects a filename argument\n"
  msgstr "La orden espera un nombre de fichero como argumento\n"
  
- #: g10/keyedit.c:2457
++#: g10/keyedit.c:2458
  #, fuzzy, c-format
  #| msgid "Can't open `%s': %s\n"
  msgid "Can't open '%s': %s\n"
  msgstr "No se puede abrir `%s': %s\n"
  
- #: g10/keyedit.c:2474
++#: g10/keyedit.c:2475
  #, fuzzy, c-format
  #| msgid "Error reading backup key from `%s': %s\n"
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "Error leyendo clave de respaldo desde `%s': %s\n"
  
- #: g10/keyedit.c:2509
++#: g10/keyedit.c:2510
  msgid "You must select at least one key.\n"
  msgstr "Debe seleccionar por lo menos una clave.\n"
  
- #: g10/keyedit.c:2515
++#: g10/keyedit.c:2516
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "¿De verdad quiere borrar las claves seleccionadas? (s/N) "
  
- #: g10/keyedit.c:2517
++#: g10/keyedit.c:2518
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "¿De verdad quiere borrar esta clave? (s/N) "
  
- #: g10/keyedit.c:2555
++#: g10/keyedit.c:2556
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr "¿Revocar realmente todos los identificadores seleccionados? (s/N) "
  
- #: g10/keyedit.c:2556
++#: g10/keyedit.c:2557
  msgid "Really revoke this user ID? (y/N) "
  msgstr "¿Revocar realmente este identificador de usuario? (s/N) "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2575
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "¿De verdad quiere revocar la clave completa? (s/N) "
  
- #: g10/keyedit.c:2585
++#: g10/keyedit.c:2586
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "¿De verdad quiere revocar las subclaves seleccionadas? (s/N)"
  
- #: g10/keyedit.c:2587
++#: g10/keyedit.c:2588
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "¿De verdad quiere revocar esta subclave? (s/N) "
  
- #: g10/keyedit.c:2645
++#: g10/keyedit.c:2646
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  "La confianza del propietario no puede establecerse si se está usando\n"
  "una base de datos de confianza propocionada por el usuario\n"
  
- #: g10/keyedit.c:2690
++#: g10/keyedit.c:2691
  msgid "Set preference list to:\n"
  msgstr "Establecer lista de preferencias a:\n"
  
- #: g10/keyedit.c:2697
++#: g10/keyedit.c:2698
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr ""
  "¿Actualizar realmente las preferencias para los ID seleccionados? (s/N) "
  
- #: g10/keyedit.c:2699
++#: g10/keyedit.c:2700
  msgid "Really update the preferences? (y/N) "
  msgstr "¿Actualizar realmente las preferencias? (s/N) "
  
- #: g10/keyedit.c:2773
++#: g10/keyedit.c:2774
  msgid "Save changes? (y/N) "
  msgstr "¿Grabar cambios? (s/N) "
  
- #: g10/keyedit.c:2777
++#: g10/keyedit.c:2778
  msgid "Quit without saving? (y/N) "
  msgstr "¿Salir sin grabar? (s/N) "
  
- #: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
- #: g10/keyedit.c:3267 g10/keyedit.c:3332
++#: g10/keyedit.c:2789 g10/keyedit.c:2799 g10/keyedit.c:2943 g10/keyedit.c:3046
++#: g10/keyedit.c:3268 g10/keyedit.c:3333 g10/keyedit.c:3409
  #, c-format
  msgid "update failed: %s\n"
  msgstr "actualización fallida: %s\n"
  
- #: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
++#: g10/keyedit.c:2805 g10/keyedit.c:3273 g10/keyedit.c:3338 g10/keyedit.c:3416
  msgid "Key not changed so no update needed.\n"
  msgstr "Clave sin cambios, no se necesita actualización.\n"
  
- #: g10/keyedit.c:3038
++#: g10/keyedit.c:3039
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
  msgstr "Creación de la clave fallida: %s\n"
  
- #: g10/keyedit.c:3083
++#: g10/keyedit.c:3084
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "huella dactilar no válida"
  
- #: g10/keyedit.c:3112
++#: g10/keyedit.c:3113
  #, fuzzy, c-format
  #| msgid "failed to get the fingerprint\n"
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "fallo obteniendo huella digital\n"
  
- #: g10/keyedit.c:3248 g10/keyedit.c:3251
++#: g10/keyedit.c:3249 g10/keyedit.c:3252
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
  msgstr "valor inválido\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  #, fuzzy
  #| msgid "No such user ID.\n"
  msgid "No matching user IDs."
  msgstr "ID de usuario inexistente.\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  #, fuzzy
  #| msgid "Nothing to sign with key %s\n"
  msgid "Nothing to sign.\n"
  msgstr "Nada que firmar con la clave %s\n"
  
- #: g10/keyedit.c:3427
++#: g10/keyedit.c:3388
+ #, fuzzy, c-format
+ #| msgid "`%s' is not a valid signature expiration\n"
+ msgid "'%s' is not a valid expiration time\n"
+ msgstr "`%s' no es una fecha de caducidad válida\n"
+ 
++#: g10/keyedit.c:3508
  msgid "Digest: "
  msgstr "Resumen: "
  
- #: g10/keyedit.c:3484
++#: g10/keyedit.c:3565
  msgid "Features: "
  msgstr "Características: "
  
- #: g10/keyedit.c:3495
++#: g10/keyedit.c:3576
  msgid "Keyserver no-modify"
  msgstr "Sevidor de claves no-modificar"
  
- #: g10/keyedit.c:3510 g10/keylist.c:377
++#: g10/keyedit.c:3591 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr "Servidor de claves preferido: "
  
- #: g10/keyedit.c:3518 g10/keyedit.c:3519
++#: g10/keyedit.c:3599 g10/keyedit.c:3600
  msgid "Notations: "
  msgstr "Notaciones: "
  
- #: g10/keyedit.c:3764
++#: g10/keyedit.c:3845
  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:3836
++#: g10/keyedit.c:3917
  #, 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:3860
++#: g10/keyedit.c:3941
  #, 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:3866
++#: g10/keyedit.c:3947
  msgid "(sensitive)"
  msgstr "(confidencial)"
  
- #: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3989 g10/keyedit.c:4131 g10/keylist.c:262 g10/keyserver.c:538
  #, c-format
  msgid "created: %s"
  msgstr "creado: %s"
  
- #: g10/keyedit.c:3911 g10/keylist.c:1852
++#: g10/keyedit.c:3992 g10/keylist.c:1852
  #, c-format
  msgid "revoked: %s"
  msgstr "revocada: %s"
  
- #: g10/keyedit.c:3913 g10/keylist.c:1858
++#: g10/keyedit.c:3994 g10/keylist.c:1858
  #, c-format
  msgid "expired: %s"
  msgstr "caducó: %s"
  
- #: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyedit.c:3996 g10/keyedit.c:4133 g10/keylist.c:264 g10/keylist.c:1864
 +#: g10/keyserver.c:544
  #, c-format
  msgid "expires: %s"
  msgstr "caduca: %s"
  
- #: g10/keyedit.c:3917
++#: g10/keyedit.c:3998
  #, c-format
  msgid "usage: %s"
  msgstr "uso: %s"
  
- #: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
++#: g10/keyedit.c:4006 g10/keyedit.c:4026 g10/keylist.c:267
  msgid "card-no: "
  msgstr "num. tarjeta: "
  
- #: g10/keyedit.c:3984
++#: g10/keyedit.c:4065
  #, c-format
  msgid "trust: %s"
  msgstr "confianza: %s"
  
- #: g10/keyedit.c:3988
++#: g10/keyedit.c:4069
  #, c-format
  msgid "validity: %s"
  msgstr "validez: %s"
  
- #: g10/keyedit.c:3995
++#: g10/keyedit.c:4076
  msgid "This key has been disabled"
  msgstr "Esta clave está deshabilitada"
  
- #: g10/keyedit.c:4013
++#: g10/keyedit.c:4094
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4663,18 -3664,12 +4625,18 @@@ msgstr "
  "Por favor, advierta que la validez de clave mostrada no es necesariamente\n"
  "correcta a menos de que reinicie el programa.\n"
  
- #: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
- #: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: g10/keyedit.c:4150 g10/keyedit.c:4581 g10/keyserver.c:548
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:712
 +#: dirmngr/ocsp.c:703
  msgid "revoked"
  msgstr "revocada"
  
- #: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
- #: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4152 g10/keyedit.c:4583 g10/keyserver.c:552
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:714
  msgid "expired"
  msgstr "caducada"
  
- #: g10/keyedit.c:4188
++#: g10/keyedit.c:4269
  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"
@@@ -4682,17 -3677,14 +4644,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:4240
++#: g10/keyedit.c:4321
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr ""
  
- #: g10/keyedit.c:4241
++#: g10/keyedit.c:4322
  #, fuzzy
  #| 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 puede cambiar la fecha de caducidad de una clave v3\n"
  
- #: g10/keyedit.c:4300
++#: g10/keyedit.c:4381
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4701,35 -3693,27 +4663,35 @@@ 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:4305 g10/keyedit.c:4595
++#: g10/keyedit.c:4386 g10/keyedit.c:4676
  msgid "Are you sure you still want to add it? (y/N) "
  msgstr "¿Está seguro de querer añadirla? (s/N) "
  
- #: g10/keyedit.c:4311
++#: g10/keyedit.c:4392
  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:4326 g10/keygen.c:2697
++#: g10/keyedit.c:4407 g10/keygen.c:2719
  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:4428
++#: g10/keyedit.c:4509
  msgid "Delete this good signature? (y/N/q)"
  msgstr "¿Borrar esta firma correcta? (s/N/q)"
  
- #: g10/keyedit.c:4438
++#: g10/keyedit.c:4519
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "¿Borrar esta firma inválida? (s/N/q)"
  
- #: g10/keyedit.c:4442
++#: g10/keyedit.c:4523
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "¿Borrar esta firma desconocida? (s/N/q)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4530
  msgid "Really delete this self-signature? (y/N)"
  msgstr "¿Borrar realmente esta autofirma? (s/N)"
  
- #: g10/keyedit.c:4465
++#: g10/keyedit.c:4546
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
@@@ -4737,20 -3721,16 +4699,20 @@@ msgid_plural "Deleted %d signatures.\n
  msgstr[0] "%d firmas borradas.\n"
  msgstr[1] "%d firmas borradas.\n"
  
- #: g10/keyedit.c:4469
++#: g10/keyedit.c:4550
  msgid "Nothing deleted.\n"
  msgstr "No se borró nada\n"
  
- #: g10/keyedit.c:4504 g10/trust.c:693
++#: g10/keyedit.c:4585 g10/trust.c:716
  msgid "invalid"
  msgstr "inválida"
  
- #: g10/keyedit.c:4506
++#: g10/keyedit.c:4587
  #, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "ID de usuario \"%s\" compactado: %s\n"
  
- #: g10/keyedit.c:4512
++#: g10/keyedit.c:4593
  #, fuzzy, c-format
  #| msgid "User ID \"%s\": %d signature removed\n"
  msgid "User ID \"%s\": %d signature removed\n"
@@@ -4758,17 -3738,14 +4720,17 @@@ msgid_plural "User ID \"%s\": %d signat
  msgstr[0] "ID de usuario \"%s\": %d firma borrada\n"
  msgstr[1] "ID de usuario \"%s\": %d firma borrada\n"
  
- #: g10/keyedit.c:4520
++#: g10/keyedit.c:4601
  #, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "ID de usuario \"%s\": ya minimizado\n"
  
- #: g10/keyedit.c:4521
++#: g10/keyedit.c:4602
  #, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "ID de usuario \"%s\" ya limpiado\n"
  
- #: g10/keyedit.c:4590
++#: g10/keyedit.c:4671
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4777,38 -3754,30 +4739,38 @@@ 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:4601
++#: g10/keyedit.c:4682
  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:4618
++#: g10/keyedit.c:4699
  msgid "Enter the user ID of the designated revoker: "
  msgstr "Introduzca el ID de usuario del revocador designado: "
  
- #: g10/keyedit.c:4643
++#: g10/keyedit.c:4724
  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:4658
++#: g10/keyedit.c:4739
  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:4680
++#: g10/keyedit.c:4761
  msgid "this key has already been designated as a revoker\n"
  msgstr "esta clave ya ha sido designada como revocadora\n"
  
- #: g10/keyedit.c:4698
++#: g10/keyedit.c:4779
  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:4704
++#: g10/keyedit.c:4785
  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:4755
++#: g10/keyedit.c:4848
  #, fuzzy
  #| msgid ""
  #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4818,233 -3787,182 +4780,233 @@@ msgid "
  msgstr ""
  "¿Está seguro de querer elegir esta clave como revocador designado? (s/N) "
  
- #: g10/keyedit.c:4760
++#: g10/keyedit.c:4853
  msgid "Changing expiration time for a subkey.\n"
  msgstr "Cambiando fecha de caducidad de subclave.\n"
  
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:4856
  msgid "Changing expiration time for the primary key.\n"
  msgstr "Cambiando caducidad de clave primaria.\n"
  
- #: g10/keyedit.c:4814
++#: g10/keyedit.c:4910
  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:4987
++#: g10/keyedit.c:5085
  #, 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:4993
++#: g10/keyedit.c:5091
  #, 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:5108
++#: g10/keyedit.c:5206
  msgid "Please select exactly one user ID.\n"
  msgstr "Por favor seleccione exactamente un identificador de usuario.\n"
  
- #: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
++#: g10/keyedit.c:5247 g10/keyedit.c:5361 g10/keyedit.c:5474 g10/keyedit.c:5611
  #, c-format
  msgid "skipping v3 self-signature on user ID \"%s\"\n"
  msgstr "omitiendo autofirma V3 para el id \"%s\"\n"
  
- #: g10/keyedit.c:5320
++#: g10/keyedit.c:5418
  msgid "Enter your preferred keyserver URL: "
  msgstr "Introduzca la URL de su servidor de claves preferido: "
  
- #: g10/keyedit.c:5399
++#: g10/keyedit.c:5497
  msgid "Are you sure you want to replace it? (y/N) "
  msgstr "¿Seguro que quiere reemplazarlo? (s/N) "
  
- #: g10/keyedit.c:5400
++#: g10/keyedit.c:5498
  msgid "Are you sure you want to delete it? (y/N) "
  msgstr "¿Seguro que quiere borrarlo? (s/N) "
  
- #: g10/keyedit.c:5459
++#: g10/keyedit.c:5557
  msgid "Enter the notation: "
  msgstr "Introduzca la notación: "
  
- #: g10/keyedit.c:5606
++#: g10/keyedit.c:5704
  msgid "Proceed? (y/N) "
  msgstr "¿Continuar? (s/N) "
  
- #: g10/keyedit.c:5676
++#: g10/keyedit.c:5774
  #, 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:5738
++#: g10/keyedit.c:5836
  #, c-format
  msgid "No user ID with hash %s\n"
  msgstr "No hay ID de usuario con hash %s\n"
  
- #: g10/keyedit.c:5839
++#: g10/keyedit.c:5937
  #, fuzzy, c-format
  #| msgid "No subkey with index %d\n"
  msgid "No subkey with key ID '%s'.\n"
  msgstr "No existe una subclave con índice %d\n"
  
- #: g10/keyedit.c:5861
++#: g10/keyedit.c:5959
  #, c-format
  msgid "No subkey with index %d\n"
  msgstr "No existe una subclave con índice %d\n"
  
- #: g10/keyedit.c:6002
++#: g10/keyedit.c:6100
  #, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "ID de usuario: \"%s\"\n"
  
- #: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
++#: g10/keyedit.c:6103 g10/keyedit.c:6205 g10/keyedit.c:6253
  #, 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:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
++#: g10/keyedit.c:6105 g10/keyedit.c:6207 g10/keyedit.c:6255
  msgid " (non-exportable)"
  msgstr " (no exportable)"
  
- #: g10/keyedit.c:6011
++#: g10/keyedit.c:6109
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "Esta firma caducó el %s.\n"
  
- #: g10/keyedit.c:6016
++#: g10/keyedit.c:6114
  msgid "Are you sure you still want to revoke it? (y/N) "
  msgstr "¿De verdad quiere revocarla? (s/N) "
  
- #: g10/keyedit.c:6021
++#: g10/keyedit.c:6119
  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:6075
++#: g10/keyedit.c:6173
  msgid "Not signed by you.\n"
  msgstr "No está firmado por usted.\n"
  
- #: g10/keyedit.c:6081
++#: g10/keyedit.c:6179
  #, 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:6110
++#: g10/keyedit.c:6208
  msgid " (non-revocable)"
  msgstr " (no revocable)"
  
- #: g10/keyedit.c:6117
++#: g10/keyedit.c:6215
  #, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "revocada por la clave %s el %s\n"
  
- #: g10/keyedit.c:6142
++#: g10/keyedit.c:6240
  msgid "You are about to revoke these signatures:\n"
  msgstr "Va a revocar las siguientes firmas:\n"
  
- #: g10/keyedit.c:6165
++#: g10/keyedit.c:6263
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "¿Crear los certificados de revocación realmente? (s/N) "
  
- #: g10/keyedit.c:6198
++#: g10/keyedit.c:6296
  msgid "no secret key\n"
  msgstr "no hay clave secreta\n"
  
- #: g10/keyedit.c:6246
++#: g10/keyedit.c:6344
  #, fuzzy, c-format
  #| msgid "revoke a user ID"
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr "revocar un identificador de usuario"
  
- #: g10/keyedit.c:6256
++#: g10/keyedit.c:6354
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
  
- #: g10/keyedit.c:6273
++#: g10/keyedit.c:6371
  #, 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:6386
++#: g10/keyedit.c:6485
  #, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "La clave %s ya ha sido revocada.\n"
  
- #: g10/keyedit.c:6448
++#: g10/keyedit.c:6547
  #, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "La subclave %s ya ha sido revocada.\n"
  
- #: g10/keyedit.c:6545
++#: g10/keyedit.c:6644
  #, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr "Mostrando ID fotográfico %s de tamaño %ld para la clave %s (uid %d)\n"
  
- #: g10/keygen.c:305
++#: g10/keygen.c:316
  #, fuzzy, c-format
  #| msgid "preference `%s' duplicated\n"
  msgid "preference '%s' duplicated\n"
  msgstr "preferencia `%s' duplicada\n"
  
- #: g10/keygen.c:312
++#: g10/keygen.c:323
  msgid "too many cipher preferences\n"
  msgstr "demasiadas preferencias de cifrado\n"
  
- #: g10/keygen.c:314
++#: g10/keygen.c:325
  msgid "too many digest preferences\n"
  msgstr "demasiadas preferencias de resumen\n"
  
- #: g10/keygen.c:316
++#: g10/keygen.c:327
  msgid "too many compression preferences\n"
  msgstr "demasiadas preferencias de compresión\n"
  
- #: g10/keygen.c:457
++#: g10/keygen.c:468
  #, fuzzy, c-format
  #| msgid "invalid item `%s' in preference string\n"
  msgid "invalid item '%s' in preference string\n"
  msgstr "caracter inválido `%s' en cadena de preferencias\n"
  
- #: g10/keygen.c:936
++#: g10/keygen.c:947
  msgid "writing direct signature\n"
  msgstr "escribiendo firma directa\n"
  
- #: g10/keygen.c:982
++#: g10/keygen.c:993
  msgid "writing self signature\n"
  msgstr "escribiendo autofirma\n"
  
- #: g10/keygen.c:1038
++#: g10/keygen.c:1049
  msgid "writing key binding signature\n"
  msgstr "escribiendo la firma de comprobación de clave\n"
  
- #: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
- #: g10/keygen.c:1610 g10/keygen.c:1615
++#: g10/keygen.c:1413 g10/keygen.c:1418 g10/keygen.c:1470 g10/keygen.c:1475
++#: g10/keygen.c:1622 g10/keygen.c:1627
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "tamaño de clave incorrecto; se usarán %u bits\n"
  
- #: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
++#: g10/keygen.c:1424 g10/keygen.c:1481 g10/keygen.c:1489 g10/keygen.c:1633
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "tamaño de clave redondeado a %u bits\n"
  
- #: g10/keygen.c:1503
++#: g10/keygen.c:1515
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  "AVISO: ciertos programas OpenPGP no usan claves DSAcon resúmenes de este "
  "tamaño\n"
  
- #: g10/keygen.c:1677
++#: g10/keygen.c:1689
  msgid "Sign"
  msgstr "Firma"
  
- #: g10/keygen.c:1680
++#: g10/keygen.c:1692
  msgid "Certify"
  msgstr "Certificar"
  
- #: g10/keygen.c:1683
++#: g10/keygen.c:1695
  msgid "Encrypt"
  msgstr "Cifrado"
  
- #: g10/keygen.c:1686
++#: g10/keygen.c:1698
  msgid "Authenticate"
  msgstr "Autentificación"
  
@@@ -5058,158 -3976,127 +5020,158 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1705
++#: g10/keygen.c:1717
  msgid "SsEeAaQq"
  msgstr "FfCcAaSs"
  
- #: g10/keygen.c:1732
++#: g10/keygen.c:1744
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "Posibles accriones para una %s clave: "
  
- #: g10/keygen.c:1738
++#: g10/keygen.c:1750
  msgid "Current allowed actions: "
  msgstr "Acciones permitidas actualmente: "
  
- #: g10/keygen.c:1743
++#: g10/keygen.c:1755
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) Conmutar la capacidad de firmar\n"
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) Conmutar la capacidad de cifrado\n"
  
- #: g10/keygen.c:1749
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) Conmutar la capacidad de autenticación\n"
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) Acabado\n"
  
- #: g10/keygen.c:1881 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1893 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Por favor seleccione tipo de clave deseado:\n"
  
- #: g10/keygen.c:1885
++#: g10/keygen.c:1897
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) RSA y RSA (por defecto)\n"
  
- #: g10/keygen.c:1889
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA y ElGamal\n"
  
- #: g10/keygen.c:1892
++#: g10/keygen.c:1904
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (sólo firmar)\n"
  
- #: g10/keygen.c:1894
++#: g10/keygen.c:1906
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (sólo firmar)\n"
  
- #: g10/keygen.c:1900
++#: g10/keygen.c:1912
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) ElGamal (sólo cifrar)\n"
  
- #: g10/keygen.c:1902
++#: g10/keygen.c:1914
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (sólo cifrar)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1920
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (permite elegir capacidades)\n"
  
- #: g10/keygen.c:1910
++#: g10/keygen.c:1922
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (permite elegir capacidades)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1928
  #, fuzzy, c-format
  #| msgid "   (%d) DSA and Elgamal\n"
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA y ElGamal\n"
  
- #: g10/keygen.c:1918
++#: g10/keygen.c:1930
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (sólo firmar)\n"
  
- #: g10/keygen.c:1920
++#: g10/keygen.c:1932
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (set your own capabilities)\n"
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) DSA (permite elegir capacidades)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1934
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) RSA (sólo cifrar)\n"
  
- #: g10/keygen.c:1926
++#: g10/keygen.c:1938
  #, fuzzy, c-format
  #| msgid "   (%d) Existing key\n"
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) Clave existente\n"
  
- #: g10/keygen.c:2022 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:206
  msgid "Enter the keygrip: "
  msgstr "Introduzca keygrip: "
  
- #: g10/keygen.c:2035 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2047 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr "No es un keygrip válido (se esperaban 40 dígitos hex)\n"
  
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2049 sm/certreqgen-ui.c:216
  msgid "No key with this keygrip\n"
  msgstr "No hay claves con ese keygrip\n"
  
- #: g10/keygen.c:2111 g10/keygen.c:2125
++#: g10/keygen.c:2133 g10/keygen.c:2147
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
  msgstr "redondeados a %u bits\n"
  
- #: g10/keygen.c:2166
++#: g10/keygen.c:2188
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr "las claves %s pueden tener entre %u y %u bits de longitud.\n"
  
- #: g10/keygen.c:2174
++#: g10/keygen.c:2196
  #, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "¿De qué tamaño quiere la subclave? (%u) "
  
- #: g10/keygen.c:2177 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2199 sm/certreqgen-ui.c:183
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "¿De qué tamaño quiere la clave? (%u) "
  
- #: g10/keygen.c:2191 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2213 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "El tamaño requerido es de %u bits\n"
  
- #: g10/keygen.c:2237
++#: g10/keygen.c:2259
  #, fuzzy
  #| msgid "Please select what kind of key you want:\n"
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Por favor seleccione tipo de clave deseado:\n"
  
- #: g10/keygen.c:2409
++#: g10/keygen.c:2431
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5225,7 -4112,6 +5187,7 @@@ msgstr "
  "      <n>m = la clave caduca en n meses\n"
  "      <n>y = la clave caduca en n años\n"
  
- #: g10/keygen.c:2420
++#: g10/keygen.c:2442
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5241,38 -4127,30 +5203,38 @@@ msgstr "
  "      <n>m = la clave caduca en n meses\n"
  "      <n>y = la clave caduca en n años\n"
  
- #: g10/keygen.c:2443
++#: g10/keygen.c:2465
  msgid "Key is valid for? (0) "
  msgstr "¿Validez de la clave (0)? "
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2470
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Clave válida ¿durante? (%s) "
  
- #: g10/keygen.c:2461 g10/keygen.c:2486
++#: g10/keygen.c:2483 g10/keygen.c:2508
  msgid "invalid value\n"
  msgstr "valor inválido\n"
  
- #: g10/keygen.c:2468
++#: g10/keygen.c:2490
  msgid "Key does not expire at all\n"
  msgstr "La clave nunca caduca\n"
  
- #: g10/keygen.c:2469
++#: g10/keygen.c:2491
  msgid "Signature does not expire at all\n"
  msgstr "La firma nunca caduca\n"
  
- #: g10/keygen.c:2474
++#: g10/keygen.c:2496
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "La clave caduca %s\n"
  
- #: g10/keygen.c:2475
++#: g10/keygen.c:2497
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "La firma caduca el %s\n"
  
- #: g10/keygen.c:2479
++#: g10/keygen.c:2501
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5280,11 -4158,9 +5242,11 @@@ msgstr "
  "Su sistema no puede mostrar fechas más allá del 2038.\n"
  "Sin embargo funcionará correctamente hasta el 2106.\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2514
  msgid "Is this correct? (y/N) "
  msgstr "¿Es correcto? (s/n) "
  
- #: g10/keygen.c:2560
++#: g10/keygen.c:2582
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5298,7 -4174,6 +5260,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2575
++#: g10/keygen.c:2597
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -5314,50 -4189,39 +5276,50 @@@ msgstr "
  "    \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
  "\n"
  
- #: g10/keygen.c:2594
++#: g10/keygen.c:2616
  msgid "Real name: "
  msgstr "Nombre y apellidos: "
  
- #: g10/keygen.c:2603
++#: g10/keygen.c:2625
  msgid "Invalid character in name\n"
  msgstr "Caracter inválido en el nombre\n"
  
- #: g10/keygen.c:2604
++#: g10/keygen.c:2626
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2608
++#: g10/keygen.c:2630
  msgid "Name may not start with a digit\n"
  msgstr "El nombre no puede empezar con un número\n"
  
- #: g10/keygen.c:2611
++#: g10/keygen.c:2633
  msgid "Name must be at least 5 characters long\n"
  msgstr "El nombre debe tener al menos 5 caracteres\n"
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2643
  msgid "Email address: "
  msgstr "Dirección de correo electrónico: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2649
  msgid "Not a valid email address\n"
  msgstr "Dirección inválida\n"
  
- #: g10/keygen.c:2636
++#: g10/keygen.c:2658
  msgid "Comment: "
  msgstr "Comentario: "
  
- #: g10/keygen.c:2642
++#: g10/keygen.c:2664
  msgid "Invalid character in comment\n"
  msgstr "Caracter inválido en el comentario\n"
  
- #: g10/keygen.c:2678
++#: g10/keygen.c:2700
  #, fuzzy, c-format
  #| msgid "You are using the `%s' character set.\n"
  msgid "You are using the '%s' character set.\n"
  msgstr "Está usando el juego de caracteres `%s'.\n"
  
- #: g10/keygen.c:2684
++#: g10/keygen.c:2706
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5368,7 -4232,6 +5330,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2689
++#: g10/keygen.c:2711
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr ""
  "Por favor no ponga la dirección de correo-e en el nombre real o en el "
@@@ -5385,31 -4248,24 +5347,31 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2714
++#: g10/keygen.c:2736
  msgid "NnCcEeOoQq"
  msgstr "NnCcDdVvSs"
  
- #: g10/keygen.c:2724
++#: g10/keygen.c:2746
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "¿Cambia (N)ombre, (C)omentario, (D)irección o (S)alir? "
  
- #: g10/keygen.c:2725
++#: g10/keygen.c:2747
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr "¿Cambia (N)ombre, (C)omentario, (D)irección o (V)ale/(S)alir? "
  
- #: g10/keygen.c:2730
++#: g10/keygen.c:2752
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "¿Cambia (N)ombre, (D)irección o (S)alir? "
  
- #: g10/keygen.c:2731
++#: g10/keygen.c:2753
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "¿Cambia (N)ombre, (D)irección o (V)ale/(S)alir? "
  
- #: g10/keygen.c:2750
++#: g10/keygen.c:2772
  msgid "Please correct the error first\n"
  msgstr "Por favor corrija primero el error.\n"
  
- #: g10/keygen.c:2796
++#: g10/keygen.c:2818
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5422,13 -4278,10 +5384,13 @@@ msgstr "
  "generador de números aleatorios mayor oportunidad de recoger suficiente\n"
  "entropía.\n"
  
- #: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
- #: g10/keygen.c:4777 g10/keygen.c:4882
++#: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
++#: g10/keygen.c:4330 g10/keygen.c:4803 g10/keygen.c:5064 g10/keygen.c:5169
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Creación de la clave fallida: %s\n"
  
- #: g10/keygen.c:3598
++#: g10/keygen.c:3922
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5436,71 -4289,58 +5398,71 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3924
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3621
++#: g10/keygen.c:3945
  #, fuzzy, c-format
  #| msgid "key already exists\n"
  msgid "A key for \"%s\" already exists\n"
  msgstr "la clave ya existe\n"
  
- #: g10/keygen.c:3626
++#: g10/keygen.c:3950
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "Create anyway? (y/N) "
  msgstr "¿Crear de todas formas?"
  
- #: g10/keygen.c:3632
++#: g10/keygen.c:3956
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "creating anyway\n"
  msgstr "¿Crear de todas formas?"
  
- #: g10/keygen.c:3981
++#: g10/keygen.c:4315
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:4013
++#: g10/keygen.c:4358
  msgid "Key generation canceled.\n"
  msgstr "Creación de claves cancelada.\n"
  
- #: g10/keygen.c:4073
++#: g10/keygen.c:4418
  #, fuzzy, c-format
  #| msgid "can't create backup file `%s': %s\n"
  msgid "can't create backup file '%s': %s\n"
  msgstr "no se puede crear fichero de respaldo `%s': %s\n"
  
- #: g10/keygen.c:4093
++#: g10/keygen.c:4438
  #, fuzzy, c-format
  #| msgid "NOTE: backup of card key saved to `%s'\n"
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "NOTA: copia de seguridad de la clave guardada en `%s'\n"
  
- #: g10/keygen.c:4244 g10/keygen.c:4393
++#: g10/keygen.c:4589 g10/keygen.c:4738
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
  msgstr "escribiendo clave pública en `%s'\n"
  
- #: g10/keygen.c:4387
++#: g10/keygen.c:4732
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "anillo público de claves no escribible encontrado: %s\n"
  
- #: g10/keygen.c:4401
++#: g10/keygen.c:4746
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error writing public keyring '%s': %s\n"
  msgstr "error escribiendo anillo público `%s': %s\n"
  
- #: g10/keygen.c:4433
++#: g10/keygen.c:4778
  msgid "public and secret key created and signed.\n"
  msgstr "claves pública y secreta creadas y firmadas.\n"
  
- #: g10/keygen.c:4445
++#: g10/keygen.c:4790
  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"
@@@ -5508,7 -4348,6 +5470,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:4649 g10/keygen.c:4833
++#: g10/keygen.c:4936 g10/keygen.c:5120
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5516,7 -4355,6 +5478,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:4651 g10/keygen.c:4835
++#: g10/keygen.c:4938 g10/keygen.c:5122
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5524,21 -4362,17 +5486,21 @@@ msgstr "
  "clave pública creada %lu segundos en el futuro (salto en el tiempo o\n"
  "problemas con el reloj)\n"
  
- #: g10/keygen.c:4662 g10/keygen.c:4846
++#: g10/keygen.c:4949 g10/keygen.c:5133
  #, fuzzy
  #| 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 subclaves para claves V3 no sigue el estándar OpenPGP\n"
  
- #: g10/keygen.c:4674 g10/keygen.c:4676
++#: g10/keygen.c:4961 g10/keygen.c:4963
  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:4683 g10/keygen.c:4685
++#: g10/keygen.c:4970 g10/keygen.c:4972
  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:4704 g10/keygen.c:4860
++#: g10/keygen.c:4991 g10/keygen.c:5147
  msgid "Really create? (y/N) "
  msgstr "¿Crear de verdad? (s/N) "
  
@@@ -5863,126 -4632,100 +5825,126 @@@ msgstr "AVISO: se observan varios texto
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
  msgstr "revocación independiente - use \"gpg --import\" para aplicarla\n"
  
- #: g10/mainproc.c:1233 g10/mainproc.c:1276
++#: g10/mainproc.c:1238 g10/mainproc.c:1281
  msgid "no signature found\n"
  msgstr "no se encontró firma\n"
  
- #: g10/mainproc.c:1607
++#: g10/mainproc.c:1612
  #, c-format
  msgid "BAD signature from \"%s\""
  msgstr "Firma INCORRECTA de \"%s\""
  
- #: g10/mainproc.c:1609
++#: g10/mainproc.c:1614
  #, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Firma caducada de \"%s\""
  
- #: g10/mainproc.c:1611
++#: g10/mainproc.c:1616
  #, c-format
  msgid "Good signature from \"%s\""
  msgstr "Firma correcta de \"%s\""
  
- #: g10/mainproc.c:1630
++#: g10/mainproc.c:1635
  msgid "signature verification suppressed\n"
  msgstr "suprimida la verificación de la firma\n"
  
- #: g10/mainproc.c:1739
++#: g10/mainproc.c:1744
  msgid "can't handle this ambiguous signature data\n"
  msgstr "no puedo manejar estos datos ambiguos en la firma\n"
  
- #: g10/mainproc.c:1753 g10/mainproc.c:1761
++#: g10/mainproc.c:1758 g10/mainproc.c:1766
  #, c-format
  msgid "Signature made %s\n"
  msgstr "Firmado el %s\n"
  
- #: g10/mainproc.c:1754 g10/mainproc.c:1762
++#: g10/mainproc.c:1759 g10/mainproc.c:1767
  #, c-format
  msgid "               using %s key %s\n"
  msgstr "               usando %s clave %s\n"
  
- #: g10/mainproc.c:1766
++#: g10/mainproc.c:1771
  #, 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:1772
++#: g10/mainproc.c:1777
  #, fuzzy, c-format
  #| msgid "                aka \"%s\""
  msgid "               issuer \"%s\"\n"
  msgstr "                alias \"%s\""
  
- #: g10/mainproc.c:1789
++#: g10/mainproc.c:1794
  msgid "Key available at: "
  msgstr "Clave disponible en: "
  
- #: g10/mainproc.c:2024
++#: g10/mainproc.c:2029
  msgid "[uncertain]"
  msgstr "[incierto]"
  
- #: g10/mainproc.c:2062
++#: g10/mainproc.c:2067
  #, c-format
  msgid "                aka \"%s\""
  msgstr "                alias \"%s\""
  
- #: g10/mainproc.c:2145
++#: g10/mainproc.c:2150
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "Firma caducada en %s\n"
  
- #: g10/mainproc.c:2149
++#: g10/mainproc.c:2154
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "La firma caduca el %s\n"
  
- #: g10/mainproc.c:2160
++#: g10/mainproc.c:2165
  #, fuzzy, c-format
  #| msgid "%s signature, digest algorithm %s\n"
  msgid "%s signature, digest algorithm %s%s%s\n"
  msgstr "firma %s, algoritmo de resumen %s\n"
  
- #: g10/mainproc.c:2161
++#: g10/mainproc.c:2166
  msgid "binary"
  msgstr "binaria"
  
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2167
  msgid "textmode"
  msgstr "modotexto"
  
- #: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "desconocido"
  
- #: g10/mainproc.c:2164
++#: g10/mainproc.c:2169
  #, fuzzy
  #| msgid "unknown pubkey algorithm"
  msgid ", key algorithm "
  msgstr "Algoritmo de clave pública desconocido"
  
- #: g10/mainproc.c:2199
++#: g10/mainproc.c:2204
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2229
++#: g10/mainproc.c:2234
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "Imposible comprobar la firma: %s\n"
  
- #: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
++#: g10/mainproc.c:2327 g10/mainproc.c:2346 g10/mainproc.c:2470
  msgid "not a detached signature\n"
  msgstr "no es una firma separada\n"
  
- #: g10/mainproc.c:2375
++#: g10/mainproc.c:2380
  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:2384
++#: g10/mainproc.c:2389
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "firma independiente de clase 0x%02x\n"
  
- #: g10/mainproc.c:2469
++#: g10/mainproc.c:2474
  msgid "old style (PGP 2.x) signature\n"
  msgstr "firma al viejo estilo (PGP 2.x)\n"
  
@@@ -6282,23 -4971,18 +6244,23 @@@ msgstr "¿Es correcta la foto? (s/n) 
  msgid "unable to display photo ID!\n"
  msgstr "¡no puedo mostrar ID fotográfico!\n"
  
- #: g10/pkclist.c:72 g10/revoke.c:757
++#: g10/pkclist.c:72 g10/revoke.c:758
  msgid "No reason specified"
  msgstr "No se dio ninguna razón"
  
- #: g10/pkclist.c:74 g10/revoke.c:759
++#: g10/pkclist.c:74 g10/revoke.c:760
  msgid "Key is superseded"
  msgstr "La clave ha sido reemplazada."
  
- #: g10/pkclist.c:76 g10/revoke.c:758
++#: g10/pkclist.c:76 g10/revoke.c:759
  msgid "Key has been compromised"
  msgstr "La clave ha sido comprometida"
  
- #: g10/pkclist.c:78 g10/revoke.c:760
++#: g10/pkclist.c:78 g10/revoke.c:761
  msgid "Key is no longer used"
  msgstr "La clave ya no está en uso"
  
- #: g10/pkclist.c:80 g10/revoke.c:761
++#: g10/pkclist.c:80 g10/revoke.c:762
  msgid "User ID is no longer valid"
  msgstr "El identificador de usuario ya no es válido"
  
@@@ -6376,7 -5047,6 +6338,7 @@@ msgstr "
  "El mínimo nivel de confianza para esta clave es: %s\n"
  "\n"
  
- #: g10/pkclist.c:310 g10/revoke.c:786
++#: g10/pkclist.c:310 g10/revoke.c:787
  msgid "Your decision? "
  msgstr "¿Su decisión? "
  
@@@ -6581,33 -5213,26 +6543,33 @@@ msgstr "
  msgid "No such user ID.\n"
  msgstr "ID de usuario inexistente.\n"
  
- #: g10/pkclist.c:1197 g10/pkclist.c:1273
++#: g10/pkclist.c:1197 g10/pkclist.c:1274
  msgid "skipped: public key already set as default recipient\n"
  msgstr "omitida: clave pública ya designada como destinataria por defecto\n"
  
- #: g10/pkclist.c:1218
++#: g10/pkclist.c:1219
  msgid "Public key is disabled.\n"
  msgstr "Clave pública deshabilitada.\n"
  
- #: g10/pkclist.c:1228
++#: g10/pkclist.c:1229
  msgid "skipped: public key already set\n"
  msgstr "omitida: clave pública ya establecida\n"
  
- #: g10/pkclist.c:1263
++#: g10/pkclist.c:1264
  #, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "desconocido el destinatario predefinido \"%s\"\n"
  
- #: g10/pkclist.c:1312
++#: g10/pkclist.c:1313
  msgid "no valid addressees\n"
  msgstr "no hay direcciones válidas\n"
  
- #: g10/pkclist.c:1665
++#: g10/pkclist.c:1666
  #, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "Nota: la clave %s no usa %s\n"
  
- #: g10/pkclist.c:1690
++#: g10/pkclist.c:1691
  #, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "Nota: clave %s no tiene preferencias para %s\n"
@@@ -6616,29 -5240,23 +6578,29 @@@
  msgid "data not saved; use option \"--output\" to save it\n"
  msgstr "datos no grabados; use la opción \"--output\" para grabarlos\n"
  
- #: g10/plaintext.c:598
++#: g10/plaintext.c:614
  msgid "Detached signature.\n"
  msgstr "Firma separada.\n"
  
- #: g10/plaintext.c:606
++#: g10/plaintext.c:622
  msgid "Please enter name of data file: "
  msgstr "Introduzca el nombre del fichero de datos: "
  
- #: g10/plaintext.c:643
++#: g10/plaintext.c:659
  msgid "reading stdin ...\n"
  msgstr "leyendo stdin...\n"
  
- #: g10/plaintext.c:688
++#: g10/plaintext.c:704
  msgid "no signed data\n"
  msgstr "no hay datos firmados\n"
  
- #: g10/plaintext.c:706
++#: g10/plaintext.c:722
  #, fuzzy, c-format
  #| msgid "can't open signed data `%s'\n"
  msgid "can't open signed data '%s'\n"
  msgstr "imposible abrir datos firmados `%s'\n"
  
- #: g10/plaintext.c:741
++#: g10/plaintext.c:757
  #, c-format
  msgid "can't open signed data fd=%d: %s\n"
  msgstr "imposible abrir datos firmados fd=%d: %s\n"
@@@ -6707,7 -5311,6 +6669,7 @@@ msgstr "Clave secreta disponible.\n
  msgid "Create a designated revocation certificate for this key? (y/N) "
  msgstr "¿Crear un certificado de revocación para esta clave? (s/N)"
  
- #: g10/revoke.c:336 g10/revoke.c:727
++#: g10/revoke.c:336 g10/revoke.c:728
  msgid "ASCII armored output forced.\n"
  msgstr "se fuerza salida con armadura ASCII.\n"
  
@@@ -6744,23 -5341,20 +6706,23 @@@ msgid "
  "the secret key.  However, if the secret key is still accessible,\n"
  "it is better to generate a new revocation certificate and give\n"
  "a reason for the revocation.  For details see the description of\n"
- "of the gpg command \"--gen-revoke\" in the GnuPG manual."
+ "of the gpg command \"--generate-revocation\" in the GnuPG manual."
  msgstr ""
  
- #: g10/revoke.c:575
++#: g10/revoke.c:576
  msgid ""
  "To avoid an accidental use of this file, a colon has been inserted\n"
  "before the 5 dashes below.  Remove this colon with a text editor\n"
  "before importing and publishing this revocation certificate."
  msgstr ""
  
- #: g10/revoke.c:590
++#: g10/revoke.c:591
  #, fuzzy, c-format
  #| msgid "Revocation certificate created.\n"
  msgid "revocation certificate stored as '%s.rev'\n"
  msgstr "Certificado de revocación creado.\n"
  
- #: g10/revoke.c:634
++#: g10/revoke.c:635
  #, fuzzy, c-format
  #| msgid "secret key \"%s\" not found: %s\n"
  msgid "secret key \"%s\" not found\n"
@@@ -6769,22 -5363,18 +6731,22 @@@ msgstr "clave secreta \"%s\" no encontr
  #. TRANSLATORS: The %s prints a key specification which
  #. for example has been given at the command line.  Several lines
  #. lines with secret key infos are printed after this message.
- #: g10/revoke.c:661
++#: g10/revoke.c:662
  #, c-format
  msgid "'%s' matches multiple secret keys:\n"
  msgstr ""
  
- #: g10/revoke.c:688
++#: g10/revoke.c:689
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error searching the keyring: %s\n"
  msgstr "error escribiendo anillo `%s': %s\n"
  
- #: g10/revoke.c:711
++#: g10/revoke.c:712
  msgid "Create a revocation certificate for this key? (y/N) "
  msgstr "¿Crear un certificado de revocación para esta clave? (s/N) "
  
- #: g10/revoke.c:735
++#: g10/revoke.c:736
  msgid ""
  "Revocation certificate created.\n"
  "\n"
@@@ -6803,33 -5393,26 +6765,33 @@@ msgstr "
  "de impresión de su máquina podría almacenar los datos y hacerlos accesibles\n"
  "a otras personas!\n"
  
- #: g10/revoke.c:769
++#: g10/revoke.c:770
  msgid "Please select the reason for the revocation:\n"
  msgstr "Por favor elija una razón para la revocación:\n"
  
- #: g10/revoke.c:779
++#: g10/revoke.c:780
  msgid "Cancel"
  msgstr "Cancelar"
  
- #: g10/revoke.c:781
++#: g10/revoke.c:782
  #, c-format
  msgid "(Probably you want to select %d here)\n"
  msgstr "(Probablemente quería seleccionar %d aquí)\n"
  
- #: g10/revoke.c:822
++#: g10/revoke.c:823
  msgid "Enter an optional description; end it with an empty line:\n"
  msgstr "Introduzca una descripción opcional; acábela con una línea vacía:\n"
  
- #: g10/revoke.c:850
++#: g10/revoke.c:851
  #, c-format
  msgid "Reason for revocation: %s\n"
  msgstr "Razón para la revocación: %s\n"
  
- #: g10/revoke.c:852
++#: g10/revoke.c:853
  msgid "(No description given)\n"
  msgstr "(No se dió descripción)\n"
  
- #: g10/revoke.c:857
++#: g10/revoke.c:858
  msgid "Is this okay? (y/N) "
  msgstr "¿Es correcto? (s/N) "
  
@@@ -6972,12 -5535,10 +6934,12 @@@ msgstr "
  "AVISO: no puedo expandir el %% de la URL del servidor de claves\n"
  "preferido. Se usa sin expandir.\n"
  
- #: g10/sign.c:329
++#: g10/sign.c:331
  #, c-format
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s/%s firma de: \"%s\"\n"
  
- #: g10/sign.c:878
++#: g10/sign.c:880
  #, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6985,11 -5546,9 +6947,11 @@@ msgstr "
  "AVISO: forzar el algoritmo de resumen %s (%d) va en contra de las\n"
  "preferencias del destinatario\n"
  
- #: g10/sign.c:1009
++#: g10/sign.c:1011
  msgid "signing:"
  msgstr "firmando:"
  
- #: g10/sign.c:1286
++#: g10/sign.c:1288
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "se usará un cifrado %s\n"
@@@ -7012,7 -5567,6 +6974,7 @@@ msgid "this is a PGP generated Elgamal 
  msgstr ""
  "¡esta es una clave ElGamal generada por PGP que NO es segura para firmar!"
  
- #: g10/tdbdump.c:57 g10/trustdb.c:362
++#: g10/tdbdump.c:57 g10/trustdb.c:369
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "registro de confianza %lu, tipo %d: fallo escritura: %s\n"
@@@ -7060,7 -5606,6 +7022,7 @@@ msgstr "error econtrando registro de co
  msgid "read error in '%s': %s\n"
  msgstr "error de lectura `%s': %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "base de datos de confianza: fallo sincronización: %s\n"
@@@ -7209,309 -5725,318 +7171,384 @@@ msgstr "no se pueden manejar líneas d
  msgid "input line longer than %d characters\n"
  msgstr "línea de longitud superior a %d caracteres\n"
  
- #: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
++#: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
  #, fuzzy, c-format
  #| msgid "error sending standard options: %s\n"
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "error enviando opciones estándar: %s\n"
  
- #: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
++#: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:357 g10/tofu.c:699
++#: g10/tofu.c:355 g10/tofu.c:888
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:501
++#: g10/tofu.c:505
  #, fuzzy, c-format
  #| msgid "unsupported algorithm: %s"
  msgid "unsupported TOFU database version: %s\n"
  msgstr "algoritmo no disponible: %s"
  
- #: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
- #: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
- #: g10/tofu.c:3056
++#: g10/tofu.c:538
+ #, fuzzy, c-format
+ #| msgid "error creating temporary file: %s\n"
+ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
+ msgstr "error creando fichero temporal: %s\n"
+ 
++#: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
+ msgid "TOFU DB error"
+ msgstr ""
+ 
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2340 g10/tofu.c:2359
++#: g10/tofu.c:2372 g10/tofu.c:2384 g10/tofu.c:2399 g10/tofu.c:2411
++#: g10/tofu.c:2980 g10/tofu.c:2997 g10/tofu.c:3033 g10/tofu.c:3050
++#: g10/tofu.c:3353
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error reading TOFU database: %s\n"
  msgstr "error enviando orden %s: %s\n"
  
- #: g10/tofu.c:566 g10/tofu.c:574
++#: g10/tofu.c:716 g10/tofu.c:724
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error determining TOFU database's version: %s\n"
  msgstr "error escribiendo anillo privado `%s': %s\n"
  
- #: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
++#: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing TOFU database: %s\n"
  msgstr "%s: error escribiendo registro de directorio: %s\n"
  
- #: g10/tofu.c:765
++#: g10/tofu.c:844
+ #, fuzzy, c-format
+ #| msgid "error sending %s command: %s\n"
+ msgid "error creating 'encryptions' TOFU table: %s\n"
+ msgstr "error enviando orden %s: %s\n"
+ 
++#: g10/tofu.c:874
+ #, c-format
+ msgid "adding column effective_policy to bindings DB: %s\n"
+ msgstr ""
+ 
++#: g10/tofu.c:956
  #, fuzzy, c-format
  #| msgid "error opening `%s': %s\n"
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "error abriendo `%s': %s\n"
  
- #: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
++#: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error updating TOFU database: %s\n"
  msgstr "error enviando orden %s: %s\n"
  
- #: g10/tofu.c:1239
++#: g10/tofu.c:1328
  #, c-format
  msgid ""
  "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1247
++#: g10/tofu.c:1337
  #, c-format
- msgid "The email address \"%s\" is associated with %d keys!"
- msgstr ""
+ msgid "The email address \"%s\" is associated with %d key!"
+ msgid_plural "The email address \"%s\" is associated with %d keys!"
+ msgstr[0] ""
+ msgstr[1] ""
  
- #: g10/tofu.c:1251
++#: g10/tofu.c:1343
  msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  
- #: g10/tofu.c:1257
++#: g10/tofu.c:1349
  #, c-format
  msgid ""
  "Please indicate whether this email address should be associated with key %s "
  "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1513
++#: g10/tofu.c:1605
  #, fuzzy, c-format
  #| msgid "error getting new PIN: %s\n"
  msgid "error gathering other user IDs: %s\n"
  msgstr "error obteniendo nuevo PIN: %s\n"
  
- #: g10/tofu.c:1523
++#: g10/tofu.c:1615
  #, fuzzy
  #| msgid "list key and user IDs"
  msgid "This key's user IDs:\n"
  msgstr "lista clave e identificadores de usuario"
  
- #: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
++#: g10/tofu.c:1631 g10/tofu.c:1796
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "policy: %s"
  msgstr "Política: "
  
- #: g10/tofu.c:1630
++#: g10/tofu.c:1722
  #, fuzzy, c-format
  #| msgid "error getting stored flags: %s\n"
  msgid "error gathering signature stats: %s\n"
  msgstr "error obteniendo parámetros almacenados: %s\n"
  
- #: g10/tofu.c:1634
++#: g10/tofu.c:1726
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1651
++#: g10/tofu.c:1744
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1684 g10/tofu.c:1689
++#: g10/tofu.c:1785 g10/tofu.c:1790
  msgid ", "
  msgstr ""
  
- #: g10/tofu.c:1693
++#: g10/tofu.c:1794
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
  msgstr "lista claves"
  
- #: g10/tofu.c:1715
++#: g10/tofu.c:1820
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid "Verified %d message."
+ msgid_plural "Verified %d messages."
+ msgstr[0] "imprime resúmenes de mensaje"
+ msgstr[1] "imprime resúmenes de mensaje"
+ 
++#: g10/tofu.c:1824
+ #, fuzzy, c-format
+ msgid "Encrypted %d message."
+ msgid_plural "Encrypted %d messages."
+ msgstr[0] "el algoritmo de resumen seleccionado no es válido\n"
+ msgstr[1] "el algoritmo de resumen seleccionado no es válido\n"
+ 
++#: g10/tofu.c:1831
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid "Verified %d message"
- msgid_plural "Verified %d messages"
+ msgid "Verified %d message in the future."
+ msgid_plural "Verified %d messages in the future."
  msgstr[0] "imprime resúmenes de mensaje"
  msgstr[1] "imprime resúmenes de mensaje"
  
- #: g10/tofu.c:1719
++#: g10/tofu.c:1835
  #, fuzzy, c-format
- msgid "Encrypted %d message"
- msgid_plural "Encrypted %d messages"
+ msgid "Encrypted %d message in the future."
+ msgid_plural "Encrypted %d messages in the future."
  msgstr[0] "el algoritmo de resumen seleccionado no es válido\n"
  msgstr[1] "el algoritmo de resumen seleccionado no es válido\n"
  
- #: g10/tofu.c:1734
++#: g10/tofu.c:1849
  #, c-format
- msgid " over the past day."
- msgid_plural " over the past %d days."
+ msgid "Messages verified over the past %d day: %d."
+ msgid_plural "Messages verified over the past %d days: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1740
++#: g10/tofu.c:1855
  #, c-format
- msgid " over the past month."
- msgid_plural " over the past %d months."
+ msgid "Messages encrypted over the past %d day: %d."
+ msgid_plural "Messages encrypted over the past %d days: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1746
++#: g10/tofu.c:1865
  #, c-format
- msgid " over the past year."
- msgid_plural " over the past %d years."
+ msgid "Messages verified over the past %d month: %d."
+ msgid_plural "Messages verified over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1752
- msgid " in the past."
++#: g10/tofu.c:1871
+ #, c-format
+ msgid "Messages encrypted over the past %d month: %d."
+ msgid_plural "Messages encrypted over the past %d months: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1881
+ #, c-format
+ msgid "Messages verified over the past %d year: %d."
+ msgid_plural "Messages verified over the past %d years: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1887
+ #, c-format
+ msgid "Messages encrypted over the past %d year: %d."
+ msgid_plural "Messages encrypted over the past %d years: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1895
+ #, c-format
+ msgid "Messages verified in the past: %d."
  msgstr ""
  
++#: g10/tofu.c:1899
+ #, fuzzy, c-format
+ msgid "Messages encrypted in the past: %d."
+ msgstr "el algoritmo de resumen seleccionado no es válido\n"
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1767
++#: g10/tofu.c:1916
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1809
++#: g10/tofu.c:1958
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1815
++#: g10/tofu.c:1964
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1823
++#: g10/tofu.c:1972
  msgid "Defaulting to unknown."
  msgstr ""
  
- #: g10/tofu.c:1938 g10/tofu.c:2074
++#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
- #: g10/tofu.c:1994
++#: g10/tofu.c:2143
  #, fuzzy, c-format
  #| msgid "error writing key: %s\n"
  msgid "resetting keydb: %s\n"
  msgstr "error escribiendo clave: %s\n"
  
- #: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
- #: g10/tofu.c:2425
++#: g10/tofu.c:2601
  #, fuzzy, c-format
  #| msgid "error storing flags: %s\n"
- msgid "error setting TOFU binding's trust level to %s\n"
+ msgid "error setting TOFU binding's policy to %s\n"
  msgstr "error almacenando parámetros: %s\n"
  
- #: g10/tofu.c:2473
++#: g10/tofu.c:2794
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "error changing TOFU policy: %s\n"
  msgstr "error creando tubería: %s\n"
  
- #. TRANSLATORS: The tilde ('~') is used here to indicate a
- #. * non-breakable space
- #: g10/tofu.c:2574
++#: g10/tofu.c:2839
  #, c-format
- msgid "%d~year"
- msgid_plural "%d~years"
+ msgid "%lld~year"
+ msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2583
++#: g10/tofu.c:2844
  #, c-format
- msgid "%d~month"
- msgid_plural "%d~months"
+ msgid "%lld~month"
+ msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2592
++#: g10/tofu.c:2849
  #, c-format
- msgid "%d~day"
- msgid_plural "%d~days"
+ msgid "%lld~week"
+ msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2854
+ #, c-format
+ msgid "%lld~day"
+ msgid_plural "%lld~days"
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:2859
  #, c-format
- msgid "%d~hour"
- msgid_plural "%d~hours"
+ msgid "%lld~hour"
+ msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2610
++#: g10/tofu.c:2864
  #, c-format
- msgid "%d~minute"
- msgid_plural "%d~minutes"
+ msgid "%lld~minute"
+ msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2619
++#: g10/tofu.c:2866
  #, fuzzy, c-format
  #| msgid "second"
- msgid "%d~second"
- msgid_plural "%d~seconds"
+ msgid "%lld~second"
+ msgid_plural "%lld~seconds"
  msgstr[0] "segundo"
  msgstr[1] "segundo"
  
- #: g10/tofu.c:2802
- #, fuzzy, c-format
- #| msgid "%s: okay\n"
- msgid "%s: "
- msgstr "%s: bien\n"
++#: g10/tofu.c:3103
+ #, c-format
+ msgid "%s: Verified 0~signatures and encrypted 0~messages."
+ msgstr ""
  
- #: g10/tofu.c:2806
++#: g10/tofu.c:3109
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
- msgid "Verified %ld signatures"
+ msgid "%s: Verified 0 signatures."
  msgstr "%d firmas borradas\n"
  
- #: g10/tofu.c:2816
++#: g10/tofu.c:3117
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid "Verified %ld signature in the past %s"
- msgid_plural "Verified %ld signatures in the past %s"
+ msgid "%s: Verified %ld~signature in the past %s."
+ msgid_plural "%s: Verified %ld~signatures in the past %s."
  msgstr[0] "imprime resúmenes de mensaje"
  msgstr[1] "imprime resúmenes de mensaje"
  
- #: g10/tofu.c:2826
- #, fuzzy, c-format
- msgid ", and encrypted %ld messages"
++#: g10/tofu.c:3127
+ #, fuzzy
+ msgid "Encrypted 0 messages."
  msgstr "el algoritmo de resumen seleccionado no es válido\n"
  
- #: g10/tofu.c:2835
++#: g10/tofu.c:3135
  #, fuzzy, c-format
- msgid ", and encrypted %ld message in the past %s"
- msgid_plural ", and encrypted %ld messages in the past %s"
+ msgid "Encrypted %ld~message in the past %s."
+ msgid_plural "Encrypted %ld~messages in the past %s."
  msgstr[0] "el algoritmo de resumen seleccionado no es válido\n"
  msgstr[1] "el algoritmo de resumen seleccionado no es válido\n"
  
- #: g10/tofu.c:2880
++#: g10/tofu.c:3146
+ #, fuzzy, c-format
+ #| msgid "Policy: "
+ msgid "(policy: %s)"
+ msgstr "Política: "
+ 
++#: g10/tofu.c:3177
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2883
++#: g10/tofu.c:3180
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2887
++#: g10/tofu.c:3184
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2890
++#: g10/tofu.c:3187
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2919
++#: g10/tofu.c:3216
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7528,19 -6053,15 +7565,19 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
- #: g10/tofu.c:3480 g10/tofu.c:3572
++#: g10/tofu.c:3298 g10/tofu.c:3449 g10/tofu.c:3627 g10/tofu.c:3670
++#: g10/tofu.c:3784 g10/tofu.c:3859 g10/tofu.c:3894
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error opening TOFU database: %s\n"
  msgstr "error enviando orden %s: %s\n"
  
- #: g10/tofu.c:3185
++#: g10/tofu.c:3482
  #, c-format
- msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
  msgstr ""
  
- #: g10/tofu.c:3515
++#: g10/tofu.c:3819
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7572,45 -6088,36 +7609,45 @@@ msgstr "clave %s: clave fiable sin clav
  msgid "key %s marked as ultimately trusted\n"
  msgstr "clave %s marcada como de confianza absoluta\n"
  
- #: g10/trustdb.c:341
++#: g10/trustdb.c:348
  #, 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:347
++#: g10/trustdb.c:354
  #, 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:422
++#: g10/trustdb.c:429
  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:431
++#: g10/trustdb.c:438
  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:468
++#: g10/trustdb.c:475
  #, 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:474
++#: g10/trustdb.c:481
  #, c-format
  msgid "using %s trust model\n"
  msgstr "usando %s como modelo de confianza\n"
  
- #: g10/trustdb.c:511
++#: g10/trustdb.c:518
  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:517 g10/trustdb.c:2160
++#: g10/trustdb.c:524 g10/trustdb.c:2187
  #, 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:526
++#: g10/trustdb.c:533
  #, 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"
@@@ -7618,7 -6125,6 +7655,7 @@@ 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:542
++#: g10/trustdb.c:549
  #, 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"
@@@ -7626,20 -6132,16 +7663,20 @@@ msgstr "
  "no es necesario comprobar la base de datos de confianza\n"
  "con el modelo `%s'\n"
  
- #: g10/trustdb.c:749 g10/trustdb.c:1313
++#: g10/trustdb.c:756 g10/trustdb.c:1340
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "clave pública %s no encontrada: %s\n"
  
- #: g10/trustdb.c:966
++#: g10/trustdb.c:973
  msgid "please do a --check-trustdb\n"
  msgstr "por favor haga un --check-trustdb\n"
  
- #: g10/trustdb.c:971
++#: g10/trustdb.c:978
  msgid "checking the trustdb\n"
  msgstr "comprobando base de datos de confianza\n"
  
- #: g10/trustdb.c:1883
++#: g10/trustdb.c:1910
  #, fuzzy, c-format
  #| msgid "%lu keys processed so far\n"
  msgid "%d key processed"
@@@ -7647,7 -6149,6 +7684,7 @@@ msgid_plural "%d keys processed
  msgstr[0] "%lu claves procesadas hasta ahora\n"
  msgstr[1] "%lu claves procesadas hasta ahora\n"
  
- #: g10/trustdb.c:1886
++#: g10/trustdb.c:1913
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7655,16 -6156,13 +7692,16 @@@ msgid_plural " (%d validity counts clea
  msgstr[0] "%d claves procesadas (%d validaciones superadas)\n"
  msgstr[1] "%d claves procesadas (%d validaciones superadas)\n"
  
- #: g10/trustdb.c:1956
++#: g10/trustdb.c:1983
  msgid "no ultimately trusted keys found\n"
  msgstr "no se encuentran claves absolutamente fiables\n"
  
- #: g10/trustdb.c:1970
++#: g10/trustdb.c:1997
  #, 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:2087
++#: g10/trustdb.c:2114
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7672,7 -6170,6 +7709,7 @@@ msgstr "
  "nivel: %d  validez: %3d  firmada: %3d  confianza: %d-, %dq, %dn, %dm, %df, "
  "%du\n"
  
- #: g10/trustdb.c:2167
++#: g10/trustdb.c:2194
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr ""
@@@ -7791,19 -6267,14 +7828,19 @@@ msgstr "
  "Sintaxis: kbxutil [opciones] [ficheros]\n"
  "listar, exportar, importar datos Keybox\n"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3208
++#: scd/app-nks.c:718 scd/app-openpgp.c:3221
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr "falta el módulo RSA o no es de %d bits\n"
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3220
++#: scd/app-nks.c:726 scd/app-openpgp.c:3233
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr "falta el exponente público RSA o es mayor de %d bits\n"
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
- #: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
- #: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1965 scd/app-openpgp.c:1984
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2166 scd/app-openpgp.c:2430
++#: scd/app-openpgp.c:2477 scd/app-openpgp.c:2582 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "la función de manejo del PIN devolvió un error: %s\n"
@@@ -7853,83 -6315,65 +7890,83 @@@ msgstr "
  "|NP|Por favor introduzca el PIN Unblocking Code (PUK) para la clave que crea "
  "firmas cualificadas."
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2511 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "error obteniendo nuevo PIN: %s\n"
  
- #: scd/app-openpgp.c:806
++#: scd/app-openpgp.c:801
  #, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "fallo al almacenar la huella digital: %s\n"
  
- #: scd/app-openpgp.c:819
++#: scd/app-openpgp.c:814
  #, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "fallo guardando la fecha de creación: %s\n"
  
- #: scd/app-openpgp.c:1236
++#: scd/app-openpgp.c:1247
  msgid "response does not contain the RSA modulus\n"
  msgstr "la respuesta no incluye el módulo RSA\n"
  
- #: scd/app-openpgp.c:1243
++#: scd/app-openpgp.c:1254
  msgid "response does not contain the RSA public exponent\n"
  msgstr "la respuesta no incluye el exponente público RSA\n"
  
- #: scd/app-openpgp.c:1353
++#: scd/app-openpgp.c:1364
  #, fuzzy
  #| msgid "response does not contain the RSA public exponent\n"
  msgid "response does not contain the EC public key\n"
  msgstr "la respuesta no incluye el exponente público RSA\n"
  
- #: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:1464 scd/app-openpgp.c:3825
  msgid "response does not contain the public key data\n"
  msgstr "la respuesta no incluye la clave pública\n"
  
- #: scd/app-openpgp.c:1551
++#: scd/app-openpgp.c:1564
  #, c-format
  msgid "reading public key failed: %s\n"
  msgstr "fallo leyendo clave pública: %s\n"
  
- #: scd/app-openpgp.c:1903
++#: scd/app-openpgp.c:1916
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr "usando PIN por defecto %s\n"
  
- #: scd/app-openpgp.c:1910
++#: scd/app-openpgp.c:1923
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr "fallo al usar el PIN por defecto %s: %s - en adelante deshabilitado\n"
  
- #: scd/app-openpgp.c:1925
++#: scd/app-openpgp.c:1938
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr "||Por favor introduzca PIN%%0A[firmas hechas: %lu]"
  
- #: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
++#: scd/app-openpgp.c:1949 scd/app-openpgp.c:2424
  msgid "||Please enter the PIN"
  msgstr "||Por favor introduzca PIN"
  
- #: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2173 scd/app-openpgp.c:2437
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr "El PIN para CHV%d es demasiado corto; longitud mínima %d\n"
  
- #: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
- #: scd/app-openpgp.c:4114
++#: scd/app-openpgp.c:2004 scd/app-openpgp.c:2043 scd/app-openpgp.c:2185
++#: scd/app-openpgp.c:4126
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "la verificación CHV%d falló: %s\n"
  
- #: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
++#: scd/app-openpgp.c:2072 scd/app-openpgp.c:2458 scd/app-openpgp.c:4556
  msgid "error retrieving CHV status from card\n"
  msgstr "error recuperando el estatus CHV de la tarjeta\n"
  
- #: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
++#: scd/app-openpgp.c:2078 scd/app-openpgp.c:4565
  msgid "card is permanently locked!\n"
  msgstr "¡la tarjeta está bloqueada permanentemente!\n"
  
- #: scd/app-openpgp.c:2072
++#: scd/app-openpgp.c:2085
  #, fuzzy, c-format
  #| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@@ -7944,24 -6388,19 +7981,24 @@@ msgstr[1] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:2082
++#: scd/app-openpgp.c:2095
  #, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "|A|Introduzca PIN de Administrador%%0A[intentos restantes: %d]"
  
- #: scd/app-openpgp.c:2086
++#: scd/app-openpgp.c:2099
  msgid "|A|Please enter the Admin PIN"
  msgstr "|A|Por favor introduzca PIN de Administrador"
  
- #: scd/app-openpgp.c:2107
++#: scd/app-openpgp.c:2120
  msgid "access to admin commands is not configured\n"
  msgstr "el acceso a órdenes de administrador no está configurado\n"
  
- #: scd/app-openpgp.c:2460
++#: scd/app-openpgp.c:2473
  msgid "||Please enter the Reset Code for the card"
  msgstr "||Por favor introduzca Código de Reinicio de la tarjeta"
  
- #: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
++#: scd/app-openpgp.c:2483 scd/app-openpgp.c:2537
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr "Código de Reinicio demasiado corto; longitud mínima %d\n"
@@@ -7969,83 -6408,65 +8006,83 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2493
++#: scd/app-openpgp.c:2506
  msgid "|RN|New Reset Code"
  msgstr "|CR|Nuevo Código de Reinicio"
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|AN|New Admin PIN"
  msgstr "|AN|Nuevo PIN Administrador"
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|N|New PIN"
  msgstr "|N|Nuevo PIN"
  
- #: scd/app-openpgp.c:2565
++#: scd/app-openpgp.c:2578
  #, fuzzy
  #| msgid "|A|Please enter the Admin PIN"
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "|A|Por favor introduzca PIN de Administrador"
  
- #: scd/app-openpgp.c:2566
++#: scd/app-openpgp.c:2579
  #, fuzzy
  #| msgid "||Please enter the PIN"
  msgid "||Please enter the PIN and New PIN"
  msgstr "||Por favor introduzca PIN"
  
- #: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
++#: scd/app-openpgp.c:2635 scd/app-openpgp.c:3885
  msgid "error reading application data\n"
  msgstr "error leyendo datos de la aplicación\n"
  
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
++#: scd/app-openpgp.c:2641 scd/app-openpgp.c:3892
  msgid "error reading fingerprint DO\n"
  msgstr "error leyendo huella digital DO\n"
  
- #: scd/app-openpgp.c:2638
++#: scd/app-openpgp.c:2651
  msgid "key already exists\n"
  msgstr "la clave ya existe\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2655
  msgid "existing key will be replaced\n"
  msgstr "la clave existente será reemplazada\n"
  
- #: scd/app-openpgp.c:2644
++#: scd/app-openpgp.c:2657
  msgid "generating new key\n"
  msgstr "generando nueva clave\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2659
  msgid "writing new key\n"
  msgstr "escribiendo clave nueva\n"
  
- #: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
++#: scd/app-openpgp.c:3201 scd/app-openpgp.c:3553
  msgid "creation timestamp missing\n"
  msgstr "falta fecha de creación\n"
  
- #: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
++#: scd/app-openpgp.c:3243 scd/app-openpgp.c:3251
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr "el primo RSA %s falta o no es de %d bits\n"
  
- #: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
++#: scd/app-openpgp.c:3384 scd/app-openpgp.c:3647
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "fallo al almacenar la clave: %s\n"
  
- #: scd/app-openpgp.c:3534
++#: scd/app-openpgp.c:3547
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "URI no disponible"
  
- #: scd/app-openpgp.c:3790
++#: scd/app-openpgp.c:3802
  msgid "please wait while key is being generated ...\n"
  msgstr "por favor, espere mientras se genera la clave ...\n"
  
- #: scd/app-openpgp.c:3798
++#: scd/app-openpgp.c:3810
  msgid "generating key failed\n"
  msgstr "la generación de la clave falló\n"
  
- #: scd/app-openpgp.c:3804
++#: scd/app-openpgp.c:3816
  #, fuzzy, c-format
  #| msgid "key generation completed (%d seconds)\n"
  msgid "key generation completed (%d second)\n"
@@@ -8053,31 -6474,25 +8090,31 @@@ msgid_plural "key generation completed 
  msgstr[0] "generación de clave completada (%d segundos)\n"
  msgstr[1] "generación de clave completada (%d segundos)\n"
  
- #: scd/app-openpgp.c:3838
++#: scd/app-openpgp.c:3850
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "estructura de la tarjeta OpenPGP inválida (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:3900
  msgid "fingerprint on card does not match requested one\n"
  msgstr "la huella digital en la tarjeta no coincide con la solicitada\n"
  
- #: scd/app-openpgp.c:4004
++#: scd/app-openpgp.c:4016
  #, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "la tarjeta no permite usar el algoritmo de resumen %s\n"
  
- #: scd/app-openpgp.c:4089
++#: scd/app-openpgp.c:4101
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "firmas creadas hasta ahora: %lu\n"
  
- #: scd/app-openpgp.c:4551
++#: scd/app-openpgp.c:4570
  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:4854 scd/app-openpgp.c:4865
++#: scd/app-openpgp.c:4871 scd/app-openpgp.c:4882
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "no se puede acceder a %s - ¿tarjeta OpenPGP inválida?\n"
@@@ -8099,7 -6511,6 +8136,7 @@@ msgstr "|N|Nuevo PIN Inicial
  msgid "run in multi server mode (foreground)"
  msgstr "ejecutar en modo multi servidor (primer plano)"
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|NIVEL|poner el nivel de depurado a NIVEL"
  
@@@ -8141,13 -6543,11 +8178,13 @@@ msgstr "denegar órdenes de administrac
  msgid "use variable length input for pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:287
++#: scd/scdaemon.c:286
  #, fuzzy
  #| msgid "Usage: gpgconf [options] (-h for help)"
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Uso: gpgconf [opciones] (-h para ayuda)"
  
- #: scd/scdaemon.c:289
++#: scd/scdaemon.c:288
  #, fuzzy
  #| msgid ""
  #| "Syntax: scdaemon [options] [command [args]]\n"
@@@ -8159,19 -6559,16 +8196,19 @@@ msgstr "
  "Sintaxis: scdaemon [opciones] [orden [args]]\n"
  "Demonio de la tarjeta inteligente para GnuPG\n"
  
- #: scd/scdaemon.c:786
++#: scd/scdaemon.c:784
  #, fuzzy
  #| 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 "use la opción `--daemon' para ejectuar el programa en segundo plano\n"
  
- #: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1904
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "manejador del descriptor %d iniciado\n"
  
- #: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
++#: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1909
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "manejador del descriptor %d terminado\n"
@@@ -8252,9 -6633,6 +8289,9 @@@ msgstr "número de certificados coincid
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "fallo buscando la clave sólo caché de dirmngr: %s\n"
  
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
 +#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  msgid "failed to allocate keyDB handle\n"
  msgstr "fallo al reservar handle de keyDB\n"
  
@@@ -8754,11 -7030,9 +8791,11 @@@ msgstr "Acabado. Debería mandar esta p
  msgid "resource problem: out of core\n"
  msgstr "problema de recursos: memoria desbordada\n"
  
- #: sm/decrypt.c:330
++#: sm/decrypt.c:332
  msgid "(this is the RC2 algorithm)\n"
  msgstr "(el algoritmo RC2)\n"
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:334
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr "(no parece un mensaje cifrado)\n"
  
@@@ -8802,79 -7068,60 +8839,79 @@@ msgstr "lista claves externas
  msgid "list certificate chain"
  msgstr "lista de cadenas de certificados"
  
- #: sm/gpgsm.c:218
++#: sm/gpgsm.c:219
  msgid "import certificates"
  msgstr "importa certificado"
  
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
  msgid "export certificates"
  msgstr "exporta certificado"
  
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:228
  msgid "register a smartcard"
  msgstr "registrar tarjeta inteligente"
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:231
  msgid "pass a command to the dirmngr"
  msgstr "pasar una orden a dirmngr"
  
- #: sm/gpgsm.c:232
++#: sm/gpgsm.c:233
  msgid "invoke gpg-protect-tool"
  msgstr "invocar gpg-protect-tool"
  
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:250
  msgid "create base-64 encoded output"
  msgstr "crea una salida en base-64"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in PEM format"
  msgstr "asumir entrada en formato PEM"
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in base-64 format"
  msgstr "asumir entrada en formato base-64"
  
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:262
  msgid "assume input is in binary format"
  msgstr "asumir entrada en formato binario"
  
- #: sm/gpgsm.c:267
++#: sm/gpgsm.c:269
  msgid "never consult a CRL"
  msgstr "nunca consultar una CRL"
  
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:279
  msgid "check validity using OCSP"
  msgstr "comprabar validez usando OCSP"
  
- #: sm/gpgsm.c:282
++#: sm/gpgsm.c:284
  msgid "|N|number of certificates to include"
  msgstr "|N|número de certificados que incluir"
  
- #: sm/gpgsm.c:285
++#: sm/gpgsm.c:287
  msgid "|FILE|take policy information from FILE"
  msgstr "|FICHERO|tomar política de información de FICHERO"
  
- #: sm/gpgsm.c:288
++#: sm/gpgsm.c:290
  msgid "do not check certificate policies"
  msgstr "no comprobar políticas de certificados"
  
- #: sm/gpgsm.c:292
++#: sm/gpgsm.c:294
  msgid "fetch missing issuer certificates"
  msgstr "recuperar certificados de emisor perdidos"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "don't use the terminal at all"
  msgstr "no usa la terminal en absoluto"
  
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:307
  msgid "|FILE|write a server mode log to FILE"
  msgstr "|FICHERO|escribir un log en modo servidor en FICHERO"
  
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:312
  msgid "|FILE|write an audit log to FILE"
  msgstr "|FICHERO|escribir inform de auditoría a FICHERO"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "batch mode: never ask"
  msgstr "proceso por lotes: nunca preguntar"
  
@@@ -8884,41 -7131,32 +8921,41 @@@
  # 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:314
++#: sm/gpgsm.c:316
  msgid "assume yes on most questions"
  msgstr "asume \"sí\" en casi todas las preguntas"
  
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:317
  msgid "assume no on most questions"
  msgstr "asume \"no\" en casi todas las preguntas"
  
- #: sm/gpgsm.c:318
++#: sm/gpgsm.c:320
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "|FICHERO|añade este anillo a la lista de anillos"
  
- #: sm/gpgsm.c:321
++#: sm/gpgsm.c:323
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|ID-USUARIO|usa ID-USUARIO como clave secreta por defecto"
  
- #: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|ESPEC|usa este servidor para buscar claves"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
  
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:352
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:559
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
  msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
  
- #: sm/gpgsm.c:570
++#: sm/gpgsm.c:562
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpgsm [options] [files]\n"
@@@ -8933,50 -7171,41 +8970,50 @@@ msgstr "
  "firma, comprueba, cifra o descifra usando protocolo S/MIME\n"
  "la operación por defecto depende de los datos de entrada\n"
  
- #: sm/gpgsm.c:774
++#: sm/gpgsm.c:766
  #, 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 "NOTA: no se podrá cifrar a `%s': %s\n"
  
- #: sm/gpgsm.c:785
++#: sm/gpgsm.c:777
  #, fuzzy, c-format
  #| msgid "unknown validation model `%s'\n"
  msgid "unknown validation model '%s'\n"
  msgstr "modelo de validación desconocido `%s'\n"
  
- #: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
  #, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "%s:%u: falta el nombre del host\n"
  
- #: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr "%s:%u: se dio contraseña sin usuario\n"
  
- #: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
  #, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr "%s:%u: omitir esta línea\n"
  
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1427
  msgid "could not parse keyserver\n"
  msgstr "no se puede interpretar el servidor de claves\n"
  
- #: sm/gpgsm.c:1636
++#: sm/gpgsm.c:1630
  #, fuzzy, c-format
  #| msgid "importing common certificates `%s'\n"
  msgid "importing common certificates '%s'\n"
  msgstr "importando certificados comunes `%s'\n"
  
- #: sm/gpgsm.c:1677
++#: sm/gpgsm.c:1671
  #, fuzzy, c-format
  #| msgid "can't sign using `%s': %s\n"
  msgid "can't sign using '%s': %s\n"
  msgstr "no puedo firmar usando `%s': %s\n"
  
- #: sm/gpgsm.c:2033
++#: sm/gpgsm.c:2028
  msgid "invalid command (there is no implicit command)\n"
  msgstr "orden inválida (no hay orden implícita)\n"
  
@@@ -9807,8 -7885,6 +9844,8 @@@ msgstr "
  msgid "CRL access not possible due to disabled %s\n"
  msgstr ""
  
 +#: dirmngr/crlfetch.c:223 dirmngr/ldap-wrapper-ce.c:488
- #: dirmngr/ldap-wrapper.c:742 dirmngr/misc.c:563
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:563
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
@@@ -10011,122 -8051,95 +10048,122 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:160
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:158
++#: dirmngr/dirmngr.c:161
  #, fuzzy
  #| msgid "|FILE|run commands from FILE on startup"
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|FICHERO|ejecuta órdenes de FICHERO al empezar"
  
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:162
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:163
  #, fuzzy
  #| msgid "pass a command to the dirmngr"
  msgid "shutdown the dirmngr"
  msgstr "pasar una orden a dirmngr"
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:164
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
- #: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
++#: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|FICHERO|escribir logs en modo servidor en FICHERO"
  
- #: dirmngr/dirmngr.c:177
++#: dirmngr/dirmngr.c:180
  #, fuzzy
  #| msgid "Quit without saving? (y/N) "
  msgid "run without asking a user"
  msgstr "¿Salir sin grabar? (s/N) "
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:181
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:182
  #, fuzzy
  #| msgid "allow PKA lookups (DNS requests)"
  msgid "allow sending OCSP requests"
  msgstr "permitir búsquedas PKA (peticiones DNS)"
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:184
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:185
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:186
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:188
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:192
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:202
  #, fuzzy
  #| msgid "|FILE|read options from FILE"
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FICHERO|lee opciones desde FICHERO"
  
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
  #, fuzzy
  #| msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgid "|N|set LDAP timeout to N seconds"
  msgstr "|N|establecer vida máxima del caché de PIN en N segundos"
  
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:210
  #, fuzzy
  #| msgid "|URL|use keyserver at URL"
  msgid "|URL|use OCSP responder at URL"
  msgstr "|URL|usar servidor de claves en URL"
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:212
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:218
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:220
++#: dirmngr/dirmngr.c:223
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:225
  msgid "route all network traffic via Tor"
  msgstr ""
  
@@@ -10134,7 -8147,6 +10171,7 @@@
  # página man -> página de manual
  # Vale. ¿del manual mejor?
  # Hmm, no sé, en man-db se usa "de". La verdad es que no lo he pensado.
- #: dirmngr/dirmngr.c:240
++#: dirmngr/dirmngr.c:246
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -10147,13 -8159,11 +10184,13 @@@ msgstr "
  "@\n"
  "(Véase en la página del manual la lista completo de órdenes y opciones)\n"
  
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:361
  #, fuzzy
  #| msgid "Usage: gpgconf [options] (-h for help)"
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Uso: gpgconf [opciones] (-h para ayuda)"
  
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:363
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -10165,88 -8175,71 +10202,88 @@@ msgstr "
  "Sintaxis: gpg-agent [opciones] [orden [argumentos]]\n"
  "Manejo de claves privadas por GnuPG\n"
  
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:443
  #, fuzzy, c-format
  #| msgid "invalid debug-level `%s' given\n"
  msgid "valid debug levels are: %s\n"
  msgstr "el nivel de depuración `%s` no es válido\n"
  
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
- #: tools/gpgconf.c:648
++#: dirmngr/dirmngr.c:496 tools/gpgconf.c:550 tools/gpgconf.c:585
++#: tools/gpgconf.c:656
  #, fuzzy, c-format
  #| msgid "usage: gpgsm [options] "
  msgid "usage: %s [options] "
  msgstr "uso: gpgsm [opciones] "
  
- #: dirmngr/dirmngr.c:1062
++#: dirmngr/dirmngr.c:1074
  #, fuzzy
  #| msgid "%s not allowed with %s!\n"
  msgid "colons are not allowed in the socket name\n"
  msgstr "¡%s no permitido con %s!\n"
  
- #: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
++#: dirmngr/dirmngr.c:1300 dirmngr/server.c:1585
  #, fuzzy, c-format
  #| msgid "renaming `%s' to `%s' failed: %s\n"
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "renombrando `%s' en `%s' fallo: %s\n"
  
- #: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
++#: dirmngr/dirmngr.c:1306 dirmngr/server.c:1591
  #, fuzzy, c-format
  #| msgid "conversion from `%s' to `%s' failed: %s\n"
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "la conversión de `%s' en `%s' falló: %s\n"
  
- #: dirmngr/dirmngr.c:1484
++#: dirmngr/dirmngr.c:1487
  #, fuzzy, c-format
  #| msgid "line too long - skipped\n"
  msgid "%s:%u: line too long - skipped\n"
  msgstr "línea demasiado larga -omitida\n"
  
- #: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
++#: dirmngr/dirmngr.c:1542 dirmngr/dirmngr.c:1626
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "huella dactilar no válida"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
++#: dirmngr/dirmngr.c:1578 dirmngr/dirmngr.c:1604 tools/gpgconf-comp.c:4032
  #, fuzzy, c-format
  #| msgid "read error in `%s': %s\n"
  msgid "%s:%u: read error: %s\n"
  msgstr "error de lectura `%s': %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1633
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1700
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1734
++#: dirmngr/dirmngr.c:1738
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1739
++#: dirmngr/dirmngr.c:1743
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1745
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1746
++#: dirmngr/dirmngr.c:1750
  #, fuzzy
  #| msgid "not forced"
  msgid "shutdown forced\n"
  msgstr "no forzado"
  
- #: dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1758
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1761
++#: dirmngr/dirmngr.c:1765
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10777,37 -8671,31 +10814,37 @@@ msgstr "select fallido: %s\n
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2463
++#: dirmngr/server.c:2469
  #, fuzzy, c-format
  #| msgid "cannot allocate outfile string: %s\n"
  msgid "can't allocate control structure: %s\n"
  msgstr "no puedo reservar espacio para la cadena de salida: %s\n"
  
- #: dirmngr/server.c:2474
++#: dirmngr/server.c:2480
  #, fuzzy, c-format
  #| msgid "failed to create stream from socket: %s\n"
  msgid "failed to allocate assuan context: %s\n"
  msgstr "fallo al crear un flujo desde el socket: %s\n"
  
- #: dirmngr/server.c:2495
++#: dirmngr/server.c:2501
  #, fuzzy, c-format
  #| msgid "failed to initialize the TrustDB: %s\n"
  msgid "failed to initialize the server: %s\n"
  msgstr "inicialización de la base de datos de confianza fallida: %s\n"
  
- #: dirmngr/server.c:2503
++#: dirmngr/server.c:2509
  #, fuzzy, c-format
  #| msgid "failed to store the creation date: %s\n"
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "fallo guardando la fecha de creación: %s\n"
  
- #: dirmngr/server.c:2534
++#: dirmngr/server.c:2540
  #, fuzzy, c-format
  #| msgid "user '%s' list problem: %s\n"
  msgid "Assuan accept problem: %s\n"
  msgstr "problema lista usuario '%s': %s\n"
  
- #: dirmngr/server.c:2553
++#: dirmngr/server.c:2559
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
@@@ -10863,7 -8742,6 +10900,7 @@@ msgstr "DSA necesita un algoritmo de ha
  msgid "certificate should not have been used for CRL signing\n"
  msgstr "el certificado no debería haberse usado para firmar\n"
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:167
  msgid "quiet"
  msgstr "silencioso"
  
@@@ -10965,22 -8823,15 +11002,22 @@@ 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:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
- #: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
++#: tools/gpgconf-comp.c:766 tools/gpgconf-comp.c:865
  msgid "Options controlling the diagnostic output"
  msgstr "Opciones que controlan la salida de diagnósticos"
  
 +#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
- #: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
++#: tools/gpgconf-comp.c:779 tools/gpgconf-comp.c:888
  msgid "Options controlling the configuration"
  msgstr "Opciones que controlan la configuración"
  
- #: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
- #: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
++#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:723
++#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:901
  msgid "Options useful for debugging"
  msgstr "Opciones útiles para el depurado"
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
  msgid "Options controlling the security"
  msgstr "Opciones que controlan la seguridad"
  
@@@ -11030,11 -8870,9 +11067,11 @@@ msgstr "no permite reusar antiguas fras
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr "|N|establecer vida máxima del caché de PIN en N segundos"
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
++#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
  msgid "|NAME|use NAME as default secret key"
  msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
  
- #: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
++#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:784
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NOMBRE|cifra para el ususario NOMBRE también"
  
@@@ -11042,85 -8879,65 +11079,85 @@@
  msgid "|SPEC|set up email aliases"
  msgstr "|ESPEC|establecer alias de email"
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
++#: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
  msgid "Configuration for Keyservers"
  msgstr "Configuración para servidores de claves"
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
++#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
  msgid "|URL|use keyserver at URL"
  msgstr "|URL|usar servidor de claves en URL"
  
- #: tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:741
  msgid "allow PKA lookups (DNS requests)"
  msgstr "permitir búsquedas PKA (peticiones DNS)"
  
- #: tools/gpgconf-comp.c:738
++#: tools/gpgconf-comp.c:744
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr "|MECANISMOS|usa MECANISMOS para encontrar claves por emails"
  
- #: tools/gpgconf-comp.c:787
++#: tools/gpgconf-comp.c:793
  msgid "disable all access to the dirmngr"
  msgstr "prohibir todo acceso al dirmngr"
  
- #: tools/gpgconf-comp.c:790
++#: tools/gpgconf-comp.c:796
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
  msgstr "|NOMBRE|usa la codificación NOMBRE para frases contraseña PKCS#12"
  
- #: tools/gpgconf-comp.c:820
++#: tools/gpgconf-comp.c:829
  msgid "do not check CRLs for root certificates"
  msgstr "no comprobar CRLs para certificados raíz"
  
- #: tools/gpgconf-comp.c:869
++#: tools/gpgconf-comp.c:878
  msgid "Options controlling the format of the output"
  msgstr "Opciones que controlan el formato de la salida"
  
- #: tools/gpgconf-comp.c:905
++#: tools/gpgconf-comp.c:920
  msgid "Options controlling the interactivity and enforcement"
  msgstr "Opciones que controlan la interactividad y obligación"
  
- #: tools/gpgconf-comp.c:918
++#: tools/gpgconf-comp.c:933
  #, fuzzy
  #| msgid "Options controlling the security"
  msgid "Options controlling the use of Tor"
  msgstr "Opciones que controlan la seguridad"
  
- #: tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:947
  msgid "Configuration for HTTP servers"
  msgstr "Configuración de servidores HTTP"
  
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:958
  msgid "use system's HTTP proxy setting"
  msgstr "usar configuración del proxy HTTP del sistema"
  
- #: tools/gpgconf-comp.c:948
++#: tools/gpgconf-comp.c:963
  msgid "Configuration of LDAP servers to use"
  msgstr "Configuración de servidores LDAP que se usará"
  
- #: tools/gpgconf-comp.c:977
++#: tools/gpgconf-comp.c:992
  msgid "LDAP server list"
  msgstr "lista de servidores LDAP"
  
- #: tools/gpgconf-comp.c:985
++#: tools/gpgconf-comp.c:1000
  msgid "Configuration for OCSP"
  msgstr "Configuración de OCSP"
  
- #: tools/gpgconf-comp.c:1066
++#: tools/gpgconf-comp.c:1081
  msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1067
++#: tools/gpgconf-comp.c:1082
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1083
  msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1069
++#: tools/gpgconf-comp.c:1084
  msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1070
++#: tools/gpgconf-comp.c:1085
  #, fuzzy
  #| msgid "network error"
  msgid "Network"
@@@ -11135,104 -8952,98 +11172,122 @@@ msgstr "error de red
  # ¿Por qué los ingleses entonces sí que saben lo que es un "passphrase"?
  # ¿Es que son más listos? :-)
  #
- #: tools/gpgconf-comp.c:1071
++#: tools/gpgconf-comp.c:1086
  #, fuzzy
  #| msgid "Bad Passphrase"
  msgid "Passphrase Entry"
  msgstr "Frase contraseña errónea"
  
- #: tools/gpgconf-comp.c:1225
++#: tools/gpgconf-comp.c:1240
  #, fuzzy
  #| msgid "Component not found"
  msgid "Component not suitable for launching"
  msgstr "Componente no encontrado"
  
- #: tools/gpgconf-comp.c:3283
++#: tools/gpgconf-comp.c:3311
  #, c-format
  msgid "External verification of component %s failed"
  msgstr "Verificación externa del componente %s fallida"
  
- #: tools/gpgconf-comp.c:3434
++#: tools/gpgconf-comp.c:3462
  msgid "Note that group specifications are ignored\n"
  msgstr "Note que las especificación de grupo se ignoran\n"
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf-comp.c:4036
+ #, fuzzy, c-format
+ #| msgid "error closing %s: %s\n"
+ msgid "error closing '%s'\n"
+ msgstr "error cerrando %s: %s\n"
+ 
++#: tools/gpgconf-comp.c:4038
+ #, fuzzy, c-format
+ #| msgid "error in `%s': %s\n"
+ msgid "error parsing '%s'\n"
+ msgstr "error en `%s': %s\n"
+ 
++#: tools/gpgconf.c:73
  msgid "list all components"
  msgstr "listar todos los componentes"
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "check all programs"
  msgstr "comprobar todos los programas"
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|list options"
  msgstr "|COMPONENTE|lista de opciones"
  
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
  msgid "|COMPONENT|change options"
  msgstr "|COMPONENTE|cambiar opciones"
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "|COMPONENT|check options"
  msgstr "|COMPONENTE|comprobar opciones"
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "apply global default values"
  msgstr "aplicar valores globales por defecto"
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
+ #, fuzzy
+ #| msgid "|FILE|take policy information from FILE"
+ msgid "|FILE|update configuration files using FILE"
+ msgstr "|FICHERO|tomar política de información de FICHERO"
+ 
++#: tools/gpgconf.c:83
  #, fuzzy
  #| msgid "get the configuration directories for gpgconf"
  msgid "get the configuration directories for @GPGCONF@"
  msgstr "obtener directorios de configuración para gpgconf"
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:85
  msgid "list global configuration file"
  msgstr "listar fichero de configuración global"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  msgid "check global configuration file"
  msgstr "comprobar fichero global de configuración"
  
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:89
  #, fuzzy
  #| msgid "update the trust database"
  msgid "query the software version database"
  msgstr "actualiza la base de datos de confianza"
  
- #: tools/gpgconf.c:86
++#: tools/gpgconf.c:90
  #, fuzzy
  #| msgid "list all components"
  msgid "reload all or a given component"
  msgstr "listar todos los componentes"
  
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:91
  #, fuzzy
  #| msgid "list all components"
  msgid "launch a given component"
  msgstr "listar todos los componentes"
  
- #: tools/gpgconf.c:88
++#: tools/gpgconf.c:92
  #, fuzzy
  #| msgid "list all components"
  msgid "kill a given component"
  msgstr "listar todos los componentes"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "use as output file"
  msgstr "usa como fichero de salida"
  
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:102
  msgid "activate changes at runtime, if possible"
  msgstr "activar cambios en tiempo de ejecución, si es posible"
  
- #: tools/gpgconf.c:122
++#: tools/gpgconf.c:127
  #, fuzzy
  #| msgid "Usage: gpgconf [options] (-h for help)"
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "Uso: gpgconf [opciones] (-h para ayuda)"
  
- #: tools/gpgconf.c:125
++#: tools/gpgconf.c:130
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpgconf [options]\n"
@@@ -11244,15 -9055,12 +11299,15 @@@ msgstr "
  "Sintaxis: gpgconf [opciones]\n"
  "Administrar opciones de configuración de las herramientas GnuPG\n"
  
- #: tools/gpgconf.c:545 tools/gpgconf.c:579
++#: tools/gpgconf.c:552 tools/gpgconf.c:587
  msgid "Need one component argument"
  msgstr "Necesita un argumento de un componente"
  
- #: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
++#: tools/gpgconf.c:561 tools/gpgconf.c:599 tools/gpgconf.c:632
  msgid "Component not found"
  msgstr "Componente no encontrado"
  
- #: tools/gpgconf.c:650
++#: tools/gpgconf.c:658
  msgid "No argument allowed"
  msgstr "No se permiten parámetros"
  
diff --cc po/et.po
index b4a24b2,a7de525..490e386
--- a/po/et.po
+++ b/po/et.po
@@@ -6,7 -6,6 +6,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg 1.2.2\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-11-18 16:54+0100\n"
++"POT-Creation-Date: 2016-12-20 11:28+0100\n"
  "PO-Revision-Date: 2004-06-17 11:04+0300\n"
  "Last-Translator: Toomas Soome <Toomas.Soome at microlink.ee>\n"
  "Language-Team: Estonian <et at li.org>\n"
@@@ -155,25 -126,11 +155,25 @@@ msgstr "halb parool
  msgid "ssh keys greater than %d bits are not supported\n"
  msgstr "kaitse algoritm %d%s ei ole toetatud\n"
  
 +#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
- #: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1306 g10/keygen.c:4577
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
++#: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't create '%s': %s\n"
  msgstr "`%s' ei õnnestu luua: %s\n"
  
 +#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
- #: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1307
++#: g10/import.c:305 g10/import.c:448 g10/import.c:621 g10/keygen.c:3681
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
- #: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
- #: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:825 g10/sign.c:1025
++#: g10/sign.c:1130 g10/sign.c:1275 g10/tdbdump.c:143 g10/tdbdump.c:151
++#: g10/tdbio.c:720 g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161
++#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
++#: dirmngr/certcache.c:368 dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1564
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
@@@ -236,11 -182,9 +236,11 @@@ msgstr "Palun sisestage parool; see on 
  msgid "failed to create stream from socket: %s\n"
  msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1100
++#: agent/divert-scd.c:92 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1101
++#: agent/divert-scd.c:93 g10/call-agent.c:1102
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  
@@@ -383,48 -301,33 +383,48 @@@ msgstr "
  "Võtmed:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
  #, fuzzy
  #| msgid "Key is superseded"
  msgid "run in supervised mode"
  msgstr "Võti on asendatud"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:170 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "ole jutukas"
  
 +#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "ole mõnevõrra vaiksem"
  
- #: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
  msgid "csh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
- #: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
++#: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
  #, fuzzy
  msgid "|FILE|read options from FILE"
  msgstr "|FAIL|lae laiendusmoodul FAIL"
  
- #: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:177
  msgid "do not detach from the console"
  msgstr ""
  
@@@ -509,162 -395,120 +509,162 @@@ msgstr "ei ole toetatud
  #. 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:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:481 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1025 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:358
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:124 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  #, fuzzy
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr "Palun saatke veateated aadressil <gnupg-bugs at gnu.org>.\n"
  
- #: agent/gpg-agent.c:491
++#: agent/gpg-agent.c:490
  #, fuzzy
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
  
- #: agent/gpg-agent.c:493
++#: agent/gpg-agent.c:492
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:537 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:442
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:793
++#: agent/gpg-agent.c:1082 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:812
  #, 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"
  
- #: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
- #: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1093 agent/gpg-agent.c:1935 g10/gpg.c:2510
++#: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:817
++#: dirmngr/dirmngr.c:1670 tools/symcryptrun.c:932
  #, fuzzy, c-format
  #| msgid "option file `%s': %s\n"
  msgid "option file '%s': %s\n"
  msgstr "võtmete fail `%s': %s\n"
  
- #: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:806
++#: agent/gpg-agent.c:1101 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:825
  #, 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:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
- #: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
++#: agent/gpg-agent.c:1223 g10/gpg.c:3643 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:936 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:527
  #, 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:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
++#: agent/gpg-agent.c:2080 scd/scdaemon.c:1073 dirmngr/dirmngr.c:1081
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
  msgstr "%s ei õnnestu luua: %s\n"
  
- #: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
++#: agent/gpg-agent.c:2097 scd/scdaemon.c:1086 dirmngr/dirmngr.c:1094
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2134
++#: agent/gpg-agent.c:2135
  #, fuzzy
  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:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
++#: agent/gpg-agent.c:2145 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1126
  #, fuzzy
  msgid "error getting nonce for the socket\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
++#: agent/gpg-agent.c:2150 scd/scdaemon.c:1113 dirmngr/dirmngr.c:1129
  #, fuzzy, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "viga teate saatmisel serverile `%s': %s\n"
  
- #: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
- #: dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2160 agent/gpg-agent.c:2197 scd/scdaemon.c:1121
++#: dirmngr/dirmngr.c:1138
  #, fuzzy, c-format
  msgid "can't set permissions of '%s': %s\n"
  msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
  
- #: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:2165 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1143
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
  msgstr "uuendamine ebaõnnestus: %s\n"
  
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
++#: agent/gpg-agent.c:2172 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1149
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
  msgstr "kirjutan salajase võtme faili `%s'\n"
  
- #: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: agent/gpg-agent.c:2191 agent/gpg-agent.c:2234 g10/exec.c:199
 +#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, 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:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: agent/gpg-agent.c:2194 agent/gpg-agent.c:2239 g10/openfile.c:491
 +#: g10/openfile.c:520 sm/keydb.c:103
  #, fuzzy, c-format
  msgid "directory '%s' created\n"
  msgstr "%s: kataloog on loodud\n"
  
- #: agent/gpg-agent.c:2244
++#: agent/gpg-agent.c:2245
  #, fuzzy, c-format
  msgid "stat() failed for '%s': %s\n"
  msgstr "trustdb: lugemine ebaõnnestus (n=%d): %s\n"
  
- #: agent/gpg-agent.c:2248
++#: agent/gpg-agent.c:2249
  #, fuzzy, c-format
  msgid "can't use '%s' as home directory\n"
  msgstr "%s: kataloogi ei õnnestu luua: %s\n"
  
- #: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
++#: agent/gpg-agent.c:2392 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1871
  #, fuzzy, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
  
- #: agent/gpg-agent.c:2598
++#: agent/gpg-agent.c:2599
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2603
++#: agent/gpg-agent.c:2604
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2678
++#: agent/gpg-agent.c:2679
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2683
++#: agent/gpg-agent.c:2684
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
++#: agent/gpg-agent.c:2881 scd/scdaemon.c:1272 dirmngr/dirmngr.c:2075
  #, fuzzy, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "salajase võtme uuendamine ebaõnnestus: %s\n"
  
- #: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2954 scd/scdaemon.c:1321
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
  msgstr "%s: jätsin vahele: %s\n"
  
- #: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
++#: agent/gpg-agent.c:3092 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  #, fuzzy
  msgid "no gpg-agent running in this session\n"
  msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
@@@ -680,8 -522,6 +680,8 @@@ msgid "
  "Password cache maintenance\n"
  msgstr ""
  
- #: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
++#: agent/protect-tool.c:106 g10/gpg.c:424 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:153 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -689,9 -529,6 +689,9 @@@ msgstr "
  "@Käsud:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
- #: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:92 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:168 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -745,8 -574,6 +745,8 @@@ msgstr "Katkesta
  msgid "error while asking for the passphrase: %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
- #: tools/gpgconf.c:323
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1472
++#: tools/gpgconf.c:328
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
@@@ -916,9 -714,6 +916,9 @@@ msgstr "kaitse algoritm %d%s ei ole toe
  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:438
 +#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
- #: dirmngr/ldap-wrapper.c:710
++#: dirmngr/ldap-wrapper.c:711
  #, fuzzy, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "viga parooli loomisel: %s\n"
@@@ -930,8 -722,6 +930,8 @@@
  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:848 dirmngr/dirmngr.c:1155
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1167
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
@@@ -978,27 -759,22 +978,27 @@@ msgstr "ei õnnestu luua ühendust serv
  msgid "problem setting the gpg-agent options\n"
  msgstr "probleem agendiga: agent tagastas 0x%lx\n"
  
- #: common/sysutils.c:144
++#: common/sysutils.c:148
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "ei õnnestu blokeerida mälupildi salvestamist: %s\n"
  
- #: common/sysutils.c:239
++#: common/sysutils.c:250
  #, fuzzy, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
  
- #: common/sysutils.c:271
++#: common/sysutils.c:282
  #, fuzzy, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
  
- #: common/sysutils.c:659
++#: common/sysutils.c:693
  #, fuzzy, c-format
  msgid "waiting for file '%s' to become accessible ...\n"
  msgstr "uuendamine ebaõnnestus: %s\n"
  
- #: common/sysutils.c:685
++#: common/sysutils.c:719
  #, fuzzy, c-format
  msgid "renaming '%s' to '%s' failed: %s\n"
  msgstr "pakendamine ebaõnnestus: %s\n"
@@@ -1074,7 -835,6 +1074,7 @@@ msgstr "
  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:554
++#: common/miscellaneous.c:556
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
@@@ -1189,8 -926,6 +1189,8 @@@ msgstr "%s: võtmehoidla on loodud\n
  msgid "algorithm: %s"
  msgstr "pakend: %s\n"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3098
++#: scd/app-openpgp.c:3111
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
@@@ -1402,7 -1095,6 +1402,7 @@@ msgstr "
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr ""
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1173
++#: common/argparse.c:401 dirmngr/dirmngr.c:1185
  #, fuzzy
  msgid "out of core\n"
  msgstr "ei töödeldud"
@@@ -1461,8 -1142,6 +1461,8 @@@ msgstr "ei leia avalikku võtit %08lX: 
  msgid "waiting for lock %s...\n"
  msgstr "kirjutan salajase võtme faili `%s'\n"
  
- #: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
- #: dirmngr/dirmngr.c:715
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:725
++#: dirmngr/dirmngr.c:734
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
@@@ -1502,7 -1173,6 +1502,7 @@@ msgstr "ootamatu pakend:
  msgid "invalid dash escaped line: "
  msgstr "vigane kriipsudega märgitud rida: "
  
- #: g10/armor.c:873 g10/armor.c:1490
++#: g10/armor.c:873 g10/armor.c:1493
  #, fuzzy, c-format
  msgid "invalid radix64 character %02X skipped\n"
  msgstr "vigane radix64 sümbol %02x vahele jäetud\n"
@@@ -1519,7 -1186,6 +1519,7 @@@ msgstr "enneaegne faililõpp (poolik CR
  msgid "malformed CRC\n"
  msgstr "vigane CRC\n"
  
- #: g10/armor.c:962 g10/armor.c:1527
++#: g10/armor.c:962 g10/armor.c:1530
  #, fuzzy, c-format
  msgid "CRC error; %06lX - %06lX\n"
  msgstr "CRC viga; %06lx - %06lx\n"
@@@ -1533,16 -1197,13 +1533,16 @@@ msgstr "enneaegne faililõpp (lõpetava
  msgid "error in trailer line\n"
  msgstr "viga lõpetaval real\n"
  
- #: g10/armor.c:1303
++#: g10/armor.c:1306
  msgid "no valid OpenPGP data found.\n"
  msgstr "ei leia OpenPGP andmeid.\n"
  
- #: g10/armor.c:1308
++#: g10/armor.c:1311
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
  msgstr "vigane pakend: rida on pikem, kui %d sümbolit\n"
  
- #: g10/armor.c:1312
++#: g10/armor.c:1315
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr ""
@@@ -1630,8 -1276,6 +1630,8 @@@ msgstr "salajane võti ei ole kättesaa
  msgid "OpenPGP card no. %s detected\n"
  msgstr ""
  
- #: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
- #: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2030
++#: g10/keygen.c:4087 g10/revoke.c:215 g10/revoke.c:618
  #, fuzzy
  msgid "can't do this in batch mode\n"
  msgstr "seda ei saa teha pakettmoodis\n"
@@@ -1641,15 -1284,10 +1641,15 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "See käsklus ei ole %s moodis lubatud.\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2454
++#: g10/card-util.c:109 scd/app-openpgp.c:2467
  #, fuzzy
  msgid "Reset Code not or not anymore available\n"
  msgstr "salajase võtme komponendid ei ole kättesaadavad\n"
  
 +#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
- #: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
- #: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1768
++#: g10/keygen.c:1945 g10/keygen.c:2313 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "Teie valik? "
  
@@@ -1716,10 -1340,6 +1716,10 @@@ msgstr "vastavat avalikku võtit pole: 
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
- #: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:334
++#: g10/import.c:592 g10/import.c:640 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
++#: dirmngr/dirmngr.c:1510 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
@@@ -1793,7 -1398,6 +1793,7 @@@ msgstr "Võtme genereerimine ebaõnnest
  msgid "not an OpenPGP card"
  msgstr "ei leia OpenPGP andmeid.\n"
  
- #: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
++#: g10/card-util.c:1173 g10/keygen.c:4106 g10/keygen.c:5092
  #, fuzzy, c-format
  msgid "error getting current key info: %s\n"
  msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
@@@ -1824,13 -1423,10 +1824,13 @@@ msgstr "Millist võtmepikkust te soovit
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "Millist võtmepikkust te soovite? (1024) "
  
- #: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
++#: g10/card-util.c:1316 g10/keygen.c:2122 g10/keygen.c:2154
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "ümardatud üles %u bitini\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2207 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr ""
@@@ -1885,9 -1471,6 +1885,9 @@@ msgstr "   (%d) RSA (ainult krüpteerim
  msgid "   (3) Authentication key\n"
  msgstr ""
  
- #: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
- #: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
- #: g10/keygen.c:2314 g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1508
++#: g10/keygen.c:1794 g10/keygen.c:1822 g10/keygen.c:1952 g10/keygen.c:2060
++#: g10/keygen.c:2336 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Vigane valik.\n"
  
@@@ -1921,7 -1498,6 +1921,7 @@@ msgstr "Allkirjastan tõesti? 
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1816 g10/keyedit.c:1867
++#: g10/card-util.c:1816 g10/keyedit.c:1868
  msgid "quit this menu"
  msgstr "välju sellest menüüst"
  
@@@ -1930,7 -1505,6 +1930,7 @@@
  msgid "show admin commands"
  msgstr "vastuolulised käsud\n"
  
- #: g10/card-util.c:1819 g10/keyedit.c:1870
++#: g10/card-util.c:1819 g10/keyedit.c:1871
  msgid "show this help"
  msgstr "näita seda abiinfot"
  
@@@ -2014,31 -1570,21 +2014,31 @@@ msgstr "vastuolulised käsud\n
  msgid "Admin commands are not allowed\n"
  msgstr "kirjutan salajase võtme faili `%s'\n"
  
- #: g10/card-util.c:2127 g10/keyedit.c:2816
++#: g10/card-util.c:2127 g10/keyedit.c:2817
  msgid "Invalid command  (try \"help\")\n"
  msgstr "Vigane käsklus (proovige \"help\")\n"
  
- #: g10/decrypt.c:191 g10/encrypt.c:955
++#: g10/decrypt.c:190 g10/encrypt.c:955
  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:4851 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4904 g10/keyring.c:398 g10/keyring.c:771
  #, fuzzy, c-format
  #| msgid "can't open `%s'\n"
  msgid "can't open '%s'\n"
  msgstr "`%s' ei õnnestu avada\n"
  
 +#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
- #: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
- #: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4858 g10/keyedit.c:2051
++#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2163
  #, fuzzy, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "võtit '%s' ei leitud: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
- #: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
- #: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4866 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:645 g10/tofu.c:2171
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "viga võtmebloki lugemisel: %s\n"
@@@ -2100,7 -1634,6 +2100,7 @@@ msgstr "avaliku võtme \"%s\" jaoks on 
  msgid "use option \"--delete-secret-keys\" to delete it first.\n"
  msgstr "selle kustutamiseks kasutage võtit \"--delete-secret-keys\".\n"
  
- #: g10/encrypt.c:232 g10/sign.c:1292
++#: g10/encrypt.c:232 g10/sign.c:1294
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "viga parooli loomisel: %s\n"
@@@ -2120,7 -1650,6 +2120,7 @@@ msgstr "kasutan šiffrit %s\n
  msgid "'%s' already compressed\n"
  msgstr "`%s' on juba pakitud\n"
  
- #: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:610
  #, fuzzy, c-format
  #| msgid "WARNING: `%s' is an empty file\n"
  msgid "WARNING: '%s' is an empty file\n"
@@@ -2139,7 -1666,6 +2139,7 @@@ msgid "
  msgstr ""
  "sümmetrilise šifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
  
- #: g10/encrypt.c:707 g10/sign.c:984
++#: g10/encrypt.c:707 g10/sign.c:986
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2173,7 -1694,6 +2173,7 @@@ msgstr "%s krüpteeritud andmed\n
  msgid "encrypted with unknown algorithm %d\n"
  msgstr "krüpteeritud tundmatu algoritmiga %d\n"
  
- #: g10/decrypt-data.c:164 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:129
  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"
@@@ -2273,8 -1775,6 +2273,8 @@@ msgstr "
  msgid " - skipped"
  msgstr "%s: jätsin vahele: %s\n"
  
- #: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:845 g10/sign.c:1148
++#: g10/export.c:1251 g10/import.c:1543 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:847 g10/sign.c:1150
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
@@@ -2299,8 -1795,6 +2299,8 @@@ msgstr "võti %08lX: PGP 2.x stiilis v�
  msgid "WARNING: nothing exported\n"
  msgstr "HOIATUS: midagi ei eksporditud\n"
  
- #: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
- #: g10/plaintext.c:151 g10/plaintext.c:174
++#: g10/export.c:2283 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/plaintext.c:167 g10/plaintext.c:190
  #, fuzzy, c-format
  #| msgid "error creating `%s': %s\n"
  msgid "error creating '%s': %s\n"
@@@ -2348,8 -1833,6 +2348,8 @@@ msgstr "viga `%s' loomisel: %s\n
  msgid "No fingerprint"
  msgstr "näita sõrmejälge"
  
- #: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
- #: g10/revoke.c:701
++#: g10/getkey.c:1873 g10/keyedit.c:2929 g10/keyedit.c:3016 g10/revoke.c:637
++#: g10/revoke.c:702
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "salajast võtit `%s' ei leitud: %s\n"
@@@ -2383,218 -1861,174 +2383,224 @@@ msgstr "
  msgid "using subkey %s instead of primary key %s\n"
  msgstr "kasutan sekundaarset võtit %08lX primaarse võtme %08lX asemel\n"
  
- #: g10/gpg.c:424 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:200
  #, fuzzy
  msgid "make a signature"
  msgstr "loo eraldiseisev allkiri"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:427
  #, fuzzy
  msgid "make a clear text signature"
  msgstr "|[fail]|loo avateksti allkiri"
  
- #: g10/gpg.c:426 sm/gpgsm.c:202
++#: g10/gpg.c:429 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "loo eraldiseisev allkiri"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:430 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "krüpteeri andmed"
  
- #: g10/gpg.c:429
++#: g10/gpg.c:432
  msgid "encryption only with symmetric cipher"
  msgstr "krüpteerimine kasutades ainult sümmeetrilist šifrit"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:434 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "dekrüpteeri andmed (vaikimisi)"
  
- #: g10/gpg.c:433 sm/gpgsm.c:206
++#: g10/gpg.c:436 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "kontrolli allkirja"
  
- #: g10/gpg.c:435 sm/gpgsm.c:207
++#: g10/gpg.c:438 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "näita võtmeid"
  
- #: g10/gpg.c:437
++#: g10/gpg.c:440
  msgid "list keys and signatures"
  msgstr "näita võtmeid ja allkirju"
  
- #: g10/gpg.c:438
++#: g10/gpg.c:443
  #, fuzzy
  msgid "list and check key signatures"
  msgstr "kontrolli võtmete allkirju"
  
- #: g10/gpg.c:439 sm/gpgsm.c:212
++#: g10/gpg.c:445 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "näita võtmeid ja sõrmejälgi"
  
- #: g10/gpg.c:440 sm/gpgsm.c:210
++#: g10/gpg.c:446 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "näita salajasi võtmeid"
  
- #: g10/gpg.c:442 sm/gpgsm.c:213
++#: g10/gpg.c:448 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "genereeri uus võtmepaar"
  
- #: g10/gpg.c:444
++#: g10/gpg.c:451
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly generate a new key pair"
  msgstr "genereeri uus võtmepaar"
  
- #: g10/gpg.c:446
++#: g10/gpg.c:454
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly add a new user-id"
  msgstr "genereeri uus võtmepaar"
  
- #: g10/gpg.c:449
++#: g10/gpg.c:459
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly revoke a user-id"
  msgstr "genereeri uus võtmepaar"
  
- #: g10/gpg.c:451
++#: g10/gpg.c:462
+ #, fuzzy
+ #| msgid "generate a new key pair"
+ msgid "quickly set a new expiration date"
+ msgstr "genereeri uus võtmepaar"
+ 
++#: g10/gpg.c:464
  msgid "full featured key pair generation"
  msgstr ""
  
- #: g10/gpg.c:452
++#: g10/gpg.c:467
  msgid "generate a revocation certificate"
  msgstr "genereeri tühistamise sertifikaat"
  
- #: g10/gpg.c:454 sm/gpgsm.c:215
++#: g10/gpg.c:470 sm/gpgsm.c:216
  msgid "remove keys from the public keyring"
  msgstr "eemalda võtmed avalike võtmete hoidlast"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:472
  msgid "remove keys from the secret keyring"
  msgstr "eemalda võtmed salajaste võtmete hoidlast"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:474
  #, fuzzy
  #| msgid "sign a key"
  msgid "quickly sign a key"
  msgstr "allkirjasta võti"
  
- #: g10/gpg.c:460
++#: g10/gpg.c:476
  #, fuzzy
  #| msgid "sign a key locally"
  msgid "quickly sign a key locally"
  msgstr "allkirjasta võti lokaalselt"
  
- #: g10/gpg.c:461
++#: g10/gpg.c:477
  msgid "sign a key"
  msgstr "allkirjasta võti"
  
- #: g10/gpg.c:462
++#: g10/gpg.c:478
  msgid "sign a key locally"
  msgstr "allkirjasta võti lokaalselt"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:479
  msgid "sign or edit a key"
  msgstr "allkirjasta või toimeta võtit"
  
- #: g10/gpg.c:465 sm/gpgsm.c:233
++#: g10/gpg.c:481 sm/gpgsm.c:234
  #, fuzzy
  msgid "change a passphrase"
  msgstr "muuda parooli"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:485
  msgid "export keys"
  msgstr "ekspordi võtmed"
  
- #: g10/gpg.c:468
++#: g10/gpg.c:486
  msgid "export keys to a keyserver"
  msgstr "ekspordi võtmed võtmeserverisse"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:487
  msgid "import keys from a keyserver"
  msgstr "impordi võtmed võtmeserverist"
  
- #: g10/gpg.c:471
++#: g10/gpg.c:490
  msgid "search for keys on a keyserver"
  msgstr "otsi võtmeid võtmeserverist"
  
- #: g10/gpg.c:473
++#: g10/gpg.c:492
  msgid "update all keys from a keyserver"
  msgstr "uuenda võtmeid võtmeserverist"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:498
  msgid "import/merge keys"
  msgstr "impordi/mesti võtmed"
  
- #: g10/gpg.c:482
++#: g10/gpg.c:501
  msgid "print the card status"
  msgstr ""
  
- #: g10/gpg.c:483
++#: g10/gpg.c:502
  msgid "change data on a card"
  msgstr ""
  
- #: g10/gpg.c:484
++#: g10/gpg.c:504
  msgid "change a card's PIN"
  msgstr ""
  
- #: g10/gpg.c:496
++#: g10/gpg.c:516
  msgid "update the trust database"
  msgstr "uuenda usalduse andmebaasi"
  
- #: g10/gpg.c:505
++#: g10/gpg.c:525
  #, fuzzy
  msgid "print message digests"
  msgstr "|algo [failid]|trüki teatelühendid"
  
- #: g10/gpg.c:508 sm/gpgsm.c:228
++#: g10/gpg.c:528 sm/gpgsm.c:229
  msgid "run in server mode"
  msgstr ""
  
- #: g10/gpg.c:510
++#: g10/gpg.c:530
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:514 sm/gpgsm.c:246
++#: g10/gpg.c:534 sm/gpgsm.c:248
  msgid "create ascii armored output"
  msgstr "loo ascii pakendis väljund"
  
- #: g10/gpg.c:517 sm/gpgsm.c:262
++#: g10/gpg.c:537 sm/gpgsm.c:264
  #, fuzzy
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|NIMI|krüpti NIMEle"
  
- #: g10/gpg.c:533 sm/gpgsm.c:298
++#: g10/gpg.c:553 sm/gpgsm.c:300
  #, fuzzy
  msgid "|USER-ID|use USER-ID to sign or decrypt"
  msgstr "kasuta seda kasutaja IDd"
  
- #: g10/gpg.c:539
++#: g10/gpg.c:559
  #, fuzzy
  msgid "|N|set compress level to N (0 disables)"
  msgstr "|N|määra pakkimise tase N (0 blokeerib)"
  
- #: g10/gpg.c:546
++#: g10/gpg.c:566
  msgid "use canonical text mode"
  msgstr "kasuta kanoonilist tekstimoodi"
  
- #: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
++#: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
  #, fuzzy
  msgid "|FILE|write output to FILE"
  msgstr "|FAIL|lae laiendusmoodul FAIL"
  
- #: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
++#: g10/gpg.c:598 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
  msgid "do not make any changes"
  msgstr "ära tee mingeid muutusi"
  
- #: g10/gpg.c:579
++#: g10/gpg.c:599
  msgid "prompt before overwriting"
  msgstr "küsi enne ülekirjutamist"
  
- #: g10/gpg.c:628
++#: g10/gpg.c:648
  msgid "use strict OpenPGP behavior"
  msgstr ""
  
- #: g10/gpg.c:654 sm/gpgsm.c:355
++#: g10/gpg.c:674 sm/gpgsm.c:357
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2602,7 -2036,16 +2608,17 @@@ msgstr "
  "@\n"
  "(Kõikide käskude ja võtmete täieliku kirjelduse leiate manualist)\n"
  
- #: g10/gpg.c:657 sm/gpgsm.c:358
++#: g10/gpg.c:677
+ #, fuzzy
+ #| msgid ""
+ #| "@\n"
+ #| "Examples:\n"
+ #| "\n"
+ #| " -se -r Bob [file]          sign and encrypt for user Bob\n"
+ #| " --clear-sign [file]         make a clear text signature\n"
+ #| " --detach-sign [file]       make a detached signature\n"
+ #| " --list-keys [names]        show keys\n"
+ #| " --fingerprint [names]      show fingerprints\n"
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2622,13 -2065,11 +2638,13 @@@ msgstr "
  " --list-keys [nimed]        näita võtmeid\n"
  " --fingerprint [nimed]      näita sõrmejälgi\n"
  
- #: g10/gpg.c:1026
++#: g10/gpg.c:1047
  #, 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:1029
++#: g10/gpg.c:1050
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg [options] [files]\n"
@@@ -2643,7 -2084,6 +2659,7 @@@ msgstr "
  "allkirjasta, kontrolli, krüpti ja dekrüpti\n"
  "vaikimisi operatsioon sõltub sisendandmetest\n"
  
- #: g10/gpg.c:1040 sm/gpgsm.c:588
++#: g10/gpg.c:1061 sm/gpgsm.c:580
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2651,605 -2091,427 +2667,542 @@@ msgstr "
  "\n"
  "Toetatud algoritmid:\n"
  
- #: g10/gpg.c:1043
++#: g10/gpg.c:1064
  msgid "Pubkey: "
  msgstr "Avalik võti: "
  
- #: g10/gpg.c:1050 g10/keyedit.c:3402
++#: g10/gpg.c:1071 g10/keyedit.c:3483
  msgid "Cipher: "
  msgstr "Šiffer: "
  
- #: g10/gpg.c:1057
++#: g10/gpg.c:1078
  msgid "Hash: "
  msgstr "Räsi: "
  
- #: g10/gpg.c:1064 g10/keyedit.c:3451
++#: g10/gpg.c:1085 g10/keyedit.c:3532
  msgid "Compression: "
  msgstr "Pakkimine: "
  
- #: g10/gpg.c:1133 sm/gpgsm.c:662
++#: g10/gpg.c:1154 sm/gpgsm.c:654
  #, fuzzy, c-format
  msgid "usage: %s [options] %s\n"
  msgstr "kasuta: gpg [võtmed] "
  
- #: g10/gpg.c:1321 sm/gpgsm.c:751
++#: g10/gpg.c:1342 sm/gpgsm.c:743
  msgid "conflicting commands\n"
  msgstr "vastuolulised käsud\n"
  
- #: g10/gpg.c:1339
++#: g10/gpg.c:1360
  #, fuzzy, c-format
  msgid "no = sign found in group definition '%s'\n"
  msgstr "grupi definitsioonis \"%s\" puudub sümbol =\n"
  
- #: g10/gpg.c:1537
++#: g10/gpg.c:1558
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
  
- #: g10/gpg.c:1540
++#: g10/gpg.c:1561
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
  msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
  
- #: g10/gpg.c:1543
++#: g10/gpg.c:1564
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on extension '%s'\n"
  msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
  
- #: g10/gpg.c:1549
++#: g10/gpg.c:1570
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
  msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
  
- #: g10/gpg.c:1552
++#: g10/gpg.c:1573
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
  msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
  
- #: g10/gpg.c:1555
++#: g10/gpg.c:1576
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on extension '%s'\n"
  msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
  
- #: g10/gpg.c:1561
++#: g10/gpg.c:1582
  #, fuzzy, c-format
  msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
  msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
  
- #: g10/gpg.c:1564
++#: g10/gpg.c:1585
  #, 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:1567
++#: g10/gpg.c:1588
  #, fuzzy, c-format
  msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
  msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
  
- #: g10/gpg.c:1573
++#: g10/gpg.c:1594
  #, fuzzy, c-format
  msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
  msgstr "Hoiatus: ebaturvalised kataloogi õigused %s \"%s\"\n"
  
- #: g10/gpg.c:1576
++#: g10/gpg.c:1597
  #, 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:1579
++#: g10/gpg.c:1600
  #, fuzzy, c-format
  msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
  msgstr "Hoiatus: ebaturvalised kataloogi õigused %s \"%s\"\n"
  
- #: g10/gpg.c:1786
++#: g10/gpg.c:1816
  #, fuzzy, c-format
  msgid "unknown configuration item '%s'\n"
  msgstr "tundmatu seade \"%s\"\n"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1925
  msgid "display photo IDs during key listings"
  msgstr ""
  
- #: g10/gpg.c:1895
++#: g10/gpg.c:1927
  #, fuzzy
  msgid "show key usage information during key listings"
  msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1929
  msgid "show policy URLs during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1931
  #, fuzzy
  msgid "show all notations during signature listings"
  msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1933
  msgid "show IETF standard notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1937
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1939
  #, fuzzy
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "antud allkirja poliisi URL on vigane\n"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1941
  msgid "show user ID validity during key listings"
  msgstr ""
  
- #: g10/gpg.c:1911
++#: g10/gpg.c:1943
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  
- #: g10/gpg.c:1913
++#: g10/gpg.c:1945
  msgid "show revoked and expired subkeys in key listings"
  msgstr ""
  
- #: g10/gpg.c:1915
++#: g10/gpg.c:1947
  #, fuzzy
  msgid "show the keyring name in key listings"
  msgstr "näita millisesse võtmehoidlasse näidatud võti kuulub"
  
- #: g10/gpg.c:1917
++#: g10/gpg.c:1949
  #, fuzzy
  msgid "show expiration dates during signature listings"
  msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
  
- #: g10/gpg.c:2019 g10/gpg.c:2056
++#: g10/gpg.c:2051 g10/gpg.c:2088
  #, fuzzy, c-format
  msgid "valid values for option '%s':\n"
  msgstr "vigased impordi võtmed\n"
  
- #: g10/gpg.c:2030
++#: g10/gpg.c:2062
  #, fuzzy, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "tundmatu vaikimisi saaja `%s'\n"
  
- #: g10/gpg.c:2032 g10/gpg.c:2068
++#: g10/gpg.c:2064 g10/gpg.c:2100
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2066
++#: g10/gpg.c:2098 g10/keygen.c:167
  #, fuzzy, c-format
  msgid "invalid value for option '%s'\n"
  msgstr "vigased impordi võtmed\n"
  
- #: g10/gpg.c:2203
++#: g10/gpg.c:2235
  #, fuzzy, c-format
  #| msgid "NOTE: old default options file `%s' ignored\n"
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "MÄRKUS: ignoreerin vana vaikimisi võtmete faili `%s'\n"
  
- #: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
++#: g10/gpg.c:2839 g10/gpg.c:3610 g10/gpg.c:3622
  #, 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:2978 g10/gpg.c:2990
++#: g10/gpg.c:3011 g10/gpg.c:3023
  #, fuzzy, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "%s ei ole lubatud kooditabel\n"
  
- #: g10/gpg.c:3012
++#: g10/gpg.c:3045
  #, fuzzy, c-format
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "Selline e-posti aadress ei ole lubatud\n"
  
- #: g10/gpg.c:3044 sm/gpgsm.c:1166
++#: g10/gpg.c:3077 sm/gpgsm.c:1158
  #, fuzzy, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "vigane räsialgoritm `%s'\n"
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3130
  #, fuzzy, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "%s ei ole lubatud kooditabel\n"
  
- #: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
++#: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
  #, fuzzy
  msgid "could not parse keyserver URL\n"
  msgstr "ei saa parsida võtmeserveri URI\n"
  
- #: g10/gpg.c:3137
++#: g10/gpg.c:3170
  #, fuzzy, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: vigased ekspordi võtmed\n"
  
- #: g10/gpg.c:3140
++#: g10/gpg.c:3173
  #, fuzzy
  msgid "invalid keyserver options\n"
  msgstr "vigased ekspordi võtmed\n"
  
- #: g10/gpg.c:3147
++#: g10/gpg.c:3180
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: vigased impordi võtmed\n"
  
- #: g10/gpg.c:3150
++#: g10/gpg.c:3183
  msgid "invalid import options\n"
  msgstr "vigased impordi võtmed\n"
  
- #: g10/gpg.c:3156 g10/gpg.c:3171
++#: g10/gpg.c:3189 g10/gpg.c:3204
  #, fuzzy, c-format
  msgid "invalid filter option: %s\n"
  msgstr "vigased impordi võtmed\n"
  
- #: g10/gpg.c:3162
++#: g10/gpg.c:3195
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: vigased ekspordi võtmed\n"
  
- #: g10/gpg.c:3165
++#: g10/gpg.c:3198
  msgid "invalid export options\n"
  msgstr "vigased ekspordi võtmed\n"
  
- #: g10/gpg.c:3177
++#: g10/gpg.c:3210
  #, fuzzy, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: vigased impordi võtmed\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3213
  #, fuzzy
  msgid "invalid list options\n"
  msgstr "vigased impordi võtmed\n"
  
- #: g10/gpg.c:3188
++#: g10/gpg.c:3221
  msgid "display photo IDs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3190
++#: g10/gpg.c:3223
  msgid "show policy URLs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3192
++#: g10/gpg.c:3225
  #, fuzzy
  msgid "show all notations during signature verification"
  msgstr "%s ei ole lubatud kooditabel\n"
  
- #: g10/gpg.c:3194
++#: g10/gpg.c:3227
  msgid "show IETF standard notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3231
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3200
++#: g10/gpg.c:3233
  #, fuzzy
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "antud allkirja poliisi URL on vigane\n"
  
- #: g10/gpg.c:3202
++#: g10/gpg.c:3235
  #, fuzzy
  msgid "show user ID validity during signature verification"
  msgstr "%s ei ole lubatud kooditabel\n"
  
- #: g10/gpg.c:3204
++#: g10/gpg.c:3237
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  
- #: g10/gpg.c:3206
++#: g10/gpg.c:3239
  #, fuzzy
  msgid "show only the primary user ID in signature verification"
  msgstr "%s ei ole lubatud kooditabel\n"
  
- #: g10/gpg.c:3208
++#: g10/gpg.c:3241
  msgid "validate signatures with PKA data"
  msgstr ""
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3243
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr ""
  
- #: g10/gpg.c:3217
++#: g10/gpg.c:3250
  #, fuzzy, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: vigased ekspordi võtmed\n"
  
- #: g10/gpg.c:3220
++#: g10/gpg.c:3253
  #, fuzzy
  msgid "invalid verify options\n"
  msgstr "vigased ekspordi võtmed\n"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3260
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "exec-path väärtuseks ei õnnestu seada %s\n"
  
- #: g10/gpg.c:3417
++#: g10/gpg.c:3452
  #, fuzzy, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: vigased ekspordi võtmed\n"
  
- #: g10/gpg.c:3420
++#: g10/gpg.c:3455
  msgid "invalid auto-key-locate list\n"
  msgstr ""
  
- #: g10/gpg.c:3553 sm/gpgsm.c:1507
++#: g10/gpg.c:3592 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
  msgstr "HOIATUS: programm võib salvestada oma mälupildi!\n"
  
- #: g10/gpg.c:3564
++#: g10/gpg.c:3603
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "HOIATUS: %s määrab üle %s\n"
  
- #: g10/gpg.c:3573
++#: g10/gpg.c:3612
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s ja %s ei ole koos lubatud!\n"
  
- #: g10/gpg.c:3576
++#: g10/gpg.c:3615
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s ja %s ei oma koos mõtet!\n"
  
- #: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
++#: g10/gpg.c:3630 sm/gpgsm.c:1518 dirmngr/dirmngr.c:951
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3651
  #, 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:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
++#: g10/gpg.c:3686 g10/gpg.c:3710 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "valitud šifri algoritm ei ole lubatud\n"
  
- #: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
++#: g10/gpg.c:3692 g10/gpg.c:3716 sm/gpgsm.c:1591 sm/gpgsm.c:1597
  msgid "selected digest algorithm is invalid\n"
  msgstr "valitud lühendi algoritm ei ole lubatud\n"
  
- #: g10/gpg.c:3659
++#: g10/gpg.c:3698
  #, fuzzy
  msgid "selected compression algorithm is invalid\n"
  msgstr "valitud šifri algoritm ei ole lubatud\n"
  
- #: g10/gpg.c:3665
++#: g10/gpg.c:3704
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "valitud sertifikaadi lühendi algoritm ei ole lubatud\n"
  
- #: g10/gpg.c:3680
++#: g10/gpg.c:3719
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed peab olema suurem, kui 0\n"
  
- #: g10/gpg.c:3682
++#: g10/gpg.c:3721
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed peab olema suurem, kui 1\n"
  
- #: g10/gpg.c:3684
++#: g10/gpg.c:3723
  #, fuzzy
  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:3686
++#: g10/gpg.c:3725
  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:3688
++#: g10/gpg.c:3727
  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:3691
++#: g10/gpg.c:3730
  #, fuzzy
  #| 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:3695
++#: g10/gpg.c:3734
  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:3702
++#: g10/gpg.c:3741
  msgid "invalid default preferences\n"
  msgstr "vigased vaikimisi eelistused\n"
  
- #: g10/gpg.c:3706
++#: g10/gpg.c:3745
  msgid "invalid personal cipher preferences\n"
  msgstr "vigased isikliku šifri eelistused\n"
  
- #: g10/gpg.c:3710
++#: g10/gpg.c:3749
  msgid "invalid personal digest preferences\n"
  msgstr "vigased isikliku lühendi eelistused\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3753
  msgid "invalid personal compress preferences\n"
  msgstr "vigased isikliku pakkimise eelistused\n"
  
- #: g10/gpg.c:3750
++#: g10/gpg.c:3789
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s ei tööta veel koos %s-ga\n"
  
- #: g10/gpg.c:3797
++#: g10/gpg.c:3836
  #, fuzzy, c-format
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr "šifri algoritm \"%s\" ei ole moodis %s lubatud\n"
  
- #: g10/gpg.c:3802
++#: g10/gpg.c:3841
  #, fuzzy, c-format
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr "sõnumilühendi algoritm \"%s\" ei ole moodis %s lubatud\n"
  
- #: g10/gpg.c:3807
++#: g10/gpg.c:3846
  #, fuzzy, c-format
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr "pakkimise algoritm \"%s\" ei ole moodis %s lubatud\n"
  
- #: g10/gpg.c:3906
++#: g10/gpg.c:3945
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:3957
  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:3975
- msgid "--store [filename]"
- msgstr "--store [failinimi]"
- 
- #: g10/gpg.c:3985
- msgid "--symmetric [filename]"
- msgstr "--symmetric [failinimi]"
- 
- #: g10/gpg.c:3989
++#: g10/gpg.c:4028
  #, fuzzy, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "lahtikrüpteerimine ebaõnnestus: %s\n"
  
- #: g10/gpg.c:4000
- msgid "--encrypt [filename]"
- msgstr "--encrypt [failinimi]"
- 
- #: g10/gpg.c:4016
- #, fuzzy
- msgid "--symmetric --encrypt [filename]"
- msgstr "--sign --encrypt [failinimi]"
- 
- #: g10/gpg.c:4018
++#: g10/gpg.c:4057
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4021
++#: g10/gpg.c:4060
  #, fuzzy, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr "%s ei ole moodis %s lubatud.\n"
  
- #: g10/gpg.c:4042
- msgid "--sign [filename]"
- msgstr "--sign [failinimi]"
- 
- #: g10/gpg.c:4058
- msgid "--sign --encrypt [filename]"
- msgstr "--sign --encrypt [failinimi]"
- 
- #: g10/gpg.c:4076
- #, fuzzy
- msgid "--symmetric --sign --encrypt [filename]"
- msgstr "--sign --encrypt [failinimi]"
- 
- #: g10/gpg.c:4078
++#: g10/gpg.c:4117
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4081
++#: g10/gpg.c:4120
  #, fuzzy, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr "%s ei ole moodis %s lubatud.\n"
  
- #: g10/gpg.c:4105
- msgid "--sign --symmetric [filename]"
- msgstr "--sign --symmetric [failinimi]"
- 
- #: g10/gpg.c:4117
- msgid "--clearsign [filename]"
- msgstr "--clearsign [failinimi]"
- 
- #: g10/gpg.c:4147
- msgid "--decrypt [filename]"
- msgstr "--decrypt [failinimi]"
- 
- #: g10/gpg.c:4174
- msgid "--sign-key user-id"
- msgstr "--sign-key kasutaja-id"
- 
- #: g10/gpg.c:4178
- msgid "--lsign-key user-id"
- msgstr "--lsign-key kasutaja-id"
- 
- #: g10/gpg.c:4199
- msgid "--edit-key user-id [commands]"
- msgstr "--edit-key kasutaja-id [käsud]"
- 
- #: g10/gpg.c:4215
- #, fuzzy
- msgid "--passwd <user-id>"
- msgstr "--sign-key kasutaja-id"
- 
- #: g10/gpg.c:4411 g10/keyserver.c:1837
++#: g10/gpg.c:4462 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "võtmeserverile saatmine ebaõnnestus: %s\n"
  
- #: g10/gpg.c:4416
++#: g10/gpg.c:4467
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "võtmeserverilt lugemine ebaõnnestus: %s\n"
  
- #: g10/gpg.c:4422
++#: g10/gpg.c:4473
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "võtme eksport ebaõnnestus: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4486
  #, 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:4447
++#: g10/gpg.c:4498
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "võtmeserveri otsing ebaõnnestus: %s\n"
  
- #: g10/gpg.c:4460
++#: g10/gpg.c:4511
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "võtmeserveri uuendamine ebaõnnestus: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4578
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "lahtipakendamine ebaõnnestus: %s\n"
  
- #: g10/gpg.c:4538
++#: g10/gpg.c:4589
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "pakendamine ebaõnnestus: %s\n"
  
- #: g10/gpg.c:4630
++#: g10/gpg.c:4681
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
  msgstr "vigane räsialgoritm `%s'\n"
  
- #: g10/gpg.c:4776 g10/tofu.c:2002
++#: g10/gpg.c:4827 g10/tofu.c:2151
  #, fuzzy, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: g10/gpg.c:4788
++#: g10/gpg.c:4839
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4835
- msgid "[filename]"
- msgstr "[failinimi]"
- 
- #: g10/gpg.c:4841
++#: g10/gpg.c:4894
  msgid "Go ahead and type your message ...\n"
  msgstr "Kirjutage nüüd oma teade ...\n"
  
- #: g10/gpg.c:5179
++#: g10/gpg.c:5232
  msgid "the given certification policy URL is invalid\n"
  msgstr "antud sertifikaadi poliisi URL on vigane\n"
  
- #: g10/gpg.c:5181
++#: g10/gpg.c:5234
  msgid "the given signature policy URL is invalid\n"
  msgstr "antud allkirja poliisi URL on vigane\n"
  
- #: g10/gpg.c:5214
++#: g10/gpg.c:5267
  #, fuzzy
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "antud allkirja poliisi URL on vigane\n"
@@@ -3263,7 -2523,6 +3216,7 @@@ msgstr "võta võtmed sellest võtmehoi
  msgid "make timestamp conflicts only a warning"
  msgstr "teata ajatemplite konfliktist ainult hoiatusega"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:345
++#: g10/gpgv.c:82 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
  
@@@ -3294,329 -2548,263 +3247,329 @@@ msgstr "Abiinfo puudub
  msgid "No help available for '%s'"
  msgstr "`%s' kohta abiinfo puudub"
  
- #: g10/import.c:151
++#: g10/import.c:152
  msgid "import signatures that are marked as local-only"
  msgstr ""
  
- #: g10/import.c:154
++#: g10/import.c:155
  msgid "repair damage from the pks keyserver during import"
  msgstr ""
  
- #: g10/import.c:157
++#: g10/import.c:158
  #, fuzzy
  msgid "do not clear the ownertrust values during import"
  msgstr "uuenda usalduse andmebaasi"
  
- #: g10/import.c:160
++#: g10/import.c:161
  #, fuzzy
  msgid "do not update the trustdb after import"
  msgstr "uuenda usalduse andmebaasi"
  
- #: g10/import.c:163
++#: g10/import.c:164
  #, fuzzy
  msgid "show key during import"
  msgstr "näita sõrmejälge"
  
- #: g10/import.c:166
++#: g10/import.c:167
  msgid "only accept updates to existing keys"
  msgstr ""
  
- #: g10/import.c:169
++#: g10/import.c:170
  #, fuzzy
  msgid "remove unusable parts from key after import"
  msgstr "mittekasutatav salajane võti"
  
- #: g10/import.c:172
++#: g10/import.c:173
  msgid "remove as much as possible from key after import"
  msgstr ""
  
- #: g10/import.c:175
++#: g10/import.c:176
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:326 g10/import.c:568
++#: g10/import.c:327 g10/import.c:569
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "jätan bloki tüübiga %d vahele\n"
  
- #: g10/import.c:585
++#: g10/import.c:586
  #, fuzzy, c-format
  msgid "%lu keys processed so far\n"
  msgstr "%lu võtit on seni töödeldud\n"
  
- #: g10/import.c:655
++#: g10/import.c:656
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "Töödeldud kokku: %lu\n"
  
- #: g10/import.c:658
++#: g10/import.c:659
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr " vahele jäetud uusi võtmeid: %lu\n"
  
- #: g10/import.c:660
++#: g10/import.c:661
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr " vahele jäetud uusi võtmeid: %lu\n"
  
- #: g10/import.c:663
++#: g10/import.c:664
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "    puudub kasutaja ID: %lu\n"
  
- #: g10/import.c:666 sm/import.c:130
++#: g10/import.c:667 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "            imporditud: %lu"
  
- #: g10/import.c:670 sm/import.c:134
++#: g10/import.c:671 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "              muutmata: %lu\n"
  
- #: g10/import.c:672
++#: g10/import.c:673
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "       uusi kasutajaid: %lu\n"
  
- #: g10/import.c:674
++#: g10/import.c:675
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "      uusi alamvõtmeid: %lu\n"
  
- #: g10/import.c:676
++#: g10/import.c:677
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "         uusi allkirju: %lu\n"
  
- #: g10/import.c:678
++#: g10/import.c:679
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "      uusi tühistamisi: %lu\n"
  
- #: g10/import.c:680 sm/import.c:136
++#: g10/import.c:681 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr " loetud salajasi võtmeid: %lu\n"
  
- #: g10/import.c:682 sm/import.c:138
++#: g10/import.c:683 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr " salajasi võtmeid imporditud: %lu\n"
  
- #: g10/import.c:684 sm/import.c:140
++#: g10/import.c:685 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr " muutmata salajasi võtmeid: %lu\n"
  
- #: g10/import.c:686 sm/import.c:142
++#: g10/import.c:687 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "       pole imporditud: %lu\n"
  
- #: g10/import.c:688
++#: g10/import.c:689
  #, fuzzy, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "         uusi allkirju: %lu\n"
  
- #: g10/import.c:690
++#: g10/import.c:691
  #, fuzzy, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr " loetud salajasi võtmeid: %lu\n"
  
- #: g10/import.c:1034
++#: g10/import.c:1035
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
  "algorithms on these user IDs:\n"
  msgstr ""
  
- #: g10/import.c:1076
++#: g10/import.c:1077
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1091
++#: g10/import.c:1092
  #, fuzzy, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
  
- #: g10/import.c:1103
++#: g10/import.c:1104
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1116
++#: g10/import.c:1117
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr ""
  
- #: g10/import.c:1118
++#: g10/import.c:1119
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  
- #: g10/import.c:1143
++#: g10/import.c:1144
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  
- #: g10/import.c:1379 g10/import.c:2167
++#: g10/import.c:1380 g10/import.c:2168
  #, fuzzy, c-format
  msgid "key %s: no user ID\n"
  msgstr "võti %08lX: kasutaja ID puudub\n"
  
- #: g10/import.c:1385
++#: g10/import.c:1386
  #, fuzzy, c-format
  msgid "key %s: %s\n"
  msgstr "`%s' jätsin vahele: %s\n"
  
- #: g10/import.c:1386 g10/import.c:2141
++#: g10/import.c:1387 g10/import.c:2142
  msgid "rejected by import screener"
  msgstr ""
  
- #: g10/import.c:1416
++#: g10/import.c:1417
  #, fuzzy, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "võti %08lX: HKP alamvõtme rike parandatud\n"
  
- #: g10/import.c:1434
++#: g10/import.c:1435
  #, fuzzy, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr ""
  "võti %08lX: aktsepteerisin iseenda poolt allakirjutamata kasutaja ID '%s'\n"
  
- #: g10/import.c:1444 g10/import.c:1475
++#: g10/import.c:1445 g10/import.c:1476
  #, fuzzy, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "võti %08lX: puudub kehtiv kasutaja ID\n"
  
- #: g10/import.c:1446
++#: g10/import.c:1447
  msgid "this may be caused by a missing self-signature\n"
  msgstr "see võib olla põhjustatud puuduvast iseenda allkirjast\n"
  
- #: g10/import.c:1516 g10/import.c:2318
++#: g10/import.c:1517 g10/import.c:2319
  #, fuzzy, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "võti %08lX: avalikku võtit ei leitud: %s\n"
  
- #: g10/import.c:1522
++#: g10/import.c:1523
  #, fuzzy, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "võti %08lX: uus võti - jätsin vahele\n"
  
- #: g10/import.c:1537
++#: g10/import.c:1538
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "ei leia kirjutatavat võtmehoidlat: %s\n"
  
- #: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
++#: g10/import.c:1547 g10/import.c:1648 g10/import.c:2385
  #, fuzzy, c-format
  #| msgid "error writing keyring `%s': %s\n"
  msgid "error writing keyring '%s': %s\n"
  msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
  
- #: g10/import.c:1566
++#: g10/import.c:1567
  #, fuzzy, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "võti %08lX: avalik võti \"%s\" on imporditud\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1591
  #, fuzzy, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "võti %08lX: ei sobi meie koopiaga\n"
  
- #: g10/import.c:1606 g10/import.c:2342
++#: g10/import.c:1607 g10/import.c:2343
  #, fuzzy, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "võti %08lX: ei leia algset võtmeblokki: %s\n"
  
- #: g10/import.c:1614 g10/import.c:2349
++#: g10/import.c:1615 g10/import.c:2350
  #, fuzzy, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "võti %08lX: ei õnnestu lugeda algset võtmeblokki: %s\n"
  
- #: g10/import.c:1657
++#: g10/import.c:1658
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "võti %08lX: \"%s\" 1 uus kasutaja ID\n"
  
- #: g10/import.c:1660
++#: g10/import.c:1661
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "võti %08lX: \"%s\" %d uut kasutaja IDd\n"
  
- #: g10/import.c:1663
++#: g10/import.c:1664
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "võti %08lX: \"%s\" 1 uus allkiri\n"
  
- #: g10/import.c:1666
++#: g10/import.c:1667
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "võti %08lX: \"%s\" %d uut allkirja\n"
  
- #: g10/import.c:1669
++#: g10/import.c:1670
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "võti %08lX: \"%s\" 1 uus alamvõti\n"
  
- #: g10/import.c:1672
++#: g10/import.c:1673
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "võti %08lX: \"%s\" %d uut alamvõtit\n"
  
- #: g10/import.c:1675
++#: g10/import.c:1676
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "võti %08lX: \"%s\" %d uut allkirja\n"
  
- #: g10/import.c:1678
++#: g10/import.c:1679
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "võti %08lX: \"%s\" %d uut allkirja\n"
  
- #: g10/import.c:1681
++#: g10/import.c:1682
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "võti %08lX: \"%s\" %d uut kasutaja IDd\n"
  
- #: g10/import.c:1684
++#: g10/import.c:1685
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "võti %08lX: \"%s\" %d uut kasutaja IDd\n"
  
- #: g10/import.c:1707
++#: g10/import.c:1708
  #, fuzzy, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "võti %08lX: \"%s\" ei muudetud\n"
  
- #: g10/import.c:2019 g10/import.c:2264
++#: g10/import.c:2020 g10/import.c:2265
  #, fuzzy, c-format
  msgid "key %s: secret key imported\n"
  msgstr "võti %08lX: salajane võti on imporditud\n"
  
- #: g10/import.c:2027
++#: g10/import.c:2028
  #, fuzzy, c-format
  #| msgid "skipped: secret key already present\n"
  msgid "key %s: secret key already exists\n"
  msgstr "jätsin vahele: avalik võti on juba olemas\n"
  
- #: g10/import.c:2035
++#: g10/import.c:2036
  #, fuzzy, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "viga teate saatmisel serverile `%s': %s\n"
  
- #: g10/import.c:2140
++#: g10/import.c:2141
  #, fuzzy, c-format
  msgid "secret key %s: %s\n"
  msgstr "salajast võtit `%s' ei leitud: %s\n"
  
- #: g10/import.c:2160 g10/import.c:2195
++#: g10/import.c:2161 g10/import.c:2196
  #, fuzzy
  msgid "importing secret keys not allowed\n"
  msgstr "kirjutan salajase võtme faili `%s'\n"
  
- #: g10/import.c:2184
++#: g10/import.c:2185
  #, fuzzy, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr "võti %08lX: salajane võti vigase šifriga %d - jätsin vahele\n"
@@@ -3631,140 -2819,113 +3584,140 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2256
++#: g10/import.c:2257
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2311
++#: g10/import.c:2312
  #, fuzzy, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
  "võti %08lX: avalik võti puudub - tühistamise sertifikaati ei saa rakendada\n"
  
- #: g10/import.c:2360
++#: g10/import.c:2361
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "võti %08lX: vigane tühistamise sertifikaat: %s - lükkasin tagasi\n"
  
- #: g10/import.c:2393
++#: g10/import.c:2394
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "võti %08lX: \"%s\" tühistamise sertifikaat imporditud\n"
  
- #: g10/import.c:2469
++#: g10/import.c:2470
  #, fuzzy, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "võti %08lX: allkirjal puudub kasutaja ID\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2487
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr "võti %08lX: mittetoetatud avaliku võtme algoritm kasutajaga \"%s\"\n"
  
- #: g10/import.c:2488
++#: g10/import.c:2489
  #, fuzzy, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "võti %08lX: kasutajal \"%s\" on vigane iseenda allkiri\n"
  
- #: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
++#: g10/import.c:2506 g10/import.c:2532 g10/import.c:2583
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "võti %08lX: mittetoetatud avaliku võtme algoritm\n"
  
- #: g10/import.c:2506
++#: g10/import.c:2507
  #, fuzzy, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "võti %08lX: lisatud vahetu võtme allkiri\n"
  
- #: g10/import.c:2520
++#: g10/import.c:2521
  #, fuzzy, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "võti %08lX: võtmeseosel puudub alamvõti\n"
  
- #: g10/import.c:2533
++#: g10/import.c:2534
  #, fuzzy, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "võti %08lX: vigane alamvõtme seos\n"
  
- #: g10/import.c:2549
++#: g10/import.c:2550
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "võti %08lX: vigane mitme alamvõtme seos\n"
  
- #: g10/import.c:2571
++#: g10/import.c:2572
  #, fuzzy, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "võti %08lX: võtme tühistamiseks puudub alamvõti\n"
  
- #: g10/import.c:2584
++#: g10/import.c:2585
  #, fuzzy, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "võti %08lX: vigane alamvõtme tühistamine\n"
  
- #: g10/import.c:2599
++#: g10/import.c:2600
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "võti %08lX: eemaldasin mitme alamvõtme tühistamise\n"
  
- #: g10/import.c:2641
++#: g10/import.c:2642
  #, fuzzy, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "võti %08lX: jätsin vahele kasutaja ID '"
  
- #: g10/import.c:2665
++#: g10/import.c:2666
  #, fuzzy, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "võti %08lX: jätsin alamvõtme vahele\n"
  
- #: g10/import.c:2694
++#: g10/import.c:2695
  #, fuzzy, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "võti %08lX: mitte eksporditav allkiri (klass %02x) - jätan vahele\n"
  
- #: g10/import.c:2705
++#: g10/import.c:2706
  #, fuzzy, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "võti %08lX: tühistamise sertifikaat on vales kohas - jätan vahele\n"
  
- #: g10/import.c:2723
++#: g10/import.c:2724
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "võti %08lX: vigane tühistamise sertifikaat: %s - jätan vahele\n"
  
- #: g10/import.c:2737
++#: g10/import.c:2738
  #, fuzzy, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "võti %08lX: alamvõtme allkiri on vales kohas - jätan vahele\n"
  
- #: g10/import.c:2745
++#: g10/import.c:2746
  #, fuzzy, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "võti %08lX: ootamatu allkirja klass (0x%02x) - jätan vahele\n"
  
- #: g10/import.c:2887
++#: g10/import.c:2888
  #, fuzzy, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "võti %08lX: tuvastasin dubleeritud kasutaja ID - mestisin\n"
  
- #: g10/import.c:2951
++#: g10/import.c:2952
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr ""
  "HOIATUS: võti %08lX võib olla tühistatud: laen tühistamise võtit %08lX\n"
  
- #: g10/import.c:2967
++#: g10/import.c:2968
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr ""
  "HOIATUS: võti %08lX võib olla tühistatud: tühistamise võtit %08lX pole.\n"
  
- #: g10/import.c:3031
++#: g10/import.c:3032
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "võti %08lX: \"%s\" tühistamise sertifikaat lisatud\n"
  
- #: g10/import.c:3069
++#: g10/import.c:3070
  #, fuzzy, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "võti %08lX: lisatud vahetu võtme allkiri\n"
@@@ -3801,54 -2956,43 +3754,54 @@@ msgstr "viga `%s' loomisel: %s\n
  msgid "error opening key DB: %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
  
- #: g10/keydb.c:1782
++#: g10/keydb.c:1786
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "võtmehoidla vahemälu uuesti loomine ebaõnnestus: %s\n"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[revocation]"
  msgstr "[tühistamine]"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[self-signature]"
  msgstr "[iseenda allkiri]"
  
- #: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
++#: g10/keyedit.c:433 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: dirmngr/ldap-wrapper.c:694
  #, fuzzy, c-format
  msgid "error allocating memory: %s\n"
  msgstr "viga võtmehoidla `%s' loomisel: %s\n"
  
- #: g10/keyedit.c:629
++#: g10/keyedit.c:630
  #, fuzzy, c-format
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr "võti %08lX: mittetoetatud avaliku võtme algoritm\n"
  
- #: g10/keyedit.c:638
++#: g10/keyedit.c:639
  #, fuzzy, c-format
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
  
- #: g10/keyedit.c:800
++#: g10/keyedit.c:801
  #, fuzzy
  msgid " (reordered signatures follow)"
  msgstr "Korrektne allkiri kasutajalt \""
  
- #: g10/keyedit.c:913
++#: g10/keyedit.c:914
  #, fuzzy, c-format
  msgid "key %s:\n"
  msgstr "`%s' jätsin vahele: %s\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:917
  #, fuzzy, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
  msgstr[0] "Kasutaja ID \"%s\" on tühistatud."
  msgstr[1] "Kasutaja ID \"%s\" on tühistatud."
  
- #: g10/keyedit.c:919 g10/keylist.c:480
++#: g10/keyedit.c:920 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
@@@ -3856,7 -3000,6 +3809,7 @@@ msgid_plural "%d signatures not checke
  msgstr[0] "1 allkiri jäi testimata, kuna võti puudub\n"
  msgstr[1] "1 allkiri jäi testimata, kuna võti puudub\n"
  
- #: g10/keyedit.c:923 g10/keylist.c:476
++#: g10/keyedit.c:924 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
@@@ -3864,21 -3007,18 +3817,21 @@@ msgid_plural "%d bad signatures\n
  msgstr[0] "%d halba allkirja\n"
  msgstr[1] "%d halba allkirja\n"
  
- #: g10/keyedit.c:927
++#: g10/keyedit.c:928
  #, fuzzy, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
  msgstr[0] "Korrektne allkiri kasutajalt \""
  msgstr[1] "Korrektne allkiri kasutajalt \""
  
- #: g10/keyedit.c:932
++#: g10/keyedit.c:933
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:992 g10/pkclist.c:274
++#: g10/keyedit.c:993 g10/pkclist.c:274
  #, fuzzy
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
@@@ -3891,68 -3031,53 +3844,68 @@@ msgstr "
  "passe, kontrollige erinevatest allikatest näpujälgi...)?\n"
  "\n"
  
- #: g10/keyedit.c:996 g10/pkclist.c:286
++#: g10/keyedit.c:997 g10/pkclist.c:286
  #, fuzzy, c-format
  msgid "  %d = I trust marginally\n"
  msgstr " %d = Usaldan vähesel määral\n"
  
- #: g10/keyedit.c:997 g10/pkclist.c:288
++#: g10/keyedit.c:998 g10/pkclist.c:288
  #, fuzzy, c-format
  msgid "  %d = I trust fully\n"
  msgstr " %d = Usaldan täiesti\n"
  
- #: g10/keyedit.c:1015
++#: g10/keyedit.c:1016
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
  "trust signatures on your behalf.\n"
  msgstr ""
  
- #: g10/keyedit.c:1032
++#: g10/keyedit.c:1033
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  
- #: g10/keyedit.c:1160
++#: g10/keyedit.c:1161
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1168
++#: g10/keyedit.c:1169
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "Kasutaja ID \"%s\" on tühistatud."
  
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
- #: g10/keyedit.c:2246
++#: g10/keyedit.c:1178 g10/keyedit.c:1206 g10/keyedit.c:1233 g10/keyedit.c:1417
++#: g10/keyedit.c:2247
  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:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
- #: g10/keyedit.c:2251 g10/keyedit.c:3177
++#: g10/keyedit.c:1192 g10/keyedit.c:1220 g10/keyedit.c:1247 g10/keyedit.c:1423
++#: g10/keyedit.c:2252 g10/keyedit.c:3178
  msgid "  Unable to sign.\n"
  msgstr "  Ei saa allkirjastada.\n"
  
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1197
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "Kasutaja ID \"%s\" on aegunud."
  
- #: g10/keyedit.c:1224
++#: g10/keyedit.c:1225
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "Kasutaja ID \"%s\" ei ole ise allkirjastatud."
  
- #: g10/keyedit.c:1253
++#: g10/keyedit.c:1254
  #, fuzzy, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "Kasutaja ID \"%s\" ei ole ise allkirjastatud."
  
- #: g10/keyedit.c:1255
++#: g10/keyedit.c:1256
  #, fuzzy
  msgid "Sign it? (y/N) "
  msgstr "Allkirjastan tõesti? "
  
- #: g10/keyedit.c:1282
++#: g10/keyedit.c:1283
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -3961,11 -3086,9 +3914,11 @@@ msgstr "
  "Iseenda allkiri \"%s\"\n"
  "on PGP 2.x stiilis allkiri.\n"
  
- #: g10/keyedit.c:1291
++#: g10/keyedit.c:1292
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr "Kas te soovite seda edutada OpenPGP iseenda allkirjaks? (j/E) "
  
- #: g10/keyedit.c:1304
++#: g10/keyedit.c:1305
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3974,11 -3097,9 +3927,11 @@@ msgstr "
  "Teie praegune allkiri \"%s\"\n"
  "on aegunud.\n"
  
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:1310
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr "Kas soovite luua uut allkirja et asendada vana aegunud? (j/E) "
  
- #: g10/keyedit.c:1330
++#: g10/keyedit.c:1331
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3987,44 -3108,35 +3940,44 @@@ msgstr "
  "Teie praegune allkiri \"%s\"\n"
  "on lokaalne allkiri.\n"
  
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:1336
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr ""
  "Kas te soovite seda edutada täielikuks eksporditavaks allkirjaks? (j/E) "
  
- #: g10/keyedit.c:1355
++#: g10/keyedit.c:1356
  #, fuzzy, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "\"%s\" on juba lokaalselt allkirjastatud võtmega %08lX\n"
  
- #: g10/keyedit.c:1359
++#: g10/keyedit.c:1360
  #, fuzzy, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "\"%s\" on juba allkirjastatud võtmega %08lX\n"
  
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:1365
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/E) "
  
- #: g10/keyedit.c:1386
++#: g10/keyedit.c:1387
  #, fuzzy, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "Võtmega %08lX pole midagi allkirjastada\n"
  
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1411
  msgid "This key has expired!"
  msgstr "See võti on aegunud!"
  
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1429
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "See võti aegub %s.\n"
  
- #: g10/keyedit.c:1434
++#: g10/keyedit.c:1435
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr "Soovite, et teie allkiri aeguks samal ajal? (J/e) "
  
- #: g10/keyedit.c:1475
++#: g10/keyedit.c:1476
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -4034,32 -3146,26 +3987,32 @@@ msgstr "
  "kuulub ka tegelikult ülal mainitud isikule? Kui te ei tea, mida vastata,\n"
  "sisestage \"0\".\n"
  
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1481
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) Ma ei vasta.%s\n"
  
- #: g10/keyedit.c:1482
++#: g10/keyedit.c:1483
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) Ma ei ole üldse kontrollinud.%s\n"
  
- #: g10/keyedit.c:1484
++#: g10/keyedit.c:1485
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) Ma olen teinud pealiskaudset kontrolli.%s\n"
  
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:1488
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) Ma olen kontrollinud väga hoolikalt.%s\n"
  
- #: g10/keyedit.c:1494
++#: g10/keyedit.c:1495
  #, fuzzy
  msgid "Your selection? (enter '?' for more information): "
  msgstr "Teie valik? (lisainfo saamiseks vajutage '?'): "
  
- #: g10/keyedit.c:1521
++#: g10/keyedit.c:1522
  #, fuzzy, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -4068,265 -3174,211 +4021,265 @@@ msgstr "
  "Olete tõesti kindel, et soovite seda võtit oma\n"
  "võtmega allkirjastada: \""
  
- #: g10/keyedit.c:1529
++#: g10/keyedit.c:1530
  #, fuzzy
  msgid "This will be a self-signature.\n"
  msgstr ""
  "\n"
  "See saab olema iseenda allkiri.\n"
  
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:1535
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr ""
  "\n"
  "HOIATUS: allkirja ei märgita mitte-eksporditavaks.\n"
  
- #: g10/keyedit.c:1541
++#: g10/keyedit.c:1542
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr ""
  "\n"
  "HOIATUS: allkirja ei märgita kehtetuks mitte-tunnistatavaks.\n"
  
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1552
  #, fuzzy
  msgid "The signature will be marked as non-exportable.\n"
  msgstr ""
  "\n"
  "Allkiri märgitakse mitte-eksporditavaks.\n"
  
- #: g10/keyedit.c:1558
++#: g10/keyedit.c:1559
  #, fuzzy
  msgid "The signature will be marked as non-revocable.\n"
  msgstr ""
  "\n"
  "Allkiri märgitakse kehtetuks mitte-tunnistatavaks.\n"
  
- #: g10/keyedit.c:1565
++#: g10/keyedit.c:1566
  #, fuzzy
  msgid "I have not checked this key at all.\n"
  msgstr ""
  "\n"
  "Ma ei ole seda võtit üldse kontrollinud.\n"
  
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:1571
  #, fuzzy
  msgid "I have checked this key casually.\n"
  msgstr ""
  "\n"
  "Ma olen seda võtit kontrollinud ainult pealiskaudselt.\n"
  
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:1576
  #, fuzzy
  msgid "I have checked this key very carefully.\n"
  msgstr ""
  "\n"
  "Ma olen kontrollinud seda võtit väga hoolikalt.\n"
  
- #: g10/keyedit.c:1587
++#: g10/keyedit.c:1588
  #, fuzzy
  msgid "Really sign? (y/N) "
  msgstr "Allkirjastan tõesti? "
  
- #: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
- #: g10/keyedit.c:6463 g10/sign.c:323
++#: g10/keyedit.c:1639 g10/keyedit.c:6308 g10/keyedit.c:6391 g10/keyedit.c:6500
++#: g10/keyedit.c:6562 g10/sign.c:325
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "allkirjastamine ebaõnnestus: %s\n"
  
- #: g10/keyedit.c:1725
++#: g10/keyedit.c:1726
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  
- #: g10/keyedit.c:1755
++#: g10/keyedit.c:1756
  #, fuzzy, c-format
  #| msgid "error creating passphrase: %s\n"
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: g10/keyedit.c:1869
++#: g10/keyedit.c:1870
  msgid "save and quit"
  msgstr "salvesta ja välju"
  
- #: g10/keyedit.c:1872
++#: g10/keyedit.c:1873
  #, fuzzy
  msgid "show key fingerprint"
  msgstr "näita sõrmejälge"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1874
  #, fuzzy
  msgid "show the keygrip"
  msgstr "Allkirja noteerimine: "
  
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1875
  msgid "list key and user IDs"
  msgstr "näita võtit ja kasutaja IDd"
  
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1877
  msgid "select user ID N"
  msgstr "vali kasutaja ID N"
  
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1878
  #, fuzzy
  msgid "select subkey N"
  msgstr "vali kasutaja ID N"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1879
  #, fuzzy
  msgid "check signatures"
  msgstr "tühista allkirjad"
  
- #: g10/keyedit.c:1884
++#: g10/keyedit.c:1885
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr ""
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1890
  #, fuzzy
  msgid "sign selected user IDs locally"
  msgstr "allkirjasta võti lokaalselt"
  
- #: g10/keyedit.c:1890
++#: g10/keyedit.c:1891
  #, fuzzy
  msgid "sign selected user IDs with a trust signature"
  msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1893
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr ""
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1895
  msgid "add a user ID"
  msgstr "lisa kasutaja ID"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1897
  msgid "add a photo ID"
  msgstr "lisa foto ID"
  
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1898
  #, fuzzy
  msgid "delete selected user IDs"
  msgstr "kustuta kasutaja ID"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1901
  #, fuzzy
  msgid "add a subkey"
  msgstr "addkey"
  
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1904
  msgid "add a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1906
  msgid "move a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1908
  msgid "move a backup key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1910
  #, fuzzy
  msgid "delete selected subkeys"
  msgstr "kustuta sekundaarne võti"
  
- #: g10/keyedit.c:1911
++#: g10/keyedit.c:1912
  msgid "add a revocation key"
  msgstr "lisa tühistamise võti"
  
- #: g10/keyedit.c:1913
++#: g10/keyedit.c:1914
  #, fuzzy
  msgid "delete signatures from the selected user IDs"
  msgstr "Kas uuendan tõesti kõik kasutaja ID-de seaded? "
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1916
  #, fuzzy
  msgid "change the expiration date for the key or selected subkeys"
  msgstr "v3 võtme aegumise aega ei saa muuta.\n"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1918
  #, fuzzy
  msgid "flag the selected user ID as primary"
  msgstr "märgi kasutaja ID primaarseks"
  
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1921
  msgid "list preferences (expert)"
  msgstr "näita eelistusi (ekspert)"
  
- #: g10/keyedit.c:1921
++#: g10/keyedit.c:1922
  msgid "list preferences (verbose)"
  msgstr "näita eelistusi (detailsena)"
  
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:1924
  #, fuzzy
  msgid "set preference list for the selected user IDs"
  msgstr "Kas uuendan tõesti kõik kasutaja ID-de seaded? "
  
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1927
  #, fuzzy
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr "ei saa parsida võtmeserveri URI\n"
  
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1929
  #, fuzzy
  msgid "set a notation for the selected user IDs"
  msgstr "Kas uuendan tõesti kõik kasutaja ID-de seaded? "
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1931
  msgid "change the passphrase"
  msgstr "muuda parooli"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1934
  msgid "change the ownertrust"
  msgstr "muuda omaniku usaldust"
  
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1937
  #, fuzzy
  msgid "revoke signatures on the selected user IDs"
  msgstr "Kas tühistan tõesti kõik valitud kasutaja IDd? "
  
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1939
  #, fuzzy
  msgid "revoke selected user IDs"
  msgstr "tühista kasutaja ID"
  
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1942
  #, fuzzy
  msgid "revoke key or selected subkeys"
  msgstr "tühista sekundaarne võti"
  
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1944
  #, fuzzy
  msgid "enable key"
  msgstr "luba võti"
  
- #: g10/keyedit.c:1944
++#: g10/keyedit.c:1945
  #, fuzzy
  msgid "disable key"
  msgstr "blokeeri võti"
  
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1947
  #, fuzzy
  msgid "show selected photo IDs"
  msgstr "näita foto ID"
  
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1949
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:1951
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2063
  msgid "Secret key is available.\n"
  msgstr "Salajane võti on kasutatav.\n"
  
- #: g10/keyedit.c:2162
++#: g10/keyedit.c:2163
  msgid "Need the secret key to do this.\n"
  msgstr "Selle tegamiseks on vaja salajast võtit.\n"
  
- #: g10/keyedit.c:2183
++#: g10/keyedit.c:2184
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4334,279 -3386,224 +4287,284 @@@
  "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
  msgstr ""
  
- #: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
++#: g10/keyedit.c:2240 g10/keyedit.c:3178 g10/keyedit.c:3317 g10/keyedit.c:3379
  msgid "Key is revoked."
  msgstr "Võti on tühistatud."
  
- #: g10/keyedit.c:2262
++#: g10/keyedit.c:2263
  #, fuzzy
  msgid "Really sign all user IDs? (y/N) "
  msgstr "Kas allkirjastan tõesti kõik kasutaja IDd? "
  
- #: g10/keyedit.c:2266
++#: g10/keyedit.c:2267
  #, fuzzy
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "Kas allkirjastan tõesti kõik kasutaja IDd? "
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2275
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
  
- #: g10/keyedit.c:2285
++#: g10/keyedit.c:2286
  #, fuzzy, c-format
  msgid "Unknown signature type '%s'\n"
  msgstr "tundmatu allkirja klass"
  
- #: g10/keyedit.c:2309
++#: g10/keyedit.c:2310
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
  msgstr "See käsklus ei ole %s moodis lubatud.\n"
  
- #: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
++#: g10/keyedit.c:2332 g10/keyedit.c:2356 g10/keyedit.c:2550
  msgid "You must select at least one user ID.\n"
  msgstr "Te peate valima vähemalt ühe kasutaja ID.\n"
  
- #: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
++#: g10/keyedit.c:2334 g10/keyedit.c:2358 g10/keyedit.c:2512 g10/keyedit.c:2552
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2336
++#: g10/keyedit.c:2337
  msgid "You can't delete the last user ID!\n"
  msgstr "Viimast kasutaja ID ei saa kustutada!\n"
  
- #: g10/keyedit.c:2339
++#: g10/keyedit.c:2340
  #, fuzzy
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "Kas kustutan tõesti kõik kasutaja IDd? "
  
- #: g10/keyedit.c:2340
++#: g10/keyedit.c:2341
  #, fuzzy
  msgid "Really remove this user ID? (y/N) "
  msgstr "Kas eemaldan tõesti selle kasutaja ID? "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2397
++#: g10/keyedit.c:2398
  #, fuzzy
  msgid "Really move the primary key? (y/N) "
  msgstr "Kas eemaldan tõesti selle kasutaja ID? "
  
- #: g10/keyedit.c:2409 g10/keyedit.c:4866
++#: g10/keyedit.c:2410 g10/keyedit.c:4964
  #, fuzzy
  msgid "You must select exactly one key.\n"
  msgstr "Te peata valima vähemalt ühe võtme.\n"
  
- #: g10/keyedit.c:2436
++#: g10/keyedit.c:2437
  msgid "Command expects a filename argument\n"
  msgstr ""
  
- #: g10/keyedit.c:2457
++#: g10/keyedit.c:2458
  #, fuzzy, c-format
  msgid "Can't open '%s': %s\n"
  msgstr "`%s' ei õnnestu avada: %s\n"
  
- #: g10/keyedit.c:2474
++#: g10/keyedit.c:2475
  #, fuzzy, c-format
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "viga võtmehoidla `%s' loomisel: %s\n"
  
- #: g10/keyedit.c:2509
++#: g10/keyedit.c:2510
  msgid "You must select at least one key.\n"
  msgstr "Te peata valima vähemalt ühe võtme.\n"
  
- #: g10/keyedit.c:2515
++#: g10/keyedit.c:2516
  #, fuzzy
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "Kas te tõesti soovite valitud võtmeid kustutada? "
  
- #: g10/keyedit.c:2517
++#: g10/keyedit.c:2518
  #, fuzzy
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "Kas te tõesti soovite seda võtit kustutada? "
  
- #: g10/keyedit.c:2555
++#: g10/keyedit.c:2556
  #, fuzzy
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr "Kas tühistan tõesti kõik valitud kasutaja IDd? "
  
- #: g10/keyedit.c:2556
++#: g10/keyedit.c:2557
  #, fuzzy
  msgid "Really revoke this user ID? (y/N) "
  msgstr "Kas tühistan tõesti selle kasutaja ID? "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2575
  #, fuzzy
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "Kas te tõesti soovite seda võtit tühistada? "
  
- #: g10/keyedit.c:2585
++#: g10/keyedit.c:2586
  #, fuzzy
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "Kas te tõesti soovite valitud võtmeid tühistada? "
  
- #: g10/keyedit.c:2587
++#: g10/keyedit.c:2588
  #, fuzzy
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "Kas te tõesti soovite seda võtit tühistada? "
  
- #: g10/keyedit.c:2645
++#: g10/keyedit.c:2646
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  
- #: g10/keyedit.c:2690
++#: g10/keyedit.c:2691
  #, fuzzy
  msgid "Set preference list to:\n"
  msgstr "sea eelistuste nimekiri"
  
- #: g10/keyedit.c:2697
++#: g10/keyedit.c:2698
  #, fuzzy
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr "Kas uuendan tõesti kõik kasutaja ID-de seaded? "
  
- #: g10/keyedit.c:2699
++#: g10/keyedit.c:2700
  #, fuzzy
  msgid "Really update the preferences? (y/N) "
  msgstr "Kas tõesti uuendan seaded? "
  
- #: g10/keyedit.c:2773
++#: g10/keyedit.c:2774
  #, fuzzy
  msgid "Save changes? (y/N) "
  msgstr "Salvestan muutused? "
  
- #: g10/keyedit.c:2777
++#: g10/keyedit.c:2778
  #, fuzzy
  msgid "Quit without saving? (y/N) "
  msgstr "Väljun salvestamata? "
  
- #: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
- #: g10/keyedit.c:3267 g10/keyedit.c:3332
++#: g10/keyedit.c:2789 g10/keyedit.c:2799 g10/keyedit.c:2943 g10/keyedit.c:3046
++#: g10/keyedit.c:3268 g10/keyedit.c:3333 g10/keyedit.c:3409
  #, c-format
  msgid "update failed: %s\n"
  msgstr "uuendamine ebaõnnestus: %s\n"
  
- #: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
++#: g10/keyedit.c:2805 g10/keyedit.c:3273 g10/keyedit.c:3338 g10/keyedit.c:3416
  msgid "Key not changed so no update needed.\n"
  msgstr "Võtit ei muudetud, seega pole uuendamist vaja.\n"
  
- #: g10/keyedit.c:3038
++#: g10/keyedit.c:3039
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
  msgstr "Võtme genereerimine ebaõnnestus: %s\n"
  
- #: g10/keyedit.c:3083
++#: g10/keyedit.c:3084
  #, fuzzy, c-format
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "viga: vigane sõrmejälg\n"
  
- #: g10/keyedit.c:3112
++#: g10/keyedit.c:3113
  #, fuzzy, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
  
- #: g10/keyedit.c:3248 g10/keyedit.c:3251
++#: g10/keyedit.c:3249 g10/keyedit.c:3252
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
  msgstr "vigane väärtus\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  #, fuzzy
  #| msgid "No such user ID.\n"
  msgid "No matching user IDs."
  msgstr "Tundmatu kasutaja ID.\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  #, fuzzy
  msgid "Nothing to sign.\n"
  msgstr "Võtmega %08lX pole midagi allkirjastada\n"
  
- #: g10/keyedit.c:3427
++#: g10/keyedit.c:3388
+ #, fuzzy, c-format
+ msgid "'%s' is not a valid expiration time\n"
+ msgstr "%s ei ole lubatud kooditabel\n"
+ 
++#: g10/keyedit.c:3508
  msgid "Digest: "
  msgstr "Teatelühend: "
  
- #: g10/keyedit.c:3484
++#: g10/keyedit.c:3565
  msgid "Features: "
  msgstr "Omadused: "
  
- #: g10/keyedit.c:3495
++#: g10/keyedit.c:3576
  msgid "Keyserver no-modify"
  msgstr ""
  
- #: g10/keyedit.c:3510 g10/keylist.c:377
++#: g10/keyedit.c:3591 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr ""
  
- #: g10/keyedit.c:3518 g10/keyedit.c:3519
++#: g10/keyedit.c:3599 g10/keyedit.c:3600
  #, fuzzy
  msgid "Notations: "
  msgstr "Noteering: "
  
- #: g10/keyedit.c:3764
++#: g10/keyedit.c:3845
  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:3836
++#: g10/keyedit.c:3917
  #, 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:3860
++#: g10/keyedit.c:3941
  #, 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:3866
++#: g10/keyedit.c:3947
  #, fuzzy
  msgid "(sensitive)"
  msgstr " (tundlik)"
  
- #: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3989 g10/keyedit.c:4131 g10/keylist.c:262 g10/keyserver.c:538
  #, fuzzy, c-format
  msgid "created: %s"
  msgstr "%s ei õnnestu luua: %s\n"
  
- #: g10/keyedit.c:3911 g10/keylist.c:1852
++#: g10/keyedit.c:3992 g10/keylist.c:1852
  #, fuzzy, c-format
  msgid "revoked: %s"
  msgstr "[tühistatud] "
  
- #: g10/keyedit.c:3913 g10/keylist.c:1858
++#: g10/keyedit.c:3994 g10/keylist.c:1858
  #, fuzzy, c-format
  msgid "expired: %s"
  msgstr " [aegub: %s]"
  
- #: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyedit.c:3996 g10/keyedit.c:4133 g10/keylist.c:264 g10/keylist.c:1864
 +#: g10/keyserver.c:544
  #, fuzzy, c-format
  msgid "expires: %s"
  msgstr " [aegub: %s]"
  
- #: g10/keyedit.c:3917
++#: g10/keyedit.c:3998
  #, fuzzy, c-format
  msgid "usage: %s"
  msgstr " usaldus: %c/%c"
  
- #: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
++#: g10/keyedit.c:4006 g10/keyedit.c:4026 g10/keylist.c:267
  msgid "card-no: "
  msgstr ""
  
- #: g10/keyedit.c:3984
++#: g10/keyedit.c:4065
  #, fuzzy, c-format
  msgid "trust: %s"
  msgstr " usaldus: %c/%c"
  
- #: g10/keyedit.c:3988
++#: g10/keyedit.c:4069
  #, c-format
  msgid "validity: %s"
  msgstr ""
  
- #: g10/keyedit.c:3995
++#: g10/keyedit.c:4076
  msgid "This key has been disabled"
  msgstr "See võti on blokeeritud"
  
- #: g10/keyedit.c:4013
++#: g10/keyedit.c:4094
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4614,20 -3611,14 +4572,20 @@@ 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:4069 g10/keyedit.c:4500 g10/keyserver.c:548
- #: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: g10/keyedit.c:4150 g10/keyedit.c:4581 g10/keyserver.c:548
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:712
 +#: dirmngr/ocsp.c:703
  #, fuzzy
  msgid "revoked"
  msgstr "[tühistatud] "
  
- #: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
- #: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4152 g10/keyedit.c:4583 g10/keyserver.c:552
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:714
  #, fuzzy
  msgid "expired"
  msgstr "expire"
  
- #: g10/keyedit.c:4188
++#: g10/keyedit.c:4269
  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"
@@@ -4635,17 -3626,14 +4593,17 @@@ 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:4240
++#: g10/keyedit.c:4321
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr ""
  
- #: g10/keyedit.c:4241
++#: g10/keyedit.c:4322
  #, fuzzy
  #| 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:4300
++#: g10/keyedit.c:4381
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4654,35 -3642,27 +4612,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:4305 g10/keyedit.c:4595
++#: g10/keyedit.c:4386 g10/keyedit.c:4676
  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:4311
++#: g10/keyedit.c:4392
  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:4326 g10/keygen.c:2697
++#: g10/keyedit.c:4407 g10/keygen.c:2719
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4509
  msgid "Delete this good signature? (y/N/q)"
  msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
  
- #: g10/keyedit.c:4438
++#: g10/keyedit.c:4519
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "Kustutan selle vigase allkirja? (j/E/v)"
  
- #: g10/keyedit.c:4442
++#: g10/keyedit.c:4523
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4530
  msgid "Really delete this self-signature? (y/N)"
  msgstr "Kas tõesti kustutan selle iseenda allkirja? (j/E)"
  
- #: g10/keyedit.c:4465
++#: g10/keyedit.c:4546
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
@@@ -4690,38 -3670,31 +4648,38 @@@ msgid_plural "Deleted %d signatures.\n
  msgstr[0] "Kustutatud %d allkiri.\n"
  msgstr[1] "Kustutatud %d allkiri.\n"
  
- #: g10/keyedit.c:4469
++#: g10/keyedit.c:4550
  msgid "Nothing deleted.\n"
  msgstr "Midagi ei kustutatud.\n"
  
- #: g10/keyedit.c:4504 g10/trust.c:693
++#: g10/keyedit.c:4585 g10/trust.c:716
  #, fuzzy
  msgid "invalid"
  msgstr "vigane pakend"
  
- #: g10/keyedit.c:4506
++#: g10/keyedit.c:4587
  #, fuzzy, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "Kasutaja ID \"%s\" on tühistatud."
  
- #: g10/keyedit.c:4512
++#: g10/keyedit.c:4593
  #, 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:4520
++#: g10/keyedit.c:4601
  #, fuzzy, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
  
- #: g10/keyedit.c:4521
++#: g10/keyedit.c:4602
  #, fuzzy, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
  
- #: g10/keyedit.c:4590
++#: g10/keyedit.c:4671
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4730,39 -3703,31 +4688,39 @@@ 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:4601
++#: g10/keyedit.c:4682
  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:4618
++#: g10/keyedit.c:4699
  msgid "Enter the user ID of the designated revoker: "
  msgstr "Sisestage määratud tühistaja kasutaja ID: "
  
- #: g10/keyedit.c:4643
++#: g10/keyedit.c:4724
  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:4658
++#: g10/keyedit.c:4739
  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:4680
++#: g10/keyedit.c:4761
  #, fuzzy
  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:4698
++#: g10/keyedit.c:4779
  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:4704
++#: g10/keyedit.c:4785
  #, 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:4755
++#: g10/keyedit.c:4848
  #, fuzzy
  msgid ""
  "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@@ -4770,239 -3735,188 +4728,239 @@@
  msgstr ""
  "Olete kindel, et soovite seda võtit seada määratud tühistajaks? (j/E): "
  
- #: g10/keyedit.c:4760
++#: g10/keyedit.c:4853
  #, fuzzy
  msgid "Changing expiration time for a subkey.\n"
  msgstr "Muudan sekundaarse võtme aegumise aega.\n"
  
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:4856
  msgid "Changing expiration time for the primary key.\n"
  msgstr "Muudan primaarse võtme aegumise aega.\n"
  
- #: g10/keyedit.c:4814
++#: g10/keyedit.c:4910
  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:4987
++#: g10/keyedit.c:5085
  #, 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:4993
++#: g10/keyedit.c:5091
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr ""
  
- #: g10/keyedit.c:5108
++#: g10/keyedit.c:5206
  msgid "Please select exactly one user ID.\n"
  msgstr "Palun valige täpselt üks kasutaja ID.\n"
  
- #: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
++#: g10/keyedit.c:5247 g10/keyedit.c:5361 g10/keyedit.c:5474 g10/keyedit.c:5611
  #, 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:5320
++#: g10/keyedit.c:5418
  msgid "Enter your preferred keyserver URL: "
  msgstr ""
  
- #: g10/keyedit.c:5399
++#: g10/keyedit.c:5497
  #, fuzzy
  msgid "Are you sure you want to replace it? (y/N) "
  msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
  
- #: g10/keyedit.c:5400
++#: g10/keyedit.c:5498
  #, fuzzy
  msgid "Are you sure you want to delete it? (y/N) "
  msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
  
- #: g10/keyedit.c:5459
++#: g10/keyedit.c:5557
  #, fuzzy
  msgid "Enter the notation: "
  msgstr "Allkirja noteerimine: "
  
- #: g10/keyedit.c:5606
++#: g10/keyedit.c:5704
  #, fuzzy
  msgid "Proceed? (y/N) "
  msgstr "Kirjutan üle (j/E)? "
  
- #: g10/keyedit.c:5676
++#: g10/keyedit.c:5774
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "Kasutaja ID numbriga %d puudub\n"
  
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5836
  #, fuzzy, c-format
  msgid "No user ID with hash %s\n"
  msgstr "Kasutaja ID numbriga %d puudub\n"
  
- #: g10/keyedit.c:5839
++#: g10/keyedit.c:5937
  #, fuzzy, c-format
  msgid "No subkey with key ID '%s'.\n"
  msgstr "Kasutaja ID numbriga %d puudub\n"
  
- #: g10/keyedit.c:5861
++#: g10/keyedit.c:5959
  #, fuzzy, c-format
  msgid "No subkey with index %d\n"
  msgstr "Kasutaja ID numbriga %d puudub\n"
  
- #: g10/keyedit.c:6002
++#: g10/keyedit.c:6100
  #, fuzzy, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "kasutaja ID: \""
  
- #: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
++#: g10/keyedit.c:6103 g10/keyedit.c:6205 g10/keyedit.c:6253
  #, fuzzy, c-format
  msgid "signed by your key %s on %s%s%s\n"
  msgstr "   allkirjastanud %08lX %s%s%s\n"
  
- #: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
++#: g10/keyedit.c:6105 g10/keyedit.c:6207 g10/keyedit.c:6255
  msgid " (non-exportable)"
  msgstr " (mitte-eksporditav)"
  
- #: g10/keyedit.c:6011
++#: g10/keyedit.c:6109
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "See allkiri aegub %s.\n"
  
- #: g10/keyedit.c:6016
++#: g10/keyedit.c:6114
  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:6021
++#: g10/keyedit.c:6119
  msgid "Create a revocation certificate for this signature? (y/N) "
  msgstr "Loon sellele allkirjale tühistamise sertifikaadi? (j/E) "
  
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6173
  #, fuzzy
  msgid "Not signed by you.\n"
  msgstr "   allkirjastanud %08lX %s%s\n"
  
- #: g10/keyedit.c:6081
++#: g10/keyedit.c:6179
  #, 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:6110
++#: g10/keyedit.c:6208
  #, fuzzy
  msgid " (non-revocable)"
  msgstr " (mitte-eksporditav)"
  
- #: g10/keyedit.c:6117
++#: g10/keyedit.c:6215
  #, fuzzy, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "   tühistanud %08lX %s\n"
  
- #: g10/keyedit.c:6142
++#: g10/keyedit.c:6240
  msgid "You are about to revoke these signatures:\n"
  msgstr "Te asute tühistama järgmisi allkirju:\n"
  
- #: g10/keyedit.c:6165
++#: g10/keyedit.c:6263
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "Kas tõesti loon tühistamise sertifikaadid? (j/E) "
  
- #: g10/keyedit.c:6198
++#: g10/keyedit.c:6296
  msgid "no secret key\n"
  msgstr "salajast võtit pole\n"
  
- #: g10/keyedit.c:6246
++#: g10/keyedit.c:6344
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6256
++#: g10/keyedit.c:6354
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
  
- #: g10/keyedit.c:6273
++#: g10/keyedit.c:6371
  #, 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:6386
++#: g10/keyedit.c:6485
  #, fuzzy, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
  
- #: g10/keyedit.c:6448
++#: g10/keyedit.c:6547
  #, fuzzy, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
  
- #: g10/keyedit.c:6545
++#: g10/keyedit.c:6644
  #, fuzzy, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr "Näitan %s foto IDd suurusega %ld, võti 0x%08lX (uid %d)\n"
  
- #: g10/keygen.c:305
++#: g10/keygen.c:316
  #, fuzzy, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "eelistus %c%lu on duplikaat\n"
  
- #: g10/keygen.c:312
++#: g10/keygen.c:323
  #, fuzzy
  msgid "too many cipher preferences\n"
  msgstr "liiga palju `%c' eelistusi\n"
  
- #: g10/keygen.c:314
++#: g10/keygen.c:325
  #, fuzzy
  msgid "too many digest preferences\n"
  msgstr "liiga palju `%c' eelistusi\n"
  
- #: g10/keygen.c:316
++#: g10/keygen.c:327
  #, fuzzy
  msgid "too many compression preferences\n"
  msgstr "liiga palju `%c' eelistusi\n"
  
- #: g10/keygen.c:457
++#: g10/keygen.c:468
  #, fuzzy, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "lubamatu sümbol eelistuste sõnes\n"
  
- #: g10/keygen.c:936
++#: g10/keygen.c:947
  msgid "writing direct signature\n"
  msgstr "kirjutan otsese allkirja\n"
  
- #: g10/keygen.c:982
++#: g10/keygen.c:993
  msgid "writing self signature\n"
  msgstr "kirjutan iseenda allkirja\n"
  
- #: g10/keygen.c:1038
++#: g10/keygen.c:1049
  msgid "writing key binding signature\n"
  msgstr "kirjutan võtit siduva allkirja\n"
  
- #: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
- #: g10/keygen.c:1610 g10/keygen.c:1615
++#: g10/keygen.c:1413 g10/keygen.c:1418 g10/keygen.c:1470 g10/keygen.c:1475
++#: g10/keygen.c:1622 g10/keygen.c:1627
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "vigane võtme suurus; kasutan %u bitti\n"
  
- #: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
++#: g10/keygen.c:1424 g10/keygen.c:1481 g10/keygen.c:1489 g10/keygen.c:1633
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "võtme suurus ümardatud üles %u bitini\n"
  
- #: g10/keygen.c:1503
++#: g10/keygen.c:1515
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1677
++#: g10/keygen.c:1689
  #, fuzzy
  msgid "Sign"
  msgstr "sign"
  
- #: g10/keygen.c:1680
++#: g10/keygen.c:1692
  msgid "Certify"
  msgstr ""
  
- #: g10/keygen.c:1683
++#: g10/keygen.c:1695
  #, fuzzy
  msgid "Encrypt"
  msgstr "krüpteeri andmed"
  
- #: g10/keygen.c:1686
++#: g10/keygen.c:1698
  msgid "Authenticate"
  msgstr ""
  
@@@ -5016,157 -3930,126 +4974,157 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1705
++#: g10/keygen.c:1717
  msgid "SsEeAaQq"
  msgstr ""
  
- #: g10/keygen.c:1732
++#: g10/keygen.c:1744
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr ""
  
- #: g10/keygen.c:1738
++#: g10/keygen.c:1750
  msgid "Current allowed actions: "
  msgstr ""
  
- #: g10/keygen.c:1743
++#: g10/keygen.c:1755
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr ""
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1758
  #, fuzzy, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%d) ElGamal (ainult krüptimiseks)\n"
  
- #: g10/keygen.c:1749
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr ""
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr ""
  
- #: g10/keygen.c:1881 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1893 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Palun valige, millist võtmetüüpi te soovite:\n"
  
- #: g10/keygen.c:1885
++#: g10/keygen.c:1897
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
  
- #: g10/keygen.c:1889
++#: g10/keygen.c:1901
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
  
- #: g10/keygen.c:1892
++#: g10/keygen.c:1904
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
  
- #: g10/keygen.c:1894
++#: g10/keygen.c:1906
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (ainult allkirjastamiseks)\n"
  
- #: g10/keygen.c:1900
++#: g10/keygen.c:1912
  #, fuzzy, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) ElGamal (ainult krüptimiseks)\n"
  
- #: g10/keygen.c:1902
++#: g10/keygen.c:1914
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1920
  #, fuzzy, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
  
- #: g10/keygen.c:1910
++#: g10/keygen.c:1922
  #, fuzzy, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1928
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
  
- #: g10/keygen.c:1918
++#: g10/keygen.c:1930
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
  
- #: g10/keygen.c:1920
++#: g10/keygen.c:1932
  #, fuzzy, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1934
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
  
- #: g10/keygen.c:1926
++#: g10/keygen.c:1938
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
  
- #: g10/keygen.c:2022 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:206
  #, fuzzy
  msgid "Enter the keygrip: "
  msgstr "Allkirja noteerimine: "
  
- #: g10/keygen.c:2035 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2047 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2049 sm/certreqgen-ui.c:216
  #, fuzzy
  msgid "No key with this keygrip\n"
  msgstr "Kasutaja ID numbriga %d puudub\n"
  
- #: g10/keygen.c:2111 g10/keygen.c:2125
++#: g10/keygen.c:2133 g10/keygen.c:2147
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
  msgstr "ümardatud üles %u bitini\n"
  
- #: g10/keygen.c:2166
++#: g10/keygen.c:2188
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr ""
  
- #: g10/keygen.c:2174
++#: g10/keygen.c:2196
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Millist võtmepikkust te soovite? (1024) "
  
- #: g10/keygen.c:2177 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2199 sm/certreqgen-ui.c:183
  #, fuzzy, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Millist võtmepikkust te soovite? (1024) "
  
- #: g10/keygen.c:2191 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2213 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Soovitud võtmepikkus on %u bitti\n"
  
- #: g10/keygen.c:2237
++#: g10/keygen.c:2259
  #, fuzzy
  #| msgid "Please select what kind of key you want:\n"
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Palun valige, millist võtmetüüpi te soovite:\n"
  
- #: g10/keygen.c:2409
++#: g10/keygen.c:2431
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5182,7 -4065,6 +5140,7 @@@ msgstr "
  "      <n>m = võti aegub n kuuga\n"
  "      <n>y = võti aegub n aastaga\n"
  
- #: g10/keygen.c:2420
++#: g10/keygen.c:2442
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5198,40 -4080,32 +5156,40 @@@ msgstr "
  "      <n>m = allkiri aegub n kuuga\n"
  "      <n>y = allkiri aegub n aastaga\n"
  
- #: g10/keygen.c:2443
++#: g10/keygen.c:2465
  msgid "Key is valid for? (0) "
  msgstr "Võti on kehtiv kuni? (0) "
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2470
  #, fuzzy, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Allkiri on kehtiv kuni? (0) "
  
- #: g10/keygen.c:2461 g10/keygen.c:2486
++#: g10/keygen.c:2483 g10/keygen.c:2508
  msgid "invalid value\n"
  msgstr "vigane väärtus\n"
  
- #: g10/keygen.c:2468
++#: g10/keygen.c:2490
  #, fuzzy
  msgid "Key does not expire at all\n"
  msgstr "%s ei aegu kunagi\n"
  
- #: g10/keygen.c:2469
++#: g10/keygen.c:2491
  #, fuzzy
  msgid "Signature does not expire at all\n"
  msgstr "%s ei aegu kunagi\n"
  
- #: g10/keygen.c:2474
++#: g10/keygen.c:2496
  #, fuzzy, c-format
  msgid "Key expires at %s\n"
  msgstr "%s aegub %s\n"
  
- #: g10/keygen.c:2475
++#: g10/keygen.c:2497
  #, fuzzy, c-format
  msgid "Signature expires at %s\n"
  msgstr "Allkiri aegub %s\n"
  
- #: g10/keygen.c:2479
++#: g10/keygen.c:2501
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5239,12 -4113,10 +5197,12 @@@ msgstr "
  "Teie süsteem ei saa esitada kuupäevi peale aastat 2038.\n"
  "Siiski käsitletakse neid korrektselt aastani 2106.\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2514
  #, fuzzy
  msgid "Is this correct? (y/N) "
  msgstr "On see õige (j/e)? "
  
- #: g10/keygen.c:2560
++#: g10/keygen.c:2582
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5255,7 -4127,6 +5213,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2575
++#: g10/keygen.c:2597
  #, fuzzy
  msgid ""
  "\n"
@@@ -5271,50 -4142,39 +5229,50 @@@ msgstr "
  "    \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
  "\n"
  
- #: g10/keygen.c:2594
++#: g10/keygen.c:2616
  msgid "Real name: "
  msgstr "Pärisnimi: "
  
- #: g10/keygen.c:2603
++#: g10/keygen.c:2625
  msgid "Invalid character in name\n"
  msgstr "Lubamatu sümbol nimes\n"
  
- #: g10/keygen.c:2604
++#: g10/keygen.c:2626
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2608
++#: g10/keygen.c:2630
  msgid "Name may not start with a digit\n"
  msgstr "Nimi ei või alata numbriga\n"
  
- #: g10/keygen.c:2611
++#: g10/keygen.c:2633
  msgid "Name must be at least 5 characters long\n"
  msgstr "Nimes peab olema vähemalt 5 sümbolit\n"
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2643
  msgid "Email address: "
  msgstr "E-posti aadress: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2649
  msgid "Not a valid email address\n"
  msgstr "Selline e-posti aadress ei ole lubatud\n"
  
- #: g10/keygen.c:2636
++#: g10/keygen.c:2658
  msgid "Comment: "
  msgstr "Kommentaar: "
  
- #: g10/keygen.c:2642
++#: g10/keygen.c:2664
  msgid "Invalid character in comment\n"
  msgstr "Lubamatu sümbol kommentaaris\n"
  
- #: g10/keygen.c:2678
++#: g10/keygen.c:2700
  #, fuzzy, c-format
  #| msgid "You are using the `%s' character set.\n"
  msgid "You are using the '%s' character set.\n"
  msgstr "Te kasutate kooditabelit `%s'.\n"
  
- #: g10/keygen.c:2684
++#: g10/keygen.c:2706
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5325,7 -4185,6 +5283,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2689
++#: g10/keygen.c:2711
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr "Ärge palun kirjutage e-posti aadressi pärisnimesse ega kommentaari\n"
  
@@@ -5340,35 -4199,28 +5298,35 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2714
++#: g10/keygen.c:2736
  msgid "NnCcEeOoQq"
  msgstr "NnKkEeOoVv"
  
- #: g10/keygen.c:2724
++#: g10/keygen.c:2746
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "Muuda (N)ime, (K)ommentaari, (E)posti või (V)älju? "
  
- #: g10/keygen.c:2725
++#: g10/keygen.c:2747
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr "Muuda (N)ime, (K)ommentaari, (E)posti või (O)k/(V)älju? "
  
- #: g10/keygen.c:2730
++#: g10/keygen.c:2752
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "Muuda (N)ime, (K)ommentaari, (E)posti või (V)älju? "
  
- #: g10/keygen.c:2731
++#: g10/keygen.c:2753
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "Muuda (N)ime, (K)ommentaari, (E)posti või (O)k/(V)älju? "
  
- #: g10/keygen.c:2750
++#: g10/keygen.c:2772
  msgid "Please correct the error first\n"
  msgstr "Palun parandage kõigepealt viga\n"
  
- #: g10/keygen.c:2796
++#: g10/keygen.c:2818
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5380,13 -4232,10 +5338,13 @@@ msgstr "
  "kasutada kettaid jne), see annaks juhuarvude generaatorile võimaluse\n"
  "koguda paremat entroopiat.\n"
  
- #: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
- #: g10/keygen.c:4777 g10/keygen.c:4882
++#: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
++#: g10/keygen.c:4330 g10/keygen.c:4803 g10/keygen.c:5064 g10/keygen.c:5169
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Võtme genereerimine ebaõnnestus: %s\n"
  
- #: g10/keygen.c:3598
++#: g10/keygen.c:3922
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5394,66 -4243,53 +5352,66 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3924
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3621
++#: g10/keygen.c:3945
  #, fuzzy, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "`%s' on juba pakitud\n"
  
- #: g10/keygen.c:3626
++#: g10/keygen.c:3950
  #, fuzzy
  msgid "Create anyway? (y/N) "
  msgstr "Kasutan seda võtit ikka? "
  
- #: g10/keygen.c:3632
++#: g10/keygen.c:3956
  #, fuzzy
  msgid "creating anyway\n"
  msgstr "genereeri uus võtmepaar"
  
- #: g10/keygen.c:3981
++#: g10/keygen.c:4315
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:4013
++#: g10/keygen.c:4358
  msgid "Key generation canceled.\n"
  msgstr "Võtme genereerimine katkestati.\n"
  
- #: g10/keygen.c:4073
++#: g10/keygen.c:4418
  #, fuzzy, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "`%s' ei õnnestu luua: %s\n"
  
- #: g10/keygen.c:4093
++#: g10/keygen.c:4438
  #, fuzzy, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "MÄRKUS: salajane võti %08lX aegus %s\n"
  
- #: g10/keygen.c:4244 g10/keygen.c:4393
++#: g10/keygen.c:4589 g10/keygen.c:4738
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
  msgstr "kirjutan avaliku võtme faili `%s'\n"
  
- #: g10/keygen.c:4387
++#: g10/keygen.c:4732
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "kirjutatavat avalike võtmete hoidlat pole: %s\n"
  
- #: g10/keygen.c:4401
++#: g10/keygen.c:4746
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error writing public keyring '%s': %s\n"
  msgstr "viga avaliku võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
  
- #: g10/keygen.c:4433
++#: g10/keygen.c:4778
  msgid "public and secret key created and signed.\n"
  msgstr "avalik ja salajane võti on loodud ja allkirjastatud.\n"
  
- #: g10/keygen.c:4445
++#: g10/keygen.c:4790
  #, fuzzy
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
@@@ -5463,34 -4299,28 +5421,34 @@@ msgstr "
  "Krüptimiseks tuleb genereerida teine võti, seda saate teha\n"
  "kasutades võtit \"--edit-key\".\n"
  
- #: g10/keygen.c:4649 g10/keygen.c:4833
++#: g10/keygen.c:4936 g10/keygen.c:5120
  #, 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:4651 g10/keygen.c:4835
++#: g10/keygen.c:4938 g10/keygen.c:5122
  #, 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:4662 g10/keygen.c:4846
++#: g10/keygen.c:4949 g10/keygen.c:5133
  #, fuzzy
  #| 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:4674 g10/keygen.c:4676
++#: g10/keygen.c:4961 g10/keygen.c:4963
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Primaarse võtme salajased komponendid ei ole kättesaadavad.\n"
  
- #: g10/keygen.c:4683 g10/keygen.c:4685
++#: g10/keygen.c:4970 g10/keygen.c:4972
  #, fuzzy
  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:4704 g10/keygen.c:4860
++#: g10/keygen.c:4991 g10/keygen.c:5147
  #, fuzzy
  msgid "Really create? (y/N) "
  msgstr "Loon tõesti? "
@@@ -5815,127 -4580,101 +5773,127 @@@ msgstr "
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
  msgstr "eraldiseisev tühistus - realiseerimiseks kasutage \"gpg --import\"\n"
  
- #: g10/mainproc.c:1233 g10/mainproc.c:1276
++#: g10/mainproc.c:1238 g10/mainproc.c:1281
  #, fuzzy
  msgid "no signature found\n"
  msgstr "Korrektne allkiri kasutajalt \""
  
- #: g10/mainproc.c:1607
++#: g10/mainproc.c:1612
  #, fuzzy, c-format
  msgid "BAD signature from \"%s\""
  msgstr "HALB allkiri kasutajalt \""
  
- #: g10/mainproc.c:1609
++#: g10/mainproc.c:1614
  #, fuzzy, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Aegunud allkiri kasutajalt \""
  
- #: g10/mainproc.c:1611
++#: g10/mainproc.c:1616
  #, fuzzy, c-format
  msgid "Good signature from \"%s\""
  msgstr "Korrektne allkiri kasutajalt \""
  
- #: g10/mainproc.c:1630
++#: g10/mainproc.c:1635
  msgid "signature verification suppressed\n"
  msgstr "allkirja kontroll jäeti ära\n"
  
- #: g10/mainproc.c:1739
++#: g10/mainproc.c:1744
  #, fuzzy
  msgid "can't handle this ambiguous signature data\n"
  msgstr "neid allkirju ei õnnestu töödelda\n"
  
- #: g10/mainproc.c:1753 g10/mainproc.c:1761
++#: g10/mainproc.c:1758 g10/mainproc.c:1766
  #, fuzzy, c-format
  msgid "Signature made %s\n"
  msgstr "Allkiri aegus %s\n"
  
- #: g10/mainproc.c:1754 g10/mainproc.c:1762
++#: g10/mainproc.c:1759 g10/mainproc.c:1767
  #, fuzzy, c-format
  msgid "               using %s key %s\n"
  msgstr "                 ka \""
  
- #: g10/mainproc.c:1766
++#: g10/mainproc.c:1771
  #, 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:1772
++#: g10/mainproc.c:1777
  #, fuzzy, c-format
  msgid "               issuer \"%s\"\n"
  msgstr "                 ka \""
  
- #: g10/mainproc.c:1789
++#: g10/mainproc.c:1794
  msgid "Key available at: "
  msgstr "Võtme leiate: "
  
- #: g10/mainproc.c:2024
++#: g10/mainproc.c:2029
  msgid "[uncertain]"
  msgstr "[ebakindel]"
  
- #: g10/mainproc.c:2062
++#: g10/mainproc.c:2067
  #, fuzzy, c-format
  msgid "                aka \"%s\""
  msgstr "                 ka \""
  
- #: g10/mainproc.c:2145
++#: g10/mainproc.c:2150
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "Allkiri aegus %s\n"
  
- #: g10/mainproc.c:2149
++#: g10/mainproc.c:2154
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "Allkiri aegub %s\n"
  
- #: g10/mainproc.c:2160
++#: g10/mainproc.c:2165
  #, 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:2161
++#: g10/mainproc.c:2166
  msgid "binary"
  msgstr "binaarne"
  
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2167
  msgid "textmode"
  msgstr "tekstimood"
  
- #: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "tundmatu"
  
- #: g10/mainproc.c:2164
++#: g10/mainproc.c:2169
  #, fuzzy
  #| msgid "unknown pubkey algorithm"
  msgid ", key algorithm "
  msgstr "tundmatu avaliku võtme algoritm"
  
- #: g10/mainproc.c:2199
++#: g10/mainproc.c:2204
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2229
++#: g10/mainproc.c:2234
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "Allkirja ei saa kontrollida: %s\n"
  
- #: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
++#: g10/mainproc.c:2327 g10/mainproc.c:2346 g10/mainproc.c:2470
  msgid "not a detached signature\n"
  msgstr "ei ole eraldiseisev allkiri\n"
  
- #: g10/mainproc.c:2375
++#: g10/mainproc.c:2380
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
  msgstr "HOIATUS: leidsin mitu allkirja. Kontrollitakse ainult esimest.\n"
  
- #: g10/mainproc.c:2384
++#: g10/mainproc.c:2389
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
  
- #: g10/mainproc.c:2469
++#: g10/mainproc.c:2474
  msgid "old style (PGP 2.x) signature\n"
  msgstr "vana stiili (PGP 2.x) allkiri\n"
  
@@@ -6223,23 -4908,18 +6181,23 @@@ msgstr "On see foto õige (j/E/v)? 
  msgid "unable to display photo ID!\n"
  msgstr "foto ID ei saa näidata!\n"
  
- #: g10/pkclist.c:72 g10/revoke.c:757
++#: g10/pkclist.c:72 g10/revoke.c:758
  msgid "No reason specified"
  msgstr "Põhjus puudub"
  
- #: g10/pkclist.c:74 g10/revoke.c:759
++#: g10/pkclist.c:74 g10/revoke.c:760
  msgid "Key is superseded"
  msgstr "Võti on asendatud"
  
- #: g10/pkclist.c:76 g10/revoke.c:758
++#: g10/pkclist.c:76 g10/revoke.c:759
  msgid "Key has been compromised"
  msgstr "Võti on kompromiteeritud"
  
- #: g10/pkclist.c:78 g10/revoke.c:760
++#: g10/pkclist.c:78 g10/revoke.c:761
  msgid "Key is no longer used"
  msgstr "Võti ei ole enam kasutusel"
  
- #: g10/pkclist.c:80 g10/revoke.c:761
++#: g10/pkclist.c:80 g10/revoke.c:762
  msgid "User ID is no longer valid"
  msgstr "Kasutaja ID ei ole enam kehtiv"
  
@@@ -6320,7 -4987,6 +6278,7 @@@ msgid "
  "\n"
  msgstr ""
  
- #: g10/pkclist.c:310 g10/revoke.c:786
++#: g10/pkclist.c:310 g10/revoke.c:787
  msgid "Your decision? "
  msgstr "Teie otsus? "
  
@@@ -6357,10 -5016,9 +6315,10 @@@ msgstr "See võti kuulub meile\n
  msgid "%s: This key is bad!  It has been marked as untrusted!\n"
  msgstr ""
  
 +#: g10/pkclist.c:484
  #, fuzzy
  msgid ""
- "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "This key is bad!  It has been marked as untrusted!  If you\n"
  "*really* know what you are doing, you may answer the next\n"
  "question with yes.\n"
  msgstr ""
@@@ -6516,33 -5144,26 +6474,33 @@@ msgstr "
  msgid "No such user ID.\n"
  msgstr "Tundmatu kasutaja ID.\n"
  
- #: g10/pkclist.c:1197 g10/pkclist.c:1273
++#: g10/pkclist.c:1197 g10/pkclist.c:1274
  msgid "skipped: public key already set as default recipient\n"
  msgstr "jätsin vahele: avalik võti on juba vaikimisi saaja\n"
  
- #: g10/pkclist.c:1218
++#: g10/pkclist.c:1219
  msgid "Public key is disabled.\n"
  msgstr "Avalik võti on blokeeritud.\n"
  
- #: g10/pkclist.c:1228
++#: g10/pkclist.c:1229
  msgid "skipped: public key already set\n"
  msgstr "jätsin vahele: avalik võti on juba olemas\n"
  
- #: g10/pkclist.c:1263
++#: g10/pkclist.c:1264
  #, fuzzy, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "tundmatu vaikimisi saaja `%s'\n"
  
- #: g10/pkclist.c:1312
++#: g10/pkclist.c:1313
  msgid "no valid addressees\n"
  msgstr "kehtivaid aadresse pole\n"
  
- #: g10/pkclist.c:1665
++#: g10/pkclist.c:1666
  #, fuzzy, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "võti %08lX: kasutaja ID puudub\n"
  
- #: g10/pkclist.c:1690
++#: g10/pkclist.c:1691
  #, fuzzy, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "võti %08lX: kasutaja ID puudub\n"
@@@ -6551,29 -5171,23 +6509,29 @@@
  msgid "data not saved; use option \"--output\" to save it\n"
  msgstr "andmeid ei salvestatud; salvestamiseks kasutage võtit \"--output\"\n"
  
- #: g10/plaintext.c:598
++#: g10/plaintext.c:614
  msgid "Detached signature.\n"
  msgstr "Eraldiseisev allkiri.\n"
  
- #: g10/plaintext.c:606
++#: g10/plaintext.c:622
  msgid "Please enter name of data file: "
  msgstr "Palun sisestage andmefaili nimi: "
  
- #: g10/plaintext.c:643
++#: g10/plaintext.c:659
  msgid "reading stdin ...\n"
  msgstr "loen standardsisendit ...\n"
  
- #: g10/plaintext.c:688
++#: g10/plaintext.c:704
  msgid "no signed data\n"
  msgstr "allkirjastatud andmeid pole\n"
  
- #: g10/plaintext.c:706
++#: g10/plaintext.c:722
  #, fuzzy, c-format
  #| msgid "can't open signed data `%s'\n"
  msgid "can't open signed data '%s'\n"
  msgstr "allkirjastatud andmete avamine ebaõnnestus `%s'\n"
  
- #: g10/plaintext.c:741
++#: g10/plaintext.c:757
  #, fuzzy, c-format
  msgid "can't open signed data fd=%d: %s\n"
  msgstr "allkirjastatud andmete avamine ebaõnnestus `%s'\n"
@@@ -6642,7 -5242,6 +6600,7 @@@ msgstr "Salajane võti on kasutatav.\n
  msgid "Create a designated revocation certificate for this key? (y/N) "
  msgstr "Loon sellele võtmele tühistamise sertifikaadi? "
  
- #: g10/revoke.c:336 g10/revoke.c:727
++#: g10/revoke.c:336 g10/revoke.c:728
  msgid "ASCII armored output forced.\n"
  msgstr "Väljundis sunnitakse kasutama ASCII vormingut.\n"
  
@@@ -6680,23 -5273,20 +6638,23 @@@ msgid "
  "the secret key.  However, if the secret key is still accessible,\n"
  "it is better to generate a new revocation certificate and give\n"
  "a reason for the revocation.  For details see the description of\n"
- "of the gpg command \"--gen-revoke\" in the GnuPG manual."
+ "of the gpg command \"--generate-revocation\" in the GnuPG manual."
  msgstr ""
  
- #: g10/revoke.c:575
++#: g10/revoke.c:576
  msgid ""
  "To avoid an accidental use of this file, a colon has been inserted\n"
  "before the 5 dashes below.  Remove this colon with a text editor\n"
  "before importing and publishing this revocation certificate."
  msgstr ""
  
- #: g10/revoke.c:590
++#: g10/revoke.c:591
  #, fuzzy, c-format
  #| msgid "Revocation certificate created.\n"
  msgid "revocation certificate stored as '%s.rev'\n"
  msgstr "Tühistamise sertifikaat on loodud.\n"
  
- #: g10/revoke.c:634
++#: g10/revoke.c:635
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found\n"
  msgstr "salajast võtit `%s' ei leitud: %s\n"
@@@ -6704,23 -5294,19 +6662,23 @@@
  #. TRANSLATORS: The %s prints a key specification which
  #. for example has been given at the command line.  Several lines
  #. lines with secret key infos are printed after this message.
- #: g10/revoke.c:661
++#: g10/revoke.c:662
  #, c-format
  msgid "'%s' matches multiple secret keys:\n"
  msgstr ""
  
- #: g10/revoke.c:688
++#: g10/revoke.c:689
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error searching the keyring: %s\n"
  msgstr "viga võtmehoidla `%s' loomisel: %s\n"
  
- #: g10/revoke.c:711
++#: g10/revoke.c:712
  #, fuzzy
  msgid "Create a revocation certificate for this key? (y/N) "
  msgstr "Loon sellele võtmele tühistamise sertifikaadi? "
  
- #: g10/revoke.c:735
++#: g10/revoke.c:736
  msgid ""
  "Revocation certificate created.\n"
  "\n"
@@@ -6741,33 -5327,26 +6699,33 @@@ msgstr "
  "trükisüsteem\n"
  "võib salvestada need andmed ja teha teistele kättesaadavaks! \n"
  
- #: g10/revoke.c:769
++#: g10/revoke.c:770
  msgid "Please select the reason for the revocation:\n"
  msgstr "Palun valige tühistamise põhjus:\n"
  
- #: g10/revoke.c:779
++#: g10/revoke.c:780
  msgid "Cancel"
  msgstr "Katkesta"
  
- #: g10/revoke.c:781
++#: g10/revoke.c:782
  #, c-format
  msgid "(Probably you want to select %d here)\n"
  msgstr "(Tõenäoliselt soovite siin valida %d)\n"
  
- #: g10/revoke.c:822
++#: g10/revoke.c:823
  msgid "Enter an optional description; end it with an empty line:\n"
  msgstr "Sisestage mittekohustuslik kirjeldus. Lõpetage tühja reaga:\n"
  
- #: g10/revoke.c:850
++#: g10/revoke.c:851
  #, c-format
  msgid "Reason for revocation: %s\n"
  msgstr "Tühistamise põhjus: %s\n"
  
- #: g10/revoke.c:852
++#: g10/revoke.c:853
  msgid "(No description given)\n"
  msgstr "(Kirjeldust ei antud)\n"
  
- #: g10/revoke.c:857
++#: g10/revoke.c:858
  #, fuzzy
  msgid "Is this okay? (y/N) "
  msgstr "On see hästi? "
@@@ -6892,23 -5451,19 +6850,23 @@@ msgstr "
  "HOIATUS: poliisi urli %%-asendus ebaõnnestus (liiga suur). Kasutan "
  "kompaktset.\n"
  
- #: g10/sign.c:329
++#: g10/sign.c:331
  #, fuzzy, c-format
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s allkiri kasutajalt: \"%s\"\n"
  
- #: g10/sign.c:878
++#: g10/sign.c:880
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
  msgstr ""
  "sõnumilühendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
  
- #: g10/sign.c:1009
++#: g10/sign.c:1011
  msgid "signing:"
  msgstr "allkirjastan:"
  
- #: g10/sign.c:1286
++#: g10/sign.c:1288
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "kasutatakse %s krüpteerimist\n"
@@@ -6934,7 -5485,6 +6892,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:362
++#: g10/tdbdump.c:57 g10/trustdb.c:369
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "usalduse kirje %lu, tüüp %d: kirjutamine ebaõnnestus: %s\n"
@@@ -6982,7 -5524,6 +6940,7 @@@ msgstr "viga usalduse kirje otsimisel: 
  msgid "read error in '%s': %s\n"
  msgstr "viga lugemisel: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "trustdb: sync ebaõnnestus: %s\n"
@@@ -7128,298 -5640,306 +7086,372 @@@ msgstr "ei suuda käsitleda tekstiridu 
  msgid "input line longer than %d characters\n"
  msgstr "sisendrida on pikem, kui %d sümbolit\n"
  
- #: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
++#: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
  #, fuzzy, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "viga teate saatmisel serverile `%s': %s\n"
  
- #: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
++#: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:357 g10/tofu.c:699
++#: g10/tofu.c:355 g10/tofu.c:888
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:501
++#: g10/tofu.c:505
  #, fuzzy, c-format
  msgid "unsupported TOFU database version: %s\n"
  msgstr ""
  "\n"
  "Toetatud algoritmid:\n"
  
- #: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
- #: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
- #: g10/tofu.c:3056
++#: g10/tofu.c:538
+ #, fuzzy, c-format
+ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
+ msgstr "viga parooli loomisel: %s\n"
+ 
++#: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
+ msgid "TOFU DB error"
+ msgstr ""
+ 
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2340 g10/tofu.c:2359
++#: g10/tofu.c:2372 g10/tofu.c:2384 g10/tofu.c:2399 g10/tofu.c:2411
++#: g10/tofu.c:2980 g10/tofu.c:2997 g10/tofu.c:3033 g10/tofu.c:3050
++#: g10/tofu.c:3353
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "viga teate saatmisel serverile `%s': %s\n"
  
- #: g10/tofu.c:566 g10/tofu.c:574
++#: g10/tofu.c:716 g10/tofu.c:724
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error determining TOFU database's version: %s\n"
  msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
  
- #: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
++#: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing TOFU database: %s\n"
  msgstr "%s: viga kataloogikirje kirjutamisel: %s\n"
  
- #: g10/tofu.c:765
++#: g10/tofu.c:844
+ #, fuzzy, c-format
+ msgid "error creating 'encryptions' TOFU table: %s\n"
+ msgstr "viga teate saatmisel serverile `%s': %s\n"
+ 
++#: g10/tofu.c:874
+ #, c-format
+ msgid "adding column effective_policy to bindings DB: %s\n"
+ msgstr ""
+ 
++#: g10/tofu.c:956
  #, fuzzy, c-format
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
  
- #: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
++#: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "viga teate saatmisel serverile `%s': %s\n"
  
- #: g10/tofu.c:1239
++#: g10/tofu.c:1328
  #, c-format
  msgid ""
  "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1247
++#: g10/tofu.c:1337
  #, c-format
- msgid "The email address \"%s\" is associated with %d keys!"
- msgstr ""
+ msgid "The email address \"%s\" is associated with %d key!"
+ msgid_plural "The email address \"%s\" is associated with %d keys!"
+ msgstr[0] ""
+ msgstr[1] ""
  
- #: g10/tofu.c:1251
++#: g10/tofu.c:1343
  msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  
- #: g10/tofu.c:1257
++#: g10/tofu.c:1349
  #, c-format
  msgid ""
  "Please indicate whether this email address should be associated with key %s "
  "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1513
++#: g10/tofu.c:1605
  #, fuzzy, c-format
  msgid "error gathering other user IDs: %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: g10/tofu.c:1523
++#: g10/tofu.c:1615
  #, fuzzy
  #| msgid "list key and user IDs"
  msgid "This key's user IDs:\n"
  msgstr "näita võtit ja kasutaja IDd"
  
- #: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
++#: g10/tofu.c:1631 g10/tofu.c:1796
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "policy: %s"
  msgstr "Poliis: "
  
- #: g10/tofu.c:1630
++#: g10/tofu.c:1722
  #, fuzzy, c-format
  msgid "error gathering signature stats: %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: g10/tofu.c:1634
++#: g10/tofu.c:1726
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1651
++#: g10/tofu.c:1744
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1684 g10/tofu.c:1689
++#: g10/tofu.c:1785 g10/tofu.c:1790
  msgid ", "
  msgstr ""
  
- #: g10/tofu.c:1693
++#: g10/tofu.c:1794
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
  msgstr "näita võtmeid"
  
- #: g10/tofu.c:1715
++#: g10/tofu.c:1820
+ #, fuzzy, c-format
+ msgid "Verified %d message."
+ msgid_plural "Verified %d messages."
+ msgstr[0] "|algo [failid]|trüki teatelühendid"
+ msgstr[1] "|algo [failid]|trüki teatelühendid"
+ 
++#: g10/tofu.c:1824
  #, fuzzy, c-format
- msgid "Verified %d message"
- msgid_plural "Verified %d messages"
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid "Encrypted %d message."
+ msgid_plural "Encrypted %d messages."
+ msgstr[0] "krüpteeritud kasutades %lu parooli\n"
+ msgstr[1] "krüpteeritud kasutades %lu parooli\n"
+ 
++#: g10/tofu.c:1831
+ #, fuzzy, c-format
+ msgid "Verified %d message in the future."
+ msgid_plural "Verified %d messages in the future."
+ msgstr[0] "|algo [failid]|trüki teatelühendid"
+ msgstr[1] "|algo [failid]|trüki teatelühendid"
+ 
++#: g10/tofu.c:1835
+ #, fuzzy, c-format
+ msgid "Encrypted %d message in the future."
+ msgid_plural "Encrypted %d messages in the future."
  msgstr[0] "|algo [failid]|trüki teatelühendid"
  msgstr[1] "|algo [failid]|trüki teatelühendid"
  
- #: g10/tofu.c:1719
++#: g10/tofu.c:1849
  #, c-format
- msgid "Encrypted %d message"
- msgid_plural "Encrypted %d messages"
+ msgid "Messages verified over the past %d day: %d."
+ msgid_plural "Messages verified over the past %d days: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1734
++#: g10/tofu.c:1855
  #, c-format
- msgid " over the past day."
- msgid_plural " over the past %d days."
+ msgid "Messages encrypted over the past %d day: %d."
+ msgid_plural "Messages encrypted over the past %d days: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1740
++#: g10/tofu.c:1865
  #, c-format
- msgid " over the past month."
- msgid_plural " over the past %d months."
+ msgid "Messages verified over the past %d month: %d."
+ msgid_plural "Messages verified over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1746
++#: g10/tofu.c:1871
  #, c-format
- msgid " over the past year."
- msgid_plural " over the past %d years."
+ msgid "Messages encrypted over the past %d month: %d."
+ msgid_plural "Messages encrypted over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1752
- msgid " in the past."
++#: g10/tofu.c:1881
+ #, c-format
+ msgid "Messages verified over the past %d year: %d."
+ msgid_plural "Messages verified over the past %d years: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1887
+ #, c-format
+ msgid "Messages encrypted over the past %d year: %d."
+ msgid_plural "Messages encrypted over the past %d years: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1895
+ #, c-format
+ msgid "Messages verified in the past: %d."
  msgstr ""
  
++#: g10/tofu.c:1899
+ #, fuzzy, c-format
+ msgid "Messages encrypted in the past: %d."
+ msgstr "|algo [failid]|trüki teatelühendid"
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1767
++#: g10/tofu.c:1916
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1809
++#: g10/tofu.c:1958
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1815
++#: g10/tofu.c:1964
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1823
++#: g10/tofu.c:1972
  msgid "Defaulting to unknown."
  msgstr ""
  
- #: g10/tofu.c:1938 g10/tofu.c:2074
++#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
- #: g10/tofu.c:1994
++#: g10/tofu.c:2143
  #, fuzzy, c-format
  msgid "resetting keydb: %s\n"
  msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
  
- #: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
- #: g10/tofu.c:2425
++#: g10/tofu.c:2601
  #, fuzzy, c-format
- msgid "error setting TOFU binding's trust level to %s\n"
+ msgid "error setting TOFU binding's policy to %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
  
- #: g10/tofu.c:2473
++#: g10/tofu.c:2794
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #. TRANSLATORS: The tilde ('~') is used here to indicate a
- #. * non-breakable space
- #: g10/tofu.c:2574
++#: g10/tofu.c:2839
  #, c-format
- msgid "%d~year"
- msgid_plural "%d~years"
+ msgid "%lld~year"
+ msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2583
++#: g10/tofu.c:2844
  #, c-format
- msgid "%d~month"
- msgid_plural "%d~months"
+ msgid "%lld~month"
+ msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2592
++#: g10/tofu.c:2849
  #, c-format
- msgid "%d~day"
- msgid_plural "%d~days"
+ msgid "%lld~week"
+ msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2854
  #, c-format
- msgid "%d~hour"
- msgid_plural "%d~hours"
+ msgid "%lld~day"
+ msgid_plural "%lld~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2610
++#: g10/tofu.c:2859
  #, c-format
- msgid "%d~minute"
- msgid_plural "%d~minutes"
+ msgid "%lld~hour"
+ msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2619
++#: g10/tofu.c:2864
  #, c-format
- msgid "%d~second"
- msgid_plural "%d~seconds"
+ msgid "%lld~minute"
+ msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2802
++#: g10/tofu.c:2866
  #, c-format
- msgid "%s: "
+ msgid "%lld~second"
+ msgid_plural "%lld~seconds"
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:3103
+ #, c-format
+ msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:2806
++#: g10/tofu.c:3109
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
- msgid "Verified %ld signatures"
+ msgid "%s: Verified 0 signatures."
  msgstr "Kustutatud %d allkirja.\n"
  
- #: g10/tofu.c:2816
++#: g10/tofu.c:3117
  #, fuzzy, c-format
- msgid "Verified %ld signature in the past %s"
- msgid_plural "Verified %ld signatures in the past %s"
+ msgid "%s: Verified %ld~signature in the past %s."
+ msgid_plural "%s: Verified %ld~signatures in the past %s."
  msgstr[0] "|algo [failid]|trüki teatelühendid"
  msgstr[1] "|algo [failid]|trüki teatelühendid"
  
- #: g10/tofu.c:2826
- #, fuzzy, c-format
++#: g10/tofu.c:3127
+ #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
- msgid ", and encrypted %ld messages"
+ msgid "Encrypted 0 messages."
  msgstr "krüpteeritud kasutades %lu parooli\n"
  
- #: g10/tofu.c:2835
++#: g10/tofu.c:3135
  #, fuzzy, c-format
- msgid ", and encrypted %ld message in the past %s"
- msgid_plural ", and encrypted %ld messages in the past %s"
+ msgid "Encrypted %ld~message in the past %s."
+ msgid_plural "Encrypted %ld~messages in the past %s."
  msgstr[0] "|algo [failid]|trüki teatelühendid"
  msgstr[1] "|algo [failid]|trüki teatelühendid"
  
- #: g10/tofu.c:2880
++#: g10/tofu.c:3146
+ #, fuzzy, c-format
+ #| msgid "Policy: "
+ msgid "(policy: %s)"
+ msgstr "Poliis: "
+ 
++#: g10/tofu.c:3177
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2883
++#: g10/tofu.c:3180
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2887
++#: g10/tofu.c:3184
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2890
++#: g10/tofu.c:3187
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2919
++#: g10/tofu.c:3216
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7436,18 -5956,14 +7468,18 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
- #: g10/tofu.c:3480 g10/tofu.c:3572
++#: g10/tofu.c:3298 g10/tofu.c:3449 g10/tofu.c:3627 g10/tofu.c:3670
++#: g10/tofu.c:3784 g10/tofu.c:3859 g10/tofu.c:3894
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "viga teate saatmisel serverile `%s': %s\n"
  
- #: g10/tofu.c:3185
++#: g10/tofu.c:3482
  #, c-format
- msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
  msgstr ""
  
- #: g10/tofu.c:3515
++#: g10/tofu.c:3819
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7479,74 -5990,59 +7511,74 @@@ msgstr "võti %08lX: usaldataval võtme
  msgid "key %s marked as ultimately trusted\n"
  msgstr "võti on märgitud abslouutselt usaldatuks.\n"
  
- #: g10/trustdb.c:341
++#: g10/trustdb.c:348
  #, 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:347
++#: g10/trustdb.c:354
  #, 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:422
++#: g10/trustdb.c:429
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr ""
  
- #: g10/trustdb.c:431
++#: g10/trustdb.c:438
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:468
++#: g10/trustdb.c:475
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:474
++#: g10/trustdb.c:481
  #, c-format
  msgid "using %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:511
++#: g10/trustdb.c:518
  msgid "no need for a trustdb check\n"
  msgstr "trustdb kontrolliks puudub vajadus\n"
  
- #: g10/trustdb.c:517 g10/trustdb.c:2160
++#: g10/trustdb.c:524 g10/trustdb.c:2187
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "trustdb järgmine kontroll %s\n"
  
- #: g10/trustdb.c:526
++#: g10/trustdb.c:533
  #, fuzzy, c-format
  msgid "no need for a trustdb check with '%s' trust model\n"
  msgstr "trustdb kontrolliks puudub vajadus\n"
  
- #: g10/trustdb.c:542
++#: g10/trustdb.c:549
  #, fuzzy, c-format
  msgid "no need for a trustdb update with '%s' trust model\n"
  msgstr "trustdb kontrolliks puudub vajadus\n"
  
- #: g10/trustdb.c:749 g10/trustdb.c:1313
++#: g10/trustdb.c:756 g10/trustdb.c:1340
  #, fuzzy, c-format
  msgid "public key %s not found: %s\n"
  msgstr "ei leia avalikku võtit %08lX: %s\n"
  
- #: g10/trustdb.c:966
++#: g10/trustdb.c:973
  msgid "please do a --check-trustdb\n"
  msgstr "palun tehke --check-trustdb\n"
  
- #: g10/trustdb.c:971
++#: g10/trustdb.c:978
  msgid "checking the trustdb\n"
  msgstr "kontrollin trustdb faili\n"
  
- #: g10/trustdb.c:1883
++#: g10/trustdb.c:1910
  #, 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:1886
++#: g10/trustdb.c:1913
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7554,22 -6050,18 +7586,22 @@@ msgid_plural " (%d validity counts clea
  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:1956
++#: g10/trustdb.c:1983
  msgid "no ultimately trusted keys found\n"
  msgstr "absoluutselt usaldatavaid võtmeid pole\n"
  
- #: g10/trustdb.c:1970
++#: g10/trustdb.c:1997
  #, 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:2087
++#: g10/trustdb.c:2114
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr ""
  
- #: g10/trustdb.c:2167
++#: g10/trustdb.c:2194
  #, 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"
@@@ -7683,19 -6154,14 +7715,19 @@@ msgid "
  "List, export, import Keybox data\n"
  msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3208
++#: scd/app-nks.c:718 scd/app-openpgp.c:3221
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3220
++#: scd/app-nks.c:726 scd/app-openpgp.c:3233
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
- #: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
- #: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1965 scd/app-openpgp.c:1984
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2166 scd/app-openpgp.c:2430
++#: scd/app-openpgp.c:2477 scd/app-openpgp.c:2582 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr ""
@@@ -7744,84 -6201,66 +7776,84 @@@ msgid "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2511 scd/app-dinsig.c:532
  #, fuzzy, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: scd/app-openpgp.c:806
++#: scd/app-openpgp.c:801
  #, fuzzy, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
  
- #: scd/app-openpgp.c:819
++#: scd/app-openpgp.c:814
  #, fuzzy, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "võtmehoidla vahemälu uuesti loomine ebaõnnestus: %s\n"
  
- #: scd/app-openpgp.c:1236
++#: scd/app-openpgp.c:1247
  msgid "response does not contain the RSA modulus\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1243
++#: scd/app-openpgp.c:1254
  msgid "response does not contain the RSA public exponent\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1353
++#: scd/app-openpgp.c:1364
  #, fuzzy
  #| msgid "remove keys from the public keyring"
  msgid "response does not contain the EC public key\n"
  msgstr "eemalda võtmed avalike võtmete hoidlast"
  
- #: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:1464 scd/app-openpgp.c:3825
  msgid "response does not contain the public key data\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1551
++#: scd/app-openpgp.c:1564
  #, fuzzy, c-format
  msgid "reading public key failed: %s\n"
  msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
  
- #: scd/app-openpgp.c:1903
++#: scd/app-openpgp.c:1916
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1910
++#: scd/app-openpgp.c:1923
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1925
++#: scd/app-openpgp.c:1938
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr ""
  
- #: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
++#: scd/app-openpgp.c:1949 scd/app-openpgp.c:2424
  #, fuzzy
  msgid "||Please enter the PIN"
  msgstr "muuda parooli"
  
- #: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2173 scd/app-openpgp.c:2437
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
- #: scd/app-openpgp.c:4114
++#: scd/app-openpgp.c:2004 scd/app-openpgp.c:2043 scd/app-openpgp.c:2185
++#: scd/app-openpgp.c:4126
  #, fuzzy, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "võtmeserverile saatmine ebaõnnestus: %s\n"
  
- #: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
++#: scd/app-openpgp.c:2072 scd/app-openpgp.c:2458 scd/app-openpgp.c:4556
  msgid "error retrieving CHV status from card\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
++#: scd/app-openpgp.c:2078 scd/app-openpgp.c:4565
  msgid "card is permanently locked!\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2072
++#: scd/app-openpgp.c:2085
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7831,26 -6270,21 +7863,26 @@@ msgstr[1] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:2082
++#: scd/app-openpgp.c:2095
  #, fuzzy, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "muuda parooli"
  
- #: scd/app-openpgp.c:2086
++#: scd/app-openpgp.c:2099
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
  msgstr "muuda parooli"
  
- #: scd/app-openpgp.c:2107
++#: scd/app-openpgp.c:2120
  msgid "access to admin commands is not configured\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2460
++#: scd/app-openpgp.c:2473
  #, fuzzy
  msgid "||Please enter the Reset Code for the card"
  msgstr "Palun valige tühistamise põhjus:\n"
  
- #: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
++#: scd/app-openpgp.c:2483 scd/app-openpgp.c:2537
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr ""
@@@ -7858,117 -6292,93 +7890,117 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2493
++#: scd/app-openpgp.c:2506
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|AN|New Admin PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|N|New PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2565
++#: scd/app-openpgp.c:2578
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "muuda parooli"
  
- #: scd/app-openpgp.c:2566
++#: scd/app-openpgp.c:2579
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
  msgstr "muuda parooli"
  
- #: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
++#: scd/app-openpgp.c:2635 scd/app-openpgp.c:3885
  #, fuzzy
  msgid "error reading application data\n"
  msgstr "viga võtmebloki lugemisel: %s\n"
  
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
++#: scd/app-openpgp.c:2641 scd/app-openpgp.c:3892
  #, fuzzy
  msgid "error reading fingerprint DO\n"
  msgstr "%s: viga vaba kirje lugemisel: %s\n"
  
- #: scd/app-openpgp.c:2638
++#: scd/app-openpgp.c:2651
  #, fuzzy
  msgid "key already exists\n"
  msgstr "`%s' on juba pakitud\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2655
  msgid "existing key will be replaced\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2644
++#: scd/app-openpgp.c:2657
  #, fuzzy
  msgid "generating new key\n"
  msgstr "genereeri uus võtmepaar"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2659
  #, fuzzy
  msgid "writing new key\n"
  msgstr "genereeri uus võtmepaar"
  
- #: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
++#: scd/app-openpgp.c:3201 scd/app-openpgp.c:3553
  msgid "creation timestamp missing\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
++#: scd/app-openpgp.c:3243 scd/app-openpgp.c:3251
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
++#: scd/app-openpgp.c:3384 scd/app-openpgp.c:3647
  #, fuzzy, c-format
  msgid "failed to store the key: %s\n"
  msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
  
- #: scd/app-openpgp.c:3534
++#: scd/app-openpgp.c:3547
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "mittetoetatud URI"
  
- #: scd/app-openpgp.c:3790
++#: scd/app-openpgp.c:3802
  msgid "please wait while key is being generated ...\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3798
++#: scd/app-openpgp.c:3810
  #, fuzzy
  msgid "generating key failed\n"
  msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
  
- #: scd/app-openpgp.c:3804
++#: scd/app-openpgp.c:3816
  #, fuzzy, c-format
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
  msgstr[0] "Võtme genereerimine ebaõnnestus: %s\n"
  msgstr[1] "Võtme genereerimine ebaõnnestus: %s\n"
  
- #: scd/app-openpgp.c:3838
++#: scd/app-openpgp.c:3850
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:3900
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4004
++#: scd/app-openpgp.c:4016
  #, fuzzy, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
  
- #: scd/app-openpgp.c:4089
++#: scd/app-openpgp.c:4101
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4551
++#: scd/app-openpgp.c:4570
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
++#: scd/app-openpgp.c:4871 scd/app-openpgp.c:4882
  #, fuzzy, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "ei leia OpenPGP andmeid.\n"
@@@ -7989,7 -6396,6 +8021,7 @@@ msgstr "
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
@@@ -8034,27 -6431,22 +8066,27 @@@ msgstr "vastuolulised käsud\n
  msgid "use variable length input for pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:287
++#: scd/scdaemon.c:286
  #, fuzzy
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
  
- #: scd/scdaemon.c:289
++#: scd/scdaemon.c:288
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
  msgstr ""
  
- #: scd/scdaemon.c:786
++#: scd/scdaemon.c:784
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1904
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
++#: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1909
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
@@@ -8134,9 -6510,6 +8166,9 @@@ msgstr "viga parooli loomisel: %s\n
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
  
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
 +#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  #, fuzzy
  msgid "failed to allocate keyDB handle\n"
  msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
@@@ -8631,11 -6902,9 +8663,11 @@@ msgstr "
  msgid "resource problem: out of core\n"
  msgstr ""
  
- #: sm/decrypt.c:330
++#: sm/decrypt.c:332
  msgid "(this is the RC2 algorithm)\n"
  msgstr ""
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:334
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr ""
  
@@@ -8679,124 -6940,96 +8711,124 @@@ msgstr "näita salajasi võtmeid
  msgid "list certificate chain"
  msgstr "halb sertifikaat"
  
- #: sm/gpgsm.c:218
++#: sm/gpgsm.c:219
  #, fuzzy
  msgid "import certificates"
  msgstr "halb sertifikaat"
  
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
  #, fuzzy
  msgid "export certificates"
  msgstr "halb sertifikaat"
  
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:228
  msgid "register a smartcard"
  msgstr ""
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:231
  msgid "pass a command to the dirmngr"
  msgstr ""
  
- #: sm/gpgsm.c:232
++#: sm/gpgsm.c:233
  msgid "invoke gpg-protect-tool"
  msgstr ""
  
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:250
  #, fuzzy
  msgid "create base-64 encoded output"
  msgstr "loo ascii pakendis väljund"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in PEM format"
  msgstr ""
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in base-64 format"
  msgstr ""
  
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:262
  msgid "assume input is in binary format"
  msgstr ""
  
- #: sm/gpgsm.c:267
++#: sm/gpgsm.c:269
  msgid "never consult a CRL"
  msgstr ""
  
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:279
  msgid "check validity using OCSP"
  msgstr ""
  
- #: sm/gpgsm.c:282
++#: sm/gpgsm.c:284
  msgid "|N|number of certificates to include"
  msgstr ""
  
- #: sm/gpgsm.c:285
++#: sm/gpgsm.c:287
  msgid "|FILE|take policy information from FILE"
  msgstr ""
  
- #: sm/gpgsm.c:288
++#: sm/gpgsm.c:290
  msgid "do not check certificate policies"
  msgstr ""
  
- #: sm/gpgsm.c:292
++#: sm/gpgsm.c:294
  msgid "fetch missing issuer certificates"
  msgstr ""
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "don't use the terminal at all"
  msgstr "ära kasuta terminali"
  
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:307
  msgid "|FILE|write a server mode log to FILE"
  msgstr ""
  
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:312
  #, fuzzy
  msgid "|FILE|write an audit log to FILE"
  msgstr "|FAIL|lae laiendusmoodul FAIL"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "batch mode: never ask"
  msgstr "pakettmood: ära küsi kunagi"
  
- #: sm/gpgsm.c:314
++#: sm/gpgsm.c:316
  msgid "assume yes on most questions"
  msgstr "eelda enamus küsimustele jah vastust"
  
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:317
  msgid "assume no on most questions"
  msgstr "eelda enamus küsimustele ei vastust"
  
- #: sm/gpgsm.c:318
++#: sm/gpgsm.c:320
  #, fuzzy
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "lisa see võtmehoidla võtmehoidlate nimekirja"
  
- #: sm/gpgsm.c:321
++#: sm/gpgsm.c:323
  #, fuzzy
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
  
- #: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
  #, fuzzy
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|HOST|kasuta seda võtmeserverit"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|NIMI|kasuta šifri algoritmi NIMI"
  
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:352
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|NIMI|kasuta teatelühendi algoritmi NIMI"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:559
  #, 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:570
++#: sm/gpgsm.c:562
  #, fuzzy
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
@@@ -8807,47 -7040,38 +8839,47 @@@ msgstr "
  "allkirjasta, kontrolli, krüpti ja dekrüpti\n"
  "vaikimisi operatsioon sõltub sisendandmetest\n"
  
- #: sm/gpgsm.c:774
++#: sm/gpgsm.c:766
  #, 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:785
++#: sm/gpgsm.c:777
  #, fuzzy, c-format
  msgid "unknown validation model '%s'\n"
  msgstr "tundmatu vaikimisi saaja `%s'\n"
  
- #: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
  #, fuzzy, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "(Kirjeldust ei antud)\n"
  
- #: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr ""
  
- #: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
  #, fuzzy, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr " j = jäta see võti vahele\n"
  
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1427
  #, fuzzy
  msgid "could not parse keyserver\n"
  msgstr "ei saa parsida võtmeserveri URI\n"
  
- #: sm/gpgsm.c:1636
++#: sm/gpgsm.c:1630
  #, fuzzy, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "kirjutan faili `%s'\n"
  
- #: sm/gpgsm.c:1677
++#: sm/gpgsm.c:1671
  #, fuzzy, c-format
  msgid "can't sign using '%s': %s\n"
  msgstr "`%s' ei õnnestu sulgeda: %s\n"
  
- #: sm/gpgsm.c:2033
++#: sm/gpgsm.c:2028
  msgid "invalid command (there is no implicit command)\n"
  msgstr ""
  
@@@ -9607,8 -7680,6 +9639,8 @@@ msgstr "
  msgid "CRL access not possible due to disabled %s\n"
  msgstr ""
  
 +#: dirmngr/crlfetch.c:223 dirmngr/ldap-wrapper-ce.c:488
- #: dirmngr/ldap-wrapper.c:742 dirmngr/misc.c:563
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:563
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
@@@ -9793,116 -7828,88 +9825,116 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:160
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:158
++#: dirmngr/dirmngr.c:161
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|FAIL|lae laiendusmoodul FAIL"
  
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:162
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:163
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:164
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
- #: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
++#: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:177
++#: dirmngr/dirmngr.c:180
  #, fuzzy
  msgid "run without asking a user"
  msgstr "Väljun salvestamata? "
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:181
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:182
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:184
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:185
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:186
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:188
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:192
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:202
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FAIL|lae laiendusmoodul FAIL"
  
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:210
  #, fuzzy
  msgid "|URL|use OCSP responder at URL"
  msgstr "ei saa parsida võtmeserveri URI\n"
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:212
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:218
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:220
++#: dirmngr/dirmngr.c:223
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:225
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:240
++#: dirmngr/dirmngr.c:246
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -9915,91 -7922,72 +9947,91 @@@ msgstr "
  "@\n"
  "(Kõikide käskude ja võtmete täieliku kirjelduse leiate manualist)\n"
  
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:361
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
  
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:363
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:443
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
- #: tools/gpgconf.c:648
++#: dirmngr/dirmngr.c:496 tools/gpgconf.c:550 tools/gpgconf.c:585
++#: tools/gpgconf.c:656
  #, fuzzy, c-format
  msgid "usage: %s [options] "
  msgstr "kasuta: gpg [võtmed] "
  
- #: dirmngr/dirmngr.c:1062
++#: dirmngr/dirmngr.c:1074
  #, fuzzy
  #| 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:1301 dirmngr/server.c:1585
++#: dirmngr/dirmngr.c:1300 dirmngr/server.c:1585
  #, fuzzy, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "pakendamine ebaõnnestus: %s\n"
  
- #: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
++#: dirmngr/dirmngr.c:1306 dirmngr/server.c:1591
  #, fuzzy, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "pakendamine ebaõnnestus: %s\n"
  
- #: dirmngr/dirmngr.c:1484
++#: dirmngr/dirmngr.c:1487
  #, fuzzy, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "rida on liiga pikk\n"
  
- #: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
++#: dirmngr/dirmngr.c:1542 dirmngr/dirmngr.c:1626
  #, fuzzy, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "viga: vigane sõrmejälg\n"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
++#: dirmngr/dirmngr.c:1578 dirmngr/dirmngr.c:1604 tools/gpgconf-comp.c:4032
  #, fuzzy, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "viga lugemisel: %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1633
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1700
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1734
++#: dirmngr/dirmngr.c:1738
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1739
++#: dirmngr/dirmngr.c:1743
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1745
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1746
++#: dirmngr/dirmngr.c:1750
  #, fuzzy
  msgid "shutdown forced\n"
  msgstr "ei töödeldud"
  
- #: dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1758
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1761
++#: dirmngr/dirmngr.c:1765
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10481,33 -8370,27 +10513,33 @@@ msgstr "võtmebloki kustutamine ebaõnn
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2463
++#: dirmngr/server.c:2469
  #, fuzzy, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "`%s' ei õnnestu luua: %s\n"
  
- #: dirmngr/server.c:2474
++#: dirmngr/server.c:2480
  #, fuzzy, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n"
  
- #: dirmngr/server.c:2495
++#: dirmngr/server.c:2501
  #, 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:2503
++#: dirmngr/server.c:2509
  #, 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:2534
++#: dirmngr/server.c:2540
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2553
++#: dirmngr/server.c:2559
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
@@@ -10555,7 -8429,6 +10587,7 @@@ msgstr "DSA nõuab 160 bitist räsialgo
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:167
  #, fuzzy
  msgid "quiet"
  msgstr "välju"
@@@ -10648,22 -8501,15 +10680,22 @@@ msgstr "allkirjastamine ebaõnnestus: %
  msgid "error sending standard options: %s\n"
  msgstr "viga teate saatmisel serverile `%s': %s\n"
  
 +#: tools/gpgconf-comp.c:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
- #: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
++#: tools/gpgconf-comp.c:766 tools/gpgconf-comp.c:865
  msgid "Options controlling the diagnostic output"
  msgstr ""
  
 +#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
- #: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
++#: tools/gpgconf-comp.c:779 tools/gpgconf-comp.c:888
  msgid "Options controlling the configuration"
  msgstr ""
  
- #: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
- #: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
++#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:723
++#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:901
  msgid "Options useful for debugging"
  msgstr ""
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
  msgid "Options controlling the security"
  msgstr ""
  
@@@ -10713,11 -8548,9 +10745,11 @@@ msgstr "viga parooli loomisel: %s\n
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
++#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
  msgid "|NAME|use NAME as default secret key"
  msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
  
- #: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
++#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:784
  #, fuzzy
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NIMI|krüpti NIMEle"
@@@ -10726,194 -8558,161 +10758,208 @@@
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
++#: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
  msgid "Configuration for Keyservers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
++#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
  #, fuzzy
  msgid "|URL|use keyserver at URL"
  msgstr "ei saa parsida võtmeserveri URI\n"
  
- #: tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:741
  msgid "allow PKA lookups (DNS requests)"
  msgstr ""
  
- #: tools/gpgconf-comp.c:738
++#: tools/gpgconf-comp.c:744
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr ""
  
- #: tools/gpgconf-comp.c:787
++#: tools/gpgconf-comp.c:793
  msgid "disable all access to the dirmngr"
  msgstr ""
  
- #: tools/gpgconf-comp.c:790
++#: tools/gpgconf-comp.c:796
  #, fuzzy
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
  msgstr "|NIMI|kasuta paroolidega šifri algoritmi NIMI"
  
- #: tools/gpgconf-comp.c:820
++#: tools/gpgconf-comp.c:829
  msgid "do not check CRLs for root certificates"
  msgstr ""
  
- #: tools/gpgconf-comp.c:869
++#: tools/gpgconf-comp.c:878
  msgid "Options controlling the format of the output"
  msgstr ""
  
- #: tools/gpgconf-comp.c:905
++#: tools/gpgconf-comp.c:920
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:918
++#: tools/gpgconf-comp.c:933
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:947
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:958
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:948
++#: tools/gpgconf-comp.c:963
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:977
++#: tools/gpgconf-comp.c:992
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:985
++#: tools/gpgconf-comp.c:1000
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1066
++#: tools/gpgconf-comp.c:1081
  msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1067
++#: tools/gpgconf-comp.c:1082
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1083
  msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1069
++#: tools/gpgconf-comp.c:1084
  msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1070
++#: tools/gpgconf-comp.c:1085
  #, fuzzy
  #| msgid "network error"
  msgid "Network"
  msgstr "võrgu viga"
  
- #: tools/gpgconf-comp.c:1071
++#: tools/gpgconf-comp.c:1086
  #, fuzzy
  msgid "Passphrase Entry"
  msgstr "halb parool"
  
- #: tools/gpgconf-comp.c:1225
++#: tools/gpgconf-comp.c:1240
  #, fuzzy
  msgid "Component not suitable for launching"
  msgstr "ei leia avalikku võtit"
  
- #: tools/gpgconf-comp.c:3283
++#: tools/gpgconf-comp.c:3311
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3434
++#: tools/gpgconf-comp.c:3462
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf-comp.c:4036
+ #, fuzzy, c-format
+ msgid "error closing '%s'\n"
+ msgstr "viga `%s' lugemisel: %s\n"
+ 
++#: tools/gpgconf-comp.c:4038
+ #, fuzzy, c-format
+ msgid "error parsing '%s'\n"
+ msgstr "viga `%s' lugemisel: %s\n"
+ 
++#: tools/gpgconf.c:73
  msgid "list all components"
  msgstr ""
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "check all programs"
  msgstr ""
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|list options"
  msgstr ""
  
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
  msgid "|COMPONENT|change options"
  msgstr ""
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "|COMPONENT|check options"
  msgstr ""
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "apply global default values"
  msgstr ""
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
+ msgid "|FILE|update configuration files using FILE"
+ msgstr ""
+ 
++#: tools/gpgconf.c:83
  msgid "get the configuration directories for @GPGCONF@"
  msgstr ""
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:85
  #, fuzzy
  msgid "list global configuration file"
  msgstr "tundmatu seade \"%s\"\n"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  #, fuzzy
  msgid "check global configuration file"
  msgstr "tundmatu seade \"%s\"\n"
  
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:89
  #, fuzzy
  #| msgid "update the trust database"
  msgid "query the software version database"
  msgstr "uuenda usalduse andmebaasi"
  
- #: tools/gpgconf.c:86
++#: tools/gpgconf.c:90
  msgid "reload all or a given component"
  msgstr ""
  
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:91
  msgid "launch a given component"
  msgstr ""
  
- #: tools/gpgconf.c:88
++#: tools/gpgconf.c:92
  msgid "kill a given component"
  msgstr ""
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "use as output file"
  msgstr "kasuta väljundfailina"
  
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:102
  msgid "activate changes at runtime, if possible"
  msgstr ""
  
- #: tools/gpgconf.c:122
++#: tools/gpgconf.c:127
  #, fuzzy
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
  
- #: tools/gpgconf.c:125
++#: tools/gpgconf.c:130
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
  msgstr ""
  
- #: tools/gpgconf.c:545 tools/gpgconf.c:579
++#: tools/gpgconf.c:552 tools/gpgconf.c:587
  msgid "Need one component argument"
  msgstr ""
  
- #: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
++#: tools/gpgconf.c:561 tools/gpgconf.c:599 tools/gpgconf.c:632
  #, fuzzy
  msgid "Component not found"
  msgstr "ei leia avalikku võtit"
  
- #: tools/gpgconf.c:650
++#: tools/gpgconf.c:658
  #, fuzzy
  msgid "No argument allowed"
  msgstr "kirjutan salajase võtme faili `%s'\n"
diff --cc po/fi.po
index 2089584,108ce7a..5976160
--- a/po/fi.po
+++ b/po/fi.po
@@@ -22,7 -22,6 +22,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg 1.2.2\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-11-18 16:54+0100\n"
++"POT-Creation-Date: 2016-12-20 11:28+0100\n"
  "PO-Revision-Date: 2004-06-16 22:40+0300\n"
  "Last-Translator: Tommi Vainikainen <Tommi.Vainikainen at iki.fi>\n"
  "Language-Team: Finnish <translation-team-fi at lists.sourceforge.net>\n"
@@@ -171,25 -142,11 +171,25 @@@ msgstr "väärä salasana
  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:838 common/dotlock.c:839 g10/card-util.c:839
- #: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1306 g10/keygen.c:4577
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
++#: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't create '%s': %s\n"
  msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
  
 +#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
- #: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1307
++#: g10/import.c:305 g10/import.c:448 g10/import.c:621 g10/keygen.c:3681
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
- #: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
- #: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:825 g10/sign.c:1025
++#: g10/sign.c:1130 g10/sign.c:1275 g10/tdbdump.c:143 g10/tdbdump.c:151
++#: g10/tdbio.c:720 g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161
++#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
++#: dirmngr/certcache.c:368 dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1564
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
@@@ -252,11 -198,9 +252,11 @@@ msgstr "Ole hyvä ja syötä salasana, 
  msgid "failed to create stream from socket: %s\n"
  msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1100
++#: agent/divert-scd.c:92 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1101
++#: agent/divert-scd.c:93 g10/call-agent.c:1102
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  
@@@ -399,48 -317,33 +399,48 @@@ msgstr "
  "Valitsimet:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
  #, fuzzy
  #| msgid "Key is superseded"
  msgid "run in supervised mode"
  msgstr "Avain on uusittu"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:170 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "monisanainen"
  
 +#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "ole jonkinverran hiljaisempi"
  
- #: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
  msgid "csh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
- #: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
++#: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
  #, fuzzy
  msgid "|FILE|read options from FILE"
  msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
  
- #: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:177
  msgid "do not detach from the console"
  msgstr ""
  
@@@ -525,163 -411,121 +525,163 @@@ msgstr "ei tuettu
  #. 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:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:481 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1025 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:358
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:124 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  #, fuzzy
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr ""
  "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <gnupg-bugs at gnu.org>.\n"
  
- #: agent/gpg-agent.c:491
++#: agent/gpg-agent.c:490
  #, fuzzy
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
  
- #: agent/gpg-agent.c:493
++#: agent/gpg-agent.c:492
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:537 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:442
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:793
++#: agent/gpg-agent.c:1082 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:812
  #, 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"
  
- #: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
- #: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1093 agent/gpg-agent.c:1935 g10/gpg.c:2510
++#: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:817
++#: dirmngr/dirmngr.c:1670 tools/symcryptrun.c:932
  #, fuzzy, c-format
  #| msgid "option file `%s': %s\n"
  msgid "option file '%s': %s\n"
  msgstr "asetustiedosto \"%s\": %s\n"
  
- #: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:806
++#: agent/gpg-agent.c:1101 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:825
  #, 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:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
- #: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
++#: agent/gpg-agent.c:1223 g10/gpg.c:3643 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:936 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:527
  #, 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:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
++#: agent/gpg-agent.c:2080 scd/scdaemon.c:1073 dirmngr/dirmngr.c:1081
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
  msgstr "ei voida luoda kohdetta %s: %s\n"
  
- #: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
++#: agent/gpg-agent.c:2097 scd/scdaemon.c:1086 dirmngr/dirmngr.c:1094
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2134
++#: agent/gpg-agent.c:2135
  #, fuzzy
  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:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
++#: agent/gpg-agent.c:2145 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1126
  #, fuzzy
  msgid "error getting nonce for the socket\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
++#: agent/gpg-agent.c:2150 scd/scdaemon.c:1113 dirmngr/dirmngr.c:1129
  #, fuzzy, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
  
- #: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
- #: dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2160 agent/gpg-agent.c:2197 scd/scdaemon.c:1121
++#: dirmngr/dirmngr.c:1138
  #, 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:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:2165 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1143
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
  msgstr "päivitys epäonnistui: %s\n"
  
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
++#: agent/gpg-agent.c:2172 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1149
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
  msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
  
- #: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: agent/gpg-agent.c:2191 agent/gpg-agent.c:2234 g10/exec.c:199
 +#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, 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:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: agent/gpg-agent.c:2194 agent/gpg-agent.c:2239 g10/openfile.c:491
 +#: g10/openfile.c:520 sm/keydb.c:103
  #, fuzzy, c-format
  msgid "directory '%s' created\n"
  msgstr "%s: hakemisto luotu\n"
  
- #: agent/gpg-agent.c:2244
++#: agent/gpg-agent.c:2245
  #, fuzzy, c-format
  msgid "stat() failed for '%s': %s\n"
  msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
  
- #: agent/gpg-agent.c:2248
++#: agent/gpg-agent.c:2249
  #, fuzzy, c-format
  msgid "can't use '%s' as home directory\n"
  msgstr "%s: hakemistoa ei voi luoda: %s\n"
  
- #: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
++#: agent/gpg-agent.c:2392 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1871
  #, fuzzy, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
  
- #: agent/gpg-agent.c:2598
++#: agent/gpg-agent.c:2599
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2603
++#: agent/gpg-agent.c:2604
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2678
++#: agent/gpg-agent.c:2679
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2683
++#: agent/gpg-agent.c:2684
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
++#: agent/gpg-agent.c:2881 scd/scdaemon.c:1272 dirmngr/dirmngr.c:2075
  #, fuzzy, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "salaisen päivitys epäonnistui: %s\n"
  
- #: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2954 scd/scdaemon.c:1321
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
  msgstr "%s: ohitettu: %s\n"
  
- #: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
++#: agent/gpg-agent.c:3092 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  #, fuzzy
  msgid "no gpg-agent running in this session\n"
  msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
@@@ -697,8 -539,6 +697,8 @@@ msgid "
  "Password cache maintenance\n"
  msgstr ""
  
- #: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
++#: agent/protect-tool.c:106 g10/gpg.c:424 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:153 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -706,9 -546,6 +706,9 @@@ msgstr "
  "@Komennot:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
- #: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:92 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:168 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -762,8 -591,6 +762,8 @@@ msgstr "Peru
  msgid "error while asking for the passphrase: %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
- #: tools/gpgconf.c:323
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1472
++#: tools/gpgconf.c:328
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
  msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@@ -933,9 -731,6 +933,9 @@@ msgstr "suojausalgoritmi %d%s ei ole k�
  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:438
 +#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
- #: dirmngr/ldap-wrapper.c:710
++#: dirmngr/ldap-wrapper.c:711
  #, fuzzy, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
@@@ -947,8 -739,6 +947,8 @@@
  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:848 dirmngr/dirmngr.c:1155
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1167
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
  msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@@ -995,27 -776,22 +995,27 @@@ msgstr "yhteys kohteeseen \"%s\" ei onn
  msgid "problem setting the gpg-agent options\n"
  msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
  
- #: common/sysutils.c:144
++#: common/sysutils.c:148
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "core-tiedostojen luontia ei voi estää: %s\n"
  
- #: common/sysutils.c:239
++#: common/sysutils.c:250
  #, fuzzy, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
  
- #: common/sysutils.c:271
++#: common/sysutils.c:282
  #, fuzzy, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
  
- #: common/sysutils.c:659
++#: common/sysutils.c:693
  #, fuzzy, c-format
  msgid "waiting for file '%s' to become accessible ...\n"
  msgstr "päivitys epäonnistui: %s\n"
  
- #: common/sysutils.c:685
++#: common/sysutils.c:719
  #, fuzzy, c-format
  msgid "renaming '%s' to '%s' failed: %s\n"
  msgstr "ascii-koodaaminen epäonnistui: %s\n"
@@@ -1091,7 -852,6 +1091,7 @@@ msgstr "
  msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
  msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
  
- #: common/miscellaneous.c:554
++#: common/miscellaneous.c:556
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
@@@ -1206,8 -943,6 +1206,8 @@@ msgstr "%s: avainrengas luotu\n
  msgid "algorithm: %s"
  msgstr "ascii-koodaus: %s\n"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3098
++#: scd/app-openpgp.c:3111
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
@@@ -1419,7 -1112,6 +1419,7 @@@ msgstr "
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr ""
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1173
++#: common/argparse.c:401 dirmngr/dirmngr.c:1185
  #, fuzzy
  msgid "out of core\n"
  msgstr "ei käsitelty"
@@@ -1478,8 -1159,6 +1478,8 @@@ msgstr "julkista avainta %08lX ei löyd
  msgid "waiting for lock %s...\n"
  msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
  
- #: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
- #: dirmngr/dirmngr.c:715
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:725
++#: dirmngr/dirmngr.c:734
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
@@@ -1519,7 -1190,6 +1519,7 @@@ msgstr "odottamaton ascii-koodaus:
  msgid "invalid dash escaped line: "
  msgstr "epäkelpo viiva rivin lopussa: "
  
- #: g10/armor.c:873 g10/armor.c:1490
++#: g10/armor.c:873 g10/armor.c:1493
  #, fuzzy, c-format
  msgid "invalid radix64 character %02X skipped\n"
  msgstr "epäkelpo radix64-merkki %02x ohitettu\n"
@@@ -1536,7 -1203,6 +1536,7 @@@ msgstr "ennenaikainen tiedoston loppu (
  msgid "malformed CRC\n"
  msgstr "väärinmuotoiltu CRC\n"
  
- #: g10/armor.c:962 g10/armor.c:1527
++#: g10/armor.c:962 g10/armor.c:1530
  #, fuzzy, c-format
  msgid "CRC error; %06lX - %06lX\n"
  msgstr "CRC-virhe; %06lx - %06lx\n"
@@@ -1550,16 -1214,13 +1550,16 @@@ msgstr "Ennenaikainen tiedoston loppu (
  msgid "error in trailer line\n"
  msgstr "virhe trailer-rivissä\n"
  
- #: g10/armor.c:1303
++#: g10/armor.c:1306
  msgid "no valid OpenPGP data found.\n"
  msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
  
- #: g10/armor.c:1308
++#: g10/armor.c:1311
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
  msgstr "epäkelpo ascii-koodaus: yli %d merkkiä pitkä rivi\n"
  
- #: g10/armor.c:1312
++#: g10/armor.c:1315
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr ""
@@@ -1649,8 -1295,6 +1649,8 @@@ msgstr "salaista avainta ei löydy
  msgid "OpenPGP card no. %s detected\n"
  msgstr ""
  
- #: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
- #: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2030
++#: g10/keygen.c:4087 g10/revoke.c:215 g10/revoke.c:618
  #, fuzzy
  msgid "can't do this in batch mode\n"
  msgstr "tätä ei voi tehdä eräajossa\n"
@@@ -1660,15 -1303,10 +1660,15 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "Tätä komentoa ei sallita %s-tilassa.\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2454
++#: g10/card-util.c:109 scd/app-openpgp.c:2467
  #, fuzzy
  msgid "Reset Code not or not anymore available\n"
  msgstr "salaisen avaimen osat eivät ole käytettävissä\n"
  
 +#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
- #: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
- #: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1768
++#: g10/keygen.c:1945 g10/keygen.c:2313 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "Valintasi? "
  
@@@ -1735,10 -1359,6 +1735,10 @@@ msgstr "ei vastaavaa julkista avainta: 
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
- #: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:334
++#: g10/import.c:592 g10/import.c:640 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
++#: dirmngr/dirmngr.c:1510 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
@@@ -1812,7 -1417,6 +1812,7 @@@ msgstr "Avaimen luonti epäonnistui: %s
  msgid "not an OpenPGP card"
  msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
  
- #: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
++#: g10/card-util.c:1173 g10/keygen.c:4106 g10/keygen.c:5092
  #, fuzzy, c-format
  msgid "error getting current key info: %s\n"
  msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
@@@ -1843,13 -1442,10 +1843,13 @@@ msgstr "Minkä kokoisen avaimen haluat
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "Minkä kokoisen avaimen haluat? (1024) "
  
- #: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
++#: g10/card-util.c:1316 g10/keygen.c:2122 g10/keygen.c:2154
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "pyöristetty %u bittiin\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2207 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr ""
@@@ -1904,9 -1490,6 +1904,9 @@@ msgstr "   (%d) RSA (vain salaus)\n
  msgid "   (3) Authentication key\n"
  msgstr ""
  
- #: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
- #: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
- #: g10/keygen.c:2314 g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1508
++#: g10/keygen.c:1794 g10/keygen.c:1822 g10/keygen.c:1952 g10/keygen.c:2060
++#: g10/keygen.c:2336 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Valinta ei kelpaa.\n"
  
@@@ -1940,7 -1517,6 +1940,7 @@@ msgstr "Varmastiko allekirjoita? 
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1816 g10/keyedit.c:1867
++#: g10/card-util.c:1816 g10/keyedit.c:1868
  msgid "quit this menu"
  msgstr "ulos tästä valikosta"
  
@@@ -1949,7 -1524,6 +1949,7 @@@
  msgid "show admin commands"
  msgstr "ristiriitainen komento\n"
  
- #: g10/card-util.c:1819 g10/keyedit.c:1870
++#: g10/card-util.c:1819 g10/keyedit.c:1871
  msgid "show this help"
  msgstr "näytä tämä ohje"
  
@@@ -2033,31 -1589,21 +2033,31 @@@ msgstr "ristiriitainen komento\n
  msgid "Admin commands are not allowed\n"
  msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
  
- #: g10/card-util.c:2127 g10/keyedit.c:2816
++#: g10/card-util.c:2127 g10/keyedit.c:2817
  msgid "Invalid command  (try \"help\")\n"
  msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
  
- #: g10/decrypt.c:191 g10/encrypt.c:955
++#: g10/decrypt.c:190 g10/encrypt.c:955
  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:4851 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4904 g10/keyring.c:398 g10/keyring.c:771
  #, 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:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
- #: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
- #: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4858 g10/keyedit.c:2051
++#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2163
  #, fuzzy, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "avainta \"%s\" ei löydy: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
- #: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
- #: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4866 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:645 g10/tofu.c:2171
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "virhe luettaessa avainlohkoa: %s\n"
@@@ -2119,7 -1653,6 +2119,7 @@@ msgstr "julkiselle avaimelle \"%s\" lö
  msgid "use option \"--delete-secret-keys\" to delete it first.\n"
  msgstr "käytä valitsinta \"--delete-secret-keys\" poistaaksesi se ensin.\n"
  
- #: g10/encrypt.c:232 g10/sign.c:1292
++#: g10/encrypt.c:232 g10/sign.c:1294
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
@@@ -2139,7 -1669,6 +2139,7 @@@ msgstr "käytetään salakirjoitusalgor
  msgid "'%s' already compressed\n"
  msgstr "\"%s\" on jo pakattu\n"
  
- #: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:610
  #, fuzzy, c-format
  #| msgid "WARNING: `%s' is an empty file\n"
  msgid "WARNING: '%s' is an empty file\n"
@@@ -2157,7 -1684,6 +2157,7 @@@ msgid "
  "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
  msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
  
- #: g10/encrypt.c:707 g10/sign.c:984
++#: g10/encrypt.c:707 g10/sign.c:986
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2189,7 -1710,6 +2189,7 @@@ msgstr "%s salattua dataa\n
  msgid "encrypted with unknown algorithm %d\n"
  msgstr "salattu tuntemattomalla algoritmilla %d\n"
  
- #: g10/decrypt-data.c:164 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:129
  msgid ""
  "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
  msgstr ""
@@@ -2288,8 -1790,6 +2288,8 @@@ msgstr "
  msgid " - skipped"
  msgstr "%s: ohitettu: %s\n"
  
- #: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:845 g10/sign.c:1148
++#: g10/export.c:1251 g10/import.c:1543 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:847 g10/sign.c:1150
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
@@@ -2314,8 -1810,6 +2314,8 @@@ msgstr "avain %08lX: PGP 2.x -muodon av
  msgid "WARNING: nothing exported\n"
  msgstr "VAROITUS: mitään ei viety\n"
  
- #: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
- #: g10/plaintext.c:151 g10/plaintext.c:174
++#: g10/export.c:2283 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/plaintext.c:167 g10/plaintext.c:190
  #, fuzzy, c-format
  #| msgid "error creating `%s': %s\n"
  msgid "error creating '%s': %s\n"
@@@ -2363,8 -1848,6 +2363,8 @@@ msgstr "virhe luotaessa \"%s\": %s\n
  msgid "No fingerprint"
  msgstr "näytä sormenjälki"
  
- #: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
- #: g10/revoke.c:701
++#: g10/getkey.c:1873 g10/keyedit.c:2929 g10/keyedit.c:3016 g10/revoke.c:637
++#: g10/revoke.c:702
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "salaista avainta \"%s\" ei löydy: %s\n"
@@@ -2398,218 -1876,174 +2398,224 @@@ msgid "using subkey %s instead of prima
  msgstr ""
  "käytetään toissijaista avainta %08lX ensisijaisen avaimen %08lX sijasta\n"
  
- #: g10/gpg.c:424 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:200
  #, fuzzy
  msgid "make a signature"
  msgstr "tee erillinen allekirjoitus"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:427
  #, fuzzy
  msgid "make a clear text signature"
  msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
  
- #: g10/gpg.c:426 sm/gpgsm.c:202
++#: g10/gpg.c:429 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "tee erillinen allekirjoitus"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:430 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "salaa tiedot"
  
- #: g10/gpg.c:429
++#: g10/gpg.c:432
  msgid "encryption only with symmetric cipher"
  msgstr "salaa vain symmetrisellä salaimella"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:434 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "avaa tiedot (oletus)"
  
- #: g10/gpg.c:433 sm/gpgsm.c:206
++#: g10/gpg.c:436 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "tarkista allekirjoitus"
  
- #: g10/gpg.c:435 sm/gpgsm.c:207
++#: g10/gpg.c:438 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "näytä avaimet"
  
- #: g10/gpg.c:437
++#: g10/gpg.c:440
  msgid "list keys and signatures"
  msgstr "näytä avaimet allekirjoituksineen"
  
- #: g10/gpg.c:438
++#: g10/gpg.c:443
  #, fuzzy
  msgid "list and check key signatures"
  msgstr "tarkista avainten allekirjoitukset"
  
- #: g10/gpg.c:439 sm/gpgsm.c:212
++#: g10/gpg.c:445 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "näytä avaimet sormenjälkineen"
  
- #: g10/gpg.c:440 sm/gpgsm.c:210
++#: g10/gpg.c:446 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "näytä salaiset avaimet"
  
- #: g10/gpg.c:442 sm/gpgsm.c:213
++#: g10/gpg.c:448 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "luo uusi avainpari"
  
- #: g10/gpg.c:444
++#: g10/gpg.c:451
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly generate a new key pair"
  msgstr "luo uusi avainpari"
  
- #: g10/gpg.c:446
++#: g10/gpg.c:454
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly add a new user-id"
  msgstr "luo uusi avainpari"
  
- #: g10/gpg.c:449
++#: g10/gpg.c:459
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly revoke a user-id"
  msgstr "luo uusi avainpari"
  
- #: g10/gpg.c:451
++#: g10/gpg.c:462
+ #, fuzzy
+ #| msgid "generate a new key pair"
+ msgid "quickly set a new expiration date"
+ msgstr "luo uusi avainpari"
+ 
++#: g10/gpg.c:464
  msgid "full featured key pair generation"
  msgstr ""
  
- #: g10/gpg.c:452
++#: g10/gpg.c:467
  msgid "generate a revocation certificate"
  msgstr "luo mitätöintivarmenne"
  
- #: g10/gpg.c:454 sm/gpgsm.c:215
++#: g10/gpg.c:470 sm/gpgsm.c:216
  msgid "remove keys from the public keyring"
  msgstr "poista avaimet julkisten avainten renkaasta"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:472
  msgid "remove keys from the secret keyring"
  msgstr "poista avaimet salaisten avainten renkaasta"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:474
  #, fuzzy
  #| msgid "sign a key"
  msgid "quickly sign a key"
  msgstr "allekirjoita avain"
  
- #: g10/gpg.c:460
++#: g10/gpg.c:476
  #, fuzzy
  #| msgid "sign a key locally"
  msgid "quickly sign a key locally"
  msgstr "allekirjoita avain paikallisesti"
  
- #: g10/gpg.c:461
++#: g10/gpg.c:477
  msgid "sign a key"
  msgstr "allekirjoita avain"
  
- #: g10/gpg.c:462
++#: g10/gpg.c:478
  msgid "sign a key locally"
  msgstr "allekirjoita avain paikallisesti"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:479
  msgid "sign or edit a key"
  msgstr "allekirjoita tai muokkaa avainta"
  
- #: g10/gpg.c:465 sm/gpgsm.c:233
++#: g10/gpg.c:481 sm/gpgsm.c:234
  #, fuzzy
  msgid "change a passphrase"
  msgstr "muuta salasanaa"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:485
  msgid "export keys"
  msgstr "vie avaimia"
  
- #: g10/gpg.c:468
++#: g10/gpg.c:486
  msgid "export keys to a keyserver"
  msgstr "vie avaimia palvelimelle"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:487
  msgid "import keys from a keyserver"
  msgstr "nouda avaimia avainpalvelimelta"
  
- #: g10/gpg.c:471
++#: g10/gpg.c:490
  msgid "search for keys on a keyserver"
  msgstr "etsi avaimia avainpalvelimelta"
  
- #: g10/gpg.c:473
++#: g10/gpg.c:492
  msgid "update all keys from a keyserver"
  msgstr "päivitä kaikki avaimet avainpalvelimelta"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:498
  msgid "import/merge keys"
  msgstr "nouda/liitä avaimia"
  
- #: g10/gpg.c:482
++#: g10/gpg.c:501
  msgid "print the card status"
  msgstr ""
  
- #: g10/gpg.c:483
++#: g10/gpg.c:502
  msgid "change data on a card"
  msgstr ""
  
- #: g10/gpg.c:484
++#: g10/gpg.c:504
  msgid "change a card's PIN"
  msgstr ""
  
- #: g10/gpg.c:496
++#: g10/gpg.c:516
  msgid "update the trust database"
  msgstr "päivitä luottamustietokanta"
  
- #: g10/gpg.c:505
++#: g10/gpg.c:525
  #, fuzzy
  msgid "print message digests"
  msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
  
- #: g10/gpg.c:508 sm/gpgsm.c:228
++#: g10/gpg.c:528 sm/gpgsm.c:229
  msgid "run in server mode"
  msgstr ""
  
- #: g10/gpg.c:510
++#: g10/gpg.c:530
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:514 sm/gpgsm.c:246
++#: g10/gpg.c:534 sm/gpgsm.c:248
  msgid "create ascii armored output"
  msgstr "tuota ascii-koodattu tuloste"
  
- #: g10/gpg.c:517 sm/gpgsm.c:262
++#: g10/gpg.c:537 sm/gpgsm.c:264
  #, fuzzy
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|NIMI|salaa vastaanottajalle NIMI"
  
- #: g10/gpg.c:533 sm/gpgsm.c:298
++#: g10/gpg.c:553 sm/gpgsm.c:300
  #, 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:539
++#: g10/gpg.c:559
  #, fuzzy
  msgid "|N|set compress level to N (0 disables)"
  msgstr "|N|aseta pakkausaste N (0 poistaa käytöstä)"
  
- #: g10/gpg.c:546
++#: g10/gpg.c:566
  msgid "use canonical text mode"
  msgstr "käytä tekstimuotoa"
  
- #: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
++#: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
  #, fuzzy
  msgid "|FILE|write output to FILE"
  msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
  
- #: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
++#: g10/gpg.c:598 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
  msgid "do not make any changes"
  msgstr "älä tee muutoksia"
  
- #: g10/gpg.c:579
++#: g10/gpg.c:599
  msgid "prompt before overwriting"
  msgstr "kysy ennen ylikirjoittamista"
  
- #: g10/gpg.c:628
++#: g10/gpg.c:648
  msgid "use strict OpenPGP behavior"
  msgstr ""
  
- #: g10/gpg.c:654 sm/gpgsm.c:355
++#: g10/gpg.c:674 sm/gpgsm.c:357
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2618,7 -2052,16 +2624,17 @@@ msgstr "
  "(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
  "sivuilta)\n"
  
- #: g10/gpg.c:657 sm/gpgsm.c:358
++#: g10/gpg.c:677
+ #, fuzzy
+ #| msgid ""
+ #| "@\n"
+ #| "Examples:\n"
+ #| "\n"
+ #| " -se -r Bob [file]          sign and encrypt for user Bob\n"
+ #| " --clear-sign [file]         make a clear text signature\n"
+ #| " --detach-sign [file]       make a detached signature\n"
+ #| " --list-keys [names]        show keys\n"
+ #| " --fingerprint [names]      show fingerprints\n"
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2637,13 -2080,11 +2653,13 @@@ msgstr "
  " --list-keys [nimet]        näytä avaimet\n"
  " --fingerprint [nimet]      näytä sormenjäljet\n"
  
- #: g10/gpg.c:1026
++#: g10/gpg.c:1047
  #, 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:1029
++#: g10/gpg.c:1050
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg [options] [files]\n"
@@@ -2658,7 -2099,6 +2674,7 @@@ msgstr "
  "allekirjoita, tarkista, salaa tai avaa\n"
  "oletustoiminto riippuu syötteestä\n"
  
- #: g10/gpg.c:1040 sm/gpgsm.c:588
++#: g10/gpg.c:1061 sm/gpgsm.c:580
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2666,606 -2106,428 +2682,543 @@@ msgstr "
  "\n"
  "Tuetut algoritmit:\n"
  
- #: g10/gpg.c:1043
++#: g10/gpg.c:1064
  msgid "Pubkey: "
  msgstr "JulkAvain: "
  
- #: g10/gpg.c:1050 g10/keyedit.c:3402
++#: g10/gpg.c:1071 g10/keyedit.c:3483
  msgid "Cipher: "
  msgstr "Salaus: "
  
- #: g10/gpg.c:1057
++#: g10/gpg.c:1078
  msgid "Hash: "
  msgstr "Tiiviste: "
  
- #: g10/gpg.c:1064 g10/keyedit.c:3451
++#: g10/gpg.c:1085 g10/keyedit.c:3532
  msgid "Compression: "
  msgstr "Pakkaus: "
  
- #: g10/gpg.c:1133 sm/gpgsm.c:662
++#: g10/gpg.c:1154 sm/gpgsm.c:654
  #, fuzzy, c-format
  msgid "usage: %s [options] %s\n"
  msgstr "käyttö: gpg [valitsimet] "
  
- #: g10/gpg.c:1321 sm/gpgsm.c:751
++#: g10/gpg.c:1342 sm/gpgsm.c:743
  msgid "conflicting commands\n"
  msgstr "ristiriitainen komento\n"
  
- #: g10/gpg.c:1339
++#: g10/gpg.c:1360
  #, 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:1537
++#: g10/gpg.c:1558
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
  
- #: g10/gpg.c:1540
++#: g10/gpg.c:1561
  #, 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:1543
++#: g10/gpg.c:1564
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on extension '%s'\n"
  msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
  
- #: g10/gpg.c:1549
++#: g10/gpg.c:1570
  #, 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:1552
++#: g10/gpg.c:1573
  #, 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:1555
++#: g10/gpg.c:1576
  #, 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:1561
++#: g10/gpg.c:1582
  #, 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:1564
++#: g10/gpg.c:1585
  #, 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:1567
++#: g10/gpg.c:1588
  #, 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:1573
++#: g10/gpg.c:1594
  #, 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:1576
++#: g10/gpg.c:1597
  #, 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:1579
++#: g10/gpg.c:1600
  #, 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:1786
++#: g10/gpg.c:1816
  #, fuzzy, c-format
  msgid "unknown configuration item '%s'\n"
  msgstr "tuntematon asetus \"%s\"\n"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1925
  msgid "display photo IDs during key listings"
  msgstr ""
  
- #: g10/gpg.c:1895
++#: g10/gpg.c:1927
  #, fuzzy
  msgid "show key usage information during key listings"
  msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1929
  msgid "show policy URLs during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1931
  #, fuzzy
  msgid "show all notations during signature listings"
  msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1933
  msgid "show IETF standard notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1937
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1939
  #, fuzzy
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1941
  msgid "show user ID validity during key listings"
  msgstr ""
  
- #: g10/gpg.c:1911
++#: g10/gpg.c:1943
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  
- #: g10/gpg.c:1913
++#: g10/gpg.c:1945
  msgid "show revoked and expired subkeys in key listings"
  msgstr ""
  
- #: g10/gpg.c:1915
++#: g10/gpg.c:1947
  #, fuzzy
  msgid "show the keyring name in key listings"
  msgstr "näytä mihin avainrenkaaseen tulostettu avain kuuluu"
  
- #: g10/gpg.c:1917
++#: g10/gpg.c:1949
  #, fuzzy
  msgid "show expiration dates during signature listings"
  msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
  
- #: g10/gpg.c:2019 g10/gpg.c:2056
++#: g10/gpg.c:2051 g10/gpg.c:2088
  #, fuzzy, c-format
  msgid "valid values for option '%s':\n"
  msgstr "virheelliset tuontivalitsimet\n"
  
- #: g10/gpg.c:2030
++#: g10/gpg.c:2062
  #, fuzzy, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
  
- #: g10/gpg.c:2032 g10/gpg.c:2068
++#: g10/gpg.c:2064 g10/gpg.c:2100
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2066
++#: g10/gpg.c:2098 g10/keygen.c:167
  #, fuzzy, c-format
  msgid "invalid value for option '%s'\n"
  msgstr "virheelliset tuontivalitsimet\n"
  
- #: g10/gpg.c:2203
++#: g10/gpg.c:2235
  #, fuzzy, c-format
  #| msgid "NOTE: old default options file `%s' ignored\n"
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "HUOM: Vanhat oletusarvoiset asetukset löytyvät tiedostosta \"%s\"\n"
  
- #: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
++#: g10/gpg.c:2839 g10/gpg.c:3610 g10/gpg.c:3622
  #, 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:2978 g10/gpg.c:2990
++#: g10/gpg.c:3011 g10/gpg.c:3023
  #, fuzzy, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "%s ei kelpaa merkistöksi\n"
  
- #: g10/gpg.c:3012
++#: g10/gpg.c:3045
  #, fuzzy, c-format
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "Sähköpostiosoite ei kelpaa\n"
  
- #: g10/gpg.c:3044 sm/gpgsm.c:1166
++#: g10/gpg.c:3077 sm/gpgsm.c:1158
  #, fuzzy, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3130
  #, fuzzy, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "%s ei kelpaa merkistöksi\n"
  
- #: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
++#: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
  #, fuzzy
  msgid "could not parse keyserver URL\n"
  msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
  
- #: g10/gpg.c:3137
++#: g10/gpg.c:3170
  #, fuzzy, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: virheelliset vientivalitsimet\n"
  
- #: g10/gpg.c:3140
++#: g10/gpg.c:3173
  #, fuzzy
  msgid "invalid keyserver options\n"
  msgstr "virheelliset vientivalitsimet\n"
  
- #: g10/gpg.c:3147
++#: g10/gpg.c:3180
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: virheelliset tuontivalitsimet\n"
  
- #: g10/gpg.c:3150
++#: g10/gpg.c:3183
  msgid "invalid import options\n"
  msgstr "virheelliset tuontivalitsimet\n"
  
- #: g10/gpg.c:3156 g10/gpg.c:3171
++#: g10/gpg.c:3189 g10/gpg.c:3204
  #, fuzzy, c-format
  msgid "invalid filter option: %s\n"
  msgstr "virheelliset tuontivalitsimet\n"
  
- #: g10/gpg.c:3162
++#: g10/gpg.c:3195
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: virheelliset vientivalitsimet\n"
  
- #: g10/gpg.c:3165
++#: g10/gpg.c:3198
  msgid "invalid export options\n"
  msgstr "virheelliset vientivalitsimet\n"
  
- #: g10/gpg.c:3177
++#: g10/gpg.c:3210
  #, fuzzy, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: virheelliset tuontivalitsimet\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3213
  #, fuzzy
  msgid "invalid list options\n"
  msgstr "virheelliset tuontivalitsimet\n"
  
- #: g10/gpg.c:3188
++#: g10/gpg.c:3221
  msgid "display photo IDs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3190
++#: g10/gpg.c:3223
  msgid "show policy URLs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3192
++#: g10/gpg.c:3225
  #, fuzzy
  msgid "show all notations during signature verification"
  msgstr "%s ei kelpaa merkistöksi\n"
  
- #: g10/gpg.c:3194
++#: g10/gpg.c:3227
  msgid "show IETF standard notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3231
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3200
++#: g10/gpg.c:3233
  #, fuzzy
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
  
- #: g10/gpg.c:3202
++#: g10/gpg.c:3235
  #, fuzzy
  msgid "show user ID validity during signature verification"
  msgstr "%s ei kelpaa merkistöksi\n"
  
- #: g10/gpg.c:3204
++#: g10/gpg.c:3237
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  
- #: g10/gpg.c:3206
++#: g10/gpg.c:3239
  #, fuzzy
  msgid "show only the primary user ID in signature verification"
  msgstr "%s ei kelpaa merkistöksi\n"
  
- #: g10/gpg.c:3208
++#: g10/gpg.c:3241
  msgid "validate signatures with PKA data"
  msgstr ""
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3243
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr ""
  
- #: g10/gpg.c:3217
++#: g10/gpg.c:3250
  #, fuzzy, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: virheelliset vientivalitsimet\n"
  
- #: g10/gpg.c:3220
++#: g10/gpg.c:3253
  #, fuzzy
  msgid "invalid verify options\n"
  msgstr "virheelliset vientivalitsimet\n"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3260
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
  
- #: g10/gpg.c:3417
++#: g10/gpg.c:3452
  #, fuzzy, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: virheelliset vientivalitsimet\n"
  
- #: g10/gpg.c:3420
++#: g10/gpg.c:3455
  msgid "invalid auto-key-locate list\n"
  msgstr ""
  
- #: g10/gpg.c:3553 sm/gpgsm.c:1507
++#: g10/gpg.c:3592 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
  msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
  
- #: g10/gpg.c:3564
++#: g10/gpg.c:3603
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "VAROITUS: %s korvaa %s:n\n"
  
- #: g10/gpg.c:3573
++#: g10/gpg.c:3612
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
  
- #: g10/gpg.c:3576
++#: g10/gpg.c:3615
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s ja %s yhdessä on järjetöntä!\n"
  
- #: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
++#: g10/gpg.c:3630 sm/gpgsm.c:1518 dirmngr/dirmngr.c:951
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3651
  #, fuzzy, c-format
  msgid "will not run with insecure memory due to %s\n"
  msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
  
- #: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
++#: g10/gpg.c:3686 g10/gpg.c:3710 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "valittu salausalgoritmi ei kelpaa\n"
  
- #: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
++#: g10/gpg.c:3692 g10/gpg.c:3716 sm/gpgsm.c:1591 sm/gpgsm.c:1597
  msgid "selected digest algorithm is invalid\n"
  msgstr "valittu tiivistealgoritmi ei kelpaa\n"
  
- #: g10/gpg.c:3659
++#: g10/gpg.c:3698
  #, fuzzy
  msgid "selected compression algorithm is invalid\n"
  msgstr "valittu salausalgoritmi ei kelpaa\n"
  
- #: g10/gpg.c:3665
++#: g10/gpg.c:3704
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
  
- #: g10/gpg.c:3680
++#: g10/gpg.c:3719
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed täytyy olla suurempi kuin 0\n"
  
- #: g10/gpg.c:3682
++#: g10/gpg.c:3721
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
  
- #: g10/gpg.c:3684
++#: g10/gpg.c:3723
  #, fuzzy
  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:3686
++#: g10/gpg.c:3725
  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:3688
++#: g10/gpg.c:3727
  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:3691
++#: g10/gpg.c:3730
  #, fuzzy
  #| 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:3695
++#: g10/gpg.c:3734
  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:3702
++#: g10/gpg.c:3741
  msgid "invalid default preferences\n"
  msgstr "virheelliset oletusarvoiset valinnat\n"
  
- #: g10/gpg.c:3706
++#: g10/gpg.c:3745
  msgid "invalid personal cipher preferences\n"
  msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
  
- #: g10/gpg.c:3710
++#: g10/gpg.c:3749
  msgid "invalid personal digest preferences\n"
  msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3753
  msgid "invalid personal compress preferences\n"
  msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
  
- #: g10/gpg.c:3750
++#: g10/gpg.c:3789
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s ja %s eivät vielä toimi yhdessä\n"
  
- #: g10/gpg.c:3797
++#: g10/gpg.c:3836
  #, fuzzy, c-format
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr "salausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
  
- #: g10/gpg.c:3802
++#: g10/gpg.c:3841
  #, fuzzy, c-format
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr "tiivistealgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
  
- #: g10/gpg.c:3807
++#: g10/gpg.c:3846
  #, fuzzy, c-format
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr "pakkausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
  
- #: g10/gpg.c:3906
++#: g10/gpg.c:3945
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:3957
  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:3975
- msgid "--store [filename]"
- msgstr "--store [tiedostonimi]"
- 
- #: g10/gpg.c:3985
- msgid "--symmetric [filename]"
- msgstr "--symmetric [tiedostonimi]"
- 
- #: g10/gpg.c:3989
++#: g10/gpg.c:4028
  #, fuzzy, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "avaus epäonnistui: %s\n"
  
- #: g10/gpg.c:4000
- msgid "--encrypt [filename]"
- msgstr "--encrypt [tiedostonimi]"
- 
- #: g10/gpg.c:4016
- #, fuzzy
- msgid "--symmetric --encrypt [filename]"
- msgstr "--sign --encrypt [tiedostonimi]"
- 
- #: g10/gpg.c:4018
++#: g10/gpg.c:4057
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4021
++#: g10/gpg.c:4060
  #, fuzzy, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
  
- #: g10/gpg.c:4042
- msgid "--sign [filename]"
- msgstr "--allekirjoita [tiedostonimi]"
- 
- #: g10/gpg.c:4058
- msgid "--sign --encrypt [filename]"
- msgstr "--sign --encrypt [tiedostonimi]"
- 
- #: g10/gpg.c:4076
- #, fuzzy
- msgid "--symmetric --sign --encrypt [filename]"
- msgstr "--sign --encrypt [tiedostonimi]"
- 
- #: g10/gpg.c:4078
++#: g10/gpg.c:4117
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4081
++#: g10/gpg.c:4120
  #, fuzzy, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
  
- #: g10/gpg.c:4105
- msgid "--sign --symmetric [filename]"
- msgstr "--sign --symmetric [tiedostonimi]"
- 
- #: g10/gpg.c:4117
- msgid "--clearsign [filename]"
- msgstr "--clearsign [tiedostonimi]"
- 
- #: g10/gpg.c:4147
- msgid "--decrypt [filename]"
- msgstr "--decrypt [tiedostonimi]"
- 
- #: g10/gpg.c:4174
- msgid "--sign-key user-id"
- msgstr "--sign-key käyttäjätunnus"
- 
- #: g10/gpg.c:4178
- msgid "--lsign-key user-id"
- msgstr "--lsign-key käyttäjätunnus"
- 
- #: g10/gpg.c:4199
- msgid "--edit-key user-id [commands]"
- msgstr "--edit-key käyttäjätunnus [komennot]"
- 
- #: g10/gpg.c:4215
- #, fuzzy
- msgid "--passwd <user-id>"
- msgstr "--sign-key käyttäjätunnus"
- 
- #: g10/gpg.c:4411 g10/keyserver.c:1837
++#: g10/gpg.c:4462 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
  
- #: g10/gpg.c:4416
++#: g10/gpg.c:4467
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
  
- #: g10/gpg.c:4422
++#: g10/gpg.c:4473
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "avaimen vienti epäonnistui: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4486
  #, 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:4447
++#: g10/gpg.c:4498
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
  
- #: g10/gpg.c:4460
++#: g10/gpg.c:4511
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4578
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "ascii-koodauksen purku epäonnistui: %s\n"
  
- #: g10/gpg.c:4538
++#: g10/gpg.c:4589
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "ascii-koodaaminen epäonnistui: %s\n"
  
- #: g10/gpg.c:4630
++#: g10/gpg.c:4681
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
  msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
  
- #: g10/gpg.c:4776 g10/tofu.c:2002
++#: g10/gpg.c:4827 g10/tofu.c:2151
  #, fuzzy, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: g10/gpg.c:4788
++#: g10/gpg.c:4839
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4835
- msgid "[filename]"
- msgstr "[tiedostonimi]"
- 
- #: g10/gpg.c:4841
++#: g10/gpg.c:4894
  msgid "Go ahead and type your message ...\n"
  msgstr "Kirjoita viestisi...\n"
  
- #: g10/gpg.c:5179
++#: g10/gpg.c:5232
  msgid "the given certification policy URL is invalid\n"
  msgstr "annettu varmennekäytännön URL on virheellinen\n"
  
- #: g10/gpg.c:5181
++#: g10/gpg.c:5234
  msgid "the given signature policy URL is invalid\n"
  msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
  
- #: g10/gpg.c:5214
++#: g10/gpg.c:5267
  #, fuzzy
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
@@@ -3279,7 -2539,6 +3232,7 @@@ msgstr "ota avaimet tästä avainrenkaa
  msgid "make timestamp conflicts only a warning"
  msgstr "käsittele aikaleimakonfliktit pelkkinä varoituksina"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:345
++#: g10/gpgv.c:82 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|tilatiedot kirjoitetaan FD:iin"
  
@@@ -3310,330 -2564,264 +3263,330 @@@ msgstr "Ei ohjeita saatavilla
  msgid "No help available for '%s'"
  msgstr "Ei ohjetta aiheesta \"%s\""
  
- #: g10/import.c:151
++#: g10/import.c:152
  msgid "import signatures that are marked as local-only"
  msgstr ""
  
- #: g10/import.c:154
++#: g10/import.c:155
  msgid "repair damage from the pks keyserver during import"
  msgstr ""
  
- #: g10/import.c:157
++#: g10/import.c:158
  #, fuzzy
  msgid "do not clear the ownertrust values during import"
  msgstr "päivitä luottamustietokanta"
  
- #: g10/import.c:160
++#: g10/import.c:161
  #, fuzzy
  msgid "do not update the trustdb after import"
  msgstr "päivitä luottamustietokanta"
  
- #: g10/import.c:163
++#: g10/import.c:164
  #, fuzzy
  msgid "show key during import"
  msgstr "näytä sormenjälki"
  
- #: g10/import.c:166
++#: g10/import.c:167
  msgid "only accept updates to existing keys"
  msgstr ""
  
- #: g10/import.c:169
++#: g10/import.c:170
  #, fuzzy
  msgid "remove unusable parts from key after import"
  msgstr "salaista avainta ei voi käyttää"
  
- #: g10/import.c:172
++#: g10/import.c:173
  msgid "remove as much as possible from key after import"
  msgstr ""
  
- #: g10/import.c:175
++#: g10/import.c:176
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:326 g10/import.c:568
++#: g10/import.c:327 g10/import.c:569
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "ohitetaan tyypin %d lohko\n"
  
- #: g10/import.c:585
++#: g10/import.c:586
  #, fuzzy, c-format
  msgid "%lu keys processed so far\n"
  msgstr "tähän mennessä käsitelty %lu avainta\n"
  
- #: g10/import.c:655
++#: g10/import.c:656
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "Kaikkiaan käsitelty: %lu\n"
  
- #: g10/import.c:658
++#: g10/import.c:659
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "      ohitetaan uudet avaimet: %lu\n"
  
- #: g10/import.c:660
++#: g10/import.c:661
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "      ohitetaan uudet avaimet: %lu\n"
  
- #: g10/import.c:663
++#: g10/import.c:664
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "          ilman käyttäjätunnuksia: %lu\n"
  
- #: g10/import.c:666 sm/import.c:130
++#: g10/import.c:667 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "              tuotu: %lu"
  
- #: g10/import.c:670 sm/import.c:134
++#: g10/import.c:671 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "             muuttamatonta: %lu\n"
  
- #: g10/import.c:672
++#: g10/import.c:673
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "          uusia käyttäjätunnuksia: %lu\n"
  
- #: g10/import.c:674
++#: g10/import.c:675
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "           uusia aliavaimia: %lu\n"
  
- #: g10/import.c:676
++#: g10/import.c:677
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "        uusia allekirjoituksia: %lu\n"
  
- #: g10/import.c:678
++#: g10/import.c:679
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "   uusia avainten mitätöintejä: %lu\n"
  
- #: g10/import.c:680 sm/import.c:136
++#: g10/import.c:681 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "      luettuja salaisia avaimia: %lu\n"
  
- #: g10/import.c:682 sm/import.c:138
++#: g10/import.c:683 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "  tuotuja salaisia avaimia: %lu\n"
  
- #: g10/import.c:684 sm/import.c:140
++#: g10/import.c:685 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr " muuttamattomia salaisia avaimia: %lu\n"
  
- #: g10/import.c:686 sm/import.c:142
++#: g10/import.c:687 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "          ei tuotu: %lu\n"
  
- #: g10/import.c:688
++#: g10/import.c:689
  #, fuzzy, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "        uusia allekirjoituksia: %lu\n"
  
- #: g10/import.c:690
++#: g10/import.c:691
  #, fuzzy, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "      luettuja salaisia avaimia: %lu\n"
  
- #: g10/import.c:1034
++#: g10/import.c:1035
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
  "algorithms on these user IDs:\n"
  msgstr ""
  
- #: g10/import.c:1076
++#: g10/import.c:1077
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr ""
  
  # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
- #: g10/import.c:1091
++#: g10/import.c:1092
  #, fuzzy, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
  
- #: g10/import.c:1103
++#: g10/import.c:1104
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1116
++#: g10/import.c:1117
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr ""
  
- #: g10/import.c:1118
++#: g10/import.c:1119
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  
- #: g10/import.c:1143
++#: g10/import.c:1144
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  
- #: g10/import.c:1379 g10/import.c:2167
++#: g10/import.c:1380 g10/import.c:2168
  #, fuzzy, c-format
  msgid "key %s: no user ID\n"
  msgstr "avain %08lX: ei käyttäjätunnusta\n"
  
- #: g10/import.c:1385
++#: g10/import.c:1386
  #, fuzzy, c-format
  msgid "key %s: %s\n"
  msgstr "ohitetaan \"%s\": %s\n"
  
- #: g10/import.c:1386 g10/import.c:2141
++#: g10/import.c:1387 g10/import.c:2142
  msgid "rejected by import screener"
  msgstr ""
  
- #: g10/import.c:1416
++#: g10/import.c:1417
  #, fuzzy, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "avain %08lX: HKP-aliavainvirhe korjattu\n"
  
- #: g10/import.c:1434
++#: g10/import.c:1435
  #, fuzzy, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr ""
  "avain %08lX: käyttäjätunnus \"%s\" hyväksytty ilman omaa allekirjoitusta\n"
  
- #: g10/import.c:1444 g10/import.c:1475
++#: g10/import.c:1445 g10/import.c:1476
  #, fuzzy, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "avain %08lX: ei voimassaolevia käyttäjätunnuksia\n"
  
- #: g10/import.c:1446
++#: g10/import.c:1447
  msgid "this may be caused by a missing self-signature\n"
  msgstr "tämän voi aiheuttaa puuttuva oma-allekirjoitus\n"
  
- #: g10/import.c:1516 g10/import.c:2318
++#: g10/import.c:1517 g10/import.c:2319
  #, fuzzy, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "avain %08lX: julkista avainta ei löydetty: %s\n"
  
- #: g10/import.c:1522
++#: g10/import.c:1523
  #, fuzzy, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "avain %08lX: uusi avain - ohitetaan\n"
  
- #: g10/import.c:1537
++#: g10/import.c:1538
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "kirjoitettavissa olevaa avainrengasta ei löydy: %s\n"
  
- #: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
++#: g10/import.c:1547 g10/import.c:1648 g10/import.c:2385
  #, fuzzy, c-format
  #| msgid "error writing keyring `%s': %s\n"
  msgid "error writing keyring '%s': %s\n"
  msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
  
- #: g10/import.c:1566
++#: g10/import.c:1567
  #, fuzzy, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "avain %08lX: julkinen avain \"%s\" tuotu\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1591
  #, fuzzy, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "avain %08lX: ei vastaa omaa kopiotamme\n"
  
- #: g10/import.c:1606 g10/import.c:2342
++#: g10/import.c:1607 g10/import.c:2343
  #, fuzzy, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "avain %08lX: alkuperäistä avainlohkoa ei löydy: %s\n"
  
- #: g10/import.c:1614 g10/import.c:2349
++#: g10/import.c:1615 g10/import.c:2350
  #, fuzzy, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "avain %08lX. alkuperäisen avainlohko lukeminen ei onnistu: %s\n"
  
- #: g10/import.c:1657
++#: g10/import.c:1658
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "avain %08lX: \"%s\" 1 uusi käyttäjätunnus\n"
  
- #: g10/import.c:1660
++#: g10/import.c:1661
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
  
- #: g10/import.c:1663
++#: g10/import.c:1664
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "avain %08lX: \"%s\" 1 uusi allekirjoitus\n"
  
- #: g10/import.c:1666
++#: g10/import.c:1667
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
  
- #: g10/import.c:1669
++#: g10/import.c:1670
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "avain %08lX: \"%s\" 1 uusi aliavain\n"
  
- #: g10/import.c:1672
++#: g10/import.c:1673
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "avain %08lX: \"%s\" %d uutta aliavainta\n"
  
- #: g10/import.c:1675
++#: g10/import.c:1676
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
  
- #: g10/import.c:1678
++#: g10/import.c:1679
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
  
- #: g10/import.c:1681
++#: g10/import.c:1682
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
  
- #: g10/import.c:1684
++#: g10/import.c:1685
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
  
- #: g10/import.c:1707
++#: g10/import.c:1708
  #, fuzzy, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "avain %08lX: \"%s\" ei muutoksia\n"
  
- #: g10/import.c:2019 g10/import.c:2264
++#: g10/import.c:2020 g10/import.c:2265
  #, fuzzy, c-format
  msgid "key %s: secret key imported\n"
  msgstr "avain %08lX: salainen avain tuotu\n"
  
- #: g10/import.c:2027
++#: g10/import.c:2028
  #, fuzzy, c-format
  #| msgid "skipped: secret key already present\n"
  msgid "key %s: secret key already exists\n"
  msgstr "ohitetaan: salainen avain on jo paikalla\n"
  
- #: g10/import.c:2035
++#: g10/import.c:2036
  #, fuzzy, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
  
- #: g10/import.c:2140
++#: g10/import.c:2141
  #, fuzzy, c-format
  msgid "secret key %s: %s\n"
  msgstr "salaista avainta \"%s\" ei löydy: %s\n"
  
- #: g10/import.c:2160 g10/import.c:2195
++#: g10/import.c:2161 g10/import.c:2196
  #, fuzzy
  msgid "importing secret keys not allowed\n"
  msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
  
- #: g10/import.c:2184
++#: g10/import.c:2185
  #, fuzzy, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr "avain %08lX: avaimella on epäkelpo salain %d - ohitetaan\n"
@@@ -3648,142 -2836,115 +3601,142 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2256
++#: g10/import.c:2257
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2311
++#: g10/import.c:2312
  #, fuzzy, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
  "avain %08lX: ei julkista avainta - mitätöintivarmennetta ei voida käyttää\n"
  
- #: g10/import.c:2360
++#: g10/import.c:2361
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "avain %08lX: pätemätön mitätöintivarmenne: %s - hylätty\n"
  
- #: g10/import.c:2393
++#: g10/import.c:2394
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "avain %08lX: mitätöintivarmenne \"%s\" tuotu\n"
  
- #: g10/import.c:2469
++#: g10/import.c:2470
  #, fuzzy, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "avain %08lX: allekirjoitukselle ei ole käyttäjätunnusta\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2487
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr "avain %08lX: julkisen avaimen algoritmia \"%s\" ei tueta\n"
  
- #: g10/import.c:2488
++#: g10/import.c:2489
  #, fuzzy, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "avain %08lX: epäkelpo oma-allekirjoitus käyttäjätunnuksella \"%s\"\n"
  
- #: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
++#: g10/import.c:2506 g10/import.c:2532 g10/import.c:2583
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "avain %08lX: julkisen avaimen algoritmia ei tueta\n"
  
- #: g10/import.c:2506
++#: g10/import.c:2507
  #, fuzzy, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
  
- #: g10/import.c:2520
++#: g10/import.c:2521
  #, fuzzy, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "avain %08lX: ei aliavainta avainten riippuvuuksiin\n"
  
- #: g10/import.c:2533
++#: g10/import.c:2534
  #, fuzzy, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "avain %08lX: pätemätön aliavainriippuvuus\n"
  
- #: g10/import.c:2549
++#: g10/import.c:2550
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "avain %08lX: moninkertainen aliavainriippuvuus poistettu\n"
  
- #: g10/import.c:2571
++#: g10/import.c:2572
  #, fuzzy, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "avain %08lX: ei aliavainta avainten mitätöintiä varten\n"
  
- #: g10/import.c:2584
++#: g10/import.c:2585
  #, fuzzy, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "avain %08lX: epäkelpo aliavaimen mitätöinti\n"
  
- #: g10/import.c:2599
++#: g10/import.c:2600
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "avain %08lX: useiden aliavainten mitätöinti poistettu\n"
  
- #: g10/import.c:2641
++#: g10/import.c:2642
  #, fuzzy, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "avain %08lX: käyttäjätunnus ohitettu '"
  
- #: g10/import.c:2665
++#: g10/import.c:2666
  #, fuzzy, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "avain %08lX: aliavain ohitettu\n"
  
- #: g10/import.c:2694
++#: g10/import.c:2695
  #, fuzzy, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr ""
  "avain %08lX: allekirjoitusta ei voida viedä (luokka %02x) - ohitetaan\n"
  
- #: g10/import.c:2705
++#: g10/import.c:2706
  #, fuzzy, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "avain %08lX: mitätöintivarmenne väärässä paikassa - ohitetaan\n"
  
- #: g10/import.c:2723
++#: g10/import.c:2724
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "avain %08lX: epäkelpo mitätöintivarmenne: %s - ohitetaan\n"
  
- #: g10/import.c:2737
++#: g10/import.c:2738
  #, fuzzy, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "avain %08lX: aliavaimen allekirjoitus väärässä paikassa - ohitetaan\n"
  
- #: g10/import.c:2745
++#: g10/import.c:2746
  #, fuzzy, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "avain %08lX: odottamaton allekirjoitusluokka (0x%02X) - ohitetaan\n"
  
- #: g10/import.c:2887
++#: g10/import.c:2888
  #, fuzzy, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "avain %08lX: käyttäjätunnuksen kaksoiskappale havaittu - liitetty\n"
  
- #: g10/import.c:2951
++#: g10/import.c:2952
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr ""
  "VAROITUS: avain %08lX saattaa olla mitätöity: haetaan mitätöintiavain %08lX\n"
  
- #: g10/import.c:2967
++#: g10/import.c:2968
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr ""
  "VAROITUS: avain %08lX saattaa olla mitätöity: mitätöintiavainta %08lX \n"
  "ei saatavilla.\n"
  
- #: g10/import.c:3031
++#: g10/import.c:3032
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "avain %08lX: \"%s\"-mitätöintivarmenne lisätty\n"
  
- #: g10/import.c:3069
++#: g10/import.c:3070
  #, fuzzy, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
@@@ -3820,55 -2975,44 +3773,55 @@@ msgstr "virhe luotaessa \"%s\": %s\n
  msgid "error opening key DB: %s\n"
  msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
  
- #: g10/keydb.c:1782
++#: g10/keydb.c:1786
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[revocation]"
  msgstr "[mitätöinti]"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[self-signature]"
  msgstr "[oma-allekirjoitus]"
  
- #: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
++#: g10/keyedit.c:433 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: dirmngr/ldap-wrapper.c:694
  #, fuzzy, c-format
  msgid "error allocating memory: %s\n"
  msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
  
- #: g10/keyedit.c:629
++#: g10/keyedit.c:630
  #, fuzzy, c-format
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr "avain %08lX: julkisen avaimen algoritmia ei tueta\n"
  
  # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
- #: g10/keyedit.c:638
++#: g10/keyedit.c:639
  #, fuzzy, c-format
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
  
- #: g10/keyedit.c:800
++#: g10/keyedit.c:801
  #, fuzzy
  msgid " (reordered signatures follow)"
  msgstr "Allekirjoitus täsmää lähettäjään \""
  
- #: g10/keyedit.c:913
++#: g10/keyedit.c:914
  #, fuzzy, c-format
  msgid "key %s:\n"
  msgstr "ohitetaan \"%s\": %s\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:917
  #, fuzzy, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
  msgstr[0] "Käyttäjätunnus \"%s\" on mitätöity."
  msgstr[1] "Käyttäjätunnus \"%s\" on mitätöity."
  
- #: g10/keyedit.c:919 g10/keylist.c:480
++#: g10/keyedit.c:920 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
@@@ -3876,7 -3020,6 +3829,7 @@@ msgid_plural "%d signatures not checke
  msgstr[0] "1 allekirjoitus jätetty tarkistamatta puuttuvan avaimen vuoksi\n"
  msgstr[1] "1 allekirjoitus jätetty tarkistamatta puuttuvan avaimen vuoksi\n"
  
- #: g10/keyedit.c:923 g10/keylist.c:476
++#: g10/keyedit.c:924 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
@@@ -3884,21 -3027,18 +3837,21 @@@ msgid_plural "%d bad signatures\n
  msgstr[0] "%d väärää allekirjoitusta\n"
  msgstr[1] "%d väärää allekirjoitusta\n"
  
- #: g10/keyedit.c:927
++#: g10/keyedit.c:928
  #, fuzzy, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
  msgstr[0] "Allekirjoitus täsmää lähettäjään \""
  msgstr[1] "Allekirjoitus täsmää lähettäjään \""
  
- #: g10/keyedit.c:932
++#: g10/keyedit.c:933
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:992 g10/pkclist.c:274
++#: g10/keyedit.c:993 g10/pkclist.c:274
  #, fuzzy
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
@@@ -3911,68 -3051,53 +3864,68 @@@ msgstr "
  "lähteistä...)?\n"
  "\n"
  
- #: g10/keyedit.c:996 g10/pkclist.c:286
++#: g10/keyedit.c:997 g10/pkclist.c:286
  #, fuzzy, c-format
  msgid "  %d = I trust marginally\n"
  msgstr " %d = Luotan osittain\n"
  
- #: g10/keyedit.c:997 g10/pkclist.c:288
++#: g10/keyedit.c:998 g10/pkclist.c:288
  #, fuzzy, c-format
  msgid "  %d = I trust fully\n"
  msgstr " %d = Luotan täysin\n"
  
- #: g10/keyedit.c:1015
++#: g10/keyedit.c:1016
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
  "trust signatures on your behalf.\n"
  msgstr ""
  
- #: g10/keyedit.c:1032
++#: g10/keyedit.c:1033
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  
- #: g10/keyedit.c:1160
++#: g10/keyedit.c:1161
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1168
++#: g10/keyedit.c:1169
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "Käyttäjätunnus \"%s\" on mitätöity."
  
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
- #: g10/keyedit.c:2246
++#: g10/keyedit.c:1178 g10/keyedit.c:1206 g10/keyedit.c:1233 g10/keyedit.c:1417
++#: g10/keyedit.c:2247
  msgid "Are you sure you still want to sign it? (y/N) "
  msgstr "Haluatko varmasti edelleen allekirjoittaa? (k/E) "
  
- #: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
- #: g10/keyedit.c:2251 g10/keyedit.c:3177
++#: g10/keyedit.c:1192 g10/keyedit.c:1220 g10/keyedit.c:1247 g10/keyedit.c:1423
++#: g10/keyedit.c:2252 g10/keyedit.c:3178
  msgid "  Unable to sign.\n"
  msgstr "  Allekirjoittaminen ei onnistu.\n"
  
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1197
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "Käyttäjätunnus \"%s\" on vanhentunut."
  
- #: g10/keyedit.c:1224
++#: g10/keyedit.c:1225
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "Käyttäjätunnuksella \"%s\" ei ole oma-allekirjoitusta."
  
- #: g10/keyedit.c:1253
++#: g10/keyedit.c:1254
  #, fuzzy, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "Käyttäjätunnuksella \"%s\" ei ole oma-allekirjoitusta."
  
- #: g10/keyedit.c:1255
++#: g10/keyedit.c:1256
  #, fuzzy
  msgid "Sign it? (y/N) "
  msgstr "Varmastiko allekirjoita? "
  
- #: g10/keyedit.c:1282
++#: g10/keyedit.c:1283
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -3981,13 -3106,11 +3934,13 @@@ msgstr "
  "Oma-allekirjoitus kohteessa \"%s\"\n"
  "on PGP 2.x -muodon allekirjoitus.\n"
  
- #: g10/keyedit.c:1291
++#: g10/keyedit.c:1292
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr ""
  "Haluatko vahventaa sen täysin vientikelpoiseksi OpenPGP-allekirjoitukseksi? "
  "(k/E) "
  
- #: g10/keyedit.c:1304
++#: g10/keyedit.c:1305
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3996,11 -3119,9 +3949,11 @@@ msgstr "
  "Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
  "on vanhentunut.\n"
  
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:1310
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr "Haluatko tehdä uuden allekirjoituksen korvaamaan vanhentuneen? (k/E) "
  
- #: g10/keyedit.c:1330
++#: g10/keyedit.c:1331
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -4009,44 -3130,35 +3962,44 @@@ msgstr "
  "Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
  "on paikallinen allekirjoitus.\n"
  
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:1336
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr ""
  "Haluatko vahventaa sen täysin vientikelpoiseksi allekirjoitukseksi? (k/E) "
  
- #: g10/keyedit.c:1355
++#: g10/keyedit.c:1356
  #, fuzzy, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "\"%s\" on jo allekirjoitettu paikallisesti avaimella %08lX\n"
  
- #: g10/keyedit.c:1359
++#: g10/keyedit.c:1360
  #, fuzzy, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "\"%s\" on jo allekirjoitettu avaimella %08lX\n"
  
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:1365
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "Haluatko allekirjoittaa uudelleen joka tapauksessa? (k/E) "
  
- #: g10/keyedit.c:1386
++#: g10/keyedit.c:1387
  #, fuzzy, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "Avaimelle %08lX ei löydy mitään mitä allekirjoittaa\n"
  
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1411
  msgid "This key has expired!"
  msgstr "Tämä avain on vanhentunut!"
  
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1429
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "Avain vanhenee %s.\n"
  
- #: g10/keyedit.c:1434
++#: g10/keyedit.c:1435
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr "Haluatko allekirjoituksesi vanhenevan samaan aikaan? (K/e) "
  
- #: g10/keyedit.c:1475
++#: g10/keyedit.c:1476
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -4055,32 -3167,26 +4008,32 @@@ msgstr "
  "Kuinka huolellisesti olet vahvistanut avaimen haltijan henkilöllisyyden?\n"
  "Jos et tiedä vastausta, syötä \"0\".\n"
  
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1481
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) En vastaa.%s\n"
  
- #: g10/keyedit.c:1482
++#: g10/keyedit.c:1483
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) En ole tarkistanut lainkaan.%s\n"
  
- #: g10/keyedit.c:1484
++#: g10/keyedit.c:1485
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) Olen suorittanut arkisen tarkistuksen.%s\n"
  
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:1488
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) Olen suorittanut huolellisen tarkistuksen.%s\n"
  
- #: g10/keyedit.c:1494
++#: g10/keyedit.c:1495
  #, fuzzy
  msgid "Your selection? (enter '?' for more information): "
  msgstr "Valintasi? (syöttämällä \"?\" saat lisätietoja): "
  
- #: g10/keyedit.c:1521
++#: g10/keyedit.c:1522
  #, fuzzy, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -4089,265 -3195,211 +4042,265 @@@ msgstr "
  "Haluatko varmasti allekirjoittaa tämän avaimen\n"
  "omalla avaimellasi: \""
  
- #: g10/keyedit.c:1529
++#: g10/keyedit.c:1530
  #, fuzzy
  msgid "This will be a self-signature.\n"
  msgstr ""
  "\n"
  "Tämä tulee olemaan oma-allekirjoitus.\n"
  
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:1535
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr ""
  "\n"
  "VAROITUS: Tätä allekirjoitusta ei määritellä vientikelvottomaksi.\n"
  
- #: g10/keyedit.c:1541
++#: g10/keyedit.c:1542
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr ""
  "\n"
  "VAROITUS: Tätä allekirjoitusta ei määritellä mitätöimättömäksi.\n"
  
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1552
  #, fuzzy
  msgid "The signature will be marked as non-exportable.\n"
  msgstr ""
  "\n"
  "Tämä allekirjoitus määritellään vientikelvottomaksi.\n"
  
- #: g10/keyedit.c:1558
++#: g10/keyedit.c:1559
  #, fuzzy
  msgid "The signature will be marked as non-revocable.\n"
  msgstr ""
  "\n"
  "Tämä allekirjoitus määritellään mitätöimättömäksi.\n"
  
- #: g10/keyedit.c:1565
++#: g10/keyedit.c:1566
  #, fuzzy
  msgid "I have not checked this key at all.\n"
  msgstr ""
  "\n"
  "En ole tarkistanut tätä avainta lainkaan.\n"
  
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:1571
  #, fuzzy
  msgid "I have checked this key casually.\n"
  msgstr ""
  "\n"
  "Olen tarkistanut avaimen arkisesti.\n"
  
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:1576
  #, fuzzy
  msgid "I have checked this key very carefully.\n"
  msgstr ""
  "\n"
  "Olen tarkistanut avaimen erittäin huolellisesti.\n"
  
- #: g10/keyedit.c:1587
++#: g10/keyedit.c:1588
  #, fuzzy
  msgid "Really sign? (y/N) "
  msgstr "Varmastiko allekirjoita? "
  
- #: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
- #: g10/keyedit.c:6463 g10/sign.c:323
++#: g10/keyedit.c:1639 g10/keyedit.c:6308 g10/keyedit.c:6391 g10/keyedit.c:6500
++#: g10/keyedit.c:6562 g10/sign.c:325
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "allekirjoitus epäonnistui: %s\n"
  
- #: g10/keyedit.c:1725
++#: g10/keyedit.c:1726
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  
- #: g10/keyedit.c:1755
++#: g10/keyedit.c:1756
  #, fuzzy, c-format
  #| msgid "error creating passphrase: %s\n"
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: g10/keyedit.c:1869
++#: g10/keyedit.c:1870
  msgid "save and quit"
  msgstr "tallenna ja lopeta"
  
- #: g10/keyedit.c:1872
++#: g10/keyedit.c:1873
  #, fuzzy
  msgid "show key fingerprint"
  msgstr "näytä sormenjälki"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1874
  #, fuzzy
  msgid "show the keygrip"
  msgstr "Allekirjoitusnotaatio: "
  
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1875
  msgid "list key and user IDs"
  msgstr "näytä avaimet ja käyttäjätunnukset"
  
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1877
  msgid "select user ID N"
  msgstr "valitse käyttäjätunnus N"
  
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1878
  #, fuzzy
  msgid "select subkey N"
  msgstr "valitse käyttäjätunnus N"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1879
  #, fuzzy
  msgid "check signatures"
  msgstr "mitätöi allekirjoitus"
  
- #: g10/keyedit.c:1884
++#: g10/keyedit.c:1885
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr ""
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1890
  #, fuzzy
  msgid "sign selected user IDs locally"
  msgstr "allekirjoita avain paikallisesti"
  
- #: g10/keyedit.c:1890
++#: g10/keyedit.c:1891
  #, fuzzy
  msgid "sign selected user IDs with a trust signature"
  msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1893
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr ""
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1895
  msgid "add a user ID"
  msgstr "lisää käyttäjätunnus"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1897
  msgid "add a photo ID"
  msgstr "lisää valokuva"
  
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1898
  #, fuzzy
  msgid "delete selected user IDs"
  msgstr "poista käyttäjätunnus"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1901
  #, fuzzy
  msgid "add a subkey"
  msgstr "addkey"
  
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1904
  msgid "add a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1906
  msgid "move a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1908
  msgid "move a backup key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1910
  #, fuzzy
  msgid "delete selected subkeys"
  msgstr "poista toissijainen avain"
  
- #: g10/keyedit.c:1911
++#: g10/keyedit.c:1912
  msgid "add a revocation key"
  msgstr "lisää mitätöintiavain"
  
- #: g10/keyedit.c:1913
++#: g10/keyedit.c:1914
  #, fuzzy
  msgid "delete signatures from the selected user IDs"
  msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1916
  #, fuzzy
  msgid "change the expiration date for the key or selected subkeys"
  msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1918
  #, fuzzy
  msgid "flag the selected user ID as primary"
  msgstr "merkitse käyttäjätunnus ensisijaiseksi"
  
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1921
  msgid "list preferences (expert)"
  msgstr "näytä valinnat (asiantuntija)"
  
- #: g10/keyedit.c:1921
++#: g10/keyedit.c:1922
  msgid "list preferences (verbose)"
  msgstr "näytä valinnat (monisanaisesti)"
  
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:1924
  #, fuzzy
  msgid "set preference list for the selected user IDs"
  msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
  
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1927
  #, fuzzy
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
  
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1929
  #, fuzzy
  msgid "set a notation for the selected user IDs"
  msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1931
  msgid "change the passphrase"
  msgstr "muuta salasanaa"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1934
  msgid "change the ownertrust"
  msgstr "muuta luottamusastetta"
  
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1937
  #, fuzzy
  msgid "revoke signatures on the selected user IDs"
  msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
  
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1939
  #, fuzzy
  msgid "revoke selected user IDs"
  msgstr "mitätöi käyttäjätunnus"
  
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1942
  #, fuzzy
  msgid "revoke key or selected subkeys"
  msgstr "mitätöi toissijainen avain"
  
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1944
  #, fuzzy
  msgid "enable key"
  msgstr "ota avain käyttöön"
  
- #: g10/keyedit.c:1944
++#: g10/keyedit.c:1945
  #, fuzzy
  msgid "disable key"
  msgstr "poista avain käytöstä"
  
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1947
  #, fuzzy
  msgid "show selected photo IDs"
  msgstr "näytä valokuvatunniste"
  
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1949
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:1951
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2063
  msgid "Secret key is available.\n"
  msgstr "Salainen avain on saatavilla.\n"
  
- #: g10/keyedit.c:2162
++#: g10/keyedit.c:2163
  msgid "Need the secret key to do this.\n"
  msgstr "Tähän tarvitaan salainen avain.\n"
  
- #: g10/keyedit.c:2183
++#: g10/keyedit.c:2184
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4355,279 -3407,224 +4308,284 @@@
  "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
  msgstr ""
  
- #: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
++#: g10/keyedit.c:2240 g10/keyedit.c:3178 g10/keyedit.c:3317 g10/keyedit.c:3379
  msgid "Key is revoked."
  msgstr "Avain on mitätöity."
  
- #: g10/keyedit.c:2262
++#: g10/keyedit.c:2263
  #, fuzzy
  msgid "Really sign all user IDs? (y/N) "
  msgstr "Varmastiko allekirjoita kaikki käyttäjätunnukset?"
  
- #: g10/keyedit.c:2266
++#: g10/keyedit.c:2267
  #, fuzzy
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "Varmastiko allekirjoita kaikki käyttäjätunnukset?"
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2275
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
  
- #: g10/keyedit.c:2285
++#: g10/keyedit.c:2286
  #, fuzzy, c-format
  msgid "Unknown signature type '%s'\n"
  msgstr "tuntematon allekirjoitusluokka"
  
- #: g10/keyedit.c:2309
++#: g10/keyedit.c:2310
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
  msgstr "Tätä komentoa ei sallita %s-tilassa.\n"
  
- #: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
++#: g10/keyedit.c:2332 g10/keyedit.c:2356 g10/keyedit.c:2550
  msgid "You must select at least one user ID.\n"
  msgstr "Sinun täytyy valita ainakin yksi käyttäjätunnus.\n"
  
- #: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
++#: g10/keyedit.c:2334 g10/keyedit.c:2358 g10/keyedit.c:2512 g10/keyedit.c:2552
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2336
++#: g10/keyedit.c:2337
  msgid "You can't delete the last user ID!\n"
  msgstr "Et voi poistaa viimeistä käyttäjätunnusta!\n"
  
- #: g10/keyedit.c:2339
++#: g10/keyedit.c:2340
  #, fuzzy
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "Varmastiko poista kaikki valitut käyttäjätunnukset? "
  
- #: g10/keyedit.c:2340
++#: g10/keyedit.c:2341
  #, fuzzy
  msgid "Really remove this user ID? (y/N) "
  msgstr "Varmastiko poista tämä käyttäjätunnus? "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2397
++#: g10/keyedit.c:2398
  #, fuzzy
  msgid "Really move the primary key? (y/N) "
  msgstr "Varmastiko poista tämä käyttäjätunnus? "
  
- #: g10/keyedit.c:2409 g10/keyedit.c:4866
++#: g10/keyedit.c:2410 g10/keyedit.c:4964
  #, fuzzy
  msgid "You must select exactly one key.\n"
  msgstr "Sinun täytyy valita ainakin yksi avain.\n"
  
- #: g10/keyedit.c:2436
++#: g10/keyedit.c:2437
  msgid "Command expects a filename argument\n"
  msgstr ""
  
- #: g10/keyedit.c:2457
++#: g10/keyedit.c:2458
  #, fuzzy, c-format
  msgid "Can't open '%s': %s\n"
  msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
  
- #: g10/keyedit.c:2474
++#: g10/keyedit.c:2475
  #, fuzzy, c-format
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
  
- #: g10/keyedit.c:2509
++#: g10/keyedit.c:2510
  msgid "You must select at least one key.\n"
  msgstr "Sinun täytyy valita ainakin yksi avain.\n"
  
- #: g10/keyedit.c:2515
++#: g10/keyedit.c:2516
  #, fuzzy
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "Haluatko varmasti poistaa valitut avaimet? "
  
- #: g10/keyedit.c:2517
++#: g10/keyedit.c:2518
  #, fuzzy
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "Haluatko varmasti poistaa tämän avaimen? "
  
- #: g10/keyedit.c:2555
++#: g10/keyedit.c:2556
  #, fuzzy
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
  
- #: g10/keyedit.c:2556
++#: g10/keyedit.c:2557
  #, fuzzy
  msgid "Really revoke this user ID? (y/N) "
  msgstr "Varmastiko mitätöi tämä käyttäjätunnus? "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2575
  #, fuzzy
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "Haluatko varmasti mitätöidä tämän avaimen? "
  
- #: g10/keyedit.c:2585
++#: g10/keyedit.c:2586
  #, fuzzy
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "Haluatko varmasti mitätöidä valitut avaimet? "
  
- #: g10/keyedit.c:2587
++#: g10/keyedit.c:2588
  #, fuzzy
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "Haluatko varmasti mitätöidä tämän avaimen? "
  
- #: g10/keyedit.c:2645
++#: g10/keyedit.c:2646
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  
- #: g10/keyedit.c:2690
++#: g10/keyedit.c:2691
  #, fuzzy
  msgid "Set preference list to:\n"
  msgstr "näytä valinnat"
  
- #: g10/keyedit.c:2697
++#: g10/keyedit.c:2698
  #, fuzzy
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
  
- #: g10/keyedit.c:2699
++#: g10/keyedit.c:2700
  #, fuzzy
  msgid "Really update the preferences? (y/N) "
  msgstr "Varmastiko päivitä valinnat? "
  
- #: g10/keyedit.c:2773
++#: g10/keyedit.c:2774
  #, fuzzy
  msgid "Save changes? (y/N) "
  msgstr "Tallenna muutokset? "
  
- #: g10/keyedit.c:2777
++#: g10/keyedit.c:2778
  #, fuzzy
  msgid "Quit without saving? (y/N) "
  msgstr "Lopeta tallentamatta muutoksia?"
  
- #: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
- #: g10/keyedit.c:3267 g10/keyedit.c:3332
++#: g10/keyedit.c:2789 g10/keyedit.c:2799 g10/keyedit.c:2943 g10/keyedit.c:3046
++#: g10/keyedit.c:3268 g10/keyedit.c:3333 g10/keyedit.c:3409
  #, c-format
  msgid "update failed: %s\n"
  msgstr "päivitys epäonnistui: %s\n"
  
- #: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
++#: g10/keyedit.c:2805 g10/keyedit.c:3273 g10/keyedit.c:3338 g10/keyedit.c:3416
  msgid "Key not changed so no update needed.\n"
  msgstr "Päivitystä ei tarvita, koska avain ei ole muuttunut.\n"
  
- #: g10/keyedit.c:3038
++#: g10/keyedit.c:3039
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
  msgstr "Avaimen luonti epäonnistui: %s\n"
  
- #: g10/keyedit.c:3083
++#: g10/keyedit.c:3084
  #, fuzzy, c-format
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "virhe: sormenjälki on väärä\n"
  
- #: g10/keyedit.c:3112
++#: g10/keyedit.c:3113
  #, fuzzy, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
  
- #: g10/keyedit.c:3248 g10/keyedit.c:3251
++#: g10/keyedit.c:3249 g10/keyedit.c:3252
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
  msgstr "arvo ei kelpaa\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  #, fuzzy
  #| msgid "No such user ID.\n"
  msgid "No matching user IDs."
  msgstr "Käyttäjätunnusta ei löydy.\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  #, fuzzy
  msgid "Nothing to sign.\n"
  msgstr "Avaimelle %08lX ei löydy mitään mitä allekirjoittaa\n"
  
- #: g10/keyedit.c:3427
++#: g10/keyedit.c:3388
+ #, fuzzy, c-format
+ msgid "'%s' is not a valid expiration time\n"
+ msgstr "%s ei kelpaa merkistöksi\n"
+ 
++#: g10/keyedit.c:3508
  msgid "Digest: "
  msgstr "Tiiviste: "
  
- #: g10/keyedit.c:3484
++#: g10/keyedit.c:3565
  msgid "Features: "
  msgstr "Ominaisuudet: "
  
- #: g10/keyedit.c:3495
++#: g10/keyedit.c:3576
  msgid "Keyserver no-modify"
  msgstr ""
  
- #: g10/keyedit.c:3510 g10/keylist.c:377
++#: g10/keyedit.c:3591 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr ""
  
- #: g10/keyedit.c:3518 g10/keyedit.c:3519
++#: g10/keyedit.c:3599 g10/keyedit.c:3600
  #, fuzzy
  msgid "Notations: "
  msgstr "Notaatio: "
  
- #: g10/keyedit.c:3764
++#: g10/keyedit.c:3845
  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:3836
++#: g10/keyedit.c:3917
  #, 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:3860
++#: g10/keyedit.c:3941
  #, 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:3866
++#: g10/keyedit.c:3947
  #, fuzzy
  msgid "(sensitive)"
  msgstr " (luottamuksellinen)"
  
- #: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3989 g10/keyedit.c:4131 g10/keylist.c:262 g10/keyserver.c:538
  #, fuzzy, c-format
  msgid "created: %s"
  msgstr "ei voida luoda kohdetta %s: %s\n"
  
- #: g10/keyedit.c:3911 g10/keylist.c:1852
++#: g10/keyedit.c:3992 g10/keylist.c:1852
  #, fuzzy, c-format
  msgid "revoked: %s"
  msgstr "[mitätöity] "
  
- #: g10/keyedit.c:3913 g10/keylist.c:1858
++#: g10/keyedit.c:3994 g10/keylist.c:1858
  #, fuzzy, c-format
  msgid "expired: %s"
  msgstr " [vanhenee: %s]"
  
- #: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyedit.c:3996 g10/keyedit.c:4133 g10/keylist.c:264 g10/keylist.c:1864
 +#: g10/keyserver.c:544
  #, fuzzy, c-format
  msgid "expires: %s"
  msgstr " [vanhenee: %s]"
  
- #: g10/keyedit.c:3917
++#: g10/keyedit.c:3998
  #, fuzzy, c-format
  msgid "usage: %s"
  msgstr " luottamus: %c/%c"
  
- #: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
++#: g10/keyedit.c:4006 g10/keyedit.c:4026 g10/keylist.c:267
  msgid "card-no: "
  msgstr ""
  
- #: g10/keyedit.c:3984
++#: g10/keyedit.c:4065
  #, fuzzy, c-format
  msgid "trust: %s"
  msgstr " luottamus: %c/%c"
  
- #: g10/keyedit.c:3988
++#: g10/keyedit.c:4069
  #, c-format
  msgid "validity: %s"
  msgstr ""
  
- #: g10/keyedit.c:3995
++#: g10/keyedit.c:4076
  msgid "This key has been disabled"
  msgstr "Tämä avain on poistettu käytöstä"
  
- #: g10/keyedit.c:4013
++#: g10/keyedit.c:4094
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4635,20 -3632,14 +4593,20 @@@ 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:4069 g10/keyedit.c:4500 g10/keyserver.c:548
- #: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: g10/keyedit.c:4150 g10/keyedit.c:4581 g10/keyserver.c:548
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:712
 +#: dirmngr/ocsp.c:703
  #, fuzzy
  msgid "revoked"
  msgstr "[mitätöity] "
  
- #: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
- #: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4152 g10/keyedit.c:4583 g10/keyserver.c:552
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:714
  #, fuzzy
  msgid "expired"
  msgstr "expire"
  
- #: g10/keyedit.c:4188
++#: g10/keyedit.c:4269
  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"
@@@ -4656,17 -3647,14 +4614,17 @@@ 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:4240
++#: g10/keyedit.c:4321
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr ""
  
- #: g10/keyedit.c:4241
++#: g10/keyedit.c:4322
  #, fuzzy
  #| 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:4300
++#: g10/keyedit.c:4381
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4675,35 -3663,27 +4633,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:4305 g10/keyedit.c:4595
++#: g10/keyedit.c:4386 g10/keyedit.c:4676
  msgid "Are you sure you still want to add it? (y/N) "
  msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) "
  
- #: g10/keyedit.c:4311
++#: g10/keyedit.c:4392
  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:4326 g10/keygen.c:2697
++#: g10/keyedit.c:4407 g10/keygen.c:2719
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4509
  msgid "Delete this good signature? (y/N/q)"
  msgstr "Poistetaanko tämä kelvollinen allekirjoitus? (k/E/l)"
  
- #: g10/keyedit.c:4438
++#: g10/keyedit.c:4519
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "Poistetaanko tämä epäkelpo allekirjoitus? (k/E/l)"
  
- #: g10/keyedit.c:4442
++#: g10/keyedit.c:4523
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "Poistetaanko tämä tuntematon allekirjoitus? (k/E/l)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4530
  msgid "Really delete this self-signature? (y/N)"
  msgstr "Varmastiko poista oma-allekirjoitus? (k/E)"
  
- #: g10/keyedit.c:4465
++#: g10/keyedit.c:4546
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
@@@ -4711,38 -3691,31 +4669,38 @@@ msgid_plural "Deleted %d signatures.\n
  msgstr[0] "%d allekirjoitus poistettu.\n"
  msgstr[1] "%d allekirjoitus poistettu.\n"
  
- #: g10/keyedit.c:4469
++#: g10/keyedit.c:4550
  msgid "Nothing deleted.\n"
  msgstr "Mitään ei poistettu.\n"
  
- #: g10/keyedit.c:4504 g10/trust.c:693
++#: g10/keyedit.c:4585 g10/trust.c:716
  #, fuzzy
  msgid "invalid"
  msgstr "virheellinen ascii-koodaus"
  
- #: g10/keyedit.c:4506
++#: g10/keyedit.c:4587
  #, fuzzy, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "Käyttäjätunnus \"%s\" on mitätöity."
  
- #: g10/keyedit.c:4512
++#: g10/keyedit.c:4593
  #, 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:4520
++#: g10/keyedit.c:4601
  #, 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:4521
++#: g10/keyedit.c:4602
  #, 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:4590
++#: g10/keyedit.c:4671
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4752,39 -3725,31 +4710,39 @@@ msgstr "
  "voi\n"
  "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
  
- #: g10/keyedit.c:4601
++#: g10/keyedit.c:4682
  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:4618
++#: g10/keyedit.c:4699
  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:4643
++#: g10/keyedit.c:4724
  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:4658
++#: g10/keyedit.c:4739
  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:4680
++#: g10/keyedit.c:4761
  #, fuzzy
  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:4698
++#: g10/keyedit.c:4779
  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:4704
++#: g10/keyedit.c:4785
  #, 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:4755
++#: g10/keyedit.c:4848
  #, fuzzy
  msgid ""
  "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@@ -4792,243 -3757,192 +4750,243 @@@
  msgstr ""
  "Haluatko varmasti nimittää tämän avaimen määrätyksi mitätöijäksi? (k/E): "
  
- #: g10/keyedit.c:4760
++#: g10/keyedit.c:4853
  #, fuzzy
  msgid "Changing expiration time for a subkey.\n"
  msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n"
  
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:4856
  msgid "Changing expiration time for the primary key.\n"
  msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n"
  
- #: g10/keyedit.c:4814
++#: g10/keyedit.c:4910
  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:4987
++#: g10/keyedit.c:5085
  #, fuzzy, c-format
  msgid "signing subkey %s is already cross-certified\n"
  msgstr "VAROITUS: allekirjoitusaliavain %08lX ei ole ristiinvarmennettu\n"
  
- #: g10/keyedit.c:4993
++#: g10/keyedit.c:5091
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr ""
  
- #: g10/keyedit.c:5108
++#: g10/keyedit.c:5206
  msgid "Please select exactly one user ID.\n"
  msgstr "Valitse tasan yksi käyttäjätunnus!\n"
  
- #: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
++#: g10/keyedit.c:5247 g10/keyedit.c:5361 g10/keyedit.c:5474 g10/keyedit.c:5611
  #, 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:5320
++#: g10/keyedit.c:5418
  msgid "Enter your preferred keyserver URL: "
  msgstr ""
  
- #: g10/keyedit.c:5399
++#: g10/keyedit.c:5497
  #, fuzzy
  msgid "Are you sure you want to replace it? (y/N) "
  msgstr "Haluatko varmasti käyttää sitä (k/E)? "
  
- #: g10/keyedit.c:5400
++#: g10/keyedit.c:5498
  #, fuzzy
  msgid "Are you sure you want to delete it? (y/N) "
  msgstr "Haluatko varmasti käyttää sitä (k/E)? "
  
- #: g10/keyedit.c:5459
++#: g10/keyedit.c:5557
  #, fuzzy
  msgid "Enter the notation: "
  msgstr "Allekirjoitusnotaatio: "
  
- #: g10/keyedit.c:5606
++#: g10/keyedit.c:5704
  #, fuzzy
  msgid "Proceed? (y/N) "
  msgstr "Ylikirjoita (k/E)? "
  
- #: g10/keyedit.c:5676
++#: g10/keyedit.c:5774
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
  
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5836
  #, 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:5839
++#: g10/keyedit.c:5937
  #, 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:5861
++#: g10/keyedit.c:5959
  #, fuzzy, c-format
  msgid "No subkey with index %d\n"
  msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
  
- #: g10/keyedit.c:6002
++#: g10/keyedit.c:6100
  #, fuzzy, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "käyttäjätunnus: \""
  
- #: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
++#: g10/keyedit.c:6103 g10/keyedit.c:6205 g10/keyedit.c:6253
  #, 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:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
++#: g10/keyedit.c:6105 g10/keyedit.c:6207 g10/keyedit.c:6255
  msgid " (non-exportable)"
  msgstr " (vientiin kelpaamaton)"
  
- #: g10/keyedit.c:6011
++#: g10/keyedit.c:6109
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "Tämä allekirjoitus vanheni %s.\n"
  
- #: g10/keyedit.c:6016
++#: g10/keyedit.c:6114
  msgid "Are you sure you still want to revoke it? (y/N) "
  msgstr "Haluatko varmasti mitätöidä sen? (k/E) "
  
- #: g10/keyedit.c:6021
++#: g10/keyedit.c:6119
  msgid "Create a revocation certificate for this signature? (y/N) "
  msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) "
  
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6173
  #, fuzzy
  msgid "Not signed by you.\n"
  msgstr "   %08lX allekirjoitti tämän %s%s\n"
  
- #: g10/keyedit.c:6081
++#: g10/keyedit.c:6179
  #, 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:6110
++#: g10/keyedit.c:6208
  #, fuzzy
  msgid " (non-revocable)"
  msgstr " (vientiin kelpaamaton)"
  
- #: g10/keyedit.c:6117
++#: g10/keyedit.c:6215
  #, 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:6142
++#: g10/keyedit.c:6240
  msgid "You are about to revoke these signatures:\n"
  msgstr "Olet mitätöimässä seuraavat allekirjoitukset:\n"
  
- #: g10/keyedit.c:6165
++#: g10/keyedit.c:6263
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "Varmastiko luo mitätöintivarmenteet? (k/E) "
  
- #: g10/keyedit.c:6198
++#: g10/keyedit.c:6296
  msgid "no secret key\n"
  msgstr "salainen avain ei ole saatavilla\n"
  
- #: g10/keyedit.c:6246
++#: g10/keyedit.c:6344
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6256
++#: g10/keyedit.c:6354
  #, 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:6273
++#: g10/keyedit.c:6371
  #, 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:6386
++#: g10/keyedit.c:6485
  #, 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:6448
++#: g10/keyedit.c:6547
  #, 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:6545
++#: g10/keyedit.c:6644
  #, fuzzy, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr ""
  "Näytetään valokuva %s, kokoa %ld avaimelle 0x%08lX\n"
  "(käyttäjätunnus %d)\n"
  
- #: g10/keygen.c:305
++#: g10/keygen.c:316
  #, fuzzy, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "valinta %c%lu on kopio\n"
  
- #: g10/keygen.c:312
++#: g10/keygen.c:323
  #, fuzzy
  msgid "too many cipher preferences\n"
  msgstr "liian monta \"%c\" valintaa\n"
  
- #: g10/keygen.c:314
++#: g10/keygen.c:325
  #, fuzzy
  msgid "too many digest preferences\n"
  msgstr "liian monta \"%c\" valintaa\n"
  
- #: g10/keygen.c:316
++#: g10/keygen.c:327
  #, fuzzy
  msgid "too many compression preferences\n"
  msgstr "liian monta \"%c\" valintaa\n"
  
- #: g10/keygen.c:457
++#: g10/keygen.c:468
  #, fuzzy, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "Valinnassa on luvaton merkki\n"
  
- #: g10/keygen.c:936
++#: g10/keygen.c:947
  msgid "writing direct signature\n"
  msgstr "kirjoitetaan suora allekirjoitus\n"
  
- #: g10/keygen.c:982
++#: g10/keygen.c:993
  msgid "writing self signature\n"
  msgstr "kirjoitetaan oma-allekirjoitus\n"
  
- #: g10/keygen.c:1038
++#: g10/keygen.c:1049
  msgid "writing key binding signature\n"
  msgstr "kirjoitetaan avaimen varmentava allekirjoitus\n"
  
- #: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
- #: g10/keygen.c:1610 g10/keygen.c:1615
++#: g10/keygen.c:1413 g10/keygen.c:1418 g10/keygen.c:1470 g10/keygen.c:1475
++#: g10/keygen.c:1622 g10/keygen.c:1627
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "avaimen koko on virheellinen, käytetään %u bittiä\n"
  
- #: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
++#: g10/keygen.c:1424 g10/keygen.c:1481 g10/keygen.c:1489 g10/keygen.c:1633
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "avaimen koko on pyöristetty %u bittiin\n"
  
- #: g10/keygen.c:1503
++#: g10/keygen.c:1515
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1677
++#: g10/keygen.c:1689
  #, fuzzy
  msgid "Sign"
  msgstr "sign"
  
- #: g10/keygen.c:1680
++#: g10/keygen.c:1692
  msgid "Certify"
  msgstr ""
  
- #: g10/keygen.c:1683
++#: g10/keygen.c:1695
  #, fuzzy
  msgid "Encrypt"
  msgstr "salaa tiedot"
  
- #: g10/keygen.c:1686
++#: g10/keygen.c:1698
  msgid "Authenticate"
  msgstr ""
  
@@@ -5042,157 -3956,126 +5000,157 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1705
++#: g10/keygen.c:1717
  msgid "SsEeAaQq"
  msgstr ""
  
- #: g10/keygen.c:1732
++#: g10/keygen.c:1744
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr ""
  
- #: g10/keygen.c:1738
++#: g10/keygen.c:1750
  msgid "Current allowed actions: "
  msgstr ""
  
- #: g10/keygen.c:1743
++#: g10/keygen.c:1755
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr ""
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1758
  #, fuzzy, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%d) ElGamal (vain salaus)\n"
  
- #: g10/keygen.c:1749
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr ""
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr ""
  
- #: g10/keygen.c:1881 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1893 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Valitse millaisen avaimen haluat:\n"
  
- #: g10/keygen.c:1885
++#: g10/keygen.c:1897
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) DSA ja ElGamal (oletus)\n"
  
- #: g10/keygen.c:1889
++#: g10/keygen.c:1901
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA ja ElGamal (oletus)\n"
  
- #: g10/keygen.c:1892
++#: g10/keygen.c:1904
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (vain allekirjoitus)\n"
  
- #: g10/keygen.c:1894
++#: g10/keygen.c:1906
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (vain allekirjoitus)\n"
  
- #: g10/keygen.c:1900
++#: g10/keygen.c:1912
  #, fuzzy, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) ElGamal (vain salaus)\n"
  
- #: g10/keygen.c:1902
++#: g10/keygen.c:1914
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (vain salaus)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1920
  #, fuzzy, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (vain salaus)\n"
  
- #: g10/keygen.c:1910
++#: g10/keygen.c:1922
  #, fuzzy, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (vain salaus)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1928
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA ja ElGamal (oletus)\n"
  
- #: g10/keygen.c:1918
++#: g10/keygen.c:1930
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (vain allekirjoitus)\n"
  
- #: g10/keygen.c:1920
++#: g10/keygen.c:1932
  #, fuzzy, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) RSA (vain salaus)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1934
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) RSA (vain salaus)\n"
  
- #: g10/keygen.c:1926
++#: g10/keygen.c:1938
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) RSA (vain salaus)\n"
  
- #: g10/keygen.c:2022 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:206
  #, fuzzy
  msgid "Enter the keygrip: "
  msgstr "Allekirjoitusnotaatio: "
  
- #: g10/keygen.c:2035 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2047 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2049 sm/certreqgen-ui.c:216
  #, fuzzy
  msgid "No key with this keygrip\n"
  msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
  
- #: g10/keygen.c:2111 g10/keygen.c:2125
++#: g10/keygen.c:2133 g10/keygen.c:2147
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
  msgstr "pyöristetty %u bittiin\n"
  
- #: g10/keygen.c:2166
++#: g10/keygen.c:2188
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr ""
  
- #: g10/keygen.c:2174
++#: g10/keygen.c:2196
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Minkä kokoisen avaimen haluat? (1024) "
  
- #: g10/keygen.c:2177 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2199 sm/certreqgen-ui.c:183
  #, fuzzy, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Minkä kokoisen avaimen haluat? (1024) "
  
- #: g10/keygen.c:2191 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2213 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Halutun avaimen koko on %u bittiä\n"
  
- #: g10/keygen.c:2237
++#: g10/keygen.c:2259
  #, fuzzy
  #| msgid "Please select what kind of key you want:\n"
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Valitse millaisen avaimen haluat:\n"
  
- #: g10/keygen.c:2409
++#: g10/keygen.c:2431
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5208,7 -4091,6 +5166,7 @@@ msgstr "
  "     <n>m = Avain vanhenee n kuukauden kuluttua\n"
  "     <n>y = Avain vanhenee n vuoden kuluttua\n"
  
- #: g10/keygen.c:2420
++#: g10/keygen.c:2442
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5224,40 -4106,32 +5182,40 @@@ msgstr "
  "     <n>m = Allekirjoitus vanhenee n kuukauden kuluttua\n"
  "     <n>y = Allekirjoitus vanhenee n vuoden kuluttua\n"
  
- #: g10/keygen.c:2443
++#: g10/keygen.c:2465
  msgid "Key is valid for? (0) "
  msgstr "Avain on voimassa? (0) "
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2470
  #, fuzzy, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Allekirjoitus on voimassa? (0) "
  
- #: g10/keygen.c:2461 g10/keygen.c:2486
++#: g10/keygen.c:2483 g10/keygen.c:2508
  msgid "invalid value\n"
  msgstr "arvo ei kelpaa\n"
  
- #: g10/keygen.c:2468
++#: g10/keygen.c:2490
  #, fuzzy
  msgid "Key does not expire at all\n"
  msgstr "%s ei vanhene koskaan\n"
  
- #: g10/keygen.c:2469
++#: g10/keygen.c:2491
  #, fuzzy
  msgid "Signature does not expire at all\n"
  msgstr "%s ei vanhene koskaan\n"
  
- #: g10/keygen.c:2474
++#: g10/keygen.c:2496
  #, fuzzy, c-format
  msgid "Key expires at %s\n"
  msgstr "%s vanhenee %s\n"
  
- #: g10/keygen.c:2475
++#: g10/keygen.c:2497
  #, fuzzy, c-format
  msgid "Signature expires at %s\n"
  msgstr "Allekirjoitus vanhenee %s\n"
  
- #: g10/keygen.c:2479
++#: g10/keygen.c:2501
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5265,12 -4139,10 +5223,12 @@@ msgstr "
  "Järjestelmäsi ei osaa näyttää päiväyksiä kuin vuoteen 2038.\n"
  "Se kuitenkin käsittelee päiväykset oikein vuoteen 2106.\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2514
  #, fuzzy
  msgid "Is this correct? (y/N) "
  msgstr "Onko tämä oikein (k/e) "
  
- #: g10/keygen.c:2560
++#: g10/keygen.c:2582
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5281,7 -4153,6 +5239,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2575
++#: g10/keygen.c:2597
  #, fuzzy
  msgid ""
  "\n"
@@@ -5299,50 -4170,39 +5257,50 @@@ msgstr "
  "     \"Matti Meikäläinen (nuorempi) <matti.meikalainen at osoite.fi>\"\n"
  "\n"
  
- #: g10/keygen.c:2594
++#: g10/keygen.c:2616
  msgid "Real name: "
  msgstr "Oikea nimi: "
  
- #: g10/keygen.c:2603
++#: g10/keygen.c:2625
  msgid "Invalid character in name\n"
  msgstr "Nimessä on epäkelpo merkki\n"
  
- #: g10/keygen.c:2604
++#: g10/keygen.c:2626
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2608
++#: g10/keygen.c:2630
  msgid "Name may not start with a digit\n"
  msgstr "Nimi ei voi alkaa numerolla\n"
  
- #: g10/keygen.c:2611
++#: g10/keygen.c:2633
  msgid "Name must be at least 5 characters long\n"
  msgstr "Nimen täytyy olla vähintään 5 merkkiä pitkä\n"
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2643
  msgid "Email address: "
  msgstr "Sähköpostiosoite: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2649
  msgid "Not a valid email address\n"
  msgstr "Sähköpostiosoite ei kelpaa\n"
  
- #: g10/keygen.c:2636
++#: g10/keygen.c:2658
  msgid "Comment: "
  msgstr "Huomautus: "
  
- #: g10/keygen.c:2642
++#: g10/keygen.c:2664
  msgid "Invalid character in comment\n"
  msgstr "Huomautuksessa on epäkelpo merkki\n"
  
- #: g10/keygen.c:2678
++#: g10/keygen.c:2700
  #, fuzzy, c-format
  #| msgid "You are using the `%s' character set.\n"
  msgid "You are using the '%s' character set.\n"
  msgstr "Käytät merkistöä \"%s\".\n"
  
- #: g10/keygen.c:2684
++#: g10/keygen.c:2706
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5353,7 -4213,6 +5311,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2689
++#: g10/keygen.c:2711
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr "Älä syötä sähköpostiosoitetta nimen tai huomautuksen paikalle\n"
  
@@@ -5368,35 -4227,28 +5326,35 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2714
++#: g10/keygen.c:2736
  msgid "NnCcEeOoQq"
  msgstr "NnHhSsOoLl"
  
- #: g10/keygen.c:2724
++#: g10/keygen.c:2746
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (L)opeta?"
  
- #: g10/keygen.c:2725
++#: g10/keygen.c:2747
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (O)k/(L)opeta?"
  
- #: g10/keygen.c:2730
++#: g10/keygen.c:2752
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (L)opeta?"
  
- #: g10/keygen.c:2731
++#: g10/keygen.c:2753
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (O)k/(L)opeta?"
  
- #: g10/keygen.c:2750
++#: g10/keygen.c:2772
  msgid "Please correct the error first\n"
  msgstr "Ole hyvä ja korjaa ensin virhe\n"
  
- #: g10/keygen.c:2796
++#: g10/keygen.c:2818
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5408,13 -4260,10 +5366,13 @@@ msgstr "
  "alkulukujen luomisen aikana, tämä antaa satunnaislukugeneraattorille\n"
  "paremmat mahdollisuudet kerätä riittävästi entropiaa.\n"
  
- #: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
- #: g10/keygen.c:4777 g10/keygen.c:4882
++#: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
++#: g10/keygen.c:4330 g10/keygen.c:4803 g10/keygen.c:5064 g10/keygen.c:5169
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Avaimen luonti epäonnistui: %s\n"
  
- #: g10/keygen.c:3598
++#: g10/keygen.c:3922
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5422,66 -4271,53 +5380,66 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3924
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3621
++#: g10/keygen.c:3945
  #, fuzzy, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "\"%s\" on jo pakattu\n"
  
- #: g10/keygen.c:3626
++#: g10/keygen.c:3950
  #, fuzzy
  msgid "Create anyway? (y/N) "
  msgstr "Haluatko käyttää tätä avainta kaikesta huolimatta? "
  
- #: g10/keygen.c:3632
++#: g10/keygen.c:3956
  #, fuzzy
  msgid "creating anyway\n"
  msgstr "luo uusi avainpari"
  
- #: g10/keygen.c:3981
++#: g10/keygen.c:4315
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:4013
++#: g10/keygen.c:4358
  msgid "Key generation canceled.\n"
  msgstr "Avaimen luonti keskeytetty.\n"
  
- #: g10/keygen.c:4073
++#: g10/keygen.c:4418
  #, fuzzy, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
  
- #: g10/keygen.c:4093
++#: g10/keygen.c:4438
  #, fuzzy, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "HUOM: salainen avain %08lX vanheni %s\n"
  
- #: g10/keygen.c:4244 g10/keygen.c:4393
++#: g10/keygen.c:4589 g10/keygen.c:4738
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
  msgstr "kirjoitan julkisen avaimen kohteeseen \"%s\"\n"
  
- #: g10/keygen.c:4387
++#: g10/keygen.c:4732
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "kirjoitettavissa olevaa julkista avainrengasta ei löydy: %s\n"
  
- #: g10/keygen.c:4401
++#: g10/keygen.c:4746
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error writing public keyring '%s': %s\n"
  msgstr "virhe kirjoitettaessa julkiseen avainrenkaaseen \"%s\": %s\n"
  
- #: g10/keygen.c:4433
++#: g10/keygen.c:4778
  msgid "public and secret key created and signed.\n"
  msgstr "julkinen ja salainen avain on luotu ja allekirjoitettu.\n"
  
- #: g10/keygen.c:4445
++#: g10/keygen.c:4790
  #, fuzzy
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
@@@ -5490,7 -4326,6 +5448,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:4649 g10/keygen.c:4833
++#: g10/keygen.c:4936 g10/keygen.c:5120
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5498,7 -4333,6 +5456,7 @@@ msgstr "
  "avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
  "kellon kanssa on ongelmia)\n"
  
- #: g10/keygen.c:4651 g10/keygen.c:4835
++#: g10/keygen.c:4938 g10/keygen.c:5122
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5506,22 -4340,18 +5464,22 @@@ msgstr "
  "avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
  "kellon kanssa on ongelmia)\n"
  
- #: g10/keygen.c:4662 g10/keygen.c:4846
++#: g10/keygen.c:4949 g10/keygen.c:5133
  #, fuzzy
  #| 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:4674 g10/keygen.c:4676
++#: g10/keygen.c:4961 g10/keygen.c:4963
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
  
- #: g10/keygen.c:4683 g10/keygen.c:4685
++#: g10/keygen.c:4970 g10/keygen.c:4972
  #, fuzzy
  msgid "Secret parts of primary key are stored on-card.\n"
  msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
  
- #: g10/keygen.c:4704 g10/keygen.c:4860
++#: g10/keygen.c:4991 g10/keygen.c:5147
  #, fuzzy
  msgid "Really create? (y/N) "
  msgstr "Haluatko varmasti luoda? "
@@@ -5848,131 -4613,105 +5806,131 @@@ msgstr "
  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:1233 g10/mainproc.c:1276
++#: g10/mainproc.c:1238 g10/mainproc.c:1281
  #, fuzzy
  msgid "no signature found\n"
  msgstr "Allekirjoitus täsmää lähettäjään \""
  
- #: g10/mainproc.c:1607
++#: g10/mainproc.c:1612
  #, fuzzy, c-format
  msgid "BAD signature from \"%s\""
  msgstr "VÄÄRÄ allekirjoitus lähettäjältä \""
  
- #: g10/mainproc.c:1609
++#: g10/mainproc.c:1614
  #, fuzzy, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Vanhentunut allekirjoitus lähettäjältä \""
  
- #: g10/mainproc.c:1611
++#: g10/mainproc.c:1616
  #, fuzzy, c-format
  msgid "Good signature from \"%s\""
  msgstr "Allekirjoitus täsmää lähettäjään \""
  
- #: g10/mainproc.c:1630
++#: g10/mainproc.c:1635
  msgid "signature verification suppressed\n"
  msgstr "allekirjoituksen varmistus vaiennetaan\n"
  
- #: g10/mainproc.c:1739
++#: g10/mainproc.c:1744
  #, fuzzy
  msgid "can't handle this ambiguous signature data\n"
  msgstr "näitä allekirjoituksia ei voi käsitellä\n"
  
- #: g10/mainproc.c:1753 g10/mainproc.c:1761
++#: g10/mainproc.c:1758 g10/mainproc.c:1766
  #, fuzzy, c-format
  msgid "Signature made %s\n"
  msgstr "Allekirjoitus vanheni %s\n"
  
- #: g10/mainproc.c:1754 g10/mainproc.c:1762
++#: g10/mainproc.c:1759 g10/mainproc.c:1767
  #, fuzzy, c-format
  msgid "               using %s key %s\n"
  msgstr "                aka \""
  
- #: g10/mainproc.c:1766
++#: g10/mainproc.c:1771
  #, 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:1772
++#: g10/mainproc.c:1777
  #, fuzzy, c-format
  msgid "               issuer \"%s\"\n"
  msgstr "                aka \""
  
- #: g10/mainproc.c:1789
++#: g10/mainproc.c:1794
  msgid "Key available at: "
  msgstr "Avain saatavilla kohteessa: "
  
- #: g10/mainproc.c:2024
++#: g10/mainproc.c:2029
  msgid "[uncertain]"
  msgstr "[ei tiedossa]"
  
- #: g10/mainproc.c:2062
++#: g10/mainproc.c:2067
  #, fuzzy, c-format
  msgid "                aka \"%s\""
  msgstr "                aka \""
  
- #: g10/mainproc.c:2145
++#: g10/mainproc.c:2150
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "Allekirjoitus vanheni %s\n"
  
- #: g10/mainproc.c:2149
++#: g10/mainproc.c:2154
  #, 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:2160
++#: g10/mainproc.c:2165
  #, 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:2161
++#: g10/mainproc.c:2166
  msgid "binary"
  msgstr "binääri"
  
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2167
  msgid "textmode"
  msgstr "teksti"
  
- #: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "tuntematon "
  
- #: g10/mainproc.c:2164
++#: g10/mainproc.c:2169
  #, fuzzy
  #| msgid "unknown pubkey algorithm"
  msgid ", key algorithm "
  msgstr "tuntematon julkisen avaimen algoritmi"
  
- #: g10/mainproc.c:2199
++#: g10/mainproc.c:2204
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2229
++#: g10/mainproc.c:2234
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "Allekirjoitusta ei voi tarkistaa: %s\n"
  
- #: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
++#: g10/mainproc.c:2327 g10/mainproc.c:2346 g10/mainproc.c:2470
  msgid "not a detached signature\n"
  msgstr "allekirjoitus ei ole erillinen\n"
  
- #: g10/mainproc.c:2375
++#: g10/mainproc.c:2380
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
  msgstr ""
  "VAROITUS: useita allekirjoituksia havaittu.  Vain ensimmäisen voi "
  "tarkistaa.\n"
  
- #: g10/mainproc.c:2384
++#: g10/mainproc.c:2389
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "itsenäinen allekirjoitus luokkaa 0x%02x\n"
  
- #: g10/mainproc.c:2469
++#: g10/mainproc.c:2474
  msgid "old style (PGP 2.x) signature\n"
  msgstr "vanhan tyylin (PGP 2.x) allekirjoitus\n"
  
@@@ -6263,23 -4948,18 +6221,23 @@@ msgstr "Onko tämä oikein (k/E/l)? 
  msgid "unable to display photo ID!\n"
  msgstr "valokuvatunnistetta ei voi näyttää!\n"
  
- #: g10/pkclist.c:72 g10/revoke.c:757
++#: g10/pkclist.c:72 g10/revoke.c:758
  msgid "No reason specified"
  msgstr "Ei eriteltyä syytä"
  
- #: g10/pkclist.c:74 g10/revoke.c:759
++#: g10/pkclist.c:74 g10/revoke.c:760
  msgid "Key is superseded"
  msgstr "Avain on uusittu"
  
- #: g10/pkclist.c:76 g10/revoke.c:758
++#: g10/pkclist.c:76 g10/revoke.c:759
  msgid "Key has been compromised"
  msgstr "Avain on murrettu"
  
- #: g10/pkclist.c:78 g10/revoke.c:760
++#: g10/pkclist.c:78 g10/revoke.c:761
  msgid "Key is no longer used"
  msgstr "Avain ei ole enää käytössä"
  
- #: g10/pkclist.c:80 g10/revoke.c:761
++#: g10/pkclist.c:80 g10/revoke.c:762
  msgid "User ID is no longer valid"
  msgstr "Käyttäjätunnus ei ole enää käytössä"
  
@@@ -6360,7 -5027,6 +6318,7 @@@ msgid "
  "\n"
  msgstr ""
  
- #: g10/pkclist.c:310 g10/revoke.c:786
++#: g10/pkclist.c:310 g10/revoke.c:787
  msgid "Your decision? "
  msgstr "Valintasi? "
  
@@@ -6401,10 -5060,9 +6359,10 @@@ msgstr "Tämä on oma avain\n
  msgid "%s: This key is bad!  It has been marked as untrusted!\n"
  msgstr ""
  
 +#: g10/pkclist.c:484
  #, fuzzy
  msgid ""
- "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "This key is bad!  It has been marked as untrusted!  If you\n"
  "*really* know what you are doing, you may answer the next\n"
  "question with yes.\n"
  msgstr ""
@@@ -6565,33 -5193,26 +6523,33 @@@ msgstr "
  msgid "No such user ID.\n"
  msgstr "Käyttäjätunnusta ei löydy.\n"
  
- #: g10/pkclist.c:1197 g10/pkclist.c:1273
++#: g10/pkclist.c:1197 g10/pkclist.c:1274
  msgid "skipped: public key already set as default recipient\n"
  msgstr "ohitettu: julkinen avain on jo asetettu oletusvastaanottajaksi\n"
  
- #: g10/pkclist.c:1218
++#: g10/pkclist.c:1219
  msgid "Public key is disabled.\n"
  msgstr "Julkinen avain on poistettu käytöstä\n"
  
- #: g10/pkclist.c:1228
++#: g10/pkclist.c:1229
  msgid "skipped: public key already set\n"
  msgstr "ohitettu: julkinen avain on jo asetettu\n"
  
- #: g10/pkclist.c:1263
++#: g10/pkclist.c:1264
  #, fuzzy, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
  
- #: g10/pkclist.c:1312
++#: g10/pkclist.c:1313
  msgid "no valid addressees\n"
  msgstr "ei kelvollisia vastaanottajia\n"
  
- #: g10/pkclist.c:1665
++#: g10/pkclist.c:1666
  #, fuzzy, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "avain %08lX: ei käyttäjätunnusta\n"
  
- #: g10/pkclist.c:1690
++#: g10/pkclist.c:1691
  #, fuzzy, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "avain %08lX: ei käyttäjätunnusta\n"
@@@ -6601,29 -5221,23 +6559,29 @@@ msgid "data not saved; use option \"--o
  msgstr ""
  "dataa ei ole tallennettu, käytä valitsinta \"--output\" tallentaaksesi\n"
  
- #: g10/plaintext.c:598
++#: g10/plaintext.c:614
  msgid "Detached signature.\n"
  msgstr "Erillinen allekirjoitus.\n"
  
- #: g10/plaintext.c:606
++#: g10/plaintext.c:622
  msgid "Please enter name of data file: "
  msgstr "Anna datatiedoston nimi: "
  
- #: g10/plaintext.c:643
++#: g10/plaintext.c:659
  msgid "reading stdin ...\n"
  msgstr "luetaan vakiosyötettä ...\n"
  
- #: g10/plaintext.c:688
++#: g10/plaintext.c:704
  msgid "no signed data\n"
  msgstr "ei allekirjoitettua dataa\n"
  
- #: g10/plaintext.c:706
++#: g10/plaintext.c:722
  #, fuzzy, c-format
  #| msgid "can't open signed data `%s'\n"
  msgid "can't open signed data '%s'\n"
  msgstr "allekirjoitetun datan \"%s\" avaaminen ei onnistu\n"
  
- #: g10/plaintext.c:741
++#: g10/plaintext.c:757
  #, fuzzy, c-format
  msgid "can't open signed data fd=%d: %s\n"
  msgstr "allekirjoitetun datan \"%s\" avaaminen ei onnistu\n"
@@@ -6692,7 -5292,6 +6650,7 @@@ msgstr "Salainen avain on saatavilla.\n
  msgid "Create a designated revocation certificate for this key? (y/N) "
  msgstr "Luo tälle avaimelle mitätöintivarmenne? "
  
- #: g10/revoke.c:336 g10/revoke.c:727
++#: g10/revoke.c:336 g10/revoke.c:728
  msgid "ASCII armored output forced.\n"
  msgstr "ASCII-koodattu tuloste määritetty.\n"
  
@@@ -6728,23 -5321,20 +6686,23 @@@ msgid "
  "the secret key.  However, if the secret key is still accessible,\n"
  "it is better to generate a new revocation certificate and give\n"
  "a reason for the revocation.  For details see the description of\n"
- "of the gpg command \"--gen-revoke\" in the GnuPG manual."
+ "of the gpg command \"--generate-revocation\" in the GnuPG manual."
  msgstr ""
  
- #: g10/revoke.c:575
++#: g10/revoke.c:576
  msgid ""
  "To avoid an accidental use of this file, a colon has been inserted\n"
  "before the 5 dashes below.  Remove this colon with a text editor\n"
  "before importing and publishing this revocation certificate."
  msgstr ""
  
- #: g10/revoke.c:590
++#: g10/revoke.c:591
  #, fuzzy, c-format
  #| msgid "Revocation certificate created.\n"
  msgid "revocation certificate stored as '%s.rev'\n"
  msgstr "Mitätöintivarmenne luotu.\n"
  
- #: g10/revoke.c:634
++#: g10/revoke.c:635
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found\n"
  msgstr "salaista avainta \"%s\" ei löydy: %s\n"
@@@ -6752,23 -5342,19 +6710,23 @@@
  #. TRANSLATORS: The %s prints a key specification which
  #. for example has been given at the command line.  Several lines
  #. lines with secret key infos are printed after this message.
- #: g10/revoke.c:661
++#: g10/revoke.c:662
  #, c-format
  msgid "'%s' matches multiple secret keys:\n"
  msgstr ""
  
- #: g10/revoke.c:688
++#: g10/revoke.c:689
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error searching the keyring: %s\n"
  msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
  
- #: g10/revoke.c:711
++#: g10/revoke.c:712
  #, fuzzy
  msgid "Create a revocation certificate for this key? (y/N) "
  msgstr "Luo tälle avaimelle mitätöintivarmenne? "
  
- #: g10/revoke.c:735
++#: g10/revoke.c:736
  msgid ""
  "Revocation certificate created.\n"
  "\n"
@@@ -6788,33 -5374,26 +6746,33 @@@ msgstr "
  "tulostusjärjestelmä saattaa tallentaa datan ja saattaa sen muiden "
  "saataville!\n"
  
- #: g10/revoke.c:769
++#: g10/revoke.c:770
  msgid "Please select the reason for the revocation:\n"
  msgstr "Valitse mitätöinnin syy:\n"
  
- #: g10/revoke.c:779
++#: g10/revoke.c:780
  msgid "Cancel"
  msgstr "Peru"
  
- #: g10/revoke.c:781
++#: g10/revoke.c:782
  #, c-format
  msgid "(Probably you want to select %d here)\n"
  msgstr "(Todennäköisesti haluat valita %d tässä)\n"
  
- #: g10/revoke.c:822
++#: g10/revoke.c:823
  msgid "Enter an optional description; end it with an empty line:\n"
  msgstr "Syötä vapaaehtoinen kuvaus; lopeta tyhjään riviin:\n"
  
- #: g10/revoke.c:850
++#: g10/revoke.c:851
  #, c-format
  msgid "Reason for revocation: %s\n"
  msgstr "Mitätöinnin syy: %s\n"
  
- #: g10/revoke.c:852
++#: g10/revoke.c:853
  msgid "(No description given)\n"
  msgstr "(Kuvausta ei annettu)\n"
  
- #: g10/revoke.c:857
++#: g10/revoke.c:858
  #, fuzzy
  msgid "Is this okay? (y/N) "
  msgstr "Kelpaako tämä? "
@@@ -6950,23 -5509,19 +6908,23 @@@ msgstr "
  "VAROITUS: käytäntö-url:n %%-laajennus ei onnistu (liian suuri). \n"
  "Käytetään laajentamatonta.\n"
  
- #: g10/sign.c:329
++#: g10/sign.c:331
  #, fuzzy, c-format
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s-allekirjoitus lähettäjältä: \"%s\"\n"
  
- #: g10/sign.c:878
++#: g10/sign.c:880
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
  msgstr ""
  "valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n"
  
- #: g10/sign.c:1009
++#: g10/sign.c:1011
  msgid "signing:"
  msgstr "allekirjoitetaan:"
  
- #: g10/sign.c:1286
++#: g10/sign.c:1288
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "käytetään %s-salausta\n"
@@@ -6993,7 -5544,6 +6951,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:362
++#: g10/tdbdump.c:57 g10/trustdb.c:369
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n"
@@@ -7041,7 -5583,6 +6999,7 @@@ msgstr "virhe etsittäessä luottamusti
  msgid "read error in '%s': %s\n"
  msgstr "lukuvirhe: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "trustdb: synkronointi epäonnistui: %s\n"
@@@ -7187,298 -5699,306 +7145,372 @@@ msgstr "yli %d merkkiä pitkiä tekstir
  msgid "input line longer than %d characters\n"
  msgstr "syöterivi on yli %d merkkiä pitkä\n"
  
- #: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
++#: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
  #, fuzzy, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
  
- #: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
++#: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:357 g10/tofu.c:699
++#: g10/tofu.c:355 g10/tofu.c:888
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:501
++#: g10/tofu.c:505
  #, fuzzy, c-format
  msgid "unsupported TOFU database version: %s\n"
  msgstr ""
  "\n"
  "Tuetut algoritmit:\n"
  
- #: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
- #: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
- #: g10/tofu.c:3056
++#: g10/tofu.c:538
+ #, fuzzy, c-format
+ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
+ msgstr "virhe luotaessa salasanaa: %s\n"
+ 
++#: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
+ msgid "TOFU DB error"
+ msgstr ""
+ 
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2340 g10/tofu.c:2359
++#: g10/tofu.c:2372 g10/tofu.c:2384 g10/tofu.c:2399 g10/tofu.c:2411
++#: g10/tofu.c:2980 g10/tofu.c:2997 g10/tofu.c:3033 g10/tofu.c:3050
++#: g10/tofu.c:3353
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
  
- #: g10/tofu.c:566 g10/tofu.c:574
++#: g10/tofu.c:716 g10/tofu.c:724
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error determining TOFU database's version: %s\n"
  msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
  
- #: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
++#: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing TOFU database: %s\n"
  msgstr "%s: virhe kirjoitettaessa hakemistotietuetta: %s\n"
  
- #: g10/tofu.c:765
++#: g10/tofu.c:844
+ #, fuzzy, c-format
+ msgid "error creating 'encryptions' TOFU table: %s\n"
+ msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
+ 
++#: g10/tofu.c:874
+ #, c-format
+ msgid "adding column effective_policy to bindings DB: %s\n"
+ msgstr ""
+ 
++#: g10/tofu.c:956
  #, fuzzy, c-format
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
  
- #: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
++#: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
  
- #: g10/tofu.c:1239
++#: g10/tofu.c:1328
  #, c-format
  msgid ""
  "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1247
++#: g10/tofu.c:1337
  #, c-format
- msgid "The email address \"%s\" is associated with %d keys!"
- msgstr ""
+ msgid "The email address \"%s\" is associated with %d key!"
+ msgid_plural "The email address \"%s\" is associated with %d keys!"
+ msgstr[0] ""
+ msgstr[1] ""
  
- #: g10/tofu.c:1251
++#: g10/tofu.c:1343
  msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  
- #: g10/tofu.c:1257
++#: g10/tofu.c:1349
  #, c-format
  msgid ""
  "Please indicate whether this email address should be associated with key %s "
  "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1513
++#: g10/tofu.c:1605
  #, fuzzy, c-format
  msgid "error gathering other user IDs: %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: g10/tofu.c:1523
++#: g10/tofu.c:1615
  #, fuzzy
  #| msgid "list key and user IDs"
  msgid "This key's user IDs:\n"
  msgstr "näytä avaimet ja käyttäjätunnukset"
  
- #: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
++#: g10/tofu.c:1631 g10/tofu.c:1796
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "policy: %s"
  msgstr "Käytäntö: "
  
- #: g10/tofu.c:1630
++#: g10/tofu.c:1722
  #, fuzzy, c-format
  msgid "error gathering signature stats: %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: g10/tofu.c:1634
++#: g10/tofu.c:1726
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1651
++#: g10/tofu.c:1744
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1684 g10/tofu.c:1689
++#: g10/tofu.c:1785 g10/tofu.c:1790
  msgid ", "
  msgstr ""
  
- #: g10/tofu.c:1693
++#: g10/tofu.c:1794
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
  msgstr "näytä avaimet"
  
- #: g10/tofu.c:1715
++#: g10/tofu.c:1820
+ #, fuzzy, c-format
+ msgid "Verified %d message."
+ msgid_plural "Verified %d messages."
+ msgstr[0] "|algo [tiedostot]|tulosta viestien tiivisteet"
+ msgstr[1] "|algo [tiedostot]|tulosta viestien tiivisteet"
+ 
++#: g10/tofu.c:1824
  #, fuzzy, c-format
- msgid "Verified %d message"
- msgid_plural "Verified %d messages"
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid "Encrypted %d message."
+ msgid_plural "Encrypted %d messages."
+ msgstr[0] "salattu %lu salasanalla\n"
+ msgstr[1] "salattu %lu salasanalla\n"
+ 
++#: g10/tofu.c:1831
+ #, fuzzy, c-format
+ msgid "Verified %d message in the future."
+ msgid_plural "Verified %d messages in the future."
+ msgstr[0] "|algo [tiedostot]|tulosta viestien tiivisteet"
+ msgstr[1] "|algo [tiedostot]|tulosta viestien tiivisteet"
+ 
++#: g10/tofu.c:1835
+ #, fuzzy, c-format
+ msgid "Encrypted %d message in the future."
+ msgid_plural "Encrypted %d messages in the future."
  msgstr[0] "|algo [tiedostot]|tulosta viestien tiivisteet"
  msgstr[1] "|algo [tiedostot]|tulosta viestien tiivisteet"
  
- #: g10/tofu.c:1719
++#: g10/tofu.c:1849
  #, c-format
- msgid "Encrypted %d message"
- msgid_plural "Encrypted %d messages"
+ msgid "Messages verified over the past %d day: %d."
+ msgid_plural "Messages verified over the past %d days: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1734
++#: g10/tofu.c:1855
  #, c-format
- msgid " over the past day."
- msgid_plural " over the past %d days."
+ msgid "Messages encrypted over the past %d day: %d."
+ msgid_plural "Messages encrypted over the past %d days: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1740
++#: g10/tofu.c:1865
  #, c-format
- msgid " over the past month."
- msgid_plural " over the past %d months."
+ msgid "Messages verified over the past %d month: %d."
+ msgid_plural "Messages verified over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1746
++#: g10/tofu.c:1871
  #, c-format
- msgid " over the past year."
- msgid_plural " over the past %d years."
+ msgid "Messages encrypted over the past %d month: %d."
+ msgid_plural "Messages encrypted over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1752
- msgid " in the past."
++#: g10/tofu.c:1881
+ #, c-format
+ msgid "Messages verified over the past %d year: %d."
+ msgid_plural "Messages verified over the past %d years: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1887
+ #, c-format
+ msgid "Messages encrypted over the past %d year: %d."
+ msgid_plural "Messages encrypted over the past %d years: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1895
+ #, c-format
+ msgid "Messages verified in the past: %d."
  msgstr ""
  
++#: g10/tofu.c:1899
+ #, fuzzy, c-format
+ msgid "Messages encrypted in the past: %d."
+ msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1767
++#: g10/tofu.c:1916
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1809
++#: g10/tofu.c:1958
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1815
++#: g10/tofu.c:1964
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1823
++#: g10/tofu.c:1972
  msgid "Defaulting to unknown."
  msgstr ""
  
- #: g10/tofu.c:1938 g10/tofu.c:2074
++#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
- #: g10/tofu.c:1994
++#: g10/tofu.c:2143
  #, fuzzy, c-format
  msgid "resetting keydb: %s\n"
  msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
  
- #: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
- #: g10/tofu.c:2425
++#: g10/tofu.c:2601
  #, fuzzy, c-format
- msgid "error setting TOFU binding's trust level to %s\n"
+ msgid "error setting TOFU binding's policy to %s\n"
  msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
  
- #: g10/tofu.c:2473
++#: g10/tofu.c:2794
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #. TRANSLATORS: The tilde ('~') is used here to indicate a
- #. * non-breakable space
- #: g10/tofu.c:2574
++#: g10/tofu.c:2839
  #, c-format
- msgid "%d~year"
- msgid_plural "%d~years"
+ msgid "%lld~year"
+ msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2583
++#: g10/tofu.c:2844
  #, c-format
- msgid "%d~month"
- msgid_plural "%d~months"
+ msgid "%lld~month"
+ msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2592
++#: g10/tofu.c:2849
  #, c-format
- msgid "%d~day"
- msgid_plural "%d~days"
+ msgid "%lld~week"
+ msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2854
  #, c-format
- msgid "%d~hour"
- msgid_plural "%d~hours"
+ msgid "%lld~day"
+ msgid_plural "%lld~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2610
++#: g10/tofu.c:2859
  #, c-format
- msgid "%d~minute"
- msgid_plural "%d~minutes"
+ msgid "%lld~hour"
+ msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2619
++#: g10/tofu.c:2864
  #, c-format
- msgid "%d~second"
- msgid_plural "%d~seconds"
+ msgid "%lld~minute"
+ msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2802
++#: g10/tofu.c:2866
  #, c-format
- msgid "%s: "
+ msgid "%lld~second"
+ msgid_plural "%lld~seconds"
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:3103
+ #, c-format
+ msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:2806
++#: g10/tofu.c:3109
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
- msgid "Verified %ld signatures"
+ msgid "%s: Verified 0 signatures."
  msgstr "%d allekirjoitusta poistettu.\n"
  
- #: g10/tofu.c:2816
++#: g10/tofu.c:3117
  #, fuzzy, c-format
- msgid "Verified %ld signature in the past %s"
- msgid_plural "Verified %ld signatures in the past %s"
+ msgid "%s: Verified %ld~signature in the past %s."
+ msgid_plural "%s: Verified %ld~signatures in the past %s."
  msgstr[0] "|algo [tiedostot]|tulosta viestien tiivisteet"
  msgstr[1] "|algo [tiedostot]|tulosta viestien tiivisteet"
  
- #: g10/tofu.c:2826
- #, fuzzy, c-format
++#: g10/tofu.c:3127
+ #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
- msgid ", and encrypted %ld messages"
+ msgid "Encrypted 0 messages."
  msgstr "salattu %lu salasanalla\n"
  
- #: g10/tofu.c:2835
++#: g10/tofu.c:3135
  #, fuzzy, c-format
- msgid ", and encrypted %ld message in the past %s"
- msgid_plural ", and encrypted %ld messages in the past %s"
+ msgid "Encrypted %ld~message in the past %s."
+ msgid_plural "Encrypted %ld~messages in the past %s."
  msgstr[0] "|algo [tiedostot]|tulosta viestien tiivisteet"
  msgstr[1] "|algo [tiedostot]|tulosta viestien tiivisteet"
  
- #: g10/tofu.c:2880
++#: g10/tofu.c:3146
+ #, fuzzy, c-format
+ #| msgid "Policy: "
+ msgid "(policy: %s)"
+ msgstr "Käytäntö: "
+ 
++#: g10/tofu.c:3177
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2883
++#: g10/tofu.c:3180
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2887
++#: g10/tofu.c:3184
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2890
++#: g10/tofu.c:3187
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2919
++#: g10/tofu.c:3216
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7495,18 -6015,14 +7527,18 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
- #: g10/tofu.c:3480 g10/tofu.c:3572
++#: g10/tofu.c:3298 g10/tofu.c:3449 g10/tofu.c:3627 g10/tofu.c:3670
++#: g10/tofu.c:3784 g10/tofu.c:3859 g10/tofu.c:3894
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
  
- #: g10/tofu.c:3185
++#: g10/tofu.c:3482
  #, c-format
- msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
  msgstr ""
  
- #: g10/tofu.c:3515
++#: g10/tofu.c:3819
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7539,74 -6050,59 +7571,74 @@@ msgstr "
  msgid "key %s marked as ultimately trusted\n"
  msgstr "Avain on määritelty ehdottoman luotettavaksi.\n"
  
- #: g10/trustdb.c:341
++#: g10/trustdb.c:348
  #, 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:347
++#: g10/trustdb.c:354
  #, 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:422
++#: g10/trustdb.c:429
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr ""
  
- #: g10/trustdb.c:431
++#: g10/trustdb.c:438
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:468
++#: g10/trustdb.c:475
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:474
++#: g10/trustdb.c:481
  #, c-format
  msgid "using %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:511
++#: g10/trustdb.c:518
  msgid "no need for a trustdb check\n"
  msgstr "trustdb:n tarkistusta ei tarvita\n"
  
- #: g10/trustdb.c:517 g10/trustdb.c:2160
++#: g10/trustdb.c:524 g10/trustdb.c:2187
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "seuraava trustdb tarkistus %s\n"
  
- #: g10/trustdb.c:526
++#: g10/trustdb.c:533
  #, 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:542
++#: g10/trustdb.c:549
  #, 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:749 g10/trustdb.c:1313
++#: g10/trustdb.c:756 g10/trustdb.c:1340
  #, fuzzy, c-format
  msgid "public key %s not found: %s\n"
  msgstr "julkista avainta %08lX ei löydy: %s\n"
  
- #: g10/trustdb.c:966
++#: g10/trustdb.c:973
  msgid "please do a --check-trustdb\n"
  msgstr "tee --check-trustdb, kiitos\n"
  
- #: g10/trustdb.c:971
++#: g10/trustdb.c:978
  msgid "checking the trustdb\n"
  msgstr "tarkistetaan trustdb:tä\n"
  
- #: g10/trustdb.c:1883
++#: g10/trustdb.c:1910
  #, 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:1886
++#: g10/trustdb.c:1913
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7614,22 -6110,18 +7646,22 @@@ msgid_plural " (%d validity counts clea
  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:1956
++#: g10/trustdb.c:1983
  msgid "no ultimately trusted keys found\n"
  msgstr "ehdottomasti luotettavia avaimia ei löytynyt\n"
  
- #: g10/trustdb.c:1970
++#: g10/trustdb.c:1997
  #, 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:2087
++#: g10/trustdb.c:2114
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr ""
  
- #: g10/trustdb.c:2167
++#: g10/trustdb.c:2194
  #, fuzzy, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n"
@@@ -7743,19 -6214,14 +7775,19 @@@ msgid "
  "List, export, import Keybox data\n"
  msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3208
++#: scd/app-nks.c:718 scd/app-openpgp.c:3221
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3220
++#: scd/app-nks.c:726 scd/app-openpgp.c:3233
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
- #: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
- #: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1965 scd/app-openpgp.c:1984
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2166 scd/app-openpgp.c:2430
++#: scd/app-openpgp.c:2477 scd/app-openpgp.c:2582 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr ""
@@@ -7804,84 -6261,66 +7836,84 @@@ msgid "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2511 scd/app-dinsig.c:532
  #, fuzzy, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: scd/app-openpgp.c:806
++#: scd/app-openpgp.c:801
  #, fuzzy, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
  
- #: scd/app-openpgp.c:819
++#: scd/app-openpgp.c:814
  #, fuzzy, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
  
- #: scd/app-openpgp.c:1236
++#: scd/app-openpgp.c:1247
  msgid "response does not contain the RSA modulus\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1243
++#: scd/app-openpgp.c:1254
  msgid "response does not contain the RSA public exponent\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1353
++#: scd/app-openpgp.c:1364
  #, fuzzy
  #| msgid "remove keys from the public keyring"
  msgid "response does not contain the EC public key\n"
  msgstr "poista avaimet julkisten avainten renkaasta"
  
- #: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:1464 scd/app-openpgp.c:3825
  msgid "response does not contain the public key data\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1551
++#: scd/app-openpgp.c:1564
  #, fuzzy, c-format
  msgid "reading public key failed: %s\n"
  msgstr "avainlohkojen poisto epäonnistui: %s\n"
  
- #: scd/app-openpgp.c:1903
++#: scd/app-openpgp.c:1916
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1910
++#: scd/app-openpgp.c:1923
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1925
++#: scd/app-openpgp.c:1938
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr ""
  
- #: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
++#: scd/app-openpgp.c:1949 scd/app-openpgp.c:2424
  #, fuzzy
  msgid "||Please enter the PIN"
  msgstr "muuta salasanaa"
  
- #: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2173 scd/app-openpgp.c:2437
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
- #: scd/app-openpgp.c:4114
++#: scd/app-openpgp.c:2004 scd/app-openpgp.c:2043 scd/app-openpgp.c:2185
++#: scd/app-openpgp.c:4126
  #, fuzzy, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
  
- #: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
++#: scd/app-openpgp.c:2072 scd/app-openpgp.c:2458 scd/app-openpgp.c:4556
  msgid "error retrieving CHV status from card\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
++#: scd/app-openpgp.c:2078 scd/app-openpgp.c:4565
  msgid "card is permanently locked!\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2072
++#: scd/app-openpgp.c:2085
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7891,26 -6330,21 +7923,26 @@@ msgstr[1] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:2082
++#: scd/app-openpgp.c:2095
  #, fuzzy, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "muuta salasanaa"
  
- #: scd/app-openpgp.c:2086
++#: scd/app-openpgp.c:2099
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
  msgstr "muuta salasanaa"
  
- #: scd/app-openpgp.c:2107
++#: scd/app-openpgp.c:2120
  msgid "access to admin commands is not configured\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2460
++#: scd/app-openpgp.c:2473
  #, fuzzy
  msgid "||Please enter the Reset Code for the card"
  msgstr "Valitse mitätöinnin syy:\n"
  
- #: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
++#: scd/app-openpgp.c:2483 scd/app-openpgp.c:2537
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr ""
@@@ -7918,118 -6352,94 +7950,118 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2493
++#: scd/app-openpgp.c:2506
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|AN|New Admin PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|N|New PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2565
++#: scd/app-openpgp.c:2578
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "muuta salasanaa"
  
- #: scd/app-openpgp.c:2566
++#: scd/app-openpgp.c:2579
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
  msgstr "muuta salasanaa"
  
- #: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
++#: scd/app-openpgp.c:2635 scd/app-openpgp.c:3885
  #, fuzzy
  msgid "error reading application data\n"
  msgstr "virhe luettaessa avainlohkoa: %s\n"
  
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
++#: scd/app-openpgp.c:2641 scd/app-openpgp.c:3892
  #, fuzzy
  msgid "error reading fingerprint DO\n"
  msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
  
- #: scd/app-openpgp.c:2638
++#: scd/app-openpgp.c:2651
  #, fuzzy
  msgid "key already exists\n"
  msgstr "\"%s\" on jo pakattu\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2655
  msgid "existing key will be replaced\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2644
++#: scd/app-openpgp.c:2657
  #, fuzzy
  msgid "generating new key\n"
  msgstr "luo uusi avainpari"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2659
  #, fuzzy
  msgid "writing new key\n"
  msgstr "luo uusi avainpari"
  
- #: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
++#: scd/app-openpgp.c:3201 scd/app-openpgp.c:3553
  msgid "creation timestamp missing\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
++#: scd/app-openpgp.c:3243 scd/app-openpgp.c:3251
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
++#: scd/app-openpgp.c:3384 scd/app-openpgp.c:3647
  #, fuzzy, c-format
  msgid "failed to store the key: %s\n"
  msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
  
- #: scd/app-openpgp.c:3534
++#: scd/app-openpgp.c:3547
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "URI-muotoa ei tueta"
  
- #: scd/app-openpgp.c:3790
++#: scd/app-openpgp.c:3802
  msgid "please wait while key is being generated ...\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3798
++#: scd/app-openpgp.c:3810
  #, fuzzy
  msgid "generating key failed\n"
  msgstr "avainlohkojen poisto epäonnistui: %s\n"
  
- #: scd/app-openpgp.c:3804
++#: scd/app-openpgp.c:3816
  #, fuzzy, c-format
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
  msgstr[0] "Avaimen luonti epäonnistui: %s\n"
  msgstr[1] "Avaimen luonti epäonnistui: %s\n"
  
- #: scd/app-openpgp.c:3838
++#: scd/app-openpgp.c:3850
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:3900
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
  # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
- #: scd/app-openpgp.c:4004
++#: scd/app-openpgp.c:4016
  #, fuzzy, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
  
- #: scd/app-openpgp.c:4089
++#: scd/app-openpgp.c:4101
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4551
++#: scd/app-openpgp.c:4570
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
++#: scd/app-openpgp.c:4871 scd/app-openpgp.c:4882
  #, fuzzy, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
@@@ -8050,7 -6457,6 +8082,7 @@@ msgstr "
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
@@@ -8095,27 -6492,22 +8127,27 @@@ msgstr "ristiriitainen komento\n
  msgid "use variable length input for pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:287
++#: scd/scdaemon.c:286
  #, fuzzy
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
  
- #: scd/scdaemon.c:289
++#: scd/scdaemon.c:288
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
  msgstr ""
  
- #: scd/scdaemon.c:786
++#: scd/scdaemon.c:784
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1904
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
++#: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1909
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
@@@ -8195,9 -6571,6 +8227,9 @@@ msgstr "virhe luotaessa salasanaa: %s\n
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "avainlohkojen poisto epäonnistui: %s\n"
  
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
 +#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  #, fuzzy
  msgid "failed to allocate keyDB handle\n"
  msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
@@@ -8692,11 -6963,9 +8724,11 @@@ msgstr "
  msgid "resource problem: out of core\n"
  msgstr ""
  
- #: sm/decrypt.c:330
++#: sm/decrypt.c:332
  msgid "(this is the RC2 algorithm)\n"
  msgstr ""
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:334
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr ""
  
@@@ -8740,124 -7001,96 +8772,124 @@@ msgstr "näytä salaiset avaimet
  msgid "list certificate chain"
  msgstr "virheellinen varmenne"
  
- #: sm/gpgsm.c:218
++#: sm/gpgsm.c:219
  #, fuzzy
  msgid "import certificates"
  msgstr "virheellinen varmenne"
  
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
  #, fuzzy
  msgid "export certificates"
  msgstr "virheellinen varmenne"
  
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:228
  msgid "register a smartcard"
  msgstr ""
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:231
  msgid "pass a command to the dirmngr"
  msgstr ""
  
- #: sm/gpgsm.c:232
++#: sm/gpgsm.c:233
  msgid "invoke gpg-protect-tool"
  msgstr ""
  
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:250
  #, fuzzy
  msgid "create base-64 encoded output"
  msgstr "tuota ascii-koodattu tuloste"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in PEM format"
  msgstr ""
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in base-64 format"
  msgstr ""
  
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:262
  msgid "assume input is in binary format"
  msgstr ""
  
- #: sm/gpgsm.c:267
++#: sm/gpgsm.c:269
  msgid "never consult a CRL"
  msgstr ""
  
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:279
  msgid "check validity using OCSP"
  msgstr ""
  
- #: sm/gpgsm.c:282
++#: sm/gpgsm.c:284
  msgid "|N|number of certificates to include"
  msgstr ""
  
- #: sm/gpgsm.c:285
++#: sm/gpgsm.c:287
  msgid "|FILE|take policy information from FILE"
  msgstr ""
  
- #: sm/gpgsm.c:288
++#: sm/gpgsm.c:290
  msgid "do not check certificate policies"
  msgstr ""
  
- #: sm/gpgsm.c:292
++#: sm/gpgsm.c:294
  msgid "fetch missing issuer certificates"
  msgstr ""
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "don't use the terminal at all"
  msgstr "älä käytä lainkaan päätettä"
  
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:307
  msgid "|FILE|write a server mode log to FILE"
  msgstr ""
  
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:312
  #, fuzzy
  msgid "|FILE|write an audit log to FILE"
  msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "batch mode: never ask"
  msgstr "eräajo: älä kysy mitään"
  
- #: sm/gpgsm.c:314
++#: sm/gpgsm.c:316
  msgid "assume yes on most questions"
  msgstr "oleta myönteinen vastaust useimpiin kysymyksiin"
  
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:317
  msgid "assume no on most questions"
  msgstr "oleta kielteinen vastaust useimpiin kysymyksiin"
  
- #: sm/gpgsm.c:318
++#: sm/gpgsm.c:320
  #, fuzzy
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "lisää tämä avainrengas avainrenkaiden luetteloon"
  
- #: sm/gpgsm.c:321
++#: sm/gpgsm.c:323
  #, fuzzy
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
  
- #: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
  #, fuzzy
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|PALVELIN|käytä tätä palvelinta avainten etsimiseen"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|NIMI|käytä salausalgoritmia NIMI"
  
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:352
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|NIMI|käytä viestintiivistealgoritmia NIMI"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:559
  #, 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:570
++#: sm/gpgsm.c:562
  #, fuzzy
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
@@@ -8868,47 -7101,38 +8900,47 @@@ msgstr "
  "allekirjoita, tarkista, salaa tai avaa\n"
  "oletustoiminto riippuu syötteestä\n"
  
- #: sm/gpgsm.c:774
++#: sm/gpgsm.c:766
  #, 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:785
++#: sm/gpgsm.c:777
  #, fuzzy, c-format
  msgid "unknown validation model '%s'\n"
  msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
  
- #: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
  #, fuzzy, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "(Kuvausta ei annettu)\n"
  
- #: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr ""
  
- #: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
  #, fuzzy, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr " o = ohita tämä avain\n"
  
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1427
  #, fuzzy
  msgid "could not parse keyserver\n"
  msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
  
- #: sm/gpgsm.c:1636
++#: sm/gpgsm.c:1630
  #, fuzzy, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "kirjoitetaan kohteeseen \"%s\"\n"
  
- #: sm/gpgsm.c:1677
++#: sm/gpgsm.c:1671
  #, fuzzy, c-format
  msgid "can't sign using '%s': %s\n"
  msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
  
- #: sm/gpgsm.c:2033
++#: sm/gpgsm.c:2028
  msgid "invalid command (there is no implicit command)\n"
  msgstr ""
  
@@@ -9670,8 -7743,6 +9702,8 @@@ msgstr "
  msgid "CRL access not possible due to disabled %s\n"
  msgstr ""
  
 +#: dirmngr/crlfetch.c:223 dirmngr/ldap-wrapper-ce.c:488
- #: dirmngr/ldap-wrapper.c:742 dirmngr/misc.c:563
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:563
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
@@@ -9856,116 -7891,88 +9888,116 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:160
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:158
++#: dirmngr/dirmngr.c:161
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
  
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:162
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:163
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:164
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
- #: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
++#: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:177
++#: dirmngr/dirmngr.c:180
  #, fuzzy
  msgid "run without asking a user"
  msgstr "Lopeta tallentamatta muutoksia?"
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:181
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:182
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:184
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:185
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:186
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:188
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:192
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:202
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
  
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:210
  #, fuzzy
  msgid "|URL|use OCSP responder at URL"
  msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:212
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:218
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:220
++#: dirmngr/dirmngr.c:223
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:225
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:240
++#: dirmngr/dirmngr.c:246
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -9979,91 -7986,72 +10011,91 @@@ msgstr "
  "(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
  "sivuilta)\n"
  
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:361
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
  
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:363
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:443
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
- #: tools/gpgconf.c:648
++#: dirmngr/dirmngr.c:496 tools/gpgconf.c:550 tools/gpgconf.c:585
++#: tools/gpgconf.c:656
  #, fuzzy, c-format
  msgid "usage: %s [options] "
  msgstr "käyttö: gpg [valitsimet] "
  
- #: dirmngr/dirmngr.c:1062
++#: dirmngr/dirmngr.c:1074
  #, fuzzy
  #| 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:1301 dirmngr/server.c:1585
++#: dirmngr/dirmngr.c:1300 dirmngr/server.c:1585
  #, fuzzy, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "ascii-koodaaminen epäonnistui: %s\n"
  
- #: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
++#: dirmngr/dirmngr.c:1306 dirmngr/server.c:1591
  #, fuzzy, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "ascii-koodaaminen epäonnistui: %s\n"
  
- #: dirmngr/dirmngr.c:1484
++#: dirmngr/dirmngr.c:1487
  #, fuzzy, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "rivi on liian pitkä\n"
  
- #: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
++#: dirmngr/dirmngr.c:1542 dirmngr/dirmngr.c:1626
  #, fuzzy, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "virhe: sormenjälki on väärä\n"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
++#: dirmngr/dirmngr.c:1578 dirmngr/dirmngr.c:1604 tools/gpgconf-comp.c:4032
  #, fuzzy, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "lukuvirhe: %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1633
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1700
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1734
++#: dirmngr/dirmngr.c:1738
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1739
++#: dirmngr/dirmngr.c:1743
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1745
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1746
++#: dirmngr/dirmngr.c:1750
  #, fuzzy
  msgid "shutdown forced\n"
  msgstr "ei käsitelty"
  
- #: dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1758
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1761
++#: dirmngr/dirmngr.c:1765
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10545,33 -8434,27 +10577,33 @@@ msgstr "avainlohkojen poisto epäonnist
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2463
++#: dirmngr/server.c:2469
  #, fuzzy, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
  
- #: dirmngr/server.c:2474
++#: dirmngr/server.c:2480
  #, fuzzy, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
  
- #: dirmngr/server.c:2495
++#: dirmngr/server.c:2501
  #, 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:2503
++#: dirmngr/server.c:2509
  #, 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:2534
++#: dirmngr/server.c:2540
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2553
++#: dirmngr/server.c:2559
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
@@@ -10619,7 -8493,6 +10651,7 @@@ msgstr "DSA vaatii 160-bittisen tiivist
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:167
  #, fuzzy
  msgid "quiet"
  msgstr "lopeta|sulje"
@@@ -10712,22 -8565,15 +10744,22 @@@ msgstr "allekirjoitus epäonnistui: %s\
  msgid "error sending standard options: %s\n"
  msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
  
 +#: tools/gpgconf-comp.c:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
- #: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
++#: tools/gpgconf-comp.c:766 tools/gpgconf-comp.c:865
  msgid "Options controlling the diagnostic output"
  msgstr ""
  
 +#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
- #: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
++#: tools/gpgconf-comp.c:779 tools/gpgconf-comp.c:888
  msgid "Options controlling the configuration"
  msgstr ""
  
- #: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
- #: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
++#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:723
++#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:901
  msgid "Options useful for debugging"
  msgstr ""
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
  msgid "Options controlling the security"
  msgstr ""
  
@@@ -10777,11 -8612,9 +10809,11 @@@ msgstr "virhe luotaessa salasanaa: %s\n
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
++#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
  msgid "|NAME|use NAME as default secret key"
  msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
  
- #: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
++#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:784
  #, fuzzy
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NIMI|salaa vastaanottajalle NIMI"
@@@ -10790,194 -8622,161 +10822,208 @@@
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
++#: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
  msgid "Configuration for Keyservers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
++#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
  #, fuzzy
  msgid "|URL|use keyserver at URL"
  msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
  
- #: tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:741
  msgid "allow PKA lookups (DNS requests)"
  msgstr ""
  
- #: tools/gpgconf-comp.c:738
++#: tools/gpgconf-comp.c:744
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr ""
  
- #: tools/gpgconf-comp.c:787
++#: tools/gpgconf-comp.c:793
  msgid "disable all access to the dirmngr"
  msgstr ""
  
- #: tools/gpgconf-comp.c:790
++#: tools/gpgconf-comp.c:796
  #, fuzzy
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
  msgstr "|NIMI|käytä salasanoihin salausalgoritmia NIMI"
  
- #: tools/gpgconf-comp.c:820
++#: tools/gpgconf-comp.c:829
  msgid "do not check CRLs for root certificates"
  msgstr ""
  
- #: tools/gpgconf-comp.c:869
++#: tools/gpgconf-comp.c:878
  msgid "Options controlling the format of the output"
  msgstr ""
  
- #: tools/gpgconf-comp.c:905
++#: tools/gpgconf-comp.c:920
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:918
++#: tools/gpgconf-comp.c:933
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:947
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:958
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:948
++#: tools/gpgconf-comp.c:963
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:977
++#: tools/gpgconf-comp.c:992
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:985
++#: tools/gpgconf-comp.c:1000
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1066
++#: tools/gpgconf-comp.c:1081
  msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1067
++#: tools/gpgconf-comp.c:1082
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1083
  msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1069
++#: tools/gpgconf-comp.c:1084
  msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1070
++#: tools/gpgconf-comp.c:1085
  #, fuzzy
  #| msgid "network error"
  msgid "Network"
  msgstr "verkkovirhe"
  
- #: tools/gpgconf-comp.c:1071
++#: tools/gpgconf-comp.c:1086
  #, fuzzy
  msgid "Passphrase Entry"
  msgstr "väärä salasana"
  
- #: tools/gpgconf-comp.c:1225
++#: tools/gpgconf-comp.c:1240
  #, fuzzy
  msgid "Component not suitable for launching"
  msgstr "julkista avainta ei löydy"
  
- #: tools/gpgconf-comp.c:3283
++#: tools/gpgconf-comp.c:3311
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3434
++#: tools/gpgconf-comp.c:3462
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf-comp.c:4036
+ #, fuzzy, c-format
+ msgid "error closing '%s'\n"
+ msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
+ 
++#: tools/gpgconf-comp.c:4038
+ #, fuzzy, c-format
+ msgid "error parsing '%s'\n"
+ msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
+ 
++#: tools/gpgconf.c:73
  msgid "list all components"
  msgstr ""
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "check all programs"
  msgstr ""
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|list options"
  msgstr ""
  
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
  msgid "|COMPONENT|change options"
  msgstr ""
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "|COMPONENT|check options"
  msgstr ""
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "apply global default values"
  msgstr ""
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
+ msgid "|FILE|update configuration files using FILE"
+ msgstr ""
+ 
++#: tools/gpgconf.c:83
  msgid "get the configuration directories for @GPGCONF@"
  msgstr ""
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:85
  #, fuzzy
  msgid "list global configuration file"
  msgstr "tuntematon asetus \"%s\"\n"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  #, fuzzy
  msgid "check global configuration file"
  msgstr "tuntematon asetus \"%s\"\n"
  
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:89
  #, fuzzy
  #| msgid "update the trust database"
  msgid "query the software version database"
  msgstr "päivitä luottamustietokanta"
  
- #: tools/gpgconf.c:86
++#: tools/gpgconf.c:90
  msgid "reload all or a given component"
  msgstr ""
  
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:91
  msgid "launch a given component"
  msgstr ""
  
- #: tools/gpgconf.c:88
++#: tools/gpgconf.c:92
  msgid "kill a given component"
  msgstr ""
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "use as output file"
  msgstr "käytä tulostustiedostona"
  
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:102
  msgid "activate changes at runtime, if possible"
  msgstr ""
  
- #: tools/gpgconf.c:122
++#: tools/gpgconf.c:127
  #, fuzzy
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
  
- #: tools/gpgconf.c:125
++#: tools/gpgconf.c:130
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
  msgstr ""
  
- #: tools/gpgconf.c:545 tools/gpgconf.c:579
++#: tools/gpgconf.c:552 tools/gpgconf.c:587
  msgid "Need one component argument"
  msgstr ""
  
- #: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
++#: tools/gpgconf.c:561 tools/gpgconf.c:599 tools/gpgconf.c:632
  #, fuzzy
  msgid "Component not found"
  msgstr "julkista avainta ei löydy"
  
- #: tools/gpgconf.c:650
++#: tools/gpgconf.c:658
  #, fuzzy
  msgid "No argument allowed"
  msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
diff --cc po/fr.po
index 2a323cc,d1a82ff..5cac809
--- a/po/fr.po
+++ b/po/fr.po
@@@ -7,7 -7,6 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg 2.1\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-11-18 16:54+0100\n"
++"POT-Creation-Date: 2016-12-20 11:28+0100\n"
  "PO-Revision-Date: 2015-09-10 16:22+0200\n"
  "Last-Translator: David Prévot <david at tilapin.org>\n"
  "Language-Team: French <traduc at traduc.org>\n"
@@@ -165,24 -136,10 +165,24 @@@ msgstr "Mauvaise phrase secrète
  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:838 common/dotlock.c:839 g10/card-util.c:839
- #: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1306 g10/keygen.c:4577
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
++#: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
  #, c-format
  msgid "can't create '%s': %s\n"
  msgstr "impossible de créer « %s » : %s\n"
  
 +#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
- #: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1307
++#: g10/import.c:305 g10/import.c:448 g10/import.c:621 g10/keygen.c:3681
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
- #: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
- #: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:825 g10/sign.c:1025
++#: g10/sign.c:1130 g10/sign.c:1275 g10/tdbdump.c:143 g10/tdbdump.c:151
++#: g10/tdbio.c:720 g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161
++#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
++#: dirmngr/certcache.c:368 dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1564
  #, c-format
  msgid "can't open '%s': %s\n"
  msgstr "impossible d'ouvrir « %s » : %s\n"
@@@ -247,11 -193,9 +247,11 @@@ msgstr "
  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:92 g10/call-agent.c:1100
++#: agent/divert-scd.c:92 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr "Veuillez insérer la carte de numéro de série"
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1101
++#: agent/divert-scd.c:93 g10/call-agent.c:1102
  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"
  
@@@ -393,47 -311,32 +393,47 @@@ msgstr "
  "@Options :\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
  msgid "run in daemon mode (background)"
  msgstr "exécuter en mode démon (arrière-plan)"
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
  msgid "run in server mode (foreground)"
  msgstr "exécuter en mode serveur (premier plan)"
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
  #, fuzzy
  #| msgid "run in server mode"
  msgid "run in supervised mode"
  msgstr "exécuter en mode serveur"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:170 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "bavard"
  
 +#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "devenir beaucoup plus silencieux"
  
- #: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
  msgid "sh-style command output"
  msgstr "sortie de commandes à la sh"
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
  msgid "csh-style command output"
  msgstr "sortie de commandes à la csh"
  
- #: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
- #: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
++#: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
  msgid "|FILE|read options from FILE"
  msgstr "|FICHIER|lire les options depuis le FICHIER"
  
- #: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:177
  msgid "do not detach from the console"
  msgstr "ne pas détacher de la console"
  
@@@ -513,21 -399,14 +513,21 @@@ msgstr "activer la prise en charge de p
  #. 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:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:481 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1025 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:358
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:124 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr ""
  "Veuillez signaler toutes anomalies sur <@EMAIL@> (en anglais)\n"
  "et tout problème de traduction à <traduc at traduc.org>.\n"
  
- #: agent/gpg-agent.c:491
++#: agent/gpg-agent.c:490
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "Utilisation : dirmngr @GPG_AGENT@ (-h pour l'aide)"
  
- #: agent/gpg-agent.c:493
++#: agent/gpg-agent.c:492
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
@@@ -535,138 -414,103 +535,138 @@@ msgstr "
  "Syntaxe : @GPG_AGENT@ [options] [commande [arguments]]\n"
  "Gestionnaire de clefs secrètes pour @GNUPG@\n"
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:537 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:442
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr "niveau de débogage « %s » incorrect\n"
  
- #: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:793
++#: agent/gpg-agent.c:1082 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:812
  #, c-format
  msgid "Note: no default option file '%s'\n"
  msgstr "Remarque : pas de fichier d'options par défaut « %s »\n"
  
- #: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
- #: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1093 agent/gpg-agent.c:1935 g10/gpg.c:2510
++#: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:817
++#: dirmngr/dirmngr.c:1670 tools/symcryptrun.c:932
  #, c-format
  msgid "option file '%s': %s\n"
  msgstr "fichier d'options « %s » : %s\n"
  
- #: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:806
++#: agent/gpg-agent.c:1101 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:825
  #, c-format
  msgid "reading options from '%s'\n"
  msgstr "lecture des options de « %s »\n"
  
- #: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
- #: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
++#: agent/gpg-agent.c:1223 g10/gpg.c:3643 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:936 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:527
  #, 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:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
++#: agent/gpg-agent.c:2080 scd/scdaemon.c:1073 dirmngr/dirmngr.c:1081
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "impossible de créer la socket : %s\n"
  
- #: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
++#: agent/gpg-agent.c:2097 scd/scdaemon.c:1086 dirmngr/dirmngr.c:1094
  #, 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:2134
++#: agent/gpg-agent.c:2135
  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:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
++#: agent/gpg-agent.c:2145 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1126
  msgid "error getting nonce for the socket\n"
  msgstr "erreur de lecture du « nonce » de la socket\n"
  
- #: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
++#: agent/gpg-agent.c:2150 scd/scdaemon.c:1113 dirmngr/dirmngr.c:1129
  #, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "erreur de lien de la socket à « %s » : %s\n"
  
- #: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
- #: dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2160 agent/gpg-agent.c:2197 scd/scdaemon.c:1121
++#: dirmngr/dirmngr.c:1138
  #, 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:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:2165 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1143
  #, c-format
  msgid "listen() failed: %s\n"
  msgstr "échec de listen() : %s\n"
  
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
++#: agent/gpg-agent.c:2172 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1149
  #, c-format
  msgid "listening on socket '%s'\n"
  msgstr "écoute sur la socket « %s »\n"
  
- #: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: agent/gpg-agent.c:2191 agent/gpg-agent.c:2234 g10/exec.c:199
 +#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, 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:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: agent/gpg-agent.c:2194 agent/gpg-agent.c:2239 g10/openfile.c:491
 +#: g10/openfile.c:520 sm/keydb.c:103
  #, c-format
  msgid "directory '%s' created\n"
  msgstr "répertoire « %s » créé\n"
  
- #: agent/gpg-agent.c:2244
++#: agent/gpg-agent.c:2245
  #, c-format
  msgid "stat() failed for '%s': %s\n"
  msgstr "échec de stat() pour « %s » : %s\n"
  
- #: agent/gpg-agent.c:2248
++#: agent/gpg-agent.c:2249
  #, 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:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
++#: agent/gpg-agent.c:2392 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1871
  #, 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:2598
++#: agent/gpg-agent.c:2599
  #, 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:2603
++#: agent/gpg-agent.c:2604
  #, 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:2678
++#: agent/gpg-agent.c:2679
  #, 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:2683
++#: agent/gpg-agent.c:2684
  #, 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:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
++#: agent/gpg-agent.c:2881 scd/scdaemon.c:1272 dirmngr/dirmngr.c:2075
  #, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "échec de npth_pselect : %s — attente 1 s\n"
  
- #: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2954 scd/scdaemon.c:1321
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s arrêté\n"
  
- #: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
++#: agent/gpg-agent.c:3092 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  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"
@@@ -684,8 -526,6 +684,8 @@@ msgstr "
  "Syntaxe : gpg-preset-passphrase [options] KEYGRIP\n"
  "Maintenance du cache des mots de passe\n"
  
- #: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
++#: agent/protect-tool.c:106 g10/gpg.c:424 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:153 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -693,9 -533,6 +693,9 @@@ msgstr "
  "@Commandes :\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
- #: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:92 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:168 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -751,8 -580,6 +751,8 @@@ 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:362 dirmngr/dirmngr.c:1469
- #: tools/gpgconf.c:323
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1472
++#: tools/gpgconf.c:328
  #, c-format
  msgid "error opening '%s': %s\n"
  msgstr "erreur d'ouverture de « %s » : %s\n"
@@@ -931,9 -729,6 +931,9 @@@ msgid "protection hash algorithm %d (%s
  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:438
 +#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
- #: dirmngr/ldap-wrapper.c:710
++#: dirmngr/ldap-wrapper.c:711
  #, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "erreur de création d'un tube : %s\n"
@@@ -945,8 -737,6 +945,8 @@@
  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:848 dirmngr/dirmngr.c:1155
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1167
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "erreur de création de processus fils : %s\n"
@@@ -992,28 -773,23 +992,28 @@@ msgstr "impossible de se connecter à �
  msgid "problem setting the gpg-agent options\n"
  msgstr "problème de configuration des options de gpg-agent\n"
  
- #: common/sysutils.c:144
++#: common/sysutils.c:148
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "impossible d'empêcher la génération de fichiers « core » : %s\n"
  
- #: common/sysutils.c:239
++#: common/sysutils.c:250
  #, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "Avertissement : le propriétaire de %s n'est pas sûr « %s »\n"
  
- #: common/sysutils.c:271
++#: common/sysutils.c:282
  #, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "Avertissement : les droits de %s ne sont pas sûrs « %s »\n"
  
- #: common/sysutils.c:659
++#: common/sysutils.c:693
  #, 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:685
++#: common/sysutils.c:719
  #, c-format
  msgid "renaming '%s' to '%s' failed: %s\n"
  msgstr "impossible de renommer « %s » en « %s » : %s\n"
@@@ -1088,7 -849,6 +1088,7 @@@ msgstr "%s : %u : option « %s » o
  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:554
++#: common/miscellaneous.c:556
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
@@@ -1195,8 -932,6 +1195,8 @@@ msgstr "Clef de session créée
  msgid "algorithm: %s"
  msgstr "algorithme : %s"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3098
++#: scd/app-openpgp.c:3111
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "algorithme non pris en charge : %s"
@@@ -1382,7 -1075,6 +1382,7 @@@ msgstr "l'option « %.50s » est ambi
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr "la commande « %.50s » est ambiguë\n"
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1173
++#: common/argparse.c:401 dirmngr/dirmngr.c:1185
  msgid "out of core\n"
  msgstr "hors limite\n"
  
@@@ -1440,8 -1121,6 +1440,8 @@@ msgstr "verrou « %s » non effectif�
  msgid "waiting for lock %s...\n"
  msgstr "attente du verrou %s…\n"
  
- #: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
- #: dirmngr/dirmngr.c:715
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:725
++#: dirmngr/dirmngr.c:734
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr "%s est trop ancien (nécessaire : %s, utilisé : %s)\n"
@@@ -1479,7 -1150,6 +1479,7 @@@ msgstr "armure inattendue : 
  msgid "invalid dash escaped line: "
  msgstr "ligne protégée par « - » incorrecte : "
  
- #: g10/armor.c:873 g10/armor.c:1490
++#: g10/armor.c:873 g10/armor.c:1493
  #, c-format
  msgid "invalid radix64 character %02X skipped\n"
  msgstr "caractère %02X incorrect en radix64, ignoré\n"
@@@ -1496,7 -1163,6 +1496,7 @@@ msgstr "fin de fichier prématurée (da
  msgid "malformed CRC\n"
  msgstr "CRC mal défini\n"
  
- #: g10/armor.c:962 g10/armor.c:1527
++#: g10/armor.c:962 g10/armor.c:1530
  #, c-format
  msgid "CRC error; %06lX - %06lX\n"
  msgstr "erreur de CRC ; %06lX - %06lX\n"
@@@ -1509,16 -1173,13 +1509,16 @@@ msgstr "fin de fichier prématurée (da
  msgid "error in trailer line\n"
  msgstr "erreur dans la ligne de pied\n"
  
- #: g10/armor.c:1303
++#: g10/armor.c:1306
  msgid "no valid OpenPGP data found.\n"
  msgstr "aucune donnée OpenPGP valable n'a été trouvée.\n"
  
- #: g10/armor.c:1308
++#: g10/armor.c:1311
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
  msgstr "armure incorrecte : ligne plus longue que %d caractères\n"
  
- #: g10/armor.c:1312
++#: g10/armor.c:1315
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr ""
@@@ -1607,8 -1253,6 +1607,8 @@@ msgstr "la carte OpenPGP n'est pas disp
  msgid "OpenPGP card no. %s detected\n"
  msgstr "carte OpenPGP nº %s détectée\n"
  
- #: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
- #: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2030
++#: g10/keygen.c:4087 g10/revoke.c:215 g10/revoke.c:618
  msgid "can't do this in batch mode\n"
  msgstr "impossible de faire cela en mode automatique\n"
  
@@@ -1616,14 -1259,9 +1616,14 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "Cette commande n'est disponible que pour les cartes en version 2\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2454
++#: g10/card-util.c:109 scd/app-openpgp.c:2467
  msgid "Reset Code not or not anymore available\n"
  msgstr "le code de réinitialisation n'est plus disponible\n"
  
 +#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
- #: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
- #: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1768
++#: g10/keygen.c:1945 g10/keygen.c:2313 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "Quel est votre choix ? "
  
@@@ -1685,10 -1309,6 +1685,10 @@@ msgstr "URL pour récupérer la clef pu
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr "Erreur : URL trop longue (limitée à %d caractères).\n"
  
- #: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
- #: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:334
++#: g10/import.c:592 g10/import.c:640 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
++#: dirmngr/dirmngr.c:1510 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, c-format
  msgid "error reading '%s': %s\n"
  msgstr "erreur de lecture de « %s » : %s\n"
@@@ -1756,7 -1361,6 +1756,7 @@@ msgstr "opération sur la clef impossib
  msgid "not an OpenPGP card"
  msgstr "ce n'est pas une carte OpenPGP"
  
- #: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
++#: g10/card-util.c:1173 g10/keygen.c:4106 g10/keygen.c:5092
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr ""
@@@ -1793,13 -1392,10 +1793,13 @@@ msgid "What keysize do you want for th
  msgstr ""
  "Quelle taille de clef désirez-vous pour la clef d'authentification ? (%u) "
  
- #: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
++#: g10/card-util.c:1316 g10/keygen.c:2122 g10/keygen.c:2154
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "arrondie à %u bits\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2207 sm/certreqgen-ui.c:188
  #, 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"
@@@ -1855,9 -1441,6 +1855,9 @@@ msgstr "   (2) Clef de chiffrement\n
  msgid "   (3) Authentication key\n"
  msgstr "   (3) Clef d'authentification\n"
  
- #: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
- #: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
- #: g10/keygen.c:2314 g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1508
++#: g10/keygen.c:1794 g10/keygen.c:1822 g10/keygen.c:1952 g10/keygen.c:2060
++#: g10/keygen.c:2336 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Choix incorrect.\n"
  
@@@ -1892,7 -1469,6 +1892,7 @@@ msgstr "Faut-il continuer ? (O/n) 
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1816 g10/keyedit.c:1867
++#: g10/card-util.c:1816 g10/keyedit.c:1868
  msgid "quit this menu"
  msgstr "quitter ce menu"
  
@@@ -1900,7 -1475,6 +1900,7 @@@
  msgid "show admin commands"
  msgstr "afficher les commandes d'administration"
  
- #: g10/card-util.c:1819 g10/keyedit.c:1870
++#: g10/card-util.c:1819 g10/keyedit.c:1871
  msgid "show this help"
  msgstr "afficher cette aide"
  
@@@ -1978,30 -1534,20 +1978,30 @@@ msgstr "Les commandes d'administration 
  msgid "Admin commands are not allowed\n"
  msgstr "Les commandes d'administration ne sont pas permises\n"
  
- #: g10/card-util.c:2127 g10/keyedit.c:2816
++#: g10/card-util.c:2127 g10/keyedit.c:2817
  msgid "Invalid command  (try \"help\")\n"
  msgstr "Commande incorrecte (essayez « help »)\n"
  
- #: g10/decrypt.c:191 g10/encrypt.c:955
++#: g10/decrypt.c:190 g10/encrypt.c:955
  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:4851 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4904 g10/keyring.c:398 g10/keyring.c:771
  #, c-format
  msgid "can't open '%s'\n"
  msgstr "impossible d'ouvrir « %s »\n"
  
 +#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
- #: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
- #: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4858 g10/keyedit.c:2051
++#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2163
  #, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "clef « %s » introuvable : %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
- #: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
- #: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4866 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:645 g10/tofu.c:2171
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "erreur de lecture du bloc de clef : %s\n"
@@@ -2060,7 -1594,6 +2060,7 @@@ msgid "use option \"--delete-secret-key
  msgstr ""
  "utiliser d'abord l'option « --delete-secret-keys » pour la supprimer.\n"
  
- #: g10/encrypt.c:232 g10/sign.c:1292
++#: g10/encrypt.c:232 g10/sign.c:1294
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "erreur de création de la phrase secrète : %s\n"
@@@ -2079,7 -1609,6 +2079,7 @@@ msgstr "utilisation de l'algorithme de 
  msgid "'%s' already compressed\n"
  msgstr "« %s » est déjà compressé\n"
  
- #: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:610
  #, c-format
  msgid "WARNING: '%s' is an empty file\n"
  msgstr "Attention : « %s » est un fichier vide\n"
@@@ -2097,7 -1624,6 +2097,7 @@@ msgstr "
  "Attention : forcer le chiffrement symétrique %s (%d) est en\n"
  "            désaccord avec les préférences du destinataire\n"
  
- #: g10/encrypt.c:707 g10/sign.c:984
++#: g10/encrypt.c:707 g10/sign.c:986
  #, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2133,7 -1654,6 +2133,7 @@@ msgstr "données chiffrées avec %s\n
  msgid "encrypted with unknown algorithm %d\n"
  msgstr "chiffré avec l'algorithme inconnu %d\n"
  
- #: g10/decrypt-data.c:164 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:129
  msgid ""
  "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
  msgstr ""
@@@ -2227,8 -1729,6 +2227,8 @@@ msgstr "supprimer autant que possible d
  msgid " - skipped"
  msgstr " — ignoré"
  
- #: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:845 g10/sign.c:1148
++#: g10/export.c:1251 g10/import.c:1543 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:847 g10/sign.c:1150
  #, c-format
  msgid "writing to '%s'\n"
  msgstr "écriture de « %s »\n"
@@@ -2251,8 -1747,6 +2251,8 @@@ msgstr "clef %s : clef de type PGP 2.
  msgid "WARNING: nothing exported\n"
  msgstr "Attention : rien n'a été exporté\n"
  
- #: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
- #: g10/plaintext.c:151 g10/plaintext.c:174
++#: g10/export.c:2283 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/plaintext.c:167 g10/plaintext.c:190
  #, c-format
  msgid "error creating '%s': %s\n"
  msgstr "erreur de création de « %s » : %s\n"
@@@ -2299,8 -1784,6 +2299,8 @@@ msgstr "erreur de récupération de «�
  msgid "No fingerprint"
  msgstr "Aucune empreinte"
  
- #: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
- #: g10/revoke.c:701
++#: g10/getkey.c:1873 g10/keyedit.c:2929 g10/keyedit.c:3016 g10/revoke.c:637
++#: g10/revoke.c:702
  #, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "clef secrète « %s » introuvable : %s\n"
@@@ -2336,204 -1814,160 +2336,210 @@@ msgstr "
  "utilisation de la sous-clef %s à la place de la clef\n"
  "principale %s\n"
  
- #: g10/gpg.c:424 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:200
  msgid "make a signature"
  msgstr "faire une signature"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:427
  msgid "make a clear text signature"
  msgstr "faire une signature en texte clair"
  
- #: g10/gpg.c:426 sm/gpgsm.c:202
++#: g10/gpg.c:429 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "faire une signature détachée"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:430 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "chiffrer les données"
  
- #: g10/gpg.c:429
++#: g10/gpg.c:432
  msgid "encryption only with symmetric cipher"
  msgstr "chiffrement symétrique seulement"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:434 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "déchiffrer les données (défaut)"
  
- #: g10/gpg.c:433 sm/gpgsm.c:206
++#: g10/gpg.c:436 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "vérifier une signature"
  
- #: g10/gpg.c:435 sm/gpgsm.c:207
++#: g10/gpg.c:438 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "afficher les clefs"
  
- #: g10/gpg.c:437
++#: g10/gpg.c:440
  msgid "list keys and signatures"
  msgstr "afficher les clefs et les signatures"
  
- #: g10/gpg.c:438
++#: g10/gpg.c:443
  msgid "list and check key signatures"
  msgstr "afficher et vérifier les signatures de clefs"
  
- #: g10/gpg.c:439 sm/gpgsm.c:212
++#: g10/gpg.c:445 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "afficher les clefs et les empreintes"
  
- #: g10/gpg.c:440 sm/gpgsm.c:210
++#: g10/gpg.c:446 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "afficher les clefs secrètes"
  
- #: g10/gpg.c:442 sm/gpgsm.c:213
++#: g10/gpg.c:448 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "générer une nouvelle paire de clefs"
  
- #: g10/gpg.c:444
++#: g10/gpg.c:451
  msgid "quickly generate a new key pair"
  msgstr "générer rapidement une nouvelle paire de clefs"
  
- #: g10/gpg.c:446
++#: g10/gpg.c:454
  #, 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:449
++#: g10/gpg.c:459
  #, 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:451
++#: g10/gpg.c:462
+ #, 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:464
  msgid "full featured key pair generation"
  msgstr "générer une paire de clefs complètes"
  
- #: g10/gpg.c:452
++#: g10/gpg.c:467
  msgid "generate a revocation certificate"
  msgstr "générer un certificat de révocation"
  
- #: g10/gpg.c:454 sm/gpgsm.c:215
++#: g10/gpg.c:470 sm/gpgsm.c:216
  msgid "remove keys from the public keyring"
  msgstr "supprimer les clefs du porte-clefs public"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:472
  msgid "remove keys from the secret keyring"
  msgstr "supprimer les clefs du porte-clefs secret"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:474
  msgid "quickly sign a key"
  msgstr "signer rapidement une clef"
  
- #: g10/gpg.c:460
++#: g10/gpg.c:476
  msgid "quickly sign a key locally"
  msgstr "signer rapidement une clef localement"
  
- #: g10/gpg.c:461
++#: g10/gpg.c:477
  msgid "sign a key"
  msgstr "signer une clef"
  
- #: g10/gpg.c:462
++#: g10/gpg.c:478
  msgid "sign a key locally"
  msgstr "signer une clef localement"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:479
  msgid "sign or edit a key"
  msgstr "signer ou éditer une clef"
  
- #: g10/gpg.c:465 sm/gpgsm.c:233
++#: g10/gpg.c:481 sm/gpgsm.c:234
  msgid "change a passphrase"
  msgstr "modifier une phrase secrète"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:485
  msgid "export keys"
  msgstr "exporter les clefs"
  
- #: g10/gpg.c:468
++#: g10/gpg.c:486
  msgid "export keys to a keyserver"
  msgstr "exporter les clefs vers un serveur de clefs"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:487
  msgid "import keys from a keyserver"
  msgstr "importer les clefs d'un serveur de clefs"
  
- #: g10/gpg.c:471
++#: g10/gpg.c:490
  msgid "search for keys on a keyserver"
  msgstr "chercher les clefs avec un serveur de clefs"
  
- #: g10/gpg.c:473
++#: g10/gpg.c:492
  msgid "update all keys from a keyserver"
  msgstr "mettre à jour les clefs depuis un serveur"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:498
  msgid "import/merge keys"
  msgstr "importer ou fusionner les clefs"
  
- #: g10/gpg.c:482
++#: g10/gpg.c:501
  msgid "print the card status"
  msgstr "afficher l'état de la carte"
  
- #: g10/gpg.c:483
++#: g10/gpg.c:502
  msgid "change data on a card"
  msgstr "modifier les données d'une carte"
  
- #: g10/gpg.c:484
++#: g10/gpg.c:504
  msgid "change a card's PIN"
  msgstr "modifier le code personnel d'une carte"
  
- #: g10/gpg.c:496
++#: g10/gpg.c:516
  msgid "update the trust database"
  msgstr "mettre la base de confiance à jour"
  
- #: g10/gpg.c:505
++#: g10/gpg.c:525
  msgid "print message digests"
  msgstr "indiquer les fonctions de hachage"
  
- #: g10/gpg.c:508 sm/gpgsm.c:228
++#: g10/gpg.c:528 sm/gpgsm.c:229
  msgid "run in server mode"
  msgstr "exécuter en mode serveur"
  
- #: g10/gpg.c:510
++#: g10/gpg.c:530
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:514 sm/gpgsm.c:246
++#: g10/gpg.c:534 sm/gpgsm.c:248
  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:517 sm/gpgsm.c:262
++#: g10/gpg.c:537 sm/gpgsm.c:264
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|IDENTITÉ| chiffrer pour l'IDENTITÉ"
  
- #: g10/gpg.c:533 sm/gpgsm.c:298
++#: g10/gpg.c:553 sm/gpgsm.c:300
  msgid "|USER-ID|use USER-ID to sign or decrypt"
  msgstr "|IDENTITÉ| utiliser l'IDENTITÉ pour signer ou déchiffrer"
  
- #: g10/gpg.c:539
++#: g10/gpg.c:559
  msgid "|N|set compress level to N (0 disables)"
  msgstr "|N|niveau de compression N (0 désactive)"
  
- #: g10/gpg.c:546
++#: g10/gpg.c:566
  msgid "use canonical text mode"
  msgstr "utiliser le mode texte canonique"
  
- #: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
++#: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
  msgid "|FILE|write output to FILE"
  msgstr "|FICHIER|écrire la sortie dans le FICHIER"
  
- #: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
++#: g10/gpg.c:598 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
  msgid "do not make any changes"
  msgstr "ne rien modifier"
  
- #: g10/gpg.c:579
++#: g10/gpg.c:599
  msgid "prompt before overwriting"
  msgstr "demander avant d'écraser un fichier"
  
- #: g10/gpg.c:628
++#: g10/gpg.c:648
  msgid "use strict OpenPGP behavior"
  msgstr "utiliser le comportement strict d'OpenPGP"
  
- #: g10/gpg.c:654 sm/gpgsm.c:355
++#: g10/gpg.c:674 sm/gpgsm.c:357
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2542,7 -1976,16 +2548,17 @@@ msgstr "
  "(Consultez la page de manuel pour obtenir une liste complète des commandes\n"
  "et options)\n"
  
- #: g10/gpg.c:657 sm/gpgsm.c:358
++#: g10/gpg.c:677
+ #, fuzzy
+ #| msgid ""
+ #| "@\n"
+ #| "Examples:\n"
+ #| "\n"
+ #| " -se -r Bob [file]          sign and encrypt for user Bob\n"
+ #| " --clear-sign [file]         make a clear text signature\n"
+ #| " --detach-sign [file]       make a detached signature\n"
+ #| " --list-keys [names]        show keys\n"
+ #| " --fingerprint [names]      show fingerprints\n"
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2562,11 -2005,9 +2578,11 @@@ msgstr "
  " --list-keys [noms]         montrer les clefs\n"
  " --fingerprint [noms]       montrer les empreintes\n"
  
- #: g10/gpg.c:1026
++#: g10/gpg.c:1047
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
  msgstr "Utilisation : @GPG@ [options] [fichiers] (-h pour l'aide)"
  
- #: g10/gpg.c:1029
++#: g10/gpg.c:1050
  msgid ""
  "Syntax: @GPG@ [options] [files]\n"
  "Sign, check, encrypt or decrypt\n"
@@@ -2576,7 -2017,6 +2592,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:1040 sm/gpgsm.c:588
++#: g10/gpg.c:1061 sm/gpgsm.c:580
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2584,86 -2024,71 +2600,86 @@@ msgstr "
  "\n"
  "Algorithmes pris en charge :\n"
  
- #: g10/gpg.c:1043
++#: g10/gpg.c:1064
  msgid "Pubkey: "
  msgstr "Clef publique : "
  
- #: g10/gpg.c:1050 g10/keyedit.c:3402
++#: g10/gpg.c:1071 g10/keyedit.c:3483
  msgid "Cipher: "
  msgstr "Chiffrement : "
  
- #: g10/gpg.c:1057
++#: g10/gpg.c:1078
  msgid "Hash: "
  msgstr "Hachage : "
  
- #: g10/gpg.c:1064 g10/keyedit.c:3451
++#: g10/gpg.c:1085 g10/keyedit.c:3532
  msgid "Compression: "
  msgstr "Compression : "
  
- #: g10/gpg.c:1133 sm/gpgsm.c:662
++#: g10/gpg.c:1154 sm/gpgsm.c:654
  #, c-format
  msgid "usage: %s [options] %s\n"
  msgstr "utilisation : %s [options] %s\n"
  
- #: g10/gpg.c:1321 sm/gpgsm.c:751
++#: g10/gpg.c:1342 sm/gpgsm.c:743
  msgid "conflicting commands\n"
  msgstr "commandes en conflit\n"
  
- #: g10/gpg.c:1339
++#: g10/gpg.c:1360
  #, 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:1537
++#: g10/gpg.c:1558
  #, 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:1540
++#: g10/gpg.c:1561
  #, 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:1543
++#: g10/gpg.c:1564
  #, 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:1549
++#: g10/gpg.c:1570
  #, 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:1552
++#: g10/gpg.c:1573
  #, 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:1555
++#: g10/gpg.c:1576
  #, 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:1561
++#: g10/gpg.c:1582
  #, 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:1564
++#: g10/gpg.c:1585
  #, c-format
  msgid ""
  "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@@ -2671,21 -2096,18 +2687,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:1567
++#: g10/gpg.c:1588
  #, 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:1573
++#: g10/gpg.c:1594
  #, 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:1576
++#: g10/gpg.c:1597
  #, c-format
  msgid ""
  "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2693,509 -2115,352 +2709,449 @@@ msgstr "
  "Attention : les droits du répertoire contenant le fichier de configuration\n"
  "            « %s » ne sont pas sûrs\n"
  
- #: g10/gpg.c:1579
++#: g10/gpg.c:1600
  #, 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:1786
++#: g10/gpg.c:1816
  #, c-format
  msgid "unknown configuration item '%s'\n"
  msgstr "élément de configuration « %s » inconnu\n"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1925
  msgid "display photo IDs during key listings"
  msgstr "montrer les photos d'identité en affichant les clefs"
  
- #: g10/gpg.c:1895
++#: g10/gpg.c:1927
  msgid "show key usage information during key listings"
  msgstr "indiquer les informations sur l'utilisation en affichant les clefs"
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1929
  msgid "show policy URLs during signature listings"
  msgstr "montrer les URL de politique en affichant les signatures"
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1931
  msgid "show all notations during signature listings"
  msgstr "montrer toutes les notations en affichant les signatures"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1933
  msgid "show IETF standard notations during signature listings"
  msgstr "utiliser les notations aux normes IETF en affichant les signatures"
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1937
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  "utiliser les notations fournies par l'utilisateur en affichant les signatures"
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1939
  msgid "show preferred keyserver URLs during signature listings"
  msgstr ""
  "montrer les URL des serveurs de clefs favoris en affichant les signatures"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1941
  msgid "show user ID validity during key listings"
  msgstr "indiquer la validité de l'identité en affichant les clefs"
  
- #: g10/gpg.c:1911
++#: g10/gpg.c:1943
  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:1913
++#: g10/gpg.c:1945
  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:1915
++#: g10/gpg.c:1947
  msgid "show the keyring name in key listings"
  msgstr "montrer le nom du porte-clefs en affichant les clefs"
  
- #: g10/gpg.c:1917
++#: g10/gpg.c:1949
  msgid "show expiration dates during signature listings"
  msgstr "montrer les dates d'expiration en affichant les signatures"
  
- #: g10/gpg.c:2019 g10/gpg.c:2056
++#: g10/gpg.c:2051 g10/gpg.c:2088
  #, 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:2030
++#: g10/gpg.c:2062
  #, fuzzy, c-format
  #| msgid "unknown option '%s'\n"
  msgid "unknown TOFU policy '%s'\n"
  msgstr "option « %s » inconnue\n"
  
- #: g10/gpg.c:2032 g10/gpg.c:2068
++#: g10/gpg.c:2064 g10/gpg.c:2100
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2066
++#: g10/gpg.c:2098 g10/keygen.c:167
  #, fuzzy, c-format
  #| msgid "invalid argument for option \"%.50s\"\n"
  msgid "invalid value for option '%s'\n"
  msgstr "argument incorrect pour l'option « %.50s »\n"
  
- #: g10/gpg.c:2203
++#: g10/gpg.c:2235
  #, c-format
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "Remarque : l'ancien fichier d'options par défaut « %s » a été ignoré\n"
  
- #: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
++#: g10/gpg.c:2839 g10/gpg.c:3610 g10/gpg.c:3622
  #, 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:2978 g10/gpg.c:2990
++#: g10/gpg.c:3011 g10/gpg.c:3023
  #, 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:3012
++#: g10/gpg.c:3045
  #, 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:3044 sm/gpgsm.c:1166
++#: g10/gpg.c:3077 sm/gpgsm.c:1158
  #, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "mode pinentry « %s » incorrect\n"
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3130
  #, 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:3119 g10/gpg.c:3322 g10/keyedit.c:5338
++#: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
  msgid "could not parse keyserver URL\n"
  msgstr "impossible d'analyser l'URL du serveur de clefs\n"
  
- #: g10/gpg.c:3137
++#: g10/gpg.c:3170
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s : %d : les options du serveur de clefs sont incorrectes\n"
  
- #: g10/gpg.c:3140
++#: g10/gpg.c:3173
  msgid "invalid keyserver options\n"
  msgstr "les options du serveur de clefs sont incorrectes\n"
  
- #: g10/gpg.c:3147
++#: g10/gpg.c:3180
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s : %d : options d'importation incorrectes\n"
  
- #: g10/gpg.c:3150
++#: g10/gpg.c:3183
  msgid "invalid import options\n"
  msgstr "options d'importation incorrectes\n"
  
- #: g10/gpg.c:3156 g10/gpg.c:3171
++#: g10/gpg.c:3189 g10/gpg.c:3204
  #, fuzzy, c-format
  #| msgid "invalid list options\n"
  msgid "invalid filter option: %s\n"
  msgstr "options de liste incorrectes\n"
  
- #: g10/gpg.c:3162
++#: g10/gpg.c:3195
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s : %d : options d'exportation incorrectes\n"
  
- #: g10/gpg.c:3165
++#: g10/gpg.c:3198
  msgid "invalid export options\n"
  msgstr "options d'exportation incorrectes\n"
  
- #: g10/gpg.c:3177
++#: g10/gpg.c:3210
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s : %d : options de liste incorrectes\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3213
  msgid "invalid list options\n"
  msgstr "options de liste incorrectes\n"
  
- #: g10/gpg.c:3188
++#: g10/gpg.c:3221
  msgid "display photo IDs during signature verification"
  msgstr "montrer les photos d'identité en vérifiant les signatures"
  
- #: g10/gpg.c:3190
++#: g10/gpg.c:3223
  msgid "show policy URLs during signature verification"
  msgstr "montrer les URL de politique en vérifiant les signatures"
  
- #: g10/gpg.c:3192
++#: g10/gpg.c:3225
  msgid "show all notations during signature verification"
  msgstr "montrer toutes les notations en vérifiant les signatures"
  
- #: g10/gpg.c:3194
++#: g10/gpg.c:3227
  msgid "show IETF standard notations during signature verification"
  msgstr "utiliser les notations aux normes IETF en vérifiant les signatures"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3231
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  "utiliser les notations fournies par l'utilisateur en vérifiant les signatures"
  
- #: g10/gpg.c:3200
++#: g10/gpg.c:3233
  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:3202
++#: g10/gpg.c:3235
  msgid "show user ID validity during signature verification"
  msgstr "indiquer la validité de l'identité en vérifiant les signatures"
  
- #: g10/gpg.c:3204
++#: g10/gpg.c:3237
  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:3206
++#: g10/gpg.c:3239
  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:3208
++#: g10/gpg.c:3241
  msgid "validate signatures with PKA data"
  msgstr "valider les signatures avec les données PKA"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3243
  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:3217
++#: g10/gpg.c:3250
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s : %d : options de vérification incorrectes\n"
  
- #: g10/gpg.c:3220
++#: g10/gpg.c:3253
  msgid "invalid verify options\n"
  msgstr "options de vérification incorrectes\n"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3260
  #, 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:3417
++#: g10/gpg.c:3452
  #, 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:3420
++#: g10/gpg.c:3455
  msgid "invalid auto-key-locate list\n"
  msgstr "liste de recherche automatique de clef incorrecte\n"
  
- #: g10/gpg.c:3553 sm/gpgsm.c:1507
++#: g10/gpg.c:3592 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
  msgstr "Attention : le programme pourrait créer un fichier « core ».\n"
  
- #: g10/gpg.c:3564
++#: g10/gpg.c:3603
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "Attention : %s remplace %s\n"
  
- #: g10/gpg.c:3573
++#: g10/gpg.c:3612
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s n'est pas permis avec %s.\n"
  
- #: g10/gpg.c:3576
++#: g10/gpg.c:3615
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s n'a aucun sens avec %s.\n"
  
- #: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
++#: g10/gpg.c:3630 sm/gpgsm.c:1518 dirmngr/dirmngr.c:951
  msgid "WARNING: running with faked system time: "
  msgstr "Attention : exécution avec un système de temps contrefait : "
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3651
  #, 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:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
++#: g10/gpg.c:3686 g10/gpg.c:3710 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "l'algorithme de chiffrement sélectionné est incorrect\n"
  
- #: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
++#: g10/gpg.c:3692 g10/gpg.c:3716 sm/gpgsm.c:1591 sm/gpgsm.c:1597
  msgid "selected digest algorithm is invalid\n"
  msgstr "la fonction de hachage sélectionnée est incorrecte\n"
  
- #: g10/gpg.c:3659
++#: g10/gpg.c:3698
  msgid "selected compression algorithm is invalid\n"
  msgstr "l'algorithme de compression sélectionné est incorrect\n"
  
- #: g10/gpg.c:3665
++#: g10/gpg.c:3704
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "la fonction de hachage de certification sélectionnée est incorrecte\n"
  
- #: g10/gpg.c:3680
++#: g10/gpg.c:3719
  msgid "completes-needed must be greater than 0\n"
  msgstr "« completes-needed » doit être supérieur à 0\n"
  
- #: g10/gpg.c:3682
++#: g10/gpg.c:3721
  msgid "marginals-needed must be greater than 1\n"
  msgstr "« marginals-needed » doit être supérieur à 1\n"
  
- #: g10/gpg.c:3684
++#: g10/gpg.c:3723
  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:3686
++#: g10/gpg.c:3725
  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:3688
++#: g10/gpg.c:3727
  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:3691
++#: g10/gpg.c:3730
  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:3695
++#: g10/gpg.c:3734
  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:3702
++#: g10/gpg.c:3741
  msgid "invalid default preferences\n"
  msgstr "préférences par défaut incorrectes\n"
  
- #: g10/gpg.c:3706
++#: g10/gpg.c:3745
  msgid "invalid personal cipher preferences\n"
  msgstr "préférences personnelles de chiffrement incorrectes\n"
  
- #: g10/gpg.c:3710
++#: g10/gpg.c:3749
  msgid "invalid personal digest preferences\n"
  msgstr "préférences personnelles de hachage incorrectes\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3753
  msgid "invalid personal compress preferences\n"
  msgstr "préférences personnelles de compression incorrectes\n"
  
- #: g10/gpg.c:3750
++#: g10/gpg.c:3789
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s ne fonctionne pas encore avec %s\n"
  
- #: g10/gpg.c:3797
++#: g10/gpg.c:3836
  #, c-format
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr "impossible d'utiliser l'algorithme de chiffrement « %s » en mode %s.\n"
  
- #: g10/gpg.c:3802
++#: g10/gpg.c:3841
  #, c-format
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr "impossible d'utiliser l'algorithme de hachage « %s » en mode %s.\n"
  
- #: g10/gpg.c:3807
++#: g10/gpg.c:3846
  #, c-format
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr "impossible d'utiliser l'algorithme de compression « %s » en mode %s.\n"
  
- #: g10/gpg.c:3906
++#: g10/gpg.c:3945
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "impossible d'initialiser la base de confiance : %s\n"
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:3957
  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:3975
- msgid "--store [filename]"
- msgstr "--store [fichier]"
- 
- #: g10/gpg.c:3985
- msgid "--symmetric [filename]"
- msgstr "--symmetric [fichier]"
- 
- #: g10/gpg.c:3989
++#: g10/gpg.c:4028
  #, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "échec du chiffrement symétrique de « %s » : %s\n"
  
- #: g10/gpg.c:4000
- msgid "--encrypt [filename]"
- msgstr "--encrypt [fichier]"
- 
- #: g10/gpg.c:4016
- msgid "--symmetric --encrypt [filename]"
- msgstr "--symmetric --encrypt [fichier]"
- 
- #: g10/gpg.c:4018
++#: g10/gpg.c:4057
  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:4021
++#: g10/gpg.c:4060
  #, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr "impossible d'utiliser --symmetric --encrypt en mode %s\n"
  
- #: g10/gpg.c:4042
- msgid "--sign [filename]"
- msgstr "--sign [fichier]"
- 
- #: g10/gpg.c:4058
- msgid "--sign --encrypt [filename]"
- msgstr "--sign --encrypt [fichier]"
- 
- #: g10/gpg.c:4076
- msgid "--symmetric --sign --encrypt [filename]"
- msgstr "--symmetric --sign --encrypt [fichier]"
- 
- #: g10/gpg.c:4078
++#: g10/gpg.c:4117
  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:4081
++#: g10/gpg.c:4120
  #, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr "impossible d'utiliser --symmetric --sign --encrypt en mode %s\n"
  
- #: g10/gpg.c:4105
- msgid "--sign --symmetric [filename]"
- msgstr "--sign --symmetric [fichier]"
- 
- #: g10/gpg.c:4117
- msgid "--clearsign [filename]"
- msgstr "--clearsign [fichier]"
- 
- #: g10/gpg.c:4147
- msgid "--decrypt [filename]"
- msgstr "--decrypt [fichier]"
- 
- #: g10/gpg.c:4174
- msgid "--sign-key user-id"
- msgstr "--sign-key identité"
- 
- #: g10/gpg.c:4178
- msgid "--lsign-key user-id"
- msgstr "--lsign-key identité"
- 
- #: g10/gpg.c:4199
- msgid "--edit-key user-id [commands]"
- msgstr "--edit-key identité [commandes]"
- 
- #: g10/gpg.c:4215
- msgid "--passwd <user-id>"
- msgstr "--passwd <identité>"
- 
- #: g10/gpg.c:4411 g10/keyserver.c:1837
++#: g10/gpg.c:4462 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "échec d'envoi vers le serveur de clefs : %s\n"
  
- #: g10/gpg.c:4416
++#: g10/gpg.c:4467
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "échec de réception depuis le serveur de clefs : %s\n"
  
- #: g10/gpg.c:4422
++#: g10/gpg.c:4473
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "échec d'exportation de la clef : %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4486
  #, 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:4447
++#: g10/gpg.c:4498
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "échec de recherche au sein du serveur de clefs : %s\n"
  
- #: g10/gpg.c:4460
++#: g10/gpg.c:4511
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "échec de rafraîchissement par le serveur de clefs : %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4578
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "échec de déconstruction d'une armure : %s\n"
  
- #: g10/gpg.c:4538
++#: g10/gpg.c:4589
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "échec de construction d'une armure : %s \n"
  
- #: g10/gpg.c:4630
++#: g10/gpg.c:4681
  #, c-format
  msgid "invalid hash algorithm '%s'\n"
  msgstr "algorithme de hachage « %s » incorrect\n"
  
- #: g10/gpg.c:4776 g10/tofu.c:2002
++#: g10/gpg.c:4827 g10/tofu.c:2151
  #, 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:4788
++#: g10/gpg.c:4839
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4835
- msgid "[filename]"
- msgstr "[fichier]"
- 
- #: g10/gpg.c:4841
++#: g10/gpg.c:4894
  msgid "Go ahead and type your message ...\n"
  msgstr "Vous pouvez taper votre message…\n"
  
- #: g10/gpg.c:5179
++#: g10/gpg.c:5232
  msgid "the given certification policy URL is invalid\n"
  msgstr "l'URL de politique de certification donnée est incorrecte\n"
  
- #: g10/gpg.c:5181
++#: g10/gpg.c:5234
  msgid "the given signature policy URL is invalid\n"
  msgstr "l'URL de politique de signature donnée est incorrecte\n"
  
- #: g10/gpg.c:5214
++#: g10/gpg.c:5267
  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"
  
@@@ -3207,7 -2470,6 +3163,7 @@@ msgstr "|FICHIER|prendre les clefs dan
  msgid "make timestamp conflicts only a warning"
  msgstr "convertir les conflits de date en avertissements"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:345
++#: g10/gpgv.c:82 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|écrire l'état sur ce descripteur"
  
@@@ -3236,138 -2493,110 +3192,138 @@@ msgstr "Pas d'aide disponible
  msgid "No help available for '%s'"
  msgstr "Pas d'aide disponible pour « %s »"
  
- #: g10/import.c:151
++#: g10/import.c:152
  msgid "import signatures that are marked as local-only"
  msgstr "importer des signatures marquées comme locales seulement"
  
- #: g10/import.c:154
++#: g10/import.c:155
  msgid "repair damage from the pks keyserver during import"
  msgstr "réparer les données endommagées du serveur pks pendant l'importation"
  
- #: g10/import.c:157
++#: g10/import.c:158
  #, fuzzy
  #| msgid "do not update the trustdb after import"
  msgid "do not clear the ownertrust values during import"
  msgstr "ne pas mettre à jour la base de confiance après l'importation"
  
- #: g10/import.c:160
++#: g10/import.c:161
  msgid "do not update the trustdb after import"
  msgstr "ne pas mettre à jour la base de confiance après l'importation"
  
- #: g10/import.c:163
++#: g10/import.c:164
  #, fuzzy
  #| msgid "show key fingerprint"
  msgid "show key during import"
  msgstr "afficher l'empreinte de la clef"
  
- #: g10/import.c:166
++#: g10/import.c:167
  msgid "only accept updates to existing keys"
  msgstr "n'accepter que les mises à jour des clefs existantes"
  
- #: g10/import.c:169
++#: g10/import.c:170
  msgid "remove unusable parts from key after import"
  msgstr "nettoyer les parties inutilisables de la clef après l'importation"
  
- #: g10/import.c:172
++#: g10/import.c:173
  msgid "remove as much as possible from key after import"
  msgstr "supprimer autant que possible de la clef après l'importation"
  
- #: g10/import.c:175
++#: g10/import.c:176
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:326 g10/import.c:568
++#: g10/import.c:327 g10/import.c:569
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "un bloc de type %d a été ignoré\n"
  
- #: g10/import.c:585
++#: g10/import.c:586
  #, c-format
  msgid "%lu keys processed so far\n"
  msgstr "%lu clefs traitées jusqu'à présent\n"
  
- #: g10/import.c:655
++#: g10/import.c:656
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "      Quantité totale traitée : %lu\n"
  
- #: g10/import.c:658
++#: g10/import.c:659
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "     nouvelles clefs ignorées : %lu\n"
  
- #: g10/import.c:660
++#: g10/import.c:661
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "     nouvelles clefs ignorées : %lu\n"
  
- #: g10/import.c:663
++#: g10/import.c:664
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "                sans identité : %lu\n"
  
- #: g10/import.c:666 sm/import.c:130
++#: g10/import.c:667 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "                    importées : %lu"
  
- #: g10/import.c:670 sm/import.c:134
++#: g10/import.c:671 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "                non modifiées : %lu\n"
  
- #: g10/import.c:672
++#: g10/import.c:673
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "          nouvelles identités : %lu\n"
  
- #: g10/import.c:674
++#: g10/import.c:675
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "         nouvelles sous-clefs : %lu\n"
  
- #: g10/import.c:676
++#: g10/import.c:677
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "         nouvelles signatures : %lu\n"
  
- #: g10/import.c:678
++#: g10/import.c:679
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "nouvelles révocations de clef : %lu\n"
  
- #: g10/import.c:680 sm/import.c:136
++#: g10/import.c:681 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "          clefs secrètes lues : %lu\n"
  
- #: g10/import.c:682 sm/import.c:138
++#: g10/import.c:683 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "     clefs secrètes importées : %lu\n"
  
- #: g10/import.c:684 sm/import.c:140
++#: g10/import.c:685 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr " clefs secrètes non modifiées : %lu\n"
  
- #: g10/import.c:686 sm/import.c:142
++#: g10/import.c:687 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "                non importées : %lu\n"
  
- #: g10/import.c:688
++#: g10/import.c:689
  #, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "         signatures nettoyées : %lu\n"
  
- #: g10/import.c:690
++#: g10/import.c:691
  #, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "          identités nettoyées : %lu\n"
  
- #: g10/import.c:1034
++#: g10/import.c:1035
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
@@@ -3376,189 -2605,151 +3332,189 @@@ msgstr "
  "Attention : la clef %s contient des préférences pour des\n"
  "            algorithmes indisponibles pour ces identités :\n"
  
- #: g10/import.c:1076
++#: g10/import.c:1077
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr "            « %s » : préférence pour l'algorithme de chiffrement %s\n"
  
- #: g10/import.c:1091
++#: g10/import.c:1092
  #, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "            « %s » : préférence pour l'algorithme de hachage %s\n"
  
- #: g10/import.c:1103
++#: g10/import.c:1104
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr "            « %s » : préférence pour l'algorithme de compression %s\n"
  
- #: g10/import.c:1116
++#: g10/import.c:1117
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr "vous devriez mettre à jour vos préférences et redistribuer cette\n"
  
- #: g10/import.c:1118
++#: g10/import.c:1119
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr "clef pour éviter d'éventuels problèmes d'algorithmes non appropriés\n"
  
- #: g10/import.c:1143
++#: g10/import.c:1144
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  "vous pouvez mettre à jour vos préférences avec :\n"
  "gpg --edit-key %s updpref save\n"
  
- #: g10/import.c:1379 g10/import.c:2167
++#: g10/import.c:1380 g10/import.c:2168
  #, c-format
  msgid "key %s: no user ID\n"
  msgstr "clef %s : pas d'identité\n"
  
- #: g10/import.c:1385
++#: g10/import.c:1386
  #, c-format
  msgid "key %s: %s\n"
  msgstr "clef %s : %s\n"
  
- #: g10/import.c:1386 g10/import.c:2141
++#: g10/import.c:1387 g10/import.c:2142
  msgid "rejected by import screener"
  msgstr "rejetée par le filtre d’importation"
  
- #: g10/import.c:1416
++#: g10/import.c:1417
  #, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "clef %s : corruption de sous-clef PKS réparée\n"
  
- #: g10/import.c:1434
++#: g10/import.c:1435
  #, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "clef %s : identité « %s » non autosignée acceptée\n"
  
- #: g10/import.c:1444 g10/import.c:1475
++#: g10/import.c:1445 g10/import.c:1476
  #, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "clef %s : pas d'identité valable\n"
  
- #: g10/import.c:1446
++#: g10/import.c:1447
  msgid "this may be caused by a missing self-signature\n"
  msgstr "cela pourrait provenir d'une autosignature manquante\n"
  
- #: g10/import.c:1516 g10/import.c:2318
++#: g10/import.c:1517 g10/import.c:2319
  #, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "clef %s : clef publique introuvable : %s\n"
  
- #: g10/import.c:1522
++#: g10/import.c:1523
  #, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "clef %s : nouvelle clef — ignorée\n"
  
- #: g10/import.c:1537
++#: g10/import.c:1538
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "aucun porte-clefs accessible en écriture n'a été trouvé : %s\n"
  
- #: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
++#: g10/import.c:1547 g10/import.c:1648 g10/import.c:2385
  #, c-format
  msgid "error writing keyring '%s': %s\n"
  msgstr "erreur d'écriture du porte-clefs « %s » : %s\n"
  
- #: g10/import.c:1566
++#: g10/import.c:1567
  #, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "clef %s : clef publique « %s » importée\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1591
  #, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "clef %s : ne correspond pas à notre copie\n"
  
- #: g10/import.c:1606 g10/import.c:2342
++#: g10/import.c:1607 g10/import.c:2343
  #, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "clef %s : impossible de trouver le bloc de clef d'origine : %s\n"
  
- #: g10/import.c:1614 g10/import.c:2349
++#: g10/import.c:1615 g10/import.c:2350
  #, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "clef %s : impossible de lire le bloc de clef d'origine : %s\n"
  
- #: g10/import.c:1657
++#: g10/import.c:1658
  #, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "clef %s : « %s » 1 nouvelle identité\n"
  
- #: g10/import.c:1660
++#: g10/import.c:1661
  #, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "clef %s : « %s » %d nouvelles identités\n"
  
- #: g10/import.c:1663
++#: g10/import.c:1664
  #, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "clef %s : « %s » 1 nouvelle signature\n"
  
- #: g10/import.c:1666
++#: g10/import.c:1667
  #, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "clef %s : « %s » %d nouvelles signatures\n"
  
- #: g10/import.c:1669
++#: g10/import.c:1670
  #, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "clef %s : « %s » 1 nouvelle sous-clef\n"
  
- #: g10/import.c:1672
++#: g10/import.c:1673
  #, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "clef %s : « %s » %d nouvelles sous-clefs\n"
  
- #: g10/import.c:1675
++#: g10/import.c:1676
  #, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "clef %s : « %s » %d signature nettoyée\n"
  
- #: g10/import.c:1678
++#: g10/import.c:1679
  #, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "clef %s : « %s » %d signatures nettoyées\n"
  
- #: g10/import.c:1681
++#: g10/import.c:1682
  #, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "clef %s : « %s » %d identité nettoyée\n"
  
- #: g10/import.c:1684
++#: g10/import.c:1685
  #, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "clef %s : « %s » %d identités nettoyées\n"
  
- #: g10/import.c:1707
++#: g10/import.c:1708
  #, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "clef %s : « %s » n'est pas modifiée\n"
  
- #: g10/import.c:2019 g10/import.c:2264
++#: g10/import.c:2020 g10/import.c:2265
  #, c-format
  msgid "key %s: secret key imported\n"
  msgstr "clef %s : clef secrète importée\n"
  
- #: g10/import.c:2027
++#: g10/import.c:2028
  #, c-format
  msgid "key %s: secret key already exists\n"
  msgstr "clef %s : la clef secrète clef existe déjà\n"
  
- #: g10/import.c:2035
++#: g10/import.c:2036
  #, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "clef %s : erreur d'envoi à l'agent : %s\n"
  
- #: g10/import.c:2140
++#: g10/import.c:2141
  #, c-format
  msgid "secret key %s: %s\n"
  msgstr "clef secrète %s : %s\n"
  
- #: g10/import.c:2160 g10/import.c:2195
++#: g10/import.c:2161 g10/import.c:2196
  msgid "importing secret keys not allowed\n"
  msgstr "impossible d'importer des clefs secrètes\n"
  
- #: g10/import.c:2184
++#: g10/import.c:2185
  #, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr "clef %s : clef secrète avec chiffrement %d incorrect — ignorée\n"
@@@ -3573,143 -2764,116 +3529,143 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2256
++#: g10/import.c:2257
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2311
++#: g10/import.c:2312
  #, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
  "clef %s : pas de clef publique — impossible d'appliquer le certificat\n"
  "          de révocation\n"
  
- #: g10/import.c:2360
++#: g10/import.c:2361
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "clef %s : certificat de révocation incorrect : %s — rejeté\n"
  
- #: g10/import.c:2393
++#: g10/import.c:2394
  #, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "clef %s : « %s » certificat de révocation importé\n"
  
- #: g10/import.c:2469
++#: g10/import.c:2470
  #, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "clef %s : pas d'identité pour la signature\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2487
  #, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr "clef %s : algorithme à clef publique non géré avec l'identité « %s »\n"
  
- #: g10/import.c:2488
++#: g10/import.c:2489
  #, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "clef %s : autosignature de l'identité « %s » incorrecte\n"
  
- #: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
++#: g10/import.c:2506 g10/import.c:2532 g10/import.c:2583
  #, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "clef %s : algorithme à clef publique non pris en charge\n"
  
- #: g10/import.c:2506
++#: g10/import.c:2507
  #, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "clef %s : signature directe de clef incorrecte\n"
  
- #: g10/import.c:2520
++#: g10/import.c:2521
  #, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "clef %s : pas de sous-clef pour relier la clef\n"
  
- #: g10/import.c:2533
++#: g10/import.c:2534
  #, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "clef %s : lien à la sous-clef incorrect\n"
  
- #: g10/import.c:2549
++#: g10/import.c:2550
  #, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "clef %s : suppression de lien multiple aux sous-clefs\n"
  
- #: g10/import.c:2571
++#: g10/import.c:2572
  #, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "clef %s : pas de sous-clef pour révoquer la clef\n"
  
- #: g10/import.c:2584
++#: g10/import.c:2585
  #, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "clef %s : révocation de sous-clef incorrecte\n"
  
- #: g10/import.c:2599
++#: g10/import.c:2600
  #, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "clef %s : suppression de la révocation de sous-clefs multiples\n"
  
- #: g10/import.c:2641
++#: g10/import.c:2642
  #, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "clef %s : identité « %s » ignorée\n"
  
- #: g10/import.c:2665
++#: g10/import.c:2666
  #, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "clef %s : sous-clef ignorée\n"
  
- #: g10/import.c:2694
++#: g10/import.c:2695
  #, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "clef %s : signature non exportable (classe 0x%02X) — ignorée\n"
  
- #: g10/import.c:2705
++#: g10/import.c:2706
  #, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "clef %s : certificat de révocation au mauvais endroit — ignoré\n"
  
- #: g10/import.c:2723
++#: g10/import.c:2724
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "clef %s : certificat de révocation incorrect : %s — ignoré\n"
  
- #: g10/import.c:2737
++#: g10/import.c:2738
  #, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "clef %s : signature de sous-clef au mauvais endroit — ignorée\n"
  
- #: g10/import.c:2745
++#: g10/import.c:2746
  #, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "clef %s : classe de signature inattendue (0x%02X) — ignorée\n"
  
- #: g10/import.c:2887
++#: g10/import.c:2888
  #, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "clef %s : identités en double détectées — fusionnées\n"
  
- #: g10/import.c:2951
++#: g10/import.c:2952
  #, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr ""
  "Attention : la clef %s est peut-être révoquée :\n"
  "            récupération de la clef de révocation %s\n"
  
- #: g10/import.c:2967
++#: g10/import.c:2968
  #, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr ""
  "Attention : la clef %s est peut-être révoquée :\n"
  "            la clef de révocation %s est absente.\n"
  
- #: g10/import.c:3031
++#: g10/import.c:3032
  #, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "clef %s : ajout du certificat de révocation « %s »\n"
  
- #: g10/import.c:3069
++#: g10/import.c:3070
  #, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "clef %s : ajout de la signature directe de clef\n"
@@@ -3745,51 -2903,41 +3701,51 @@@ msgstr "ressource de bloc de clef « %
  msgid "error opening key DB: %s\n"
  msgstr "erreur d'ouverture de « %s » : %s\n"
  
- #: g10/keydb.c:1782
++#: g10/keydb.c:1786
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "échec de reconstruction du cache de porte-clefs : %s\n"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[revocation]"
  msgstr "[révocation]"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[self-signature]"
  msgstr "[autosignature]"
  
- #: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
++#: g10/keyedit.c:433 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: dirmngr/ldap-wrapper.c:694
  #, c-format
  msgid "error allocating memory: %s\n"
  msgstr "erreur d'allocation de mémoire : %s\n"
  
- #: g10/keyedit.c:629
++#: g10/keyedit.c:630
  #, fuzzy, c-format
  #| msgid "key %s: unsupported public key algorithm\n"
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr "clef %s : algorithme à clef publique non pris en charge\n"
  
- #: g10/keyedit.c:638
++#: g10/keyedit.c:639
  #, fuzzy, c-format
  #| msgid "card does not support digest algorithm %s\n"
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "la carte ne gère pas l'algorithme de hachage %s\n"
  
- #: g10/keyedit.c:800
++#: g10/keyedit.c:801
  #, fuzzy
  #| msgid "Good signature from"
  msgid " (reordered signatures follow)"
  msgstr "Bonne signature de"
  
- #: g10/keyedit.c:913
++#: g10/keyedit.c:914
  #, fuzzy, c-format
  #| msgid "key %s: %s\n"
  msgid "key %s:\n"
  msgstr "clef %s : %s\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:917
  #, fuzzy, c-format
  #| msgid "User ID \"%s\": %d signature removed\n"
  msgid "%d duplicate signature removed\n"
@@@ -3797,7 -2945,6 +3753,7 @@@ msgid_plural "%d duplicate signatures r
  msgstr[0] "Identité « %s » : %d signature supprimée\n"
  msgstr[1] "Identité « %s » : %d signature supprimée\n"
  
- #: g10/keyedit.c:919 g10/keylist.c:480
++#: g10/keyedit.c:920 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
@@@ -3805,7 -2952,6 +3761,7 @@@ msgid_plural "%d signatures not checke
  msgstr[0] "1 signature non vérifiée à cause d'une clef manquante\n"
  msgstr[1] "1 signature non vérifiée à cause d'une clef manquante\n"
  
- #: g10/keyedit.c:923 g10/keylist.c:476
++#: g10/keyedit.c:924 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
@@@ -3813,7 -2959,6 +3769,7 @@@ msgid_plural "%d bad signatures\n
  msgstr[0] "%d mauvaises signatures\n"
  msgstr[1] "%d mauvaises signatures\n"
  
- #: g10/keyedit.c:927
++#: g10/keyedit.c:928
  #, fuzzy, c-format
  #| msgid "Good signature from"
  msgid "%d signature reordered\n"
@@@ -3821,14 -2966,12 +3777,14 @@@ msgid_plural "%d signatures reordered\n
  msgstr[0] "Bonne signature de"
  msgstr[1] "Bonne signature de"
  
- #: g10/keyedit.c:932
++#: g10/keyedit.c:933
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:992 g10/pkclist.c:274
++#: g10/keyedit.c:993 g10/pkclist.c:274
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
  "keys\n"
@@@ -3839,17 -2982,14 +3795,17 @@@ msgstr "
  "vérifier les clefs des autres utilisateurs (en regardant les passeports, en\n"
  "vérifiant les empreintes depuis diverses sources, etc.)\n"
  
- #: g10/keyedit.c:996 g10/pkclist.c:286
++#: g10/keyedit.c:997 g10/pkclist.c:286
  #, c-format
  msgid "  %d = I trust marginally\n"
  msgstr "  %d = je fais très légèrement confiance\n"
  
- #: g10/keyedit.c:997 g10/pkclist.c:288
++#: g10/keyedit.c:998 g10/pkclist.c:288
  #, c-format
  msgid "  %d = I trust fully\n"
  msgstr "  %d = je fais entièrement confiance\n"
  
- #: g10/keyedit.c:1015
++#: g10/keyedit.c:1016
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
@@@ -3859,52 -2999,40 +3815,52 @@@ msgstr "
  "Une profondeur supérieure à 1 permet à la clef que vous signez de faire\n"
  "des signatures de confiance de votre part.\n"
  
- #: g10/keyedit.c:1032
++#: g10/keyedit.c:1033
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  "Veuillez entrer un domaine pour restreindre cette signature, ou appuyer\n"
  "sur la touche entrée pour aucun domaine.\n"
  
- #: g10/keyedit.c:1160
++#: g10/keyedit.c:1161
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1168
++#: g10/keyedit.c:1169
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "L'identité « %s » est révoquée."
  
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
- #: g10/keyedit.c:2246
++#: g10/keyedit.c:1178 g10/keyedit.c:1206 g10/keyedit.c:1233 g10/keyedit.c:1417
++#: g10/keyedit.c:2247
  msgid "Are you sure you still want to sign it? (y/N) "
  msgstr "Voulez-vous vraiment toujours la signer ? (o/N) "
  
- #: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
- #: g10/keyedit.c:2251 g10/keyedit.c:3177
++#: g10/keyedit.c:1192 g10/keyedit.c:1220 g10/keyedit.c:1247 g10/keyedit.c:1423
++#: g10/keyedit.c:2252 g10/keyedit.c:3178
  msgid "  Unable to sign.\n"
  msgstr " Impossible de signer.\n"
  
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1197
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "L'identité « %s » est expiré."
  
- #: g10/keyedit.c:1224
++#: g10/keyedit.c:1225
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "L'identité « %s » n'est pas autosignée."
  
- #: g10/keyedit.c:1253
++#: g10/keyedit.c:1254
  #, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "L'identité « %s » peut être signée. "
  
- #: g10/keyedit.c:1255
++#: g10/keyedit.c:1256
  msgid "Sign it? (y/N) "
  msgstr "Faut-il la signer ? (o/N) "
  
- #: g10/keyedit.c:1282
++#: g10/keyedit.c:1283
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -3913,11 -3041,9 +3869,11 @@@ msgstr "
  "L'autosignature de « %s »\n"
  "est une signature de type PGP 2.x.\n"
  
- #: g10/keyedit.c:1291
++#: g10/keyedit.c:1292
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr "Voulez-vous la modifier en autosignature OpenPGP ? (o/N) "
  
- #: g10/keyedit.c:1304
++#: g10/keyedit.c:1305
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3926,13 -3052,11 +3882,13 @@@ msgstr "
  "Votre signature actuelle de « %s »\n"
  "a expiré.\n"
  
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:1310
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr ""
  "Voulez-vous créer une nouvelle signature pour remplacer celle qui a\n"
  "expiré ? (o/N) "
  
- #: g10/keyedit.c:1330
++#: g10/keyedit.c:1331
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3941,43 -3065,34 +3897,43 @@@ msgstr "
  "Votre signature actuelle de « %s »\n"
  "est locale.\n"
  
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:1336
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr "Voulez-vous la rendre complètement exportable ? (o/N) "
  
- #: g10/keyedit.c:1355
++#: g10/keyedit.c:1356
  #, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "« %s » a déjà été signée localement par la clef %s\n"
  
- #: g10/keyedit.c:1359
++#: g10/keyedit.c:1360
  #, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "« %s » a déjà été signée par la clef %s\n"
  
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:1365
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "Voulez-vous quand même encore la signer ? (o/N) "
  
- #: g10/keyedit.c:1386
++#: g10/keyedit.c:1387
  #, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "Rien à signer avec la clef %s\n"
  
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1411
  msgid "This key has expired!"
  msgstr "Cette clef a expiré."
  
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1429
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "Cette clef va expirer le %s.\n"
  
- #: g10/keyedit.c:1434
++#: g10/keyedit.c:1435
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr "Voulez-vous que votre signature expire en même temps ? (O/n) "
  
- #: g10/keyedit.c:1475
++#: g10/keyedit.c:1476
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -3986,31 -3101,25 +3942,31 @@@ msgstr "
  "Avec quel soin avez-vous vérifié que la clef à signer appartient bien à\n"
  "la personne sus-nommée ? Si vous ne savez quoi répondre, entrez « 0 ».\n"
  
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1481
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) Je ne répondrai pas.%s\n"
  
- #: g10/keyedit.c:1482
++#: g10/keyedit.c:1483
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) Je n'ai pas vérifié du tout.%s\n"
  
- #: g10/keyedit.c:1484
++#: g10/keyedit.c:1485
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) J'ai partiellement vérifié.%s\n"
  
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:1488
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) J'ai complètement vérifié.%s\n"
  
- #: g10/keyedit.c:1494
++#: g10/keyedit.c:1495
  msgid "Your selection? (enter '?' for more information): "
  msgstr "Quel est votre choix ? (Entrez « ? » pour plus de renseignements) : "
  
- #: g10/keyedit.c:1521
++#: g10/keyedit.c:1522
  #, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -4019,229 -3128,175 +3975,229 @@@ msgstr "
  "Voulez-vous vraiment signer cette clef avec votre\n"
  "clef « %s » (%s)\n"
  
- #: g10/keyedit.c:1529
++#: g10/keyedit.c:1530
  msgid "This will be a self-signature.\n"
  msgstr "Ce sera une autosignature.\n"
  
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:1535
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr "Attention : la signature ne sera pas marquée comme non exportable.\n"
  
- #: g10/keyedit.c:1541
++#: g10/keyedit.c:1542
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr "Attention : La signature ne sera pas marquée comme non révocable.\n"
  
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1552
  msgid "The signature will be marked as non-exportable.\n"
  msgstr "La signature sera marquée comme non exportable.\n"
  
- #: g10/keyedit.c:1558
++#: g10/keyedit.c:1559
  msgid "The signature will be marked as non-revocable.\n"
  msgstr "La signature sera marquée comme non révocable.\n"
  
- #: g10/keyedit.c:1565
++#: g10/keyedit.c:1566
  msgid "I have not checked this key at all.\n"
  msgstr "Je n'ai pas du tout vérifié cette clef.\n"
  
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:1571
  msgid "I have checked this key casually.\n"
  msgstr "J'ai partiellement vérifié cette clef.\n"
  
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:1576
  msgid "I have checked this key very carefully.\n"
  msgstr "J'ai complètement vérifié cette clef.\n"
  
- #: g10/keyedit.c:1587
++#: g10/keyedit.c:1588
  msgid "Really sign? (y/N) "
  msgstr "Voulez-vous vraiment signer ? (o/N) "
  
- #: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
- #: g10/keyedit.c:6463 g10/sign.c:323
++#: g10/keyedit.c:1639 g10/keyedit.c:6308 g10/keyedit.c:6391 g10/keyedit.c:6500
++#: g10/keyedit.c:6562 g10/sign.c:325
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "échec de la signature : %s\n"
  
- #: g10/keyedit.c:1725
++#: g10/keyedit.c:1726
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  "La clef ne possède que des éléments partiels ou stockés sur carte\n"
  "— pas de phrase secrète à modifier.\n"
  
- #: g10/keyedit.c:1755
++#: g10/keyedit.c:1756
  #, c-format
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "clef %s : erreur de modification de la phrase secrète : %s\n"
  
- #: g10/keyedit.c:1869
++#: g10/keyedit.c:1870
  msgid "save and quit"
  msgstr "enregistrer et quitter"
  
- #: g10/keyedit.c:1872
++#: g10/keyedit.c:1873
  msgid "show key fingerprint"
  msgstr "afficher l'empreinte de la clef"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1874
  #, fuzzy
  #| msgid "Enter the keygrip: "
  msgid "show the keygrip"
  msgstr "Entrez le keygrip : "
  
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1875
  msgid "list key and user IDs"
  msgstr "afficher la clef et les identités"
  
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1877
  msgid "select user ID N"
  msgstr "sélectionner l'identité N"
  
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1878
  msgid "select subkey N"
  msgstr "sélectionner la sous-clef N"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1879
  msgid "check signatures"
  msgstr "vérifier les signatures"
  
- #: g10/keyedit.c:1884
++#: g10/keyedit.c:1885
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr ""
  "signer les identités sélectionnées [* voir ci-dessous les commandes "
  "similaires]"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1890
  msgid "sign selected user IDs locally"
  msgstr "signer les identités sélectionnées localement"
  
- #: g10/keyedit.c:1890
++#: g10/keyedit.c:1891
  msgid "sign selected user IDs with a trust signature"
  msgstr "signer les identités sélectionnées avec une signature de confiance"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1893
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr "signer les identités sélectionnées avec une signature non révocable"
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1895
  msgid "add a user ID"
  msgstr "ajouter une identité"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1897
  msgid "add a photo ID"
  msgstr "ajouter une photo d'identité"
  
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1898
  msgid "delete selected user IDs"
  msgstr "supprimer les identités sélectionnées"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1901
  msgid "add a subkey"
  msgstr "ajouter une sous-clef"
  
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1904
  msgid "add a key to a smartcard"
  msgstr "ajouter une clef à une carte à puce"
  
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1906
  msgid "move a key to a smartcard"
  msgstr "déplacer une clef vers une carte à puce"
  
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1908
  msgid "move a backup key to a smartcard"
  msgstr "déplacer une clef de sauvegarde vers une carte à puce"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1910
  msgid "delete selected subkeys"
  msgstr "supprimer les sous-clefs sélectionnées"
  
- #: g10/keyedit.c:1911
++#: g10/keyedit.c:1912
  msgid "add a revocation key"
  msgstr "ajouter une clef de révocation"
  
- #: g10/keyedit.c:1913
++#: g10/keyedit.c:1914
  msgid "delete signatures from the selected user IDs"
  msgstr "supprimer les signatures des identités sélectionnées"
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1916
  msgid "change the expiration date for the key or selected subkeys"
  msgstr ""
  "modifier la date d'expiration de la clef ou des sous-clefs sélectionnées"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1918
  msgid "flag the selected user ID as primary"
  msgstr "marquer l'identité sélectionnée comme principale"
  
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1921
  msgid "list preferences (expert)"
  msgstr "afficher les préférences (expert)"
  
- #: g10/keyedit.c:1921
++#: g10/keyedit.c:1922
  msgid "list preferences (verbose)"
  msgstr "afficher les préférences (bavard)"
  
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:1924
  msgid "set preference list for the selected user IDs"
  msgstr "définir la liste de préférences pour les identités sélectionnées"
  
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1927
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr "définir le serveur de clefs favori pour les identités sélectionnées"
  
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1929
  msgid "set a notation for the selected user IDs"
  msgstr "définir une notation pour les identités sélectionnées"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1931
  msgid "change the passphrase"
  msgstr "modifier la phrase secrète"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1934
  msgid "change the ownertrust"
  msgstr "modifier la confiance du propriétaire"
  
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1937
  msgid "revoke signatures on the selected user IDs"
  msgstr "révoquer les signatures des identités sélectionnées"
  
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1939
  msgid "revoke selected user IDs"
  msgstr "révoquer les identités sélectionnées"
  
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1942
  msgid "revoke key or selected subkeys"
  msgstr "révoquer la clef ou des sous-clefs sélectionnées"
  
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1944
  msgid "enable key"
  msgstr "activer la clef"
  
- #: g10/keyedit.c:1944
++#: g10/keyedit.c:1945
  msgid "disable key"
  msgstr "désactiver la clef"
  
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1947
  msgid "show selected photo IDs"
  msgstr "montrer les photos d'identité sélectionnées"
  
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1949
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  "compacter les identités inutilisables et supprimer les\n"
  "            signatures inutilisables de la clef"
  
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:1951
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  "compacter les identités inutilisables et supprimer toutes\n"
  "            les signatures de la clef"
  
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2063
  msgid "Secret key is available.\n"
  msgstr "La clef secrète est disponible.\n"
  
- #: g10/keyedit.c:2162
++#: g10/keyedit.c:2163
  msgid "Need the secret key to do this.\n"
  msgstr "La clef secrète est nécessaire pour faire cela.\n"
  
- #: g10/keyedit.c:2183
++#: g10/keyedit.c:2184
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4253,263 -3308,209 +4209,269 @@@ msgstr "
  "  confiance (tsign), « nr » pour les signatures non révocables\n"
  "  (nrsign), ou toute combinaison possible (ltsign, tnrsign, etc.).\n"
  
- #: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
++#: g10/keyedit.c:2240 g10/keyedit.c:3178 g10/keyedit.c:3317 g10/keyedit.c:3379
  msgid "Key is revoked."
  msgstr "La clef est révoquée."
  
- #: g10/keyedit.c:2262
++#: g10/keyedit.c:2263
  msgid "Really sign all user IDs? (y/N) "
  msgstr "Voulez-vous vraiment signer toutes les identités ? (o/N) "
  
- #: g10/keyedit.c:2266
++#: g10/keyedit.c:2267
  #, fuzzy
  #| msgid "Really sign all user IDs? (y/N) "
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "Voulez-vous vraiment signer toutes les identités ? (o/N) "
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2275
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Conseil : sélectionner les identités à signer\n"
  
- #: g10/keyedit.c:2285
++#: g10/keyedit.c:2286
  #, c-format
  msgid "Unknown signature type '%s'\n"
  msgstr "Type de signature « %s » inconnu\n"
  
- #: g10/keyedit.c:2309
++#: g10/keyedit.c:2310
  #, 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/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
++#: g10/keyedit.c:2332 g10/keyedit.c:2356 g10/keyedit.c:2550
  msgid "You must select at least one user ID.\n"
  msgstr "Vous devez sélectionner au moins une identité.\n"
  
- #: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
++#: g10/keyedit.c:2334 g10/keyedit.c:2358 g10/keyedit.c:2512 g10/keyedit.c:2552
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2336
++#: g10/keyedit.c:2337
  msgid "You can't delete the last user ID!\n"
  msgstr "Vous ne pouvez pas supprimer la dernière identité.\n"
  
- #: g10/keyedit.c:2339
++#: g10/keyedit.c:2340
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "Faut-il vraiment supprimer toutes les identités sélectionnées ? (o/N) "
  
- #: g10/keyedit.c:2340
++#: g10/keyedit.c:2341
  msgid "Really remove this user ID? (y/N) "
  msgstr "Faut-il vraiment supprimer cette identité ? (o/N) "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2397
++#: g10/keyedit.c:2398
  msgid "Really move the primary key? (y/N) "
  msgstr "Faut-il vraiment déplacer la clef principale ? (o/N) "
  
- #: g10/keyedit.c:2409 g10/keyedit.c:4866
++#: g10/keyedit.c:2410 g10/keyedit.c:4964
  msgid "You must select exactly one key.\n"
  msgstr "Vous devez sélectionner exactement une clef.\n"
  
- #: g10/keyedit.c:2436
++#: g10/keyedit.c:2437
  msgid "Command expects a filename argument\n"
  msgstr "La commande attend un nom de fichier comme argument\n"
  
- #: g10/keyedit.c:2457
++#: g10/keyedit.c:2458
  #, c-format
  msgid "Can't open '%s': %s\n"
  msgstr "Impossible d'ouvrir « %s » : %s\n"
  
- #: g10/keyedit.c:2474
++#: g10/keyedit.c:2475
  #, c-format
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "Erreur de lecture de la clef de sauvegarde sur « %s » : %s\n"
  
- #: g10/keyedit.c:2509
++#: g10/keyedit.c:2510
  msgid "You must select at least one key.\n"
  msgstr "Vous devez sélectionner au moins une clef.\n"
  
- #: g10/keyedit.c:2515
++#: g10/keyedit.c:2516
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "Voulez-vous vraiment supprimer les clefs sélectionnées ? (o/N) "
  
- #: g10/keyedit.c:2517
++#: g10/keyedit.c:2518
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "Voulez-vous vraiment supprimer cette clef ? (o/N) "
  
- #: g10/keyedit.c:2555
++#: g10/keyedit.c:2556
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr ""
  "Voulez-vous vraiment révoquer toutes les identités sélectionnées ? (o/N) "
  
- #: g10/keyedit.c:2556
++#: g10/keyedit.c:2557
  msgid "Really revoke this user ID? (y/N) "
  msgstr "Voulez-vous vraiment révoquer cette identité ? (o/N) "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2575
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "Voulez-vous vraiment révoquer toute la clef ? (o/N) "
  
- #: g10/keyedit.c:2585
++#: g10/keyedit.c:2586
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "Voulez-vous vraiment révoquer les sous-clefs sélectionnées ? (o/N) "
  
- #: g10/keyedit.c:2587
++#: g10/keyedit.c:2588
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "Voulez-vous vraiment révoquer cette sous-clef ? (o/N) "
  
- #: g10/keyedit.c:2645
++#: g10/keyedit.c:2646
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  "La confiance du propriétaire pourrait ne pas être définie à partir de\n"
  "la base de confiance d'un tiers\n"
  
- #: g10/keyedit.c:2690
++#: g10/keyedit.c:2691
  msgid "Set preference list to:\n"
  msgstr "Définir la liste de préférences en :\n"
  
- #: g10/keyedit.c:2697
++#: g10/keyedit.c:2698
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr ""
  "Faut-il vraiment mettre à jour les préférences pour les\n"
  "identités sélectionnées ? (o/N) "
  
- #: g10/keyedit.c:2699
++#: g10/keyedit.c:2700
  msgid "Really update the preferences? (y/N) "
  msgstr "Faut-il vraiment mettre à jour les préférences ? (o/N) "
  
- #: g10/keyedit.c:2773
++#: g10/keyedit.c:2774
  msgid "Save changes? (y/N) "
  msgstr "Faut-il enregistrer les modifications ? (o/N) "
  
- #: g10/keyedit.c:2777
++#: g10/keyedit.c:2778
  msgid "Quit without saving? (y/N) "
  msgstr "Faut-il quitter sans enregistrer ? (o/N) "
  
- #: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
- #: g10/keyedit.c:3267 g10/keyedit.c:3332
++#: g10/keyedit.c:2789 g10/keyedit.c:2799 g10/keyedit.c:2943 g10/keyedit.c:3046
++#: g10/keyedit.c:3268 g10/keyedit.c:3333 g10/keyedit.c:3409
  #, c-format
  msgid "update failed: %s\n"
  msgstr "échec de la mise à jour : %s\n"
  
- #: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
++#: g10/keyedit.c:2805 g10/keyedit.c:3273 g10/keyedit.c:3338 g10/keyedit.c:3416
  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:3038
++#: g10/keyedit.c:3039
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
  msgstr "Échec de génération de la clef : %s\n"
  
- #: g10/keyedit.c:3083
++#: g10/keyedit.c:3084
  #, c-format
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "« %s » n’est pas une empreinte\n"
  
- #: g10/keyedit.c:3112
++#: g10/keyedit.c:3113
  #, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "« %s » n’est pas l’empreinte principale\n"
  
- #: g10/keyedit.c:3248 g10/keyedit.c:3251
++#: g10/keyedit.c:3249 g10/keyedit.c:3252
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
  msgstr "valeur incorrecte\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  msgid "No matching user IDs."
  msgstr "Pas d’identités correspondantes."
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  msgid "Nothing to sign.\n"
  msgstr "Rien à signer.\n"
  
- #: g10/keyedit.c:3427
++#: g10/keyedit.c:3388
+ #, 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:3508
  msgid "Digest: "
  msgstr "Hachage : "
  
- #: g10/keyedit.c:3484
++#: g10/keyedit.c:3565
  msgid "Features: "
  msgstr "Fonctionnalités : "
  
- #: g10/keyedit.c:3495
++#: g10/keyedit.c:3576
  msgid "Keyserver no-modify"
  msgstr "Serveur de clefs sans modification"
  
- #: g10/keyedit.c:3510 g10/keylist.c:377
++#: g10/keyedit.c:3591 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr "Serveur de clefs favori : "
  
- #: g10/keyedit.c:3518 g10/keyedit.c:3519
++#: g10/keyedit.c:3599 g10/keyedit.c:3600
  msgid "Notations: "
  msgstr "Notations : "
  
- #: g10/keyedit.c:3764
++#: g10/keyedit.c:3845
  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:3836
++#: g10/keyedit.c:3917
  #, 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:3860
++#: g10/keyedit.c:3941
  #, 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:3866
++#: g10/keyedit.c:3947
  msgid "(sensitive)"
  msgstr "(sensible)"
  
- #: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3989 g10/keyedit.c:4131 g10/keylist.c:262 g10/keyserver.c:538
  #, c-format
  msgid "created: %s"
  msgstr "créé : %s"
  
- #: g10/keyedit.c:3911 g10/keylist.c:1852
++#: g10/keyedit.c:3992 g10/keylist.c:1852
  #, c-format
  msgid "revoked: %s"
  msgstr "révoquée : %s"
  
- #: g10/keyedit.c:3913 g10/keylist.c:1858
++#: g10/keyedit.c:3994 g10/keylist.c:1858
  #, c-format
  msgid "expired: %s"
  msgstr "expirée : %s"
  
- #: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyedit.c:3996 g10/keyedit.c:4133 g10/keylist.c:264 g10/keylist.c:1864
 +#: g10/keyserver.c:544
  #, c-format
  msgid "expires: %s"
  msgstr "expire : %s"
  
- #: g10/keyedit.c:3917
++#: g10/keyedit.c:3998
  #, c-format
  msgid "usage: %s"
  msgstr "utilisation : %s"
  
- #: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
++#: g10/keyedit.c:4006 g10/keyedit.c:4026 g10/keylist.c:267
  msgid "card-no: "
  msgstr "nº de carte : "
  
- #: g10/keyedit.c:3984
++#: g10/keyedit.c:4065
  #, c-format
  msgid "trust: %s"
  msgstr "confiance : %s"
  
- #: g10/keyedit.c:3988
++#: g10/keyedit.c:4069
  #, c-format
  msgid "validity: %s"
  msgstr "validité : %s"
  
- #: g10/keyedit.c:3995
++#: g10/keyedit.c:4076
  msgid "This key has been disabled"
  msgstr "Cette clef a été désactivée"
  
- #: g10/keyedit.c:4013
++#: g10/keyedit.c:4094
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4517,18 -3518,12 +4479,18 @@@ 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:4069 g10/keyedit.c:4500 g10/keyserver.c:548
- #: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: g10/keyedit.c:4150 g10/keyedit.c:4581 g10/keyserver.c:548
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:712
 +#: dirmngr/ocsp.c:703
  msgid "revoked"
  msgstr "révoquée"
  
- #: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
- #: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4152 g10/keyedit.c:4583 g10/keyserver.c:552
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:714
  msgid "expired"
  msgstr "expirée"
  
- #: g10/keyedit.c:4188
++#: g10/keyedit.c:4269
  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"
@@@ -4537,15 -3532,12 +4499,15 @@@ msgstr "
  "commande\n"
  "            risque de rendre une autre identité principale par défaut.\n"
  
- #: g10/keyedit.c:4240
++#: g10/keyedit.c:4321
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr "Attention : votre sous-clef de chiffrement expire bientôt.\n"
  
- #: g10/keyedit.c:4241
++#: g10/keyedit.c:4322
  msgid "You may want to change its expiration date too.\n"
  msgstr "Vous pourriez modifier aussi sa date d’expiration.\n"
  
- #: g10/keyedit.c:4300
++#: g10/keyedit.c:4381
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4554,36 -3546,28 +4516,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:4305 g10/keyedit.c:4595
++#: g10/keyedit.c:4386 g10/keyedit.c:4676
  msgid "Are you sure you still want to add it? (y/N) "
  msgstr "Voulez-vous vraiment toujours l'ajouter ? (o/N) "
  
- #: g10/keyedit.c:4311
++#: g10/keyedit.c:4392
  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:4326 g10/keygen.c:2697
++#: g10/keyedit.c:4407 g10/keygen.c:2719
  msgid "Such a user ID already exists on this key!\n"
  msgstr "Cette identité existe déjà pour cette clef.\n"
  
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4509
  msgid "Delete this good signature? (y/N/q)"
  msgstr "Supprimer cette bonne signature ? (o/N/q)"
  
- #: g10/keyedit.c:4438
++#: g10/keyedit.c:4519
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "Supprimer cette signature incorrecte ? (o/N/q)"
  
- #: g10/keyedit.c:4442
++#: g10/keyedit.c:4523
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "Supprimer cette signature inconnue ? (o/N/q)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4530
  msgid "Really delete this self-signature? (y/N)"
  msgstr "Faut-il vraiment supprimer cette autosignature ? (o/N)"
  
- #: g10/keyedit.c:4465
++#: g10/keyedit.c:4546
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
@@@ -4591,20 -3575,16 +4553,20 @@@ msgid_plural "Deleted %d signatures.\n
  msgstr[0] "%d signature supprimée.\n"
  msgstr[1] "%d signature supprimée.\n"
  
- #: g10/keyedit.c:4469
++#: g10/keyedit.c:4550
  msgid "Nothing deleted.\n"
  msgstr "Rien n'a été supprimé.\n"
  
- #: g10/keyedit.c:4504 g10/trust.c:693
++#: g10/keyedit.c:4585 g10/trust.c:716
  msgid "invalid"
  msgstr "incorrecte"
  
- #: g10/keyedit.c:4506
++#: g10/keyedit.c:4587
  #, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "Identité « %s » compactée : %s\n"
  
- #: g10/keyedit.c:4512
++#: g10/keyedit.c:4593
  #, fuzzy, c-format
  #| msgid "User ID \"%s\": %d signature removed\n"
  msgid "User ID \"%s\": %d signature removed\n"
@@@ -4612,17 -3592,14 +4574,17 @@@ msgid_plural "User ID \"%s\": %d signat
  msgstr[0] "Identité « %s » : %d signature supprimée\n"
  msgstr[1] "Identité « %s » : %d signature supprimée\n"
  
- #: g10/keyedit.c:4520
++#: g10/keyedit.c:4601
  #, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "Identité « %s » : déjà minimisée\n"
  
- #: g10/keyedit.c:4521
++#: g10/keyedit.c:4602
  #, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "Identité « %s » : déjà nettoyée\n"
  
- #: g10/keyedit.c:4590
++#: g10/keyedit.c:4671
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4631,43 -3608,35 +4593,43 @@@ 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:4601
++#: g10/keyedit.c:4682
  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:4618
++#: g10/keyedit.c:4699
  msgid "Enter the user ID of the designated revoker: "
  msgstr "Entrez l'identité du révocateur désigné : "
  
- #: g10/keyedit.c:4643
++#: g10/keyedit.c:4724
  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:4658
++#: g10/keyedit.c:4739
  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:4680
++#: g10/keyedit.c:4761
  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:4698
++#: g10/keyedit.c:4779
  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:4704
++#: g10/keyedit.c:4785
  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:4755
++#: g10/keyedit.c:4848
  #, fuzzy
  #| msgid ""
  #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4677,239 -3646,188 +4639,239 @@@ msgid "
  msgstr ""
  "Voulez-vous vraiment rendre cette clef comme révocateur désigné ? (o/N) "
  
- #: g10/keyedit.c:4760
++#: g10/keyedit.c:4853
  msgid "Changing expiration time for a subkey.\n"
  msgstr "Modification de la date d'expiration d'une sous-clef.\n"
  
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:4856
  msgid "Changing expiration time for the primary key.\n"
  msgstr "Modification de la date d'expiration de la clef principale.\n"
  
- #: g10/keyedit.c:4814
++#: g10/keyedit.c:4910
  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:4987
++#: g10/keyedit.c:5085
  #, 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:4993
++#: g10/keyedit.c:5091
  #, 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:5108
++#: g10/keyedit.c:5206
  msgid "Please select exactly one user ID.\n"
  msgstr "Veuillez sélectionner exactement une identité.\n"
  
- #: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
++#: g10/keyedit.c:5247 g10/keyedit.c:5361 g10/keyedit.c:5474 g10/keyedit.c:5611
  #, 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:5320
++#: g10/keyedit.c:5418
  msgid "Enter your preferred keyserver URL: "
  msgstr "Entrez l'URL de votre serveur de clefs favori : "
  
- #: g10/keyedit.c:5399
++#: g10/keyedit.c:5497
  msgid "Are you sure you want to replace it? (y/N) "
  msgstr "Voulez-vous vraiment le remplacer ? (o/N) "
  
- #: g10/keyedit.c:5400
++#: g10/keyedit.c:5498
  msgid "Are you sure you want to delete it? (y/N) "
  msgstr "Voulez-vous vraiment le supprimer ? (o/N) "
  
- #: g10/keyedit.c:5459
++#: g10/keyedit.c:5557
  msgid "Enter the notation: "
  msgstr "Entrez la notation : "
  
- #: g10/keyedit.c:5606
++#: g10/keyedit.c:5704
  msgid "Proceed? (y/N) "
  msgstr "Faut-il continuer ? (o/N) "
  
- #: g10/keyedit.c:5676
++#: g10/keyedit.c:5774
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "Pas d'identité d'indice %d\n"
  
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5836
  #, c-format
  msgid "No user ID with hash %s\n"
  msgstr "Pas d'identité avec le hachage %s\n"
  
- #: g10/keyedit.c:5839
++#: g10/keyedit.c:5937
  #, 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:5861
++#: g10/keyedit.c:5959
  #, c-format
  msgid "No subkey with index %d\n"
  msgstr "Pas de sous-clef d'indice %d\n"
  
- #: g10/keyedit.c:6002
++#: g10/keyedit.c:6100
  #, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "identité : « %s »\n"
  
- #: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
++#: g10/keyedit.c:6103 g10/keyedit.c:6205 g10/keyedit.c:6253
  #, 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:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
++#: g10/keyedit.c:6105 g10/keyedit.c:6207 g10/keyedit.c:6255
  msgid " (non-exportable)"
  msgstr " (non exportable)"
  
- #: g10/keyedit.c:6011
++#: g10/keyedit.c:6109
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "Cette signature a expiré le %s.\n"
  
- #: g10/keyedit.c:6016
++#: g10/keyedit.c:6114
  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:6021
++#: g10/keyedit.c:6119
  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:6075
++#: g10/keyedit.c:6173
  msgid "Not signed by you.\n"
  msgstr "Non signée par vous.\n"
  
- #: g10/keyedit.c:6081
++#: g10/keyedit.c:6179
  #, 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:6110
++#: g10/keyedit.c:6208
  msgid " (non-revocable)"
  msgstr " (non révocable)"
  
- #: g10/keyedit.c:6117
++#: g10/keyedit.c:6215
  #, 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:6142
++#: g10/keyedit.c:6240
  msgid "You are about to revoke these signatures:\n"
  msgstr "Vous êtes sur le point de révoquer ces signatures :\n"
  
- #: g10/keyedit.c:6165
++#: g10/keyedit.c:6263
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "Faut-il vraiment créer les certificats de révocation ? (o/N) "
  
- #: g10/keyedit.c:6198
++#: g10/keyedit.c:6296
  msgid "no secret key\n"
  msgstr "pas de clef secrète\n"
  
- #: g10/keyedit.c:6246
++#: g10/keyedit.c:6344
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6256
++#: g10/keyedit.c:6354
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "l'identité « %s »\" est déjà révoquée.\n"
  
- #: g10/keyedit.c:6273
++#: g10/keyedit.c:6371
  #, 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:6386
++#: g10/keyedit.c:6485
  #, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "La clef %s est déjà révoqué.\n"
  
- #: g10/keyedit.c:6448
++#: g10/keyedit.c:6547
  #, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "La sous-clef %s est déjà révoquée.\n"
  
- #: g10/keyedit.c:6545
++#: g10/keyedit.c:6644
  #, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr ""
  "Affichage de la photo d'identité %s de taille %ld pour la clef\n"
  "%s (uid %d)\n"
  
- #: g10/keygen.c:305
++#: g10/keygen.c:316
  #, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "préférence « %s » en double\n"
  
- #: g10/keygen.c:312
++#: g10/keygen.c:323
  msgid "too many cipher preferences\n"
  msgstr "trop de préférences de chiffrement\n"
  
- #: g10/keygen.c:314
++#: g10/keygen.c:325
  msgid "too many digest preferences\n"
  msgstr "trop de préférences de hachage\n"
  
- #: g10/keygen.c:316
++#: g10/keygen.c:327
  msgid "too many compression preferences\n"
  msgstr "trop de préférences de compression\n"
  
- #: g10/keygen.c:457
++#: g10/keygen.c:468
  #, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "élément « %s » incorrect dans la chaîne de préférences\n"
  
  # g10/keygen.c:123 ???
- #: g10/keygen.c:936
++#: g10/keygen.c:947
  msgid "writing direct signature\n"
  msgstr "écriture de la signature directe\n"
  
  # g10/keygen.c:123 ???
- #: g10/keygen.c:982
++#: g10/keygen.c:993
  msgid "writing self signature\n"
  msgstr "écriture de l'autosignature\n"
  
  # g10/keygen.c:161 ???
- #: g10/keygen.c:1038
++#: g10/keygen.c:1049
  msgid "writing key binding signature\n"
  msgstr "écriture de la signature de lien à la clef\n"
  
- #: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
- #: g10/keygen.c:1610 g10/keygen.c:1615
++#: g10/keygen.c:1413 g10/keygen.c:1418 g10/keygen.c:1470 g10/keygen.c:1475
++#: g10/keygen.c:1622 g10/keygen.c:1627
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "taille incorrecte ; utilisation de %u bits\n"
  
- #: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
++#: g10/keygen.c:1424 g10/keygen.c:1481 g10/keygen.c:1489 g10/keygen.c:1633
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "taille arrondie à %u bits\n"
  
- #: g10/keygen.c:1503
++#: g10/keygen.c:1515
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  "Attention : certains programmes OpenPGP ne peuvent pas gérer\n"
  "            de clef DSA avec cette taille de hachage\n"
  
- #: g10/keygen.c:1677
++#: g10/keygen.c:1689
  msgid "Sign"
  msgstr "Signer"
  
- #: g10/keygen.c:1680
++#: g10/keygen.c:1692
  msgid "Certify"
  msgstr "Certifier"
  
- #: g10/keygen.c:1683
++#: g10/keygen.c:1695
  msgid "Encrypt"
  msgstr "Chiffrer"
  
- #: g10/keygen.c:1686
++#: g10/keygen.c:1698
  msgid "Authenticate"
  msgstr "Authentifier"
  
@@@ -4923,150 -3841,119 +4885,150 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1705
++#: g10/keygen.c:1717
  msgid "SsEeAaQq"
  msgstr "SsCcAaQq"
  
- #: g10/keygen.c:1732
++#: g10/keygen.c:1744
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "Actions possibles pour une clef %s : "
  
- #: g10/keygen.c:1738
++#: g10/keygen.c:1750
  msgid "Current allowed actions: "
  msgstr "Actions actuellement permises : "
  
- #: g10/keygen.c:1743
++#: g10/keygen.c:1755
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) Inverser la capacité de signature\n"
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) Inverser la capacité de chiffrement\n"
  
- #: g10/keygen.c:1749
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) Inverser la capacité d'authentification\n"
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) Terminé\n"
  
- #: g10/keygen.c:1881 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1893 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Sélectionnez le type de clef désiré :\n"
  
- #: g10/keygen.c:1885
++#: g10/keygen.c:1897
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) RSA et RSA (par défaut)\n"
  
- #: g10/keygen.c:1889
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA et Elgamal\n"
  
- #: g10/keygen.c:1892
++#: g10/keygen.c:1904
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (signature seule)\n"
  
- #: g10/keygen.c:1894
++#: g10/keygen.c:1906
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (signature seule)\n"
  
- #: g10/keygen.c:1900
++#: g10/keygen.c:1912
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) Elgamal (chiffrement seul)\n"
  
- #: g10/keygen.c:1902
++#: g10/keygen.c:1914
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (chiffrement seul)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1920
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (indiquez vous-même les capacités)\n"
  
- #: g10/keygen.c:1910
++#: g10/keygen.c:1922
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (indiquez vous-même les capacités)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1928
  #, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) ECC et ECC\n"
  
- #: g10/keygen.c:1918
++#: g10/keygen.c:1930
  #, c-format
  msgid "  (%d) ECC (sign only)\n"
  msgstr "  (%d) ECC (signature seule)\n"
  
- #: g10/keygen.c:1920
++#: g10/keygen.c:1932
  #, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "  (%d) ECC (indiquez vous-même les capacités)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1934
  #, c-format
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "  (%d) ECC (chiffrement seul)\n"
  
- #: g10/keygen.c:1926
++#: g10/keygen.c:1938
  #, c-format
  msgid "  (%d) Existing key\n"
  msgstr "  (%d) Clef existante\n"
  
- #: g10/keygen.c:2022 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:206
  msgid "Enter the keygrip: "
  msgstr "Entrez le keygrip : "
  
- #: g10/keygen.c:2035 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2047 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr "Ce n'est pas un keygrip valable (40 chiffres hexadécimaux attendus)\n"
  
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2049 sm/certreqgen-ui.c:216
  msgid "No key with this keygrip\n"
  msgstr "Pas de clef avec ce keygrip\n"
  
- #: g10/keygen.c:2111 g10/keygen.c:2125
++#: g10/keygen.c:2133 g10/keygen.c:2147
  #, c-format
  msgid "rounded to %u bits\n"
  msgstr "arrondie à %u bits\n"
  
- #: g10/keygen.c:2166
++#: g10/keygen.c:2188
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr "les clefs %s peuvent faire une taille comprise entre %u et %u bits.\n"
  
- #: g10/keygen.c:2174
++#: g10/keygen.c:2196
  #, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Quelle taille de clef désirez-vous pour la sous-clef ? (%u) "
  
- #: g10/keygen.c:2177 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2199 sm/certreqgen-ui.c:183
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Quelle taille de clef désirez-vous ? (%u) "
  
- #: g10/keygen.c:2191 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2213 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "La taille demandée est %u bits\n"
  
- #: g10/keygen.c:2237
++#: g10/keygen.c:2259
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Sélectionnez le type de courbe elliptique désiré :\n"
  
- #: g10/keygen.c:2409
++#: g10/keygen.c:2431
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5082,7 -3969,6 +5044,7 @@@ msgstr "
  "      <n>m = la clef expire dans n mois\n"
  "      <n>y = la clef expire dans n ans\n"
  
- #: g10/keygen.c:2420
++#: g10/keygen.c:2442
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5099,38 -3985,30 +5061,38 @@@ msgstr "
  "      <n>m = la signature expire dans n mois\n"
  "      <n>y = la signature expire dans n ans\n"
  
- #: g10/keygen.c:2443
++#: g10/keygen.c:2465
  msgid "Key is valid for? (0) "
  msgstr "Pendant combien de temps la clef est-elle valable ? (0) "
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2470
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Pendant combien de temps la signature est-elle valable ? (%s) "
  
- #: g10/keygen.c:2461 g10/keygen.c:2486
++#: g10/keygen.c:2483 g10/keygen.c:2508
  msgid "invalid value\n"
  msgstr "valeur incorrecte\n"
  
- #: g10/keygen.c:2468
++#: g10/keygen.c:2490
  msgid "Key does not expire at all\n"
  msgstr "La clef n'expire pas du tout\n"
  
- #: g10/keygen.c:2469
++#: g10/keygen.c:2491
  msgid "Signature does not expire at all\n"
  msgstr "La signature n'expire pas du tout\n"
  
- #: g10/keygen.c:2474
++#: g10/keygen.c:2496
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "La clef expire le %s\n"
  
- #: g10/keygen.c:2475
++#: g10/keygen.c:2497
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "La signature expire le %s\n"
  
- #: g10/keygen.c:2479
++#: g10/keygen.c:2501
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5138,11 -4016,9 +5100,11 @@@ msgstr "
  "Le système ne peut pas afficher les dates au-delà de 2038.\n"
  "Cependant, la gestion des dates sera correcte jusqu'en 2106.\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2514
  msgid "Is this correct? (y/N) "
  msgstr "Est-ce correct ? (o/N) "
  
- #: g10/keygen.c:2560
++#: g10/keygen.c:2582
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5156,7 -4032,6 +5118,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2575
++#: g10/keygen.c:2597
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -5172,49 -4047,38 +5134,49 @@@ msgstr "
  "   « Heinrich Heine (le poète) <heinrichh at duesseldorf.de> »\n"
  "\n"
  
- #: g10/keygen.c:2594
++#: g10/keygen.c:2616
  msgid "Real name: "
  msgstr "Nom réel : "
  
- #: g10/keygen.c:2603
++#: g10/keygen.c:2625
  msgid "Invalid character in name\n"
  msgstr "Caractère incorrect dans le nom\n"
  
- #: g10/keygen.c:2604
++#: g10/keygen.c:2626
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2608
++#: g10/keygen.c:2630
  msgid "Name may not start with a digit\n"
  msgstr "Le nom ne doit pas commencer par un chiffre\n"
  
- #: g10/keygen.c:2611
++#: g10/keygen.c:2633
  msgid "Name must be at least 5 characters long\n"
  msgstr "Le nom doit contenir au moins cinq caractères\n"
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2643
  msgid "Email address: "
  msgstr "Adresse électronique : "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2649
  msgid "Not a valid email address\n"
  msgstr "Ce n'est pas une adresse électronique valable\n"
  
- #: g10/keygen.c:2636
++#: g10/keygen.c:2658
  msgid "Comment: "
  msgstr "Commentaire : "
  
- #: g10/keygen.c:2642
++#: g10/keygen.c:2664
  msgid "Invalid character in comment\n"
  msgstr "Caractère incorrect dans le commentaire\n"
  
- #: g10/keygen.c:2678
++#: g10/keygen.c:2700
  #, c-format
  msgid "You are using the '%s' character set.\n"
  msgstr "Vous utilisez le jeu de caractères « %s ».\n"
  
- #: g10/keygen.c:2684
++#: g10/keygen.c:2706
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5225,7 -4089,6 +5187,7 @@@ msgstr "
  "    « %s »\n"
  "\n"
  
- #: g10/keygen.c:2689
++#: g10/keygen.c:2711
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr ""
  "Ne mettez pas d'adresse électronique dans le nom réel ou dans le "
@@@ -5242,34 -4105,27 +5204,34 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2714
++#: g10/keygen.c:2736
  msgid "NnCcEeOoQq"
  msgstr "NnCcAaOoQq"
  
- #: g10/keygen.c:2724
++#: g10/keygen.c:2746
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr ""
  "Changer le (N)om, le (C)ommentaire, l'(A)dresse électronique ou (Q)uitter ? "
  
- #: g10/keygen.c:2725
++#: g10/keygen.c:2747
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr ""
  "Changer le (N)om, le (C)ommentaire, l'(A)dresse électronique\n"
  "ou (O)ui/(Q)uitter ? "
  
- #: g10/keygen.c:2730
++#: g10/keygen.c:2752
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "Changer le (N)om, l’(A)dresse électronique ou (Q)uitter ? "
  
- #: g10/keygen.c:2731
++#: g10/keygen.c:2753
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "Changer le (N)om, l'(A)dresse électronique ou (O)ui/(Q)uitter ? "
  
- #: g10/keygen.c:2750
++#: g10/keygen.c:2772
  msgid "Please correct the error first\n"
  msgstr "Veuillez d'abord corriger l'erreur\n"
  
- #: g10/keygen.c:2796
++#: g10/keygen.c:2818
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5281,13 -4137,10 +5243,13 @@@ msgstr "
  "pendant la génération de nombres premiers ; cela donne au générateur de\n"
  "nombres aléatoires une meilleure chance d'obtenir suffisamment d'entropie.\n"
  
- #: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
- #: g10/keygen.c:4777 g10/keygen.c:4882
++#: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
++#: g10/keygen.c:4330 g10/keygen.c:4803 g10/keygen.c:5064 g10/keygen.c:5169
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Échec de génération de la clef : %s\n"
  
- #: g10/keygen.c:3598
++#: g10/keygen.c:3922
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5298,64 -4151,51 +5260,64 @@@ msgstr "
  "   « %s »\n"
  "\n"
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3924
  msgid "Continue? (Y/n) "
  msgstr "Faut-il continuer ? (O/n) "
  
- #: g10/keygen.c:3621
++#: g10/keygen.c:3945
  #, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "Une clef pour « %s » existe déjà\n"
  
- #: g10/keygen.c:3626
++#: g10/keygen.c:3950
  msgid "Create anyway? (y/N) "
  msgstr "Faut-il quand même créer ? (o/N) "
  
- #: g10/keygen.c:3632
++#: g10/keygen.c:3956
  msgid "creating anyway\n"
  msgstr "création quand même\n"
  
- #: g10/keygen.c:3981
++#: g10/keygen.c:4315
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  "Remarque : Utilisez « %s %s » pour une fenêtre de dialogue de génération de "
  "clef complète.\n"
  
- #: g10/keygen.c:4013
++#: g10/keygen.c:4358
  msgid "Key generation canceled.\n"
  msgstr "La génération de clef a été annulée.\n"
  
- #: g10/keygen.c:4073
++#: g10/keygen.c:4418
  #, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "impossible de créer le fichier de sauvegarde « %s » : %s\n"
  
- #: g10/keygen.c:4093
++#: g10/keygen.c:4438
  #, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "Remarque : sauvegarde de la clef de la carte dans « %s »\n"
  
- #: g10/keygen.c:4244 g10/keygen.c:4393
++#: g10/keygen.c:4589 g10/keygen.c:4738
  #, c-format
  msgid "writing public key to '%s'\n"
  msgstr "écriture de la clef publique dans « %s »\n"
  
- #: g10/keygen.c:4387
++#: g10/keygen.c:4732
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "aucun porte-clefs public accessible en écriture n'a été trouvé : %s\n"
  
- #: g10/keygen.c:4401
++#: g10/keygen.c:4746
  #, c-format
  msgid "error writing public keyring '%s': %s\n"
  msgstr "erreur d'écriture du porte-clefs public « %s » : %s\n"
  
- #: g10/keygen.c:4433
++#: g10/keygen.c:4778
  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:4445
++#: g10/keygen.c:4790
  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"
@@@ -5364,7 -4204,6 +5326,7 @@@ msgstr "
  "pouvez\n"
  "utiliser la commande « --edit-key » pour générer une sous-clef à cette fin.\n"
  
- #: g10/keygen.c:4649 g10/keygen.c:4833
++#: g10/keygen.c:4936 g10/keygen.c:5120
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5372,7 -4211,6 +5334,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:4651 g10/keygen.c:4835
++#: g10/keygen.c:4938 g10/keygen.c:5122
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5380,22 -4218,18 +5342,22 @@@ msgstr "
  "la clef a été créée %lu secondes dans le futur (faille temporelle ou\n"
  "problème d'horloge)\n"
  
- #: g10/keygen.c:4662 g10/keygen.c:4846
++#: g10/keygen.c:4949 g10/keygen.c:5133
  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:4674 g10/keygen.c:4676
++#: g10/keygen.c:4961 g10/keygen.c:4963
  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:4683 g10/keygen.c:4685
++#: g10/keygen.c:4970 g10/keygen.c:4972
  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:4704 g10/keygen.c:4860
++#: g10/keygen.c:4991 g10/keygen.c:5147
  msgid "Really create? (y/N) "
  msgstr "Faut-il vraiment la créer ? (o/N) "
  
@@@ -5724,125 -4493,99 +5686,125 @@@ msgstr "Attention : plusieurs textes e
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
  msgstr "révocation autonome — utilisez « gpg --import » pour l'appliquer\n"
  
- #: g10/mainproc.c:1233 g10/mainproc.c:1276
++#: g10/mainproc.c:1238 g10/mainproc.c:1281
  msgid "no signature found\n"
  msgstr "aucune signature trouvée\n"
  
- #: g10/mainproc.c:1607
++#: g10/mainproc.c:1612
  #, c-format
  msgid "BAD signature from \"%s\""
  msgstr "MAUVAISE signature de « %s »"
  
- #: g10/mainproc.c:1609
++#: g10/mainproc.c:1614
  #, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Signature expirée de « %s »"
  
- #: g10/mainproc.c:1611
++#: g10/mainproc.c:1616
  #, c-format
  msgid "Good signature from \"%s\""
  msgstr "Bonne signature de « %s »"
  
- #: g10/mainproc.c:1630
++#: g10/mainproc.c:1635
  msgid "signature verification suppressed\n"
  msgstr "vérification de signature supprimée\n"
  
- #: g10/mainproc.c:1739
++#: g10/mainproc.c:1744
  msgid "can't handle this ambiguous signature data\n"
  msgstr "impossible de traiter ces données ambiguës de signature\n"
  
- #: g10/mainproc.c:1753 g10/mainproc.c:1761
++#: g10/mainproc.c:1758 g10/mainproc.c:1766
  #, c-format
  msgid "Signature made %s\n"
  msgstr "Signature faite le %s\n"
  
- #: g10/mainproc.c:1754 g10/mainproc.c:1762
++#: g10/mainproc.c:1759 g10/mainproc.c:1767
  #, c-format
  msgid "               using %s key %s\n"
  msgstr "               avec la clef %s %s\n"
  
- #: g10/mainproc.c:1766
++#: g10/mainproc.c:1771
  #, 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:1772
++#: g10/mainproc.c:1777
  #, fuzzy, c-format
  #| msgid "                aka \"%s\""
  msgid "               issuer \"%s\"\n"
  msgstr "                alias « %s »"
  
- #: g10/mainproc.c:1789
++#: g10/mainproc.c:1794
  msgid "Key available at: "
  msgstr "Clef disponible sur : "
  
- #: g10/mainproc.c:2024
++#: g10/mainproc.c:2029
  msgid "[uncertain]"
  msgstr "[doute]"
  
- #: g10/mainproc.c:2062
++#: g10/mainproc.c:2067
  #, c-format
  msgid "                aka \"%s\""
  msgstr "                alias « %s »"
  
- #: g10/mainproc.c:2145
++#: g10/mainproc.c:2150
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "La signature a expiré le %s\n"
  
- #: g10/mainproc.c:2149
++#: g10/mainproc.c:2154
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "La signature expire le %s\n"
  
- #: g10/mainproc.c:2160
++#: g10/mainproc.c:2165
  #, c-format
  msgid "%s signature, digest algorithm %s%s%s\n"
  msgstr "signature %s, algorithme de hachage %s%s%s\n"
  
- #: g10/mainproc.c:2161
++#: g10/mainproc.c:2166
  msgid "binary"
  msgstr "binaire"
  
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2167
  msgid "textmode"
  msgstr "mode texte"
  
- #: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "inconnu"
  
- #: g10/mainproc.c:2164
++#: g10/mainproc.c:2169
  msgid ", key algorithm "
  msgstr ", algorithme de clef "
  
- #: g10/mainproc.c:2199
++#: g10/mainproc.c:2204
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2229
++#: g10/mainproc.c:2234
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "Impossible de vérifier la signature : %s\n"
  
- #: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
++#: g10/mainproc.c:2327 g10/mainproc.c:2346 g10/mainproc.c:2470
  msgid "not a detached signature\n"
  msgstr "la signature n'est pas détachée\n"
  
- #: g10/mainproc.c:2375
++#: g10/mainproc.c:2380
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
  msgstr ""
  "Attention : plusieurs signatures ont été détectées.\n"
  "            Seule la première sera vérifiée.\n"
  
- #: g10/mainproc.c:2384
++#: g10/mainproc.c:2389
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "signature autonome de classe 0x%02x\n"
  
- #: g10/mainproc.c:2469
++#: g10/mainproc.c:2474
  msgid "old style (PGP 2.x) signature\n"
  msgstr "signature d'un ancien type (PGP 2.x)\n"
  
@@@ -6142,23 -4831,18 +6104,23 @@@ msgstr "Cette photo est-elle correcte (
  msgid "unable to display photo ID!\n"
  msgstr "impossible d'afficher la photo d'identité.\n"
  
- #: g10/pkclist.c:72 g10/revoke.c:757
++#: g10/pkclist.c:72 g10/revoke.c:758
  msgid "No reason specified"
  msgstr "Aucune cause indiquée"
  
- #: g10/pkclist.c:74 g10/revoke.c:759
++#: g10/pkclist.c:74 g10/revoke.c:760
  msgid "Key is superseded"
  msgstr "La clef a été remplacée"
  
- #: g10/pkclist.c:76 g10/revoke.c:758
++#: g10/pkclist.c:76 g10/revoke.c:759
  msgid "Key has been compromised"
  msgstr "La clef a été compromise"
  
- #: g10/pkclist.c:78 g10/revoke.c:760
++#: g10/pkclist.c:78 g10/revoke.c:761
  msgid "Key is no longer used"
  msgstr "La clef n'est plus utilisée"
  
- #: g10/pkclist.c:80 g10/revoke.c:761
++#: g10/pkclist.c:80 g10/revoke.c:762
  msgid "User ID is no longer valid"
  msgstr "L'identité n'est plus valable"
  
@@@ -6236,7 -4907,6 +6198,7 @@@ msgstr "
  "Le niveau de confiance minimal pour cette clef est : %s\n"
  "\n"
  
- #: g10/pkclist.c:310 g10/revoke.c:786
++#: g10/pkclist.c:310 g10/revoke.c:787
  msgid "Your decision? "
  msgstr "Quelle est votre décision ? "
  
@@@ -6445,34 -5077,27 +6407,34 @@@ msgstr "
  msgid "No such user ID.\n"
  msgstr "Cette identité n'existe pas.\n"
  
- #: g10/pkclist.c:1197 g10/pkclist.c:1273
++#: g10/pkclist.c:1197 g10/pkclist.c:1274
  msgid "skipped: public key already set as default recipient\n"
  msgstr ""
  "ignoré : la clef publique est déjà définie en destinataire par défaut\n"
  
- #: g10/pkclist.c:1218
++#: g10/pkclist.c:1219
  msgid "Public key is disabled.\n"
  msgstr "La clef publique est désactivée.\n"
  
- #: g10/pkclist.c:1228
++#: g10/pkclist.c:1229
  msgid "skipped: public key already set\n"
  msgstr "ignoré : clef publique déjà activée\n"
  
- #: g10/pkclist.c:1263
++#: g10/pkclist.c:1264
  #, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "destinataire par défaut « %s » inconnu\n"
  
- #: g10/pkclist.c:1312
++#: g10/pkclist.c:1313
  msgid "no valid addressees\n"
  msgstr "pas de destinataire valable\n"
  
- #: g10/pkclist.c:1665
++#: g10/pkclist.c:1666
  #, 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:1690
++#: g10/pkclist.c:1691
  #, 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"
@@@ -6483,28 -5107,22 +6445,28 @@@ msgstr "
  "les données ne sont pas enregistrées ; utilisez l'option « --output » pour\n"
  "les enregistrer\n"
  
- #: g10/plaintext.c:598
++#: g10/plaintext.c:614
  msgid "Detached signature.\n"
  msgstr "Signature détachée.\n"
  
- #: g10/plaintext.c:606
++#: g10/plaintext.c:622
  msgid "Please enter name of data file: "
  msgstr "Entrez le nom du fichier de données : "
  
- #: g10/plaintext.c:643
++#: g10/plaintext.c:659
  msgid "reading stdin ...\n"
  msgstr "lecture de l'entrée standard…\n"
  
- #: g10/plaintext.c:688
++#: g10/plaintext.c:704
  msgid "no signed data\n"
  msgstr "pas de données signées\n"
  
- #: g10/plaintext.c:706
++#: g10/plaintext.c:722
  #, c-format
  msgid "can't open signed data '%s'\n"
  msgstr "impossible d'ouvrir les données signées « %s »\n"
  
- #: g10/plaintext.c:741
++#: g10/plaintext.c:757
  #, c-format
  msgid "can't open signed data fd=%d: %s\n"
  msgstr "impossible d'ouvrir les données signées fd=%d : %s\n"
@@@ -6574,7 -5178,6 +6536,7 @@@ msgid "Create a designated revocation c
  msgstr ""
  "Faut-il créer un certificat de révocation désigné pour cette clef ? (o/N) "
  
- #: g10/revoke.c:336 g10/revoke.c:727
++#: g10/revoke.c:336 g10/revoke.c:728
  msgid "ASCII armored output forced.\n"
  msgstr "sortie forcée avec armure ASCII.\n"
  
@@@ -6622,7 -5219,6 +6584,7 @@@ msgstr "
  "encore accessible, créer un nouveau certificat de révocation\n"
  "est préférable afin d’indiquer la cause de révocation."
  
- #: g10/revoke.c:575
++#: g10/revoke.c:576
  #, fuzzy
  #| msgid ""
  #| "To avoid an accidental use of this file, a colon has been inserted\n"
@@@ -6638,13 -5234,11 +6600,13 @@@ msgstr "
  "Supprimez ce deux-points avec un éditeur de texte avant\n"
  "d’utiliser ce certificat de révocation."
  
- #: g10/revoke.c:590
++#: g10/revoke.c:591
  #, fuzzy, c-format
  #| msgid "Revocation certificate created.\n"
  msgid "revocation certificate stored as '%s.rev'\n"
  msgstr "Certificat de révocation créé.\n"
  
- #: g10/revoke.c:634
++#: g10/revoke.c:635
  #, fuzzy, c-format
  #| msgid "secret key \"%s\" not found: %s\n"
  msgid "secret key \"%s\" not found\n"
@@@ -6653,22 -5247,18 +6615,22 @@@ msgstr "clef secrète « %s » introu
  #. TRANSLATORS: The %s prints a key specification which
  #. for example has been given at the command line.  Several lines
  #. lines with secret key infos are printed after this message.
- #: g10/revoke.c:661
++#: g10/revoke.c:662
  #, c-format
  msgid "'%s' matches multiple secret keys:\n"
  msgstr ""
  
- #: g10/revoke.c:688
++#: g10/revoke.c:689
  #, fuzzy, c-format
  #| msgid "error creating keyring '%s': %s\n"
  msgid "error searching the keyring: %s\n"
  msgstr "erreur de création du porte-clefs « %s » : %s\n"
  
- #: g10/revoke.c:711
++#: g10/revoke.c:712
  msgid "Create a revocation certificate for this key? (y/N) "
  msgstr "Faut-il créer un certificat de révocation pour cette clef ? (o/N) "
  
- #: g10/revoke.c:735
++#: g10/revoke.c:736
  msgid ""
  "Revocation certificate created.\n"
  "\n"
@@@ -6689,34 -5279,27 +6651,34 @@@ msgstr "
  "d'impression\n"
  "utilisé pourrait stocker ces données et les rendre accessibles à d'autres.\n"
  
- #: g10/revoke.c:769
++#: g10/revoke.c:770
  msgid "Please select the reason for the revocation:\n"
  msgstr "choisissez la cause de la révocation :\n"
  
- #: g10/revoke.c:779
++#: g10/revoke.c:780
  msgid "Cancel"
  msgstr "Annuler"
  
- #: g10/revoke.c:781
++#: g10/revoke.c:782
  #, c-format
  msgid "(Probably you want to select %d here)\n"
  msgstr "(Vous devriez sûrement sélectionner %d ici)\n"
  
- #: g10/revoke.c:822
++#: g10/revoke.c:823
  msgid "Enter an optional description; end it with an empty line:\n"
  msgstr ""
  "Entrez une description facultative, en terminant par une ligne vide :\n"
  
- #: g10/revoke.c:850
++#: g10/revoke.c:851
  #, c-format
  msgid "Reason for revocation: %s\n"
  msgstr "Cause de révocation : %s\n"
  
- #: g10/revoke.c:852
++#: g10/revoke.c:853
  msgid "(No description given)\n"
  msgstr "(Aucune description donnée)\n"
  
- #: g10/revoke.c:857
++#: g10/revoke.c:858
  msgid "Is this okay? (y/N) "
  msgstr "Est-ce d'accord ? (o/N) "
  
@@@ -6867,12 -5430,10 +6829,12 @@@ msgstr "
  "            l'URL du serveur de clef favori (chaîne trop grande).\n"
  "            Utilisation de la version non expansée.\n"
  
- #: g10/sign.c:329
++#: g10/sign.c:331
  #, c-format
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s/%s signature de : « %s »\n"
  
- #: g10/sign.c:878
++#: g10/sign.c:880
  #, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6880,11 -5441,9 +6842,11 @@@ msgstr "
  "Attention : forcer l'algorithme de hachage %s (%d) est en\n"
  "            désaccord avec les préférences du destinataire\n"
  
- #: g10/sign.c:1009
++#: g10/sign.c:1011
  msgid "signing:"
  msgstr "signature :"
  
- #: g10/sign.c:1286
++#: g10/sign.c:1288
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "le chiffrement %s sera utilisé\n"
@@@ -6910,7 -5465,6 +6872,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:362
++#: g10/tdbdump.c:57 g10/trustdb.c:369
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "enregistrement de confiance %lu, type %d : échec d'écriture : %s\n"
@@@ -6955,7 -5501,6 +6917,7 @@@ msgstr "impossible de trouver l'enregis
  msgid "read error in '%s': %s\n"
  msgstr "erreur de lecture dans « %s » : %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "base de confiance : échec de synchronisation : %s\n"
@@@ -7099,309 -5615,322 +7061,388 @@@ msgstr "impossible de traiter les ligne
  msgid "input line longer than %d characters\n"
  msgstr "la ligne d'entrée est plus longue que %d caractères\n"
  
- #: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
++#: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
  #, fuzzy, c-format
  #| msgid "error sending standard options: %s\n"
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "erreur d'envoi d'options standards : %s\n"
  
- #: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
++#: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:357 g10/tofu.c:699
++#: g10/tofu.c:355 g10/tofu.c:888
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:501
++#: g10/tofu.c:505
  #, fuzzy, c-format
  #| msgid "unsupported algorithm: %s"
  msgid "unsupported TOFU database version: %s\n"
  msgstr "algorithme non pris en charge : %s"
  
- #: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
- #: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
- #: g10/tofu.c:3056
++#: g10/tofu.c:538
+ #, fuzzy, c-format
+ #| msgid "error creating temporary file: %s\n"
+ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
+ msgstr "erreur de création du fichier temporaire : %s\n"
+ 
++#: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
+ msgid "TOFU DB error"
+ msgstr ""
+ 
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2340 g10/tofu.c:2359
++#: g10/tofu.c:2372 g10/tofu.c:2384 g10/tofu.c:2399 g10/tofu.c:2411
++#: g10/tofu.c:2980 g10/tofu.c:2997 g10/tofu.c:3033 g10/tofu.c:3050
++#: g10/tofu.c:3353
  #, fuzzy, c-format
  #| msgid "error sending data: %s\n"
  msgid "error reading TOFU database: %s\n"
  msgstr "erreur d'envoi de données : %s\n"
  
- #: g10/tofu.c:566 g10/tofu.c:574
++#: g10/tofu.c:716 g10/tofu.c:724
  #, fuzzy, c-format
  #| msgid "error writing base64 encoding: %s\n"
  msgid "error determining TOFU database's version: %s\n"
  msgstr "erreur d'écriture en encodage base64 : %s\n"
  
- #: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
++#: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
  #, fuzzy, c-format
  #| msgid "error initializing reader object: %s\n"
  msgid "error initializing TOFU database: %s\n"
  msgstr "erreur d'initialisation de l'objet lecteur : %s\n"
  
- #: g10/tofu.c:765
++#: g10/tofu.c:844
+ #, fuzzy, c-format
+ #| msgid "error sending data: %s\n"
+ msgid "error creating 'encryptions' TOFU table: %s\n"
+ msgstr "erreur d'envoi de données : %s\n"
+ 
++#: g10/tofu.c:874
+ #, c-format
+ msgid "adding column effective_policy to bindings DB: %s\n"
+ msgstr ""
+ 
++#: g10/tofu.c:956
  #, fuzzy, c-format
  #| msgid "error opening '%s': %s\n"
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "erreur d'ouverture de « %s » : %s\n"
  
- #: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
++#: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
  #, fuzzy, c-format
  #| msgid "error sending data: %s\n"
  msgid "error updating TOFU database: %s\n"
  msgstr "erreur d'envoi de données : %s\n"
  
- #: g10/tofu.c:1239
++#: g10/tofu.c:1328
  #, c-format
  msgid ""
  "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1247
++#: g10/tofu.c:1337
  #, c-format
- msgid "The email address \"%s\" is associated with %d keys!"
- msgstr ""
+ msgid "The email address \"%s\" is associated with %d key!"
+ msgid_plural "The email address \"%s\" is associated with %d keys!"
+ msgstr[0] ""
+ msgstr[1] ""
  
- #: g10/tofu.c:1251
++#: g10/tofu.c:1343
  msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  
- #: g10/tofu.c:1257
++#: g10/tofu.c:1349
  #, c-format
  msgid ""
  "Please indicate whether this email address should be associated with key %s "
  "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1513
++#: g10/tofu.c:1605
  #, fuzzy, c-format
  #| msgid "error getting responder ID: %s\n"
  msgid "error gathering other user IDs: %s\n"
  msgstr "erreur de lecture de l'identifiant de répondeur : %s\n"
  
- #: g10/tofu.c:1523
++#: g10/tofu.c:1615
  #, fuzzy
  #| msgid "list key and user IDs"
  msgid "This key's user IDs:\n"
  msgstr "afficher la clef et les identités"
  
- #: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
++#: g10/tofu.c:1631 g10/tofu.c:1796
  #, fuzzy, c-format
  #| msgid "validity: %s"
  msgid "policy: %s"
  msgstr "validité : %s"
  
- #: g10/tofu.c:1630
++#: g10/tofu.c:1722
  #, fuzzy, c-format
  #| msgid "error getting stored flags: %s\n"
  msgid "error gathering signature stats: %s\n"
  msgstr "erreur de lecture des options stockées : %s\n"
  
- #: g10/tofu.c:1634
++#: g10/tofu.c:1726
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1651
++#: g10/tofu.c:1744
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1684 g10/tofu.c:1689
++#: g10/tofu.c:1785 g10/tofu.c:1790
  msgid ", "
  msgstr ""
  
- #: g10/tofu.c:1693
++#: g10/tofu.c:1794
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
  msgstr "afficher les clefs"
  
- #: g10/tofu.c:1715
++#: g10/tofu.c:1820
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid "Verified %d message"
- msgid_plural "Verified %d messages"
+ msgid "Verified %d message."
+ msgid_plural "Verified %d messages."
  msgstr[0] "indiquer les fonctions de hachage"
  msgstr[1] "indiquer les fonctions de hachage"
  
- #: g10/tofu.c:1719
++#: g10/tofu.c:1824
+ #, fuzzy, c-format
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid "Encrypted %d message."
+ msgid_plural "Encrypted %d messages."
+ msgstr[0] "chiffré avec %lu phrases secrètes\n"
+ msgstr[1] "chiffré avec %lu phrases secrètes\n"
+ 
++#: g10/tofu.c:1831
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid "Verified %d message in the future."
+ msgid_plural "Verified %d messages in the future."
+ msgstr[0] "indiquer les fonctions de hachage"
+ msgstr[1] "indiquer les fonctions de hachage"
+ 
++#: g10/tofu.c:1835
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid "Encrypted %d message in the future."
+ msgid_plural "Encrypted %d messages in the future."
+ msgstr[0] "indiquer les fonctions de hachage"
+ msgstr[1] "indiquer les fonctions de hachage"
+ 
++#: g10/tofu.c:1849
+ #, c-format
+ msgid "Messages verified over the past %d day: %d."
+ msgid_plural "Messages verified over the past %d days: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1855
+ #, c-format
+ msgid "Messages encrypted over the past %d day: %d."
+ msgid_plural "Messages encrypted over the past %d days: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1865
  #, c-format
- msgid "Encrypted %d message"
- msgid_plural "Encrypted %d messages"
+ msgid "Messages verified over the past %d month: %d."
+ msgid_plural "Messages verified over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1734
++#: g10/tofu.c:1871
  #, c-format
- msgid " over the past day."
- msgid_plural " over the past %d days."
+ msgid "Messages encrypted over the past %d month: %d."
+ msgid_plural "Messages encrypted over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1740
++#: g10/tofu.c:1881
  #, c-format
- msgid " over the past month."
- msgid_plural " over the past %d months."
+ msgid "Messages verified over the past %d year: %d."
+ msgid_plural "Messages verified over the past %d years: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1746
++#: g10/tofu.c:1887
  #, c-format
- msgid " over the past year."
- msgid_plural " over the past %d years."
+ msgid "Messages encrypted over the past %d year: %d."
+ msgid_plural "Messages encrypted over the past %d years: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1752
- msgid " in the past."
++#: g10/tofu.c:1895
+ #, c-format
+ msgid "Messages verified in the past: %d."
  msgstr ""
  
++#: g10/tofu.c:1899
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid "Messages encrypted in the past: %d."
+ msgstr "indiquer les fonctions de hachage"
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1767
++#: g10/tofu.c:1916
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1809
++#: g10/tofu.c:1958
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1815
++#: g10/tofu.c:1964
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1823
++#: g10/tofu.c:1972
  msgid "Defaulting to unknown."
  msgstr ""
  
- #: g10/tofu.c:1938 g10/tofu.c:2074
++#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
- #: g10/tofu.c:1994
++#: g10/tofu.c:2143
  #, fuzzy, c-format
  #| msgid "error writing key: %s\n"
  msgid "resetting keydb: %s\n"
  msgstr "erreur d'écriture la clef : %s\n"
  
- #: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
- #: g10/tofu.c:2425
++#: g10/tofu.c:2601
  #, fuzzy, c-format
  #| msgid "error setting OCSP target: %s\n"
- msgid "error setting TOFU binding's trust level to %s\n"
+ msgid "error setting TOFU binding's policy to %s\n"
  msgstr "erreur de configuration de la cible OCSP : %s\n"
  
- #: g10/tofu.c:2473
++#: g10/tofu.c:2794
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "error changing TOFU policy: %s\n"
  msgstr "erreur de création d'un tube : %s\n"
  
- #. TRANSLATORS: The tilde ('~') is used here to indicate a
- #. * non-breakable space
- #: g10/tofu.c:2574
++#: g10/tofu.c:2839
  #, c-format
- msgid "%d~year"
- msgid_plural "%d~years"
+ msgid "%lld~year"
+ msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2583
++#: g10/tofu.c:2844
  #, c-format
- msgid "%d~month"
- msgid_plural "%d~months"
+ msgid "%lld~month"
+ msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2592
++#: g10/tofu.c:2849
  #, c-format
- msgid "%d~day"
- msgid_plural "%d~days"
+ msgid "%lld~week"
+ msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2854
+ #, c-format
+ msgid "%lld~day"
+ msgid_plural "%lld~days"
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:2859
  #, c-format
- msgid "%d~hour"
- msgid_plural "%d~hours"
+ msgid "%lld~hour"
+ msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2610
++#: g10/tofu.c:2864
  #, c-format
- msgid "%d~minute"
- msgid_plural "%d~minutes"
+ msgid "%lld~minute"
+ msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2619
++#: g10/tofu.c:2866
  #, c-format
- msgid "%d~second"
- msgid_plural "%d~seconds"
+ msgid "%lld~second"
+ msgid_plural "%lld~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2802
++#: g10/tofu.c:3103
  #, c-format
- msgid "%s: "
+ msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:2806
++#: g10/tofu.c:3109
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
- msgid "Verified %ld signatures"
+ msgid "%s: Verified 0 signatures."
  msgstr "%d signatures supprimées\n"
  
- #: g10/tofu.c:2816
++#: g10/tofu.c:3117
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid "Verified %ld signature in the past %s"
- msgid_plural "Verified %ld signatures in the past %s"
+ msgid "%s: Verified %ld~signature in the past %s."
+ msgid_plural "%s: Verified %ld~signatures in the past %s."
  msgstr[0] "indiquer les fonctions de hachage"
  msgstr[1] "indiquer les fonctions de hachage"
  
- #: g10/tofu.c:2826
- #, fuzzy, c-format
++#: g10/tofu.c:3127
+ #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
- msgid ", and encrypted %ld messages"
+ msgid "Encrypted 0 messages."
  msgstr "chiffré avec %lu phrases secrètes\n"
  
- #: g10/tofu.c:2835
++#: g10/tofu.c:3135
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid ", and encrypted %ld message in the past %s"
- msgid_plural ", and encrypted %ld messages in the past %s"
+ msgid "Encrypted %ld~message in the past %s."
+ msgid_plural "Encrypted %ld~messages in the past %s."
  msgstr[0] "indiquer les fonctions de hachage"
  msgstr[1] "indiquer les fonctions de hachage"
  
- #: g10/tofu.c:2880
++#: g10/tofu.c:3146
+ #, fuzzy, c-format
+ #| msgid "validity: %s"
+ msgid "(policy: %s)"
+ msgstr "validité : %s"
+ 
++#: g10/tofu.c:3177
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2883
++#: g10/tofu.c:3180
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2887
++#: g10/tofu.c:3184
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2890
++#: g10/tofu.c:3187
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2919
++#: g10/tofu.c:3216
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7418,19 -5947,15 +7459,19 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
- #: g10/tofu.c:3480 g10/tofu.c:3572
++#: g10/tofu.c:3298 g10/tofu.c:3449 g10/tofu.c:3627 g10/tofu.c:3670
++#: g10/tofu.c:3784 g10/tofu.c:3859 g10/tofu.c:3894
  #, fuzzy, c-format
  #| msgid "error sending data: %s\n"
  msgid "error opening TOFU database: %s\n"
  msgstr "erreur d'envoi de données : %s\n"
  
- #: g10/tofu.c:3185
++#: g10/tofu.c:3482
  #, c-format
- msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
  msgstr ""
  
- #: g10/tofu.c:3515
++#: g10/tofu.c:3819
  #, fuzzy, c-format
  #| msgid "error writing public keyring '%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7461,75 -5981,61 +7502,75 @@@ msgstr "clef %s : pas de clef publiqu
  msgid "key %s marked as ultimately trusted\n"
  msgstr "clef %s marquée de confiance ultime.\n"
  
- #: g10/trustdb.c:341
++#: g10/trustdb.c:348
  #, 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:347
++#: g10/trustdb.c:354
  #, 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:422
++#: g10/trustdb.c:429
  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:431
++#: g10/trustdb.c:438
  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:468
++#: g10/trustdb.c:475
  #, 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:474
++#: g10/trustdb.c:481
  #, c-format
  msgid "using %s trust model\n"
  msgstr "utilisation du modèle de confiance %s\n"
  
- #: g10/trustdb.c:511
++#: g10/trustdb.c:518
  msgid "no need for a trustdb check\n"
  msgstr "inutile de vérifier la base de confiance\n"
  
- #: g10/trustdb.c:517 g10/trustdb.c:2160
++#: g10/trustdb.c:524 g10/trustdb.c:2187
  #, 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:526
++#: g10/trustdb.c:533
  #, 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:542
++#: g10/trustdb.c:549
  #, 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:749 g10/trustdb.c:1313
++#: g10/trustdb.c:756 g10/trustdb.c:1340
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "clef publique %s introuvable : %s\n"
  
- #: g10/trustdb.c:966
++#: g10/trustdb.c:973
  msgid "please do a --check-trustdb\n"
  msgstr "veuillez faire un --check-trustdb\n"
  
- #: g10/trustdb.c:971
++#: g10/trustdb.c:978
  msgid "checking the trustdb\n"
  msgstr "vérification de la base de confiance\n"
  
- #: g10/trustdb.c:1883
++#: g10/trustdb.c:1910
  #, fuzzy, c-format
  #| msgid "%lu keys processed so far\n"
  msgid "%d key processed"
@@@ -7537,7 -6043,6 +7578,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:1886
++#: g10/trustdb.c:1913
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7545,16 -6050,13 +7586,16 @@@ msgid_plural " (%d validity counts clea
  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:1956
++#: g10/trustdb.c:1983
  msgid "no ultimately trusted keys found\n"
  msgstr "aucune clef de confiance ultime n'a été trouvée\n"
  
- #: g10/trustdb.c:1970
++#: g10/trustdb.c:1997
  #, 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:2087
++#: g10/trustdb.c:2114
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7562,7 -6064,6 +7603,7 @@@ msgstr "
  "profondeur : %d  valables : %3d  signées : %3d\n"
  "     confiance : %d i., %d n.d., %d j., %d m., %d t., %d u.\n"
  
- #: g10/trustdb.c:2167
++#: g10/trustdb.c:2194
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr ""
@@@ -7677,19 -6157,14 +7718,19 @@@ msgstr "
  "Syntaxe : kbxutil [options] [fichiers]\n"
  "Afficher, exporter, importer les données de trousseau local\n"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3208
++#: scd/app-nks.c:718 scd/app-openpgp.c:3221
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr "le module RSA est manquant ou sa taille n'est pas de %d bits\n"
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3220
++#: scd/app-nks.c:726 scd/app-openpgp.c:3233
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr "l'exposant public RSA est manquant ou plus grand que %d bits\n"
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
- #: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
- #: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1965 scd/app-openpgp.c:1984
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2166 scd/app-openpgp.c:2430
++#: scd/app-openpgp.c:2477 scd/app-openpgp.c:2582 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "le rappel du code personnel a renvoyé une erreur : %s\n"
@@@ -7746,87 -6212,69 +7787,87 @@@ msgstr "
  "|P|Veuillez entrer le code de déblocage personnel (CDP) pour permettre à la "
  "clef de créer des signatures qualifiées."
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2511 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "erreur de lecture du nouveau code personnel : %s\n"
  
- #: scd/app-openpgp.c:806
++#: scd/app-openpgp.c:801
  #, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "impossible de stocker l'empreinte : %s\n"
  
- #: scd/app-openpgp.c:819
++#: scd/app-openpgp.c:814
  #, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "impossible de stocker la date de création : %s\n"
  
- #: scd/app-openpgp.c:1236
++#: scd/app-openpgp.c:1247
  msgid "response does not contain the RSA modulus\n"
  msgstr "la réponse ne contient pas le module RSA\n"
  
- #: scd/app-openpgp.c:1243
++#: scd/app-openpgp.c:1254
  msgid "response does not contain the RSA public exponent\n"
  msgstr "la réponse ne contient pas l'exposant public RSA\n"
  
- #: scd/app-openpgp.c:1353
++#: scd/app-openpgp.c:1364
  #, fuzzy
  #| msgid "response does not contain the EC public point\n"
  msgid "response does not contain the EC public key\n"
  msgstr "la réponse ne contient pas le point public EC\n"
  
- #: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:1464 scd/app-openpgp.c:3825
  msgid "response does not contain the public key data\n"
  msgstr "la réponse ne contient pas les données de clef publique\n"
  
- #: scd/app-openpgp.c:1551
++#: scd/app-openpgp.c:1564
  #, c-format
  msgid "reading public key failed: %s\n"
  msgstr "échec de lecture de clef publique : %s\n"
  
- #: scd/app-openpgp.c:1903
++#: scd/app-openpgp.c:1916
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr "utilisation du code personnel par défaut en tant que %s\n"
  
- #: scd/app-openpgp.c:1910
++#: scd/app-openpgp.c:1923
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  "impossible d'utiliser le code personnel par défaut en tant que %s :\n"
  "%s — désactivation de la prochaine utilisation par défaut\n"
  
- #: scd/app-openpgp.c:1925
++#: scd/app-openpgp.c:1938
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr "||Veuillez entrer le code personnel%%0A[signatures faites : %lu]"
  
- #: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
++#: scd/app-openpgp.c:1949 scd/app-openpgp.c:2424
  msgid "||Please enter the PIN"
  msgstr "||Veuillez entrer le code personnel"
  
- #: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2173 scd/app-openpgp.c:2437
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr ""
  "le code personnel pour CHV%d est trop court ; la taille minimale\n"
  "est %d\n"
  
- #: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
- #: scd/app-openpgp.c:4114
++#: scd/app-openpgp.c:2004 scd/app-openpgp.c:2043 scd/app-openpgp.c:2185
++#: scd/app-openpgp.c:4126
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "échec de vérification CHV%d : %s\n"
  
- #: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
++#: scd/app-openpgp.c:2072 scd/app-openpgp.c:2458 scd/app-openpgp.c:4556
  msgid "error retrieving CHV status from card\n"
  msgstr "erreur de récupération de l'état CHV de la carte\n"
  
- #: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
++#: scd/app-openpgp.c:2078 scd/app-openpgp.c:4565
  msgid "card is permanently locked!\n"
  msgstr "la carte est irrémédiablement bloquée.\n"
  
- #: scd/app-openpgp.c:2072
++#: scd/app-openpgp.c:2085
  #, fuzzy, c-format
  #| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@@ -7841,26 -6289,21 +7882,26 @@@ msgstr[1] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:2082
++#: scd/app-openpgp.c:2095
  #, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr ""
  "|A|Veuillez entrer le code personnel d'administration%%0A[tentatives "
  "restantes : %d]"
  
- #: scd/app-openpgp.c:2086
++#: scd/app-openpgp.c:2099
  msgid "|A|Please enter the Admin PIN"
  msgstr "|A|Veuillez entrer le code personnel d'administration"
  
- #: scd/app-openpgp.c:2107
++#: scd/app-openpgp.c:2120
  msgid "access to admin commands is not configured\n"
  msgstr "l'accès aux commandes d'administration n'est pas configuré\n"
  
- #: scd/app-openpgp.c:2460
++#: scd/app-openpgp.c:2473
  msgid "||Please enter the Reset Code for the card"
  msgstr "||Veuillez entrer le code de réinitialisation pour la carte"
  
- #: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
++#: scd/app-openpgp.c:2483 scd/app-openpgp.c:2537
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr ""
@@@ -7870,83 -6313,65 +7911,83 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2493
++#: scd/app-openpgp.c:2506
  msgid "|RN|New Reset Code"
  msgstr "|RN|Nouveau code de réinitialisation"
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|AN|New Admin PIN"
  msgstr "|AN|Nouveau code personnel d'administration"
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|N|New PIN"
  msgstr "|N|Nouveau code personnel"
  
- #: scd/app-openpgp.c:2565
++#: scd/app-openpgp.c:2578
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr ""
  "||Veuillez entrer le code personnel d'administration et le nouveau code "
  "personnel d'administration"
  
- #: scd/app-openpgp.c:2566
++#: scd/app-openpgp.c:2579
  msgid "||Please enter the PIN and New PIN"
  msgstr "||Veuillez entrer le code personnel et le nouveau code personnel"
  
- #: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
++#: scd/app-openpgp.c:2635 scd/app-openpgp.c:3885
  msgid "error reading application data\n"
  msgstr "erreur de lecture des données d'application\n"
  
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
++#: scd/app-openpgp.c:2641 scd/app-openpgp.c:3892
  msgid "error reading fingerprint DO\n"
  msgstr "erreur de lecture de l'empreinte DO\n"
  
- #: scd/app-openpgp.c:2638
++#: scd/app-openpgp.c:2651
  msgid "key already exists\n"
  msgstr "la clef existe déjà\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2655
  msgid "existing key will be replaced\n"
  msgstr "la clef existante sera remplacée\n"
  
- #: scd/app-openpgp.c:2644
++#: scd/app-openpgp.c:2657
  msgid "generating new key\n"
  msgstr "génération d'une nouvelle clef\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2659
  msgid "writing new key\n"
  msgstr "écriture d'une nouvelle clef\n"
  
- #: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
++#: scd/app-openpgp.c:3201 scd/app-openpgp.c:3553
  msgid "creation timestamp missing\n"
  msgstr "la date de création est manquant\n"
  
- #: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
++#: scd/app-openpgp.c:3243 scd/app-openpgp.c:3251
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  "le nombre premier RSA %s est manquant ou sa taille n'est pas de\n"
  "%d bits\n"
  
- #: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
++#: scd/app-openpgp.c:3384 scd/app-openpgp.c:3647
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "impossible de stocker la clef : %s\n"
  
- #: scd/app-openpgp.c:3534
++#: scd/app-openpgp.c:3547
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "URI non pris en charge"
  
- #: scd/app-openpgp.c:3790
++#: scd/app-openpgp.c:3802
  msgid "please wait while key is being generated ...\n"
  msgstr "veuillez patienter pendant la génération de la clef…\n"
  
- #: scd/app-openpgp.c:3798
++#: scd/app-openpgp.c:3810
  msgid "generating key failed\n"
  msgstr "échec de génération de la clef\n"
  
- #: scd/app-openpgp.c:3804
++#: scd/app-openpgp.c:3816
  #, fuzzy, c-format
  #| msgid "key generation completed (%d seconds)\n"
  msgid "key generation completed (%d second)\n"
@@@ -7954,32 -6379,26 +7995,32 @@@ msgid_plural "key generation completed 
  msgstr[0] "la génération de clef est terminé (%d secondes)\n"
  msgstr[1] "la génération de clef est terminé (%d secondes)\n"
  
- #: scd/app-openpgp.c:3838
++#: scd/app-openpgp.c:3850
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "structure de carte OpenPGP incorrecte (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:3900
  msgid "fingerprint on card does not match requested one\n"
  msgstr "l'empreinte de la carte ne correspond pas à celle demandée\n"
  
- #: scd/app-openpgp.c:4004
++#: scd/app-openpgp.c:4016
  #, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "la carte ne gère pas l'algorithme de hachage %s\n"
  
- #: scd/app-openpgp.c:4089
++#: scd/app-openpgp.c:4101
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "signatures créées jusqu'à présent : %lu\n"
  
- #: scd/app-openpgp.c:4551
++#: scd/app-openpgp.c:4570
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  "la vérification du code personnel d'administration est actuellement\n"
  "interdite avec cette commande\n"
  
- #: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
++#: scd/app-openpgp.c:4871 scd/app-openpgp.c:4882
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr ""
@@@ -8001,7 -6417,6 +8042,7 @@@ msgstr "|N|Nouveau code personnel initi
  msgid "run in multi server mode (foreground)"
  msgstr "exécuter en mode multiserveur (premier plan)"
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|NIVEAU|définir le niveau de débogage à NIVEAU"
  
@@@ -8041,11 -6447,9 +8082,11 @@@ msgstr "refus d'utiliser les commandes 
  msgid "use variable length input for pinpad"
  msgstr "utiliser une entrée de taille variable pour le pavé numérique"
  
- #: scd/scdaemon.c:287
++#: scd/scdaemon.c:286
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Utilisation : @SCDAEMON@ [options] (-h pour l'aide)"
  
- #: scd/scdaemon.c:289
++#: scd/scdaemon.c:288
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
@@@ -8053,18 -6457,15 +8094,18 @@@ msgstr "
  "Syntaxe : scdaemon [options] [commande [arguments]]\n"
  "Démon de carte à puce pour @GNUPG@\n"
  
- #: scd/scdaemon.c:786
++#: scd/scdaemon.c:784
  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:1160 dirmngr/dirmngr.c:1900
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1904
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "gestionnaire pour le descripteur %d démarré\n"
  
- #: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
++#: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1909
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "gestionnaire pour le descripteur %d terminé\n"
@@@ -8144,9 -6529,6 +8185,9 @@@ msgstr "nombre de certificats correspon
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "échec de recherche de clef seulement dans le cache du dirmngr : %s\n"
  
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
 +#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  msgid "failed to allocate keyDB handle\n"
  msgstr "impossible d'allouer la gestion de base de clefs\n"
  
@@@ -8632,11 -6912,9 +8673,11 @@@ msgstr "
  msgid "resource problem: out of core\n"
  msgstr "problème de ressources : hors limite\n"
  
- #: sm/decrypt.c:330
++#: sm/decrypt.c:332
  msgid "(this is the RC2 algorithm)\n"
  msgstr "(c'est l'algorithme RC2)\n"
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:334
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr "(ça ne ressemble pas à un message chiffré)\n"
  
@@@ -8677,115 -6947,87 +8718,115 @@@ msgstr "afficher les clefs externes
  msgid "list certificate chain"
  msgstr "afficher la chaîne de certificats"
  
- #: sm/gpgsm.c:218
++#: sm/gpgsm.c:219
  msgid "import certificates"
  msgstr "importer les certificats"
  
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
  msgid "export certificates"
  msgstr "exporter les certificats"
  
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:228
  msgid "register a smartcard"
  msgstr "enregistrer une carte à puce"
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:231
  msgid "pass a command to the dirmngr"
  msgstr "passer une commande au dirmngr"
  
- #: sm/gpgsm.c:232
++#: sm/gpgsm.c:233
  msgid "invoke gpg-protect-tool"
  msgstr "appeler gpg-protect-tool"
  
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:250
  msgid "create base-64 encoded output"
  msgstr "créer une sortie encodée en base-64"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in PEM format"
  msgstr "entrée supposée au format PEM"
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in base-64 format"
  msgstr "entrée supposée au format base-64"
  
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:262
  msgid "assume input is in binary format"
  msgstr "entrée supposée au format binaire"
  
- #: sm/gpgsm.c:267
++#: sm/gpgsm.c:269
  msgid "never consult a CRL"
  msgstr "ne pas consulter liste de révocations de cert."
  
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:279
  msgid "check validity using OCSP"
  msgstr "vérifier la validité avec OCSP"
  
- #: sm/gpgsm.c:282
++#: sm/gpgsm.c:284
  msgid "|N|number of certificates to include"
  msgstr "|N|nombre de certificats à inclure"
  
- #: sm/gpgsm.c:285
++#: sm/gpgsm.c:287
  msgid "|FILE|take policy information from FILE"
  msgstr "|FICHIER|prendre renseignements de politique du FICHIER"
  
- #: sm/gpgsm.c:288
++#: sm/gpgsm.c:290
  msgid "do not check certificate policies"
  msgstr "ne pas vérifier les politiques de certificat"
  
- #: sm/gpgsm.c:292
++#: sm/gpgsm.c:294
  msgid "fetch missing issuer certificates"
  msgstr "récupérer certificats d'émetteur manquants"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "don't use the terminal at all"
  msgstr "ne pas utiliser du tout le terminal"
  
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:307
  msgid "|FILE|write a server mode log to FILE"
  msgstr "|FICHIER|écrire un journal serveur dans le FICHIER"
  
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:312
  msgid "|FILE|write an audit log to FILE"
  msgstr "|FICHIER|écrire un journal d'audit dans le FICHIER"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "batch mode: never ask"
  msgstr "mode automatique : aucune question"
  
- #: sm/gpgsm.c:314
++#: sm/gpgsm.c:316
  msgid "assume yes on most questions"
  msgstr "oui comme réponse à la plupart des questions"
  
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:317
  msgid "assume no on most questions"
  msgstr "non comme réponse à la plupart des questions"
  
- #: sm/gpgsm.c:318
++#: sm/gpgsm.c:320
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "|FICHIER|ajouter le trousseau à la liste de trousseaux"
  
- #: sm/gpgsm.c:321
++#: sm/gpgsm.c:323
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|IDENTITÉ| utiliser IDENTITÉ comme clef secr. par défaut"
  
- #: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|SPEC|utiliser ce serveur pour rechercher les clefs"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
  
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:352
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|NOM|utiliser l'algorithme de hachage NOM"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:559
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
  msgstr "Utilisation : @GPGSM@ [options] [fichiers] (-h pour l'aide)"
  
- #: sm/gpgsm.c:570
++#: sm/gpgsm.c:562
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
  "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@@ -8795,46 -7037,37 +8836,46 @@@ 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:774
++#: sm/gpgsm.c:766
  #, 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:785
++#: sm/gpgsm.c:777
  #, c-format
  msgid "unknown validation model '%s'\n"
  msgstr "modèle de validation « %s » inconnu\n"
  
- #: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
  #, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "%s : %u : aucun nom d'hôte donné\n"
  
- #: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr "%s : %u : mot de passe donné sans utilisateur\n"
  
- #: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
  #, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr "%s : %u : ignorer cette ligne\n"
  
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1427
  msgid "could not parse keyserver\n"
  msgstr "impossible d'analyser le serveur de clefs\n"
  
- #: sm/gpgsm.c:1636
++#: sm/gpgsm.c:1630
  #, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "importation des certificats commun « %s »\n"
  
- #: sm/gpgsm.c:1677
++#: sm/gpgsm.c:1671
  #, c-format
  msgid "can't sign using '%s': %s\n"
  msgstr "impossible de signer en utilisant « %s » : %s\n"
  
- #: sm/gpgsm.c:2033
++#: sm/gpgsm.c:2028
  msgid "invalid command (there is no implicit command)\n"
  msgstr "commande incorrecte (il n'y a pas de commande implicite)\n"
  
@@@ -9641,8 -7723,6 +9682,8 @@@ msgstr "
  "accès à la liste de révocations de certificat impossible car %s est "
  "désactivé\n"
  
 +#: dirmngr/crlfetch.c:223 dirmngr/ldap-wrapper-ce.c:488
- #: dirmngr/ldap-wrapper.c:742 dirmngr/misc.c:563
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:563
  #, c-format
  msgid "error initializing reader object: %s\n"
  msgstr "erreur d'initialisation de l'objet lecteur : %s\n"
@@@ -9818,120 -7862,92 +9859,120 @@@ msgstr "nom de fichier absolu attendu\n
  msgid "looking up '%s'\n"
  msgstr "recherche de « %s »\n"
  
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:160
  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:158
++#: dirmngr/dirmngr.c:161
  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:159
++#: dirmngr/dirmngr.c:162
  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:160
++#: dirmngr/dirmngr.c:163
  msgid "shutdown the dirmngr"
  msgstr "arrêter le dirmngr"
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:164
  msgid "flush the cache"
  msgstr "vider le cache"
  
- #: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
- #: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
++#: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|FICHIER|écrire les journaux serveur dans le FICHIER"
  
- #: dirmngr/dirmngr.c:177
++#: dirmngr/dirmngr.c:180
  msgid "run without asking a user"
  msgstr "exécuter sans demander à l'utilisateur"
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:181
  msgid "force loading of outdated CRLs"
  msgstr "forcer le chargement des listes de révocations de certificat obsolètes"
  
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:182
  msgid "allow sending OCSP requests"
  msgstr "permettre l'envoi de requêtes OCSP"
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:184
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:185
  msgid "inhibit the use of HTTP"
  msgstr "interdire l'utilisation d'HTTP"
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:186
  msgid "inhibit the use of LDAP"
  msgstr "interdire l'utilisation de LDAP"
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:188
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  "ignorer les points de distribution de liste de révocations de certificat en "
  "HTTP"
  
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  "ignorer les points de distribution de liste de révocations de certificat en "
  "LDAP"
  
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:192
  msgid "ignore certificate contained OCSP service URLs"
  msgstr "ignorer les URL de service OCSP contenues dans le certificat"
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr "|URL|rediriger toutes les requêtes HTTP vers l'URL"
  
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
  msgid "|HOST|use HOST for LDAP queries"
  msgstr "|HÔTE|utiliser l'HÔTE pour les requêtes LDAP"
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr "ne pas utiliser d'hôtes de repli avec --ldap-proxy"
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:202
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FICHIER|lire la liste de serveurs LDAP depuis le FICHIER"
  
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
  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:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr "|N|définir le temps d'expiration de LDAP à N secondes"
  
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:210
  msgid "|URL|use OCSP responder at URL"
  msgstr "|URL|utiliser le répondeur OCSP à l'URL"
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:212
  msgid "|FPR|OCSP response signed by FPR"
  msgstr "|EMPR|réponse OCSP signée par EMPR"
  
- #: dirmngr/dirmngr.c:215
++#: 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:220
++#: dirmngr/dirmngr.c:223
  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:222
++#: dirmngr/dirmngr.c:225
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:240
++#: dirmngr/dirmngr.c:246
  msgid ""
  "@\n"
  "(See the \"info\" manual for a complete listing of all commands and "
@@@ -9941,11 -7957,9 +9982,11 @@@ msgstr "
  "(Consultez le manuel « info » pour obtenir une liste complète des commandes\n"
  "et options)\n"
  
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:361
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Utilisation : @DIRMNGR@ [options] (-h pour l'aide)"
  
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:363
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9954,79 -7968,62 +9995,79 @@@ msgstr "
  "Serveur de clefs, liste de révocations de certificat et accès OCSP pour "
  "@GNUPG@\n"
  
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:443
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr "les niveaux de débogage possibles sont : %s\n"
  
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
- #: tools/gpgconf.c:648
++#: dirmngr/dirmngr.c:496 tools/gpgconf.c:550 tools/gpgconf.c:585
++#: tools/gpgconf.c:656
  #, c-format
  msgid "usage: %s [options] "
  msgstr "utilisation : %s [options] "
  
- #: dirmngr/dirmngr.c:1062
++#: dirmngr/dirmngr.c:1074
  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:1301 dirmngr/server.c:1585
++#: dirmngr/dirmngr.c:1300 dirmngr/server.c:1585
  #, 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:1307 dirmngr/server.c:1591
++#: dirmngr/dirmngr.c:1306 dirmngr/server.c:1591
  #, 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:1484
++#: dirmngr/dirmngr.c:1487
  #, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "%s : %u : ligne trop longue — ignorée\n"
  
- #: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
++#: dirmngr/dirmngr.c:1542 dirmngr/dirmngr.c:1626
  #, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "%s : %u : empreinte incorrecte détectée\n"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
++#: dirmngr/dirmngr.c:1578 dirmngr/dirmngr.c:1604 tools/gpgconf-comp.c:4032
  #, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "%s : %u : erreur de lecture : %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1633
  #, 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:1697
++#: dirmngr/dirmngr.c:1700
  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:1734
++#: dirmngr/dirmngr.c:1738
  msgid "SIGUSR2 received - no action defined\n"
  msgstr "SIGUSR2 reçu — aucune action définie\n"
  
- #: dirmngr/dirmngr.c:1739
++#: dirmngr/dirmngr.c:1743
  msgid "SIGTERM received - shutting down ...\n"
  msgstr "SIGTERM reçu — arrêt…\n"
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1745
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr "SIGTERM reçu — encore %d connexions actives\n"
  
- #: dirmngr/dirmngr.c:1746
++#: dirmngr/dirmngr.c:1750
  msgid "shutdown forced\n"
  msgstr "arrêt forcé\n"
  
- #: dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1758
  msgid "SIGINT received - immediate shutdown\n"
  msgstr "SIGINT reçu — arrêt immédiat\n"
  
- #: dirmngr/dirmngr.c:1761
++#: dirmngr/dirmngr.c:1765
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr "signal %d reçu — aucune action définie\n"
@@@ -10493,32 -8391,26 +10534,32 @@@ msgstr "échec de fetch_next_cert : %s
  msgid "max_replies %d exceeded\n"
  msgstr "max_replies %d dépassé\n"
  
- #: dirmngr/server.c:2463
++#: dirmngr/server.c:2469
  #, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "impossible d'allouer une structure de contrôle : %s\n"
  
- #: dirmngr/server.c:2474
++#: dirmngr/server.c:2480
  #, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "échec d'allocation du contexte Assuan : %s\n"
  
- #: dirmngr/server.c:2495
++#: dirmngr/server.c:2501
  #, c-format
  msgid "failed to initialize the server: %s\n"
  msgstr "impossible d'initialiser le serveur : %s\n"
  
- #: dirmngr/server.c:2503
++#: dirmngr/server.c:2509
  #, 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:2534
++#: dirmngr/server.c:2540
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr "problème d'accept_assuan : %s\n"
  
- #: dirmngr/server.c:2553
++#: dirmngr/server.c:2559
  #, c-format
  msgid "Assuan processing failed: %s\n"
  msgstr "problème de traitement Assuan : %s\n"
@@@ -10567,7 -8450,6 +10608,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:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:167
  msgid "quiet"
  msgstr "silencieux"
  
@@@ -10658,22 -8520,15 +10699,22 @@@ 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:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
- #: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
++#: tools/gpgconf-comp.c:766 tools/gpgconf-comp.c:865
  msgid "Options controlling the diagnostic output"
  msgstr "Options contrôlant la sortie de diagnostique"
  
 +#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
- #: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
++#: tools/gpgconf-comp.c:779 tools/gpgconf-comp.c:888
  msgid "Options controlling the configuration"
  msgstr "Options contrôlant la configuration"
  
- #: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
- #: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
++#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:723
++#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:901
  msgid "Options useful for debugging"
  msgstr "Options pratiques pour le débogage"
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
  msgid "Options controlling the security"
  msgstr "Options contrôlant la sécurité"
  
@@@ -10727,11 -8571,9 +10768,11 @@@ msgstr "ne pas autoriser la réutilisat
  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:698 tools/gpgconf-comp.c:775
++#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
  msgid "|NAME|use NAME as default secret key"
  msgstr "|NOM|utiliser le NOM comme clef secrète par défaut"
  
- #: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
++#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:784
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NOM|chiffrer aussi pour l'identité NOM"
  
@@@ -10739,182 -8580,156 +10780,200 @@@
  msgid "|SPEC|set up email aliases"
  msgstr "|SPEC|configurer les alias d'adresse"
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
++#: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
  msgid "Configuration for Keyservers"
  msgstr "Configuration pour les serveurs de clefs"
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
++#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
  msgid "|URL|use keyserver at URL"
  msgstr "|URL|utiliser le serveur de clefs à l'URL"
  
- #: tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:741
  msgid "allow PKA lookups (DNS requests)"
  msgstr "permettre les recherches PKA (requêtes DNS)"
  
- #: tools/gpgconf-comp.c:738
++#: tools/gpgconf-comp.c:744
  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:787
++#: tools/gpgconf-comp.c:793
  msgid "disable all access to the dirmngr"
  msgstr "désactiver tous les accès au dirmngr"
  
- #: tools/gpgconf-comp.c:790
++#: tools/gpgconf-comp.c:796
  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:820
++#: tools/gpgconf-comp.c:829
  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:869
++#: tools/gpgconf-comp.c:878
  msgid "Options controlling the format of the output"
  msgstr "Options contrôlant le format de sortie"
  
- #: tools/gpgconf-comp.c:905
++#: tools/gpgconf-comp.c:920
  msgid "Options controlling the interactivity and enforcement"
  msgstr "Options contrôlant l'interactivité et la mise en application"
  
- #: tools/gpgconf-comp.c:918
++#: tools/gpgconf-comp.c:933
  #, fuzzy
  #| msgid "Options controlling the security"
  msgid "Options controlling the use of Tor"
  msgstr "Options contrôlant la sécurité"
  
- #: tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:947
  msgid "Configuration for HTTP servers"
  msgstr "Configuration pour les serveurs HTTP"
  
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:958
  msgid "use system's HTTP proxy setting"
  msgstr "utiliser la configuration de serveur mandataire (proxy) du système"
  
- #: tools/gpgconf-comp.c:948
++#: tools/gpgconf-comp.c:963
  msgid "Configuration of LDAP servers to use"
  msgstr "Configuration des serveurs LDAP à utiliser"
  
- #: tools/gpgconf-comp.c:977
++#: tools/gpgconf-comp.c:992
  msgid "LDAP server list"
  msgstr "liste de serveurs LDAP"
  
- #: tools/gpgconf-comp.c:985
++#: tools/gpgconf-comp.c:1000
  msgid "Configuration for OCSP"
  msgstr "Configuration pour OCSP"
  
- #: tools/gpgconf-comp.c:1066
++#: tools/gpgconf-comp.c:1081
  #, fuzzy
  #| msgid "GPG for OpenPGP"
  msgid "OpenPGP"
  msgstr "GPG pour OpenPGP"
  
- #: tools/gpgconf-comp.c:1067
++#: tools/gpgconf-comp.c:1082
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1083
  #, fuzzy
  #| msgid "Smartcard Daemon"
  msgid "Smartcards"
  msgstr "Démon de carte à puce"
  
- #: tools/gpgconf-comp.c:1069
++#: tools/gpgconf-comp.c:1084
  #, fuzzy
  #| msgid "GPG for S/MIME"
  msgid "S/MIME"
  msgstr "GPG pour S/MIME"
  
- #: tools/gpgconf-comp.c:1070
++#: tools/gpgconf-comp.c:1085
  #, fuzzy
  #| msgid "network error"
  msgid "Network"
  msgstr "erreur de réseau"
  
- #: tools/gpgconf-comp.c:1071
++#: tools/gpgconf-comp.c:1086
  #, fuzzy
  #| msgid "PIN and Passphrase Entry"
  msgid "Passphrase Entry"
  msgstr "Entrée de code personnel et de phrase secrète"
  
- #: tools/gpgconf-comp.c:1225
++#: tools/gpgconf-comp.c:1240
  msgid "Component not suitable for launching"
  msgstr "Composant non convenable pour le lancement"
  
- #: tools/gpgconf-comp.c:3283
++#: tools/gpgconf-comp.c:3311
  #, c-format
  msgid "External verification of component %s failed"
  msgstr "Échec de vérification externe du composant %s"
  
- #: tools/gpgconf-comp.c:3434
++#: tools/gpgconf-comp.c:3462
  msgid "Note that group specifications are ignored\n"
  msgstr "Remarquez que les spécifications de groupe sont ignorées\n"
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf-comp.c:4036
+ #, 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:4038
+ #, 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:73
  msgid "list all components"
  msgstr "afficher tous les composants"
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "check all programs"
  msgstr "vérifier tous les programmes"
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|list options"
  msgstr "|COMPOSANT|afficher les options"
  
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
  msgid "|COMPONENT|change options"
  msgstr "|COMPOSANT|modifier les options"
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "|COMPONENT|check options"
  msgstr "|COMPOSANT|vérifier les options"
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "apply global default values"
  msgstr "appliquer les valeurs par défaut globales"
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
+ #, 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:83
  msgid "get the configuration directories for @GPGCONF@"
  msgstr "aff. répertoires de configuration pour @GPGCONF@"
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:85
  msgid "list global configuration file"
  msgstr "afficher le fichier de configuration globale"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  msgid "check global configuration file"
  msgstr "vérifier le fichier de configuration globale"
  
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:89
  #, fuzzy
  #| msgid "update the trust database"
  msgid "query the software version database"
  msgstr "mettre la base de confiance à jour"
  
- #: tools/gpgconf.c:86
++#: tools/gpgconf.c:90
  msgid "reload all or a given component"
  msgstr "recharger tous les composants ou celui donné"
  
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:91
  msgid "launch a given component"
  msgstr "lancer un composant donné"
  
- #: tools/gpgconf.c:88
++#: tools/gpgconf.c:92
  msgid "kill a given component"
  msgstr "tuer un composant donné"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "use as output file"
  msgstr "utiliser comme fichier de sortie"
  
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:102
  msgid "activate changes at runtime, if possible"
  msgstr "activer modif. pendant l'exécution si possible"
  
- #: tools/gpgconf.c:122
++#: tools/gpgconf.c:127
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "Utilisation : @GPGCONF@ [options] (-h pour l'aide)"
  
- #: tools/gpgconf.c:125
++#: tools/gpgconf.c:130
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10922,15 -8737,12 +10981,15 @@@ msgstr "
  "Syntaxe : @GPGCONF@ [options]\n"
  "Gérer les options de configuration pour les outils du système @GNUPG@\n"
  
- #: tools/gpgconf.c:545 tools/gpgconf.c:579
++#: tools/gpgconf.c:552 tools/gpgconf.c:587
  msgid "Need one component argument"
  msgstr "Un argument de composant nécessaire"
  
- #: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
++#: tools/gpgconf.c:561 tools/gpgconf.c:599 tools/gpgconf.c:632
  msgid "Component not found"
  msgstr "Composant introuvable"
  
- #: tools/gpgconf.c:650
++#: tools/gpgconf.c:658
  msgid "No argument allowed"
  msgstr "Aucun argument permis"
  
diff --cc po/gl.po
index 01f51c7,ff7663a..1208429
--- a/po/gl.po
+++ b/po/gl.po
@@@ -6,7 -6,6 +6,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg 1.2.4\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-11-18 16:54+0100\n"
++"POT-Creation-Date: 2016-12-20 11:28+0100\n"
  "PO-Revision-Date: 2003-12-04 11:39+0100\n"
  "Last-Translator: Jacobo Tarrio <jtarrio at trasno.net>\n"
  "Language-Team: Galician <gpul-traduccion at ceu.fi.udc.es>\n"
@@@ -156,25 -127,11 +156,25 @@@ msgstr "contrasinal erróneo
  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:838 common/dotlock.c:839 g10/card-util.c:839
- #: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1306 g10/keygen.c:4577
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
++#: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't create '%s': %s\n"
  msgstr "non se pode crear `%s': %s\n"
  
 +#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
- #: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1307
++#: g10/import.c:305 g10/import.c:448 g10/import.c:621 g10/keygen.c:3681
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
- #: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
- #: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:825 g10/sign.c:1025
++#: g10/sign.c:1130 g10/sign.c:1275 g10/tdbdump.c:143 g10/tdbdump.c:151
++#: g10/tdbio.c:720 g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161
++#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
++#: dirmngr/certcache.c:368 dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1564
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
@@@ -237,11 -183,9 +237,11 @@@ msgstr "Por favor, introduza o contrasi
  msgid "failed to create stream from socket: %s\n"
  msgstr "%s: fallo ao crear unha táboa hash: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1100
++#: agent/divert-scd.c:92 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1101
++#: agent/divert-scd.c:93 g10/call-agent.c:1102
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  
@@@ -385,48 -303,33 +385,48 @@@ msgstr "
  "Opcións:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
  #, fuzzy
  #| msgid "Key is superseded"
  msgid "run in supervised mode"
  msgstr "A chave é obsoleta"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:170 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "lareto"
  
 +#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "ser un pouquiño máis calado"
  
- #: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
  msgid "csh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
- #: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
++#: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
  #, fuzzy
  msgid "|FILE|read options from FILE"
  msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
  
- #: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:177
  msgid "do not detach from the console"
  msgstr ""
  
@@@ -511,164 -397,122 +511,164 @@@ msgstr "non está soportado
  #. 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:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:481 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1025 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:358
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:124 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  #, fuzzy
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr ""
  "Por favor, informe dos erros no programa a <gnupg-bugs at gnu.org>,\n"
  "e dos erros na traducción a <proxecto at trasno.net>.\n"
  
- #: agent/gpg-agent.c:491
++#: agent/gpg-agent.c:490
  #, fuzzy
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
  
- #: agent/gpg-agent.c:493
++#: agent/gpg-agent.c:492
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:537 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:442
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:793
++#: agent/gpg-agent.c:1082 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:812
  #, 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"
  
- #: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
- #: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1093 agent/gpg-agent.c:1935 g10/gpg.c:2510
++#: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:817
++#: dirmngr/dirmngr.c:1670 tools/symcryptrun.c:932
  #, fuzzy, c-format
  #| msgid "option file `%s': %s\n"
  msgid "option file '%s': %s\n"
  msgstr "ficheiro de opcións `%s': %s\n"
  
- #: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:806
++#: agent/gpg-agent.c:1101 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:825
  #, 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:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
- #: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
++#: agent/gpg-agent.c:1223 g10/gpg.c:3643 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:936 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:527
  #, 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:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
++#: agent/gpg-agent.c:2080 scd/scdaemon.c:1073 dirmngr/dirmngr.c:1081
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
  msgstr "non foi posible crear %s: %s\n"
  
- #: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
++#: agent/gpg-agent.c:2097 scd/scdaemon.c:1086 dirmngr/dirmngr.c:1094
  #, fuzzy, c-format
  msgid "socket name '%s' is too long\n"
  msgstr "Revocación de certificado válida"
  
- #: agent/gpg-agent.c:2134
++#: agent/gpg-agent.c:2135
  #, fuzzy
  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:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
++#: agent/gpg-agent.c:2145 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1126
  #, fuzzy
  msgid "error getting nonce for the socket\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
++#: agent/gpg-agent.c:2150 scd/scdaemon.c:1113 dirmngr/dirmngr.c:1129
  #, fuzzy, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "erro ao enviar a `%s': %s\n"
  
- #: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
- #: dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2160 agent/gpg-agent.c:2197 scd/scdaemon.c:1121
++#: dirmngr/dirmngr.c:1138
  #, fuzzy, c-format
  msgid "can't set permissions of '%s': %s\n"
  msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
  
- #: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:2165 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1143
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
  msgstr "a actualización fallou: %s\n"
  
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
++#: agent/gpg-agent.c:2172 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1149
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
  msgstr "gravando a chave secreta en `%s'\n"
  
- #: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: agent/gpg-agent.c:2191 agent/gpg-agent.c:2234 g10/exec.c:199
 +#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, 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:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: agent/gpg-agent.c:2194 agent/gpg-agent.c:2239 g10/openfile.c:491
 +#: g10/openfile.c:520 sm/keydb.c:103
  #, fuzzy, c-format
  msgid "directory '%s' created\n"
  msgstr "%s: directorio creado\n"
  
- #: agent/gpg-agent.c:2244
++#: agent/gpg-agent.c:2245
  #, 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:2248
++#: agent/gpg-agent.c:2249
  #, 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:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
++#: agent/gpg-agent.c:2392 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1871
  #, fuzzy, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "erro lendo `%s': %s\n"
  
- #: agent/gpg-agent.c:2598
++#: agent/gpg-agent.c:2599
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2603
++#: agent/gpg-agent.c:2604
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2678
++#: agent/gpg-agent.c:2679
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2683
++#: agent/gpg-agent.c:2684
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
++#: agent/gpg-agent.c:2881 scd/scdaemon.c:1272 dirmngr/dirmngr.c:2075
  #, fuzzy, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "o segredo da actualización fallou: %s\n"
  
- #: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2954 scd/scdaemon.c:1321
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
  msgstr "\t%lu chaves omitidas\n"
  
- #: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
++#: agent/gpg-agent.c:3092 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  #, fuzzy
  msgid "no gpg-agent running in this session\n"
  msgstr "gpg-agent non está dispoñible nesta sesión\n"
@@@ -684,8 -526,6 +684,8 @@@ msgid "
  "Password cache maintenance\n"
  msgstr ""
  
- #: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
++#: agent/protect-tool.c:106 g10/gpg.c:424 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:153 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -693,9 -533,6 +693,9 @@@ msgstr "
  "@Comandos:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
- #: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:92 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:168 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -749,8 -578,6 +749,8 @@@ 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:362 dirmngr/dirmngr.c:1469
- #: tools/gpgconf.c:323
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1472
++#: tools/gpgconf.c:328
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
  msgstr "erro lendo `%s': %s\n"
@@@ -920,9 -718,6 +920,9 @@@ msgstr "o algoritmo de protección %d%
  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:438
 +#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
- #: dirmngr/ldap-wrapper.c:710
++#: dirmngr/ldap-wrapper.c:711
  #, fuzzy, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
@@@ -934,8 -726,6 +934,8 @@@
  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:848 dirmngr/dirmngr.c:1155
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1167
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
  msgstr "erro lendo `%s': %s\n"
@@@ -982,27 -763,22 +982,27 @@@ msgstr "non se puido conectar a `%s': %
  msgid "problem setting the gpg-agent options\n"
  msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
  
- #: common/sysutils.c:144
++#: common/sysutils.c:148
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "non é posible deshabilita-los volcados de 'core': %s\n"
  
- #: common/sysutils.c:239
++#: common/sysutils.c:250
  #, fuzzy, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
  
- #: common/sysutils.c:271
++#: common/sysutils.c:282
  #, fuzzy, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
  
- #: common/sysutils.c:659
++#: common/sysutils.c:693
  #, fuzzy, c-format
  msgid "waiting for file '%s' to become accessible ...\n"
  msgstr "a actualización fallou: %s\n"
  
- #: common/sysutils.c:685
++#: common/sysutils.c:719
  #, fuzzy, c-format
  msgid "renaming '%s' to '%s' failed: %s\n"
  msgstr "non se puido poñe-la armadura: %s\n"
@@@ -1078,7 -839,6 +1078,7 @@@ msgstr "
  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:554
++#: common/miscellaneous.c:556
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
@@@ -1195,8 -932,6 +1195,8 @@@ msgstr "%s: chaveiro creado\n
  msgid "algorithm: %s"
  msgstr "armadura: %s\n"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3098
++#: scd/app-openpgp.c:3111
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
@@@ -1410,7 -1103,6 +1410,7 @@@ msgstr "
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr ""
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1173
++#: common/argparse.c:401 dirmngr/dirmngr.c:1185
  #, fuzzy
  msgid "out of core\n"
  msgstr "non procesado"
@@@ -1469,8 -1150,6 +1469,8 @@@ msgstr "non se atopou a chave pública 
  msgid "waiting for lock %s...\n"
  msgstr "gravando a chave secreta en `%s'\n"
  
- #: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
- #: dirmngr/dirmngr.c:715
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:725
++#: dirmngr/dirmngr.c:734
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
@@@ -1510,7 -1181,6 +1510,7 @@@ msgstr "armadura inesperada:
  msgid "invalid dash escaped line: "
  msgstr "liña escapada cunha barra non válida: "
  
- #: g10/armor.c:873 g10/armor.c:1490
++#: g10/armor.c:873 g10/armor.c:1493
  #, fuzzy, c-format
  msgid "invalid radix64 character %02X skipped\n"
  msgstr "carácter radix64 non válido %02x omitido\n"
@@@ -1527,7 -1194,6 +1527,7 @@@ msgstr "fin de ficheiro prematura (no C
  msgid "malformed CRC\n"
  msgstr "CRC mal formado\n"
  
- #: g10/armor.c:962 g10/armor.c:1527
++#: g10/armor.c:962 g10/armor.c:1530
  #, fuzzy, c-format
  msgid "CRC error; %06lX - %06lX\n"
  msgstr "Erro de CRC; %06lx - %06lx\n"
@@@ -1541,16 -1205,13 +1541,16 @@@ msgstr "fin de ficheiro prematura (nas 
  msgid "error in trailer line\n"
  msgstr "error nunha liña adicional\n"
  
- #: g10/armor.c:1303
++#: g10/armor.c:1306
  msgid "no valid OpenPGP data found.\n"
  msgstr "non se atoparon datos OpenPGP válidos.\n"
  
- #: g10/armor.c:1308
++#: g10/armor.c:1311
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
  msgstr "armadura incorrecta: liña máis longa ca %d caracteres\n"
  
- #: g10/armor.c:1312
++#: g10/armor.c:1315
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr ""
@@@ -1639,8 -1285,6 +1639,8 @@@ msgstr "a chave secreta non está dispo
  msgid "OpenPGP card no. %s detected\n"
  msgstr ""
  
- #: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
- #: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2030
++#: g10/keygen.c:4087 g10/revoke.c:215 g10/revoke.c:618
  #, fuzzy
  msgid "can't do this in batch mode\n"
  msgstr "non se pode facer iso no modo por lotes\n"
@@@ -1650,15 -1293,10 +1650,15 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "Non se admite este comando no modo %s.\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2454
++#: g10/card-util.c:109 scd/app-openpgp.c:2467
  #, fuzzy
  msgid "Reset Code not or not anymore available\n"
  msgstr "hai partes da chave secreta non dispoñibles\n"
  
 +#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
- #: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
- #: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1768
++#: g10/keygen.c:1945 g10/keygen.c:2313 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "¿A súa selección? "
  
@@@ -1725,10 -1349,6 +1725,10 @@@ msgstr "non hai unha chave pública cor
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
- #: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:334
++#: g10/import.c:592 g10/import.c:640 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
++#: dirmngr/dirmngr.c:1510 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
@@@ -1802,7 -1407,6 +1802,7 @@@ msgstr "A xeración da chave fallou: %s
  msgid "not an OpenPGP card"
  msgstr "non se atoparon datos OpenPGP válidos.\n"
  
- #: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
++#: g10/card-util.c:1173 g10/keygen.c:4106 g10/keygen.c:5092
  #, fuzzy, c-format
  msgid "error getting current key info: %s\n"
  msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
@@@ -1833,13 -1432,10 +1833,13 @@@ msgstr "¿Qué tamaño de chave quere? 
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "¿Qué tamaño de chave quere? (1024) "
  
- #: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
++#: g10/card-util.c:1316 g10/keygen.c:2122 g10/keygen.c:2154
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "redondeado a %u bits\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2207 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr ""
@@@ -1894,9 -1480,6 +1894,9 @@@ msgstr "   (%d) RSA (só cifrar)\n
  msgid "   (3) Authentication key\n"
  msgstr ""
  
- #: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
- #: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
- #: g10/keygen.c:2314 g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1508
++#: g10/keygen.c:1794 g10/keygen.c:1822 g10/keygen.c:1952 g10/keygen.c:2060
++#: g10/keygen.c:2336 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Selección non válida.\n"
  
@@@ -1930,7 -1507,6 +1930,7 @@@ msgstr "¿Asinar de verdade? 
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1816 g10/keyedit.c:1867
++#: g10/card-util.c:1816 g10/keyedit.c:1868
  msgid "quit this menu"
  msgstr "saír deste menú"
  
@@@ -1939,7 -1514,6 +1939,7 @@@
  msgid "show admin commands"
  msgstr "comandos conflictivos\n"
  
- #: g10/card-util.c:1819 g10/keyedit.c:1870
++#: g10/card-util.c:1819 g10/keyedit.c:1871
  msgid "show this help"
  msgstr "amosar esta axuda"
  
@@@ -2023,31 -1579,21 +2023,31 @@@ msgstr "comandos conflictivos\n
  msgid "Admin commands are not allowed\n"
  msgstr "gravando a chave secreta en `%s'\n"
  
- #: g10/card-util.c:2127 g10/keyedit.c:2816
++#: g10/card-util.c:2127 g10/keyedit.c:2817
  msgid "Invalid command  (try \"help\")\n"
  msgstr "Comando incorrecto (tente \"help\")\n"
  
- #: g10/decrypt.c:191 g10/encrypt.c:955
++#: g10/decrypt.c:190 g10/encrypt.c:955
  msgid "--output doesn't work for this command\n"
  msgstr "--output non traballa con este comando\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4904 g10/keyring.c:398 g10/keyring.c:771
  #, 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:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
- #: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
- #: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4858 g10/keyedit.c:2051
++#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2163
  #, fuzzy, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "non se atopou a chave `%s': %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
- #: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
- #: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4866 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:645 g10/tofu.c:2171
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "erro ao le-lo bloque de chaves: %s\n"
@@@ -2110,7 -1644,6 +2110,7 @@@ msgstr "¡hai unha chave secreta para 
  msgid "use option \"--delete-secret-keys\" to delete it first.\n"
  msgstr "empregue a opción \"--delete-secret-keys\" para borrala primeiro.\n"
  
- #: g10/encrypt.c:232 g10/sign.c:1292
++#: g10/encrypt.c:232 g10/sign.c:1294
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
@@@ -2130,7 -1660,6 +2130,7 @@@ msgstr "fallou a sinatura: %s\n
  msgid "'%s' already compressed\n"
  msgstr "`%s' xa está comprimido\n"
  
- #: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:610
  #, fuzzy, c-format
  #| msgid "WARNING: `%s' is an empty file\n"
  msgid "WARNING: '%s' is an empty file\n"
@@@ -2149,7 -1676,6 +2149,7 @@@ msgid "
  msgstr ""
  "forza-la cifra simétrica %s (%d) viola as preferencias do destinatario\n"
  
- #: g10/encrypt.c:707 g10/sign.c:984
++#: g10/encrypt.c:707 g10/sign.c:986
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2184,7 -1705,6 +2184,7 @@@ msgstr "datos cifrados con %s\n
  msgid "encrypted with unknown algorithm %d\n"
  msgstr "cifrado cun algoritmo descoñecido %d\n"
  
- #: g10/decrypt-data.c:164 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:129
  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"
@@@ -2282,8 -1784,6 +2282,8 @@@ msgstr "
  msgid " - skipped"
  msgstr "%s: omitido: %s\n"
  
- #: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:845 g10/sign.c:1148
++#: g10/export.c:1251 g10/import.c:1543 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:847 g10/sign.c:1150
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
@@@ -2308,8 -1804,6 +2308,8 @@@ msgstr "chave %08lX: chave estilo PGP 2
  msgid "WARNING: nothing exported\n"
  msgstr "AVISO: non se exportou nada\n"
  
- #: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
- #: g10/plaintext.c:151 g10/plaintext.c:174
++#: g10/export.c:2283 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/plaintext.c:167 g10/plaintext.c:190
  #, fuzzy, c-format
  #| msgid "error creating `%s': %s\n"
  msgid "error creating '%s': %s\n"
@@@ -2357,8 -1842,6 +2357,8 @@@ msgstr "erro ao crear `%s': %s\n
  msgid "No fingerprint"
  msgstr "Pegada dactilar:"
  
- #: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
- #: g10/revoke.c:701
++#: g10/getkey.c:1873 g10/keyedit.c:2929 g10/keyedit.c:3016 g10/revoke.c:637
++#: g10/revoke.c:702
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "non se atopou a chave secreta `%s': %s\n"
@@@ -2391,218 -1869,174 +2391,224 @@@ 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/gpg.c:424 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:200
  #, fuzzy
  msgid "make a signature"
  msgstr "facer unha sinatura separada"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:427
  #, fuzzy
  msgid "make a clear text signature"
  msgstr "|[ficheiro]|facer unha sinatura en texto claro"
  
- #: g10/gpg.c:426 sm/gpgsm.c:202
++#: g10/gpg.c:429 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "facer unha sinatura separada"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:430 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "cifrar datos"
  
- #: g10/gpg.c:429
++#: g10/gpg.c:432
  msgid "encryption only with symmetric cipher"
  msgstr "cifrar só con cifrado simétrico"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:434 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "descifrar datos (por defecto)"
  
- #: g10/gpg.c:433 sm/gpgsm.c:206
++#: g10/gpg.c:436 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "verificar unha sinatura"
  
- #: g10/gpg.c:435 sm/gpgsm.c:207
++#: g10/gpg.c:438 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "ve-la lista de chaves"
  
- #: g10/gpg.c:437
++#: g10/gpg.c:440
  msgid "list keys and signatures"
  msgstr "ve-la lista de chaves e sinaturas"
  
- #: g10/gpg.c:438
++#: g10/gpg.c:443
  #, fuzzy
  msgid "list and check key signatures"
  msgstr "verifica-las sinaturas das chaves"
  
- #: g10/gpg.c:439 sm/gpgsm.c:212
++#: g10/gpg.c:445 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "ve-la lista de chaves e pegadas dactilares"
  
- #: g10/gpg.c:440 sm/gpgsm.c:210
++#: g10/gpg.c:446 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "ve-la lista de chaves secretas"
  
- #: g10/gpg.c:442 sm/gpgsm.c:213
++#: g10/gpg.c:448 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "xerar un novo par de chaves"
  
- #: g10/gpg.c:444
++#: g10/gpg.c:451
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly generate a new key pair"
  msgstr "xerar un novo par de chaves"
  
- #: g10/gpg.c:446
++#: g10/gpg.c:454
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly add a new user-id"
  msgstr "xerar un novo par de chaves"
  
- #: g10/gpg.c:449
++#: g10/gpg.c:459
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly revoke a user-id"
  msgstr "xerar un novo par de chaves"
  
- #: g10/gpg.c:451
++#: g10/gpg.c:462
+ #, fuzzy
+ #| msgid "generate a new key pair"
+ msgid "quickly set a new expiration date"
+ msgstr "xerar un novo par de chaves"
+ 
++#: g10/gpg.c:464
  msgid "full featured key pair generation"
  msgstr ""
  
- #: g10/gpg.c:452
++#: g10/gpg.c:467
  msgid "generate a revocation certificate"
  msgstr "xerar un certificado de revocación"
  
- #: g10/gpg.c:454 sm/gpgsm.c:215
++#: g10/gpg.c:470 sm/gpgsm.c:216
  msgid "remove keys from the public keyring"
  msgstr "borrar chaves do chaveiro público"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:472
  msgid "remove keys from the secret keyring"
  msgstr "borrar chaves do chaveiro secreto"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:474
  #, fuzzy
  #| msgid "sign a key"
  msgid "quickly sign a key"
  msgstr "asinar unha chave"
  
- #: g10/gpg.c:460
++#: g10/gpg.c:476
  #, fuzzy
  #| msgid "sign a key locally"
  msgid "quickly sign a key locally"
  msgstr "asinar unha chave localmente"
  
- #: g10/gpg.c:461
++#: g10/gpg.c:477
  msgid "sign a key"
  msgstr "asinar unha chave"
  
- #: g10/gpg.c:462
++#: g10/gpg.c:478
  msgid "sign a key locally"
  msgstr "asinar unha chave localmente"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:479
  msgid "sign or edit a key"
  msgstr "asinar ou editar unha chave"
  
- #: g10/gpg.c:465 sm/gpgsm.c:233
++#: g10/gpg.c:481 sm/gpgsm.c:234
  #, fuzzy
  msgid "change a passphrase"
  msgstr "cambia-lo contrasinal"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:485
  msgid "export keys"
  msgstr "exportar chaves"
  
- #: g10/gpg.c:468
++#: g10/gpg.c:486
  msgid "export keys to a keyserver"
  msgstr "exportar chaves a un servidor de chaves"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:487
  msgid "import keys from a keyserver"
  msgstr "importar chaves dun servidor de chaves"
  
- #: g10/gpg.c:471
++#: g10/gpg.c:490
  msgid "search for keys on a keyserver"
  msgstr "buscar chaves nun servidor de chaves"
  
- #: g10/gpg.c:473
++#: g10/gpg.c:492
  msgid "update all keys from a keyserver"
  msgstr "actualizar tódalas chaves dun servidor de chaves"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:498
  msgid "import/merge keys"
  msgstr "importar/mesturar chaves"
  
- #: g10/gpg.c:482
++#: g10/gpg.c:501
  msgid "print the card status"
  msgstr ""
  
- #: g10/gpg.c:483
++#: g10/gpg.c:502
  msgid "change data on a card"
  msgstr ""
  
- #: g10/gpg.c:484
++#: g10/gpg.c:504
  msgid "change a card's PIN"
  msgstr ""
  
- #: g10/gpg.c:496
++#: g10/gpg.c:516
  msgid "update the trust database"
  msgstr "actualiza-la base de datos de confianza"
  
- #: g10/gpg.c:505
++#: g10/gpg.c:525
  #, fuzzy
  msgid "print message digests"
  msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
  
- #: g10/gpg.c:508 sm/gpgsm.c:228
++#: g10/gpg.c:528 sm/gpgsm.c:229
  msgid "run in server mode"
  msgstr ""
  
- #: g10/gpg.c:510
++#: g10/gpg.c:530
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:514 sm/gpgsm.c:246
++#: g10/gpg.c:534 sm/gpgsm.c:248
  msgid "create ascii armored output"
  msgstr "crear saída con armadura en ascii"
  
- #: g10/gpg.c:517 sm/gpgsm.c:262
++#: g10/gpg.c:537 sm/gpgsm.c:264
  #, fuzzy
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|NOME|cifrar para NOME"
  
- #: g10/gpg.c:533 sm/gpgsm.c:298
++#: g10/gpg.c:553 sm/gpgsm.c:300
  #, fuzzy
  msgid "|USER-ID|use USER-ID to sign or decrypt"
  msgstr "empregar este id de usuario para asinar ou descifrar"
  
- #: g10/gpg.c:539
++#: g10/gpg.c:559
  #, 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:546
++#: g10/gpg.c:566
  msgid "use canonical text mode"
  msgstr "usar modo de texto canónico"
  
- #: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
++#: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
  #, fuzzy
  msgid "|FILE|write output to FILE"
  msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
  
- #: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
++#: g10/gpg.c:598 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
  msgid "do not make any changes"
  msgstr "non facer ningún cambio"
  
- #: g10/gpg.c:579
++#: g10/gpg.c:599
  msgid "prompt before overwriting"
  msgstr "avisar antes de sobrescribir"
  
- #: g10/gpg.c:628
++#: g10/gpg.c:648
  msgid "use strict OpenPGP behavior"
  msgstr ""
  
- #: g10/gpg.c:654 sm/gpgsm.c:355
++#: g10/gpg.c:674 sm/gpgsm.c:357
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2610,7 -2044,16 +2616,17 @@@ msgstr "
  "@\n"
  "(Vexa a páxina man para un listado completo de comandos e opcións)\n"
  
- #: g10/gpg.c:657 sm/gpgsm.c:358
++#: g10/gpg.c:677
+ #, fuzzy
+ #| msgid ""
+ #| "@\n"
+ #| "Examples:\n"
+ #| "\n"
+ #| " -se -r Bob [file]          sign and encrypt for user Bob\n"
+ #| " --clear-sign [file]         make a clear text signature\n"
+ #| " --detach-sign [file]       make a detached signature\n"
+ #| " --list-keys [names]        show keys\n"
+ #| " --fingerprint [names]      show fingerprints\n"
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2630,13 -2073,11 +2646,13 @@@ msgstr "
  " --list-keys [nomes]        amosa-las chaves\n"
  " --fingerprint [nomes]      amosa-las pegadas dactilares\n"
  
- #: g10/gpg.c:1026
++#: g10/gpg.c:1047
  #, 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:1029
++#: g10/gpg.c:1050
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg [options] [files]\n"
@@@ -2651,7 -2092,6 +2667,7 @@@ msgstr "
  "asinar, verificar, cifrar ou descifrar\n"
  "a operación por defecto depende dos datos de entrada\n"
  
- #: g10/gpg.c:1040 sm/gpgsm.c:588
++#: g10/gpg.c:1061 sm/gpgsm.c:580
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2659,607 -2099,429 +2675,544 @@@ msgstr "
  "\n"
  "Algoritmos soportados:\n"
  
- #: g10/gpg.c:1043
++#: g10/gpg.c:1064
  msgid "Pubkey: "
  msgstr "Pública: "
  
- #: g10/gpg.c:1050 g10/keyedit.c:3402
++#: g10/gpg.c:1071 g10/keyedit.c:3483
  msgid "Cipher: "
  msgstr "Cifra: "
  
- #: g10/gpg.c:1057
++#: g10/gpg.c:1078
  msgid "Hash: "
  msgstr "Hash: "
  
- #: g10/gpg.c:1064 g10/keyedit.c:3451
++#: g10/gpg.c:1085 g10/keyedit.c:3532
  msgid "Compression: "
  msgstr "Compresión: "
  
- #: g10/gpg.c:1133 sm/gpgsm.c:662
++#: g10/gpg.c:1154 sm/gpgsm.c:654
  #, fuzzy, c-format
  msgid "usage: %s [options] %s\n"
  msgstr "uso: gpg [opcións] "
  
- #: g10/gpg.c:1321 sm/gpgsm.c:751
++#: g10/gpg.c:1342 sm/gpgsm.c:743
  msgid "conflicting commands\n"
  msgstr "comandos conflictivos\n"
  
- #: g10/gpg.c:1339
++#: g10/gpg.c:1360
  #, 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:1537
++#: g10/gpg.c:1558
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
  
- #: g10/gpg.c:1540
++#: g10/gpg.c:1561
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
  msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
  
- #: g10/gpg.c:1543
++#: g10/gpg.c:1564
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on extension '%s'\n"
  msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
  
- #: g10/gpg.c:1549
++#: g10/gpg.c:1570
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
  msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
  
- #: g10/gpg.c:1552
++#: g10/gpg.c:1573
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
  msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
  
- #: g10/gpg.c:1555
++#: g10/gpg.c:1576
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on extension '%s'\n"
  msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
  
- #: g10/gpg.c:1561
++#: g10/gpg.c:1582
  #, 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:1564
++#: g10/gpg.c:1585
  #, 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:1567
++#: g10/gpg.c:1588
  #, 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:1573
++#: g10/gpg.c:1594
  #, 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:1576
++#: g10/gpg.c:1597
  #, 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:1579
++#: g10/gpg.c:1600
  #, 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:1786
++#: g10/gpg.c:1816
  #, fuzzy, c-format
  msgid "unknown configuration item '%s'\n"
  msgstr " creouse un novo ficheiro de configuración `%s'\n"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1925
  msgid "display photo IDs during key listings"
  msgstr ""
  
- #: g10/gpg.c:1895
++#: g10/gpg.c:1927
  #, fuzzy
  msgid "show key usage information during key listings"
  msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1929
  msgid "show policy URLs during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1931
  #, fuzzy
  msgid "show all notations during signature listings"
  msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1933
  msgid "show IETF standard notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1937
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1939
  #, fuzzy
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "o URL de normativa de sinaturas dado non é válido\n"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1941
  msgid "show user ID validity during key listings"
  msgstr ""
  
- #: g10/gpg.c:1911
++#: g10/gpg.c:1943
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  
- #: g10/gpg.c:1913
++#: g10/gpg.c:1945
  msgid "show revoked and expired subkeys in key listings"
  msgstr ""
  
- #: g10/gpg.c:1915
++#: g10/gpg.c:1947
  #, fuzzy
  msgid "show the keyring name in key listings"
  msgstr "amosar en que chaveiro está unha chave listada"
  
- #: g10/gpg.c:1917
++#: g10/gpg.c:1949
  #, fuzzy
  msgid "show expiration dates during signature listings"
  msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
  
- #: g10/gpg.c:2019 g10/gpg.c:2056
++#: g10/gpg.c:2051 g10/gpg.c:2088
  #, fuzzy, c-format
  msgid "valid values for option '%s':\n"
  msgstr "opcións de importación non válidas\n"
  
- #: g10/gpg.c:2030
++#: g10/gpg.c:2062
  #, fuzzy, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "destinatario por defecto `%s' descoñecido\n"
  
- #: g10/gpg.c:2032 g10/gpg.c:2068
++#: g10/gpg.c:2064 g10/gpg.c:2100
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2066
++#: g10/gpg.c:2098 g10/keygen.c:167
  #, fuzzy, c-format
  msgid "invalid value for option '%s'\n"
  msgstr "opcións de importación non válidas\n"
  
- #: g10/gpg.c:2203
++#: g10/gpg.c:2235
  #, fuzzy, c-format
  #| msgid "NOTE: old default options file `%s' ignored\n"
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "NOTA: ignórase o antigo ficheiro de opcións por defecto `%s'\n"
  
- #: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
++#: g10/gpg.c:2839 g10/gpg.c:3610 g10/gpg.c:3622
  #, 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:2978 g10/gpg.c:2990
++#: g10/gpg.c:3011 g10/gpg.c:3023
  #, 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:3012
++#: g10/gpg.c:3045
  #, 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:3044 sm/gpgsm.c:1166
++#: g10/gpg.c:3077 sm/gpgsm.c:1158
  #, fuzzy, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "algoritmo de hash non válido `%s'\n"
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3130
  #, 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:3119 g10/gpg.c:3322 g10/keyedit.c:5338
++#: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
  #, fuzzy
  msgid "could not parse keyserver URL\n"
  msgstr "non se puido analisa-lo URI do servidor de chaves\n"
  
- #: g10/gpg.c:3137
++#: g10/gpg.c:3170
  #, 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:3140
++#: g10/gpg.c:3173
  #, fuzzy
  msgid "invalid keyserver options\n"
  msgstr "opcións de exportación non válidas\n"
  
- #: g10/gpg.c:3147
++#: g10/gpg.c:3180
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: opcións de importación non válidas\n"
  
- #: g10/gpg.c:3150
++#: g10/gpg.c:3183
  msgid "invalid import options\n"
  msgstr "opcións de importación non válidas\n"
  
- #: g10/gpg.c:3156 g10/gpg.c:3171
++#: g10/gpg.c:3189 g10/gpg.c:3204
  #, fuzzy, c-format
  msgid "invalid filter option: %s\n"
  msgstr "opcións de importación non válidas\n"
  
- #: g10/gpg.c:3162
++#: g10/gpg.c:3195
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: opcións de exportación non válidas\n"
  
- #: g10/gpg.c:3165
++#: g10/gpg.c:3198
  msgid "invalid export options\n"
  msgstr "opcións de exportación non válidas\n"
  
- #: g10/gpg.c:3177
++#: g10/gpg.c:3210
  #, 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:3180
++#: g10/gpg.c:3213
  #, fuzzy
  msgid "invalid list options\n"
  msgstr "opcións de importación non válidas\n"
  
- #: g10/gpg.c:3188
++#: g10/gpg.c:3221
  msgid "display photo IDs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3190
++#: g10/gpg.c:3223
  msgid "show policy URLs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3192
++#: g10/gpg.c:3225
  #, fuzzy
  msgid "show all notations during signature verification"
  msgstr "%s non é un xogo de caracteres válido\n"
  
- #: g10/gpg.c:3194
++#: g10/gpg.c:3227
  msgid "show IETF standard notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3231
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3200
++#: g10/gpg.c:3233
  #, fuzzy
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "o URL de normativa de sinaturas dado non é válido\n"
  
- #: g10/gpg.c:3202
++#: g10/gpg.c:3235
  #, fuzzy
  msgid "show user ID validity during signature verification"
  msgstr "%s non é un xogo de caracteres válido\n"
  
- #: g10/gpg.c:3204
++#: g10/gpg.c:3237
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  
- #: g10/gpg.c:3206
++#: g10/gpg.c:3239
  #, fuzzy
  msgid "show only the primary user ID in signature verification"
  msgstr "%s non é un xogo de caracteres válido\n"
  
- #: g10/gpg.c:3208
++#: g10/gpg.c:3241
  msgid "validate signatures with PKA data"
  msgstr ""
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3243
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr ""
  
- #: g10/gpg.c:3217
++#: g10/gpg.c:3250
  #, 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:3220
++#: g10/gpg.c:3253
  #, fuzzy
  msgid "invalid verify options\n"
  msgstr "opcións de exportación non válidas\n"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3260
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "non se puido estabrecer exec-path a %s\n"
  
- #: g10/gpg.c:3417
++#: g10/gpg.c:3452
  #, 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:3420
++#: g10/gpg.c:3455
  msgid "invalid auto-key-locate list\n"
  msgstr ""
  
- #: g10/gpg.c:3553 sm/gpgsm.c:1507
++#: g10/gpg.c:3592 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
  msgstr "AVISO: ¡o programa pode crear un ficheiro 'core'!\n"
  
- #: g10/gpg.c:3564
++#: g10/gpg.c:3603
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "AVISO: %s fai que se ignore %s\n"
  
- #: g10/gpg.c:3573
++#: g10/gpg.c:3612
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "¡%s non se admite con %s!\n"
  
- #: g10/gpg.c:3576
++#: g10/gpg.c:3615
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "¡%s non ten sentido empregándoo con %s!\n"
  
- #: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
++#: g10/gpg.c:3630 sm/gpgsm.c:1518 dirmngr/dirmngr.c:951
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3651
  #, 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:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
++#: g10/gpg.c:3686 g10/gpg.c:3710 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "o algoritmo de cifrado seleccionado non é válido\n"
  
- #: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
++#: g10/gpg.c:3692 g10/gpg.c:3716 sm/gpgsm.c:1591 sm/gpgsm.c:1597
  msgid "selected digest algorithm is invalid\n"
  msgstr "o algoritmo de resumo seleccionado non é válido\n"
  
- #: g10/gpg.c:3659
++#: g10/gpg.c:3698
  #, fuzzy
  msgid "selected compression algorithm is invalid\n"
  msgstr "o algoritmo de cifrado seleccionado non é válido\n"
  
- #: g10/gpg.c:3665
++#: g10/gpg.c:3704
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "o algoritmo de resumo de certificación seleccionado non é válido\n"
  
- #: g10/gpg.c:3680
++#: g10/gpg.c:3719
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed debe ser superior a 0\n"
  
- #: g10/gpg.c:3682
++#: g10/gpg.c:3721
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed debe ser superior a 1\n"
  
- #: g10/gpg.c:3684
++#: g10/gpg.c:3723
  #, fuzzy
  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:3686
++#: g10/gpg.c:3725
  #, fuzzy
  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:3688
++#: g10/gpg.c:3727
  #, fuzzy
  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:3691
++#: g10/gpg.c:3730
  #, fuzzy
  #| 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:3695
++#: g10/gpg.c:3734
  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:3702
++#: g10/gpg.c:3741
  msgid "invalid default preferences\n"
  msgstr "preferencias por defecto non válidas\n"
  
- #: g10/gpg.c:3706
++#: g10/gpg.c:3745
  msgid "invalid personal cipher preferences\n"
  msgstr "preferencias de cifrado personais non válidas\n"
  
- #: g10/gpg.c:3710
++#: g10/gpg.c:3749
  msgid "invalid personal digest preferences\n"
  msgstr "preferencias de resumo personais non válidas\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3753
  msgid "invalid personal compress preferences\n"
  msgstr "preferencias de compresión personais non válidas\n"
  
- #: g10/gpg.c:3750
++#: g10/gpg.c:3789
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "¡%s aínda non traballa con %s!\n"
  
- #: g10/gpg.c:3797
++#: g10/gpg.c:3836
  #, fuzzy, c-format
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr "non se pode empregar o algoritmo de cifrado \"%s\" no modo %s\n"
  
- #: g10/gpg.c:3802
++#: g10/gpg.c:3841
  #, fuzzy, c-format
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr "non se pode empregar o algoritmo de resumo \"%s\" no modo %s\n"
  
- #: g10/gpg.c:3807
++#: g10/gpg.c:3846
  #, fuzzy, c-format
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr "non se pode empregar o algoritmo de compresión \"%s\" no modo %s\n"
  
- #: g10/gpg.c:3906
++#: g10/gpg.c:3945
  #, 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:3918
++#: g10/gpg.c:3957
  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:3975
- msgid "--store [filename]"
- msgstr "--store [ficheiro]"
- 
- #: g10/gpg.c:3985
- msgid "--symmetric [filename]"
- msgstr "--symmetric [ficheiro]"
- 
- #: g10/gpg.c:3989
++#: g10/gpg.c:4028
  #, fuzzy, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "o descifrado fallou: %s\n"
  
- #: g10/gpg.c:4000
- msgid "--encrypt [filename]"
- msgstr "--encrypt [ficheiro]"
- 
- #: g10/gpg.c:4016
- #, fuzzy
- msgid "--symmetric --encrypt [filename]"
- msgstr "--sign --encrypt [ficheiro]"
- 
- #: g10/gpg.c:4018
++#: g10/gpg.c:4057
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4021
++#: g10/gpg.c:4060
  #, fuzzy, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr "non se pode empregar %s no modo %s\n"
  
- #: g10/gpg.c:4042
- msgid "--sign [filename]"
- msgstr "--sign [ficheiro]"
- 
- #: g10/gpg.c:4058
- msgid "--sign --encrypt [filename]"
- msgstr "--sign --encrypt [ficheiro]"
- 
- #: g10/gpg.c:4076
- #, fuzzy
- msgid "--symmetric --sign --encrypt [filename]"
- msgstr "--sign --encrypt [ficheiro]"
- 
- #: g10/gpg.c:4078
++#: g10/gpg.c:4117
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4081
++#: g10/gpg.c:4120
  #, fuzzy, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr "non se pode empregar %s no modo %s\n"
  
- #: g10/gpg.c:4105
- msgid "--sign --symmetric [filename]"
- msgstr "--sign --symmetric [ficheiro]"
- 
- #: g10/gpg.c:4117
- msgid "--clearsign [filename]"
- msgstr "--clearsign [ficheiro]"
- 
- #: g10/gpg.c:4147
- msgid "--decrypt [filename]"
- msgstr "--decrypt [ficheiro]"
- 
- #: g10/gpg.c:4174
- msgid "--sign-key user-id"
- msgstr "--sign-key id-de-usuario"
- 
- #: g10/gpg.c:4178
- msgid "--lsign-key user-id"
- msgstr "--lsign-key id-de-usuario"
- 
- #: g10/gpg.c:4199
- msgid "--edit-key user-id [commands]"
- msgstr "--edit-key id-de-usuario [comandos]"
- 
- #: g10/gpg.c:4215
- #, fuzzy
- msgid "--passwd <user-id>"
- msgstr "--sign-key id-de-usuario"
- 
- #: g10/gpg.c:4411 g10/keyserver.c:1837
++#: g10/gpg.c:4462 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "o envío ao servidor de chaves fallou: %s\n"
  
- #: g10/gpg.c:4416
++#: g10/gpg.c:4467
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "a recepción do servidor de chaves fallou: %s\n"
  
- #: g10/gpg.c:4422
++#: g10/gpg.c:4473
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "a exportación da chave fallou: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4486
  #, 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:4447
++#: g10/gpg.c:4498
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "a busca no servidor de chaves fallou fallou: %s\n"
  
- #: g10/gpg.c:4460
++#: g10/gpg.c:4511
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "a actualización no servidor de chaves fallou: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4578
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "non se puido quita-la armadura: %s\n"
  
- #: g10/gpg.c:4538
++#: g10/gpg.c:4589
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "non se puido poñe-la armadura: %s\n"
  
- #: g10/gpg.c:4630
++#: g10/gpg.c:4681
  #, 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:4776 g10/tofu.c:2002
++#: g10/gpg.c:4827 g10/tofu.c:2151
  #, fuzzy, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: g10/gpg.c:4788
++#: g10/gpg.c:4839
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4835
- msgid "[filename]"
- msgstr "[ficheiro]"
- 
- #: g10/gpg.c:4841
++#: g10/gpg.c:4894
  msgid "Go ahead and type your message ...\n"
  msgstr "Escriba a súa mensaxe ...\n"
  
- #: g10/gpg.c:5179
++#: g10/gpg.c:5232
  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:5181
++#: g10/gpg.c:5234
  msgid "the given signature policy URL is invalid\n"
  msgstr "o URL de normativa de sinaturas dado non é válido\n"
  
- #: g10/gpg.c:5214
++#: g10/gpg.c:5267
  #, fuzzy
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "o URL de normativa de sinaturas dado non é válido\n"
@@@ -3273,7 -2533,6 +3226,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:82 sm/gpgsm.c:345
++#: g10/gpgv.c:82 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|DF|escribi-la información de estado a este DF"
  
@@@ -3304,332 -2558,266 +3257,332 @@@ msgstr "Non hai axuda dispoñible
  msgid "No help available for '%s'"
  msgstr "Non hai axuda dispoñible para `%s'"
  
- #: g10/import.c:151
++#: g10/import.c:152
  msgid "import signatures that are marked as local-only"
  msgstr ""
  
- #: g10/import.c:154
++#: g10/import.c:155
  msgid "repair damage from the pks keyserver during import"
  msgstr ""
  
- #: g10/import.c:157
++#: g10/import.c:158
  #, fuzzy
  msgid "do not clear the ownertrust values during import"
  msgstr "actualiza-la base de datos de confianza"
  
- #: g10/import.c:160
++#: g10/import.c:161
  #, fuzzy
  msgid "do not update the trustdb after import"
  msgstr "actualiza-la base de datos de confianza"
  
- #: g10/import.c:163
++#: g10/import.c:164
  #, fuzzy
  msgid "show key during import"
  msgstr "amosar fingerprint"
  
- #: g10/import.c:166
++#: g10/import.c:167
  msgid "only accept updates to existing keys"
  msgstr ""
  
- #: g10/import.c:169
++#: g10/import.c:170
  #, fuzzy
  msgid "remove unusable parts from key after import"
  msgstr "chave secreta non utilizable"
  
- #: g10/import.c:172
++#: g10/import.c:173
  msgid "remove as much as possible from key after import"
  msgstr ""
  
- #: g10/import.c:175
++#: g10/import.c:176
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:326 g10/import.c:568
++#: g10/import.c:327 g10/import.c:569
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "pasando por alto un bloque de tipo %d\n"
  
- #: g10/import.c:585
++#: g10/import.c:586
  #, fuzzy, c-format
  msgid "%lu keys processed so far\n"
  msgstr "%lu chaves procesadas hasta polo momento\n"
  
- #: g10/import.c:655
++#: g10/import.c:656
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "Número total procesado: %lu\n"
  
- #: g10/import.c:658
++#: g10/import.c:659
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "novas chaves omitidas: %lu\n"
  
- #: g10/import.c:660
++#: g10/import.c:661
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "novas chaves omitidas: %lu\n"
  
- #: g10/import.c:663
++#: g10/import.c:664
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "   sin IDs de usuario: %lu\n"
  
- #: g10/import.c:666 sm/import.c:130
++#: g10/import.c:667 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "           importadas: %lu"
  
- #: g10/import.c:670 sm/import.c:134
++#: g10/import.c:671 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "          sin cambios: %lu\n"
  
- #: g10/import.c:672
++#: g10/import.c:673
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr " novos IDs de usuario: %lu\n"
  
- #: g10/import.c:674
++#: g10/import.c:675
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "     novas sub-chaves: %lu\n"
  
- #: g10/import.c:676
++#: g10/import.c:677
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "         novas sinaturas: %lu\n"
  
- #: g10/import.c:678
++#: g10/import.c:679
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr " novas revocacións de chaves: %lu\n"
  
- #: g10/import.c:680 sm/import.c:136
++#: g10/import.c:681 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "chaves secretas lidas: %lu\n"
  
- #: g10/import.c:682 sm/import.c:138
++#: g10/import.c:683 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "chaves secretas importadas: %lu\n"
  
- #: g10/import.c:684 sm/import.c:140
++#: g10/import.c:685 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr "chaves secretas sin cambios: %lu\n"
  
- #: g10/import.c:686 sm/import.c:142
++#: g10/import.c:687 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "       non importadas: %lu\n"
  
- #: g10/import.c:688
++#: g10/import.c:689
  #, fuzzy, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "         novas sinaturas: %lu\n"
  
- #: g10/import.c:690
++#: g10/import.c:691
  #, fuzzy, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "chaves secretas lidas: %lu\n"
  
- #: g10/import.c:1034
++#: g10/import.c:1035
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
  "algorithms on these user IDs:\n"
  msgstr ""
  
- #: g10/import.c:1076
++#: g10/import.c:1077
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1091
++#: g10/import.c:1092
  #, fuzzy, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "Sinatura %s, algoritmo de resumo %s\n"
  
- #: g10/import.c:1103
++#: g10/import.c:1104
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1116
++#: g10/import.c:1117
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr ""
  
- #: g10/import.c:1118
++#: g10/import.c:1119
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  
- #: g10/import.c:1143
++#: g10/import.c:1144
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  
- #: g10/import.c:1379 g10/import.c:2167
++#: g10/import.c:1380 g10/import.c:2168
  #, fuzzy, c-format
  msgid "key %s: no user ID\n"
  msgstr "chave %08lX: non hai ID de usuario\n"
  
- #: g10/import.c:1385
++#: g10/import.c:1386
  #, fuzzy, c-format
  msgid "key %s: %s\n"
  msgstr "omítese `%s': %s\n"
  
- #: g10/import.c:1386 g10/import.c:2141
++#: g10/import.c:1387 g10/import.c:2142
  msgid "rejected by import screener"
  msgstr ""
  
- #: g10/import.c:1416
++#: g10/import.c:1417
  #, fuzzy, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "chave %08lX: arranxouse a corrupción da sub-chave HKP\n"
  
- #: g10/import.c:1434
++#: g10/import.c:1435
  #, fuzzy, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "chave %08lX: aceptouse o ID de usuario '%s' sen auto-sinatura\n"
  
- #: g10/import.c:1444 g10/import.c:1475
++#: g10/import.c:1445 g10/import.c:1476
  #, fuzzy, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "chave %08lX: non hai IDs de usuario válidos\n"
  
- #: g10/import.c:1446
++#: g10/import.c:1447
  msgid "this may be caused by a missing self-signature\n"
  msgstr "isto pode ser causado por unha auto-sinatura que falta\n"
  
- #: g10/import.c:1516 g10/import.c:2318
++#: g10/import.c:1517 g10/import.c:2319
  #, fuzzy, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "chave %08lX: chave pública non atopada: %s\n"
  
- #: g10/import.c:1522
++#: g10/import.c:1523
  #, fuzzy, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "chave %08lX: nova chave - omitida\n"
  
- #: g10/import.c:1537
++#: g10/import.c:1538
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "non se atopou un chaveiro no que se poida escribir: %s\n"
  
- #: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
++#: g10/import.c:1547 g10/import.c:1648 g10/import.c:2385
  #, fuzzy, c-format
  #| msgid "error writing keyring `%s': %s\n"
  msgid "error writing keyring '%s': %s\n"
  msgstr "erro escribindo no chaveiro `%s': %s\n"
  
- #: g10/import.c:1566
++#: g10/import.c:1567
  #, fuzzy, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "chave %08lX: chave pública \"%s\" importada\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1591
  #, fuzzy, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "chave %08lX: non coincide coa nosa copia\n"
  
- #: g10/import.c:1606 g10/import.c:2342
++#: g10/import.c:1607 g10/import.c:2343
  #, fuzzy, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr ""
  "chave %08lX: non foi posible localiza-lo bloque de chaves original:\n"
  "%s\n"
  
- #: g10/import.c:1614 g10/import.c:2349
++#: g10/import.c:1615 g10/import.c:2350
  #, fuzzy, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr ""
  "chave %08lX: non foi posible le-lo bloque de chaves original:\n"
  "%s\n"
  
- #: g10/import.c:1657
++#: g10/import.c:1658
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "chave %08lX: \"%s\" 1 novo ID de usuario\n"
  
- #: g10/import.c:1660
++#: g10/import.c:1661
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
  
- #: g10/import.c:1663
++#: g10/import.c:1664
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "chave %08lX: \"%s\" 1 nova sinatura\n"
  
- #: g10/import.c:1666
++#: g10/import.c:1667
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
  
- #: g10/import.c:1669
++#: g10/import.c:1670
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "chave %08lX: \"%s\" 1 nova sub-chave\n"
  
- #: g10/import.c:1672
++#: g10/import.c:1673
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "chave %08lX: \"%s\" %d novas sub-chaves\n"
  
- #: g10/import.c:1675
++#: g10/import.c:1676
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
  
- #: g10/import.c:1678
++#: g10/import.c:1679
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
  
- #: g10/import.c:1681
++#: g10/import.c:1682
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
  
- #: g10/import.c:1684
++#: g10/import.c:1685
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
  
- #: g10/import.c:1707
++#: g10/import.c:1708
  #, fuzzy, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "chave %08lX: \"%s\" sen cambios\n"
  
- #: g10/import.c:2019 g10/import.c:2264
++#: g10/import.c:2020 g10/import.c:2265
  #, fuzzy, c-format
  msgid "key %s: secret key imported\n"
  msgstr "chave %08lX: chave secreta importada\n"
  
- #: g10/import.c:2027
++#: g10/import.c:2028
  #, fuzzy, c-format
  #| msgid "skipped: secret key already present\n"
  msgid "key %s: secret key already exists\n"
  msgstr "omítese: a chave secreta xa está presente\n"
  
- #: g10/import.c:2035
++#: g10/import.c:2036
  #, fuzzy, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "erro ao enviar a `%s': %s\n"
  
- #: g10/import.c:2140
++#: g10/import.c:2141
  #, fuzzy, c-format
  msgid "secret key %s: %s\n"
  msgstr "non se atopou a chave secreta `%s': %s\n"
  
- #: g10/import.c:2160 g10/import.c:2195
++#: g10/import.c:2161 g10/import.c:2196
  #, fuzzy
  msgid "importing secret keys not allowed\n"
  msgstr "gravando a chave secreta en `%s'\n"
  
- #: g10/import.c:2184
++#: g10/import.c:2185
  #, fuzzy, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr "chave %08lX: chave secreta cunha cifra %d non válida - omitida\n"
@@@ -3644,148 -2832,121 +3597,148 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2256
++#: g10/import.c:2257
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2311
++#: g10/import.c:2312
  #, fuzzy, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
  "chave %08lX: non hai chave pública - non se pode aplica-lo\n"
  "certificado de revocación\n"
  
- #: g10/import.c:2360
++#: g10/import.c:2361
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr ""
  "chave %08lX: certificado de revocación incorrecto:\n"
  "%s - rechazado\n"
  
- #: g10/import.c:2393
++#: g10/import.c:2394
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "chave %08lX: \"%s\" certificado de revocación importado\n"
  
- #: g10/import.c:2469
++#: g10/import.c:2470
  #, fuzzy, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "chave %08lX: non hai ID de usuario para a sinatura\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2487
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr ""
  "chave %08lX: algoritmo de chave pública non soportado no ID de usuario \"%s"
  "\"\n"
  
- #: g10/import.c:2488
++#: g10/import.c:2489
  #, fuzzy, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr ""
  "chave %08lX: auto-sinatura non válida no identificadr de usuario \"%s\"\n"
  
- #: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
++#: g10/import.c:2506 g10/import.c:2532 g10/import.c:2583
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "chave %08lX: algoritmo de chave pública non soportado\n"
  
- #: g10/import.c:2506
++#: g10/import.c:2507
  #, fuzzy, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
  
- #: g10/import.c:2520
++#: g10/import.c:2521
  #, fuzzy, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "chave %08lX: non hai sub-chave para a ligazón da chave\n"
  
- #: g10/import.c:2533
++#: g10/import.c:2534
  #, fuzzy, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "chave %08lX: ligazón de sub-chave incorrecta\n"
  
- #: g10/import.c:2549
++#: g10/import.c:2550
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "chave %08lX: eliminouse unha ligazón de sub-chave múltiple\n"
  
- #: g10/import.c:2571
++#: g10/import.c:2572
  #, fuzzy, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "chave %08lX: non hai unha sub-chave para a revocación da chave\n"
  
- #: g10/import.c:2584
++#: g10/import.c:2585
  #, fuzzy, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "chave %08lX: revocación de sub-chave non válida\n"
  
- #: g10/import.c:2599
++#: g10/import.c:2600
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "chave %08lX: eliminouse a revocación de sub-chaves múltiples\n"
  
- #: g10/import.c:2641
++#: g10/import.c:2642
  #, fuzzy, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "chave %08lX: omitido o ID de usuario '"
  
- #: g10/import.c:2665
++#: g10/import.c:2666
  #, fuzzy, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "chave %08lX: omitida a sub-chave\n"
  
- #: g10/import.c:2694
++#: g10/import.c:2695
  #, fuzzy, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "chave %08lX: sinatura non exportable (clase %02x) - omitida\n"
  
- #: g10/import.c:2705
++#: g10/import.c:2706
  #, fuzzy, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "chave %08lX: certificado de revocación no lugar erróneo - omitido\n"
  
- #: g10/import.c:2723
++#: g10/import.c:2724
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "chave %08lX: certificado de revocación incorrecto: %s - omitido\n"
  
- #: g10/import.c:2737
++#: g10/import.c:2738
  #, fuzzy, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "chave %08lX: sinatura da sub-chave nun lugar incorrecto - omitida\n"
  
- #: g10/import.c:2745
++#: g10/import.c:2746
  #, fuzzy, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "chave %08lX: clase de sinatura non esperada (0x%02X) - omitida\n"
  
- #: g10/import.c:2887
++#: g10/import.c:2888
  #, fuzzy, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "chave %08lX: ID de usuario duplicado detectado - mesturado\n"
  
- #: g10/import.c:2951
++#: g10/import.c:2952
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr ""
  "AVISO: a chave %08lX pode estar revocada: obtendo a chave de revocación "
  "%08lX\n"
  
- #: g10/import.c:2967
++#: g10/import.c:2968
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr ""
  "AVISO: a chave %08lX pode estar revocada: chave de revocación %08lX "
  "ausente.\n"
  
- #: g10/import.c:3031
++#: g10/import.c:3032
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "chave %08lX: \"%s\" certificado de revocación engadido\n"
  
- #: g10/import.c:3069
++#: g10/import.c:3070
  #, fuzzy, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
@@@ -3822,54 -2977,43 +3775,54 @@@ msgstr "erro ao crear `%s': %s\n
  msgid "error opening key DB: %s\n"
  msgstr "erro lendo `%s': %s\n"
  
- #: g10/keydb.c:1782
++#: g10/keydb.c:1786
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "fallo ao reconstruí-la caché de chaveiros: %s\n"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[revocation]"
  msgstr "[revocación]"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[self-signature]"
  msgstr "[auto-sinatura]"
  
- #: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
++#: g10/keyedit.c:433 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: dirmngr/ldap-wrapper.c:694
  #, fuzzy, c-format
  msgid "error allocating memory: %s\n"
  msgstr "erro ao crea-lo chaveiro `%s': %s\n"
  
- #: g10/keyedit.c:629
++#: g10/keyedit.c:630
  #, fuzzy, c-format
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr "chave %08lX: algoritmo de chave pública non soportado\n"
  
- #: g10/keyedit.c:638
++#: g10/keyedit.c:639
  #, fuzzy, c-format
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "Sinatura %s, algoritmo de resumo %s\n"
  
- #: g10/keyedit.c:800
++#: g10/keyedit.c:801
  #, fuzzy
  msgid " (reordered signatures follow)"
  msgstr "Sinatura correcta de \""
  
- #: g10/keyedit.c:913
++#: g10/keyedit.c:914
  #, fuzzy, c-format
  msgid "key %s:\n"
  msgstr "omítese `%s': %s\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:917
  #, fuzzy, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
  msgstr[0] "O ID de usuario \"%s\" está revocado."
  msgstr[1] "O ID de usuario \"%s\" está revocado."
  
- #: g10/keyedit.c:919 g10/keylist.c:480
++#: g10/keyedit.c:920 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
@@@ -3877,7 -3021,6 +3830,7 @@@ msgid_plural "%d signatures not checke
  msgstr[0] "1 sinatura non verificada debido a unha chave que falta\n"
  msgstr[1] "1 sinatura non verificada debido a unha chave que falta\n"
  
- #: g10/keyedit.c:923 g10/keylist.c:476
++#: g10/keyedit.c:924 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
@@@ -3885,21 -3028,18 +3838,21 @@@ msgid_plural "%d bad signatures\n
  msgstr[0] "%d sinaturas erróneas\n"
  msgstr[1] "%d sinaturas erróneas\n"
  
- #: g10/keyedit.c:927
++#: g10/keyedit.c:928
  #, fuzzy, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
  msgstr[0] "Sinatura correcta de \""
  msgstr[1] "Sinatura correcta de \""
  
- #: g10/keyedit.c:932
++#: g10/keyedit.c:933
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:992 g10/pkclist.c:274
++#: g10/keyedit.c:993 g10/pkclist.c:274
  #, fuzzy
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
@@@ -3911,68 -3051,53 +3864,68 @@@ msgstr "
  "correctamente as chaves de outros usuarios (mirando nos pasaportes,\n"
  "comprobando pegadas dactilares de varias fontes...).\n"
  
- #: g10/keyedit.c:996 g10/pkclist.c:286
++#: g10/keyedit.c:997 g10/pkclist.c:286
  #, fuzzy, c-format
  msgid "  %d = I trust marginally\n"
  msgstr " %d = Confío marxinalmente\n"
  
- #: g10/keyedit.c:997 g10/pkclist.c:288
++#: g10/keyedit.c:998 g10/pkclist.c:288
  #, fuzzy, c-format
  msgid "  %d = I trust fully\n"
  msgstr " %d = Confío totalmente\n"
  
- #: g10/keyedit.c:1015
++#: g10/keyedit.c:1016
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
  "trust signatures on your behalf.\n"
  msgstr ""
  
- #: g10/keyedit.c:1032
++#: g10/keyedit.c:1033
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  
- #: g10/keyedit.c:1160
++#: g10/keyedit.c:1161
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1168
++#: g10/keyedit.c:1169
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "O ID de usuario \"%s\" está revocado."
  
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
- #: g10/keyedit.c:2246
++#: g10/keyedit.c:1178 g10/keyedit.c:1206 g10/keyedit.c:1233 g10/keyedit.c:1417
++#: g10/keyedit.c:2247
  msgid "Are you sure you still want to sign it? (y/N) "
  msgstr "¿Está seguro de que quere asinalo? (s/N) "
  
- #: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
- #: g10/keyedit.c:2251 g10/keyedit.c:3177
++#: g10/keyedit.c:1192 g10/keyedit.c:1220 g10/keyedit.c:1247 g10/keyedit.c:1423
++#: g10/keyedit.c:2252 g10/keyedit.c:3178
  msgid "  Unable to sign.\n"
  msgstr " Non se puido asinar.\n"
  
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1197
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "O ID de usuario \"%s\" está caducado."
  
- #: g10/keyedit.c:1224
++#: g10/keyedit.c:1225
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "O ID de usuario \"%s\" non está asinado por el mesmo."
  
- #: g10/keyedit.c:1253
++#: g10/keyedit.c:1254
  #, fuzzy, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "O ID de usuario \"%s\" non está asinado por el mesmo."
  
- #: g10/keyedit.c:1255
++#: g10/keyedit.c:1256
  #, fuzzy
  msgid "Sign it? (y/N) "
  msgstr "¿Asinar de verdade? "
  
- #: g10/keyedit.c:1282
++#: g10/keyedit.c:1283
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -3981,11 -3106,9 +3934,11 @@@ msgstr "
  "A auto-sinatura de \"%s\"\n"
  "é unha sinatura tipo PGP 2.x\n"
  
- #: g10/keyedit.c:1291
++#: g10/keyedit.c:1292
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr "¿Quere promovela a unha auto-sinatura OpenPGP? (s/N) "
  
- #: g10/keyedit.c:1304
++#: g10/keyedit.c:1305
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3994,11 -3117,9 +3947,11 @@@ msgstr "
  "A súa sinatura actual en \"%s\"\n"
  "caducou.\n"
  
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:1310
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr "¿Quere emitir unha nova sinatura que substitúa á caducada? (s/N) "
  
- #: g10/keyedit.c:1330
++#: g10/keyedit.c:1331
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -4007,43 -3128,34 +3960,43 @@@ msgstr "
  "A súa sinatura actual en \"%s\"\n"
  "é unha sinatura local.\n"
  
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:1336
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr "¿Quere promovela a sinatura totalmente exportable? (s/N) "
  
- #: g10/keyedit.c:1355
++#: g10/keyedit.c:1356
  #, fuzzy, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "\"%s\" xa estaba asinado localmente coa chave %08lX\n"
  
- #: g10/keyedit.c:1359
++#: g10/keyedit.c:1360
  #, fuzzy, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "\"%s\" xa estaba asinado coa chave %08lX\n"
  
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:1365
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "¿Quere asinalo outra vez de tódolos xeitos? (s/N) "
  
- #: g10/keyedit.c:1386
++#: g10/keyedit.c:1387
  #, fuzzy, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "Nada que asinar coa chave %08lX\n"
  
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1411
  msgid "This key has expired!"
  msgstr "¡Esta chave caducou!"
  
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1429
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "Esta chave ha caducar o %s.\n"
  
- #: g10/keyedit.c:1434
++#: g10/keyedit.c:1435
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr "¿Quere que a súa sinatura caduque ao mesmo tempo? (S/n) "
  
- #: g10/keyedit.c:1475
++#: g10/keyedit.c:1476
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -4052,32 -3164,26 +4005,32 @@@ msgstr "
  "¿Con canto tino comprobou que a chave que vai asinar realmente pertence á\n"
  "persoa de enriba? Se non sabe que respostar, introduza \"0\".\n"
  
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1481
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) Non hei respostar.%s\n"
  
- #: g10/keyedit.c:1482
++#: g10/keyedit.c:1483
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) Non o comprobei en absoluto.%s\n"
  
- #: g10/keyedit.c:1484
++#: g10/keyedit.c:1485
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) Fixen algunhas comprobacións.%s\n"
  
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:1488
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) Fixen comprobacións moi exhaustivas.%s\n"
  
- #: g10/keyedit.c:1494
++#: g10/keyedit.c:1495
  #, fuzzy
  msgid "Your selection? (enter '?' for more information): "
  msgstr "¿A súa elección? (introduza '?' para ter máis información): "
  
- #: g10/keyedit.c:1521
++#: g10/keyedit.c:1522
  #, fuzzy, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -4086,271 -3192,217 +4039,271 @@@ msgstr "
  "¿Esta seguro de que quere asinar esta chave\n"
  "coa súa chave: \""
  
- #: g10/keyedit.c:1529
++#: g10/keyedit.c:1530
  #, fuzzy
  msgid "This will be a self-signature.\n"
  msgstr ""
  "\n"
  "Esta ha ser unha auto-sinatura.\n"
  
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:1535
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr ""
  "\n"
  "AVISO: a sinatura non se ha marcar coma non exportable.\n"
  
- #: g10/keyedit.c:1541
++#: g10/keyedit.c:1542
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr ""
  "\n"
  "AVISO: A sinatura non se ha marcar coma non revocable.\n"
  
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1552
  #, fuzzy
  msgid "The signature will be marked as non-exportable.\n"
  msgstr ""
  "\n"
  "A sinatura hase marcar coma non exportable.\n"
  
- #: g10/keyedit.c:1558
++#: g10/keyedit.c:1559
  #, fuzzy
  msgid "The signature will be marked as non-revocable.\n"
  msgstr ""
  "\n"
  "A sinatura hase marcar coma non revocable.\n"
  
- #: g10/keyedit.c:1565
++#: g10/keyedit.c:1566
  #, fuzzy
  msgid "I have not checked this key at all.\n"
  msgstr ""
  "\n"
  "Non se comprobou esta chave en absoluto.\n"
  
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:1571
  #, fuzzy
  msgid "I have checked this key casually.\n"
  msgstr ""
  "\n"
  "Comprobouse esta chave de xeito informal.\n"
  
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:1576
  #, fuzzy
  msgid "I have checked this key very carefully.\n"
  msgstr ""
  "\n"
  "Comprobouse esta chave con moito tino.\n"
  
- #: g10/keyedit.c:1587
++#: g10/keyedit.c:1588
  #, fuzzy
  msgid "Really sign? (y/N) "
  msgstr "¿Asinar de verdade? "
  
- #: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
- #: g10/keyedit.c:6463 g10/sign.c:323
++#: g10/keyedit.c:1639 g10/keyedit.c:6308 g10/keyedit.c:6391 g10/keyedit.c:6500
++#: g10/keyedit.c:6562 g10/sign.c:325
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "fallou a sinatura: %s\n"
  
- #: g10/keyedit.c:1725
++#: g10/keyedit.c:1726
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  
- #: g10/keyedit.c:1755
++#: g10/keyedit.c:1756
  #, fuzzy, c-format
  #| msgid "error creating passphrase: %s\n"
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: g10/keyedit.c:1869
++#: g10/keyedit.c:1870
  msgid "save and quit"
  msgstr "gardar e saír"
  
- #: g10/keyedit.c:1872
++#: g10/keyedit.c:1873
  #, fuzzy
  msgid "show key fingerprint"
  msgstr "amosar fingerprint"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1874
  #, fuzzy
  msgid "show the keygrip"
  msgstr "Notación de sinaturas: "
  
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1875
  msgid "list key and user IDs"
  msgstr "listar chave e IDs de usuario"
  
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1877
  msgid "select user ID N"
  msgstr "selecciona-lo ID de usuario N"
  
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1878
  #, fuzzy
  msgid "select subkey N"
  msgstr "selecciona-lo ID de usuario N"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1879
  #, fuzzy
  msgid "check signatures"
  msgstr "revocar sinaturas"
  
- #: g10/keyedit.c:1884
++#: g10/keyedit.c:1885
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr ""
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1890
  #, fuzzy
  msgid "sign selected user IDs locally"
  msgstr "asina-la chave localmente"
  
- #: g10/keyedit.c:1890
++#: g10/keyedit.c:1891
  #, fuzzy
  msgid "sign selected user IDs with a trust signature"
  msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1893
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr ""
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1895
  msgid "add a user ID"
  msgstr "engadir un ID de usuario"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1897
  msgid "add a photo ID"
  msgstr "engadir unha identificación fotográfica"
  
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1898
  #, fuzzy
  msgid "delete selected user IDs"
  msgstr "borrar un ID de usuario"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1901
  #, fuzzy
  msgid "add a subkey"
  msgstr "addkey"
  
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1904
  msgid "add a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1906
  msgid "move a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1908
  msgid "move a backup key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1910
  #, fuzzy
  msgid "delete selected subkeys"
  msgstr "borrar unha chave secundaria"
  
- #: g10/keyedit.c:1911
++#: g10/keyedit.c:1912
  msgid "add a revocation key"
  msgstr "engadir unha chave de revocación"
  
- #: g10/keyedit.c:1913
++#: g10/keyedit.c:1914
  #, fuzzy
  msgid "delete signatures from the selected user IDs"
  msgstr ""
  "¿Seguro que quere actualiza-las preferencias dos IDs de usuario "
  "seleccionados? "
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1916
  #, fuzzy
  msgid "change the expiration date for the key or selected subkeys"
  msgstr "Non pode cambia-la data de expiración dunha chave v3\n"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1918
  #, fuzzy
  msgid "flag the selected user ID as primary"
  msgstr "marcar un ID de usuario coma primario"
  
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1921
  msgid "list preferences (expert)"
  msgstr "lista-las preferencias (expertos)"
  
- #: g10/keyedit.c:1921
++#: g10/keyedit.c:1922
  msgid "list preferences (verbose)"
  msgstr "lista-las preferencias (moitos datos)"
  
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:1924
  #, fuzzy
  msgid "set preference list for the selected user IDs"
  msgstr ""
  "¿Seguro que quere actualiza-las preferencias dos IDs de usuario "
  "seleccionados? "
  
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1927
  #, fuzzy
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr "non se puido analisa-lo URI do servidor de chaves\n"
  
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1929
  #, fuzzy
  msgid "set a notation for the selected user IDs"
  msgstr ""
  "¿Seguro que quere actualiza-las preferencias dos IDs de usuario "
  "seleccionados? "
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1931
  msgid "change the passphrase"
  msgstr "cambia-lo contrasinal"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1934
  msgid "change the ownertrust"
  msgstr "cambia-la confianza sobre o dono"
  
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1937
  #, fuzzy
  msgid "revoke signatures on the selected user IDs"
  msgstr "¿Seguro de que quere revocar tódolos IDs de usuario seleccionados? "
  
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1939
  #, fuzzy
  msgid "revoke selected user IDs"
  msgstr "revocar un ID de usuario"
  
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1942
  #, fuzzy
  msgid "revoke key or selected subkeys"
  msgstr "revocar unha chave secundaria"
  
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1944
  #, fuzzy
  msgid "enable key"
  msgstr "habilitar unha chave"
  
- #: g10/keyedit.c:1944
++#: g10/keyedit.c:1945
  #, fuzzy
  msgid "disable key"
  msgstr "deshabilitar unha chave"
  
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1947
  #, fuzzy
  msgid "show selected photo IDs"
  msgstr "amosa-la identificación fotográfica"
  
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1949
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:1951
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2063
  msgid "Secret key is available.\n"
  msgstr "A chave secreta está disponible.\n"
  
- #: g10/keyedit.c:2162
++#: g10/keyedit.c:2163
  msgid "Need the secret key to do this.\n"
  msgstr "Cómpre a chave secreta para facer isto.\n"
  
- #: g10/keyedit.c:2183
++#: g10/keyedit.c:2184
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4358,281 -3410,226 +4311,286 @@@
  "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
  msgstr ""
  
- #: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
++#: g10/keyedit.c:2240 g10/keyedit.c:3178 g10/keyedit.c:3317 g10/keyedit.c:3379
  msgid "Key is revoked."
  msgstr "A chave está revocada."
  
- #: g10/keyedit.c:2262
++#: g10/keyedit.c:2263
  #, fuzzy
  msgid "Really sign all user IDs? (y/N) "
  msgstr "¿Seguro de que quere asinar tódolos IDs de usuario? "
  
- #: g10/keyedit.c:2266
++#: g10/keyedit.c:2267
  #, fuzzy
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "¿Seguro de que quere asinar tódolos IDs de usuario? "
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2275
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
  
- #: g10/keyedit.c:2285
++#: g10/keyedit.c:2286
  #, fuzzy, c-format
  msgid "Unknown signature type '%s'\n"
  msgstr "clase de sinatura descoñecida"
  
- #: g10/keyedit.c:2309
++#: g10/keyedit.c:2310
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
  msgstr "Non se admite este comando no modo %s.\n"
  
- #: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
++#: g10/keyedit.c:2332 g10/keyedit.c:2356 g10/keyedit.c:2550
  msgid "You must select at least one user ID.\n"
  msgstr "Debe seleccionar alomenos un ID de usuario.\n"
  
- #: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
++#: g10/keyedit.c:2334 g10/keyedit.c:2358 g10/keyedit.c:2512 g10/keyedit.c:2552
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2336
++#: g10/keyedit.c:2337
  msgid "You can't delete the last user ID!\n"
  msgstr "¡Non pode borra-lo último ID de usuario!\n"
  
- #: g10/keyedit.c:2339
++#: g10/keyedit.c:2340
  #, fuzzy
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "¿Seguro de que quere borrar tódolos IDs de usuario seleccionados? "
  
- #: g10/keyedit.c:2340
++#: g10/keyedit.c:2341
  #, fuzzy
  msgid "Really remove this user ID? (y/N) "
  msgstr "¿Seguro de que quere borrar este ID de usuario? "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2397
++#: g10/keyedit.c:2398
  #, fuzzy
  msgid "Really move the primary key? (y/N) "
  msgstr "¿Seguro de que quere borrar este ID de usuario? "
  
- #: g10/keyedit.c:2409 g10/keyedit.c:4866
++#: g10/keyedit.c:2410 g10/keyedit.c:4964
  #, fuzzy
  msgid "You must select exactly one key.\n"
  msgstr "Debe seleccionar alomenos unha chave.\n"
  
- #: g10/keyedit.c:2436
++#: g10/keyedit.c:2437
  msgid "Command expects a filename argument\n"
  msgstr ""
  
- #: g10/keyedit.c:2457
++#: g10/keyedit.c:2458
  #, fuzzy, c-format
  msgid "Can't open '%s': %s\n"
  msgstr "non se puido abrir `%s': %s\n"
  
- #: g10/keyedit.c:2474
++#: g10/keyedit.c:2475
  #, fuzzy, c-format
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "erro ao crea-lo chaveiro `%s': %s\n"
  
- #: g10/keyedit.c:2509
++#: g10/keyedit.c:2510
  msgid "You must select at least one key.\n"
  msgstr "Debe seleccionar alomenos unha chave.\n"
  
- #: g10/keyedit.c:2515
++#: g10/keyedit.c:2516
  #, fuzzy
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "¿Seguro de que quere borra-las chaves seleccionadas? "
  
- #: g10/keyedit.c:2517
++#: g10/keyedit.c:2518
  #, fuzzy
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "¿Seguro de que quere borrar esta chave? "
  
- #: g10/keyedit.c:2555
++#: g10/keyedit.c:2556
  #, fuzzy
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr "¿Seguro de que quere revocar tódolos IDs de usuario seleccionados? "
  
- #: g10/keyedit.c:2556
++#: g10/keyedit.c:2557
  #, fuzzy
  msgid "Really revoke this user ID? (y/N) "
  msgstr "¿Seguro de que quere revocar este ID de usuario? "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2575
  #, fuzzy
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "¿Realmente quere revocar esta chave? "
  
- #: g10/keyedit.c:2585
++#: g10/keyedit.c:2586
  #, fuzzy
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "¿Realmente quere revoca-las chaves seleccionadas? "
  
- #: g10/keyedit.c:2587
++#: g10/keyedit.c:2588
  #, fuzzy
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "¿Realmente quere revocar esta chave? "
  
- #: g10/keyedit.c:2645
++#: g10/keyedit.c:2646
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  
- #: g10/keyedit.c:2690
++#: g10/keyedit.c:2691
  #, fuzzy
  msgid "Set preference list to:\n"
  msgstr "estabrece-la lista de preferencias"
  
- #: g10/keyedit.c:2697
++#: g10/keyedit.c:2698
  #, fuzzy
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr ""
  "¿Seguro que quere actualiza-las preferencias dos IDs de usuario "
  "seleccionados? "
  
- #: g10/keyedit.c:2699
++#: g10/keyedit.c:2700
  #, fuzzy
  msgid "Really update the preferences? (y/N) "
  msgstr "¿Realmente desexa actualiza-las preferencias? "
  
- #: g10/keyedit.c:2773
++#: g10/keyedit.c:2774
  #, fuzzy
  msgid "Save changes? (y/N) "
  msgstr "¿Garda-los cambios? "
  
- #: g10/keyedit.c:2777
++#: g10/keyedit.c:2778
  #, fuzzy
  msgid "Quit without saving? (y/N) "
  msgstr "¿Saír sin gardar? "
  
- #: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
- #: g10/keyedit.c:3267 g10/keyedit.c:3332
++#: g10/keyedit.c:2789 g10/keyedit.c:2799 g10/keyedit.c:2943 g10/keyedit.c:3046
++#: g10/keyedit.c:3268 g10/keyedit.c:3333 g10/keyedit.c:3409
  #, c-format
  msgid "update failed: %s\n"
  msgstr "a actualización fallou: %s\n"
  
- #: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
++#: g10/keyedit.c:2805 g10/keyedit.c:3273 g10/keyedit.c:3338 g10/keyedit.c:3416
  msgid "Key not changed so no update needed.\n"
  msgstr "A chave non cambiou, polo que non fai falla actualizar.\n"
  
- #: g10/keyedit.c:3038
++#: g10/keyedit.c:3039
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
  msgstr "A xeración da chave fallou: %s\n"
  
- #: g10/keyedit.c:3083
++#: g10/keyedit.c:3084
  #, fuzzy, c-format
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "erro: pegada dactilar non válida\n"
  
- #: g10/keyedit.c:3112
++#: g10/keyedit.c:3113
  #, 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:3248 g10/keyedit.c:3251
++#: g10/keyedit.c:3249 g10/keyedit.c:3252
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
  msgstr "valor non válido\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  #, fuzzy
  #| msgid "No such user ID.\n"
  msgid "No matching user IDs."
  msgstr "Non hai tal ID de usuario.\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  #, fuzzy
  msgid "Nothing to sign.\n"
  msgstr "Nada que asinar coa chave %08lX\n"
  
- #: g10/keyedit.c:3427
++#: g10/keyedit.c:3388
+ #, 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:3508
  msgid "Digest: "
  msgstr "Resumo: "
  
- #: g10/keyedit.c:3484
++#: g10/keyedit.c:3565
  msgid "Features: "
  msgstr "Características: "
  
- #: g10/keyedit.c:3495
++#: g10/keyedit.c:3576
  msgid "Keyserver no-modify"
  msgstr ""
  
- #: g10/keyedit.c:3510 g10/keylist.c:377
++#: g10/keyedit.c:3591 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr ""
  
- #: g10/keyedit.c:3518 g10/keyedit.c:3519
++#: g10/keyedit.c:3599 g10/keyedit.c:3600
  #, fuzzy
  msgid "Notations: "
  msgstr "Notación: "
  
- #: g10/keyedit.c:3764
++#: g10/keyedit.c:3845
  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:3836
++#: g10/keyedit.c:3917
  #, 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:3860
++#: g10/keyedit.c:3941
  #, 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:3866
++#: g10/keyedit.c:3947
  #, fuzzy
  msgid "(sensitive)"
  msgstr " (sensible)"
  
- #: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3989 g10/keyedit.c:4131 g10/keylist.c:262 g10/keyserver.c:538
  #, fuzzy, c-format
  msgid "created: %s"
  msgstr "non foi posible crear %s: %s\n"
  
- #: g10/keyedit.c:3911 g10/keylist.c:1852
++#: g10/keyedit.c:3992 g10/keylist.c:1852
  #, fuzzy, c-format
  msgid "revoked: %s"
  msgstr "[revocada] "
  
- #: g10/keyedit.c:3913 g10/keylist.c:1858
++#: g10/keyedit.c:3994 g10/keylist.c:1858
  #, fuzzy, c-format
  msgid "expired: %s"
  msgstr " [caduca: %s]"
  
- #: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyedit.c:3996 g10/keyedit.c:4133 g10/keylist.c:264 g10/keylist.c:1864
 +#: g10/keyserver.c:544
  #, fuzzy, c-format
  msgid "expires: %s"
  msgstr " [caduca: %s]"
  
- #: g10/keyedit.c:3917
++#: g10/keyedit.c:3998
  #, fuzzy, c-format
  msgid "usage: %s"
  msgstr " confianza: %c/%c"
  
- #: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
++#: g10/keyedit.c:4006 g10/keyedit.c:4026 g10/keylist.c:267
  msgid "card-no: "
  msgstr ""
  
- #: g10/keyedit.c:3984
++#: g10/keyedit.c:4065
  #, fuzzy, c-format
  msgid "trust: %s"
  msgstr " confianza: %c/%c"
  
- #: g10/keyedit.c:3988
++#: g10/keyedit.c:4069
  #, c-format
  msgid "validity: %s"
  msgstr ""
  
- #: g10/keyedit.c:3995
++#: g10/keyedit.c:4076
  msgid "This key has been disabled"
  msgstr "Esta chave está desactivada"
  
- #: g10/keyedit.c:4013
++#: g10/keyedit.c:4094
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4640,20 -3637,14 +4598,20 @@@ 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:4069 g10/keyedit.c:4500 g10/keyserver.c:548
- #: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: g10/keyedit.c:4150 g10/keyedit.c:4581 g10/keyserver.c:548
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:712
 +#: dirmngr/ocsp.c:703
  #, fuzzy
  msgid "revoked"
  msgstr "[revocada] "
  
- #: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
- #: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4152 g10/keyedit.c:4583 g10/keyserver.c:552
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:714
  #, fuzzy
  msgid "expired"
  msgstr "expire"
  
- #: g10/keyedit.c:4188
++#: g10/keyedit.c:4269
  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"
@@@ -4661,17 -3652,14 +4619,17 @@@ 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:4240
++#: g10/keyedit.c:4321
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr ""
  
- #: g10/keyedit.c:4241
++#: g10/keyedit.c:4322
  #, fuzzy
  #| 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:4300
++#: g10/keyedit.c:4381
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4680,37 -3668,29 +4638,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:4305 g10/keyedit.c:4595
++#: g10/keyedit.c:4386 g10/keyedit.c:4676
  msgid "Are you sure you still want to add it? (y/N) "
  msgstr "¿Está seguro de que quere engadila? (s/N) "
  
- #: g10/keyedit.c:4311
++#: g10/keyedit.c:4392
  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:4326 g10/keygen.c:2697
++#: g10/keyedit.c:4407 g10/keygen.c:2719
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4509
  msgid "Delete this good signature? (y/N/q)"
  msgstr "¿Borrar esta sinatura correcta? (s/N/q)"
  
- #: g10/keyedit.c:4438
++#: g10/keyedit.c:4519
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "¿Borrar esta sinatura incorrecta? (s/N/q)"
  
- #: g10/keyedit.c:4442
++#: g10/keyedit.c:4523
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "¿Borrar esta sinatura descoñecida? (s/N/q)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4530
  msgid "Really delete this self-signature? (y/N)"
  msgstr "¿Realmente quere borrar esta auto-sinatura? (s/N)"
  
- #: g10/keyedit.c:4465
++#: g10/keyedit.c:4546
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
@@@ -4718,38 -3698,31 +4676,38 @@@ msgid_plural "Deleted %d signatures.\n
  msgstr[0] "Borrada %d sinatura.\n"
  msgstr[1] "Borrada %d sinatura.\n"
  
- #: g10/keyedit.c:4469
++#: g10/keyedit.c:4550
  msgid "Nothing deleted.\n"
  msgstr "Non se borrou nada.\n"
  
- #: g10/keyedit.c:4504 g10/trust.c:693
++#: g10/keyedit.c:4585 g10/trust.c:716
  #, fuzzy
  msgid "invalid"
  msgstr "armadura non válida"
  
- #: g10/keyedit.c:4506
++#: g10/keyedit.c:4587
  #, fuzzy, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "O ID de usuario \"%s\" está revocado."
  
- #: g10/keyedit.c:4512
++#: g10/keyedit.c:4593
  #, 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:4520
++#: g10/keyedit.c:4601
  #, fuzzy, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "o ID de usuario \"%s\" xa está revocado\n"
  
- #: g10/keyedit.c:4521
++#: g10/keyedit.c:4602
  #, fuzzy, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "o ID de usuario \"%s\" xa está revocado\n"
  
- #: g10/keyedit.c:4590
++#: g10/keyedit.c:4671
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4759,43 -3732,35 +4717,43 @@@ msgstr "
  "designado\n"
  "       pode facer que algunhas versións de PGP rexeiten esta chave.\n"
  
- #: g10/keyedit.c:4601
++#: g10/keyedit.c:4682
  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:4618
++#: g10/keyedit.c:4699
  msgid "Enter the user ID of the designated revoker: "
  msgstr "Introduza o ID de usuario do revocador designado: "
  
- #: g10/keyedit.c:4643
++#: g10/keyedit.c:4724
  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:4658
++#: g10/keyedit.c:4739
  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:4680
++#: g10/keyedit.c:4761
  #, fuzzy
  msgid "this key has already been designated as a revoker\n"
  msgstr "AVISO: ¡Esta chave está revocada polo propietario!\n"
  
- #: g10/keyedit.c:4698
++#: g10/keyedit.c:4779
  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:4704
++#: g10/keyedit.c:4785
  #, 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:4755
++#: g10/keyedit.c:4848
  #, fuzzy
  msgid ""
  "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@@ -4803,243 -3768,192 +4761,243 @@@
  msgstr ""
  "¿Está seguro de que quere nomear esta chave coma revocador designado? (s/N): "
  
- #: g10/keyedit.c:4760
++#: g10/keyedit.c:4853
  #, fuzzy
  msgid "Changing expiration time for a subkey.\n"
  msgstr "Cambiando a data de expiración para a chave secundaria.\n"
  
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:4856
  msgid "Changing expiration time for the primary key.\n"
  msgstr "Cambiando a data de expiración da chave primaria.\n"
  
- #: g10/keyedit.c:4814
++#: g10/keyedit.c:4910
  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:4987
++#: g10/keyedit.c:5085
  #, 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:4993
++#: g10/keyedit.c:5091
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr ""
  
- #: g10/keyedit.c:5108
++#: g10/keyedit.c:5206
  msgid "Please select exactly one user ID.\n"
  msgstr "Escolla exactamente un ID de usuario.\n"
  
- #: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
++#: g10/keyedit.c:5247 g10/keyedit.c:5361 g10/keyedit.c:5474 g10/keyedit.c:5611
  #, 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:5320
++#: g10/keyedit.c:5418
  msgid "Enter your preferred keyserver URL: "
  msgstr ""
  
- #: g10/keyedit.c:5399
++#: g10/keyedit.c:5497
  #, fuzzy
  msgid "Are you sure you want to replace it? (y/N) "
  msgstr "¿Está seguro de que quere empregala (s/N)? "
  
- #: g10/keyedit.c:5400
++#: g10/keyedit.c:5498
  #, fuzzy
  msgid "Are you sure you want to delete it? (y/N) "
  msgstr "¿Está seguro de que quere empregala (s/N)? "
  
- #: g10/keyedit.c:5459
++#: g10/keyedit.c:5557
  #, fuzzy
  msgid "Enter the notation: "
  msgstr "Notación de sinaturas: "
  
- #: g10/keyedit.c:5606
++#: g10/keyedit.c:5704
  #, fuzzy
  msgid "Proceed? (y/N) "
  msgstr "¿Sobrescribir? (s/N) "
  
- #: g10/keyedit.c:5676
++#: g10/keyedit.c:5774
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "Non hai ID de usuario con índice %d\n"
  
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5836
  #, fuzzy, c-format
  msgid "No user ID with hash %s\n"
  msgstr "Non hai ID de usuario con índice %d\n"
  
- #: g10/keyedit.c:5839
++#: g10/keyedit.c:5937
  #, fuzzy, c-format
  msgid "No subkey with key ID '%s'.\n"
  msgstr "Non hai ID de usuario con índice %d\n"
  
- #: g10/keyedit.c:5861
++#: g10/keyedit.c:5959
  #, fuzzy, c-format
  msgid "No subkey with index %d\n"
  msgstr "Non hai ID de usuario con índice %d\n"
  
- #: g10/keyedit.c:6002
++#: g10/keyedit.c:6100
  #, fuzzy, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "ID de usuario: \""
  
- #: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
++#: g10/keyedit.c:6103 g10/keyedit.c:6205 g10/keyedit.c:6253
  #, 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:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
++#: g10/keyedit.c:6105 g10/keyedit.c:6207 g10/keyedit.c:6255
  msgid " (non-exportable)"
  msgstr " (non exportable)"
  
- #: g10/keyedit.c:6011
++#: g10/keyedit.c:6109
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "Esta sinatura caducou o %s.\n"
  
- #: g10/keyedit.c:6016
++#: g10/keyedit.c:6114
  msgid "Are you sure you still want to revoke it? (y/N) "
  msgstr "¿Está seguro de que quere revocala? (s/N) "
  
- #: g10/keyedit.c:6021
++#: g10/keyedit.c:6119
  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:6075
++#: g10/keyedit.c:6173
  #, fuzzy
  msgid "Not signed by you.\n"
  msgstr "   asinada por %08lX no %s%s\n"
  
- #: g10/keyedit.c:6081
++#: g10/keyedit.c:6179
  #, fuzzy, c-format
  msgid "You have signed these user IDs on key %s:\n"
  msgstr "Asinou estes IDs de usuario: \n"
  
- #: g10/keyedit.c:6110
++#: g10/keyedit.c:6208
  #, fuzzy
  msgid " (non-revocable)"
  msgstr " (non exportable)"
  
- #: g10/keyedit.c:6117
++#: g10/keyedit.c:6215
  #, fuzzy, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "   revocada por %08lX no %s\n"
  
- #: g10/keyedit.c:6142
++#: g10/keyedit.c:6240
  msgid "You are about to revoke these signatures:\n"
  msgstr "Está a punto de revocar estas sinaturas:\n"
  
- #: g10/keyedit.c:6165
++#: g10/keyedit.c:6263
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "¿Realmente desexa crea-los certificados de revocación? (s/N) "
  
- #: g10/keyedit.c:6198
++#: g10/keyedit.c:6296
  msgid "no secret key\n"
  msgstr "non hai chave secreta\n"
  
- #: g10/keyedit.c:6246
++#: g10/keyedit.c:6344
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6256
++#: g10/keyedit.c:6354
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "o ID de usuario \"%s\" xa está revocado\n"
  
- #: g10/keyedit.c:6273
++#: g10/keyedit.c:6371
  #, 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:6386
++#: g10/keyedit.c:6485
  #, fuzzy, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "o ID de usuario \"%s\" xa está revocado\n"
  
- #: g10/keyedit.c:6448
++#: g10/keyedit.c:6547
  #, fuzzy, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "o ID de usuario \"%s\" xa está revocado\n"
  
- #: g10/keyedit.c:6545
++#: g10/keyedit.c:6644
  #, fuzzy, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr ""
  "Amosando a id. fotográfica %s de tamaño %ld da chave 0x%08lX (uid %d)\n"
  
- #: g10/keygen.c:305
++#: g10/keygen.c:316
  #, fuzzy, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "preferencia %c%lu duplicada\n"
  
- #: g10/keygen.c:312
++#: g10/keygen.c:323
  #, fuzzy
  msgid "too many cipher preferences\n"
  msgstr "demasiadas preferencias `%c'\n"
  
- #: g10/keygen.c:314
++#: g10/keygen.c:325
  #, fuzzy
  msgid "too many digest preferences\n"
  msgstr "demasiadas preferencias `%c'\n"
  
- #: g10/keygen.c:316
++#: g10/keygen.c:327
  #, fuzzy
  msgid "too many compression preferences\n"
  msgstr "demasiadas preferencias `%c'\n"
  
- #: g10/keygen.c:457
++#: g10/keygen.c:468
  #, fuzzy, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "caracter non válido na cadea de preferencias\n"
  
- #: g10/keygen.c:936
++#: g10/keygen.c:947
  msgid "writing direct signature\n"
  msgstr "escribindo unha sinatura directa\n"
  
- #: g10/keygen.c:982
++#: g10/keygen.c:993
  msgid "writing self signature\n"
  msgstr "escribindo a propia sinatura\n"
  
- #: g10/keygen.c:1038
++#: g10/keygen.c:1049
  msgid "writing key binding signature\n"
  msgstr "escribindo unha sinatura que liga a chave\n"
  
- #: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
- #: g10/keygen.c:1610 g10/keygen.c:1615
++#: g10/keygen.c:1413 g10/keygen.c:1418 g10/keygen.c:1470 g10/keygen.c:1475
++#: g10/keygen.c:1622 g10/keygen.c:1627
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "tamaño de chave non válido; empregando %u bits\n"
  
- #: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
++#: g10/keygen.c:1424 g10/keygen.c:1481 g10/keygen.c:1489 g10/keygen.c:1633
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "tamaño de chave redondeado a %u bits\n"
  
- #: g10/keygen.c:1503
++#: g10/keygen.c:1515
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1677
++#: g10/keygen.c:1689
  #, fuzzy
  msgid "Sign"
  msgstr "sign"
  
- #: g10/keygen.c:1680
++#: g10/keygen.c:1692
  msgid "Certify"
  msgstr ""
  
- #: g10/keygen.c:1683
++#: g10/keygen.c:1695
  #, fuzzy
  msgid "Encrypt"
  msgstr "cifrar datos"
  
- #: g10/keygen.c:1686
++#: g10/keygen.c:1698
  msgid "Authenticate"
  msgstr ""
  
@@@ -5053,157 -3967,126 +5011,157 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1705
++#: g10/keygen.c:1717
  msgid "SsEeAaQq"
  msgstr ""
  
- #: g10/keygen.c:1732
++#: g10/keygen.c:1744
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr ""
  
- #: g10/keygen.c:1738
++#: g10/keygen.c:1750
  msgid "Current allowed actions: "
  msgstr ""
  
- #: g10/keygen.c:1743
++#: g10/keygen.c:1755
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr ""
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1758
  #, fuzzy, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%d) ElGamal (só cifrar)\n"
  
- #: g10/keygen.c:1749
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr ""
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr ""
  
- #: g10/keygen.c:1881 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1893 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Por favor, seleccione o tipo de chave que quere:\n"
  
- #: g10/keygen.c:1885
++#: g10/keygen.c:1897
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) DSA e ElGamal (por defecto)\n"
  
- #: g10/keygen.c:1889
++#: g10/keygen.c:1901
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA e ElGamal (por defecto)\n"
  
- #: g10/keygen.c:1892
++#: g10/keygen.c:1904
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (só asinar)\n"
  
- #: g10/keygen.c:1894
++#: g10/keygen.c:1906
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (só asinar)\n"
  
- #: g10/keygen.c:1900
++#: g10/keygen.c:1912
  #, fuzzy, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) ElGamal (só cifrar)\n"
  
- #: g10/keygen.c:1902
++#: g10/keygen.c:1914
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (só cifrar)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1920
  #, fuzzy, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (só cifrar)\n"
  
- #: g10/keygen.c:1910
++#: g10/keygen.c:1922
  #, fuzzy, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (só cifrar)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1928
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA e ElGamal (por defecto)\n"
  
- #: g10/keygen.c:1918
++#: g10/keygen.c:1930
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (só asinar)\n"
  
- #: g10/keygen.c:1920
++#: g10/keygen.c:1932
  #, fuzzy, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) RSA (só cifrar)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1934
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) RSA (só cifrar)\n"
  
- #: g10/keygen.c:1926
++#: g10/keygen.c:1938
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) RSA (só cifrar)\n"
  
- #: g10/keygen.c:2022 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:206
  #, fuzzy
  msgid "Enter the keygrip: "
  msgstr "Notación de sinaturas: "
  
- #: g10/keygen.c:2035 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2047 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2049 sm/certreqgen-ui.c:216
  #, fuzzy
  msgid "No key with this keygrip\n"
  msgstr "Non hai ID de usuario con índice %d\n"
  
- #: g10/keygen.c:2111 g10/keygen.c:2125
++#: g10/keygen.c:2133 g10/keygen.c:2147
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
  msgstr "redondeado a %u bits\n"
  
- #: g10/keygen.c:2166
++#: g10/keygen.c:2188
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr ""
  
- #: g10/keygen.c:2174
++#: g10/keygen.c:2196
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "¿Qué tamaño de chave quere? (1024) "
  
- #: g10/keygen.c:2177 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2199 sm/certreqgen-ui.c:183
  #, fuzzy, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "¿Qué tamaño de chave quere? (1024) "
  
- #: g10/keygen.c:2191 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2213 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "O tamaño de chave requerido son %u bits\n"
  
- #: g10/keygen.c:2237
++#: g10/keygen.c:2259
  #, fuzzy
  #| msgid "Please select what kind of key you want:\n"
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Por favor, seleccione o tipo de chave que quere:\n"
  
- #: g10/keygen.c:2409
++#: g10/keygen.c:2431
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5219,7 -4102,6 +5177,7 @@@ msgstr "
  "      <n>m = a chave caduca en n meses\n"
  "      <n>y = a chave caduca en n anos\n"
  
- #: g10/keygen.c:2420
++#: g10/keygen.c:2442
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5235,40 -4117,32 +5193,40 @@@ msgstr "
  "      <n>m = a sinatura caduca en n meses\n"
  "      <n>y = a sinatura caduca en n anos\n"
  
- #: g10/keygen.c:2443
++#: g10/keygen.c:2465
  msgid "Key is valid for? (0) "
  msgstr "¿Por canto tempo é válida a chave? (0) "
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2470
  #, fuzzy, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "¿Por canto tempo é válida a sinatura? (0) "
  
- #: g10/keygen.c:2461 g10/keygen.c:2486
++#: g10/keygen.c:2483 g10/keygen.c:2508
  msgid "invalid value\n"
  msgstr "valor non válido\n"
  
- #: g10/keygen.c:2468
++#: g10/keygen.c:2490
  #, fuzzy
  msgid "Key does not expire at all\n"
  msgstr "%s non caduca nunca\n"
  
- #: g10/keygen.c:2469
++#: g10/keygen.c:2491
  #, fuzzy
  msgid "Signature does not expire at all\n"
  msgstr "%s non caduca nunca\n"
  
- #: g10/keygen.c:2474
++#: g10/keygen.c:2496
  #, fuzzy, c-format
  msgid "Key expires at %s\n"
  msgstr "%s caduca o %s\n"
  
- #: g10/keygen.c:2475
++#: g10/keygen.c:2497
  #, fuzzy, c-format
  msgid "Signature expires at %s\n"
  msgstr "A sinatura caduca o %s\n"
  
- #: g10/keygen.c:2479
++#: g10/keygen.c:2501
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5276,12 -4150,10 +5234,12 @@@ msgstr "
  "O seu sistema non pode amosar datas máis aló do 2038.\n"
  "Aínda así, hase tratar correctamente ata o 2106.\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2514
  #, fuzzy
  msgid "Is this correct? (y/N) "
  msgstr "¿Isto é correcto? (s/n) "
  
- #: g10/keygen.c:2560
++#: g10/keygen.c:2582
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5292,7 -4164,6 +5250,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2575
++#: g10/keygen.c:2597
  #, fuzzy
  msgid ""
  "\n"
@@@ -5309,50 -4180,39 +5267,50 @@@ msgstr "
  "     \"Heinrich Heime (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
  "\n"
  
- #: g10/keygen.c:2594
++#: g10/keygen.c:2616
  msgid "Real name: "
  msgstr "Nome: "
  
- #: g10/keygen.c:2603
++#: g10/keygen.c:2625
  msgid "Invalid character in name\n"
  msgstr "Caracter non válido no nome\n"
  
- #: g10/keygen.c:2604
++#: g10/keygen.c:2626
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2608
++#: g10/keygen.c:2630
  msgid "Name may not start with a digit\n"
  msgstr "O nome non pode comezar cun díxito\n"
  
- #: g10/keygen.c:2611
++#: g10/keygen.c:2633
  msgid "Name must be at least 5 characters long\n"
  msgstr "O nome debe ter alomenos 5 caracteres\n"
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2643
  msgid "Email address: "
  msgstr "Enderezo de E-mail: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2649
  msgid "Not a valid email address\n"
  msgstr "Non é un enderezo de e-mail válido\n"
  
- #: g10/keygen.c:2636
++#: g10/keygen.c:2658
  msgid "Comment: "
  msgstr "Comentario: "
  
- #: g10/keygen.c:2642
++#: g10/keygen.c:2664
  msgid "Invalid character in comment\n"
  msgstr "Carácter non válido no comentario\n"
  
- #: g10/keygen.c:2678
++#: g10/keygen.c:2700
  #, fuzzy, c-format
  #| msgid "You are using the `%s' character set.\n"
  msgid "You are using the '%s' character set.\n"
  msgstr "Está a usa-lo xogo de caracteres `%s'.\n"
  
- #: g10/keygen.c:2684
++#: g10/keygen.c:2706
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5363,7 -4223,6 +5321,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2689
++#: g10/keygen.c:2711
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr ""
  "Por favor, non poña o enderezo de correo no nome real ou no comentario\n"
@@@ -5379,35 -4238,28 +5337,35 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2714
++#: g10/keygen.c:2736
  msgid "NnCcEeOoQq"
  msgstr "NnCcEeAaSs"
  
- #: g10/keygen.c:2724
++#: g10/keygen.c:2746
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "¿Cambia-lo (N)ome, (C)omentario, (E)-mail ou (S)aír? "
  
- #: g10/keygen.c:2725
++#: g10/keygen.c:2747
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr "¿Cambiar (N)ome, (C)omentario, (E)-mail ou (A)ceptar/(S)aír? "
  
- #: g10/keygen.c:2730
++#: g10/keygen.c:2752
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "¿Cambia-lo (N)ome, (C)omentario, (E)-mail ou (S)aír? "
  
- #: g10/keygen.c:2731
++#: g10/keygen.c:2753
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "¿Cambiar (N)ome, (C)omentario, (E)-mail ou (A)ceptar/(S)aír? "
  
- #: g10/keygen.c:2750
++#: g10/keygen.c:2772
  msgid "Please correct the error first\n"
  msgstr "Por favor, corrixa antes o erro\n"
  
- #: g10/keygen.c:2796
++#: g10/keygen.c:2818
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5419,13 -4271,10 +5377,13 @@@ msgstr "
  "mentres se xeran os números primos; isto proporciónalle ao xerador de\n"
  "números aleatorios unha opoertunidade de acumular entropía de abondo.\n"
  
- #: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
- #: g10/keygen.c:4777 g10/keygen.c:4882
++#: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
++#: g10/keygen.c:4330 g10/keygen.c:4803 g10/keygen.c:5064 g10/keygen.c:5169
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "A xeración da chave fallou: %s\n"
  
- #: g10/keygen.c:3598
++#: g10/keygen.c:3922
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5433,68 -4282,55 +5391,68 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3924
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3621
++#: g10/keygen.c:3945
  #, fuzzy, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "`%s' xa está comprimido\n"
  
- #: g10/keygen.c:3626
++#: g10/keygen.c:3950
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "Create anyway? (y/N) "
  msgstr "¿Crear de tódolos xeitos? "
  
- #: g10/keygen.c:3632
++#: g10/keygen.c:3956
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "creating anyway\n"
  msgstr "¿Crear de tódolos xeitos? "
  
- #: g10/keygen.c:3981
++#: g10/keygen.c:4315
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:4013
++#: g10/keygen.c:4358
  msgid "Key generation canceled.\n"
  msgstr "Cancelouse a xeración de chaves.\n"
  
- #: g10/keygen.c:4073
++#: g10/keygen.c:4418
  #, fuzzy, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "non se pode crear `%s': %s\n"
  
- #: g10/keygen.c:4093
++#: g10/keygen.c:4438
  #, fuzzy, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
  
- #: g10/keygen.c:4244 g10/keygen.c:4393
++#: g10/keygen.c:4589 g10/keygen.c:4738
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
  msgstr "gravando a chave pública en `%s'\n"
  
- #: g10/keygen.c:4387
++#: g10/keygen.c:4732
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "non se atopou un chaveiro público no que se poida escribir: %s\n"
  
- #: g10/keygen.c:4401
++#: g10/keygen.c:4746
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error writing public keyring '%s': %s\n"
  msgstr "erro escribindo no chaveiro público `%s': %s\n"
  
- #: g10/keygen.c:4433
++#: g10/keygen.c:4778
  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:4445
++#: g10/keygen.c:4790
  #, fuzzy
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
@@@ -5504,7 -4340,6 +5462,7 @@@ msgstr "
  "queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
  "con esa finalidade.\n"
  
- #: g10/keygen.c:4649 g10/keygen.c:4833
++#: g10/keygen.c:4936 g10/keygen.c:5120
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5512,7 -4347,6 +5470,7 @@@ msgstr "
  "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
  "reloxo)\n"
  
- #: g10/keygen.c:4651 g10/keygen.c:4835
++#: g10/keygen.c:4938 g10/keygen.c:5122
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5520,22 -4354,18 +5478,22 @@@ msgstr "
  "creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
  "reloxo)\n"
  
- #: g10/keygen.c:4662 g10/keygen.c:4846
++#: g10/keygen.c:4949 g10/keygen.c:5133
  #, fuzzy
  #| 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:4674 g10/keygen.c:4676
++#: g10/keygen.c:4961 g10/keygen.c:4963
  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:4683 g10/keygen.c:4685
++#: g10/keygen.c:4970 g10/keygen.c:4972
  #, fuzzy
  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:4704 g10/keygen.c:4860
++#: g10/keygen.c:4991 g10/keygen.c:5147
  #, fuzzy
  msgid "Really create? (y/N) "
  msgstr "¿Crear realmente? "
@@@ -5862,128 -4627,102 +5820,128 @@@ msgstr "
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
  msgstr "revocación independente - empregue \"gpg --import\" para aplicar\n"
  
- #: g10/mainproc.c:1233 g10/mainproc.c:1276
++#: g10/mainproc.c:1238 g10/mainproc.c:1281
  #, fuzzy
  msgid "no signature found\n"
  msgstr "Sinatura correcta de \""
  
- #: g10/mainproc.c:1607
++#: g10/mainproc.c:1612
  #, fuzzy, c-format
  msgid "BAD signature from \"%s\""
  msgstr "Sinatura INCORRECTA de\""
  
- #: g10/mainproc.c:1609
++#: g10/mainproc.c:1614
  #, fuzzy, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Sinatura caducada de \""
  
- #: g10/mainproc.c:1611
++#: g10/mainproc.c:1616
  #, fuzzy, c-format
  msgid "Good signature from \"%s\""
  msgstr "Sinatura correcta de \""
  
- #: g10/mainproc.c:1630
++#: g10/mainproc.c:1635
  msgid "signature verification suppressed\n"
  msgstr "verificación de sinatura suprimida\n"
  
- #: g10/mainproc.c:1739
++#: g10/mainproc.c:1744
  #, fuzzy
  msgid "can't handle this ambiguous signature data\n"
  msgstr "non se poden manexar estas sinaturas múltiples\n"
  
- #: g10/mainproc.c:1753 g10/mainproc.c:1761
++#: g10/mainproc.c:1758 g10/mainproc.c:1766
  #, fuzzy, c-format
  msgid "Signature made %s\n"
  msgstr "A sinatura caducou o %s\n"
  
- #: g10/mainproc.c:1754 g10/mainproc.c:1762
++#: g10/mainproc.c:1759 g10/mainproc.c:1767
  #, fuzzy, c-format
  msgid "               using %s key %s\n"
  msgstr "               alias \""
  
- #: g10/mainproc.c:1766
++#: g10/mainproc.c:1771
  #, 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:1772
++#: g10/mainproc.c:1777
  #, fuzzy, c-format
  msgid "               issuer \"%s\"\n"
  msgstr "               alias \""
  
- #: g10/mainproc.c:1789
++#: g10/mainproc.c:1794
  msgid "Key available at: "
  msgstr "Chave dispoñible en: "
  
- #: g10/mainproc.c:2024
++#: g10/mainproc.c:2029
  msgid "[uncertain]"
  msgstr "[incerto]"
  
- #: g10/mainproc.c:2062
++#: g10/mainproc.c:2067
  #, fuzzy, c-format
  msgid "                aka \"%s\""
  msgstr "               alias \""
  
- #: g10/mainproc.c:2145
++#: g10/mainproc.c:2150
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "A sinatura caducou o %s\n"
  
- #: g10/mainproc.c:2149
++#: g10/mainproc.c:2154
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "A sinatura caduca o %s\n"
  
- #: g10/mainproc.c:2160
++#: g10/mainproc.c:2165
  #, 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:2161
++#: g10/mainproc.c:2166
  msgid "binary"
  msgstr "binario"
  
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2167
  msgid "textmode"
  msgstr "modo texto"
  
- #: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "descoñecido"
  
- #: g10/mainproc.c:2164
++#: g10/mainproc.c:2169
  #, fuzzy
  #| msgid "unknown pubkey algorithm"
  msgid ", key algorithm "
  msgstr "algoritmo de chave pública descoñecido"
  
- #: g10/mainproc.c:2199
++#: g10/mainproc.c:2204
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2229
++#: g10/mainproc.c:2234
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "Non foi posible verifica-la sinatura: %s\n"
  
- #: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
++#: g10/mainproc.c:2327 g10/mainproc.c:2346 g10/mainproc.c:2470
  msgid "not a detached signature\n"
  msgstr "non é unha sinatura separada\n"
  
- #: g10/mainproc.c:2375
++#: g10/mainproc.c:2380
  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:2384
++#: g10/mainproc.c:2389
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "sinatura independiente de clase 0x%02x\n"
  
- #: g10/mainproc.c:2469
++#: g10/mainproc.c:2474
  msgid "old style (PGP 2.x) signature\n"
  msgstr "Sinatura ó vello estilo (PGP 2.x)\n"
  
@@@ -6272,23 -4957,18 +6230,23 @@@ msgstr "¿É esta foto correcta (s/N/q)
  msgid "unable to display photo ID!\n"
  msgstr "¡non se pode amosa-la identificación fotográfica!\n"
  
- #: g10/pkclist.c:72 g10/revoke.c:757
++#: g10/pkclist.c:72 g10/revoke.c:758
  msgid "No reason specified"
  msgstr "Non se especificou un motivo"
  
- #: g10/pkclist.c:74 g10/revoke.c:759
++#: g10/pkclist.c:74 g10/revoke.c:760
  msgid "Key is superseded"
  msgstr "A chave é obsoleta"
  
- #: g10/pkclist.c:76 g10/revoke.c:758
++#: g10/pkclist.c:76 g10/revoke.c:759
  msgid "Key has been compromised"
  msgstr "Esta chave quedou descoberta"
  
- #: g10/pkclist.c:78 g10/revoke.c:760
++#: g10/pkclist.c:78 g10/revoke.c:761
  msgid "Key is no longer used"
  msgstr "Xa non se emprega esta chave"
  
- #: g10/pkclist.c:80 g10/revoke.c:761
++#: g10/pkclist.c:80 g10/revoke.c:762
  msgid "User ID is no longer valid"
  msgstr "O ID de usuario xa non é válido"
  
@@@ -6369,7 -5036,6 +6327,7 @@@ msgid "
  "\n"
  msgstr ""
  
- #: g10/pkclist.c:310 g10/revoke.c:786
++#: g10/pkclist.c:310 g10/revoke.c:787
  msgid "Your decision? "
  msgstr "¿A súa decisión? "
  
@@@ -6410,10 -5069,9 +6368,10 @@@ msgstr "
  "Non se atoparon certificados con confianza non definida.\n"
  "\n"
  
 +#: g10/pkclist.c:484
  #, fuzzy
  msgid ""
- "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "This key is bad!  It has been marked as untrusted!  If you\n"
  "*really* know what you are doing, you may answer the next\n"
  "question with yes.\n"
  msgstr ""
@@@ -6574,34 -5202,27 +6532,34 @@@ msgstr "
  msgid "No such user ID.\n"
  msgstr "Non hai tal ID de usuario.\n"
  
- #: g10/pkclist.c:1197 g10/pkclist.c:1273
++#: g10/pkclist.c:1197 g10/pkclist.c:1274
  msgid "skipped: public key already set as default recipient\n"
  msgstr ""
  "omitido: a chave pública xa está estabrecida coma destinatario por defecto\n"
  
- #: g10/pkclist.c:1218
++#: g10/pkclist.c:1219
  msgid "Public key is disabled.\n"
  msgstr "A chave pública está desactivada.\n"
  
- #: g10/pkclist.c:1228
++#: g10/pkclist.c:1229
  msgid "skipped: public key already set\n"
  msgstr "omitido: chave pública xa estabrecida\n"
  
- #: g10/pkclist.c:1263
++#: g10/pkclist.c:1264
  #, fuzzy, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "destinatario por defecto `%s' descoñecido\n"
  
- #: g10/pkclist.c:1312
++#: g10/pkclist.c:1313
  msgid "no valid addressees\n"
  msgstr "non hai enderezos válidos\n"
  
- #: g10/pkclist.c:1665
++#: g10/pkclist.c:1666
  #, fuzzy, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "chave %08lX: non hai ID de usuario\n"
  
- #: g10/pkclist.c:1690
++#: g10/pkclist.c:1691
  #, fuzzy, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "chave %08lX: non hai ID de usuario\n"
@@@ -6610,29 -5230,23 +6568,29 @@@
  msgid "data not saved; use option \"--output\" to save it\n"
  msgstr "os datos non foron gardados; use a opción \"--output\" para gardalos\n"
  
- #: g10/plaintext.c:598
++#: g10/plaintext.c:614
  msgid "Detached signature.\n"
  msgstr "Sinatura non adxunta.\n"
  
- #: g10/plaintext.c:606
++#: g10/plaintext.c:622
  msgid "Please enter name of data file: "
  msgstr "Por favor, introduza o nome do ficheiro de datos: "
  
- #: g10/plaintext.c:643
++#: g10/plaintext.c:659
  msgid "reading stdin ...\n"
  msgstr "lendo de stdin ...\n"
  
- #: g10/plaintext.c:688
++#: g10/plaintext.c:704
  msgid "no signed data\n"
  msgstr "non hai datos asinados\n"
  
- #: g10/plaintext.c:706
++#: g10/plaintext.c:722
  #, fuzzy, c-format
  #| msgid "can't open signed data `%s'\n"
  msgid "can't open signed data '%s'\n"
  msgstr "non foi posible abri-los datos asinados `%s'\n"
  
- #: g10/plaintext.c:741
++#: g10/plaintext.c:757
  #, fuzzy, c-format
  msgid "can't open signed data fd=%d: %s\n"
  msgstr "non foi posible abri-los datos asinados `%s'\n"
@@@ -6701,7 -5301,6 +6659,7 @@@ msgstr "A chave secreta está disponibl
  msgid "Create a designated revocation certificate for this key? (y/N) "
  msgstr "¿Crear un certificado de revocación para esta sinatura? "
  
- #: g10/revoke.c:336 g10/revoke.c:727
++#: g10/revoke.c:336 g10/revoke.c:728
  msgid "ASCII armored output forced.\n"
  msgstr "Forzouse unha saída con armadura ASCII.\n"
  
@@@ -6737,23 -5330,20 +6695,23 @@@ msgid "
  "the secret key.  However, if the secret key is still accessible,\n"
  "it is better to generate a new revocation certificate and give\n"
  "a reason for the revocation.  For details see the description of\n"
- "of the gpg command \"--gen-revoke\" in the GnuPG manual."
+ "of the gpg command \"--generate-revocation\" in the GnuPG manual."
  msgstr ""
  
- #: g10/revoke.c:575
++#: g10/revoke.c:576
  msgid ""
  "To avoid an accidental use of this file, a colon has been inserted\n"
  "before the 5 dashes below.  Remove this colon with a text editor\n"
  "before importing and publishing this revocation certificate."
  msgstr ""
  
- #: g10/revoke.c:590
++#: g10/revoke.c:591
  #, fuzzy, c-format
  #| msgid "Revocation certificate created.\n"
  msgid "revocation certificate stored as '%s.rev'\n"
  msgstr "Creouse o certificado de revocación.\n"
  
- #: g10/revoke.c:634
++#: g10/revoke.c:635
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found\n"
  msgstr "non se atopou a chave secreta `%s': %s\n"
@@@ -6761,23 -5351,19 +6719,23 @@@
  #. TRANSLATORS: The %s prints a key specification which
  #. for example has been given at the command line.  Several lines
  #. lines with secret key infos are printed after this message.
- #: g10/revoke.c:661
++#: g10/revoke.c:662
  #, c-format
  msgid "'%s' matches multiple secret keys:\n"
  msgstr ""
  
- #: g10/revoke.c:688
++#: g10/revoke.c:689
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error searching the keyring: %s\n"
  msgstr "erro ao crea-lo chaveiro `%s': %s\n"
  
- #: g10/revoke.c:711
++#: g10/revoke.c:712
  #, fuzzy
  msgid "Create a revocation certificate for this key? (y/N) "
  msgstr "¿Crear un certificado de revocación para esta sinatura? "
  
- #: g10/revoke.c:735
++#: g10/revoke.c:736
  msgid ""
  "Revocation certificate created.\n"
  "\n"
@@@ -6795,33 -5381,26 +6753,33 @@@ msgstr "
  "se volve ilexible. Pero teña coidado: o sistema de impresión da súa\n"
  "máquina podería armacena-los datos e deixárllelos dispoñibles a outros.\n"
  
- #: g10/revoke.c:769
++#: g10/revoke.c:770
  msgid "Please select the reason for the revocation:\n"
  msgstr "Por favor, escolla o motivo da revocación:\n"
  
- #: g10/revoke.c:779
++#: g10/revoke.c:780
  msgid "Cancel"
  msgstr "Cancelar"
  
- #: g10/revoke.c:781
++#: g10/revoke.c:782
  #, c-format
  msgid "(Probably you want to select %d here)\n"
  msgstr "(probablemente queira seleccionar %d aquí)\n"
  
- #: g10/revoke.c:822
++#: g10/revoke.c:823
  msgid "Enter an optional description; end it with an empty line:\n"
  msgstr "Introduza unha descrición opcional; remátea cunha liña en branco:\n"
  
- #: g10/revoke.c:850
++#: g10/revoke.c:851
  #, c-format
  msgid "Reason for revocation: %s\n"
  msgstr "Motivo para a revocación: %s\n"
  
- #: g10/revoke.c:852
++#: g10/revoke.c:853
  msgid "(No description given)\n"
  msgstr "(Non se deu unha descrición)\n"
  
- #: g10/revoke.c:857
++#: g10/revoke.c:858
  #, fuzzy
  msgid "Is this okay? (y/N) "
  msgstr "¿É correcto? "
@@@ -6956,23 -5515,19 +6914,23 @@@ msgid "
  "unexpanded.\n"
  msgstr "AVISO: non se pode expandir-%% o url de normativa (grande de máis).\n"
  
- #: g10/sign.c:329
++#: g10/sign.c:331
  #, fuzzy, c-format
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "Sinatura %s de: \"%s\"\n"
  
- #: g10/sign.c:878
++#: g10/sign.c:880
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
  msgstr ""
  "forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n"
  
- #: g10/sign.c:1009
++#: g10/sign.c:1011
  msgid "signing:"
  msgstr "asinando:"
  
- #: g10/sign.c:1286
++#: g10/sign.c:1288
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "hase empregar cifrado %s\n"
@@@ -6999,7 -5550,6 +6957,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:362
++#: g10/tdbdump.c:57 g10/trustdb.c:369
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "rexistro de confianza %lu, tipo %d: fallou a escritura: %s\n"
@@@ -7047,7 -5589,6 +7005,7 @@@ msgstr "erro ao buscar un rexistro de c
  msgid "read error in '%s': %s\n"
  msgstr "erro de lectura: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "base de datos de confianza: fallou a sincronización: %s\n"
@@@ -7194,298 -5706,306 +7152,372 @@@ msgstr "non é posible manexar liñas d
  msgid "input line longer than %d characters\n"
  msgstr "a liña de entrada contén máis de %d caracteres\n"
  
- #: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
++#: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
  #, fuzzy, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "erro ao enviar a `%s': %s\n"
  
- #: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
++#: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:357 g10/tofu.c:699
++#: g10/tofu.c:355 g10/tofu.c:888
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:501
++#: g10/tofu.c:505
  #, fuzzy, c-format
  msgid "unsupported TOFU database version: %s\n"
  msgstr ""
  "\n"
  "Algoritmos soportados:\n"
  
- #: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
- #: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
- #: g10/tofu.c:3056
++#: g10/tofu.c:538
+ #, fuzzy, c-format
+ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
+ msgstr "erro ao crea-lo contrasinal: %s\n"
+ 
++#: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
+ msgid "TOFU DB error"
+ msgstr ""
+ 
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2340 g10/tofu.c:2359
++#: g10/tofu.c:2372 g10/tofu.c:2384 g10/tofu.c:2399 g10/tofu.c:2411
++#: g10/tofu.c:2980 g10/tofu.c:2997 g10/tofu.c:3033 g10/tofu.c:3050
++#: g10/tofu.c:3353
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "erro ao enviar a `%s': %s\n"
  
- #: g10/tofu.c:566 g10/tofu.c:574
++#: g10/tofu.c:716 g10/tofu.c:724
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error determining TOFU database's version: %s\n"
  msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
  
- #: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
++#: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing TOFU database: %s\n"
  msgstr "%s: erro ao escribi-lo rexistro de directorios: %s\n"
  
- #: g10/tofu.c:765
++#: g10/tofu.c:844
+ #, fuzzy, c-format
+ msgid "error creating 'encryptions' TOFU table: %s\n"
+ msgstr "erro ao enviar a `%s': %s\n"
+ 
++#: g10/tofu.c:874
+ #, c-format
+ msgid "adding column effective_policy to bindings DB: %s\n"
+ msgstr ""
+ 
++#: g10/tofu.c:956
  #, fuzzy, c-format
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "erro lendo `%s': %s\n"
  
- #: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
++#: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "erro ao enviar a `%s': %s\n"
  
- #: g10/tofu.c:1239
++#: g10/tofu.c:1328
  #, c-format
  msgid ""
  "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1247
++#: g10/tofu.c:1337
  #, c-format
- msgid "The email address \"%s\" is associated with %d keys!"
- msgstr ""
+ msgid "The email address \"%s\" is associated with %d key!"
+ msgid_plural "The email address \"%s\" is associated with %d keys!"
+ msgstr[0] ""
+ msgstr[1] ""
  
- #: g10/tofu.c:1251
++#: g10/tofu.c:1343
  msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  
- #: g10/tofu.c:1257
++#: g10/tofu.c:1349
  #, c-format
  msgid ""
  "Please indicate whether this email address should be associated with key %s "
  "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1513
++#: g10/tofu.c:1605
  #, fuzzy, c-format
  msgid "error gathering other user IDs: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: g10/tofu.c:1523
++#: g10/tofu.c:1615
  #, fuzzy
  #| msgid "list key and user IDs"
  msgid "This key's user IDs:\n"
  msgstr "listar chave e IDs de usuario"
  
- #: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
++#: g10/tofu.c:1631 g10/tofu.c:1796
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "policy: %s"
  msgstr "Normativa: "
  
- #: g10/tofu.c:1630
++#: g10/tofu.c:1722
  #, fuzzy, c-format
  msgid "error gathering signature stats: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: g10/tofu.c:1634
++#: g10/tofu.c:1726
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1651
++#: g10/tofu.c:1744
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1684 g10/tofu.c:1689
++#: g10/tofu.c:1785 g10/tofu.c:1790
  msgid ", "
  msgstr ""
  
- #: g10/tofu.c:1693
++#: g10/tofu.c:1794
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
  msgstr "ve-la lista de chaves"
  
- #: g10/tofu.c:1715
++#: g10/tofu.c:1820
+ #, fuzzy, c-format
+ msgid "Verified %d message."
+ msgid_plural "Verified %d messages."
+ msgstr[0] "|algo [ficheiros]|visualizar resumos de mensaxes"
+ msgstr[1] "|algo [ficheiros]|visualizar resumos de mensaxes"
+ 
++#: g10/tofu.c:1824
  #, fuzzy, c-format
- msgid "Verified %d message"
- msgid_plural "Verified %d messages"
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid "Encrypted %d message."
+ msgid_plural "Encrypted %d messages."
+ msgstr[0] "cifrado con %lu contrasinais\n"
+ msgstr[1] "cifrado con %lu contrasinais\n"
+ 
++#: g10/tofu.c:1831
+ #, fuzzy, c-format
+ msgid "Verified %d message in the future."
+ msgid_plural "Verified %d messages in the future."
+ msgstr[0] "|algo [ficheiros]|visualizar resumos de mensaxes"
+ msgstr[1] "|algo [ficheiros]|visualizar resumos de mensaxes"
+ 
++#: g10/tofu.c:1835
+ #, fuzzy, c-format
+ msgid "Encrypted %d message in the future."
+ msgid_plural "Encrypted %d messages in the future."
  msgstr[0] "|algo [ficheiros]|visualizar resumos de mensaxes"
  msgstr[1] "|algo [ficheiros]|visualizar resumos de mensaxes"
  
- #: g10/tofu.c:1719
++#: g10/tofu.c:1849
  #, c-format
- msgid "Encrypted %d message"
- msgid_plural "Encrypted %d messages"
+ msgid "Messages verified over the past %d day: %d."
+ msgid_plural "Messages verified over the past %d days: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1734
++#: g10/tofu.c:1855
  #, c-format
- msgid " over the past day."
- msgid_plural " over the past %d days."
+ msgid "Messages encrypted over the past %d day: %d."
+ msgid_plural "Messages encrypted over the past %d days: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1740
++#: g10/tofu.c:1865
  #, c-format
- msgid " over the past month."
- msgid_plural " over the past %d months."
+ msgid "Messages verified over the past %d month: %d."
+ msgid_plural "Messages verified over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1746
++#: g10/tofu.c:1871
  #, c-format
- msgid " over the past year."
- msgid_plural " over the past %d years."
+ msgid "Messages encrypted over the past %d month: %d."
+ msgid_plural "Messages encrypted over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1752
- msgid " in the past."
++#: g10/tofu.c:1881
+ #, c-format
+ msgid "Messages verified over the past %d year: %d."
+ msgid_plural "Messages verified over the past %d years: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1887
+ #, c-format
+ msgid "Messages encrypted over the past %d year: %d."
+ msgid_plural "Messages encrypted over the past %d years: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1895
+ #, c-format
+ msgid "Messages verified in the past: %d."
  msgstr ""
  
++#: g10/tofu.c:1899
+ #, fuzzy, c-format
+ msgid "Messages encrypted in the past: %d."
+ msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1767
++#: g10/tofu.c:1916
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1809
++#: g10/tofu.c:1958
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1815
++#: g10/tofu.c:1964
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1823
++#: g10/tofu.c:1972
  msgid "Defaulting to unknown."
  msgstr ""
  
- #: g10/tofu.c:1938 g10/tofu.c:2074
++#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
- #: g10/tofu.c:1994
++#: g10/tofu.c:2143
  #, fuzzy, c-format
  msgid "resetting keydb: %s\n"
  msgstr "erro escribindo no chaveiro `%s': %s\n"
  
- #: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
- #: g10/tofu.c:2425
++#: g10/tofu.c:2601
  #, fuzzy, c-format
- msgid "error setting TOFU binding's trust level to %s\n"
+ msgid "error setting TOFU binding's policy to %s\n"
  msgstr "erro lendo `%s': %s\n"
  
- #: g10/tofu.c:2473
++#: g10/tofu.c:2794
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #. TRANSLATORS: The tilde ('~') is used here to indicate a
- #. * non-breakable space
- #: g10/tofu.c:2574
++#: g10/tofu.c:2839
  #, c-format
- msgid "%d~year"
- msgid_plural "%d~years"
+ msgid "%lld~year"
+ msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2583
++#: g10/tofu.c:2844
  #, c-format
- msgid "%d~month"
- msgid_plural "%d~months"
+ msgid "%lld~month"
+ msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2592
++#: g10/tofu.c:2849
  #, c-format
- msgid "%d~day"
- msgid_plural "%d~days"
+ msgid "%lld~week"
+ msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2854
  #, c-format
- msgid "%d~hour"
- msgid_plural "%d~hours"
+ msgid "%lld~day"
+ msgid_plural "%lld~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2610
++#: g10/tofu.c:2859
  #, c-format
- msgid "%d~minute"
- msgid_plural "%d~minutes"
+ msgid "%lld~hour"
+ msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2619
++#: g10/tofu.c:2864
  #, c-format
- msgid "%d~second"
- msgid_plural "%d~seconds"
+ msgid "%lld~minute"
+ msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2802
++#: g10/tofu.c:2866
  #, c-format
- msgid "%s: "
+ msgid "%lld~second"
+ msgid_plural "%lld~seconds"
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:3103
+ #, c-format
+ msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:2806
++#: g10/tofu.c:3109
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
- msgid "Verified %ld signatures"
+ msgid "%s: Verified 0 signatures."
  msgstr "Borradas %d sinaturas.\n"
  
- #: g10/tofu.c:2816
++#: g10/tofu.c:3117
  #, fuzzy, c-format
- msgid "Verified %ld signature in the past %s"
- msgid_plural "Verified %ld signatures in the past %s"
+ msgid "%s: Verified %ld~signature in the past %s."
+ msgid_plural "%s: Verified %ld~signatures in the past %s."
  msgstr[0] "|algo [ficheiros]|visualizar resumos de mensaxes"
  msgstr[1] "|algo [ficheiros]|visualizar resumos de mensaxes"
  
- #: g10/tofu.c:2826
- #, fuzzy, c-format
++#: g10/tofu.c:3127
+ #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
- msgid ", and encrypted %ld messages"
+ msgid "Encrypted 0 messages."
  msgstr "cifrado con %lu contrasinais\n"
  
- #: g10/tofu.c:2835
++#: g10/tofu.c:3135
  #, fuzzy, c-format
- msgid ", and encrypted %ld message in the past %s"
- msgid_plural ", and encrypted %ld messages in the past %s"
+ msgid "Encrypted %ld~message in the past %s."
+ msgid_plural "Encrypted %ld~messages in the past %s."
  msgstr[0] "|algo [ficheiros]|visualizar resumos de mensaxes"
  msgstr[1] "|algo [ficheiros]|visualizar resumos de mensaxes"
  
- #: g10/tofu.c:2880
++#: g10/tofu.c:3146
+ #, fuzzy, c-format
+ #| msgid "Policy: "
+ msgid "(policy: %s)"
+ msgstr "Normativa: "
+ 
++#: g10/tofu.c:3177
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2883
++#: g10/tofu.c:3180
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2887
++#: g10/tofu.c:3184
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2890
++#: g10/tofu.c:3187
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2919
++#: g10/tofu.c:3216
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7502,18 -6022,14 +7534,18 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
- #: g10/tofu.c:3480 g10/tofu.c:3572
++#: g10/tofu.c:3298 g10/tofu.c:3449 g10/tofu.c:3627 g10/tofu.c:3670
++#: g10/tofu.c:3784 g10/tofu.c:3859 g10/tofu.c:3894
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "erro ao enviar a `%s': %s\n"
  
- #: g10/tofu.c:3185
++#: g10/tofu.c:3482
  #, c-format
- msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
  msgstr ""
  
- #: g10/tofu.c:3515
++#: g10/tofu.c:3819
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7546,74 -6057,59 +7578,74 @@@ msgstr "
  msgid "key %s marked as ultimately trusted\n"
  msgstr "chave marcada coma de confianza absoluta.\n"
  
- #: g10/trustdb.c:341
++#: g10/trustdb.c:348
  #, 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:347
++#: g10/trustdb.c:354
  #, 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:422
++#: g10/trustdb.c:429
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr ""
  
- #: g10/trustdb.c:431
++#: g10/trustdb.c:438
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:468
++#: g10/trustdb.c:475
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:474
++#: g10/trustdb.c:481
  #, c-format
  msgid "using %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:511
++#: g10/trustdb.c:518
  msgid "no need for a trustdb check\n"
  msgstr "non se precisa comproba-la base de datos de confianza\n"
  
- #: g10/trustdb.c:517 g10/trustdb.c:2160
++#: g10/trustdb.c:524 g10/trustdb.c:2187
  #, 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:526
++#: g10/trustdb.c:533
  #, 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:542
++#: g10/trustdb.c:549
  #, 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:749 g10/trustdb.c:1313
++#: g10/trustdb.c:756 g10/trustdb.c:1340
  #, 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:966
++#: g10/trustdb.c:973
  msgid "please do a --check-trustdb\n"
  msgstr "por favor, execute con --check-trustdb\n"
  
- #: g10/trustdb.c:971
++#: g10/trustdb.c:978
  msgid "checking the trustdb\n"
  msgstr "comprobando a base de datos de confianza\n"
  
- #: g10/trustdb.c:1883
++#: g10/trustdb.c:1910
  #, 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:1886
++#: g10/trustdb.c:1913
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7621,22 -6117,18 +7653,22 @@@ msgid_plural " (%d validity counts clea
  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:1956
++#: g10/trustdb.c:1983
  msgid "no ultimately trusted keys found\n"
  msgstr "non se atoparon chaves de confianza absoluta\n"
  
- #: g10/trustdb.c:1970
++#: g10/trustdb.c:1997
  #, 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:2087
++#: g10/trustdb.c:2114
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr ""
  
- #: g10/trustdb.c:2167
++#: g10/trustdb.c:2194
  #, 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"
@@@ -7751,19 -6222,14 +7783,19 @@@ msgid "
  "List, export, import Keybox data\n"
  msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3208
++#: scd/app-nks.c:718 scd/app-openpgp.c:3221
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3220
++#: scd/app-nks.c:726 scd/app-openpgp.c:3233
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
- #: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
- #: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1965 scd/app-openpgp.c:1984
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2166 scd/app-openpgp.c:2430
++#: scd/app-openpgp.c:2477 scd/app-openpgp.c:2582 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr ""
@@@ -7812,84 -6269,66 +7844,84 @@@ msgid "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2511 scd/app-dinsig.c:532
  #, fuzzy, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: scd/app-openpgp.c:806
++#: scd/app-openpgp.c:801
  #, fuzzy, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
  
- #: scd/app-openpgp.c:819
++#: scd/app-openpgp.c:814
  #, fuzzy, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "fallo ao reconstruí-la caché de chaveiros: %s\n"
  
- #: scd/app-openpgp.c:1236
++#: scd/app-openpgp.c:1247
  msgid "response does not contain the RSA modulus\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1243
++#: scd/app-openpgp.c:1254
  msgid "response does not contain the RSA public exponent\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1353
++#: scd/app-openpgp.c:1364
  #, fuzzy
  #| msgid "remove keys from the public keyring"
  msgid "response does not contain the EC public key\n"
  msgstr "borrar chaves do chaveiro público"
  
- #: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:1464 scd/app-openpgp.c:3825
  msgid "response does not contain the public key data\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1551
++#: scd/app-openpgp.c:1564
  #, fuzzy, c-format
  msgid "reading public key failed: %s\n"
  msgstr "fallou o borrado do bloque de chaves: %s\n"
  
- #: scd/app-openpgp.c:1903
++#: scd/app-openpgp.c:1916
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1910
++#: scd/app-openpgp.c:1923
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1925
++#: scd/app-openpgp.c:1938
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr ""
  
- #: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
++#: scd/app-openpgp.c:1949 scd/app-openpgp.c:2424
  #, fuzzy
  msgid "||Please enter the PIN"
  msgstr "cambia-lo contrasinal"
  
- #: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2173 scd/app-openpgp.c:2437
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
- #: scd/app-openpgp.c:4114
++#: scd/app-openpgp.c:2004 scd/app-openpgp.c:2043 scd/app-openpgp.c:2185
++#: scd/app-openpgp.c:4126
  #, fuzzy, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "o envío ao servidor de chaves fallou: %s\n"
  
- #: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
++#: scd/app-openpgp.c:2072 scd/app-openpgp.c:2458 scd/app-openpgp.c:4556
  msgid "error retrieving CHV status from card\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
++#: scd/app-openpgp.c:2078 scd/app-openpgp.c:4565
  msgid "card is permanently locked!\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2072
++#: scd/app-openpgp.c:2085
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7899,26 -6338,21 +7931,26 @@@ msgstr[1] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:2082
++#: scd/app-openpgp.c:2095
  #, fuzzy, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "cambia-lo contrasinal"
  
- #: scd/app-openpgp.c:2086
++#: scd/app-openpgp.c:2099
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
  msgstr "cambia-lo contrasinal"
  
- #: scd/app-openpgp.c:2107
++#: scd/app-openpgp.c:2120
  msgid "access to admin commands is not configured\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2460
++#: scd/app-openpgp.c:2473
  #, fuzzy
  msgid "||Please enter the Reset Code for the card"
  msgstr "Por favor, escolla o motivo da revocación:\n"
  
- #: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
++#: scd/app-openpgp.c:2483 scd/app-openpgp.c:2537
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr ""
@@@ -7926,117 -6360,93 +7958,117 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2493
++#: scd/app-openpgp.c:2506
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|AN|New Admin PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|N|New PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2565
++#: scd/app-openpgp.c:2578
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "cambia-lo contrasinal"
  
- #: scd/app-openpgp.c:2566
++#: scd/app-openpgp.c:2579
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
  msgstr "cambia-lo contrasinal"
  
- #: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
++#: scd/app-openpgp.c:2635 scd/app-openpgp.c:3885
  #, fuzzy
  msgid "error reading application data\n"
  msgstr "erro ao le-lo bloque de chaves: %s\n"
  
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
++#: scd/app-openpgp.c:2641 scd/app-openpgp.c:3892
  #, fuzzy
  msgid "error reading fingerprint DO\n"
  msgstr "%s: erro ao ler un rexistro libre: %s\n"
  
- #: scd/app-openpgp.c:2638
++#: scd/app-openpgp.c:2651
  #, fuzzy
  msgid "key already exists\n"
  msgstr "`%s' xa está comprimido\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2655
  msgid "existing key will be replaced\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2644
++#: scd/app-openpgp.c:2657
  #, fuzzy
  msgid "generating new key\n"
  msgstr "xerar un novo par de chaves"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2659
  #, fuzzy
  msgid "writing new key\n"
  msgstr "xerar un novo par de chaves"
  
- #: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
++#: scd/app-openpgp.c:3201 scd/app-openpgp.c:3553
  msgid "creation timestamp missing\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
++#: scd/app-openpgp.c:3243 scd/app-openpgp.c:3251
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
++#: scd/app-openpgp.c:3384 scd/app-openpgp.c:3647
  #, fuzzy, c-format
  msgid "failed to store the key: %s\n"
  msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
  
- #: scd/app-openpgp.c:3534
++#: scd/app-openpgp.c:3547
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "URI non soportado"
  
- #: scd/app-openpgp.c:3790
++#: scd/app-openpgp.c:3802
  msgid "please wait while key is being generated ...\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3798
++#: scd/app-openpgp.c:3810
  #, fuzzy
  msgid "generating key failed\n"
  msgstr "fallou o borrado do bloque de chaves: %s\n"
  
- #: scd/app-openpgp.c:3804
++#: scd/app-openpgp.c:3816
  #, fuzzy, c-format
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
  msgstr[0] "A xeración da chave fallou: %s\n"
  msgstr[1] "A xeración da chave fallou: %s\n"
  
- #: scd/app-openpgp.c:3838
++#: scd/app-openpgp.c:3850
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:3900
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4004
++#: scd/app-openpgp.c:4016
  #, fuzzy, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "Sinatura %s, algoritmo de resumo %s\n"
  
- #: scd/app-openpgp.c:4089
++#: scd/app-openpgp.c:4101
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4551
++#: scd/app-openpgp.c:4570
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
++#: scd/app-openpgp.c:4871 scd/app-openpgp.c:4882
  #, fuzzy, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "non se atoparon datos OpenPGP válidos.\n"
@@@ -8058,7 -6465,6 +8090,7 @@@ msgstr "Introduza o ID de usuario: 
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
@@@ -8103,27 -6500,22 +8135,27 @@@ msgstr "comandos conflictivos\n
  msgid "use variable length input for pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:287
++#: scd/scdaemon.c:286
  #, fuzzy
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
  
- #: scd/scdaemon.c:289
++#: scd/scdaemon.c:288
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
  msgstr ""
  
- #: scd/scdaemon.c:786
++#: scd/scdaemon.c:784
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1904
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
++#: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1909
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
@@@ -8203,9 -6579,6 +8235,9 @@@ msgstr "erro ao crea-lo contrasinal: %s
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "fallou o borrado do bloque de chaves: %s\n"
  
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
 +#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  #, fuzzy
  msgid "failed to allocate keyDB handle\n"
  msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
@@@ -8713,11 -6984,9 +8745,11 @@@ msgstr "
  msgid "resource problem: out of core\n"
  msgstr ""
  
- #: sm/decrypt.c:330
++#: sm/decrypt.c:332
  msgid "(this is the RC2 algorithm)\n"
  msgstr ""
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:334
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr ""
  
@@@ -8761,124 -7022,96 +8793,124 @@@ msgstr "ve-la lista de chaves secretas
  msgid "list certificate chain"
  msgstr "Revocación de certificado válida"
  
- #: sm/gpgsm.c:218
++#: sm/gpgsm.c:219
  #, fuzzy
  msgid "import certificates"
  msgstr "Certificado correcto"
  
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
  #, fuzzy
  msgid "export certificates"
  msgstr "Certificado correcto"
  
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:228
  msgid "register a smartcard"
  msgstr ""
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:231
  msgid "pass a command to the dirmngr"
  msgstr ""
  
- #: sm/gpgsm.c:232
++#: sm/gpgsm.c:233
  msgid "invoke gpg-protect-tool"
  msgstr ""
  
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:250
  #, fuzzy
  msgid "create base-64 encoded output"
  msgstr "crear saída con armadura en ascii"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in PEM format"
  msgstr ""
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in base-64 format"
  msgstr ""
  
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:262
  msgid "assume input is in binary format"
  msgstr ""
  
- #: sm/gpgsm.c:267
++#: sm/gpgsm.c:269
  msgid "never consult a CRL"
  msgstr ""
  
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:279
  msgid "check validity using OCSP"
  msgstr ""
  
- #: sm/gpgsm.c:282
++#: sm/gpgsm.c:284
  msgid "|N|number of certificates to include"
  msgstr ""
  
- #: sm/gpgsm.c:285
++#: sm/gpgsm.c:287
  msgid "|FILE|take policy information from FILE"
  msgstr ""
  
- #: sm/gpgsm.c:288
++#: sm/gpgsm.c:290
  msgid "do not check certificate policies"
  msgstr ""
  
- #: sm/gpgsm.c:292
++#: sm/gpgsm.c:294
  msgid "fetch missing issuer certificates"
  msgstr ""
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "don't use the terminal at all"
  msgstr "non usa-la terminal en absoluto"
  
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:307
  msgid "|FILE|write a server mode log to FILE"
  msgstr ""
  
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:312
  #, fuzzy
  msgid "|FILE|write an audit log to FILE"
  msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "batch mode: never ask"
  msgstr "modo por lotes: non preguntar nunca"
  
- #: sm/gpgsm.c:314
++#: sm/gpgsm.c:316
  msgid "assume yes on most questions"
  msgstr "asumir `si' na maioría das preguntas"
  
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:317
  msgid "assume no on most questions"
  msgstr "asumir `non' na maioría das preguntas"
  
- #: sm/gpgsm.c:318
++#: sm/gpgsm.c:320
  #, fuzzy
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "engadir este chaveiro á lista de chaveiros"
  
- #: sm/gpgsm.c:321
++#: sm/gpgsm.c:323
  #, fuzzy
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|NOME|empregar NOME coma chave secreta por defecto"
  
- #: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
  #, fuzzy
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|HOST|empregar este servidor de chaves para buscar chaves"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|NOME|emprega-lo algoritmo de cifrado NOME"
  
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:352
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|NOME|emprega-lo algoritmo de resumos de mensaxes NOME"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:559
  #, 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:570
++#: sm/gpgsm.c:562
  #, fuzzy
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
@@@ -8889,47 -7122,38 +8921,47 @@@ msgstr "
  "asinar, verificar, cifrar ou descifrar\n"
  "a operación por defecto depende dos datos de entrada\n"
  
- #: sm/gpgsm.c:774
++#: sm/gpgsm.c:766
  #, 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:785
++#: sm/gpgsm.c:777
  #, fuzzy, c-format
  msgid "unknown validation model '%s'\n"
  msgstr "destinatario por defecto `%s' descoñecido\n"
  
- #: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
  #, fuzzy, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "(Non se deu unha descrición)\n"
  
- #: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr ""
  
- #: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
  #, fuzzy, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr " o = omitir esta chave\n"
  
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1427
  #, fuzzy
  msgid "could not parse keyserver\n"
  msgstr "non se puido analisa-lo URI do servidor de chaves\n"
  
- #: sm/gpgsm.c:1636
++#: sm/gpgsm.c:1630
  #, fuzzy, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "escribindo a `%s'\n"
  
- #: sm/gpgsm.c:1677
++#: sm/gpgsm.c:1671
  #, fuzzy, c-format
  msgid "can't sign using '%s': %s\n"
  msgstr "non se pode pechar `%s': %s\n"
  
- #: sm/gpgsm.c:2033
++#: sm/gpgsm.c:2028
  msgid "invalid command (there is no implicit command)\n"
  msgstr ""
  
@@@ -9693,8 -7766,6 +9725,8 @@@ msgstr "
  msgid "CRL access not possible due to disabled %s\n"
  msgstr ""
  
 +#: dirmngr/crlfetch.c:223 dirmngr/ldap-wrapper-ce.c:488
- #: dirmngr/ldap-wrapper.c:742 dirmngr/misc.c:563
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:563
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
@@@ -9881,116 -7916,88 +9913,116 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:160
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:158
++#: dirmngr/dirmngr.c:161
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
  
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:162
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:163
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:164
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
- #: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
++#: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:177
++#: dirmngr/dirmngr.c:180
  #, fuzzy
  msgid "run without asking a user"
  msgstr "¿Saír sin gardar? "
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:181
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:182
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:184
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:185
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:186
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:188
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:192
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:202
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
  
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:210
  #, fuzzy
  msgid "|URL|use OCSP responder at URL"
  msgstr "non se puido analisa-lo URI do servidor de chaves\n"
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:212
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:218
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:220
++#: dirmngr/dirmngr.c:223
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:225
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:240
++#: dirmngr/dirmngr.c:246
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -10003,91 -8010,72 +10035,91 @@@ msgstr "
  "@\n"
  "(Vexa a páxina man para un listado completo de comandos e opcións)\n"
  
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:361
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
  
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:363
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:443
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
- #: tools/gpgconf.c:648
++#: dirmngr/dirmngr.c:496 tools/gpgconf.c:550 tools/gpgconf.c:585
++#: tools/gpgconf.c:656
  #, fuzzy, c-format
  msgid "usage: %s [options] "
  msgstr "uso: gpg [opcións] "
  
- #: dirmngr/dirmngr.c:1062
++#: dirmngr/dirmngr.c:1074
  #, fuzzy
  #| 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:1301 dirmngr/server.c:1585
++#: dirmngr/dirmngr.c:1300 dirmngr/server.c:1585
  #, fuzzy, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "non se puido poñe-la armadura: %s\n"
  
- #: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
++#: dirmngr/dirmngr.c:1306 dirmngr/server.c:1591
  #, fuzzy, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "non se puido poñe-la armadura: %s\n"
  
- #: dirmngr/dirmngr.c:1484
++#: dirmngr/dirmngr.c:1487
  #, fuzzy, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "liña longa de máis\n"
  
- #: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
++#: dirmngr/dirmngr.c:1542 dirmngr/dirmngr.c:1626
  #, fuzzy, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "erro: pegada dactilar non válida\n"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
++#: dirmngr/dirmngr.c:1578 dirmngr/dirmngr.c:1604 tools/gpgconf-comp.c:4032
  #, fuzzy, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "erro de lectura: %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1633
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1700
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1734
++#: dirmngr/dirmngr.c:1738
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1739
++#: dirmngr/dirmngr.c:1743
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1745
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1746
++#: dirmngr/dirmngr.c:1750
  #, fuzzy
  msgid "shutdown forced\n"
  msgstr "non procesado"
  
- #: dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1758
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1761
++#: dirmngr/dirmngr.c:1765
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10569,33 -8458,27 +10601,33 @@@ msgstr "fallou o borrado do bloque de c
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2463
++#: dirmngr/server.c:2469
  #, fuzzy, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "non se pode crear `%s': %s\n"
  
- #: dirmngr/server.c:2474
++#: dirmngr/server.c:2480
  #, 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:2495
++#: dirmngr/server.c:2501
  #, 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:2503
++#: dirmngr/server.c:2509
  #, 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:2534
++#: dirmngr/server.c:2540
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2553
++#: dirmngr/server.c:2559
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
@@@ -10643,7 -8517,6 +10675,7 @@@ msgstr "DSA require o emprego dun algor
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:167
  #, fuzzy
  msgid "quiet"
  msgstr "abandonar"
@@@ -10736,23 -8589,16 +10768,23 @@@ 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:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
- #: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
++#: tools/gpgconf-comp.c:766 tools/gpgconf-comp.c:865
  msgid "Options controlling the diagnostic output"
  msgstr ""
  
 +#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
- #: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
++#: tools/gpgconf-comp.c:779 tools/gpgconf-comp.c:888
  msgid "Options controlling the configuration"
  msgstr ""
  
- #: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
- #: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
++#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:723
++#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:901
  #, fuzzy
  msgid "Options useful for debugging"
  msgstr "habilitar depuración total"
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
  msgid "Options controlling the security"
  msgstr ""
  
@@@ -10802,11 -8637,9 +10834,11 @@@ msgstr "erro ao crea-lo contrasinal: %s
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
++#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
  msgid "|NAME|use NAME as default secret key"
  msgstr "|NOME|empregar NOME coma chave secreta por defecto"
  
- #: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
++#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:784
  #, fuzzy
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NOME|cifrar para NOME"
@@@ -10815,194 -8647,161 +10847,208 @@@
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
++#: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
  msgid "Configuration for Keyservers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
++#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
  #, fuzzy
  msgid "|URL|use keyserver at URL"
  msgstr "non se puido analisa-lo URI do servidor de chaves\n"
  
- #: tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:741
  msgid "allow PKA lookups (DNS requests)"
  msgstr ""
  
- #: tools/gpgconf-comp.c:738
++#: tools/gpgconf-comp.c:744
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr ""
  
- #: tools/gpgconf-comp.c:787
++#: tools/gpgconf-comp.c:793
  msgid "disable all access to the dirmngr"
  msgstr ""
  
- #: tools/gpgconf-comp.c:790
++#: tools/gpgconf-comp.c:796
  #, 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:820
++#: tools/gpgconf-comp.c:829
  msgid "do not check CRLs for root certificates"
  msgstr ""
  
- #: tools/gpgconf-comp.c:869
++#: tools/gpgconf-comp.c:878
  msgid "Options controlling the format of the output"
  msgstr ""
  
- #: tools/gpgconf-comp.c:905
++#: tools/gpgconf-comp.c:920
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:918
++#: tools/gpgconf-comp.c:933
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:947
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:958
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:948
++#: tools/gpgconf-comp.c:963
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:977
++#: tools/gpgconf-comp.c:992
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:985
++#: tools/gpgconf-comp.c:1000
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1066
++#: tools/gpgconf-comp.c:1081
  msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1067
++#: tools/gpgconf-comp.c:1082
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1083
  msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1069
++#: tools/gpgconf-comp.c:1084
  msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1070
++#: tools/gpgconf-comp.c:1085
  #, fuzzy
  #| msgid "network error"
  msgid "Network"
  msgstr "erro de rede"
  
- #: tools/gpgconf-comp.c:1071
++#: tools/gpgconf-comp.c:1086
  #, fuzzy
  msgid "Passphrase Entry"
  msgstr "contrasinal erróneo"
  
- #: tools/gpgconf-comp.c:1225
++#: tools/gpgconf-comp.c:1240
  #, fuzzy
  msgid "Component not suitable for launching"
  msgstr "non se atopou a chave pública"
  
- #: tools/gpgconf-comp.c:3283
++#: tools/gpgconf-comp.c:3311
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3434
++#: tools/gpgconf-comp.c:3462
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf-comp.c:4036
+ #, fuzzy, c-format
+ msgid "error closing '%s'\n"
+ msgstr "erro lendo `%s': %s\n"
+ 
++#: tools/gpgconf-comp.c:4038
+ #, fuzzy, c-format
+ msgid "error parsing '%s'\n"
+ msgstr "erro lendo `%s': %s\n"
+ 
++#: tools/gpgconf.c:73
  msgid "list all components"
  msgstr ""
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "check all programs"
  msgstr ""
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|list options"
  msgstr ""
  
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
  msgid "|COMPONENT|change options"
  msgstr ""
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "|COMPONENT|check options"
  msgstr ""
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "apply global default values"
  msgstr ""
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
+ msgid "|FILE|update configuration files using FILE"
+ msgstr ""
+ 
++#: tools/gpgconf.c:83
  msgid "get the configuration directories for @GPGCONF@"
  msgstr ""
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:85
  #, fuzzy
  msgid "list global configuration file"
  msgstr " creouse un novo ficheiro de configuración `%s'\n"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  #, fuzzy
  msgid "check global configuration file"
  msgstr " creouse un novo ficheiro de configuración `%s'\n"
  
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:89
  #, fuzzy
  #| msgid "update the trust database"
  msgid "query the software version database"
  msgstr "actualiza-la base de datos de confianza"
  
- #: tools/gpgconf.c:86
++#: tools/gpgconf.c:90
  msgid "reload all or a given component"
  msgstr ""
  
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:91
  msgid "launch a given component"
  msgstr ""
  
- #: tools/gpgconf.c:88
++#: tools/gpgconf.c:92
  msgid "kill a given component"
  msgstr ""
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "use as output file"
  msgstr "usar coma ficheiro de saída"
  
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:102
  msgid "activate changes at runtime, if possible"
  msgstr ""
  
- #: tools/gpgconf.c:122
++#: tools/gpgconf.c:127
  #, fuzzy
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
  
- #: tools/gpgconf.c:125
++#: tools/gpgconf.c:130
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
  msgstr ""
  
- #: tools/gpgconf.c:545 tools/gpgconf.c:579
++#: tools/gpgconf.c:552 tools/gpgconf.c:587
  msgid "Need one component argument"
  msgstr ""
  
- #: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
++#: tools/gpgconf.c:561 tools/gpgconf.c:599 tools/gpgconf.c:632
  #, fuzzy
  msgid "Component not found"
  msgstr "non se atopou a chave pública"
  
- #: tools/gpgconf.c:650
++#: tools/gpgconf.c:658
  #, fuzzy
  msgid "No argument allowed"
  msgstr "gravando a chave secreta en `%s'\n"
diff --cc po/gnupg2.pot
index 36ded94,0151cec..f054d14
--- a/po/gnupg2.pot
+++ b/po/gnupg2.pot
@@@ -1,27 -1,28 +1,27 @@@
 -# Traditional Chinese(zh-tw) messages for GnuPG
 -# Copyright (C) 2002 Free Software Foundation, Inc.
 +# SOME DESCRIPTIVE TITLE.
 +# Copyright (C) YEAR Free Software Foundation, Inc.
  # This file is distributed under the same license as the PACKAGE package.
 -# Jedi Lin <Jedi at Jedi.org>, 2003~2013.
 -#
 -# Special thanks to "Audrey Tang <audreyt at audreyt.org>".
 +# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
  #
 +#, fuzzy
  msgid ""
  msgstr ""
- "Project-Id-Version: GNU gnupg 2.1.16\n"
 -"Project-Id-Version: GNU gnupg 2.1.0\n"
++"Project-Id-Version: GNU gnupg 2.1.17\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-11-18 16:54+0100\n"
 -"PO-Revision-Date: 2014-11-22 20:56+0800\n"
 -"Last-Translator: Jedi Lin <Jedi at Jedi.org>\n"
 -"Language-Team: Chinese (traditional) <zh-l10n at linux.org.tw>\n"
 -"Language: zh_TW\n"
++"POT-Creation-Date: 2016-12-20 11:28+0100\n"
 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 +"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 +"Language-Team: LANGUAGE <LL at li.org>\n"
 +"Language: \n"
  "MIME-Version: 1.0\n"
 -"Content-Type: text/plain; charset=UTF-8\n"
 +"Content-Type: text/plain; charset=CHARSET\n"
  "Content-Transfer-Encoding: 8bit\n"
 -"X-Poedit-Basepath: gnupg-2.1.0/\n"
 -"Plural-Forms: nplurals=1; plural=0;\n"
 -"X-Generator: Poedit 1.5.7\n"
 +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
  
 +#: agent/call-pinentry.c:259
  #, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
 -msgstr "個人識別碼項目鎖定獲取失敗: %s\n"
 +msgstr ""
  
  #. TRANSLATORS: These are labels for buttons etc used in
  #. Pinentries.  An underscore indicates that the next letter
@@@ -110,87 -105,59 +110,87 @@@ msgstr "
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
 +#: agent/call-pinentry.c:989
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
 -msgstr "設定錯誤: %s (第 %d 次嘗試, 最多 %d 次)"
 +msgstr ""
  
 +#: agent/call-pinentry.c:1000
  msgid "Repeat:"
 -msgstr "重複:"
 +msgstr ""
  
 +#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
  msgid "PIN too long"
 -msgstr "個人識別碼 (PIN) 太長"
 +msgstr ""
  
 +#: agent/call-pinentry.c:1030
  msgid "Passphrase too long"
 -msgstr "密語太長"
 +msgstr ""
  
 +#: agent/call-pinentry.c:1038
  msgid "Invalid characters in PIN"
 -msgstr "個人識別碼 (PIN) 含有無效的字符"
 +msgstr ""
  
 +#: agent/call-pinentry.c:1043
  msgid "PIN too short"
 -msgstr "個人識別碼 (PIN) 太短"
 +msgstr ""
  
 +#: agent/call-pinentry.c:1056
  msgid "Bad PIN"
 -msgstr "不良的個人識別碼 (PIN)"
 +msgstr ""
  
 +#: agent/call-pinentry.c:1056
  msgid "Bad Passphrase"
 -msgstr "不良的密語"
 +msgstr ""
  
 +#: agent/command-ssh.c:635 agent/command-ssh.c:730
  #, c-format
  msgid "ssh keys greater than %d bits are not supported\n"
 -msgstr "未支援大於 %d 位元的 ssh 金鑰\n"
 +msgstr ""
  
 +#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
- #: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1306 g10/keygen.c:4577
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
++#: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
  #, c-format
  msgid "can't create '%s': %s\n"
 -msgstr "無法建立 '%s': %s\n"
 +msgstr ""
  
 +#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
- #: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1307
++#: g10/import.c:305 g10/import.c:448 g10/import.c:621 g10/keygen.c:3681
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
- #: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
- #: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:825 g10/sign.c:1025
++#: g10/sign.c:1130 g10/sign.c:1275 g10/tdbdump.c:143 g10/tdbdump.c:151
++#: g10/tdbio.c:720 g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161
++#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
++#: dirmngr/certcache.c:368 dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1564
  #, c-format
  msgid "can't open '%s': %s\n"
 -msgstr "無法開啟 '%s': %s\n"
 +msgstr ""
  
 +#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
  #, c-format
  msgid "error getting serial number of card: %s\n"
 -msgstr "取得此卡片序號時出錯: %s\n"
 +msgstr ""
  
 +#: agent/command-ssh.c:2419
  #, c-format
  msgid "detected card with S/N: %s\n"
 -msgstr "偵測到卡片, 其序號為: %s\n"
 +msgstr ""
  
 +#: agent/command-ssh.c:2424
  #, c-format
  msgid "no authentication key for ssh on card: %s\n"
 -msgstr "卡片上沒有 ssh 用的認證金鑰: %s\n"
 +msgstr ""
  
 +#: agent/command-ssh.c:2444
  #, c-format
  msgid "no suitable card key found: %s\n"
 -msgstr "找不到合適的卡片金鑰: %s\n"
 +msgstr ""
  
 +#: agent/command-ssh.c:2709
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@@ -220,23 -183,20 +220,23 @@@ msgid "
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
  "%s%%0Awithin gpg-agent's key storage"
  msgstr ""
 -"請輸入密語以保護收到的私鑰 %%0A   %s%%0A   %s%%0A 於 gpg-agent 的金鑰存放處"
  
 +#: agent/command-ssh.c:3511
  #, c-format
  msgid "failed to create stream from socket: %s\n"
 -msgstr "從 socket 建立串流失敗: %s\n"
 +msgstr ""
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1100
++#: agent/divert-scd.c:92 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
 -msgstr "請插入下列序號的卡片:"
 +msgstr ""
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1101
++#: agent/divert-scd.c:93 g10/call-agent.c:1102
  msgid "Please remove the current card and insert the one with serial number"
 -msgstr "請移除現用中的卡片並插入下列序號的卡片:"
 +msgstr ""
  
 +#: agent/divert-scd.c:204
  msgid "Admin PIN"
 -msgstr "管理者個人識別碼 (PIN)"
 +msgstr ""
  
  #. TRANSLATORS: A PUK is the Personal Unblocking Code
  #. used to unblock a PIN.
@@@ -356,102 -292,81 +356,102 @@@ msgid "
  "@Options:\n"
  " "
  msgstr ""
 -"@選項:\n"
 -" "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
  msgid "run in daemon mode (background)"
 -msgstr "以服務模式執行 (背景)"
 +msgstr ""
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
  msgid "run in server mode (foreground)"
 -msgstr "以伺服器模式執行 (前景)"
 +msgstr ""
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
 -#, fuzzy
 -#| msgid "run in server mode"
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
  msgid "run in supervised mode"
 -msgstr "以伺服器模式執行"
 +msgstr ""
  
- #: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:170 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:166
  msgid "verbose"
 -msgstr "囉唆模式"
 +msgstr ""
  
 +#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
 -msgstr "盡量安靜些"
 +msgstr ""
  
- #: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
  msgid "sh-style command output"
 -msgstr "sh 樣式的指令輸出"
 +msgstr ""
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
  msgid "csh-style command output"
 -msgstr "csh 樣式的指令輸出"
 +msgstr ""
  
- #: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
- #: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
++#: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
  msgid "|FILE|read options from FILE"
 -msgstr "|檔案|從指定檔案中讀取選項"
 +msgstr ""
  
- #: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:177
  msgid "do not detach from the console"
 -msgstr "不要從 console 分離"
 +msgstr ""
  
 +#: agent/gpg-agent.c:170
  msgid "do not grab keyboard and mouse"
 -msgstr "不要奪取鍵盤及滑鼠"
 +msgstr ""
  
 +#: agent/gpg-agent.c:171 tools/symcryptrun.c:168
  msgid "use a log file for the server"
 -msgstr "為伺服器使用日誌檔"
 +msgstr ""
  
 +#: agent/gpg-agent.c:173
  msgid "|PGM|use PGM as the PIN-Entry program"
 -msgstr "|PGM|使用 PGM 做為 PIN-Entry 程式"
 +msgstr ""
  
 +#: agent/gpg-agent.c:178
  msgid "|PGM|use PGM as the SCdaemon program"
 -msgstr "|PGM|使用 PGM 做為 SCdaemon 程式"
 +msgstr ""
  
 +#: agent/gpg-agent.c:180
  msgid "do not use the SCdaemon"
 -msgstr "不要使用 SCdaemon"
 +msgstr ""
  
 -#, fuzzy
 -#| msgid "|NAME|connect to host NAME"
 +#: agent/gpg-agent.c:184
  msgid "|NAME|accept some commands via NAME"
 -msgstr "|名稱|連線至位於指定名稱的主機"
 +msgstr ""
  
 +#: agent/gpg-agent.c:200
  msgid "ignore requests to change the TTY"
 -msgstr "忽略變更 TTY 的要求"
 +msgstr ""
  
 +#: agent/gpg-agent.c:202
  msgid "ignore requests to change the X display"
 -msgstr "忽略變更 X display 的要求"
 +msgstr ""
  
 +#: agent/gpg-agent.c:205
  msgid "|N|expire cached PINs after N seconds"
 -msgstr "|N|讓快取住的個人識別碼 (PIN) 在 N 秒後到期"
 +msgstr ""
  
 +#: agent/gpg-agent.c:219
  msgid "do not use the PIN cache when signing"
 -msgstr "簽署時不要使用個人識別碼 (PIN) 快取"
 +msgstr ""
  
 -#, fuzzy
 -#| msgid "do not allow the reuse of old passphrases"
 +#: agent/gpg-agent.c:221
  msgid "disallow the use of an external password cache"
 -msgstr "不允許重複使用舊密語"
 +msgstr ""
  
 +#: agent/gpg-agent.c:223
  msgid "disallow clients to mark keys as \"trusted\""
 -msgstr "不允許用戶端將金鑰標記為 \"已信任\""
 +msgstr ""
  
 +#: agent/gpg-agent.c:226
  msgid "allow presetting passphrase"
 -msgstr "允許預先設定密語"
 +msgstr ""
  
 +#: agent/gpg-agent.c:228
  msgid "disallow caller to override the pinentry"
  msgstr ""
  
@@@ -470,176 -382,134 +470,176 @@@ 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:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:481 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1025 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:358
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:124 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  msgid "Please report bugs to <@EMAIL@>.\n"
 -msgstr "翻譯瑕疵請回報給 <Jedi at Jedi.org>, 程式瑕疵則請回報給 <@EMAIL@>.\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:491
++#: agent/gpg-agent.c:490
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 -msgstr "用法: @GPG_AGENT@ [選項] (或用 -h 求助)"
 +msgstr ""
  
- #: agent/gpg-agent.c:493
++#: agent/gpg-agent.c:492
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
  msgstr ""
 -"語法: @GPG_AGENT@ [選項] [指令 [引數]]\n"
 -"@GNUPG@ 私鑰管理\n"
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:537 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:442
  #, c-format
  msgid "invalid debug-level '%s' given\n"
 -msgstr "給定的除錯等級 '%s' 無效\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:793
++#: agent/gpg-agent.c:1082 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:812
  #, c-format
  msgid "Note: no default option file '%s'\n"
 -msgstr "請注意: 沒有預設選項檔 '%s'\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
- #: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1093 agent/gpg-agent.c:1935 g10/gpg.c:2510
++#: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:817
++#: dirmngr/dirmngr.c:1670 tools/symcryptrun.c:932
  #, c-format
  msgid "option file '%s': %s\n"
 -msgstr "選項檔 '%s': %s\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:806
++#: agent/gpg-agent.c:1101 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:825
  #, c-format
  msgid "reading options from '%s'\n"
 -msgstr "從 '%s' 讀取選項中\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
- #: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
++#: agent/gpg-agent.c:1223 g10/gpg.c:3643 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:936 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:527
  #, c-format
  msgid "Note: '%s' is not considered an option\n"
 -msgstr "請注意: '%s' 並不當成選項\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
++#: agent/gpg-agent.c:2080 scd/scdaemon.c:1073 dirmngr/dirmngr.c:1081
  #, c-format
  msgid "can't create socket: %s\n"
 -msgstr "無法建立 socket: %s\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
++#: agent/gpg-agent.c:2097 scd/scdaemon.c:1086 dirmngr/dirmngr.c:1094
  #, c-format
  msgid "socket name '%s' is too long\n"
 -msgstr "socket 名稱 '%s' 太長\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:2134
++#: agent/gpg-agent.c:2135
  msgid "a gpg-agent is already running - not starting a new one\n"
 -msgstr "已經有一份 gpg-agent 在執行了 - 不會再啟動一份新的\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
++#: agent/gpg-agent.c:2145 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1126
  msgid "error getting nonce for the socket\n"
 -msgstr "為 socket 取得 nonce 時出錯\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
++#: agent/gpg-agent.c:2150 scd/scdaemon.c:1113 dirmngr/dirmngr.c:1129
  #, c-format
  msgid "error binding socket to '%s': %s\n"
 -msgstr "綁定 socket 至 '%s' 時出錯: %s\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
- #: dirmngr/dirmngr.c:1126
 -#, fuzzy, c-format
 -#| msgid "Warning: unsafe permissions on %s \"%s\"\n"
++#: agent/gpg-agent.c:2160 agent/gpg-agent.c:2197 scd/scdaemon.c:1121
++#: dirmngr/dirmngr.c:1138
 +#, c-format
  msgid "can't set permissions of '%s': %s\n"
 -msgstr "警告: %s 的權限 \"%s\" 並不安全\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:2165 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1143
  #, c-format
  msgid "listen() failed: %s\n"
 -msgstr "listen() 失敗: %s\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
++#: agent/gpg-agent.c:2172 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1149
  #, c-format
  msgid "listening on socket '%s'\n"
 -msgstr "正在候聽 socket '%s'\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: agent/gpg-agent.c:2191 agent/gpg-agent.c:2234 g10/exec.c:199
 +#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, c-format
  msgid "can't create directory '%s': %s\n"
 -msgstr "無法建立目錄 '%s': %s\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: agent/gpg-agent.c:2194 agent/gpg-agent.c:2239 g10/openfile.c:491
 +#: g10/openfile.c:520 sm/keydb.c:103
  #, c-format
  msgid "directory '%s' created\n"
 -msgstr "目錄 '%s' 已建立\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:2244
++#: agent/gpg-agent.c:2245
  #, c-format
  msgid "stat() failed for '%s': %s\n"
 -msgstr "'%s' 的 stat() 失敗: %s\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:2248
++#: agent/gpg-agent.c:2249
  #, c-format
  msgid "can't use '%s' as home directory\n"
 -msgstr "無法使用 '%s' 做為家目錄\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
++#: agent/gpg-agent.c:2392 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1871
  #, c-format
  msgid "error reading nonce on fd %d: %s\n"
 -msgstr "於 fd %d 讀取 nonce 時出錯: %s\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:2598
++#: agent/gpg-agent.c:2599
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
 -msgstr "經手程式 0x%lx (用於 fd %d) 已啟動\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:2603
++#: agent/gpg-agent.c:2604
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
 -msgstr "經手程式 0x%lx (用於 fd %d) 已終止\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:2678
++#: agent/gpg-agent.c:2679
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
 -msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已啟動\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:2683
++#: agent/gpg-agent.c:2684
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
 -msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已終止\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
++#: agent/gpg-agent.c:2881 scd/scdaemon.c:1272 dirmngr/dirmngr.c:2075
  #, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
 -msgstr "npth_select 失敗: %s - 等 1 秒鐘\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2954 scd/scdaemon.c:1321
  #, c-format
  msgid "%s %s stopped\n"
 -msgstr "%s %s 已停止\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
++#: agent/gpg-agent.c:3092 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  msgid "no gpg-agent running in this session\n"
 -msgstr "在此階段中沒有執行中的 gpg-agent\n"
 +msgstr ""
  
 +#: agent/preset-passphrase.c:99
  msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 -msgstr "用法: gpg-preset-passphrase [選項] 金鑰鑰柄 (或用 -h 求助)\n"
 +msgstr ""
  
 +#: agent/preset-passphrase.c:102
  msgid ""
  "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
  "Password cache maintenance\n"
  msgstr ""
 -"語法: gpg-preset-passphrase [選項] 金鑰鑰柄\n"
 -"密碼快取維護\n"
  
- #: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
++#: agent/protect-tool.c:106 g10/gpg.c:424 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:153 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
  msgstr ""
 -"@指令:\n"
 -" "
  
- #: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
- #: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:92 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:168 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -675,55 -544,46 +675,55 @@@ msgid "
  "Please enter the passphrase or the PIN\n"
  "needed to complete this operation."
  msgstr ""
 -"請輸入完成這項操作所需的\n"
 -"密語或個人識別碼 (PIN)."
  
 +#: agent/protect-tool.c:720 tools/symcryptrun.c:450
  msgid "cancelled\n"
 -msgstr "已取消\n"
 +msgstr ""
  
 +#: agent/protect-tool.c:722 tools/symcryptrun.c:446
  #, c-format
  msgid "error while asking for the passphrase: %s\n"
 -msgstr "詢問密語時出錯: %s\n"
 +msgstr ""
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
- #: tools/gpgconf.c:323
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1472
++#: tools/gpgconf.c:328
  #, c-format
  msgid "error opening '%s': %s\n"
 -msgstr "開啟 '%s' 時出錯: %s\n"
 +msgstr ""
  
 +#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
  #, c-format
  msgid "file '%s', line %d: %s\n"
 -msgstr "檔案 '%s', 第 %d 列: %s\n"
 +msgstr ""
  
 +#: agent/trustlist.c:192 agent/trustlist.c:200
  #, c-format
  msgid "statement \"%s\" ignored in '%s', line %d\n"
 -msgstr "陳述句 \"%s\" 忽略於 '%s', 第 %d 列\n"
 +msgstr ""
  
 +#: agent/trustlist.c:206
  #, c-format
  msgid "system trustlist '%s' not available\n"
 -msgstr "沒有系統信任清單 '%s' 可用\n"
 +msgstr ""
  
 +#: agent/trustlist.c:250
  #, c-format
  msgid "bad fingerprint in '%s', line %d\n"
 -msgstr "不良的指紋於 '%s', 第 %d 列\n"
 +msgstr ""
  
 +#: agent/trustlist.c:275 agent/trustlist.c:282
  #, c-format
  msgid "invalid keyflag in '%s', line %d\n"
 -msgstr "無效的金鑰旗標於 '%s', 第 %d 列\n"
 +msgstr ""
  
 +#: agent/trustlist.c:316 common/helpfile.c:136
  #, c-format
  msgid "error reading '%s', line %d: %s\n"
 -msgstr "讀取 '%s' 時出錯, 第 %d 列: %s\n"
 +msgstr ""
  
 +#: agent/trustlist.c:434 agent/trustlist.c:503
  msgid "error reading list of trusted root certificates\n"
 -msgstr "讀取已信任根憑證清單時出錯\n"
 +msgstr ""
  
  #. TRANSLATORS: This prompt is shown by the Pinentry
  #. and has one special property: A "%%0A" is used by
@@@ -811,201 -658,159 +811,201 @@@ msgid "
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
  msgstr ""
 -"警告: 這把金鑰同時列為 SSH 所使用!\n"
 -"刪除這把金鑰可能會讓你失去存取遠端機器的能力."
  
 +#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
  msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 -msgstr "DSA 需要 8 位元倍數的雜湊長度\n"
 +msgstr ""
  
 +#: agent/pksign.c:187 sm/certcheck.c:97
  #, c-format
  msgid "%s key uses an unsafe (%u bit) hash\n"
 -msgstr "金鑰 %s 使用不安全 (%u 位元) 的雜湊\n"
 +msgstr ""
  
 +#: agent/pksign.c:202
  #, c-format
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 -msgstr "%zu 位元的雜湊對 %u 位元的 %s 金鑰無效\n"
 +msgstr ""
  
 +#: agent/pksign.c:508
  #, c-format
  msgid "checking created signature failed: %s\n"
 -msgstr "檢查已建立的簽章時出錯: %s\n"
 +msgstr ""
  
 +#: agent/cvt-openpgp.c:338
  msgid "secret key parts are not available\n"
 -msgstr "私鑰部分無法取用\n"
 +msgstr ""
  
 +#: agent/cvt-openpgp.c:344
  #, c-format
  msgid "public key algorithm %d (%s) is not supported\n"
 -msgstr "公鑰演算法 %d (%s) 未支援\n"
 +msgstr ""
  
 +#: agent/cvt-openpgp.c:448
  #, c-format
  msgid "protection algorithm %d (%s) is not supported\n"
 -msgstr "保護演算法 %d (%s) 未支援\n"
 +msgstr ""
  
 +#: agent/cvt-openpgp.c:455
  #, c-format
  msgid "protection hash algorithm %d (%s) is not supported\n"
 -msgstr "保護雜湊演算法 %d (%s) 未支援\n"
 +msgstr ""
  
 +#: common/exechelp-posix.c:359 common/exechelp-w32.c:438
 +#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
- #: dirmngr/ldap-wrapper.c:710
++#: dirmngr/ldap-wrapper.c:711
  #, c-format
  msgid "error creating a pipe: %s\n"
 -msgstr "建立管道時出錯: %s\n"
 +msgstr ""
  
 +#: common/exechelp-posix.c:372 common/exechelp-w32.c:344
 +#: common/exechelp-w32.c:448 common/exechelp-w32.c:472
 +#: common/exechelp-w32.c:502
  #, c-format
  msgid "error creating a stream for a pipe: %s\n"
 -msgstr "建立管道串流時出錯: %s\n"
 +msgstr ""
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1155
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1167
  #, c-format
  msgid "error forking process: %s\n"
 -msgstr "衍生執行程序時出錯: %s\n"
 +msgstr ""
  
 +#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
  #, c-format
  msgid "waiting for process %d to terminate failed: %s\n"
 -msgstr "等候 %d 處理程序終止時失敗: %s\n"
 +msgstr ""
  
 +#: common/exechelp-posix.c:678 common/exechelp-posix.c:792
  #, c-format
  msgid "error running '%s': probably not installed\n"
 -msgstr "執行 '%s' 時出錯: 可能尚未安裝\n"
 +msgstr ""
  
 +#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
 +#: common/exechelp-w32.c:785 common/exechelp-w32ce.c:781
  #, c-format
  msgid "error running '%s': exit status %d\n"
 -msgstr "執行 '%s' 時出錯: 結束狀態 %d\n"
 +msgstr ""
  
 +#: common/exechelp-posix.c:692 common/exechelp-posix.c:807
  #, c-format
  msgid "error running '%s': terminated\n"
 -msgstr "執行 '%s' 時出錯: 已終止\n"
 +msgstr ""
  
 -#, fuzzy, c-format
 -#| msgid "waiting for process %d to terminate failed: %s\n"
 +#: common/exechelp-posix.c:750 common/exechelp-w32.c:766
 +#, c-format
  msgid "waiting for processes to terminate failed: %s\n"
 -msgstr "等候 %d 處理程序終止時失敗: %s\n"
 +msgstr ""
  
 +#: common/exechelp-w32.c:778 common/exechelp-w32ce.c:775
  #, c-format
  msgid "error getting exit code of process %d: %s\n"
 -msgstr "取得 %d 執行程序結束碼時出錯: %s\n"
 +msgstr ""
  
 +#: common/simple-pwquery.c:260
  #, c-format
  msgid "can't connect to '%s': %s\n"
 -msgstr "無法連接至 '%s': %s\n"
 +msgstr ""
  
 +#: common/simple-pwquery.c:270
  msgid "problem setting the gpg-agent options\n"
 -msgstr "設定 gpg-agent 選項時發生問題\n"
 +msgstr ""
  
- #: common/sysutils.c:144
++#: common/sysutils.c:148
  #, c-format
  msgid "can't disable core dumps: %s\n"
 -msgstr "無法讓系統停止傾印核心檔: %s\n"
 +msgstr ""
  
- #: common/sysutils.c:239
++#: common/sysutils.c:250
  #, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
 -msgstr "警告: %s 的所有權 \"%s\" 並不安全\n"
 +msgstr ""
  
- #: common/sysutils.c:271
++#: common/sysutils.c:282
  #, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
 -msgstr "警告: %s 的權限 \"%s\" 並不安全\n"
 +msgstr ""
  
- #: common/sysutils.c:659
 -#, fuzzy, c-format
 -#| msgid "waiting for the agent to come up ... (%ds)\n"
++#: common/sysutils.c:693
 +#, c-format
  msgid "waiting for file '%s' to become accessible ...\n"
 -msgstr "正在等候代理程式出現 ... (%d 秒)\n"
 +msgstr ""
  
- #: common/sysutils.c:685
++#: common/sysutils.c:719
  #, c-format
  msgid "renaming '%s' to '%s' failed: %s\n"
 -msgstr "把 '%s' 重新新命成 '%s' 時失敗: %s\n"
 +msgstr ""
  
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:45 common/yesno.c:82
  msgid "yes"
 -msgstr "yes"
 +msgstr ""
  
 +#: common/yesno.c:46 common/yesno.c:87
  msgid "yY"
 -msgstr "yY"
 +msgstr ""
  
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:48 common/yesno.c:84
  msgid "no"
 -msgstr "no"
 +msgstr ""
  
 +#: common/yesno.c:49 common/yesno.c:88
  msgid "nN"
 -msgstr "nN"
 +msgstr ""
  
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:86
  msgid "quit"
 -msgstr "quit"
 +msgstr ""
  
 +#: common/yesno.c:89
  msgid "qQ"
 -msgstr "qQ"
 +msgstr ""
  
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:123
  msgid "okay|okay"
 -msgstr "okay|okay"
 +msgstr ""
  
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:125
  msgid "cancel|cancel"
 -msgstr "cancel|cancel"
 +msgstr ""
  
 +#: common/yesno.c:126
  msgid "oO"
 -msgstr "oO"
 +msgstr ""
  
 +#: common/yesno.c:127
  msgid "cC"
 -msgstr "cC"
 +msgstr ""
  
 +#: common/miscellaneous.c:86
  #, c-format
  msgid "out of core in secure memory while allocating %lu bytes"
 -msgstr "在安全記憶體配置 %lu 位元組時超出核心"
 +msgstr ""
  
 +#: common/miscellaneous.c:89
  #, c-format
  msgid "out of core while allocating %lu bytes"
 -msgstr "配置 %lu 位元組時超出核心"
 +msgstr ""
  
 +#: common/miscellaneous.c:115 g10/card-util.c:800 tools/no-libgcrypt.c:30
  #, c-format
  msgid "error allocating enough memory: %s\n"
 -msgstr "配置足夠的記憶體時出錯: %s\n"
 +msgstr ""
  
 +#: common/miscellaneous.c:143
  #, c-format
  msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 -msgstr "%s:%u: 廢棄的 \"%s\" 選項 - 沒有任何影響\n"
 +msgstr ""
  
 +#: common/miscellaneous.c:146
  #, c-format
  msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 -msgstr "警告: \"%s%s\" 是已廢棄的選項 - 沒有效果\n"
 +msgstr ""
  
- #: common/miscellaneous.c:554
++#: common/miscellaneous.c:556
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
@@@ -1044,405 -844,312 +1044,405 @@@ msgstr "
  
  #. TRANSLATORS: Copy the prefix between the vertical bars
  #. verbatim.  It will not be printed.
 +#: common/audit.c:474
  msgid "|audit-log-result|Good"
 -msgstr "|audit-log-result|良好"
 +msgstr ""
  
 +#: common/audit.c:477
  msgid "|audit-log-result|Bad"
 -msgstr "|audit-log-result|不良"
 +msgstr ""
  
 +#: common/audit.c:479
  msgid "|audit-log-result|Not supported"
 -msgstr "|audit-log-result|不支援"
 +msgstr ""
  
 +#: common/audit.c:481
  msgid "|audit-log-result|No certificate"
 -msgstr "|audit-log-result|沒有憑證"
 +msgstr ""
  
 +#: common/audit.c:483
  msgid "|audit-log-result|Not enabled"
 -msgstr "|audit-log-result|未啟用"
 +msgstr ""
  
 +#: common/audit.c:485
  msgid "|audit-log-result|Error"
 -msgstr "|audit-log-result|錯誤"
 +msgstr ""
  
 +#: common/audit.c:487
  msgid "|audit-log-result|Not used"
 -msgstr "|audit-log-result|未使用"
 +msgstr ""
  
 +#: common/audit.c:489
  msgid "|audit-log-result|Okay"
 -msgstr "|audit-log-result|沒問題"
 +msgstr ""
  
 +#: common/audit.c:491
  msgid "|audit-log-result|Skipped"
 -msgstr "|audit-log-result|已跳過"
 +msgstr ""
  
 +#: common/audit.c:493
  msgid "|audit-log-result|Some"
 -msgstr "|audit-log-result|有些"
 +msgstr ""
  
 +#: common/audit.c:726
  msgid "Certificate chain available"
 -msgstr "有可用的憑證鏈"
 +msgstr ""
  
 +#: common/audit.c:733
  msgid "root certificate missing"
 -msgstr "根憑證遺失"
 +msgstr ""
  
 +#: common/audit.c:759
  msgid "Data encryption succeeded"
 -msgstr "資料已加密成功"
 +msgstr ""
  
 +#: common/audit.c:764 common/audit.c:830 common/audit.c:906 common/audit.c:997
  msgid "Data available"
 -msgstr "有可用的資料"
 +msgstr ""
  
 +#: common/audit.c:767
  msgid "Session key created"
 -msgstr "階段金鑰已建立"
 +msgstr ""
  
 +#: common/audit.c:772 common/audit.c:912 common/audit.c:919
  #, c-format
  msgid "algorithm: %s"
 -msgstr "演算法: %s"
 +msgstr ""
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3098
++#: scd/app-openpgp.c:3111
  #, c-format
  msgid "unsupported algorithm: %s"
 -msgstr "未支援的演算法: %s"
 +msgstr ""
  
 +#: common/audit.c:778 common/audit.c:925
  msgid "seems to be not encrypted"
 -msgstr "看起來未加密"
 +msgstr ""
  
 +#: common/audit.c:784 common/audit.c:933
  msgid "Number of recipients"
 -msgstr "收件者數量"
 +msgstr ""
  
 +#: common/audit.c:792 common/audit.c:956
  #, c-format
  msgid "Recipient %d"
 -msgstr "收件者 %d"
 +msgstr ""
  
 +#: common/audit.c:825
  msgid "Data signing succeeded"
 -msgstr "資料已簽署成功"
 +msgstr ""
  
 +#: common/audit.c:839 common/audit.c:1033 common/audit.c:1060
  #, c-format
  msgid "data hash algorithm: %s"
 -msgstr "資料雜湊演算法: %s"
 +msgstr ""
  
 +#: common/audit.c:862
  #, c-format
  msgid "Signer %d"
 -msgstr "簽署者 %d"
 +msgstr ""
  
 +#: common/audit.c:866 common/audit.c:1065
  #, c-format
  msgid "attr hash algorithm: %s"
 -msgstr "屬性雜湊演算法: %s"
 +msgstr ""
  
 +#: common/audit.c:901
  msgid "Data decryption succeeded"
 -msgstr "資料已解密成功"
 +msgstr ""
  
 +#: common/audit.c:910
  msgid "Encryption algorithm supported"
 -msgstr "支援的加密演算法"
 +msgstr ""
  
 +#: common/audit.c:993
  msgid "Data verification succeeded"
 -msgstr "資料驗證成功"
 +msgstr ""
  
 +#: common/audit.c:1002
  msgid "Signature available"
 -msgstr "有可用的簽章"
 +msgstr ""
  
 +#: common/audit.c:1024
  msgid "Parsing data succeeded"
 -msgstr "剖析資料成功"
 +msgstr ""
  
 +#: common/audit.c:1036
  #, c-format
  msgid "bad data hash algorithm: %s"
 -msgstr "不良的資料雜湊演算法: %s"
 +msgstr ""
  
 +#: common/audit.c:1051
  #, c-format
  msgid "Signature %d"
 -msgstr "簽章 %d"
 +msgstr ""
  
 +#: common/audit.c:1079
  msgid "Certificate chain valid"
 -msgstr "憑證鏈有效"
 +msgstr ""
  
 +#: common/audit.c:1090
  msgid "Root certificate trustworthy"
 -msgstr "根憑證可信賴"
 +msgstr ""
  
 +#: common/audit.c:1111 sm/certchain.c:1009
  msgid "no CRL found for certificate"
 -msgstr "找不到用於憑證的 CRL"
 +msgstr ""
  
 +#: common/audit.c:1114 sm/certchain.c:1019
  msgid "the available CRL is too old"
 -msgstr "可用的 CRL 太舊了"
 +msgstr ""
  
 +#: common/audit.c:1119
  msgid "CRL/OCSP check of certificates"
 -msgstr "CRL/OCSP 憑證檢查"
 +msgstr ""
  
 +#: common/audit.c:1139
  msgid "Included certificates"
 -msgstr "包含在內的憑證"
 +msgstr ""
  
 +#: common/audit.c:1194
  msgid "No audit log entries."
 -msgstr "沒有稽核日誌項目."
 +msgstr ""
  
 +#: common/audit.c:1243
  msgid "Unknown operation"
 -msgstr "未知的操作"
 +msgstr ""
  
 +#: common/audit.c:1261
  msgid "Gpg-Agent usable"
 -msgstr "Gpg-Agent 可以使用"
 +msgstr ""
  
 +#: common/audit.c:1271
  msgid "Dirmngr usable"
 -msgstr "Dirmngr 可以使用"
 +msgstr ""
  
 +#: common/audit.c:1307
  #, c-format
  msgid "No help available for '%s'."
 -msgstr "'%s' 沒有可用的說明."
 +msgstr ""
  
 +#: common/helpfile.c:90
  msgid "ignoring garbage line"
 -msgstr "忽略垃圾列"
 +msgstr ""
  
 +#: common/gettime.c:887
  msgid "[none]"
 -msgstr "[ 無 ]"
 +msgstr ""
  
 +#: common/argparse.c:365
  msgid "argument not expected"
 -msgstr "沒料到有引數"
 +msgstr ""
  
 +#: common/argparse.c:367
  msgid "read error"
 -msgstr "讀取錯誤"
 +msgstr ""
  
 +#: common/argparse.c:369
  msgid "keyword too long"
 -msgstr "關鍵字太長"
 +msgstr ""
  
 +#: common/argparse.c:371
  msgid "missing argument"
 -msgstr "無效的引數"
 +msgstr ""
  
 +#: common/argparse.c:373
  msgid "invalid argument"
 -msgstr "無效的引數"
 +msgstr ""
  
 +#: common/argparse.c:375
  msgid "invalid command"
 -msgstr "無效的指令"
 +msgstr ""
  
 +#: common/argparse.c:377
  msgid "invalid alias definition"
 -msgstr "無效的別名定義"
 +msgstr ""
  
 +#: common/argparse.c:379
  msgid "out of core"
 -msgstr "超出核心"
 +msgstr ""
  
 +#: common/argparse.c:381
  msgid "invalid option"
 -msgstr "無效的選項"
 +msgstr ""
  
 +#: common/argparse.c:389
  #, c-format
  msgid "missing argument for option \"%.50s\"\n"
 -msgstr "\"%.50s\" 選項遺失了引數\n"
 +msgstr ""
  
 +#: common/argparse.c:391
  #, c-format
  msgid "invalid argument for option \"%.50s\"\n"
 -msgstr "選項 \"%.50s\" 的引數無效\n"
 +msgstr ""
  
 +#: common/argparse.c:393
  #, c-format
  msgid "option \"%.50s\" does not expect an argument\n"
 -msgstr "\"%.50s\" 選項沒料到會有引數\n"
 +msgstr ""
  
 +#: common/argparse.c:395
  #, c-format
  msgid "invalid command \"%.50s\"\n"
 -msgstr "無效的指令 \"%.50s\"\n"
 +msgstr ""
  
 +#: common/argparse.c:397
  #, c-format
  msgid "option \"%.50s\" is ambiguous\n"
 -msgstr "\"%.50s\" 選項不明確\n"
 +msgstr ""
  
 +#: common/argparse.c:399
  #, c-format
  msgid "command \"%.50s\" is ambiguous\n"
 -msgstr "\"%.50s\" 指令不明確\n"
 +msgstr ""
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1173
++#: common/argparse.c:401 dirmngr/dirmngr.c:1185
  msgid "out of core\n"
 -msgstr "超出核心\n"
 +msgstr ""
  
 +#: common/argparse.c:403
  #, c-format
  msgid "invalid option \"%.50s\"\n"
 -msgstr "無效的選項 \"%.50s\"\n"
 +msgstr ""
  
 +#: common/utf8conv.c:123
  #, c-format
  msgid "conversion from '%s' to '%s' not available\n"
 -msgstr "沒有從 '%s' 到 '%s' 之間的轉換可用\n"
 +msgstr ""
  
 +#: common/utf8conv.c:131
  #, c-format
  msgid "iconv_open failed: %s\n"
 -msgstr "iconv_open 失敗: %s\n"
 +msgstr ""
  
 +#: common/utf8conv.c:385 common/utf8conv.c:651
  #, c-format
  msgid "conversion from '%s' to '%s' failed: %s\n"
 -msgstr "從 '%s' 轉換到 '%s' 失敗: %s\n"
 +msgstr ""
  
 +#: common/dotlock.c:707
  #, c-format
  msgid "failed to create temporary file '%s': %s\n"
 -msgstr "建立暫存檔失敗 '%s': %s\n"
 +msgstr ""
  
 +#: common/dotlock.c:771
  #, c-format
  msgid "error writing to '%s': %s\n"
 -msgstr "寫入 '%s' 時出錯: %s\n"
 +msgstr ""
  
 +#: common/dotlock.c:1116
  #, c-format
  msgid "removing stale lockfile (created by %d)\n"
 -msgstr "正在移除陳腐的鎖定檔 (由 %d 所建立)\n"
 +msgstr ""
  
 +#: common/dotlock.c:1152
  #, c-format
  msgid "waiting for lock (held by %d%s) %s...\n"
 -msgstr "正在等候鎖定 (被 %d%s 持有) %s...\n"
 +msgstr ""
  
 +#: common/dotlock.c:1153
  msgid "(deadlock?) "
 -msgstr "(死結嗎?) "
 +msgstr ""
  
 +#: common/dotlock.c:1192
  #, c-format
  msgid "lock '%s' not made: %s\n"
 -msgstr "未鎖定 '%s': %s\n"
 +msgstr ""
  
 +#: common/dotlock.c:1219
  #, c-format
  msgid "waiting for lock %s...\n"
 -msgstr "正在等候 `%s' 鎖定...\n"
 +msgstr ""
  
- #: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
- #: dirmngr/dirmngr.c:715
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:725
++#: dirmngr/dirmngr.c:734
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
 -msgstr "%s 太舊了 (需要 %s, 但是祇有 %s)\n"
 +msgstr ""
  
 +#: g10/armor.c:424
  #, c-format
  msgid "armor: %s\n"
 -msgstr "封裝: %s\n"
 +msgstr ""
  
 +#: g10/armor.c:463
  msgid "invalid armor header: "
 -msgstr "無效的封裝檔頭: "
 +msgstr ""
  
 +#: g10/armor.c:474
  msgid "armor header: "
 -msgstr "封裝檔頭: "
 +msgstr ""
  
 +#: g10/armor.c:487
  msgid "invalid clearsig header\n"
 -msgstr "無效的明文簽章檔頭\n"
 +msgstr ""
  
 +#: g10/armor.c:500
  msgid "unknown armor header: "
 -msgstr "未知的封裝檔頭: "
 +msgstr ""
  
 +#: g10/armor.c:553
  msgid "nested clear text signatures\n"
 -msgstr "多層明文簽章\n"
 +msgstr ""
  
 +#: g10/armor.c:688
  msgid "unexpected armor: "
 -msgstr "未預期的封裝: "
 +msgstr ""
  
 +#: g10/armor.c:701
  msgid "invalid dash escaped line: "
 -msgstr "無效的破折號逸出列: "
 +msgstr ""
  
- #: g10/armor.c:873 g10/armor.c:1490
++#: g10/armor.c:873 g10/armor.c:1493
  #, c-format
  msgid "invalid radix64 character %02X skipped\n"
 -msgstr "無效的 64 進位字符 %02x 已跳過\n"
 +msgstr ""
  
 +#: g10/armor.c:916
  msgid "premature eof (no CRC)\n"
 -msgstr "檔案未預期的結束 (沒有 CRC 的部分)\n"
 +msgstr ""
  
 +#: g10/armor.c:950
  msgid "premature eof (in CRC)\n"
 -msgstr "檔案未預期的結束 (CRC 的部分未結束)\n"
 +msgstr ""
  
 +#: g10/armor.c:958
  msgid "malformed CRC\n"
 -msgstr "格式不對的 CRC\n"
 +msgstr ""
  
- #: g10/armor.c:962 g10/armor.c:1527
++#: g10/armor.c:962 g10/armor.c:1530
  #, c-format
  msgid "CRC error; %06lX - %06lX\n"
 -msgstr "CRC 錯誤; %06lX - %06lX\n"
 +msgstr ""
  
 +#: g10/armor.c:982
  msgid "premature eof (in trailer)\n"
 -msgstr "檔案未預期的結束 (於結尾處)\n"
 +msgstr ""
  
 +#: g10/armor.c:986
  msgid "error in trailer line\n"
 -msgstr "結尾列有問題\n"
 +msgstr ""
  
- #: g10/armor.c:1303
++#: g10/armor.c:1306
  msgid "no valid OpenPGP data found.\n"
 -msgstr "找不到有效的 OpenPGP 資料.\n"
 +msgstr ""
  
- #: g10/armor.c:1308
++#: g10/armor.c:1311
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
 -msgstr "無效的封裝: 列長超出 %d 字符\n"
 +msgstr ""
  
- #: g10/armor.c:1312
++#: g10/armor.c:1315
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
 -msgstr "封裝裡出現被引號括住的可列印字符 - 可能是有瑕疵的送信程式造成的\n"
 +msgstr ""
  
 -#, fuzzy, c-format
 -#| msgid "not human readable"
 +#: g10/build-packet.c:1110
 +#, c-format
  msgid "[ not human readable (%zu bytes: %s%s) ]"
 -msgstr "不是人類能讀得懂的"
 +msgstr ""
  
 +#: g10/build-packet.c:1162
  msgid ""
  "a notation name must have only printable characters or spaces, and end with "
  "an '='\n"
@@@ -1491,901 -1195,720 +1491,905 @@@ msgstr "
  msgid "server '%s' is older than us (%s < %s)"
  msgstr ""
  
 -#, fuzzy, c-format
 -#| msgid "WARNING: %s overrides %s\n"
 +#: g10/call-agent.c:208 sm/call-agent.c:110 sm/call-dirmngr.c:177
 +#, c-format
  msgid "WARNING: %s\n"
 -msgstr "警告: %s 會推翻 %s\n"
 +msgstr ""
  
 +#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1705
  #, c-format
  msgid "OpenPGP card not available: %s\n"
 -msgstr "沒有可用的 OpenPGP 卡片: %s\n"
 +msgstr ""
  
 +#: g10/card-util.c:91 g10/card-util.c:1711
  #, c-format
  msgid "OpenPGP card no. %s detected\n"
 -msgstr "偵測到 OpenPGP 卡片編號 %s\n"
 +msgstr ""
  
- #: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
- #: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2030
++#: g10/keygen.c:4087 g10/revoke.c:215 g10/revoke.c:618
  msgid "can't do this in batch mode\n"
 -msgstr "無法在批次模式中這樣做\n"
 +msgstr ""
  
 +#: g10/card-util.c:107
  msgid "This command is only available for version 2 cards\n"
 -msgstr "祇有第二版卡片纔能用這個指令\n"
 +msgstr ""
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2454
++#: g10/card-util.c:109 scd/app-openpgp.c:2467
  msgid "Reset Code not or not anymore available\n"
 -msgstr "(再也) 沒有重設碼\n"
 +msgstr ""
  
 +#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
- #: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
- #: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1768
++#: g10/keygen.c:1945 g10/keygen.c:2313 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
 -msgstr "你要選哪一個? "
 +msgstr ""
  
 +#: g10/card-util.c:279 g10/card-util.c:330
  msgid "[not set]"
 -msgstr "[未設定]"
 +msgstr ""
  
 +#: g10/card-util.c:533
  msgid "male"
 -msgstr "男性"
 +msgstr ""
  
 +#: g10/card-util.c:534
  msgid "female"
 -msgstr "女性"
 +msgstr ""
  
 +#: g10/card-util.c:534
  msgid "unspecified"
 -msgstr "未特定"
 +msgstr ""
  
 +#: g10/card-util.c:561
  msgid "not forced"
 -msgstr "不強迫使用"
 +msgstr ""
  
 +#: g10/card-util.c:561
  msgid "forced"
 -msgstr "強迫使用"
 +msgstr ""
  
 +#: g10/card-util.c:647
  msgid "Error: Only plain ASCII is currently allowed.\n"
 -msgstr "錯誤: 目前祇允許使用單純的 ASCII 字符.\n"
 +msgstr ""
  
 +#: g10/card-util.c:649
  msgid "Error: The \"<\" character may not be used.\n"
 -msgstr "錯誤: 不能使用 \"<\" 字符.\n"
 +msgstr ""
  
 +#: g10/card-util.c:651
  msgid "Error: Double spaces are not allowed.\n"
 -msgstr "錯誤: 並不允許使用連續兩個以上的空格.\n"
 +msgstr ""
  
 +#: g10/card-util.c:668
  msgid "Cardholder's surname: "
 -msgstr "卡片持有者的姓氏: "
 +msgstr ""
  
 +#: g10/card-util.c:670
  msgid "Cardholder's given name: "
 -msgstr "卡片持有者的名字: "
 +msgstr ""
  
 +#: g10/card-util.c:688
  #, c-format
  msgid "Error: Combined name too long (limit is %d characters).\n"
 -msgstr "錯誤: 合併後的名字太長 (上限是 %d 個字符).\n"
 +msgstr ""
  
 +#: g10/card-util.c:709
  msgid "URL to retrieve public key: "
 -msgstr "取回公鑰的 URL: "
 +msgstr ""
  
 +#: g10/card-util.c:717
  #, c-format
  msgid "Error: URL too long (limit is %d characters).\n"
 -msgstr "錯誤: URL 太長 (上限是 %d 個字符).\n"
 +msgstr ""
  
- #: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
- #: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:334
++#: g10/import.c:592 g10/import.c:640 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
++#: dirmngr/dirmngr.c:1510 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, c-format
  msgid "error reading '%s': %s\n"
 -msgstr "讀取 '%s' 時出錯: %s\n"
 +msgstr ""
  
 +#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2319
 +#: dirmngr/crlcache.c:926
  #, c-format
  msgid "error writing '%s': %s\n"
 -msgstr "寫入 '%s' 時出錯: %s\n"
 +msgstr ""
  
 +#: g10/card-util.c:872
  msgid "Login data (account name): "
 -msgstr "登入資料 (帳號名稱): "
 +msgstr ""
  
 +#: g10/card-util.c:882
  #, c-format
  msgid "Error: Login data too long (limit is %d characters).\n"
 -msgstr "錯誤: 登入資料太長 (上限是 %d 個字符).\n"
 +msgstr ""
  
 +#: g10/card-util.c:918
  msgid "Private DO data: "
 -msgstr "私人的 DO 資料: "
 +msgstr ""
  
 +#: g10/card-util.c:928
  #, c-format
  msgid "Error: Private DO too long (limit is %d characters).\n"
 -msgstr "錯誤: 私人的 DO 太長 (上限是 %d 個字符).\n"
 +msgstr ""
  
 +#: g10/card-util.c:1011
  msgid "Language preferences: "
 -msgstr "介面語言偏好設定: "
 +msgstr ""
  
 +#: g10/card-util.c:1019
  msgid "Error: invalid length of preference string.\n"
 -msgstr "錯誤: 無效的偏好設定字串長度\n"
 +msgstr ""
  
 +#: g10/card-util.c:1028
  msgid "Error: invalid characters in preference string.\n"
 -msgstr "錯誤: 偏好設定字串中含有無效的字符\n"
 +msgstr ""
  
 +#: g10/card-util.c:1050
  msgid "Sex ((M)ale, (F)emale or space): "
 -msgstr "性別 ((M)男性, (F)女性或留空): "
 +msgstr ""
  
 +#: g10/card-util.c:1064
  msgid "Error: invalid response.\n"
 -msgstr "錯誤: 無效的回應.\n"
 +msgstr ""
  
 +#: g10/card-util.c:1086
  msgid "CA fingerprint: "
 -msgstr "憑證中心 (CA) 指紋: "
 +msgstr ""
  
 +#: g10/card-util.c:1109
  msgid "Error: invalid formatted fingerprint.\n"
 -msgstr "錯誤: 無效的格式化指紋.\n"
 +msgstr ""
  
 +#: g10/card-util.c:1159
  #, c-format
  msgid "key operation not possible: %s\n"
 -msgstr "不可能進行金鑰操作: %s\n"
 +msgstr ""
  
 +#: g10/card-util.c:1160
  msgid "not an OpenPGP card"
 -msgstr "這不是 OpenPGP 卡片"
 +msgstr ""
  
- #: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
++#: g10/card-util.c:1173 g10/keygen.c:4106 g10/keygen.c:5092
  #, c-format
  msgid "error getting current key info: %s\n"
 -msgstr "取得現用金鑰資訊時出錯: %s\n"
 +msgstr ""
  
 +#: g10/card-util.c:1260
  msgid "Replace existing key? (y/N) "
 -msgstr "是否要取代既有的金鑰? (y/N) "
 +msgstr ""
  
 +#: g10/card-util.c:1277
  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 ""
 -"請注意: 我們完全無法保證卡片支援你想用的尺寸.\n"
 -"      如果金鑰產生失敗了, 煩請查閱你卡片上的文件,\n"
 -"      看看這張卡片支援哪些尺寸.\n"
  
 +#: g10/card-util.c:1302
  #, c-format
  msgid "What keysize do you want for the Signature key? (%u) "
 -msgstr "你的簽署金鑰想要用多大的金鑰尺寸? (%u) "
 +msgstr ""
  
 +#: g10/card-util.c:1304
  #, c-format
  msgid "What keysize do you want for the Encryption key? (%u) "
 -msgstr "你的加密金鑰想要用多大的金鑰尺寸? (%u) "
 +msgstr ""
  
 +#: g10/card-util.c:1305
  #, c-format
  msgid "What keysize do you want for the Authentication key? (%u) "
 -msgstr "你的認證金鑰想要用多大的金鑰尺寸? (%u) "
 +msgstr ""
  
- #: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
++#: g10/card-util.c:1316 g10/keygen.c:2122 g10/keygen.c:2154
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
 -msgstr "加大到 %u 位元\n"
 +msgstr ""
  
- #: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2207 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
 -msgstr "%s 金鑰尺寸一定要介於 %u 到 %u 之間\n"
 +msgstr ""
  
 +#: g10/card-util.c:1329
  #, c-format
  msgid "The card will now be re-configured to generate a key of %u bits\n"
 -msgstr "這張卡片將重新加以組態, 以便產生 %u 位元的金鑰\n"
 +msgstr ""
  
 +#: g10/card-util.c:1349
  #, c-format
  msgid "error changing size of key %d to %u bits: %s\n"
 -msgstr "將金鑰 %d 尺寸變更至 %u 位元時出錯: %s\n"
 +msgstr ""
  
 +#: g10/card-util.c:1373
  msgid "Make off-card backup of encryption key? (Y/n) "
 -msgstr "是否要為加密用金鑰建立卡外備份? (Y/n) "
 +msgstr ""
  
 +#: g10/card-util.c:1387
  msgid "Note: keys are already stored on the card!\n"
 -msgstr "請注意: 金鑰已經存放在卡片上了!\n"
 +msgstr ""
  
 +#: g10/card-util.c:1390
  msgid "Replace existing keys? (y/N) "
 -msgstr "是否要取代既有的金鑰? (y/N) "
 +msgstr ""
  
 +#: g10/card-util.c:1402
  #, c-format
  msgid ""
  "Please note that the factory settings of the PINs are\n"
  "   PIN = '%s'     Admin PIN = '%s'\n"
  "You should change them using the command --change-pin\n"
  msgstr ""
 -"請注意個人識別碼 (PIN) 的出廠設定值為\n"
 -"   PIN = '%s'     管理者 PIN = '%s'\n"
 -"你應該用 --change-pin 指令來加以變更\n"
  
 +#: g10/card-util.c:1462
  msgid "Please select the type of key to generate:\n"
 -msgstr "請選擇你要產生的金鑰種類:\n"
 +msgstr ""
  
 +#: g10/card-util.c:1464 g10/card-util.c:1578
  msgid "   (1) Signature key\n"
 -msgstr "   (1) 簽署用金鑰\n"
 +msgstr ""
  
 +#: g10/card-util.c:1465 g10/card-util.c:1580
  msgid "   (2) Encryption key\n"
 -msgstr "   (2) 加密用金鑰\n"
 +msgstr ""
  
 +#: g10/card-util.c:1466 g10/card-util.c:1582
  msgid "   (3) Authentication key\n"
 -msgstr "   (3) 憑證用金鑰\n"
 +msgstr ""
  
- #: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
- #: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
- #: g10/keygen.c:2314 g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1508
++#: g10/keygen.c:1794 g10/keygen.c:1822 g10/keygen.c:1952 g10/keygen.c:2060
++#: g10/keygen.c:2336 g10/revoke.c:820
  msgid "Invalid selection.\n"
 -msgstr "無效的選擇.\n"
 +msgstr ""
  
 +#: g10/card-util.c:1575
  msgid "Please select where to store the key:\n"
 -msgstr "請選擇要把金鑰存放在哪裡:\n"
 +msgstr ""
  
 +#: g10/card-util.c:1621
  #, c-format
  msgid "KEYTOCARD failed: %s\n"
 -msgstr "KEYTOCARD 失敗: %s\n"
 +msgstr ""
  
 -#, fuzzy
 -#| msgid "This command is not allowed while in %s mode.\n"
 +#: g10/card-util.c:1717
  msgid "This command is not supported by this card\n"
 -msgstr "在 %s 模式中不允許使用這個指令.\n"
 +msgstr ""
  
 -#, fuzzy
 -#| msgid "Note: keys are already stored on the card!\n"
 +#: g10/card-util.c:1722
  msgid "Note: This command destroys all keys stored on the card!\n"
 -msgstr "請注意: 金鑰已經存放在卡片上了!\n"
 +msgstr ""
  
 -#, fuzzy
 -#| msgid "Continue? (Y/n) "
 +#: g10/card-util.c:1725
  msgid "Continue? (y/N) "
 -msgstr "是否繼續? (Y/n) "
 +msgstr ""
  
 +#: g10/card-util.c:1730
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1816 g10/keyedit.c:1867
++#: g10/card-util.c:1816 g10/keyedit.c:1868
  msgid "quit this menu"
 -msgstr "離開這個選單"
 +msgstr ""
  
 +#: g10/card-util.c:1818
  msgid "show admin commands"
 -msgstr "顯示管理者指令"
 +msgstr ""
  
- #: g10/card-util.c:1819 g10/keyedit.c:1870
++#: g10/card-util.c:1819 g10/keyedit.c:1871
  msgid "show this help"
 -msgstr "顯示這份線上說明"
 +msgstr ""
  
 +#: g10/card-util.c:1821
  msgid "list all available data"
 -msgstr "列出所有可用的資料"
 +msgstr ""
  
 +#: g10/card-util.c:1824
  msgid "change card holder's name"
 -msgstr "變更卡片持有人的名字"
 +msgstr ""
  
 +#: g10/card-util.c:1825
  msgid "change URL to retrieve key"
 -msgstr "變更取回金鑰的 URL"
 +msgstr ""
  
 +#: g10/card-util.c:1826
  msgid "fetch the key specified in the card URL"
 -msgstr "從卡片 URL 取回指定的金鑰"
 +msgstr ""
  
 +#: g10/card-util.c:1827
  msgid "change the login name"
 -msgstr "變更登入名稱"
 +msgstr ""
  
 +#: g10/card-util.c:1828
  msgid "change the language preferences"
 -msgstr "變更介面語言偏好設定"
 +msgstr ""
  
 +#: g10/card-util.c:1829
  msgid "change card holder's sex"
 -msgstr "變更卡片持有者的性別"
 +msgstr ""
  
 +#: g10/card-util.c:1830
  msgid "change a CA fingerprint"
 -msgstr "變更某個憑證中心 (CA) 的指紋"
 +msgstr ""
  
 +#: g10/card-util.c:1831
  msgid "toggle the signature force PIN flag"
 -msgstr "切換簽章是否強制使用個人識別碼 (PIN) 的旗標"
 +msgstr ""
  
 +#: g10/card-util.c:1832
  msgid "generate new keys"
 -msgstr "產生新的金鑰"
 +msgstr ""
  
 +#: g10/card-util.c:1833
  msgid "menu to change or unblock the PIN"
 -msgstr "變更或重設個人識別碼 (PIN) 的選單"
 +msgstr ""
  
 +#: g10/card-util.c:1834
  msgid "verify the PIN and list all data"
 -msgstr "驗證個人識別碼 (PIN) 並列出所有的資料"
 +msgstr ""
  
 +#: g10/card-util.c:1835
  msgid "unblock the PIN using a Reset Code"
 -msgstr "用重設碼來解凍個人識別碼 (PIN)"
 +msgstr ""
  
 +#: g10/card-util.c:1836
  msgid "destroy all keys and data"
  msgstr ""
  
 +#: g10/card-util.c:1958
  msgid "gpg/card> "
 -msgstr "gpg/卡片> "
 +msgstr ""
  
 +#: g10/card-util.c:1999
  msgid "Admin-only command\n"
 -msgstr "限管理者使用的指令\n"
 +msgstr ""
  
 +#: g10/card-util.c:2030
  msgid "Admin commands are allowed\n"
 -msgstr "允許使用管理者指令\n"
 +msgstr ""
  
 +#: g10/card-util.c:2032
  msgid "Admin commands are not allowed\n"
 -msgstr "未允許使用管理者指令\n"
 +msgstr ""
  
- #: g10/card-util.c:2127 g10/keyedit.c:2816
++#: g10/card-util.c:2127 g10/keyedit.c:2817
  msgid "Invalid command  (try \"help\")\n"
 -msgstr "無效的指令  (試試看 \"help\")\n"
 +msgstr ""
  
- #: g10/decrypt.c:191 g10/encrypt.c:955
++#: g10/decrypt.c:190 g10/encrypt.c:955
  msgid "--output doesn't work for this command\n"
 -msgstr "--output 在這個指令中沒有作用\n"
 +msgstr ""
  
- #: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4904 g10/keyring.c:398 g10/keyring.c:771
  #, c-format
  msgid "can't open '%s'\n"
 -msgstr "無法開啟 '%s'\n"
 +msgstr ""
  
 +#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
- #: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
- #: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4858 g10/keyedit.c:2051
++#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2163
  #, c-format
  msgid "key \"%s\" not found: %s\n"
 -msgstr "找不到金鑰 \"%s\": %s\n"
 +msgstr ""
  
- #: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
- #: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
- #: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4866 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:645 g10/tofu.c:2171
  #, c-format
  msgid "error reading keyblock: %s\n"
 -msgstr "讀取金鑰區塊時出錯: %s\n"
 +msgstr ""
  
 -#, fuzzy, c-format
 -#| msgid "key \"%s\" not found: %s\n"
 +#: g10/delkey.c:118 g10/getkey.c:579
 +#, c-format
  msgid "key \"%s\" not found\n"
 -msgstr "找不到金鑰 \"%s\": %s\n"
 +msgstr ""
  
 +#: g10/delkey.c:129 g10/delkey.c:136
  msgid "(unless you specify the key by fingerprint)\n"
 -msgstr "(除非你用指紋指定了金鑰)\n"
 +msgstr ""
  
 +#: g10/delkey.c:135
  msgid "can't do this in batch mode without \"--yes\"\n"
 -msgstr "沒有 \"--yes\" 就沒辦法在批次模式中這麼做\n"
 +msgstr ""
  
 +#: g10/delkey.c:148
  msgid "Delete this key from the keyring? (y/N) "
 -msgstr "要從鑰匙圈裡刪除這把金鑰嗎? (y/N) "
 +msgstr ""
  
 +#: g10/delkey.c:158
  msgid "This is a secret key! - really delete? (y/N) "
 -msgstr "這是一把私鑰! - 真的要刪除嗎? (y/N) "
 +msgstr ""
  
 +#: g10/delkey.c:201
  #, c-format
  msgid "deleting secret %s failed: %s\n"
 -msgstr "刪除私鑰 %s 時失敗: %s\n"
 +msgstr ""
  
 +#: g10/delkey.c:203
  msgid "key"
 -msgstr "金鑰"
 +msgstr ""
  
 +#: g10/delkey.c:203
  msgid "subkey"
 -msgstr "子鑰"
 +msgstr ""
  
 +#: g10/delkey.c:226
  #, c-format
  msgid "deleting keyblock failed: %s\n"
 -msgstr "刪除金鑰區塊時失敗: %s\n"
 +msgstr ""
  
 +#: g10/delkey.c:239
  msgid "ownertrust information cleared\n"
 -msgstr "主觀信任資訊已清除\n"
 +msgstr ""
  
 +#: g10/delkey.c:275
  #, c-format
  msgid "there is a secret key for public key \"%s\"!\n"
 -msgstr "公鑰 \"%s\" 有相對應的私鑰!\n"
 +msgstr ""
  
 +#: g10/delkey.c:277
  msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 -msgstr "請先以 \"--delete-secret-keys\" 選項來刪除它.\n"
 +msgstr ""
  
- #: g10/encrypt.c:232 g10/sign.c:1292
++#: g10/encrypt.c:232 g10/sign.c:1294
  #, c-format
  msgid "error creating passphrase: %s\n"
 -msgstr "建立密語時出錯: %s\n"
 +msgstr ""
  
 +#: g10/encrypt.c:239
  msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 -msgstr "因處於 S2K 模式下而無法使用對稱式 ESK 封包\n"
 +msgstr ""
  
 +#: g10/encrypt.c:253
  #, c-format
  msgid "using cipher %s\n"
 -msgstr "正在使用 %s 編密法\n"
 +msgstr ""
  
 +#: g10/encrypt.c:263 g10/encrypt.c:624
  #, c-format
  msgid "'%s' already compressed\n"
 -msgstr "'%s' 已經被壓縮了\n"
 +msgstr ""
  
- #: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:610
  #, c-format
  msgid "WARNING: '%s' is an empty file\n"
 -msgstr "警告: '%s' 是個空檔案\n"
 +msgstr ""
  
 +#: g10/encrypt.c:557
  #, c-format
  msgid "reading from '%s'\n"
 -msgstr "正在從 '%s' 讀取\n"
 +msgstr ""
  
 +#: g10/encrypt.c:605
  #, c-format
  msgid ""
  "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 -msgstr "警告: 強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
 +msgstr ""
  
- #: g10/encrypt.c:707 g10/sign.c:984
++#: g10/encrypt.c:707 g10/sign.c:986
  #, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
  "preferences\n"
 -msgstr "警告: 強迫使用 %s (%d) 壓縮演算法會違反收件者偏好設定\n"
 +msgstr ""
  
 +#: g10/encrypt.c:817
  #, c-format
  msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 -msgstr "強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
 +msgstr ""
  
 +#: g10/encrypt.c:903
  #, c-format
  msgid "%s/%s encrypted for: \"%s\"\n"
 -msgstr "%s/%s 已加密給: \"%s\"\n"
 +msgstr ""
  
 +#: g10/encrypt.c:931 g10/pkclist.c:1029 g10/pkclist.c:1080
  #, c-format
  msgid "you may not use %s while in %s mode\n"
 -msgstr "你不能夠將 %s 用於 %s 模式中\n"
 +msgstr ""
  
 +#: g10/decrypt-data.c:93 g10/mainproc.c:304
  #, c-format
  msgid "%s encrypted data\n"
 -msgstr "%s 已加密的資料\n"
 +msgstr ""
  
 +#: g10/decrypt-data.c:96 g10/mainproc.c:308
  #, c-format
  msgid "encrypted with unknown algorithm %d\n"
 -msgstr "以 %d 未知演算法所加密\n"
 +msgstr ""
  
- #: g10/decrypt-data.c:164 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:129
  msgid ""
  "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 -msgstr "警告: 訊息已用對稱式編密法的弱金鑰加密了.\n"
 +msgstr ""
  
 +#: g10/decrypt-data.c:176
  msgid "problem handling encrypted packet\n"
 -msgstr "處理已加密封包有問題\n"
 +msgstr ""
  
 +#: g10/exec.c:60
  msgid "no remote program execution supported\n"
 -msgstr "沒有支援的遠端程式執行\n"
 +msgstr ""
  
 +#: g10/exec.c:319
  msgid ""
  "external program calls are disabled due to unsafe options file permissions\n"
 -msgstr "因為不安全的檔案權限選項, 而禁用了外部程式叫用\n"
 +msgstr ""
  
 +#: g10/exec.c:349
  msgid "this platform requires temporary files when calling external programs\n"
 -msgstr "在這個作業平台上叫用外部程式時需要暫存檔\n"
 +msgstr ""
  
 +#: g10/exec.c:427
  #, c-format
  msgid "unable to execute program '%s': %s\n"
 -msgstr "無法執行程式 '%s': %s\n"
 +msgstr ""
  
 +#: g10/exec.c:430
  #, c-format
  msgid "unable to execute shell '%s': %s\n"
 -msgstr "無法執行 shell '%s': %s\n"
 +msgstr ""
  
 +#: g10/exec.c:521
  #, c-format
  msgid "system error while calling external program: %s\n"
 -msgstr "叫用外部程式時發生系統錯誤: %s\n"
 +msgstr ""
  
 +#: g10/exec.c:532 g10/exec.c:599
  msgid "unnatural exit of external program\n"
 -msgstr "外部程式不自然地離開\n"
 +msgstr ""
  
 +#: g10/exec.c:547
  msgid "unable to execute external program\n"
 -msgstr "無法執行外部程式\n"
 +msgstr ""
  
 +#: g10/exec.c:564
  #, c-format
  msgid "unable to read external program response: %s\n"
 -msgstr "無法讀取外部程式回應: %s\n"
 +msgstr ""
  
 +#: g10/exec.c:610 g10/exec.c:617
  #, c-format
  msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 -msgstr "警告: 無法移除暫存檔 (%s) '%s': %s\n"
 +msgstr ""
  
 +#: g10/exec.c:622
  #, c-format
  msgid "WARNING: unable to remove temp directory '%s': %s\n"
 -msgstr "警告: 無法移除暫存目錄 '%s': %s\n"
 +msgstr ""
  
 +#: g10/export.c:106
  msgid "export signatures that are marked as local-only"
 -msgstr "匯出標記為僅限本機使用的簽章"
 +msgstr ""
  
 +#: g10/export.c:108
  msgid "export attribute user IDs (generally photo IDs)"
 -msgstr "匯出署名使用者 ID (通常是照片 ID)"
 +msgstr ""
  
 +#: g10/export.c:110
  msgid "export revocation keys marked as \"sensitive\""
 -msgstr "匯出標記為 \"機密\" 的撤銷金鑰"
 +msgstr ""
  
 +#: g10/export.c:112
  msgid "remove unusable parts from key during export"
 -msgstr "匯出時從金鑰中移除無法使用的部分"
 +msgstr ""
  
 +#: g10/export.c:114
  msgid "remove as much as possible from key during export"
 -msgstr "匯出時盡可能地從金鑰中移除"
 +msgstr ""
  
 +#: g10/export.c:1218
  msgid " - skipped"
 -msgstr " - 已跳過"
 +msgstr ""
  
- #: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:845 g10/sign.c:1148
++#: g10/export.c:1251 g10/import.c:1543 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:847 g10/sign.c:1150
  #, c-format
  msgid "writing to '%s'\n"
 -msgstr "正在寫入 '%s'\n"
 +msgstr ""
  
 +#: g10/export.c:1675
  #, c-format
  msgid "key %s: key material on-card - skipped\n"
 -msgstr "金鑰 %s: 金鑰資料在卡片上 - 已跳過\n"
 +msgstr ""
  
 +#: g10/export.c:1861
  msgid "exporting secret keys not allowed\n"
 -msgstr "不允許匯出私鑰\n"
 +msgstr ""
  
 +#: g10/export.c:1938
  #, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
 -msgstr "金鑰 %s: PGP 2.x 型態的金鑰 - 已跳過\n"
 +msgstr ""
  
 +#: g10/export.c:2026
  msgid "WARNING: nothing exported\n"
 -msgstr "警告: 沒有匯出任何東西\n"
 +msgstr ""
  
- #: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
- #: g10/plaintext.c:151 g10/plaintext.c:174
++#: g10/export.c:2283 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/plaintext.c:167 g10/plaintext.c:190
  #, c-format
  msgid "error creating '%s': %s\n"
 -msgstr "建立 '%s' 時出錯: %s\n"
 +msgstr ""
  
 +#: g10/getkey.c:257
  msgid "[User ID not found]"
 -msgstr "[找不到使用者 ID]"
 +msgstr ""
  
 -#, fuzzy, c-format
 -#| msgid "missing argument for option \"%.50s\"\n"
 +#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1876
 +#: g10/pkclist.c:989
 +#, c-format
  msgid "(check argument of option '%s')\n"
 -msgstr "\"%.50s\" 選項遺失了引數\n"
 +msgstr ""
  
 +#: g10/getkey.c:516
  #, c-format
  msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
  msgstr ""
  
 -#, fuzzy, c-format
 -#| msgid "error closing %s: %s\n"
 +#: g10/getkey.c:546
 +#, c-format
  msgid "error looking up: %s\n"
 -msgstr "關閉 %s 時出錯: %s\n"
 +msgstr ""
  
 -#, fuzzy, c-format
 -#| msgid "error creating keyring '%s': %s\n"
 +#: g10/getkey.c:636
 +#, c-format
  msgid "Warning: %s appears in the keyring %d times\n"
 -msgstr "建立鑰匙圈 '%s' 時出錯: %s\n"
 +msgstr ""
  
 +#: g10/getkey.c:1437
  #, c-format
  msgid "automatically retrieved '%s' via %s\n"
 -msgstr "已自動取回 '%s' (經由 %s )\n"
 +msgstr ""
  
 +#: g10/getkey.c:1443
  #, c-format
  msgid "error retrieving '%s' via %s: %s\n"
 -msgstr "取得 '%s' (經由 %s ) 時出錯: %s\n"
 +msgstr ""
  
 +#: g10/getkey.c:1445
  msgid "No fingerprint"
 -msgstr "沒有指紋"
 +msgstr ""
  
- #: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
- #: g10/revoke.c:701
++#: g10/getkey.c:1873 g10/keyedit.c:2929 g10/keyedit.c:3016 g10/revoke.c:637
++#: g10/revoke.c:702
  #, c-format
  msgid "secret key \"%s\" not found: %s\n"
 -msgstr "找不到私鑰 \"%s\": %s\n"
 +msgstr ""
  
 -#, fuzzy, c-format
 -#| msgid "|NAME|use NAME as default secret key"
 +#: g10/getkey.c:1956
 +#, c-format
  msgid "Warning: not using '%s' as default key: %s\n"
 -msgstr "|名字|使用指定名字做為預設私鑰"
 +msgstr ""
  
 -#, fuzzy, c-format
 -#| msgid "|NAME|use NAME as default secret key"
 +#: g10/getkey.c:1964
 +#, c-format
  msgid "using \"%s\" as default secret key for signing\n"
 -msgstr "|名字|使用指定名字做為預設私鑰"
 +msgstr ""
  
 +#: g10/getkey.c:1971
  #, c-format
  msgid "all values passed to '%s' ignored\n"
  msgstr ""
  
 +#: g10/getkey.c:2777
  #, c-format
  msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 -msgstr "無效的金鑰 %s 可以藉由 --allow-non-selfsigned-uid 而生效\n"
 +msgstr ""
  
 +#: g10/getkey.c:3611
  #, c-format
  msgid "using subkey %s instead of primary key %s\n"
 -msgstr "使用子鑰 %s 來替換主鑰 %s\n"
 +msgstr ""
  
- #: g10/gpg.c:424 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:200
  msgid "make a signature"
 -msgstr "建立簽章"
 +msgstr ""
  
- #: g10/gpg.c:425
++#: g10/gpg.c:427
  msgid "make a clear text signature"
 -msgstr "建立明文簽章"
 +msgstr ""
  
- #: g10/gpg.c:426 sm/gpgsm.c:202
++#: g10/gpg.c:429 sm/gpgsm.c:202
  msgid "make a detached signature"
 -msgstr "建立分離式簽章"
 +msgstr ""
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:430 sm/gpgsm.c:203
  msgid "encrypt data"
 -msgstr "加密資料"
 +msgstr ""
  
- #: g10/gpg.c:429
++#: g10/gpg.c:432
  msgid "encryption only with symmetric cipher"
 -msgstr "僅使用對稱式編密法來加密"
 +msgstr ""
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:434 sm/gpgsm.c:205
  msgid "decrypt data (default)"
 -msgstr "資料解密 (預設)"
 +msgstr ""
  
- #: g10/gpg.c:433 sm/gpgsm.c:206
++#: g10/gpg.c:436 sm/gpgsm.c:206
  msgid "verify a signature"
 -msgstr "驗證簽章"
 +msgstr ""
  
- #: g10/gpg.c:435 sm/gpgsm.c:207
++#: g10/gpg.c:438 sm/gpgsm.c:207
  msgid "list keys"
 -msgstr "列出金鑰"
 +msgstr ""
  
- #: g10/gpg.c:437
++#: g10/gpg.c:440
  msgid "list keys and signatures"
 -msgstr "列出金鑰和簽章"
 +msgstr ""
  
- #: g10/gpg.c:438
++#: g10/gpg.c:443
  msgid "list and check key signatures"
 -msgstr "列出並檢查金鑰簽章"
 +msgstr ""
  
- #: g10/gpg.c:439 sm/gpgsm.c:212
++#: g10/gpg.c:445 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
 -msgstr "列出金鑰和指紋"
 +msgstr ""
  
- #: g10/gpg.c:440 sm/gpgsm.c:210
++#: g10/gpg.c:446 sm/gpgsm.c:210
  msgid "list secret keys"
 -msgstr "列出私鑰"
 +msgstr ""
  
- #: g10/gpg.c:442 sm/gpgsm.c:213
++#: g10/gpg.c:448 sm/gpgsm.c:213
  msgid "generate a new key pair"
 -msgstr "產生新的金鑰對"
 +msgstr ""
  
- #: g10/gpg.c:444
++#: g10/gpg.c:451
  msgid "quickly generate a new key pair"
 -msgstr "快速產生新的金鑰對"
 +msgstr ""
  
- #: g10/gpg.c:446
 -#, fuzzy
 -#| msgid "quickly generate a new key pair"
++#: g10/gpg.c:454
  msgid "quickly add a new user-id"
 -msgstr "快速產生新的金鑰對"
 +msgstr ""
  
- #: g10/gpg.c:449
 -#, fuzzy
 -#| msgid "quickly generate a new key pair"
++#: g10/gpg.c:459
  msgid "quickly revoke a user-id"
 -msgstr "快速產生新的金鑰對"
 +msgstr ""
  
- #: g10/gpg.c:451
 -#, fuzzy
 -#| msgid "quickly generate a new key pair"
++#: g10/gpg.c:462
+ msgid "quickly set a new expiration date"
 -msgstr "快速產生新的金鑰對"
++msgstr ""
+ 
++#: g10/gpg.c:464
  msgid "full featured key pair generation"
 -msgstr "全能金鑰對生成"
 +msgstr ""
  
- #: g10/gpg.c:452
++#: g10/gpg.c:467
  msgid "generate a revocation certificate"
 -msgstr "產生撤銷憑證"
 +msgstr ""
  
- #: g10/gpg.c:454 sm/gpgsm.c:215
++#: g10/gpg.c:470 sm/gpgsm.c:216
  msgid "remove keys from the public keyring"
 -msgstr "從公鑰鑰匙圈裡移除金鑰"
 +msgstr ""
  
- #: g10/gpg.c:456
++#: g10/gpg.c:472
  msgid "remove keys from the secret keyring"
 -msgstr "從私鑰鑰匙圈裡移除金鑰"
 +msgstr ""
  
- #: g10/gpg.c:458
++#: g10/gpg.c:474
  msgid "quickly sign a key"
 -msgstr "快速簽署金鑰"
 +msgstr ""
  
- #: g10/gpg.c:460
++#: g10/gpg.c:476
  msgid "quickly sign a key locally"
 -msgstr "快速在本機簽署金鑰"
 +msgstr ""
  
- #: g10/gpg.c:461
++#: g10/gpg.c:477
  msgid "sign a key"
 -msgstr "簽署金鑰"
 +msgstr ""
  
- #: g10/gpg.c:462
++#: g10/gpg.c:478
  msgid "sign a key locally"
 -msgstr "僅在本機簽署金鑰"
 +msgstr ""
  
- #: g10/gpg.c:463
++#: g10/gpg.c:479
  msgid "sign or edit a key"
 -msgstr "簽署或編輯金鑰"
 +msgstr ""
  
- #: g10/gpg.c:465 sm/gpgsm.c:233
++#: g10/gpg.c:481 sm/gpgsm.c:234
  msgid "change a passphrase"
 -msgstr "更改密語"
 +msgstr ""
  
- #: g10/gpg.c:467
++#: g10/gpg.c:485
  msgid "export keys"
 -msgstr "匯出金鑰"
 +msgstr ""
  
- #: g10/gpg.c:468
++#: g10/gpg.c:486
  msgid "export keys to a keyserver"
 -msgstr "把金鑰匯出至金鑰伺服器"
 +msgstr ""
  
- #: g10/gpg.c:469
++#: g10/gpg.c:487
  msgid "import keys from a keyserver"
 -msgstr "從金鑰伺服器匯入金鑰"
 +msgstr ""
  
- #: g10/gpg.c:471
++#: g10/gpg.c:490
  msgid "search for keys on a keyserver"
 -msgstr "在金鑰伺服器上搜尋金鑰"
 +msgstr ""
  
- #: g10/gpg.c:473
++#: g10/gpg.c:492
  msgid "update all keys from a keyserver"
 -msgstr "從金鑰伺服器更新所有的金鑰"
 +msgstr ""
  
- #: g10/gpg.c:479
++#: g10/gpg.c:498
  msgid "import/merge keys"
 -msgstr "匯入/合併金鑰"
 +msgstr ""
  
- #: g10/gpg.c:482
++#: g10/gpg.c:501
  msgid "print the card status"
 -msgstr "列印卡片狀態"
 +msgstr ""
  
- #: g10/gpg.c:483
++#: g10/gpg.c:502
  msgid "change data on a card"
 -msgstr "變更卡片上的資料"
 +msgstr ""
  
- #: g10/gpg.c:484
++#: g10/gpg.c:504
  msgid "change a card's PIN"
 -msgstr "變更卡片的個人識別碼 (PIN)"
 +msgstr ""
  
- #: g10/gpg.c:496
++#: g10/gpg.c:516
  msgid "update the trust database"
 -msgstr "更新信任資料庫"
 +msgstr ""
  
- #: g10/gpg.c:505
++#: g10/gpg.c:525
  msgid "print message digests"
 -msgstr "印出訊息摘要"
 +msgstr ""
  
- #: g10/gpg.c:508 sm/gpgsm.c:228
++#: g10/gpg.c:528 sm/gpgsm.c:229
  msgid "run in server mode"
 -msgstr "以伺服器模式執行"
 +msgstr ""
  
- #: g10/gpg.c:510
++#: g10/gpg.c:530
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:514 sm/gpgsm.c:246
++#: g10/gpg.c:534 sm/gpgsm.c:248
  msgid "create ascii armored output"
 -msgstr "建立以 ASCII 封裝過的輸出"
 +msgstr ""
  
- #: g10/gpg.c:517 sm/gpgsm.c:262
++#: g10/gpg.c:537 sm/gpgsm.c:264
  msgid "|USER-ID|encrypt for USER-ID"
 -msgstr "|使用者-ID|以指定使用者 ID 作為加密對象"
 +msgstr ""
  
- #: g10/gpg.c:533 sm/gpgsm.c:298
++#: g10/gpg.c:553 sm/gpgsm.c:300
  msgid "|USER-ID|use USER-ID to sign or decrypt"
 -msgstr "|使用者-ID|拿指定使用者 ID 來簽署或解密"
 +msgstr ""
  
- #: g10/gpg.c:539
++#: g10/gpg.c:559
  msgid "|N|set compress level to N (0 disables)"
 -msgstr "|N|設定壓縮等級為 N (0 表示不壓縮)"
 +msgstr ""
  
- #: g10/gpg.c:546
++#: g10/gpg.c:566
  msgid "use canonical text mode"
 -msgstr "使用標準的文字模式"
 +msgstr ""
  
- #: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
++#: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
  msgid "|FILE|write output to FILE"
 -msgstr "|檔案|將輸出寫入至指定檔案"
 +msgstr ""
  
- #: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
++#: g10/gpg.c:598 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
  msgid "do not make any changes"
 -msgstr "不要做任何改變"
 +msgstr ""
  
- #: g10/gpg.c:579
++#: g10/gpg.c:599
  msgid "prompt before overwriting"
 -msgstr "覆寫前先詢問"
 +msgstr ""
  
- #: g10/gpg.c:628
++#: g10/gpg.c:648
  msgid "use strict OpenPGP behavior"
 -msgstr "使用嚴謹的 OpenPGP 行為"
 +msgstr ""
  
- #: g10/gpg.c:654 sm/gpgsm.c:355
++#: g10/gpg.c:674 sm/gpgsm.c:357
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
  msgstr ""
 -"@\n"
 -"(請參照線上說明頁面來取得所有命令和選項的完整清單)\n"
  
- #: g10/gpg.c:657 sm/gpgsm.c:358
 -#, fuzzy
 -#| msgid ""
 -#| "@\n"
 -#| "Examples:\n"
 -#| "\n"
 -#| " -se -r Bob [file]          sign and encrypt for user Bob\n"
 -#| " --clear-sign [file]         make a clear text signature\n"
 -#| " --detach-sign [file]       make a detached signature\n"
 -#| " --list-keys [names]        show keys\n"
 -#| " --fingerprint [names]      show fingerprints\n"
++#: g10/gpg.c:677
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2396,614 -1919,452 +2400,554 @@@
  " --list-keys [names]        show keys\n"
  " --fingerprint [names]      show fingerprints\n"
  msgstr ""
 -"@\n"
 -"範例:\n"
 -"\n"
 -" -se -r Bob [檔案]          對 Bob 這個使用者簽署及加密\n"
 -" --clear-sign [檔案]         做出明文簽章\n"
 -" --detach-sign [檔案]       做出分離式簽章\n"
 -" --list-keys [名字]         顯示金鑰\n"
 -" --fingerprint [名字]       顯示指紋\n"
  
- #: g10/gpg.c:1026
++#: g10/gpg.c:1047
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
 -msgstr "用法: @GPG@ [選項] [檔案] (或用 -h 求助)"
 +msgstr ""
  
- #: g10/gpg.c:1029
++#: g10/gpg.c:1050
  msgid ""
  "Syntax: @GPG@ [options] [files]\n"
  "Sign, check, encrypt or decrypt\n"
  "Default operation depends on the input data\n"
  msgstr ""
 -"語法: @GPG@ [選項] [檔案]\n"
 -"簽署, 檢查, 加密, 解密\n"
 -"預設的操作會依輸入資料而定\n"
  
- #: g10/gpg.c:1040 sm/gpgsm.c:588
++#: g10/gpg.c:1061 sm/gpgsm.c:580
  msgid ""
  "\n"
  "Supported algorithms:\n"
  msgstr ""
 -"\n"
 -"已支援的演算法:\n"
  
- #: g10/gpg.c:1043
++#: g10/gpg.c:1064
  msgid "Pubkey: "
 -msgstr "公鑰: "
 +msgstr ""
  
- #: g10/gpg.c:1050 g10/keyedit.c:3402
++#: g10/gpg.c:1071 g10/keyedit.c:3483
  msgid "Cipher: "
 -msgstr "編密法: "
 +msgstr ""
  
- #: g10/gpg.c:1057
++#: g10/gpg.c:1078
  msgid "Hash: "
 -msgstr "雜湊: "
 +msgstr ""
  
- #: g10/gpg.c:1064 g10/keyedit.c:3451
++#: g10/gpg.c:1085 g10/keyedit.c:3532
  msgid "Compression: "
 -msgstr "壓縮: "
 +msgstr ""
  
- #: g10/gpg.c:1133 sm/gpgsm.c:662
++#: g10/gpg.c:1154 sm/gpgsm.c:654
  #, c-format
  msgid "usage: %s [options] %s\n"
 -msgstr "用法: %s [選項] %s\n"
 +msgstr ""
  
- #: g10/gpg.c:1321 sm/gpgsm.c:751
++#: g10/gpg.c:1342 sm/gpgsm.c:743
  msgid "conflicting commands\n"
 -msgstr "指令彼此矛盾\n"
 +msgstr ""
  
- #: g10/gpg.c:1339
++#: g10/gpg.c:1360
  #, c-format
  msgid "no = sign found in group definition '%s'\n"
 -msgstr "在群組定義 '%s' 裡找不到 = 記號\n"
 +msgstr ""
  
- #: g10/gpg.c:1537
++#: g10/gpg.c:1558
  #, c-format
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
 -msgstr "警告: 家目錄 '%s' 的所有權並不安全\n"
 +msgstr ""
  
- #: g10/gpg.c:1540
++#: g10/gpg.c:1561
  #, c-format
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 -msgstr "警告: 組態檔案 '%s' 的所有權並不安全\n"
 +msgstr ""
  
- #: g10/gpg.c:1543
++#: g10/gpg.c:1564
  #, c-format
  msgid "WARNING: unsafe ownership on extension '%s'\n"
 -msgstr "警告: 延伸模組 '%s' 的所有權並不安全\n"
 +msgstr ""
  
- #: g10/gpg.c:1549
++#: g10/gpg.c:1570
  #, c-format
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
 -msgstr "警告: 家目錄 '%s' 的權限並不安全\n"
 +msgstr ""
  
- #: g10/gpg.c:1552
++#: g10/gpg.c:1573
  #, c-format
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 -msgstr "警告: 組態檔案 '%s' 的權限並不安全\n"
 +msgstr ""
  
- #: g10/gpg.c:1555
++#: g10/gpg.c:1576
  #, c-format
  msgid "WARNING: unsafe permissions on extension '%s'\n"
 -msgstr "警告: 延伸模組 '%s' 的權限並不安全\n"
 +msgstr ""
  
- #: g10/gpg.c:1561
++#: g10/gpg.c:1582
  #, c-format
  msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 -msgstr "警告: 家目錄 '%s' 的封入目錄所有權並不安全\n"
 +msgstr ""
  
- #: g10/gpg.c:1564
++#: g10/gpg.c:1585
  #, c-format
  msgid ""
  "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 -msgstr "警告: 組態檔案 '%s' 的封入目錄所有權並不安全\n"
 +msgstr ""
  
- #: g10/gpg.c:1567
++#: g10/gpg.c:1588
  #, c-format
  msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 -msgstr "警告: 延伸模組 '%s' 的封入目錄所有權並不安全\n"
 +msgstr ""
  
- #: g10/gpg.c:1573
++#: g10/gpg.c:1594
  #, c-format
  msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 -msgstr "警告: 家目錄 '%s' 的封入目錄權限並不安全\n"
 +msgstr ""
  
- #: g10/gpg.c:1576
++#: g10/gpg.c:1597
  #, c-format
  msgid ""
  "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 -msgstr "警告: 組態檔案 '%s' 的封入目錄權限並不安全\n"
 +msgstr ""
  
- #: g10/gpg.c:1579
++#: g10/gpg.c:1600
  #, c-format
  msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 -msgstr "警告: 延伸模組 '%s' 的封入目錄權限並不安全\n"
 +msgstr ""
  
- #: g10/gpg.c:1786
++#: g10/gpg.c:1816
  #, c-format
  msgid "unknown configuration item '%s'\n"
 -msgstr "未知的組態項目 '%s'\n"
 +msgstr ""
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1925
  msgid "display photo IDs during key listings"
 -msgstr "列出金鑰時顯示照片 ID"
 +msgstr ""
  
- #: g10/gpg.c:1895
++#: g10/gpg.c:1927
  msgid "show key usage information during key listings"
 -msgstr "列出金鑰時顯示金鑰用途資訊"
 +msgstr ""
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1929
  msgid "show policy URLs during signature listings"
 -msgstr "列出簽章時顯示原則 URL"
 +msgstr ""
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1931
  msgid "show all notations during signature listings"
 -msgstr "列出簽章時顯示所有的註記"
 +msgstr ""
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1933
  msgid "show IETF standard notations during signature listings"
 -msgstr "列出簽章時顯示 IETF 標準註記"
 +msgstr ""
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1937
  msgid "show user-supplied notations during signature listings"
 -msgstr "列出簽章時顯示使用者提供的註記"
 +msgstr ""
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1939
  msgid "show preferred keyserver URLs during signature listings"
 -msgstr "列出簽章時顯示偏好的金鑰伺服器 URL"
 +msgstr ""
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1941
  msgid "show user ID validity during key listings"
 -msgstr "列出金鑰時顯示使用者 ID 有效性"
 +msgstr ""
  
- #: g10/gpg.c:1911
++#: g10/gpg.c:1943
  msgid "show revoked and expired user IDs in key listings"
 -msgstr "列出金鑰時顯示已撤銷或過期的使用者 ID"
 +msgstr ""
  
- #: g10/gpg.c:1913
++#: g10/gpg.c:1945
  msgid "show revoked and expired subkeys in key listings"
 -msgstr "列出金鑰時顯示已撤銷或過期的子鑰"
 +msgstr ""
  
- #: g10/gpg.c:1915
++#: g10/gpg.c:1947
  msgid "show the keyring name in key listings"
 -msgstr "在金鑰清單中顯示鑰匙圈名稱"
 +msgstr ""
  
- #: g10/gpg.c:1917
++#: g10/gpg.c:1949
  msgid "show expiration dates during signature listings"
 -msgstr "列出簽章時顯示有效期限"
 +msgstr ""
  
- #: g10/gpg.c:2019 g10/gpg.c:2056
 -#, fuzzy, c-format
 -#| msgid "invalid argument for option \"%.50s\"\n"
++#: g10/gpg.c:2051 g10/gpg.c:2088
 +#, c-format
  msgid "valid values for option '%s':\n"
 -msgstr "選項 \"%.50s\" 的引數無效\n"
 +msgstr ""
  
- #: g10/gpg.c:2030
 -#, fuzzy, c-format
 -#| msgid "unknown option '%s'\n"
++#: g10/gpg.c:2062
 +#, c-format
  msgid "unknown TOFU policy '%s'\n"
 -msgstr "未知的選項 '%s'\n"
 +msgstr ""
  
- #: g10/gpg.c:2032 g10/gpg.c:2068
++#: g10/gpg.c:2064 g10/gpg.c:2100
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2066
 -#, fuzzy, c-format
 -#| msgid "invalid argument for option \"%.50s\"\n"
++#: g10/gpg.c:2098 g10/keygen.c:167
 +#, c-format
  msgid "invalid value for option '%s'\n"
 -msgstr "選項 \"%.50s\" 的引數無效\n"
 +msgstr ""
  
- #: g10/gpg.c:2203
++#: g10/gpg.c:2235
  #, c-format
  msgid "Note: old default options file '%s' ignored\n"
 -msgstr "請注意: 已忽略舊有的預設選項檔 '%s'\n"
 +msgstr ""
  
- #: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
++#: g10/gpg.c:2839 g10/gpg.c:3610 g10/gpg.c:3622
  #, c-format
  msgid "Note: %s is not for normal use!\n"
 -msgstr "請注意: 一般情況下不採用 %s!\n"
 +msgstr ""
  
- #: g10/gpg.c:2978 g10/gpg.c:2990
++#: g10/gpg.c:3011 g10/gpg.c:3023
  #, c-format
  msgid "'%s' is not a valid signature expiration\n"
 -msgstr "'%s' 不是有效的簽章使用期限\n"
 +msgstr ""
  
- #: g10/gpg.c:3012
 -#, fuzzy, c-format
 -#| msgid "line %d: not a valid email address\n"
++#: g10/gpg.c:3045
 +#, c-format
  msgid "\"%s\" is not a proper mail address\n"
 -msgstr "第 %d 列: 不是有效的電子郵件地址\n"
 +msgstr ""
  
- #: g10/gpg.c:3044 sm/gpgsm.c:1166
++#: g10/gpg.c:3077 sm/gpgsm.c:1158
  #, c-format
  msgid "invalid pinentry mode '%s'\n"
 -msgstr "無效的個人識別碼項目模式 '%s'\n"
 +msgstr ""
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3130
  #, c-format
  msgid "'%s' is not a valid character set\n"
 -msgstr "'%s' 不是有效的字元集\n"
 +msgstr ""
  
- #: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
++#: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
  msgid "could not parse keyserver URL\n"
 -msgstr "無法剖析金鑰伺服器 URL\n"
 +msgstr ""
  
- #: g10/gpg.c:3137
++#: g10/gpg.c:3170
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
 -msgstr "%s:%d: 無效的金鑰伺服器選項\n"
 +msgstr ""
  
- #: g10/gpg.c:3140
++#: g10/gpg.c:3173
  msgid "invalid keyserver options\n"
 -msgstr "無效的金鑰伺服器選項\n"
 +msgstr ""
  
- #: g10/gpg.c:3147
++#: g10/gpg.c:3180
  #, c-format
  msgid "%s:%d: invalid import options\n"
 -msgstr "%s:%d: 無效的匯入選項\n"
 +msgstr ""
  
- #: g10/gpg.c:3150
++#: g10/gpg.c:3183
  msgid "invalid import options\n"
 -msgstr "無效的匯入選項\n"
 +msgstr ""
  
- #: g10/gpg.c:3156 g10/gpg.c:3171
 -#, fuzzy, c-format
 -#| msgid "invalid list options\n"
++#: g10/gpg.c:3189 g10/gpg.c:3204
 +#, c-format
  msgid "invalid filter option: %s\n"
 -msgstr "無效的清單選項\n"
 +msgstr ""
  
- #: g10/gpg.c:3162
++#: g10/gpg.c:3195
  #, c-format
  msgid "%s:%d: invalid export options\n"
 -msgstr "%s:%d: 無效的匯出選項\n"
 +msgstr ""
  
- #: g10/gpg.c:3165
++#: g10/gpg.c:3198
  msgid "invalid export options\n"
 -msgstr "無效的匯出選項\n"
 +msgstr ""
  
- #: g10/gpg.c:3177
++#: g10/gpg.c:3210
  #, c-format
  msgid "%s:%d: invalid list options\n"
 -msgstr "%s:%d: 無效的清單選項\n"
 +msgstr ""
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3213
  msgid "invalid list options\n"
 -msgstr "無效的清單選項\n"
 +msgstr ""
  
- #: g10/gpg.c:3188
++#: g10/gpg.c:3221
  msgid "display photo IDs during signature verification"
 -msgstr "驗證簽章時顯示照片 ID"
 +msgstr ""
  
- #: g10/gpg.c:3190
++#: g10/gpg.c:3223
  msgid "show policy URLs during signature verification"
 -msgstr "驗證簽章時顯示原則 URL"
 +msgstr ""
  
- #: g10/gpg.c:3192
++#: g10/gpg.c:3225
  msgid "show all notations during signature verification"
 -msgstr "驗證簽章時顯示所有的註記"
 +msgstr ""
  
- #: g10/gpg.c:3194
++#: g10/gpg.c:3227
  msgid "show IETF standard notations during signature verification"
 -msgstr "驗證簽章時顯示 IETF 標準註記"
 +msgstr ""
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3231
  msgid "show user-supplied notations during signature verification"
 -msgstr "驗證簽章時顯示使用者提供的註記"
 +msgstr ""
  
- #: g10/gpg.c:3200
++#: g10/gpg.c:3233
  msgid "show preferred keyserver URLs during signature verification"
 -msgstr "驗證簽章時顯示偏好的金鑰伺服器 URL"
 +msgstr ""
  
- #: g10/gpg.c:3202
++#: g10/gpg.c:3235
  msgid "show user ID validity during signature verification"
 -msgstr "驗證簽章時顯示使用者 ID 有效性"
 +msgstr ""
  
- #: g10/gpg.c:3204
++#: g10/gpg.c:3237
  msgid "show revoked and expired user IDs in signature verification"
 -msgstr "驗證簽章時顯示已撤銷或過期的使用者 ID"
 +msgstr ""
  
- #: g10/gpg.c:3206
++#: g10/gpg.c:3239
  msgid "show only the primary user ID in signature verification"
 -msgstr "驗證簽章時祇顯示主要的使用者 ID"
 +msgstr ""
  
- #: g10/gpg.c:3208
++#: g10/gpg.c:3241
  msgid "validate signatures with PKA data"
 -msgstr "以 PKA 資料驗證簽章"
 +msgstr ""
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3243
  msgid "elevate the trust of signatures with valid PKA data"
 -msgstr "提高對持有有效 PKA 資料之簽章的信任"
 +msgstr ""
  
- #: g10/gpg.c:3217
++#: g10/gpg.c:3250
  #, c-format
  msgid "%s:%d: invalid verify options\n"
 -msgstr "%s:%d: 無效的驗證選項\n"
 +msgstr ""
  
- #: g10/gpg.c:3220
++#: g10/gpg.c:3253
  msgid "invalid verify options\n"
 -msgstr "無效的驗證選項\n"
 +msgstr ""
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3260
  #, c-format
  msgid "unable to set exec-path to %s\n"
 -msgstr "無法把執行檔路徑設成 %s\n"
 +msgstr ""
  
- #: g10/gpg.c:3417
++#: g10/gpg.c:3452
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
 -msgstr "%s:%d: 無效的自動金鑰定址清單\n"
 +msgstr ""
  
- #: g10/gpg.c:3420
++#: g10/gpg.c:3455
  msgid "invalid auto-key-locate list\n"
 -msgstr "無效的自動金鑰定址清單\n"
 +msgstr ""
  
- #: g10/gpg.c:3553 sm/gpgsm.c:1507
++#: g10/gpg.c:3592 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
 -msgstr "警告: 程式可能會傾印出核心檔!\n"
 +msgstr ""
  
- #: g10/gpg.c:3564
++#: g10/gpg.c:3603
  #, c-format
  msgid "WARNING: %s overrides %s\n"
 -msgstr "警告: %s 會推翻 %s\n"
 +msgstr ""
  
- #: g10/gpg.c:3573
++#: g10/gpg.c:3612
  #, c-format
  msgid "%s not allowed with %s!\n"
 -msgstr "%s 不允許跟 %s 併用!\n"
 +msgstr ""
  
- #: g10/gpg.c:3576
++#: g10/gpg.c:3615
  #, c-format
  msgid "%s makes no sense with %s!\n"
 -msgstr "%s 跟 %s 放在一起沒有意義!\n"
 +msgstr ""
  
- #: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
++#: g10/gpg.c:3630 sm/gpgsm.c:1518 dirmngr/dirmngr.c:951
  msgid "WARNING: running with faked system time: "
 -msgstr "警告: 正在偽造的系統時間中執行: "
 +msgstr ""
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3651
  #, c-format
  msgid "will not run with insecure memory due to %s\n"
 -msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
 +msgstr ""
  
- #: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
++#: g10/gpg.c:3686 g10/gpg.c:3710 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
 -msgstr "所選的編密演算法無效\n"
 +msgstr ""
  
- #: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
++#: g10/gpg.c:3692 g10/gpg.c:3716 sm/gpgsm.c:1591 sm/gpgsm.c:1597
  msgid "selected digest algorithm is invalid\n"
 -msgstr "所選的摘要演算法無效\n"
 +msgstr ""
  
- #: g10/gpg.c:3659
++#: g10/gpg.c:3698
  msgid "selected compression algorithm is invalid\n"
 -msgstr "所選的壓縮演算法無效\n"
 +msgstr ""
  
- #: g10/gpg.c:3665
++#: g10/gpg.c:3704
  msgid "selected certification digest algorithm is invalid\n"
 -msgstr "所選的憑證摘要演算法無效\n"
 +msgstr ""
  
- #: g10/gpg.c:3680
++#: g10/gpg.c:3719
  msgid "completes-needed must be greater than 0\n"
 -msgstr "completes-needed 一定要大於 0\n"
 +msgstr ""
  
- #: g10/gpg.c:3682
++#: g10/gpg.c:3721
  msgid "marginals-needed must be greater than 1\n"
 -msgstr "marginals-needed 一定要大於 1\n"
 +msgstr ""
  
- #: g10/gpg.c:3684
++#: g10/gpg.c:3723
  msgid "max-cert-depth must be in the range from 1 to 255\n"
 -msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
 +msgstr ""
  
- #: g10/gpg.c:3686
++#: g10/gpg.c:3725
  msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 -msgstr "無效的 default-cert-level; 一定要是 0, 1, 2 或 3\n"
 +msgstr ""
  
- #: g10/gpg.c:3688
++#: g10/gpg.c:3727
  msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 -msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
 +msgstr ""
  
- #: g10/gpg.c:3691
++#: g10/gpg.c:3730
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 -msgstr "請注意: 強烈不建議使用單純 S2K 模式 (0)\n"
 +msgstr ""
  
- #: g10/gpg.c:3695
++#: g10/gpg.c:3734
  msgid "invalid S2K mode; must be 0, 1 or 3\n"
 -msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
 +msgstr ""
  
- #: g10/gpg.c:3702
++#: g10/gpg.c:3741
  msgid "invalid default preferences\n"
 -msgstr "無效的預設偏好\n"
 +msgstr ""
  
- #: g10/gpg.c:3706
++#: g10/gpg.c:3745
  msgid "invalid personal cipher preferences\n"
 -msgstr "無效的個人編密法偏好\n"
 +msgstr ""
  
- #: g10/gpg.c:3710
++#: g10/gpg.c:3749
  msgid "invalid personal digest preferences\n"
 -msgstr "無效的個人摘要偏好\n"
 +msgstr ""
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3753
  msgid "invalid personal compress preferences\n"
 -msgstr "無效的個人壓縮偏好\n"
 +msgstr ""
  
- #: g10/gpg.c:3750
++#: g10/gpg.c:3789
  #, c-format
  msgid "%s does not yet work with %s\n"
 -msgstr "%s 還沒辦法跟 %s 一起運作\n"
 +msgstr ""
  
- #: g10/gpg.c:3797
++#: g10/gpg.c:3836
  #, c-format
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
 -msgstr "你不該將 '%s' 編密演算法用於 %s 模式\n"
 +msgstr ""
  
- #: g10/gpg.c:3802
++#: g10/gpg.c:3841
  #, c-format
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
 -msgstr "你不該將 '%s' 摘要演算法用於 %s 模式\n"
 +msgstr ""
  
- #: g10/gpg.c:3807
++#: g10/gpg.c:3846
  #, c-format
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
 -msgstr "你不該將 '%s' 壓縮演算法用於 %s 模式\n"
 +msgstr ""
  
- #: g10/gpg.c:3906
++#: g10/gpg.c:3945
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
 -msgstr "信任資料庫啟始失敗: %s\n"
 +msgstr ""
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:3957
  msgid "WARNING: recipients (-r) given without using public key encryption\n"
 -msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
 +msgstr ""
  
- #: g10/gpg.c:3975
- msgid "--store [filename]"
- msgstr ""
- 
- #: g10/gpg.c:3985
- msgid "--symmetric [filename]"
- msgstr ""
- 
- #: g10/gpg.c:3989
++#: g10/gpg.c:4028
  #, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
 -msgstr "'%s' 對稱式加密失敗: %s\n"
 +msgstr ""
  
- #: g10/gpg.c:4000
- msgid "--encrypt [filename]"
- msgstr ""
- 
- #: g10/gpg.c:4016
- msgid "--symmetric --encrypt [filename]"
- msgstr ""
- 
- #: g10/gpg.c:4018
++#: g10/gpg.c:4057
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 -msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
 +msgstr ""
  
- #: g10/gpg.c:4021
++#: g10/gpg.c:4060
  #, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 -msgstr "你不能在 %s 模式中使用 --symmetric --encrypt\n"
 +msgstr ""
  
- #: g10/gpg.c:4042
- msgid "--sign [filename]"
- msgstr ""
- 
- #: g10/gpg.c:4058
- msgid "--sign --encrypt [filename]"
- msgstr ""
- 
- #: g10/gpg.c:4076
- msgid "--symmetric --sign --encrypt [filename]"
- msgstr ""
- 
- #: g10/gpg.c:4078
++#: g10/gpg.c:4117
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 -msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
 +msgstr ""
  
- #: g10/gpg.c:4081
++#: g10/gpg.c:4120
  #, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 -msgstr "你不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
 +msgstr ""
  
- #: g10/gpg.c:4105
- msgid "--sign --symmetric [filename]"
- msgstr ""
- 
- #: g10/gpg.c:4117
- msgid "--clearsign [filename]"
- msgstr ""
- 
- #: g10/gpg.c:4147
- msgid "--decrypt [filename]"
- msgstr ""
- 
- #: g10/gpg.c:4174
- msgid "--sign-key user-id"
- msgstr ""
- 
- #: g10/gpg.c:4178
- msgid "--lsign-key user-id"
- msgstr ""
- 
- #: g10/gpg.c:4199
- msgid "--edit-key user-id [commands]"
- msgstr ""
- 
- #: g10/gpg.c:4215
- msgid "--passwd <user-id>"
- msgstr ""
- 
- #: g10/gpg.c:4411 g10/keyserver.c:1837
++#: g10/gpg.c:4462 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
 -msgstr "送至金鑰伺服器失敗: %s\n"
 +msgstr ""
  
- #: g10/gpg.c:4416
++#: g10/gpg.c:4467
  #, c-format
  msgid "keyserver receive failed: %s\n"
 -msgstr "從金鑰伺服器接收失敗: %s\n"
 +msgstr ""
  
- #: g10/gpg.c:4422
++#: g10/gpg.c:4473
  #, c-format
  msgid "key export failed: %s\n"
 -msgstr "金鑰匯出失敗: %s\n"
 +msgstr ""
  
- #: g10/gpg.c:4435
 -#, fuzzy, c-format
 -#| msgid "key export failed: %s\n"
++#: g10/gpg.c:4486
 +#, c-format
  msgid "export as ssh key failed: %s\n"
 -msgstr "金鑰匯出失敗: %s\n"
 +msgstr ""
  
- #: g10/gpg.c:4447
++#: g10/gpg.c:4498
  #, c-format
  msgid "keyserver search failed: %s\n"
 -msgstr "用金鑰伺服器搜尋失敗: %s\n"
 +msgstr ""
  
- #: g10/gpg.c:4460
++#: g10/gpg.c:4511
  #, c-format
  msgid "keyserver refresh failed: %s\n"
 -msgstr "從金鑰伺服器更新失敗: %s\n"
 +msgstr ""
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4578
  #, c-format
  msgid "dearmoring failed: %s\n"
 -msgstr "解開封裝失敗: %s\n"
 +msgstr ""
  
- #: g10/gpg.c:4538
++#: g10/gpg.c:4589
  #, c-format
  msgid "enarmoring failed: %s\n"
 -msgstr "進行封裝失敗: %s\n"
 +msgstr ""
  
- #: g10/gpg.c:4630
++#: g10/gpg.c:4681
  #, c-format
  msgid "invalid hash algorithm '%s'\n"
 -msgstr "無效的雜湊演算法 '%s'\n"
 +msgstr ""
  
- #: g10/gpg.c:4776 g10/tofu.c:2002
 -#, fuzzy, c-format
 -#| msgid "error loading certificate '%s': %s\n"
++#: g10/gpg.c:4827 g10/tofu.c:2151
 +#, c-format
  msgid "error parsing key specification '%s': %s\n"
 -msgstr "載入憑證 '%s' 時出錯: %s\n"
 +msgstr ""
  
- #: g10/gpg.c:4788
++#: g10/gpg.c:4839
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4835
- msgid "[filename]"
- msgstr ""
- 
- #: g10/gpg.c:4841
++#: g10/gpg.c:4894
  msgid "Go ahead and type your message ...\n"
 -msgstr "請開始輸入你的訊息 ...\n"
 +msgstr ""
  
- #: g10/gpg.c:5179
++#: g10/gpg.c:5232
  msgid "the given certification policy URL is invalid\n"
 -msgstr "給定的的憑證原則 URL 無效\n"
 +msgstr ""
  
- #: g10/gpg.c:5181
++#: g10/gpg.c:5234
  msgid "the given signature policy URL is invalid\n"
 -msgstr "給定的簽章原則 URL 無效\n"
 +msgstr ""
  
- #: g10/gpg.c:5214
++#: g10/gpg.c:5267
  msgid "the given preferred keyserver URL is invalid\n"
 -msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 +msgstr ""
  
 +#: g10/gpgv.c:77
  msgid "|FILE|take the keys from the keyring FILE"
 -msgstr "|檔案|從指定鑰匙圈檔案裡取用金鑰"
 +msgstr ""
  
 +#: g10/gpgv.c:80
  msgid "make timestamp conflicts only a warning"
 -msgstr "僅把時間戳印矛盾視為警告"
 +msgstr ""
  
- #: g10/gpgv.c:82 sm/gpgsm.c:345
++#: g10/gpgv.c:82 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
 -msgstr "|檔案描述|把狀態資訊寫入此指定檔案描述"
 +msgstr ""
  
 +#: g10/gpgv.c:86
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
@@@ -3016,333 -2375,272 +2960,333 @@@ msgid "
  "Syntax: gpgv [options] [files]\n"
  "Check signatures against known trusted keys\n"
  msgstr ""
 -"語法: gpgv [選項] [檔案]\n"
 -"用已知的受信任金鑰來檢查簽章\n"
  
 +#: g10/helptext.c:72
  msgid "No help available"
 -msgstr "沒有可用的說明"
 +msgstr ""
  
 +#: g10/helptext.c:82
  #, c-format
  msgid "No help available for '%s'"
 -msgstr "'%s' 沒有可用的說明"
 +msgstr ""
  
- #: g10/import.c:151
++#: g10/import.c:152
  msgid "import signatures that are marked as local-only"
 -msgstr "匯入標記為僅限本機使用的簽章"
 +msgstr ""
  
- #: g10/import.c:154
++#: g10/import.c:155
  msgid "repair damage from the pks keyserver during import"
 -msgstr "匯入時修復來自 pks 金鑰伺服器的損壞"
 +msgstr ""
  
- #: g10/import.c:157
 -#, fuzzy
 -#| msgid "do not update the trustdb after import"
++#: g10/import.c:158
  msgid "do not clear the ownertrust values during import"
 -msgstr "匯入後不要更新信任資料庫"
 +msgstr ""
  
- #: g10/import.c:160
++#: g10/import.c:161
  msgid "do not update the trustdb after import"
 -msgstr "匯入後不要更新信任資料庫"
 +msgstr ""
  
- #: g10/import.c:163
 -#, fuzzy
 -#| msgid "show key fingerprint"
++#: g10/import.c:164
  msgid "show key during import"
 -msgstr "顯示金鑰指紋"
 +msgstr ""
  
- #: g10/import.c:166
++#: g10/import.c:167
  msgid "only accept updates to existing keys"
 -msgstr "祇接受既有金鑰的更新"
 +msgstr ""
  
- #: g10/import.c:169
++#: g10/import.c:170
  msgid "remove unusable parts from key after import"
 -msgstr "匯入後從金鑰中移除無法使用的部分"
 +msgstr ""
  
- #: g10/import.c:172
++#: g10/import.c:173
  msgid "remove as much as possible from key after import"
 -msgstr "匯入後盡可能地從金鑰中移除"
 +msgstr ""
  
- #: g10/import.c:175
++#: g10/import.c:176
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:326 g10/import.c:568
++#: g10/import.c:327 g10/import.c:569
  #, c-format
  msgid "skipping block of type %d\n"
 -msgstr "正在跳過 %d 型態的區塊\n"
 +msgstr ""
  
- #: g10/import.c:585
++#: g10/import.c:586
  #, c-format
  msgid "%lu keys processed so far\n"
 -msgstr "目前已處理 %lu 把金鑰\n"
 +msgstr ""
  
- #: g10/import.c:655
++#: g10/import.c:656
  #, c-format
  msgid "Total number processed: %lu\n"
 -msgstr "處理總量: %lu\n"
 +msgstr ""
  
- #: g10/import.c:658
 -#, fuzzy, c-format
 -#| msgid "      skipped new keys: %lu\n"
++#: g10/import.c:659
 +#, c-format
  msgid "    skipped PGP-2 keys: %lu\n"
 -msgstr "        已跳過的新金鑰: %lu\n"
 +msgstr ""
  
- #: g10/import.c:660
++#: g10/import.c:661
  #, c-format
  msgid "      skipped new keys: %lu\n"
 -msgstr "        已跳過的新金鑰: %lu\n"
 +msgstr ""
  
- #: g10/import.c:663
++#: g10/import.c:664
  #, c-format
  msgid "          w/o user IDs: %lu\n"
 -msgstr "       沒有使用者的 ID: %lu\n"
 +msgstr ""
  
- #: g10/import.c:666 sm/import.c:130
++#: g10/import.c:667 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
 -msgstr "                已匯入: %lu"
 +msgstr ""
  
- #: g10/import.c:670 sm/import.c:134
++#: g10/import.c:671 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
 -msgstr "              未改變的: %lu\n"
 +msgstr ""
  
- #: g10/import.c:672
++#: g10/import.c:673
  #, c-format
  msgid "          new user IDs: %lu\n"
 -msgstr "         新的使用者 ID: %lu\n"
 +msgstr ""
  
- #: g10/import.c:674
++#: g10/import.c:675
  #, c-format
  msgid "           new subkeys: %lu\n"
 -msgstr "              新的子鑰: %lu\n"
 +msgstr ""
  
- #: g10/import.c:676
++#: g10/import.c:677
  #, c-format
  msgid "        new signatures: %lu\n"
 -msgstr "              新的簽章: %lu\n"
 +msgstr ""
  
- #: g10/import.c:678
++#: g10/import.c:679
  #, c-format
  msgid "   new key revocations: %lu\n"
 -msgstr "          新的金鑰撤銷: %lu\n"
 +msgstr ""
  
- #: g10/import.c:680 sm/import.c:136
++#: g10/import.c:681 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
 -msgstr "          已讀取的私鑰: %lu\n"
 +msgstr ""
  
- #: g10/import.c:682 sm/import.c:138
++#: g10/import.c:683 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
 -msgstr "          已匯入的私鑰: %lu\n"
 +msgstr ""
  
- #: g10/import.c:684 sm/import.c:140
++#: g10/import.c:685 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
 -msgstr "          未改變的私鑰: %lu\n"
 +msgstr ""
  
- #: g10/import.c:686 sm/import.c:142
++#: g10/import.c:687 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
 -msgstr "              未被匯入: %lu\n"
 +msgstr ""
  
- #: g10/import.c:688
++#: g10/import.c:689
  #, c-format
  msgid "    signatures cleaned: %lu\n"
 -msgstr "      已清除的簽章: %lu\n"
 +msgstr ""
  
- #: g10/import.c:690
++#: g10/import.c:691
  #, c-format
  msgid "      user IDs cleaned: %lu\n"
 -msgstr " 已清除的使用者 ID: %lu\n"
 +msgstr ""
  
- #: g10/import.c:1034
++#: g10/import.c:1035
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
  "algorithms on these user IDs:\n"
 -msgstr "警告: 金鑰 %s 的偏好設定含有這些使用者 ID 無法使用的演算法:\n"
 +msgstr ""
  
- #: g10/import.c:1076
++#: g10/import.c:1077
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
 -msgstr "         \"%s\": 編密演算法 %s 的偏好設定\n"
 +msgstr ""
  
- #: g10/import.c:1091
++#: g10/import.c:1092
  #, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
 -msgstr "         \"%s\": 摘要演算法 %s 的偏好設定\n"
 +msgstr ""
  
- #: g10/import.c:1103
++#: g10/import.c:1104
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
 -msgstr "         \"%s\": 壓縮演算法 %s 的偏好設定\n"
 +msgstr ""
  
- #: g10/import.c:1116
++#: g10/import.c:1117
  msgid "it is strongly suggested that you update your preferences and\n"
 -msgstr "我們強烈建議你更新偏好設定, 並重新\n"
 +msgstr ""
  
- #: g10/import.c:1118
++#: g10/import.c:1119
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 -msgstr "散佈此金鑰, 以避免潛在的演算法不一致問題.\n"
 +msgstr ""
  
- #: g10/import.c:1143
++#: g10/import.c:1144
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 -msgstr "你可以像這樣來更新偏好設定: gpg --edit-key %s updpref save\n"
 +msgstr ""
  
- #: g10/import.c:1379 g10/import.c:2167
++#: g10/import.c:1380 g10/import.c:2168
  #, c-format
  msgid "key %s: no user ID\n"
 -msgstr "金鑰 %s: 沒有使用者 ID\n"
 +msgstr ""
  
- #: g10/import.c:1385
++#: g10/import.c:1386
  #, c-format
  msgid "key %s: %s\n"
 -msgstr "金鑰 %s: %s\n"
 +msgstr ""
  
- #: g10/import.c:1386 g10/import.c:2141
++#: g10/import.c:1387 g10/import.c:2142
  msgid "rejected by import screener"
 -msgstr "遭到匯入篩選程式駁回"
 +msgstr ""
  
- #: g10/import.c:1416
++#: g10/import.c:1417
  #, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
 -msgstr "金鑰 %s: PKS 子鑰的訛誤已被修復\n"
 +msgstr ""
  
- #: g10/import.c:1434
++#: g10/import.c:1435
  #, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 -msgstr "金鑰 %s: 已接受非自我簽署的使用者 ID \"%s\"\n"
 +msgstr ""
  
- #: g10/import.c:1444 g10/import.c:1475
++#: g10/import.c:1445 g10/import.c:1476
  #, c-format
  msgid "key %s: no valid user IDs\n"
 -msgstr "金鑰 %s: 沒有有效的使用者 ID\n"
 +msgstr ""
  
- #: g10/import.c:1446
++#: g10/import.c:1447
  msgid "this may be caused by a missing self-signature\n"
 -msgstr "這可能肇因於遺失自我簽章所致\n"
 +msgstr ""
  
- #: g10/import.c:1516 g10/import.c:2318
++#: g10/import.c:1517 g10/import.c:2319
  #, c-format
  msgid "key %s: public key not found: %s\n"
 -msgstr "金鑰 %s: 找不到公鑰: %s\n"
 +msgstr ""
  
- #: g10/import.c:1522
++#: g10/import.c:1523
  #, c-format
  msgid "key %s: new key - skipped\n"
 -msgstr "金鑰 %s: 新的金鑰 - 已跳過\n"
 +msgstr ""
  
- #: g10/import.c:1537
++#: g10/import.c:1538
  #, c-format
  msgid "no writable keyring found: %s\n"
 -msgstr "找不到可寫入的鑰匙圈: %s\n"
 +msgstr ""
  
- #: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
++#: g10/import.c:1547 g10/import.c:1648 g10/import.c:2385
  #, c-format
  msgid "error writing keyring '%s': %s\n"
 -msgstr "寫入鑰匙圈 '%s' 時出錯: %s\n"
 +msgstr ""
  
- #: g10/import.c:1566
++#: g10/import.c:1567
  #, c-format
  msgid "key %s: public key \"%s\" imported\n"
 -msgstr "金鑰 %s: 公鑰 \"%s\" 已匯入\n"
 +msgstr ""
  
- #: g10/import.c:1590
++#: g10/import.c:1591
  #, c-format
  msgid "key %s: doesn't match our copy\n"
 -msgstr "金鑰 %s: 跟我們的副本不吻合\n"
 +msgstr ""
  
- #: g10/import.c:1606 g10/import.c:2342
++#: g10/import.c:1607 g10/import.c:2343
  #, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
 -msgstr "金鑰 %s: 無法定址原始的金鑰區塊: %s\n"
 +msgstr ""
  
- #: g10/import.c:1614 g10/import.c:2349
++#: g10/import.c:1615 g10/import.c:2350
  #, c-format
  msgid "key %s: can't read original keyblock: %s\n"
 -msgstr "金鑰 %s: 無法讀取原始的金鑰區塊: %s\n"
 +msgstr ""
  
- #: g10/import.c:1657
++#: g10/import.c:1658
  #, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
 -msgstr "金鑰 %s: \"%s\" 1 個新的使用者 ID\n"
 +msgstr ""
  
- #: g10/import.c:1660
++#: g10/import.c:1661
  #, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
 -msgstr "金鑰 %s: \"%s\" %d 個新的使用者 ID\n"
 +msgstr ""
  
- #: g10/import.c:1663
++#: g10/import.c:1664
  #, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
 -msgstr "金鑰 %s: \"%s\" 1 份新的簽章\n"
 +msgstr ""
  
- #: g10/import.c:1666
++#: g10/import.c:1667
  #, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
 -msgstr "金鑰 %s: \"%s\" %d 份新的簽章\n"
 +msgstr ""
  
- #: g10/import.c:1669
++#: g10/import.c:1670
  #, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
 -msgstr "金鑰 %s: \"%s\" 1 把新的子鑰\n"
 +msgstr ""
  
- #: g10/import.c:1672
++#: g10/import.c:1673
  #, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
 -msgstr "金鑰 %s: \"%s\" %d 把新的子鑰\n"
 +msgstr ""
  
- #: g10/import.c:1675
++#: g10/import.c:1676
  #, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
 -msgstr "金鑰 %s: \"%s\" 已清除 %d 份簽章\n"
 +msgstr ""
  
- #: g10/import.c:1678
++#: g10/import.c:1679
  #, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
 -msgstr "金鑰 %s: \"%s\" 已清除 %d 份簽章\n"
 +msgstr ""
  
- #: g10/import.c:1681
++#: g10/import.c:1682
  #, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
 -msgstr "金鑰 %s: \"%s\" 已清除 %d 個使用者 ID\n"
 +msgstr ""
  
- #: g10/import.c:1684
++#: g10/import.c:1685
  #, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
 -msgstr "金鑰 %s: \"%s\" 已清除 %d 個使用者 ID\n"
 +msgstr ""
  
- #: g10/import.c:1707
++#: g10/import.c:1708
  #, c-format
  msgid "key %s: \"%s\" not changed\n"
 -msgstr "金鑰 %s: \"%s\" 未改變\n"
 +msgstr ""
  
- #: g10/import.c:2019 g10/import.c:2264
++#: g10/import.c:2020 g10/import.c:2265
  #, c-format
  msgid "key %s: secret key imported\n"
 -msgstr "金鑰 %s: 私鑰已匯入\n"
 +msgstr ""
  
- #: g10/import.c:2027
++#: g10/import.c:2028
  #, c-format
  msgid "key %s: secret key already exists\n"
 -msgstr "金鑰 %s: 私鑰已存在\n"
 +msgstr ""
  
- #: g10/import.c:2035
++#: g10/import.c:2036
  #, c-format
  msgid "key %s: error sending to agent: %s\n"
 -msgstr "金鑰 %s: 送至代理程式時出錯: %s\n"
 +msgstr ""
  
- #: g10/import.c:2140
++#: g10/import.c:2141
  #, c-format
  msgid "secret key %s: %s\n"
 -msgstr "私鑰 %s: %s\n"
 +msgstr ""
  
- #: g10/import.c:2160 g10/import.c:2195
++#: g10/import.c:2161 g10/import.c:2196
  msgid "importing secret keys not allowed\n"
 -msgstr "未允許匯入私鑰\n"
 +msgstr ""
  
- #: g10/import.c:2184
++#: g10/import.c:2185
  #, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
 -msgstr "金鑰 %s: 私鑰使用了無效的 %d 編密法 - 已跳過\n"
 +msgstr ""
  
  #. TRANSLATORS: For smartcard, each private key on
  #. host has a reference (stub) to a smartcard and
@@@ -3354,1250 -2652,1028 +3298,1255 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2256
++#: g10/import.c:2257
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2311
++#: g10/import.c:2312
  #, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
 -msgstr "金鑰 %s: 沒有公鑰 - 無法套用撤銷憑證\n"
 +msgstr ""
  
- #: g10/import.c:2360
++#: g10/import.c:2361
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
 -msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已駁回\n"
 +msgstr ""
  
- #: g10/import.c:2393
++#: g10/import.c:2394
  #, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
 -msgstr "金鑰 %s: \"%s\" 撤銷憑證已匯入\n"
 +msgstr ""
  
- #: g10/import.c:2469
++#: g10/import.c:2470
  #, c-format
  msgid "key %s: no user ID for signature\n"
 -msgstr "金鑰 %s: 簽章沒有使用者 ID\n"
 +msgstr ""
  
- #: g10/import.c:2486
++#: g10/import.c:2487
  #, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 -msgstr "金鑰 %s: 使用者 ID \"%s\" 用了未支援的公鑰演算法\n"
 +msgstr ""
  
- #: g10/import.c:2488
++#: g10/import.c:2489
  #, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 -msgstr "金鑰 %s: 使用者 ID \"%s\" 的自我簽章無效\n"
 +msgstr ""
  
- #: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
++#: g10/import.c:2506 g10/import.c:2532 g10/import.c:2583
  #, c-format
  msgid "key %s: unsupported public key algorithm\n"
 -msgstr "金鑰 %s: 未支援的公鑰演算法\n"
 +msgstr ""
  
- #: g10/import.c:2506
++#: g10/import.c:2507
  #, c-format
  msgid "key %s: invalid direct key signature\n"
 -msgstr "金鑰 %s: 無效的直接金鑰簽章\n"
 +msgstr ""
  
- #: g10/import.c:2520
++#: g10/import.c:2521
  #, c-format
  msgid "key %s: no subkey for key binding\n"
 -msgstr "金鑰 %s: 沒有可供附帶的子鑰\n"
 +msgstr ""
  
- #: g10/import.c:2533
++#: g10/import.c:2534
  #, c-format
  msgid "key %s: invalid subkey binding\n"
 -msgstr "金鑰 %s: 無效的附帶子鑰\n"
 +msgstr ""
  
- #: g10/import.c:2549
++#: g10/import.c:2550
  #, c-format
  msgid "key %s: removed multiple subkey binding\n"
 -msgstr "金鑰 %s: 多重附帶子鑰已移除\n"
 +msgstr ""
  
- #: g10/import.c:2571
++#: g10/import.c:2572
  #, c-format
  msgid "key %s: no subkey for key revocation\n"
 -msgstr "金鑰 %s: 沒有子鑰可供金鑰撤銷\n"
 +msgstr ""
  
- #: g10/import.c:2584
++#: g10/import.c:2585
  #, c-format
  msgid "key %s: invalid subkey revocation\n"
 -msgstr "金鑰 %s: 無效的子鑰撤銷\n"
 +msgstr ""
  
- #: g10/import.c:2599
++#: g10/import.c:2600
  #, c-format
  msgid "key %s: removed multiple subkey revocation\n"
 -msgstr "金鑰 %s: 多重子鑰撤銷已移除\n"
 +msgstr ""
  
- #: g10/import.c:2641
++#: g10/import.c:2642
  #, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
 -msgstr "金鑰 %s: 使用者 ID \"%s\" 已跳過\n"
 +msgstr ""
  
- #: g10/import.c:2665
++#: g10/import.c:2666
  #, c-format
  msgid "key %s: skipped subkey\n"
 -msgstr "金鑰 %s: 子鑰已跳過\n"
 +msgstr ""
  
- #: g10/import.c:2694
 -#  here we violate the rfc a bit by still allowing
 -#  * to import non-exportable signature when we have the
 -#  * the secret key used to create this signature - it
 -#  * seems that this makes sense
++#: g10/import.c:2695
  #, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 -msgstr "金鑰 %s: 不可匯出的簽章 (等級 0x%02X) - 已跳過\n"
 +msgstr ""
  
- #: g10/import.c:2705
++#: g10/import.c:2706
  #, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
 -msgstr "金鑰 %s: 撤銷憑證在錯誤的地方 - 已跳過\n"
 +msgstr ""
  
- #: g10/import.c:2723
++#: g10/import.c:2724
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
 -msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已跳過\n"
 +msgstr ""
  
- #: g10/import.c:2737
++#: g10/import.c:2738
  #, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
 -msgstr "金鑰 %s: 子鑰簽章在錯誤的地方 - 已跳過\n"
 +msgstr ""
  
- #: g10/import.c:2745
++#: g10/import.c:2746
  #, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 -msgstr "金鑰 %s: 非預期的簽章等級 (0x%02X) - 已跳過\n"
 +msgstr ""
  
- #: g10/import.c:2887
++#: g10/import.c:2888
  #, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
 -msgstr "金鑰 %s: 偵測到重複的使用者 ID - 已合併\n"
 +msgstr ""
  
- #: g10/import.c:2951
++#: g10/import.c:2952
  #, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 -msgstr "警告: 金鑰 %s 可能被撤銷了: 正在取回撤銷金鑰 %s\n"
 +msgstr ""
  
- #: g10/import.c:2967
++#: g10/import.c:2968
  #, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 -msgstr "警告: 金鑰 %s 可能被撤銷了: 撤銷金鑰 %s 未出現.\n"
 +msgstr ""
  
- #: g10/import.c:3031
++#: g10/import.c:3032
  #, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
 -msgstr "金鑰 %s: 已新增 \"%s\" 撤銷憑證\n"
 +msgstr ""
  
- #: g10/import.c:3069
++#: g10/import.c:3070
  #, c-format
  msgid "key %s: direct key signature added\n"
 -msgstr "金鑰 %s: 已新增直接金鑰簽章\n"
 +msgstr ""
  
 +#: g10/keydb.c:404 g10/keydb.c:431 sm/keydb.c:213 sm/keydb.c:226
  #, c-format
  msgid "error creating keybox '%s': %s\n"
 -msgstr "建立金鑰鑰匙盒 '%s' 時出錯: %s\n"
 +msgstr ""
  
 +#: g10/keydb.c:407 g10/keydb.c:434
  #, c-format
  msgid "error creating keyring '%s': %s\n"
 -msgstr "建立鑰匙圈 '%s' 時出錯: %s\n"
 +msgstr ""
  
 +#: g10/keydb.c:443 sm/keydb.c:232
  #, c-format
  msgid "keybox '%s' created\n"
 -msgstr "鑰匙盒 '%s' 已建立\n"
 +msgstr ""
  
 +#: g10/keydb.c:445
  #, c-format
  msgid "keyring '%s' created\n"
 -msgstr "鑰匙圈 '%s' 已建立\n"
 +msgstr ""
  
 +#: g10/keydb.c:823
  #, c-format
  msgid "keyblock resource '%s': %s\n"
 -msgstr "金鑰區塊資源 '%s': %s\n"
 +msgstr ""
  
 -#, fuzzy, c-format
 -#| msgid "error opening '%s': %s\n"
 +#: g10/keydb.c:911
 +#, c-format
  msgid "error opening key DB: %s\n"
 -msgstr "開啟 '%s' 時出錯: %s\n"
 +msgstr ""
  
- #: g10/keydb.c:1782
++#: g10/keydb.c:1786
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
 -msgstr "重新建立鑰匙圈快取失敗: %s\n"
 +msgstr ""
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[revocation]"
 -msgstr "[撤銷]"
 +msgstr ""
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[self-signature]"
 -msgstr "[自我簽章]"
 +msgstr ""
  
- #: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
++#: g10/keyedit.c:433 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: dirmngr/ldap-wrapper.c:694
  #, c-format
  msgid "error allocating memory: %s\n"
 -msgstr "配置記憶體時出錯: %s\n"
 +msgstr ""
  
- #: g10/keyedit.c:629
 -#, fuzzy, c-format
 -#| msgid "key %s: unsupported public key algorithm\n"
++#: g10/keyedit.c:630
 +#, c-format
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
 -msgstr "金鑰 %s: 未支援的公鑰演算法\n"
 +msgstr ""
  
- #: g10/keyedit.c:638
 -#, fuzzy, c-format
 -#| msgid "card does not support digest algorithm %s\n"
++#: g10/keyedit.c:639
 +#, c-format
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
 -msgstr "卡片不支援 %s 摘要演算法\n"
 +msgstr ""
  
- #: g10/keyedit.c:800
 -#, fuzzy
 -#| msgid "Good signature from"
++#: g10/keyedit.c:801
  msgid " (reordered signatures follow)"
 -msgstr "完好的簽章來自於"
 +msgstr ""
  
- #: g10/keyedit.c:913
 -#, fuzzy, c-format
 -#| msgid "key %s: %s\n"
++#: g10/keyedit.c:914
 +#, c-format
  msgid "key %s:\n"
 -msgstr "金鑰 %s: %s\n"
 +msgstr ""
  
- #: g10/keyedit.c:916
 -#, fuzzy, c-format
 -#| msgid "User ID \"%s\": %d signature removed\n"
++#: g10/keyedit.c:917
 +#, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
 -msgstr[0] "使用者 ID \"%s\": 已移除 %d 份簽章\n"
 +msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/keyedit.c:919 g10/keylist.c:480
 -#, fuzzy, c-format
 -#| msgid "1 signature not checked due to a missing key\n"
++#: g10/keyedit.c:920 g10/keylist.c:480
 +#, c-format
  msgid "%d signature not checked due to a missing key\n"
  msgid_plural "%d signatures not checked due to missing keys\n"
 -msgstr[0] "有 1 份簽章因為遺失金鑰而未被檢查\n"
 +msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/keyedit.c:923 g10/keylist.c:476
 -#, fuzzy, c-format
 -#| msgid "%d bad signatures\n"
++#: g10/keyedit.c:924 g10/keylist.c:476
 +#, c-format
  msgid "%d bad signature\n"
  msgid_plural "%d bad signatures\n"
 -msgstr[0] "%d 份損壞的簽章\n"
 +msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/keyedit.c:927
 -#, fuzzy, c-format
 -#| msgid "Good signature from"
++#: g10/keyedit.c:928
 +#, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
 -msgstr[0] "完好的簽章來自於"
 +msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/keyedit.c:932
++#: g10/keyedit.c:933
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:992 g10/pkclist.c:274
++#: g10/keyedit.c:993 g10/pkclist.c:274
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
  "keys\n"
  "(by looking at passports, checking fingerprints from different sources, "
  "etc.)\n"
  msgstr ""
 -"請判斷你有多信任這位使用者確實驗證其他使用者的金鑰\n"
 -"(像是查對身份證, 或從不同的來源檢查指紋等...)的能力\n"
  
- #: g10/keyedit.c:996 g10/pkclist.c:286
++#: g10/keyedit.c:997 g10/pkclist.c:286
  #, c-format
  msgid "  %d = I trust marginally\n"
 -msgstr "  %d = 我勉強信任\n"
 +msgstr ""
  
- #: g10/keyedit.c:997 g10/pkclist.c:288
++#: g10/keyedit.c:998 g10/pkclist.c:288
  #, c-format
  msgid "  %d = I trust fully\n"
 -msgstr "  %d = 我完全信任\n"
 +msgstr ""
  
- #: g10/keyedit.c:1015
++#: g10/keyedit.c:1016
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
  "trust signatures on your behalf.\n"
  msgstr ""
 -"請輸入此信任簽章的深度.\n"
 -"深度大於 1 的話就表示你信任這把正被簽署的金鑰,\n"
 -"同時也信任這把金鑰所簽署的信任簽章.\n"
  
- #: g10/keyedit.c:1032
++#: g10/keyedit.c:1033
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 -msgstr "請輸入約束此簽章的網域, 若無請直接按下 [Enter].\n"
 +msgstr ""
  
- #: g10/keyedit.c:1160
++#: g10/keyedit.c:1161
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1168
++#: g10/keyedit.c:1169
  #, c-format
  msgid "User ID \"%s\" is revoked."
 -msgstr "使用者 ID \"%s\" 已撤銷."
 +msgstr ""
  
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
- #: g10/keyedit.c:2246
++#: g10/keyedit.c:1178 g10/keyedit.c:1206 g10/keyedit.c:1233 g10/keyedit.c:1417
++#: g10/keyedit.c:2247
  msgid "Are you sure you still want to sign it? (y/N) "
 -msgstr "你仍然想要簽署它嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
- #: g10/keyedit.c:2251 g10/keyedit.c:3177
++#: g10/keyedit.c:1192 g10/keyedit.c:1220 g10/keyedit.c:1247 g10/keyedit.c:1423
++#: g10/keyedit.c:2252 g10/keyedit.c:3178
  msgid "  Unable to sign.\n"
 -msgstr "  無法簽署.\n"
 +msgstr ""
  
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1197
  #, c-format
  msgid "User ID \"%s\" is expired."
 -msgstr "使用者 ID \"%s\" 已過期."
 +msgstr ""
  
- #: g10/keyedit.c:1224
++#: g10/keyedit.c:1225
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
 -msgstr "使用者 ID \"%s\" 未經自我簽署."
 +msgstr ""
  
- #: g10/keyedit.c:1253
++#: g10/keyedit.c:1254
  #, c-format
  msgid "User ID \"%s\" is signable.  "
 -msgstr "使用者 ID \"%s\" 可被簽署."
 +msgstr ""
  
- #: g10/keyedit.c:1255
++#: g10/keyedit.c:1256
  msgid "Sign it? (y/N) "
 -msgstr "是否要簽署? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:1282
++#: g10/keyedit.c:1283
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
  "is a PGP 2.x-style signature.\n"
  msgstr ""
 -"\"%s\" 裡的自我簽章\n"
 -"是 PGP 2.x 型態的簽章.\n"
  
- #: g10/keyedit.c:1291
++#: g10/keyedit.c:1292
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 -msgstr "你是否想要將它升級成 OpenPGP 自我簽章? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:1304
++#: g10/keyedit.c:1305
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
  "has expired.\n"
  msgstr ""
 -"你目前在 \"%s\" 的簽章\n"
 -"已經過期了.\n"
  
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:1310
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 -msgstr "你想要發佈一份新的簽章來取代已過期的那個嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:1330
++#: g10/keyedit.c:1331
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
  "is a local signature.\n"
  msgstr ""
 -"你目前在 \"%s\" 的簽章\n"
 -"是一份本機簽章.\n"
  
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:1336
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
 -msgstr "你是否想要把他升級成可以完全匯出的簽章? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:1355
++#: g10/keyedit.c:1356
  #, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
 -msgstr "\"%s\" 已經被金鑰 %s 在本機簽署了\n"
 +msgstr ""
  
- #: g10/keyedit.c:1359
++#: g10/keyedit.c:1360
  #, c-format
  msgid "\"%s\" was already signed by key %s\n"
 -msgstr "\"%s\" 已經被金鑰 %s 簽署了\n"
 +msgstr ""
  
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:1365
  msgid "Do you want to sign it again anyway? (y/N) "
 -msgstr "你仍然想要再次簽署它嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:1386
++#: g10/keyedit.c:1387
  #, c-format
  msgid "Nothing to sign with key %s\n"
 -msgstr "沒有東西可以讓金鑰 %s 簽署\n"
 +msgstr ""
  
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1411
  msgid "This key has expired!"
 -msgstr "這把金鑰已經過期了!"
 +msgstr ""
  
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1429
  #, c-format
  msgid "This key is due to expire on %s.\n"
 -msgstr "這把金鑰將在 %s 過期.\n"
 +msgstr ""
  
- #: g10/keyedit.c:1434
++#: g10/keyedit.c:1435
  msgid "Do you want your signature to expire at the same time? (Y/n) "
 -msgstr "你想要讓你的簽章也在同一個時候過期嗎? (Y/n) "
 +msgstr ""
  
- #: g10/keyedit.c:1475
++#: g10/keyedit.c:1476
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
  "to the person named above?  If you don't know what to answer, enter \"0\".\n"
  msgstr ""
 -"你有多謹慎檢查正要簽署的金鑰確實屬於上面那個人的名字呢?\n"
 -"如果你不知道這個問題的答案, 請輸入 \"0\".\n"
  
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1481
  #, c-format
  msgid "   (0) I will not answer.%s\n"
 -msgstr "   (0) 我不作答.%s\n"
 +msgstr ""
  
- #: g10/keyedit.c:1482
++#: g10/keyedit.c:1483
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
 -msgstr "   (1) 我根本沒有檢查過.%s\n"
 +msgstr ""
  
- #: g10/keyedit.c:1484
++#: g10/keyedit.c:1485
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
 -msgstr "   (2) 我隨意檢查過了.%s\n"
 +msgstr ""
  
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:1488
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
 -msgstr "   (3) 我非常小心地檢查過了.%s\n"
 +msgstr ""
  
- #: g10/keyedit.c:1494
++#: g10/keyedit.c:1495
  msgid "Your selection? (enter '?' for more information): "
 -msgstr "你的選擇是? (輸入 '?' 以取得更多資訊): "
 +msgstr ""
  
- #: g10/keyedit.c:1521
++#: g10/keyedit.c:1522
  #, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
  "key \"%s\" (%s)\n"
  msgstr ""
 -"你真的確定要用你的金鑰 \"%s\" (%s)\n"
 -"來簽署這把金鑰嗎\n"
  
- #: g10/keyedit.c:1529
++#: g10/keyedit.c:1530
  msgid "This will be a self-signature.\n"
 -msgstr "這將會是一份自我簽章.\n"
 +msgstr ""
  
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:1535
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
 -msgstr "警告: 這份簽章不會被標記為不可匯出.\n"
 +msgstr ""
  
- #: g10/keyedit.c:1541
++#: g10/keyedit.c:1542
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
 -msgstr "警告: 這份簽章不會被標記成不可撤銷.\n"
 +msgstr ""
  
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1552
  msgid "The signature will be marked as non-exportable.\n"
 -msgstr "這份簽章會被標記成不可匯出.\n"
 +msgstr ""
  
- #: g10/keyedit.c:1558
++#: g10/keyedit.c:1559
  msgid "The signature will be marked as non-revocable.\n"
 -msgstr "這份簽章會被標記成不可撤銷.\n"
 +msgstr ""
  
- #: g10/keyedit.c:1565
++#: g10/keyedit.c:1566
  msgid "I have not checked this key at all.\n"
 -msgstr "我根本沒有檢查過這把金鑰.\n"
 +msgstr ""
  
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:1571
  msgid "I have checked this key casually.\n"
 -msgstr "我隨意檢查過這把金鑰了.\n"
 +msgstr ""
  
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:1576
  msgid "I have checked this key very carefully.\n"
 -msgstr "我非常小心地檢查過這把金鑰了.\n"
 +msgstr ""
  
- #: g10/keyedit.c:1587
++#: g10/keyedit.c:1588
  msgid "Really sign? (y/N) "
 -msgstr "真的要簽署嗎? (y/N)"
 +msgstr ""
  
- #: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
- #: g10/keyedit.c:6463 g10/sign.c:323
++#: g10/keyedit.c:1639 g10/keyedit.c:6308 g10/keyedit.c:6391 g10/keyedit.c:6500
++#: g10/keyedit.c:6562 g10/sign.c:325
  #, c-format
  msgid "signing failed: %s\n"
 -msgstr "簽署時失敗: %s\n"
 +msgstr ""
  
- #: g10/keyedit.c:1725
++#: g10/keyedit.c:1726
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 -msgstr "金鑰祇剩下殘骸或者祇含有卡上金鑰項目 - 沒有可變更的密語.\n"
 +msgstr ""
  
- #: g10/keyedit.c:1755
++#: g10/keyedit.c:1756
  #, c-format
  msgid "key %s: error changing passphrase: %s\n"
 -msgstr "金鑰 %s: 變更密語時出錯: %s\n"
 +msgstr ""
  
- #: g10/keyedit.c:1869
++#: g10/keyedit.c:1870
  msgid "save and quit"
 -msgstr "儲存並離開"
 +msgstr ""
  
- #: g10/keyedit.c:1872
++#: g10/keyedit.c:1873
  msgid "show key fingerprint"
 -msgstr "顯示金鑰指紋"
 +msgstr ""
  
- #: g10/keyedit.c:1873
 -#, fuzzy
 -#| msgid "Enter the keygrip: "
++#: g10/keyedit.c:1874
  msgid "show the keygrip"
 -msgstr "請輸入金鑰鑰柄: "
 +msgstr ""
  
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1875
  msgid "list key and user IDs"
 -msgstr "列出金鑰和使用者 ID"
 +msgstr ""
  
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1877
  msgid "select user ID N"
 -msgstr "選擇使用者 ID N"
 +msgstr ""
  
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1878
  msgid "select subkey N"
 -msgstr "選擇子鑰 N"
 +msgstr ""
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1879
  msgid "check signatures"
 -msgstr "檢查簽章"
 +msgstr ""
  
- #: g10/keyedit.c:1884
++#: g10/keyedit.c:1885
  msgid "sign selected user IDs [* see below for related commands]"
 -msgstr "簽署所選的使用者 ID [* 請參見底下相關的註解]"
 +msgstr ""
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1890
  msgid "sign selected user IDs locally"
 -msgstr "僅在本機簽署所選的使用者 ID"
 +msgstr ""
  
- #: g10/keyedit.c:1890
++#: g10/keyedit.c:1891
  msgid "sign selected user IDs with a trust signature"
 -msgstr "用信任簽章來簽署所選的使用者 ID"
 +msgstr ""
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1893
  msgid "sign selected user IDs with a non-revocable signature"
 -msgstr "用不可撤銷的簽章來簽署所選的使用者 ID"
 +msgstr ""
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1895
  msgid "add a user ID"
 -msgstr "增加使用者 ID"
 +msgstr ""
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1897
  msgid "add a photo ID"
 -msgstr "增加照片 ID"
 +msgstr ""
  
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1898
  msgid "delete selected user IDs"
 -msgstr "刪除所選的使用者 ID"
 +msgstr ""
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1901
  msgid "add a subkey"
 -msgstr "增加子鑰"
 +msgstr ""
  
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1904
  msgid "add a key to a smartcard"
 -msgstr "將金鑰加到智慧卡"
 +msgstr ""
  
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1906
  msgid "move a key to a smartcard"
 -msgstr "將金鑰移動到智慧卡"
 +msgstr ""
  
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1908
  msgid "move a backup key to a smartcard"
 -msgstr "將備份金鑰移動到智慧卡"
 +msgstr ""
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1910
  msgid "delete selected subkeys"
 -msgstr "刪除所選的子鑰"
 +msgstr ""
  
- #: g10/keyedit.c:1911
++#: g10/keyedit.c:1912
  msgid "add a revocation key"
 -msgstr "增加撤銷金鑰"
 +msgstr ""
  
- #: g10/keyedit.c:1913
++#: g10/keyedit.c:1914
  msgid "delete signatures from the selected user IDs"
 -msgstr "從所選的使用者 ID 中刪除簽章"
 +msgstr ""
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1916
  msgid "change the expiration date for the key or selected subkeys"
 -msgstr "變更金鑰或所選子鑰的使用期限"
 +msgstr ""
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1918
  msgid "flag the selected user ID as primary"
 -msgstr "把所選的使用者 ID 標為主要"
 +msgstr ""
  
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1921
  msgid "list preferences (expert)"
 -msgstr "列出偏好 (專家模式)"
 +msgstr ""
  
- #: g10/keyedit.c:1921
++#: g10/keyedit.c:1922
  msgid "list preferences (verbose)"
 -msgstr "列出偏好 (囉唆模式)"
 +msgstr ""
  
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:1924
  msgid "set preference list for the selected user IDs"
 -msgstr "設定所選使用者 ID 的偏好清單"
 +msgstr ""
  
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1927
  msgid "set the preferred keyserver URL for the selected user IDs"
 -msgstr "為所選的使用者 ID 設定偏好的金鑰伺服器 URL"
 +msgstr ""
  
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1929
  msgid "set a notation for the selected user IDs"
 -msgstr "為所選的使用者 ID 設定註記"
 +msgstr ""
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1931
  msgid "change the passphrase"
 -msgstr "更改密語"
 +msgstr ""
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1934
  msgid "change the ownertrust"
 -msgstr "更改主觀信任"
 +msgstr ""
  
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1937
  msgid "revoke signatures on the selected user IDs"
 -msgstr "撤銷所選使用者 ID 的簽章"
 +msgstr ""
  
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1939
  msgid "revoke selected user IDs"
 -msgstr "撤銷所選的使用者 ID"
 +msgstr ""
  
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1942
  msgid "revoke key or selected subkeys"
 -msgstr "撤銷金鑰或所選的子鑰"
 +msgstr ""
  
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1944
  msgid "enable key"
 -msgstr "啟用金鑰"
 +msgstr ""
  
- #: g10/keyedit.c:1944
++#: g10/keyedit.c:1945
  msgid "disable key"
 -msgstr "停用金鑰"
 +msgstr ""
  
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1947
  msgid "show selected photo IDs"
 -msgstr "顯示所選的照片 ID"
 +msgstr ""
  
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1949
  msgid "compact unusable user IDs and remove unusable signatures from key"
 -msgstr "從金鑰中精簡無法使用的使用者 ID 並移除無法使用的簽章"
 +msgstr ""
  
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:1951
  msgid "compact unusable user IDs and remove all signatures from key"
 -msgstr "從金鑰中精簡無法使用的使用者 ID 並移除所有的簽章"
 +msgstr ""
  
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2063
  msgid "Secret key is available.\n"
 -msgstr "私鑰可用.\n"
 +msgstr ""
  
- #: g10/keyedit.c:2162
++#: g10/keyedit.c:2163
  msgid "Need the secret key to do this.\n"
 -msgstr "要有私鑰纔能這麼做.\n"
 +msgstr ""
  
- #: g10/keyedit.c:2183
++#: g10/keyedit.c:2184
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
  "  a 't' for trust signatures (tsign), an 'nr' for non-revocable signatures\n"
  "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
  msgstr ""
 -"* 這個 'sign' 指令也可以在前面加上一個 'l' 字母, 來表示本機簽章 (lsign),\n"
 -"  加上 't' 的話就是信任簽章 (tsign), 加上 'nr' 的話就是不可撤銷簽章\n"
 -"  (nrsign), 當然也可以任意組合這些選項 (像是 ltsign, tnrsign 等等.).\n"
  
- #: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
++#: g10/keyedit.c:2240 g10/keyedit.c:3178 g10/keyedit.c:3317 g10/keyedit.c:3379
  msgid "Key is revoked."
 -msgstr "金鑰已撤銷."
 +msgstr ""
  
- #: g10/keyedit.c:2262
++#: g10/keyedit.c:2263
  msgid "Really sign all user IDs? (y/N) "
 -msgstr "真的要簽署所有的使用者 ID 嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:2266
 -#, fuzzy
 -#| msgid "Really sign all user IDs? (y/N) "
++#: g10/keyedit.c:2267
  msgid "Really sign all text user IDs? (y/N) "
 -msgstr "真的要簽署所有的使用者 ID 嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2275
  msgid "Hint: Select the user IDs to sign\n"
 -msgstr "提示: 選擇使用者 ID 來加以簽署\n"
 +msgstr ""
  
- #: g10/keyedit.c:2285
++#: g10/keyedit.c:2286
  #, c-format
  msgid "Unknown signature type '%s'\n"
 -msgstr "未知的簽章種類 '%s'\n"
 +msgstr ""
  
- #: g10/keyedit.c:2309
++#: g10/keyedit.c:2310
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
 -msgstr "在 %s 模式中不允許使用這個指令.\n"
 +msgstr ""
  
- #: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
++#: g10/keyedit.c:2332 g10/keyedit.c:2356 g10/keyedit.c:2550
  msgid "You must select at least one user ID.\n"
 -msgstr "你至少得選擇一個使用者 ID.\n"
 +msgstr ""
  
- #: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
++#: g10/keyedit.c:2334 g10/keyedit.c:2358 g10/keyedit.c:2512 g10/keyedit.c:2552
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2336
++#: g10/keyedit.c:2337
  msgid "You can't delete the last user ID!\n"
 -msgstr "你不能刪除最後一個使用者 ID!\n"
 +msgstr ""
  
- #: g10/keyedit.c:2339
++#: g10/keyedit.c:2340
  msgid "Really remove all selected user IDs? (y/N) "
 -msgstr "真的要移除所有被選擇的使用者 ID 嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:2340
++#: g10/keyedit.c:2341
  msgid "Really remove this user ID? (y/N) "
 -msgstr "真的要移除這個使用者 ID 嗎? (y/N) "
 +msgstr ""
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2397
++#: g10/keyedit.c:2398
  msgid "Really move the primary key? (y/N) "
 -msgstr "真的要移動主鑰嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:2409 g10/keyedit.c:4866
++#: g10/keyedit.c:2410 g10/keyedit.c:4964
  msgid "You must select exactly one key.\n"
 -msgstr "你一定祇得選擇一把金鑰.\n"
 +msgstr ""
  
- #: g10/keyedit.c:2436
++#: g10/keyedit.c:2437
  msgid "Command expects a filename argument\n"
 -msgstr "這項指令要拿一個檔名來當作引數\n"
 +msgstr ""
  
- #: g10/keyedit.c:2457
++#: g10/keyedit.c:2458
  #, c-format
  msgid "Can't open '%s': %s\n"
 -msgstr "無法開啟 '%s': %s\n"
 +msgstr ""
  
- #: g10/keyedit.c:2474
++#: g10/keyedit.c:2475
  #, c-format
  msgid "Error reading backup key from '%s': %s\n"
 -msgstr "從 '%s' 讀取備份金鑰時出錯: %s\n"
 +msgstr ""
  
- #: g10/keyedit.c:2509
++#: g10/keyedit.c:2510
  msgid "You must select at least one key.\n"
 -msgstr "你至少得選擇一把金鑰.\n"
 +msgstr ""
  
- #: g10/keyedit.c:2515
++#: g10/keyedit.c:2516
  msgid "Do you really want to delete the selected keys? (y/N) "
 -msgstr "你真的想要刪除所選的金鑰嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:2517
++#: g10/keyedit.c:2518
  msgid "Do you really want to delete this key? (y/N) "
 -msgstr "你真的想要刪除這把金鑰嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:2555
++#: g10/keyedit.c:2556
  msgid "Really revoke all selected user IDs? (y/N) "
 -msgstr "真的要撤銷所有所選的使用者 ID 嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:2556
++#: g10/keyedit.c:2557
  msgid "Really revoke this user ID? (y/N) "
 -msgstr "真的要撤銷這個使用者 ID 嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2575
  msgid "Do you really want to revoke the entire key? (y/N) "
 -msgstr "你真的想要撤銷這整把金鑰嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:2585
++#: g10/keyedit.c:2586
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
 -msgstr "你真的想要撤銷所選的子鑰嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:2587
++#: g10/keyedit.c:2588
  msgid "Do you really want to revoke this subkey? (y/N) "
 -msgstr "你真的想要撤銷這把子鑰嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:2645
++#: g10/keyedit.c:2646
  msgid "Owner trust may not be set while using a user provided trust database\n"
 -msgstr "使用使用者所提供的信任資料庫時可能無法設定主觀信任\n"
 +msgstr ""
  
- #: g10/keyedit.c:2690
++#: g10/keyedit.c:2691
  msgid "Set preference list to:\n"
 -msgstr "設定偏好清單至:\n"
 +msgstr ""
  
- #: g10/keyedit.c:2697
++#: g10/keyedit.c:2698
  msgid "Really update the preferences for the selected user IDs? (y/N) "
 -msgstr "真的要更新所選使用者 ID 的偏好設定嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:2699
++#: g10/keyedit.c:2700
  msgid "Really update the preferences? (y/N) "
 -msgstr "真的要更新偏好設定嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:2773
++#: g10/keyedit.c:2774
  msgid "Save changes? (y/N) "
 -msgstr "要儲存變更嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:2777
++#: g10/keyedit.c:2778
  msgid "Quit without saving? (y/N) "
 -msgstr "要不儲存就離開嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
- #: g10/keyedit.c:3267 g10/keyedit.c:3332
++#: g10/keyedit.c:2789 g10/keyedit.c:2799 g10/keyedit.c:2943 g10/keyedit.c:3046
++#: g10/keyedit.c:3268 g10/keyedit.c:3333 g10/keyedit.c:3409
  #, c-format
  msgid "update failed: %s\n"
 -msgstr "更新失敗: %s\n"
 +msgstr ""
  
- #: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
++#: g10/keyedit.c:2805 g10/keyedit.c:3273 g10/keyedit.c:3338 g10/keyedit.c:3416
  msgid "Key not changed so no update needed.\n"
 -msgstr "金鑰沒有變更所以不需要更新.\n"
 +msgstr ""
  
- #: g10/keyedit.c:3038
 -#, fuzzy, c-format
 -#| msgid "Key generation failed: %s\n"
++#: g10/keyedit.c:3039
 +#, c-format
  msgid "User ID revocation failed: %s\n"
 -msgstr "產生金鑰失敗: %s\n"
 +msgstr ""
  
- #: g10/keyedit.c:3083
++#: g10/keyedit.c:3084
  #, c-format
  msgid "\"%s\" is not a fingerprint\n"
 -msgstr "\"%s\" 不是指紋\n"
 +msgstr ""
  
- #: g10/keyedit.c:3112
++#: g10/keyedit.c:3113
  #, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
 -msgstr "\"%s\" 不是主要指紋\n"
 +msgstr ""
  
- #: g10/keyedit.c:3248 g10/keyedit.c:3251
 -#, fuzzy, c-format
 -#| msgid "invalid value\n"
++#: g10/keyedit.c:3249 g10/keyedit.c:3252
 +#, c-format
  msgid "Invalid user ID '%s': %s\n"
 -msgstr "無效的數值\n"
 +msgstr ""
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  msgid "No matching user IDs."
 -msgstr "沒有相符的使用者 ID."
 +msgstr ""
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  msgid "Nothing to sign.\n"
 -msgstr "沒有東西可以簽署.\n"
 +msgstr ""
  
- #: g10/keyedit.c:3427
 -#, fuzzy, c-format
 -#| msgid "'%s' is not a valid signature expiration\n"
++#: g10/keyedit.c:3388
++#, c-format
+ msgid "'%s' is not a valid expiration time\n"
 -msgstr "'%s' 不是有效的簽章使用期限\n"
++msgstr ""
+ 
++#: g10/keyedit.c:3508
  msgid "Digest: "
 -msgstr "摘要: "
 +msgstr ""
  
- #: g10/keyedit.c:3484
++#: g10/keyedit.c:3565
  msgid "Features: "
 -msgstr "特點: "
 +msgstr ""
  
- #: g10/keyedit.c:3495
++#: g10/keyedit.c:3576
  msgid "Keyserver no-modify"
 -msgstr "金鑰伺服器無修改"
 +msgstr ""
  
- #: g10/keyedit.c:3510 g10/keylist.c:377
++#: g10/keyedit.c:3591 g10/keylist.c:377
  msgid "Preferred keyserver: "
 -msgstr "偏好的金鑰伺服器: "
 +msgstr ""
  
- #: g10/keyedit.c:3518 g10/keyedit.c:3519
++#: g10/keyedit.c:3599 g10/keyedit.c:3600
  msgid "Notations: "
 -msgstr "註記: "
 +msgstr ""
  
- #: g10/keyedit.c:3764
++#: g10/keyedit.c:3845
  msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 -msgstr "PGP 2.x 型態的使用者 ID 沒有偏好設定.\n"
 +msgstr ""
  
- #: g10/keyedit.c:3836
++#: g10/keyedit.c:3917
  #, c-format
  msgid "The following key was revoked on %s by %s key %s\n"
 -msgstr "下列金鑰已經在 %s 時被 %s 金鑰 %s 所撤銷\n"
 +msgstr ""
  
- #: g10/keyedit.c:3860
++#: g10/keyedit.c:3941
  #, c-format
  msgid "This key may be revoked by %s key %s"
 -msgstr "這把金鑰可能被 %s 金鑰 %s 所撤銷"
 +msgstr ""
  
- #: g10/keyedit.c:3866
++#: g10/keyedit.c:3947
  msgid "(sensitive)"
 -msgstr "(機密)"
 +msgstr ""
  
- #: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3989 g10/keyedit.c:4131 g10/keylist.c:262 g10/keyserver.c:538
  #, c-format
  msgid "created: %s"
 -msgstr "建立: %s"
 +msgstr ""
  
- #: g10/keyedit.c:3911 g10/keylist.c:1852
++#: g10/keyedit.c:3992 g10/keylist.c:1852
  #, c-format
  msgid "revoked: %s"
 -msgstr "撤銷: %s"
 +msgstr ""
  
- #: g10/keyedit.c:3913 g10/keylist.c:1858
 -#  of subkey
++#: g10/keyedit.c:3994 g10/keylist.c:1858
  #, c-format
  msgid "expired: %s"
 -msgstr "過期: %s"
 +msgstr ""
  
- #: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
 -#  of subkey
++#: g10/keyedit.c:3996 g10/keyedit.c:4133 g10/keylist.c:264 g10/keylist.c:1864
 +#: g10/keyserver.c:544
  #, c-format
  msgid "expires: %s"
 -msgstr "到期: %s"
 +msgstr ""
  
- #: g10/keyedit.c:3917
++#: g10/keyedit.c:3998
  #, c-format
  msgid "usage: %s"
 -msgstr "用途: %s"
 +msgstr ""
  
- #: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
++#: g10/keyedit.c:4006 g10/keyedit.c:4026 g10/keylist.c:267
  msgid "card-no: "
 -msgstr "卡片編號: "
 +msgstr ""
  
- #: g10/keyedit.c:3984
++#: g10/keyedit.c:4065
  #, c-format
  msgid "trust: %s"
 -msgstr "信任: %s"
 +msgstr ""
  
- #: g10/keyedit.c:3988
++#: g10/keyedit.c:4069
  #, c-format
  msgid "validity: %s"
 -msgstr "有效性: %s"
 +msgstr ""
  
- #: g10/keyedit.c:3995
++#: g10/keyedit.c:4076
  msgid "This key has been disabled"
 -msgstr "這把金鑰已經停用了"
 +msgstr ""
  
- #: g10/keyedit.c:4013
++#: g10/keyedit.c:4094
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
  msgstr ""
 -"請注意顯示出來的金鑰有效性不需要更正,\n"
 -"除非你重新執行程式.\n"
  
- #: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
- #: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: g10/keyedit.c:4150 g10/keyedit.c:4581 g10/keyserver.c:548
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:712
 +#: dirmngr/ocsp.c:703
  msgid "revoked"
 -msgstr "已撤銷"
 +msgstr ""
  
- #: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
- #: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4152 g10/keyedit.c:4583 g10/keyserver.c:552
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:714
  msgid "expired"
 -msgstr "已過期"
 +msgstr ""
  
- #: g10/keyedit.c:4188
++#: g10/keyedit.c:4269
  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 ""
 -"警告: 沒有任何使用者 ID 被標示為主要 ID. 這項指令可能會\n"
 -"      導致不同的使用者 ID 被當成主要 ID.\n"
  
- #: g10/keyedit.c:4240
++#: g10/keyedit.c:4321
  msgid "WARNING: Your encryption subkey expires soon.\n"
 -msgstr "警告: 你的加密子鑰很快將到期.\n"
 +msgstr ""
  
- #: g10/keyedit.c:4241
++#: g10/keyedit.c:4322
  msgid "You may want to change its expiration date too.\n"
 -msgstr "你可能也會想變更其使用期限.\n"
 +msgstr ""
  
- #: g10/keyedit.c:4300
++#: g10/keyedit.c:4381
  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 ""
 -"警告: 這是一把 PGP2 型態的金鑰.\n"
 -"      增加照片 ID 可能會導致某些版本的 PGP 駁回這把金鑰.\n"
  
- #: g10/keyedit.c:4305 g10/keyedit.c:4595
++#: g10/keyedit.c:4386 g10/keyedit.c:4676
  msgid "Are you sure you still want to add it? (y/N) "
 -msgstr "你確定仍然想要增加嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:4311
++#: g10/keyedit.c:4392
  msgid "You may not add a photo ID to a PGP2-style key.\n"
 -msgstr "你不可以把照片 ID 增加到 PGP2 型態的金鑰裡.\n"
 +msgstr ""
  
- #: g10/keyedit.c:4326 g10/keygen.c:2697
++#: g10/keyedit.c:4407 g10/keygen.c:2719
  msgid "Such a user ID already exists on this key!\n"
 -msgstr "這把金鑰上已經有這樣子的使用者 ID 了!\n"
 +msgstr ""
  
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4509
  msgid "Delete this good signature? (y/N/q)"
 -msgstr "刪除這份完好的簽章嗎? (y/N/q)"
 +msgstr ""
  
- #: g10/keyedit.c:4438
++#: g10/keyedit.c:4519
  msgid "Delete this invalid signature? (y/N/q)"
 -msgstr "刪除這份無效的簽章嗎? (y/N/q)"
 +msgstr ""
  
- #: g10/keyedit.c:4442
++#: g10/keyedit.c:4523
  msgid "Delete this unknown signature? (y/N/q)"
 -msgstr "刪除這份未知的簽章嗎? (y/N/q)"
 +msgstr ""
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4530
  msgid "Really delete this self-signature? (y/N)"
 -msgstr "真的要刪除這份自我簽章嗎? (y/N)"
 +msgstr ""
  
- #: g10/keyedit.c:4465
 -#, fuzzy, c-format
 -#| msgid "Deleted %d signature.\n"
++#: g10/keyedit.c:4546
 +#, c-format
  msgid "Deleted %d signature.\n"
  msgid_plural "Deleted %d signatures.\n"
 -msgstr[0] "已經刪除了 %d 份簽章.\n"
 +msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/keyedit.c:4469
++#: g10/keyedit.c:4550
  msgid "Nothing deleted.\n"
 -msgstr "沒有刪除任何東西.\n"
 +msgstr ""
  
- #: g10/keyedit.c:4504 g10/trust.c:693
++#: g10/keyedit.c:4585 g10/trust.c:716
  msgid "invalid"
 -msgstr "無效"
 +msgstr ""
  
- #: g10/keyedit.c:4506
++#: g10/keyedit.c:4587
  #, c-format
  msgid "User ID \"%s\" compacted: %s\n"
 -msgstr "使用者 ID \"%s\" 已精簡: %s\n"
 +msgstr ""
  
- #: g10/keyedit.c:4512
 -#, fuzzy, c-format
 -#| msgid "User ID \"%s\": %d signature removed\n"
++#: g10/keyedit.c:4593
 +#, 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"
 +msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/keyedit.c:4520
++#: g10/keyedit.c:4601
  #, c-format
  msgid "User ID \"%s\": already minimized\n"
 -msgstr "使用者 ID \"%s\": 已經最小化了\n"
 +msgstr ""
  
- #: g10/keyedit.c:4521
++#: g10/keyedit.c:4602
  #, c-format
  msgid "User ID \"%s\": already clean\n"
 -msgstr "使用者 ID \"%s\": 已經是乾淨的了\n"
 +msgstr ""
  
- #: g10/keyedit.c:4590
++#: g10/keyedit.c:4671
  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 ""
 -"警告: 這是一把 PGP2 型態的金鑰.\n"
 -"      增加指定撤銷者可能會導致某些版本的 PGP 駁回這把金鑰.\n"
  
- #: g10/keyedit.c:4601
++#: g10/keyedit.c:4682
  msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 -msgstr "你不可以把指定撤銷者增加到 PGP2 型態的金鑰裡.\n"
 +msgstr ""
  
- #: g10/keyedit.c:4618
++#: g10/keyedit.c:4699
  msgid "Enter the user ID of the designated revoker: "
 -msgstr "輸入指定撤銷者的使用者 ID: "
 +msgstr ""
  
- #: g10/keyedit.c:4643
++#: g10/keyedit.c:4724
  msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 -msgstr "無法將 PGP 2.x 型態的金鑰指派為指定撤銷者\n"
 +msgstr ""
  
- #: g10/keyedit.c:4658
 -#  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:4739
  msgid "you cannot appoint a key as its own designated revoker\n"
 -msgstr "你不能指派某把金鑰為它自己的指定撤銷者\n"
 +msgstr ""
  
- #: g10/keyedit.c:4680
++#: g10/keyedit.c:4761
  msgid "this key has already been designated as a revoker\n"
 -msgstr "已指定這把金鑰為撤銷者了\n"
 +msgstr ""
  
- #: g10/keyedit.c:4698
++#: g10/keyedit.c:4779
  msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 -msgstr "警告: 一旦把某把金鑰指派為指定撤銷者後, 就無法反悔了!\n"
 +msgstr ""
  
- #: g10/keyedit.c:4704
++#: g10/keyedit.c:4785
  msgid ""
  "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 -msgstr "你確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:4755
 -#, fuzzy
 -#| msgid ""
 -#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
++#: g10/keyedit.c:4848
  msgid ""
  "Are you sure you want to change the expiration time for multiple subkeys? (y/"
  "N) "
 -msgstr "你確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:4760
++#: g10/keyedit.c:4853
  msgid "Changing expiration time for a subkey.\n"
 -msgstr "正在變更子鑰的使用期限.\n"
 +msgstr ""
  
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:4856
  msgid "Changing expiration time for the primary key.\n"
 -msgstr "正在變更主鑰的使用期限.\n"
 +msgstr ""
  
- #: g10/keyedit.c:4814
++#: g10/keyedit.c:4910
  msgid "You can't change the expiration date of a v3 key\n"
 -msgstr "你不能變更 v3 金鑰的使用期限\n"
 +msgstr ""
  
- #: g10/keyedit.c:4987
++#: g10/keyedit.c:5085
  #, c-format
  msgid "signing subkey %s is already cross-certified\n"
 -msgstr "簽署子鑰 %s 已經交叉認證過了\n"
 +msgstr ""
  
- #: g10/keyedit.c:4993
++#: g10/keyedit.c:5091
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 -msgstr "子鑰 %s 不做簽署之用, 因此無須交叉驗證\n"
 +msgstr ""
  
- #: g10/keyedit.c:5108
++#: g10/keyedit.c:5206
  msgid "Please select exactly one user ID.\n"
 -msgstr "請祇選擇一個使用者 ID.\n"
 +msgstr ""
  
- #: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
++#: g10/keyedit.c:5247 g10/keyedit.c:5361 g10/keyedit.c:5474 g10/keyedit.c:5611
  #, c-format
  msgid "skipping v3 self-signature on user ID \"%s\"\n"
 -msgstr "正在跳過使用者 ID \"%s\" 的 v3 自我簽章\n"
 +msgstr ""
  
- #: g10/keyedit.c:5320
++#: g10/keyedit.c:5418
  msgid "Enter your preferred keyserver URL: "
 -msgstr "請輸入你的偏好金鑰伺服器 URL: "
 +msgstr ""
  
- #: g10/keyedit.c:5399
++#: g10/keyedit.c:5497
  msgid "Are you sure you want to replace it? (y/N) "
 -msgstr "你確定要取代它嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:5400
++#: g10/keyedit.c:5498
  msgid "Are you sure you want to delete it? (y/N) "
 -msgstr "你確定要刪除它嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:5459
++#: g10/keyedit.c:5557
  msgid "Enter the notation: "
 -msgstr "請輸入註記: "
 +msgstr ""
  
- #: g10/keyedit.c:5606
++#: g10/keyedit.c:5704
  msgid "Proceed? (y/N) "
 -msgstr "是否繼續? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:5676
++#: g10/keyedit.c:5774
  #, c-format
  msgid "No user ID with index %d\n"
 -msgstr "索引 %d 沒有對應到使用者 ID\n"
 +msgstr ""
  
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5836
  #, c-format
  msgid "No user ID with hash %s\n"
 -msgstr "雜湊 %s 沒有對應到使用者 ID\n"
 +msgstr ""
  
- #: g10/keyedit.c:5839
 -#, fuzzy, c-format
 -#| msgid "No subkey with index %d\n"
++#: g10/keyedit.c:5937
 +#, c-format
  msgid "No subkey with key ID '%s'.\n"
 -msgstr "索引 %d 沒有對應到子鑰\n"
 +msgstr ""
  
- #: g10/keyedit.c:5861
++#: g10/keyedit.c:5959
  #, c-format
  msgid "No subkey with index %d\n"
 -msgstr "索引 %d 沒有對應到子鑰\n"
 +msgstr ""
  
- #: g10/keyedit.c:6002
++#: g10/keyedit.c:6100
  #, c-format
  msgid "user ID: \"%s\"\n"
 -msgstr "使用者 ID: \"%s\"\n"
 +msgstr ""
  
- #: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
++#: g10/keyedit.c:6103 g10/keyedit.c:6205 g10/keyedit.c:6253
  #, c-format
  msgid "signed by your key %s on %s%s%s\n"
 -msgstr "已被你的金鑰 %s 於 %s%s%s 所簽署\n"
 +msgstr ""
  
- #: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
++#: g10/keyedit.c:6105 g10/keyedit.c:6207 g10/keyedit.c:6255
  msgid " (non-exportable)"
 -msgstr " (不可匯出)"
 +msgstr ""
  
- #: g10/keyedit.c:6011
++#: g10/keyedit.c:6109
  #, c-format
  msgid "This signature expired on %s.\n"
 -msgstr "這份簽章已經在 %s 過期了.\n"
 +msgstr ""
  
- #: g10/keyedit.c:6016
++#: g10/keyedit.c:6114
  msgid "Are you sure you still want to revoke it? (y/N) "
 -msgstr "你確定仍然想要撤銷它嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:6021
++#: g10/keyedit.c:6119
  msgid "Create a revocation certificate for this signature? (y/N) "
 -msgstr "要為這份簽章建立一份撤銷憑證嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6173
  msgid "Not signed by you.\n"
 -msgstr "並非由你所簽署.\n"
 +msgstr ""
  
- #: g10/keyedit.c:6081
++#: g10/keyedit.c:6179
  #, c-format
  msgid "You have signed these user IDs on key %s:\n"
 -msgstr "你已經簽署了金鑰 %s 上的這些使用者 ID:\n"
 +msgstr ""
  
- #: g10/keyedit.c:6110
++#: g10/keyedit.c:6208
  msgid " (non-revocable)"
 -msgstr " (不可撤銷)"
 +msgstr ""
  
- #: g10/keyedit.c:6117
++#: g10/keyedit.c:6215
  #, c-format
  msgid "revoked by your key %s on %s\n"
 -msgstr "被你的金鑰 %s 於 %s 所撤銷了\n"
 +msgstr ""
  
- #: g10/keyedit.c:6142
++#: g10/keyedit.c:6240
  msgid "You are about to revoke these signatures:\n"
 -msgstr "你正要撤銷這些簽章:\n"
 +msgstr ""
  
- #: g10/keyedit.c:6165
++#: g10/keyedit.c:6263
  msgid "Really create the revocation certificates? (y/N) "
 -msgstr "真的要建立撤銷憑證嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:6198
++#: g10/keyedit.c:6296
  msgid "no secret key\n"
 -msgstr "沒有私鑰\n"
 +msgstr ""
  
- #: g10/keyedit.c:6246
++#: g10/keyedit.c:6344
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6256
++#: g10/keyedit.c:6354
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
 -msgstr "使用者 ID \"%s\" 已撤銷\n"
 +msgstr ""
  
- #: g10/keyedit.c:6273
++#: g10/keyedit.c:6371
  #, c-format
  msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 -msgstr "警告: 有一份使用者 ID 的簽章日期為 %d 秒後的未來\n"
 +msgstr ""
  
- #: g10/keyedit.c:6386
++#: g10/keyedit.c:6485
  #, c-format
  msgid "Key %s is already revoked.\n"
 -msgstr "金鑰 %s 已撤銷.\n"
 +msgstr ""
  
- #: g10/keyedit.c:6448
++#: g10/keyedit.c:6547
  #, c-format
  msgid "Subkey %s is already revoked.\n"
 -msgstr "子鑰 %s 已撤銷.\n"
 +msgstr ""
  
- #: g10/keyedit.c:6545
++#: g10/keyedit.c:6644
  #, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 -msgstr "正在顯示 %s 照片 ID, 其尺寸為 %ld, 屬於金鑰 %s (uid %d) 的照片\n"
 +msgstr ""
  
- #: g10/keygen.c:305
++#: g10/keygen.c:316
  #, c-format
  msgid "preference '%s' duplicated\n"
 -msgstr "偏好設定 '%s' 重複了\n"
 +msgstr ""
  
- #: g10/keygen.c:312
++#: g10/keygen.c:323
  msgid "too many cipher preferences\n"
 -msgstr "編密偏好過多\n"
 +msgstr ""
  
- #: g10/keygen.c:314
++#: g10/keygen.c:325
  msgid "too many digest preferences\n"
 -msgstr "摘要偏好過多\n"
 +msgstr ""
  
- #: g10/keygen.c:316
++#: g10/keygen.c:327
  msgid "too many compression preferences\n"
 -msgstr "壓縮偏好過多\n"
 +msgstr ""
  
- #: g10/keygen.c:457
++#: g10/keygen.c:468
  #, c-format
  msgid "invalid item '%s' in preference string\n"
 -msgstr "偏好字串中含有無效的項目 '%s'\n"
 +msgstr ""
  
- #: g10/keygen.c:936
++#: g10/keygen.c:947
  msgid "writing direct signature\n"
 -msgstr "寫入直接簽章中\n"
 +msgstr ""
  
- #: g10/keygen.c:982
++#: g10/keygen.c:993
  msgid "writing self signature\n"
 -msgstr "寫入自我簽章中\n"
 +msgstr ""
  
- #: g10/keygen.c:1038
++#: g10/keygen.c:1049
  msgid "writing key binding signature\n"
 -msgstr "寫入附鑰簽章中\n"
 +msgstr ""
  
- #: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
- #: g10/keygen.c:1610 g10/keygen.c:1615
++#: g10/keygen.c:1413 g10/keygen.c:1418 g10/keygen.c:1470 g10/keygen.c:1475
++#: g10/keygen.c:1622 g10/keygen.c:1627
  #, c-format
  msgid "keysize invalid; using %u bits\n"
 -msgstr "金鑰尺寸無效; 改用 %u 位元\n"
 +msgstr ""
  
- #: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
++#: g10/keygen.c:1424 g10/keygen.c:1481 g10/keygen.c:1489 g10/keygen.c:1633
  #, c-format
  msgid "keysize rounded up to %u bits\n"
 -msgstr "金鑰尺寸增大到 %u 位元\n"
 +msgstr ""
  
- #: g10/keygen.c:1503
++#: g10/keygen.c:1515
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 -msgstr "警告: 某些 OpenPGP 程式無法處理具有此摘要尺寸的 DSA 金鑰\n"
 +msgstr ""
  
- #: g10/keygen.c:1677
++#: g10/keygen.c:1689
  msgid "Sign"
 -msgstr "簽署"
 +msgstr ""
  
- #: g10/keygen.c:1680
++#: g10/keygen.c:1692
  msgid "Certify"
 -msgstr "保證"
 +msgstr ""
  
- #: g10/keygen.c:1683
++#: g10/keygen.c:1695
  msgid "Encrypt"
 -msgstr "加密"
 +msgstr ""
  
- #: g10/keygen.c:1686
++#: g10/keygen.c:1698
  msgid "Authenticate"
 -msgstr "鑑定"
 +msgstr ""
  
  #. TRANSLATORS: Please use only plain ASCII characters for the
  #. translation.  If this is not possible use single digits.  The
@@@ -4609,150 -3685,119 +4558,150 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1705
++#: g10/keygen.c:1717
  msgid "SsEeAaQq"
 -msgstr "SsEeAaQq"
 +msgstr ""
  
- #: g10/keygen.c:1732
++#: g10/keygen.c:1744
  #, c-format
  msgid "Possible actions for a %s key: "
 -msgstr "%s 金鑰可能的動作: "
 +msgstr ""
  
- #: g10/keygen.c:1738
++#: g10/keygen.c:1750
  msgid "Current allowed actions: "
 -msgstr "目前可進行的動作: "
 +msgstr ""
  
- #: g10/keygen.c:1743
++#: g10/keygen.c:1755
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
 -msgstr "   (%c) 切換簽署性能\n"
 +msgstr ""
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
 -msgstr "   (%c) 切換加密性能\n"
 +msgstr ""
  
- #: g10/keygen.c:1749
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
 -msgstr "   (%c) 切換鑑定性能\n"
 +msgstr ""
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Finished\n"
 -msgstr "   (%c) 已完成\n"
 +msgstr ""
  
- #: g10/keygen.c:1881 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1893 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
 -msgstr "請選擇你要使用的金鑰種類:\n"
 +msgstr ""
  
- #: g10/keygen.c:1885
++#: g10/keygen.c:1897
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
 -msgstr "   (%d) RSA 和 RSA (預設)\n"
 +msgstr ""
  
- #: g10/keygen.c:1889
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
 -msgstr "   (%d) DSA 和 Elgamal\n"
 +msgstr ""
  
- #: g10/keygen.c:1892
++#: g10/keygen.c:1904
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
 -msgstr "   (%d) DSA (僅能用於簽署)\n"
 +msgstr ""
  
- #: g10/keygen.c:1894
++#: g10/keygen.c:1906
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
 -msgstr "   (%d) RSA (僅能用於簽署)\n"
 +msgstr ""
  
- #: g10/keygen.c:1900
++#: g10/keygen.c:1912
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
 -msgstr "   (%d) Elgamal (僅能用於加密)\n"
 +msgstr ""
  
- #: g10/keygen.c:1902
++#: g10/keygen.c:1914
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
 -msgstr "   (%d) RSA (僅能用於加密)\n"
 +msgstr ""
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1920
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
 -msgstr "   (%d) DSA (你能自己設定性能)\n"
 +msgstr ""
  
- #: g10/keygen.c:1910
++#: g10/keygen.c:1922
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
 -msgstr "   (%d) RSA (你能自己設定性能)\n"
 +msgstr ""
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1928
  #, c-format
  msgid "   (%d) ECC and ECC\n"
 -msgstr "   (%d) ECC 和 ECC\n"
 +msgstr ""
  
- #: g10/keygen.c:1918
++#: g10/keygen.c:1930
  #, c-format
  msgid "  (%d) ECC (sign only)\n"
 -msgstr "   (%d) ECC (僅能用於簽署)\n"
 +msgstr ""
  
- #: g10/keygen.c:1920
++#: g10/keygen.c:1932
  #, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
 -msgstr "   (%d) ECC (你能自己設定性能)\n"
 +msgstr ""
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1934
  #, c-format
  msgid "  (%d) ECC (encrypt only)\n"
 -msgstr "   (%d) ECC (僅能用於加密)\n"
 +msgstr ""
  
- #: g10/keygen.c:1926
++#: g10/keygen.c:1938
  #, c-format
  msgid "  (%d) Existing key\n"
 -msgstr "   (%d) 現有的金鑰\n"
 +msgstr ""
  
- #: g10/keygen.c:2022 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:206
  msgid "Enter the keygrip: "
 -msgstr "請輸入金鑰鑰柄: "
 +msgstr ""
  
- #: g10/keygen.c:2035 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2047 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 -msgstr "不是有效的金鑰鑰柄 (應該要是 40 位十六進制數值)\n"
 +msgstr ""
  
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2049 sm/certreqgen-ui.c:216
  msgid "No key with this keygrip\n"
 -msgstr "沒有金鑰有此金鑰鑰柄\n"
 +msgstr ""
  
- #: g10/keygen.c:2111 g10/keygen.c:2125
++#: g10/keygen.c:2133 g10/keygen.c:2147
  #, c-format
  msgid "rounded to %u bits\n"
 -msgstr "加大到 %u 位元\n"
 +msgstr ""
  
- #: g10/keygen.c:2166
++#: g10/keygen.c:2188
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
 -msgstr "%s 金鑰的長度可能介於 %u 位元和 %u 位元之間.\n"
 +msgstr ""
  
- #: g10/keygen.c:2174
++#: g10/keygen.c:2196
  #, c-format
  msgid "What keysize do you want for the subkey? (%u) "
 -msgstr "你的子鑰想要用多大的金鑰尺寸? (%u) "
 +msgstr ""
  
- #: g10/keygen.c:2177 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2199 sm/certreqgen-ui.c:183
  #, c-format
  msgid "What keysize do you want? (%u) "
 -msgstr "你想要用多大的金鑰尺寸? (%u) "
 +msgstr ""
  
- #: g10/keygen.c:2191 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2213 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
 -msgstr "你所要求的金鑰尺寸是 %u 位元\n"
 +msgstr ""
  
- #: g10/keygen.c:2237
++#: g10/keygen.c:2259
  msgid "Please select which elliptic curve you want:\n"
 -msgstr "請選擇你要使用的橢圓曲線:\n"
 +msgstr ""
  
- #: g10/keygen.c:2409
++#: g10/keygen.c:2431
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -4761,8 -3806,13 +4710,8 @@@
  "      <n>m = key expires in n months\n"
  "      <n>y = key expires in n years\n"
  msgstr ""
 -"請指定這把金鑰的有效期限是多久.\n"
 -"         0 = 金鑰不會過期\n"
 -"      <n>  = 金鑰在 n 天後會到期\n"
 -"      <n>w = 金鑰在 n 週後會到期\n"
 -"      <n>m = 金鑰在 n 月後會到期\n"
 -"      <n>y = 金鑰在 n 年後會到期\n"
  
- #: g10/keygen.c:2420
++#: g10/keygen.c:2442
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -4771,49 -3821,47 +4720,49 @@@
  "      <n>m = signature expires in n months\n"
  "      <n>y = signature expires in n years\n"
  msgstr ""
 -"請指定這份簽章的有效期限是多久.\n"
 -"         0 = 簽章不會過期\n"
 -"      <n>  = 簽章在 n 天後會到期\n"
 -"      <n>w = 簽章在 n 週後會到期\n"
 -"      <n>m = 簽章在 n 月後會到期\n"
 -"      <n>y = 簽章在 n 年後會到期\n"
  
- #: g10/keygen.c:2443
++#: g10/keygen.c:2465
  msgid "Key is valid for? (0) "
 -msgstr "金鑰的有效期限是多久? (0) "
 +msgstr ""
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2470
  #, c-format
  msgid "Signature is valid for? (%s) "
 -msgstr "簽章的有效期限是多久? (%s) "
 +msgstr ""
  
- #: g10/keygen.c:2461 g10/keygen.c:2486
++#: g10/keygen.c:2483 g10/keygen.c:2508
  msgid "invalid value\n"
 -msgstr "無效的數值\n"
 +msgstr ""
  
- #: g10/keygen.c:2468
++#: g10/keygen.c:2490
  msgid "Key does not expire at all\n"
 -msgstr "金鑰完全不會過期\n"
 +msgstr ""
  
- #: g10/keygen.c:2469
++#: g10/keygen.c:2491
  msgid "Signature does not expire at all\n"
 -msgstr "簽章完全不會過期\n"
 +msgstr ""
  
- #: g10/keygen.c:2474
++#: g10/keygen.c:2496
  #, c-format
  msgid "Key expires at %s\n"
 -msgstr "金鑰將會在 %s 到期\n"
 +msgstr ""
  
- #: g10/keygen.c:2475
++#: g10/keygen.c:2497
  #, c-format
  msgid "Signature expires at %s\n"
 -msgstr "簽章將會在 %s 到期.\n"
 +msgstr ""
  
- #: g10/keygen.c:2479
++#: g10/keygen.c:2501
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
  msgstr ""
 -"你的系統無法顯示 2038 年以後的日期.\n"
 -"不過, 它可以正確處理直到 2106 年之前的年份.\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2514
  msgid "Is this correct? (y/N) "
 -msgstr "以上正確嗎? (y/N) "
 +msgstr ""
  
- #: g10/keygen.c:2560
++#: g10/keygen.c:2582
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -4824,7 -3875,6 +4773,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2575
++#: g10/keygen.c:2597
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -4833,60 -3883,56 +4782,60 @@@
  "    \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
  "\n"
  msgstr ""
 -"\n"
 -"你需要一個使用者 ID 來辨識你的金鑰; 這個軟體會用真實姓名,\n"
 -"註釋和電子郵件地址組合成使用者 ID 如下:\n"
 -"    \"Ke-Huan Lin (Jedi) <Jedi at Jedi.org>\"\n"
 -"\n"
  
- #: g10/keygen.c:2594
++#: g10/keygen.c:2616
  msgid "Real name: "
 -msgstr "真實姓名: "
 +msgstr ""
  
- #: g10/keygen.c:2603
++#: g10/keygen.c:2625
  msgid "Invalid character in name\n"
 -msgstr "姓名含有無效的字符\n"
 +msgstr ""
  
- #: g10/keygen.c:2604
++#: g10/keygen.c:2626
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2608
++#: g10/keygen.c:2630
  msgid "Name may not start with a digit\n"
 -msgstr "姓名不可以用數字開頭\n"
 +msgstr ""
  
- #: g10/keygen.c:2611
++#: g10/keygen.c:2633
  msgid "Name must be at least 5 characters long\n"
 -msgstr "姓名至少要有五個字符長\n"
 +msgstr ""
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2643
  msgid "Email address: "
 -msgstr "電子郵件地址: "
 +msgstr ""
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2649
  msgid "Not a valid email address\n"
 -msgstr "不是有效的電子郵件地址\n"
 +msgstr ""
  
- #: g10/keygen.c:2636
++#: g10/keygen.c:2658
  msgid "Comment: "
 -msgstr "註釋: "
 +msgstr ""
  
- #: g10/keygen.c:2642
++#: g10/keygen.c:2664
  msgid "Invalid character in comment\n"
 -msgstr "註釋含有無效的字符\n"
 +msgstr ""
  
- #: g10/keygen.c:2678
++#: g10/keygen.c:2700
  #, c-format
  msgid "You are using the '%s' character set.\n"
 -msgstr "你正在使用 '%s' 字元集.\n"
 +msgstr ""
  
- #: g10/keygen.c:2684
++#: g10/keygen.c:2706
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
  "    \"%s\"\n"
  "\n"
  msgstr ""
 -"你選擇了這個使用者 ID:\n"
 -"    \"%s\"\n"
 -"\n"
  
- #: g10/keygen.c:2689
++#: g10/keygen.c:2711
  msgid "Please don't put the email address into the real name or the comment\n"
 -msgstr "請不要把電子郵件地址放進你的真實姓名或註釋裡\n"
 +msgstr ""
  
  #. TRANSLATORS: These are the allowed answers in
  #. lower and uppercase.  Below you will find the matching
@@@ -4899,197 -3945,164 +4848,197 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2714
++#: g10/keygen.c:2736
  msgid "NnCcEeOoQq"
 -msgstr "NnCcEeOoQq"
 +msgstr ""
  
- #: g10/keygen.c:2724
++#: g10/keygen.c:2746
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 -msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或退出(Q)? "
 +msgstr ""
  
- #: g10/keygen.c:2725
++#: g10/keygen.c:2747
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 -msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或確定(O)/退出(Q)? "
 +msgstr ""
  
- #: g10/keygen.c:2730
++#: g10/keygen.c:2752
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
 -msgstr "變更姓名(N), 電子郵件地址(E)或退出(Q)? "
 +msgstr ""
  
- #: g10/keygen.c:2731
++#: g10/keygen.c:2753
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 -msgstr "變更姓名(N), 電子郵件地址(E)或確定(O)/退出(Q)? "
 +msgstr ""
  
- #: g10/keygen.c:2750
++#: g10/keygen.c:2772
  msgid "Please correct the error first\n"
 -msgstr "請先訂正錯誤\n"
 +msgstr ""
  
- #: g10/keygen.c:2796
++#: g10/keygen.c:2818
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
  "disks) during the prime generation; this gives the random number\n"
  "generator a better chance to gain enough entropy.\n"
  msgstr ""
 -"我們需要產生大量的隨機位元組. 這個時候你可以多做一些事情\n"
 -"(像是敲打鍵盤, 移動滑鼠, 讀寫硬碟之類的)\n"
 -"這會讓隨機數字產生器有更多的機會獲得夠多的亂數.\n"
  
- #: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
- #: g10/keygen.c:4777 g10/keygen.c:4882
++#: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
++#: g10/keygen.c:4330 g10/keygen.c:4803 g10/keygen.c:5064 g10/keygen.c:5169
  #, c-format
  msgid "Key generation failed: %s\n"
 -msgstr "產生金鑰失敗: %s\n"
 +msgstr ""
  
- #: g10/keygen.c:3598
++#: g10/keygen.c:3922
  #, c-format
  msgid ""
  "About to create a key for:\n"
  "    \"%s\"\n"
  "\n"
  msgstr ""
 -"即將建立用於此之金鑰:\n"
 -"    \"%s\"\n"
 -"\n"
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3924
  msgid "Continue? (Y/n) "
 -msgstr "是否繼續? (Y/n) "
 +msgstr ""
  
- #: g10/keygen.c:3621
++#: g10/keygen.c:3945
  #, c-format
  msgid "A key for \"%s\" already exists\n"
 -msgstr "\"%s\" 的金鑰已存在\n"
 +msgstr ""
  
- #: g10/keygen.c:3626
++#: g10/keygen.c:3950
  msgid "Create anyway? (y/N) "
 -msgstr "無論如何還是要建立嗎? (y/N) "
 +msgstr ""
  
- #: g10/keygen.c:3632
++#: g10/keygen.c:3956
  msgid "creating anyway\n"
 -msgstr "總之還是在建立\n"
 +msgstr ""
  
- #: g10/keygen.c:3981
++#: g10/keygen.c:4315
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 -msgstr "請注意: 如需全能金鑰產生對話框請用  \"%s %s\".\n"
 +msgstr ""
  
- #: g10/keygen.c:4013
++#: g10/keygen.c:4358
  msgid "Key generation canceled.\n"
 -msgstr "金鑰產生已取消.\n"
 +msgstr ""
  
- #: g10/keygen.c:4073
++#: g10/keygen.c:4418
  #, c-format
  msgid "can't create backup file '%s': %s\n"
 -msgstr "無法建立備份檔案 '%s': %s\n"
 +msgstr ""
  
- #: g10/keygen.c:4093
++#: g10/keygen.c:4438
  #, c-format
  msgid "Note: backup of card key saved to '%s'\n"
 -msgstr "請注意: 卡片金鑰的備份已儲存至 '%s'\n"
 +msgstr ""
  
- #: g10/keygen.c:4244 g10/keygen.c:4393
++#: g10/keygen.c:4589 g10/keygen.c:4738
  #, c-format
  msgid "writing public key to '%s'\n"
 -msgstr "正在寫入公鑰至 '%s'\n"
 +msgstr ""
  
- #: g10/keygen.c:4387
++#: g10/keygen.c:4732
  #, c-format
  msgid "no writable public keyring found: %s\n"
 -msgstr "找不到可寫入的公鑰鑰匙圈: %s\n"
 +msgstr ""
  
- #: g10/keygen.c:4401
++#: g10/keygen.c:4746
  #, c-format
  msgid "error writing public keyring '%s': %s\n"
 -msgstr "寫入公鑰鑰匙圈 '%s' 時出錯: %s\n"
 +msgstr ""
  
- #: g10/keygen.c:4433
++#: g10/keygen.c:4778
  msgid "public and secret key created and signed.\n"
 -msgstr "公鑰和私鑰已建立及簽署.\n"
 +msgstr ""
  
- #: g10/keygen.c:4445
++#: g10/keygen.c:4790
  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 ""
 -"請注意這把金鑰不能用於加密.  也許你會想藉由 \"--edit-key\" 指令\n"
 -"來產生加密用的子鑰.\n"
  
- #: g10/keygen.c:4649 g10/keygen.c:4833
++#: g10/keygen.c:4936 g10/keygen.c:5120
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
 -msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
 +msgstr ""
  
- #: g10/keygen.c:4651 g10/keygen.c:4835
++#: g10/keygen.c:4938 g10/keygen.c:5122
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
 -msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
 +msgstr ""
  
- #: g10/keygen.c:4662 g10/keygen.c:4846
++#: g10/keygen.c:4949 g10/keygen.c:5133
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 -msgstr "請注意: 對 v3 金鑰製造子鑰不符合 OpenPGP 規範\n"
 +msgstr ""
  
- #: g10/keygen.c:4674 g10/keygen.c:4676
++#: g10/keygen.c:4961 g10/keygen.c:4963
  msgid "Secret parts of primary key are not available.\n"
 -msgstr "主鑰的私鑰部分無法取用.\n"
 +msgstr ""
  
- #: g10/keygen.c:4683 g10/keygen.c:4685
++#: g10/keygen.c:4970 g10/keygen.c:4972
  msgid "Secret parts of primary key are stored on-card.\n"
 -msgstr "主鑰的私鑰部分存放於卡上.\n"
 +msgstr ""
  
- #: g10/keygen.c:4704 g10/keygen.c:4860
++#: g10/keygen.c:4991 g10/keygen.c:5147
  msgid "Really create? (y/N) "
 -msgstr "真的要建立嗎? (y/N) "
 +msgstr ""
  
 +#: g10/keyid.c:664 g10/keyid.c:677 g10/keyid.c:690
  msgid "never     "
 -msgstr "永遠不過期"
 +msgstr ""
  
 +#: g10/keylist.c:331
  msgid "Critical signature policy: "
 -msgstr "關鍵簽章原則: "
 +msgstr ""
  
 +#: g10/keylist.c:333
  msgid "Signature policy: "
 -msgstr "簽章原則: "
 +msgstr ""
  
 +#: g10/keylist.c:375
  msgid "Critical preferred keyserver: "
 -msgstr "執意偏好的金鑰伺服器: "
 +msgstr ""
  
 +#: g10/keylist.c:428
  msgid "Critical signature notation: "
 -msgstr "關鍵簽章註記: "
 +msgstr ""
  
 +#: g10/keylist.c:430
  msgid "Signature notation: "
 -msgstr "簽章註記: "
 +msgstr ""
  
 -#, fuzzy, c-format
 -#| msgid "%d bad signatures\n"
 +#: g10/keylist.c:472
 +#, c-format
  msgid "%d good signature\n"
  msgid_plural "%d good signatures\n"
 -msgstr[0] "%d 份損壞的簽章\n"
 +msgstr[0] ""
 +msgstr[1] ""
  
 -#, fuzzy, c-format
 -#| msgid "1 signature not checked due to an error\n"
 +#: g10/keylist.c:485
 +#, c-format
  msgid "%d signature not checked due to an error\n"
  msgid_plural "%d signatures not checked due to errors\n"
 -msgstr[0] "有 1 份簽章因錯誤而未被檢查\n"
 +msgstr[0] ""
 +msgstr[1] ""
  
 -#, fuzzy, c-format
 -#| msgid "Warning: %lu key(s) skipped due to their large size\n"
 +#: g10/keylist.c:567
 +#, c-format
  msgid "Warning: %lu key skipped due to its large size\n"
  msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
 -msgstr[0] "警告: %lu 把金鑰因尺寸太大已跳過\n"
 +msgstr[0] ""
 +msgstr[1] ""
  
 +#: g10/keylist.c:589
  msgid "Keyring"
 -msgstr "鑰匙圈"
 +msgstr ""
  
 +#: g10/keylist.c:1719
  msgid "Primary key fingerprint:"
 -msgstr "               主鑰指紋:"
 +msgstr ""
  
 +#: g10/keylist.c:1721
  msgid "     Subkey fingerprint:"
 -msgstr "               子鑰指紋:"
 +msgstr ""
  
  #. TRANSLATORS: this should fit into 24 bytes so that the
  #. * fingerprint data is properly aligned with the user ID
@@@ -5156,361 -4157,289 +5105,361 @@@ msgstr "
  msgid "override timeout options set for dirmngr"
  msgstr ""
  
 +#: g10/keyserver.c:100
  msgid "automatically retrieve keys when verifying signatures"
 -msgstr "驗證簽章時自動取回金鑰"
 +msgstr ""
  
 +#: g10/keyserver.c:102
  msgid "honor the preferred keyserver URL set on the key"
 -msgstr "尊重金鑰上所設定的偏好金鑰伺服器 URL"
 +msgstr ""
  
 +#: g10/keyserver.c:104
  msgid "honor the PKA record set on a key when retrieving keys"
 -msgstr "取回金鑰時尊重金鑰所設定的 PKA 記錄"
 +msgstr ""
  
 +#: g10/keyserver.c:550
  msgid "disabled"
 -msgstr "已停用"
 +msgstr ""
  
 +#: g10/keyserver.c:754
  msgid "Enter number(s), N)ext, or Q)uit > "
 -msgstr "請輸入數字, N)下一頁, 或 Q)離開 > "
 +msgstr ""
  
 +#: g10/keyserver.c:860
  #, c-format
  msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 -msgstr "無效的金鑰伺服器協定 (我們用 %d!=經手程式 %d)\n"
 +msgstr ""
  
 +#: g10/keyserver.c:1001 g10/keyserver.c:1116
  #, c-format
  msgid "\"%s\" not a key ID: skipping\n"
 -msgstr "\"%s\" 並非金鑰 ID: 跳過中\n"
 +msgstr ""
  
 -#, fuzzy, c-format
 -#| msgid "refreshing %d keys from %s\n"
 +#: g10/keyserver.c:1421 g10/keyserver.c:1454
 +#, c-format
  msgid "refreshing %d key from %s\n"
  msgid_plural "refreshing %d keys from %s\n"
 -msgstr[0] "更新 %d 份金鑰中 (從 %s )\n"
 +msgstr[0] ""
 +msgstr[1] ""
  
 +#: g10/keyserver.c:1428
  #, c-format
  msgid "WARNING: unable to refresh key %s via %s: %s\n"
 -msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
 +msgstr ""
  
 +#: g10/keyserver.c:1532
  #, c-format
  msgid "key \"%s\" not found on keyserver\n"
 -msgstr "在金鑰伺服器上找不到金鑰 \"%s\"\n"
 +msgstr ""
  
 +#: g10/keyserver.c:1535
  msgid "key not found on keyserver\n"
 -msgstr "在金鑰伺服器上找不到金鑰\n"
 +msgstr ""
  
 +#: g10/keyserver.c:1539
  msgid "no keyserver known (use option --keyserver)\n"
 -msgstr "沒有已知的金鑰伺服器 (使用 --keyserver 選項)\n"
 +msgstr ""
  
 +#: g10/keyserver.c:1704
  #, c-format
  msgid "requesting key %s from %s server %s\n"
 -msgstr "正在請求金鑰 %s 自 %s 伺服器 %s\n"
 +msgstr ""
  
 +#: g10/keyserver.c:1708
  #, c-format
  msgid "requesting key %s from %s\n"
 -msgstr "正在請求金鑰 %s 自 %s\n"
 +msgstr ""
  
 -#, fuzzy
 -#| msgid "invalid keyserver options\n"
 +#: g10/keyserver.c:1809 g10/keyserver.c:1965
  msgid "no keyserver known\n"
 -msgstr "無效的金鑰伺服器選項\n"
 +msgstr ""
  
 +#: g10/keyserver.c:1824 g10/skclist.c:196 g10/skclist.c:224
  #, c-format
  msgid "skipped \"%s\": %s\n"
 -msgstr "已跳過 \"%s\": %s\n"
 +msgstr ""
  
 +#: g10/keyserver.c:1827
  #, c-format
  msgid "sending key %s to %s\n"
 -msgstr "遞送金鑰 %s 至 %s\n"
 +msgstr ""
  
 +#: g10/keyserver.c:1868
  #, c-format
  msgid "requesting key from '%s'\n"
 -msgstr "正在向 '%s' 請求金鑰\n"
 +msgstr ""
  
 +#: g10/keyserver.c:1884
  #, c-format
  msgid "WARNING: unable to fetch URI %s: %s\n"
 -msgstr "警告: 無法抓取 URI %s: %s\n"
 +msgstr ""
  
 +#: g10/mainproc.c:254
  #, c-format
  msgid "weird size for an encrypted session key (%d)\n"
 -msgstr "加密過的階段金鑰 (%d) 尺寸詭異\n"
 +msgstr ""
  
 +#: g10/mainproc.c:302
  #, c-format
  msgid "%s encrypted session key\n"
 -msgstr "%s 加密過的階段金鑰\n"
 +msgstr ""
  
 +#: g10/mainproc.c:312
  #, c-format
  msgid "passphrase generated with unknown digest algorithm %d\n"
 -msgstr "密語係以未知的 %d 摘要演算法所產生\n"
 +msgstr ""
  
 +#: g10/mainproc.c:378
  #, c-format
  msgid "public key is %s\n"
 -msgstr "公鑰為 %s\n"
 +msgstr ""
  
 +#: g10/mainproc.c:456
  msgid "public key encrypted data: good DEK\n"
 -msgstr "公鑰加密過的資料: 完好的 DEK\n"
 +msgstr ""
  
 +#: g10/mainproc.c:489
  #, c-format
  msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 -msgstr "已用 %u 位元長的 %s 金鑰,  ID %s, 建立於 %s 所加密\n"
 +msgstr ""
  
 +#: g10/mainproc.c:493 g10/pkclist.c:228
  #, c-format
  msgid "      \"%s\"\n"
 -msgstr "      \"%s\"\n"
 +msgstr ""
  
 +#: g10/mainproc.c:497
  #, c-format
  msgid "encrypted with %s key, ID %s\n"
 -msgstr "已用 %s 金鑰, ID %s 所加密\n"
 +msgstr ""
  
 +#: g10/mainproc.c:514
  #, c-format
  msgid "public key decryption failed: %s\n"
 -msgstr "公鑰解密失敗: %s\n"
 +msgstr ""
  
 +#: g10/mainproc.c:530
  #, c-format
  msgid "encrypted with %lu passphrases\n"
 -msgstr "已用 %lu 個密語加密了\n"
 +msgstr ""
  
 +#: g10/mainproc.c:532
  msgid "encrypted with 1 passphrase\n"
 -msgstr "已用 1 個密語加密了\n"
 +msgstr ""
  
 +#: g10/mainproc.c:566 g10/mainproc.c:587
  #, c-format
  msgid "assuming %s encrypted data\n"
 -msgstr "假定 %s 為加密過的資料\n"
 +msgstr ""
  
 +#: g10/mainproc.c:573
  #, c-format
  msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 -msgstr "IDEA 編密法不可用, 我們樂觀地試著改以 %s 代替\n"
 +msgstr ""
  
 +#: g10/mainproc.c:618 g10/mainproc.c:632
  msgid "WARNING: message was not integrity protected\n"
 -msgstr "警告: 訊息未受到完整的保護\n"
 +msgstr ""
  
 +#: g10/mainproc.c:628
  msgid "decryption okay\n"
 -msgstr "解密成功\n"
 +msgstr ""
  
 +#: g10/mainproc.c:637
  msgid "WARNING: encrypted message has been manipulated!\n"
 -msgstr "警告: 加密過的訊息已經被變造了!\n"
 +msgstr ""
  
 +#: g10/mainproc.c:653
  #, c-format
  msgid "decryption failed: %s\n"
 -msgstr "解密失敗: %s\n"
 +msgstr ""
  
 +#: g10/mainproc.c:676
  msgid "Note: sender requested \"for-your-eyes-only\"\n"
 -msgstr "請注意: 寄件者要求了 \"只准你用眼睛看\"\n"
 +msgstr ""
  
 +#: g10/mainproc.c:678
  #, c-format
  msgid "original file name='%.*s'\n"
 -msgstr "原始的檔名 ='%.*s'\n"
 +msgstr ""
  
 +#: g10/mainproc.c:748
  msgid "WARNING: multiple plaintexts seen\n"
 -msgstr "警告: 看到了多份明文\n"
 +msgstr ""
  
 +#: g10/mainproc.c:923
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
 -msgstr "獨立撤銷 - 請用 \"gpg --import\" 來套用\n"
 +msgstr ""
  
- #: g10/mainproc.c:1233 g10/mainproc.c:1276
++#: g10/mainproc.c:1238 g10/mainproc.c:1281
  msgid "no signature found\n"
 -msgstr "找不到簽章\n"
 +msgstr ""
  
- #: g10/mainproc.c:1607
++#: g10/mainproc.c:1612
  #, c-format
  msgid "BAD signature from \"%s\""
 -msgstr "*損壞* 的簽章來自於 \"%s\""
 +msgstr ""
  
- #: g10/mainproc.c:1609
++#: g10/mainproc.c:1614
  #, c-format
  msgid "Expired signature from \"%s\""
 -msgstr "過期的簽章來自於 \"%s\""
 +msgstr ""
  
- #: g10/mainproc.c:1611
++#: g10/mainproc.c:1616
  #, c-format
  msgid "Good signature from \"%s\""
 -msgstr "完好的簽章來自於 \"%s\""
 +msgstr ""
  
- #: g10/mainproc.c:1630
++#: g10/mainproc.c:1635
  msgid "signature verification suppressed\n"
 -msgstr "簽章驗證已抑制\n"
 +msgstr ""
  
- #: g10/mainproc.c:1739
++#: g10/mainproc.c:1744
  msgid "can't handle this ambiguous signature data\n"
 -msgstr "無法處理這個不明確的簽章資料\n"
 +msgstr ""
  
- #: g10/mainproc.c:1753 g10/mainproc.c:1761
++#: g10/mainproc.c:1758 g10/mainproc.c:1766
  #, c-format
  msgid "Signature made %s\n"
 -msgstr "由 %s 建立的簽章\n"
 +msgstr ""
  
- #: g10/mainproc.c:1754 g10/mainproc.c:1762
++#: g10/mainproc.c:1759 g10/mainproc.c:1767
  #, c-format
  msgid "               using %s key %s\n"
 -msgstr "               使用 %s 金鑰 %s\n"
 +msgstr ""
  
- #: g10/mainproc.c:1766
++#: g10/mainproc.c:1771
  #, c-format
  msgid "Signature made %s using %s key ID %s\n"
 -msgstr "由 %s 建立的簽章, 使用 %s 金鑰 ID %s\n"
 +msgstr ""
  
- #: g10/mainproc.c:1772
 -#, fuzzy, c-format
 -#| msgid "                aka \"%s\""
++#: g10/mainproc.c:1777
 +#, c-format
  msgid "               issuer \"%s\"\n"
 -msgstr "                亦即 \"%s\""
 +msgstr ""
  
- #: g10/mainproc.c:1789
++#: g10/mainproc.c:1794
  msgid "Key available at: "
 -msgstr "可用的金鑰於: "
 +msgstr ""
  
- #: g10/mainproc.c:2024
++#: g10/mainproc.c:2029
  msgid "[uncertain]"
 -msgstr "[ 不確定 ]"
 +msgstr ""
  
- #: g10/mainproc.c:2062
++#: g10/mainproc.c:2067
  #, c-format
  msgid "                aka \"%s\""
 -msgstr "                亦即 \"%s\""
 +msgstr ""
  
- #: g10/mainproc.c:2145
++#: g10/mainproc.c:2150
  #, c-format
  msgid "Signature expired %s\n"
 -msgstr "這份簽署已經在 %s 過期了\n"
 +msgstr ""
  
- #: g10/mainproc.c:2149
++#: g10/mainproc.c:2154
  #, c-format
  msgid "Signature expires %s\n"
 -msgstr "這份簽署將在 %s 到期\n"
 +msgstr ""
  
- #: g10/mainproc.c:2160
++#: g10/mainproc.c:2165
  #, c-format
  msgid "%s signature, digest algorithm %s%s%s\n"
 -msgstr "%s 簽章, 摘要演算法 %s%s%s\n"
 +msgstr ""
  
- #: g10/mainproc.c:2161
++#: g10/mainproc.c:2166
  msgid "binary"
 -msgstr "二進制"
 +msgstr ""
  
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2167
  msgid "textmode"
 -msgstr "文字模式"
 +msgstr ""
  
- #: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
 -msgstr "未知"
 +msgstr ""
  
- #: g10/mainproc.c:2164
++#: g10/mainproc.c:2169
  msgid ", key algorithm "
 -msgstr ", 金鑰演算法 "
 +msgstr ""
  
- #: g10/mainproc.c:2199
++#: g10/mainproc.c:2204
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2229
++#: g10/mainproc.c:2234
  #, c-format
  msgid "Can't check signature: %s\n"
 -msgstr "無法檢查簽章: %s\n"
 +msgstr ""
  
- #: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
++#: g10/mainproc.c:2327 g10/mainproc.c:2346 g10/mainproc.c:2470
  msgid "not a detached signature\n"
 -msgstr "不是一份分離的簽章\n"
 +msgstr ""
  
- #: g10/mainproc.c:2375
++#: g10/mainproc.c:2380
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 -msgstr "警告: 偵測到多重簽章. 祇有第一個簽章纔會被核選.\n"
 +msgstr ""
  
- #: g10/mainproc.c:2384
++#: g10/mainproc.c:2389
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
 -msgstr "等級 0x%02x 的獨立簽章\n"
 +msgstr ""
  
- #: g10/mainproc.c:2469
++#: g10/mainproc.c:2474
  msgid "old style (PGP 2.x) signature\n"
 -msgstr "舊型 (PGP 2.x) 簽章\n"
 +msgstr ""
  
 +#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
  #, c-format
  msgid "fstat of '%s' failed in %s: %s\n"
 -msgstr "'%s' 的 fstat 失敗於 %s: %s\n"
 +msgstr ""
  
 +#: g10/misc.c:170
  #, c-format
  msgid "fstat(%d) failed in %s: %s\n"
 -msgstr "fstat(%d) 失敗於 %s: %s\n"
 +msgstr ""
  
 +#: g10/misc.c:279
  #, c-format
  msgid "WARNING: using experimental public key algorithm %s\n"
 -msgstr "警告: 正在使用實驗性的 %s 公鑰演算法\n"
 +msgstr ""
  
 +#: g10/misc.c:286
  msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 -msgstr "警告: 已不建議使用 Elgamal 簽署暨加密金鑰\n"
 +msgstr ""
  
 +#: g10/misc.c:300
  #, c-format
  msgid "WARNING: using experimental cipher algorithm %s\n"
 -msgstr "警告: 正在使用實驗性的 %s 編密演算法\n"
 +msgstr ""
  
 +#: g10/misc.c:319
  #, c-format
  msgid "WARNING: using experimental digest algorithm %s\n"
 -msgstr "警告: 正在使用實驗性的 %s 摘要演算法\n"
 +msgstr ""
  
 +#: g10/misc.c:328
  #, c-format
  msgid "WARNING: digest algorithm %s is deprecated\n"
 -msgstr "警告: 已不建議使用 %s 摘要演算法\n"
 +msgstr ""
  
 +#: g10/misc.c:353
  #, c-format
  msgid "Note: signatures using the %s algorithm are rejected\n"
 -msgstr "請注意: 採用 %s 演算法的簽章已遭駁回\n"
 +msgstr ""
  
 -#, fuzzy, c-format
 -#| msgid "%s:%u: read error: %s\n"
 +#: g10/misc.c:375
 +#, c-format
  msgid "(reported error: %s)\n"
 -msgstr "%s:%u: 讀取錯誤: %s\n"
 +msgstr ""
  
 -#, fuzzy, c-format
 -#| msgid "read error in '%s': %s\n"
 +#: g10/misc.c:378
 +#, c-format
  msgid "(reported error: %s <%s>)\n"
 -msgstr "'%s' 讀取錯誤: %s\n"
 +msgstr ""
  
 +#: g10/misc.c:397
  msgid "(further info: "
  msgstr ""
  
@@@ -5689,66 -4588,58 +5638,66 @@@ msgid "
  "very large picture, your key will become very large as well!\n"
  "Keeping the image close to 240x288 is a good size to use.\n"
  msgstr ""
 -"\n"
 -"請挑選一張圖片來當成你的照片 ID. 這張圖片一定要是 JPEG 圖檔纔行.\n"
 -"請記住這張圖片會被存放在你的公鑰裡. 如果你挑了非常大的圖片的話,\n"
 -"你的金鑰也會變成非常地大!\n"
 -"盡量把圖片尺寸控制在 240x288 左右, 會是個非常理想的大小.\n"
  
 +#: g10/photoid.c:99
  msgid "Enter JPEG filename for photo ID: "
 -msgstr "輸入要當作照片 ID 的 JPEG 檔名: "
 +msgstr ""
  
 +#: g10/photoid.c:120
  #, c-format
  msgid "unable to open JPEG file '%s': %s\n"
 -msgstr "無法開啟 JPEG 圖檔 '%s': %s\n"
 +msgstr ""
  
 +#: g10/photoid.c:131
  #, c-format
  msgid "This JPEG is really large (%d bytes) !\n"
 -msgstr "這個 JPEG 檔案真的很大 (%d 位元組) !\n"
 +msgstr ""
  
 +#: g10/photoid.c:133
  msgid "Are you sure you want to use it? (y/N) "
 -msgstr "你確定要用它嗎? (y/N) "
 +msgstr ""
  
 +#: g10/photoid.c:149
  #, c-format
  msgid "'%s' is not a JPEG file\n"
 -msgstr "'%s' 不是 JPEG 圖檔\n"
 +msgstr ""
  
 +#: g10/photoid.c:168
  msgid "Is this photo correct (y/N/q)? "
 -msgstr "這張照片正確嗎? (y/N/q) "
 +msgstr ""
  
 +#: g10/photoid.c:380
  msgid "unable to display photo ID!\n"
 -msgstr "無法顯示照片 ID!\n"
 +msgstr ""
  
- #: g10/pkclist.c:72 g10/revoke.c:757
++#: g10/pkclist.c:72 g10/revoke.c:758
  msgid "No reason specified"
 -msgstr "未指定原因"
 +msgstr ""
  
- #: g10/pkclist.c:74 g10/revoke.c:759
++#: g10/pkclist.c:74 g10/revoke.c:760
  msgid "Key is superseded"
 -msgstr "金鑰被代換了"
 +msgstr ""
  
- #: g10/pkclist.c:76 g10/revoke.c:758
++#: g10/pkclist.c:76 g10/revoke.c:759
  msgid "Key has been compromised"
 -msgstr "金鑰已經被洩漏了"
 +msgstr ""
  
- #: g10/pkclist.c:78 g10/revoke.c:760
++#: g10/pkclist.c:78 g10/revoke.c:761
  msgid "Key is no longer used"
 -msgstr "金鑰不再被使用了"
 +msgstr ""
  
- #: g10/pkclist.c:80 g10/revoke.c:761
++#: g10/pkclist.c:80 g10/revoke.c:762
  msgid "User ID is no longer valid"
 -msgstr "使用者 ID 不再有效了"
 +msgstr ""
  
 +#: g10/pkclist.c:84
  msgid "reason for revocation: "
 -msgstr "撤銷原因: "
 +msgstr ""
  
 +#: g10/pkclist.c:100
  msgid "revocation comment: "
 -msgstr "撤銷註釋: "
 +msgstr ""
  
 -#  a string with valid answers
  #. TRANSLATORS: These are the allowed answers in lower and
  #. uppercase.  Below you will find the matching strings which
  #. should be translated accordingly and the letter changed to
@@@ -5810,45 -4690,44 +5759,45 @@@ msgid "
  "The minimum trust level for this key is: %s\n"
  "\n"
  msgstr ""
 -"這把金鑰的最小信任等級為: %s\n"
 -"\n"
  
- #: g10/pkclist.c:310 g10/revoke.c:786
++#: g10/pkclist.c:310 g10/revoke.c:787
  msgid "Your decision? "
 -msgstr "你的決定是甚麼? "
 +msgstr ""
  
 +#: g10/pkclist.c:331
  msgid "Do you really want to set this key to ultimate trust? (y/N) "
 -msgstr "請問你是否真的想把這把金鑰設成徹底信任呢? (y/N) "
 +msgstr ""
  
 +#: g10/pkclist.c:345
  msgid "Certificates leading to an ultimately trusted key:\n"
 -msgstr "被徹底信任金鑰的憑證:\n"
 +msgstr ""
  
 +#: g10/pkclist.c:434
  #, c-format
  msgid "%s: There is no assurance this key belongs to the named user\n"
 -msgstr "%s: 沒法保證這把金鑰真的屬於叫這個名字的使用者\n"
 +msgstr ""
  
 +#: g10/pkclist.c:439
  #, c-format
  msgid "%s: There is limited assurance this key belongs to the named user\n"
 -msgstr "%s: 祇能有限的保證這把金鑰真的屬於叫這個名字的使用者\n"
 +msgstr ""
  
 +#: g10/pkclist.c:445
  msgid "This key probably belongs to the named user\n"
 -msgstr "這把金鑰很可能屬於叫這個名字的使用者\n"
 +msgstr ""
  
 +#: g10/pkclist.c:450
  msgid "This key belongs to us\n"
 -msgstr "這把金鑰是屬於我們自己的\n"
 +msgstr ""
  
 -#, fuzzy, c-format
 -#| msgid "root certificate has now been marked as trusted\n"
 +#: g10/pkclist.c:456
 +#, c-format
  msgid "%s: This key is bad!  It has been marked as untrusted!\n"
 -msgstr "根憑證現在已標記為已信任\n"
 +msgstr ""
  
 -#, fuzzy
 -#| msgid ""
 -#| "It is NOT certain that the key belongs to the person named\n"
 -#| "in the user ID.  If you *really* know what you are doing,\n"
 -#| "you may answer the next question with yes.\n"
 +#: g10/pkclist.c:484
  msgid ""
- "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "This key is bad!  It has been marked as untrusted!  If you\n"
  "*really* know what you are doing, you may answer the next\n"
  "question with yes.\n"
  msgstr ""
@@@ -5983,154 -4842,123 +5932,154 @@@ msgid "
  "\n"
  "Enter the user ID.  End with an empty line: "
  msgstr ""
 -"\n"
 -"請輸入使用者 ID. 以空白列結束: "
  
 +#: g10/pkclist.c:1186
  msgid "No such user ID.\n"
 -msgstr "沒有這個使用者 ID.\n"
 +msgstr ""
  
- #: g10/pkclist.c:1197 g10/pkclist.c:1273
++#: g10/pkclist.c:1197 g10/pkclist.c:1274
  msgid "skipped: public key already set as default recipient\n"
 -msgstr "已跳過: 公鑰已經被設成預設收件者\n"
 +msgstr ""
  
- #: g10/pkclist.c:1218
++#: g10/pkclist.c:1219
  msgid "Public key is disabled.\n"
 -msgstr "公鑰已停用.\n"
 +msgstr ""
  
- #: g10/pkclist.c:1228
++#: g10/pkclist.c:1229
  msgid "skipped: public key already set\n"
 -msgstr "已跳過: 公鑰已設過\n"
 +msgstr ""
  
- #: g10/pkclist.c:1263
++#: g10/pkclist.c:1264
  #, c-format
  msgid "unknown default recipient \"%s\"\n"
 -msgstr "未知的預設收件者 \"%s\"\n"
 +msgstr ""
  
- #: g10/pkclist.c:1312
++#: g10/pkclist.c:1313
  msgid "no valid addressees\n"
 -msgstr "沒有有效的地址\n"
 +msgstr ""
  
- #: g10/pkclist.c:1665
++#: g10/pkclist.c:1666
  #, c-format
  msgid "Note: key %s has no %s feature\n"
 -msgstr "請注意: 金鑰 %s 沒有 %s 功能\n"
 +msgstr ""
  
- #: g10/pkclist.c:1690
++#: g10/pkclist.c:1691
  #, c-format
  msgid "Note: key %s has no preference for %s\n"
 -msgstr "警告: 金鑰 %s 沒有 %s 的偏好設定\n"
 +msgstr ""
  
 +#: g10/plaintext.c:84
  msgid "data not saved; use option \"--output\" to save it\n"
 -msgstr "資料未被儲存; 請用 \"--output\" 選項來儲存\n"
 +msgstr ""
  
- #: g10/plaintext.c:598
++#: g10/plaintext.c:614
  msgid "Detached signature.\n"
 -msgstr "分離的簽章.\n"
 +msgstr ""
  
- #: g10/plaintext.c:606
++#: g10/plaintext.c:622
  msgid "Please enter name of data file: "
 -msgstr "請輸入資料檔的名稱: "
 +msgstr ""
  
- #: g10/plaintext.c:643
++#: g10/plaintext.c:659
  msgid "reading stdin ...\n"
 -msgstr "正在讀取標準輸入中 ...\n"
 +msgstr ""
  
- #: g10/plaintext.c:688
++#: g10/plaintext.c:704
  msgid "no signed data\n"
 -msgstr "沒有被簽署過的資料\n"
 +msgstr ""
  
- #: g10/plaintext.c:706
++#: g10/plaintext.c:722
  #, c-format
  msgid "can't open signed data '%s'\n"
 -msgstr "無法開啟被簽署過的資料 '%s'\n"
 +msgstr ""
  
- #: g10/plaintext.c:741
++#: g10/plaintext.c:757
  #, c-format
  msgid "can't open signed data fd=%d: %s\n"
 -msgstr "無法開啟被簽署過的資料 fd=%d: %s\n"
 +msgstr ""
  
 +#: g10/pubkey-enc.c:116
  #, c-format
  msgid "anonymous recipient; trying secret key %s ...\n"
 -msgstr "匿名收件者; 正在嘗試使用私鑰 %s ...\n"
 +msgstr ""
  
 +#: g10/pubkey-enc.c:123
  msgid "okay, we are the anonymous recipient.\n"
 -msgstr "很好, 我們就是匿名收件者.\n"
 +msgstr ""
  
 +#: g10/pubkey-enc.c:282
  msgid "old encoding of the DEK is not supported\n"
 -msgstr "不支援舊式的 DEK 編碼\n"
 +msgstr ""
  
 +#: g10/pubkey-enc.c:310
  #, c-format
  msgid "cipher algorithm %d%s is unknown or disabled\n"
 -msgstr "%d%s 編密演算法未知或已停用\n"
 +msgstr ""
  
 +#: g10/pubkey-enc.c:352
  #, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 -msgstr "警告: 收件者偏好設定中找不到 %s 編密演算法\n"
 +msgstr ""
  
 +#: g10/pubkey-enc.c:377
  #, c-format
  msgid "Note: secret key %s expired at %s\n"
 -msgstr "請注意: 私鑰 %s 已於 %s 過期\n"
 +msgstr ""
  
 +#: g10/pubkey-enc.c:384
  msgid "Note: key has been revoked"
 -msgstr "請注意: 金鑰已撤銷"
 +msgstr ""
  
 +#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
 +#: g10/revoke.c:500
  #, c-format
  msgid "build_packet failed: %s\n"
 -msgstr "build_packet 失敗: %s\n"
 +msgstr ""
  
 +#: g10/revoke.c:144
  #, c-format
  msgid "key %s has no user IDs\n"
 -msgstr "金鑰 %s 沒有使用者 ID\n"
 +msgstr ""
  
 +#: g10/revoke.c:312
  msgid "To be revoked by:\n"
 -msgstr "將被撤銷:\n"
 +msgstr ""
  
 +#: g10/revoke.c:316
  msgid "(This is a sensitive revocation key)\n"
 -msgstr "(這是把機密的撤銷金鑰)\n"
 +msgstr ""
  
 -#, fuzzy
 -#| msgid "Secret key is available.\n"
 +#: g10/revoke.c:322
  msgid "Secret key is not available.\n"
 -msgstr "私鑰可用.\n"
 +msgstr ""
  
 +#: g10/revoke.c:327
  msgid "Create a designated revocation certificate for this key? (y/N) "
 -msgstr "要為這把金鑰建立一份指定撤銷憑證嗎? (y/N) "
 +msgstr ""
  
- #: g10/revoke.c:336 g10/revoke.c:727
++#: g10/revoke.c:336 g10/revoke.c:728
  msgid "ASCII armored output forced.\n"
 -msgstr "已強迫使用 ASCII 封裝過的輸出.\n"
 +msgstr ""
  
 +#: g10/revoke.c:352 g10/revoke.c:479
  #, c-format
  msgid "make_keysig_packet failed: %s\n"
 -msgstr "make_keysig_packet 失敗: %s\n"
 +msgstr ""
  
 +#: g10/revoke.c:415
  msgid "Revocation certificate created.\n"
 -msgstr "已建立撤銷憑證.\n"
 +msgstr ""
  
 +#: g10/revoke.c:421
  #, c-format
  msgid "no revocation keys found for \"%s\"\n"
 -msgstr "沒有找到 \"%s\" 用的撤銷金鑰\n"
 +msgstr ""
  
 +#: g10/revoke.c:551
  msgid "This is a revocation certificate for the OpenPGP key:"
 -msgstr "這把 OpenPGP 金鑰有一份撤銷憑證."
 +msgstr ""
  
 +#: g10/revoke.c:567
  msgid ""
  "A revocation certificate is a kind of \"kill switch\" to publicly\n"
  "declare that a key shall not anymore be used.  It is not possible\n"
@@@ -6143,44 -4976,52 +6092,44 @@@ msgid "
  "the secret key.  However, if the secret key is still accessible,\n"
  "it is better to generate a new revocation certificate and give\n"
  "a reason for the revocation.  For details see the description of\n"
- "of the gpg command \"--gen-revoke\" in the GnuPG manual."
+ "of the gpg command \"--generate-revocation\" in the GnuPG manual."
  msgstr ""
 -"萬一私鑰外流或遺失時, 可以用來撤銷金鑰.\n"
 -"然而, 如果其實還可以存取私鑰, 建議更好的\n"
 -"辦法是產生一份新的撤銷憑證, 並且指明撤銷\n"
 -"的理由."
  
- #: g10/revoke.c:575
 -#, fuzzy
 -#| msgid ""
 -#| "To avoid an accidental use of this file, a colon has been inserted\n"
 -#| "before the 5 dashes below.  Remove this colon with a text editor\n"
 -#| "before making use of this revocation certificate."
++#: g10/revoke.c:576
  msgid ""
  "To avoid an accidental use of this file, a colon has been inserted\n"
  "before the 5 dashes below.  Remove this colon with a text editor\n"
  "before importing and publishing this revocation certificate."
  msgstr ""
 -"為了避免意外誤用此檔案, 底下五個破折號前面多插了一個冒號.\n"
 -"真的要使用這份撤銷憑證前, 請先用文字編輯器把那個冒號移除,\n"
 -"撤銷憑證才能使用."
  
- #: g10/revoke.c:590
 -#, fuzzy, c-format
 -#| msgid "Revocation certificate created.\n"
++#: g10/revoke.c:591
 +#, c-format
  msgid "revocation certificate stored as '%s.rev'\n"
 -msgstr "已建立撤銷憑證.\n"
 +msgstr ""
  
- #: g10/revoke.c:634
 -#, fuzzy, c-format
 -#| msgid "secret key \"%s\" not found: %s\n"
++#: g10/revoke.c:635
 +#, c-format
  msgid "secret key \"%s\" not found\n"
 -msgstr "找不到私鑰 \"%s\": %s\n"
 +msgstr ""
  
  #. TRANSLATORS: The %s prints a key specification which
  #. for example has been given at the command line.  Several lines
  #. lines with secret key infos are printed after this message.
- #: g10/revoke.c:661
++#: g10/revoke.c:662
  #, c-format
  msgid "'%s' matches multiple secret keys:\n"
  msgstr ""
  
- #: g10/revoke.c:688
 -#, fuzzy, c-format
 -#| msgid "error creating keyring '%s': %s\n"
++#: g10/revoke.c:689
 +#, c-format
  msgid "error searching the keyring: %s\n"
 -msgstr "建立鑰匙圈 '%s' 時出錯: %s\n"
 +msgstr ""
  
- #: g10/revoke.c:711
++#: g10/revoke.c:712
  msgid "Create a revocation certificate for this key? (y/N) "
 -msgstr "要為這把金鑰建立一份撤銷憑證嗎? (y/N) "
 +msgstr ""
  
- #: g10/revoke.c:735
++#: g10/revoke.c:736
  msgid ""
  "Revocation certificate created.\n"
  "\n"
@@@ -6190,91 -5031,83 +6139,91 @@@
  "your media become unreadable.  But have some caution:  The print system of\n"
  "your machine might store the data and make it available to others!\n"
  msgstr ""
 -"已建立撤銷憑證.\n"
 -"\n"
 -"請把這個檔案搬移到另一個你能夠將之藏起來的媒介上;\n"
 -"如果有人能夠取得這份憑證的話, 那麼他也能夠讓你的\n"
 -"金鑰無法繼續使用. 把這份憑證列印出來再藏到別的地\n"
 -"方也是很好的方法, 以免你的儲存媒介損毀而無法讀取.\n"
 -"但是千萬小心: 你的機器上的列印系統可能會在列印過\n"
 -"程中把這些資料暫存在某個其他人也能夠看得到的地方!\n"
  
- #: g10/revoke.c:769
++#: g10/revoke.c:770
  msgid "Please select the reason for the revocation:\n"
 -msgstr "請選擇撤銷的原因:\n"
 +msgstr ""
  
- #: g10/revoke.c:779
++#: g10/revoke.c:780
  msgid "Cancel"
 -msgstr "取消"
 +msgstr ""
  
- #: g10/revoke.c:781
++#: g10/revoke.c:782
  #, c-format
  msgid "(Probably you want to select %d here)\n"
 -msgstr "(也許你會想要在這裡選擇 %d)\n"
 +msgstr ""
  
- #: g10/revoke.c:822
++#: g10/revoke.c:823
  msgid "Enter an optional description; end it with an empty line:\n"
 -msgstr "請輸入選用的描述; 以空白列結束:\n"
 +msgstr ""
  
- #: g10/revoke.c:850
++#: g10/revoke.c:851
  #, c-format
  msgid "Reason for revocation: %s\n"
 -msgstr "撤銷原因: %s\n"
 +msgstr ""
  
- #: g10/revoke.c:852
++#: g10/revoke.c:853
  msgid "(No description given)\n"
 -msgstr "(沒有給定描述)\n"
 +msgstr ""
  
- #: g10/revoke.c:857
++#: g10/revoke.c:858
  msgid "Is this okay? (y/N) "
 -msgstr "這樣可以嗎? (y/N) "
 +msgstr ""
  
 +#: g10/seskey.c:62 sm/encrypt.c:123
  msgid "weak key created - retrying\n"
 -msgstr "建立了弱金鑰 - 重試中\n"
 +msgstr ""
  
 +#: g10/seskey.c:66
  #, c-format
  msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 -msgstr "無法避免對稱式編密法的弱金鑰; 已經試了 %d 次了!\n"
 +msgstr ""
  
 +#: g10/seskey.c:306
  #, c-format
  msgid "%s key %s uses an unsafe (%zu bit) hash\n"
 -msgstr "%s 金鑰 %s 使用不安全 (%zu 位元) 的雜湊\n"
 +msgstr ""
  
 +#: g10/seskey.c:324
  #, c-format
  msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 -msgstr "%s 金鑰 %s 需要 %zu 位元以上的雜湊 (雜湊為 %s)\n"
 +msgstr ""
  
 +#: g10/sig-check.c:122
  msgid "WARNING: signature digest conflict in message\n"
 -msgstr "警告: 簽章摘要與訊息不一致\n"
 +msgstr ""
  
 +#: g10/sig-check.c:149
  #, c-format
  msgid "WARNING: signing subkey %s is not cross-certified\n"
 -msgstr "警告: 簽署子鑰 %s 未經交叉認證\n"
 +msgstr ""
  
 +#: g10/sig-check.c:151
  #, c-format
  msgid "please see %s for more information\n"
 -msgstr "請參考 %s 上進一步的資訊\n"
 +msgstr ""
  
 +#: g10/sig-check.c:161
  #, c-format
  msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 -msgstr "警告: 簽署子鑰 %s 有無效的交叉憑證\n"
 +msgstr ""
  
 -#, fuzzy, c-format
 -#| msgid "public key %s is %lu second newer than the signature\n"
 +#: g10/sig-check.c:281
 +#, c-format
  msgid "public key %s is %lu second newer than the signature\n"
  msgid_plural "public key %s is %lu seconds newer than the signature\n"
 -msgstr[0] "公鑰 %s 比簽章還要新了 %lu 秒\n"
 +msgstr[0] ""
 +msgstr[1] ""
  
 -#, fuzzy, c-format
 -#| msgid "public key %s is %lu second newer than the signature\n"
 +#: g10/sig-check.c:290
 +#, c-format
  msgid "public key %s is %lu day newer than the signature\n"
  msgid_plural "public key %s is %lu days newer than the signature\n"
 -msgstr[0] "公鑰 %s 比簽章還要新了 %lu 秒\n"
 +msgstr[0] ""
 +msgstr[1] ""
  
 -#, fuzzy, c-format
 -#| msgid ""
 -#| "key %s was created %lu second in the future (time warp or clock problem)\n"
 +#: g10/sig-check.c:304 g10/sign.c:266
 +#, c-format
  msgid ""
  "key %s was created %lu second in the future (time warp or clock problem)\n"
  msgid_plural ""
@@@ -6331,512 -5157,481 +6280,583 @@@ msgstr "
  msgid ""
  "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
  "unexpanded.\n"
 -msgstr "警告: 偏好金鑰伺服器 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 +msgstr ""
  
- #: g10/sign.c:329
++#: g10/sign.c:331
  #, c-format
  msgid "%s/%s signature from: \"%s\"\n"
 -msgstr "%s/%s 簽章來自: \"%s\"\n"
 +msgstr ""
  
- #: g10/sign.c:878
++#: g10/sign.c:880
  #, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 -msgstr "警告: 強迫使用 %s (%d) 摘要演算法會違反收件者偏好設定\n"
 +msgstr ""
  
- #: g10/sign.c:1009
++#: g10/sign.c:1011
  msgid "signing:"
 -msgstr "簽署:"
 +msgstr ""
  
- #: g10/sign.c:1286
++#: g10/sign.c:1288
  #, c-format
  msgid "%s encryption will be used\n"
 -msgstr "%s 加密將被採用\n"
 +msgstr ""
  
 +#: g10/skclist.c:155 g10/skclist.c:236
  msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 -msgstr "金鑰未被標示為不安全 - 不能夠拿來跟假的隨機數字產生器併用!\n"
 +msgstr ""
  
 +#: g10/skclist.c:187
  #, c-format
  msgid "skipped \"%s\": duplicated\n"
 -msgstr "已跳過 \"%s\": 重複了\n"
 +msgstr ""
  
 +#: g10/skclist.c:206
  msgid "skipped: secret key already present\n"
 -msgstr "已跳過: 私鑰已經存在\n"
 +msgstr ""
  
 +#: g10/skclist.c:225
  msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 -msgstr "這是由 PGP 產生的 ElGamal 金鑰, 用於簽章並不安全!"
 +msgstr ""
  
- #: g10/tdbdump.c:57 g10/trustdb.c:362
++#: g10/tdbdump.c:57 g10/trustdb.c:369
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
 -msgstr "信任記錄 %lu, 類別 %d: 寫入失敗: %s\n"
 +msgstr ""
  
 +#: g10/tdbdump.c:105
  #, c-format
  msgid ""
  "# List of assigned trustvalues, created %s\n"
  "# (Use \"gpg --import-ownertrust\" to restore them)\n"
  msgstr ""
 -"# 相對應的信任值清單被建立於 %s\n"
 -"# (請用 \"gpg --import-ownertrust\" 來取回它們)\n"
  
 +#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
  #, c-format
  msgid "error in '%s': %s\n"
 -msgstr "在 '%s' 中出錯: %s\n"
 +msgstr ""
  
 +#: g10/tdbdump.c:162
  msgid "line too long"
 -msgstr "列太長"
 +msgstr ""
  
 +#: g10/tdbdump.c:170
  msgid "colon missing"
 -msgstr "冒號缺漏"
 +msgstr ""
  
 +#: g10/tdbdump.c:176
  msgid "invalid fingerprint"
 -msgstr "無效的指紋"
 +msgstr ""
  
 +#: g10/tdbdump.c:181
  msgid "ownertrust value missing"
 -msgstr "主觀信任值缺漏"
 +msgstr ""
  
 +#: g10/tdbdump.c:217
  #, c-format
  msgid "error finding trust record in '%s': %s\n"
 -msgstr "在 '%s' 中尋找信任記錄時出錯: %s\n"
 +msgstr ""
  
 +#: g10/tdbdump.c:221
  #, c-format
  msgid "read error in '%s': %s\n"
 -msgstr "'%s' 讀取錯誤: %s\n"
 +msgstr ""
  
- #: g10/tdbdump.c:230 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
 -msgstr "信任資料庫: 同步化失敗: %s\n"
 +msgstr ""
  
 +#: g10/tdbio.c:141 sm/keydb.c:356
  #, c-format
  msgid "can't create lock for '%s'\n"
 -msgstr "無法為 '%s' 建立鎖定\n"
 +msgstr ""
  
 +#: g10/tdbio.c:146
  #, c-format
  msgid "can't lock '%s'\n"
 -msgstr "無法鎖定 '%s'\n"
 +msgstr ""
  
 +#: g10/tdbio.c:205 g10/tdbio.c:1787
  #, c-format
  msgid "trustdb rec %lu: lseek failed: %s\n"
 -msgstr "信任資料庫記錄 %lu: 本機搜尋失敗: %s\n"
 +msgstr ""
  
 +#: g10/tdbio.c:213 g10/tdbio.c:1798
  #, c-format
  msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 -msgstr "信任資料庫記錄 %lu: 寫入失敗 (n=%d): %s\n"
 +msgstr ""
  
 +#: g10/tdbio.c:352
  msgid "trustdb transaction too large\n"
 -msgstr "信任資料庫更動量過大\n"
 +msgstr ""
  
 +#: g10/tdbio.c:682
  #, c-format
  msgid "%s: directory does not exist!\n"
 -msgstr "%s: 目錄不存在!\n"
 +msgstr ""
  
 +#: g10/tdbio.c:703 dirmngr/http.c:501
  #, c-format
  msgid "can't access '%s': %s\n"
 -msgstr "無法存取 '%s': %s\n"
 +msgstr ""
  
 +#: g10/tdbio.c:724
  #, c-format
  msgid "%s: failed to create version record: %s"
 -msgstr "%s: 建立版本記錄失敗: %s"
 +msgstr ""
  
 +#: g10/tdbio.c:729
  #, c-format
  msgid "%s: invalid trustdb created\n"
 -msgstr "%s: 建立了無效的信任資料庫\n"
 +msgstr ""
  
 +#: g10/tdbio.c:732
  #, c-format
  msgid "%s: trustdb created\n"
 -msgstr "%s: 建立了信任資料庫\n"
 +msgstr ""
  
 +#: g10/tdbio.c:788
  msgid "Note: trustdb not writable\n"
 -msgstr "請注意: 信任資料庫不可寫入\n"
 +msgstr ""
  
 +#: g10/tdbio.c:797
  #, c-format
  msgid "%s: invalid trustdb\n"
 -msgstr "%s: 無效的信任資料庫\n"
 +msgstr ""
  
 +#: g10/tdbio.c:834
  #, c-format
  msgid "%s: failed to create hashtable: %s\n"
 -msgstr "%s: 建立雜湊表失敗: %s\n"
 +msgstr ""
  
 +#: g10/tdbio.c:842
  #, c-format
  msgid "%s: error updating version record: %s\n"
 -msgstr "%s: 更新版本記錄時錯誤: %s\n"
 +msgstr ""
  
 +#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
 +#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
  #, c-format
  msgid "%s: error reading version record: %s\n"
 -msgstr "%s: 讀取版本記錄時錯誤: %s\n"
 +msgstr ""
  
 +#: g10/tdbio.c:938
  #, c-format
  msgid "%s: error writing version record: %s\n"
 -msgstr "%s: 寫入版本記錄時錯誤: %s\n"
 +msgstr ""
  
 +#: g10/tdbio.c:1461
  #, c-format
  msgid "trustdb: lseek failed: %s\n"
 -msgstr "信任資料庫: 本機搜尋失敗: %s\n"
 +msgstr ""
  
 +#: g10/tdbio.c:1472
  #, c-format
  msgid "trustdb: read failed (n=%d): %s\n"
 -msgstr "信任資料庫: 讀取失敗 (n=%d): %s\n"
 +msgstr ""
  
 +#: g10/tdbio.c:1497
  #, c-format
  msgid "%s: not a trustdb file\n"
 -msgstr "%s: 不是一個信任資料庫檔案\n"
 +msgstr ""
  
 +#: g10/tdbio.c:1522
  #, c-format
  msgid "%s: version record with recnum %lu\n"
 -msgstr "%s: 記錄編號為 %lu 的版本記錄\n"
 +msgstr ""
  
 +#: g10/tdbio.c:1528
  #, c-format
  msgid "%s: invalid file version %d\n"
 -msgstr "%s: 無效的檔案版本 %d\n"
 +msgstr ""
  
 +#: g10/tdbio.c:1748
  #, c-format
  msgid "%s: error reading free record: %s\n"
 -msgstr "%s: 讀取可用空間記錄時出錯: %s\n"
 +msgstr ""
  
 +#: g10/tdbio.c:1757
  #, c-format
  msgid "%s: error writing dir record: %s\n"
 -msgstr "%s: 寫入目錄記錄時出錯: %s\n"
 +msgstr ""
  
 +#: g10/tdbio.c:1768
  #, c-format
  msgid "%s: failed to zero a record: %s\n"
 -msgstr "%s: 記錄歸零失敗: %s\n"
 +msgstr ""
  
 +#: g10/tdbio.c:1804
  #, c-format
  msgid "%s: failed to append a record: %s\n"
 -msgstr "%s: 附加記錄失敗: %s\n"
 +msgstr ""
  
 +#: g10/tdbio.c:1865
  msgid "Error: The trustdb is corrupted.\n"
 -msgstr "錯誤: 信任資料庫已毀損.\n"
 +msgstr ""
  
 +#: g10/textfilter.c:146
  #, c-format
  msgid "can't handle text lines longer than %d characters\n"
 -msgstr "無法處理長於 %d 字符的文字列\n"
 +msgstr ""
  
 +#: g10/textfilter.c:241
  #, c-format
  msgid "input line longer than %d characters\n"
 -msgstr "輸入列比 %d 字符還長\n"
 +msgstr ""
  
- #: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
 -#, fuzzy, c-format
 -#| msgid "error sending standard options: %s\n"
++#: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
 +#, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
 -msgstr "送出標準選項時出錯: %s\n"
 +msgstr ""
  
- #: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
++#: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:357 g10/tofu.c:699
++#: g10/tofu.c:355 g10/tofu.c:888
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:501
 -#, fuzzy, c-format
 -#| msgid "unsupported algorithm: %s"
++#: g10/tofu.c:505
 +#, c-format
  msgid "unsupported TOFU database version: %s\n"
 -msgstr "未支援的演算法: %s"
 +msgstr ""
  
- #: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
- #: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
- #: g10/tofu.c:3056
 -#, fuzzy, c-format
 -#| msgid "error creating temporary file: %s\n"
++#: g10/tofu.c:538
++#, c-format
+ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
 -msgstr "建立暫存檔時出錯: %s\n"
++msgstr ""
+ 
++#: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
+ msgid "TOFU DB error"
+ msgstr ""
+ 
 -#, fuzzy, c-format
 -#| msgid "error sending data: %s\n"
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2340 g10/tofu.c:2359
++#: g10/tofu.c:2372 g10/tofu.c:2384 g10/tofu.c:2399 g10/tofu.c:2411
++#: g10/tofu.c:2980 g10/tofu.c:2997 g10/tofu.c:3033 g10/tofu.c:3050
++#: g10/tofu.c:3353
 +#, c-format
  msgid "error reading TOFU database: %s\n"
 -msgstr "送出資料時出錯: %s\n"
 +msgstr ""
  
- #: g10/tofu.c:566 g10/tofu.c:574
 -#, fuzzy, c-format
 -#| msgid "error writing base64 encoding: %s\n"
++#: g10/tofu.c:716 g10/tofu.c:724
 +#, c-format
  msgid "error determining TOFU database's version: %s\n"
 -msgstr "寫入 base64 編碼時出錯: %s\n"
 +msgstr ""
  
- #: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
 -#, fuzzy, c-format
 -#| msgid "error initializing reader object: %s\n"
++#: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
 +#, c-format
  msgid "error initializing TOFU database: %s\n"
 -msgstr "啟始讀取程式物件時出錯: %s\n"
 +msgstr ""
  
- #: g10/tofu.c:765
 -#, fuzzy, c-format
 -#| msgid "error sending data: %s\n"
++#: g10/tofu.c:844
++#, c-format
+ msgid "error creating 'encryptions' TOFU table: %s\n"
 -msgstr "送出資料時出錯: %s\n"
++msgstr ""
+ 
++#: g10/tofu.c:874
+ #, c-format
+ msgid "adding column effective_policy to bindings DB: %s\n"
+ msgstr ""
+ 
 -#, fuzzy, c-format
 -#| msgid "error opening '%s': %s\n"
++#: g10/tofu.c:956
 +#, c-format
  msgid "error opening TOFU database '%s': %s\n"
 -msgstr "開啟 '%s' 時出錯: %s\n"
 +msgstr ""
  
- #: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
 -#, fuzzy, c-format
 -#| msgid "error sending data: %s\n"
++#: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
 +#, c-format
  msgid "error updating TOFU database: %s\n"
 -msgstr "送出資料時出錯: %s\n"
 +msgstr ""
  
- #: g10/tofu.c:1239
++#: g10/tofu.c:1328
  #, c-format
  msgid ""
  "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1247
++#: g10/tofu.c:1337
  #, c-format
- msgid "The email address \"%s\" is associated with %d keys!"
- msgstr ""
+ msgid "The email address \"%s\" is associated with %d key!"
+ msgid_plural "The email address \"%s\" is associated with %d keys!"
+ msgstr[0] ""
++msgstr[1] ""
  
- #: g10/tofu.c:1251
++#: g10/tofu.c:1343
  msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  
- #: g10/tofu.c:1257
++#: g10/tofu.c:1349
  #, c-format
  msgid ""
  "Please indicate whether this email address should be associated with key %s "
  "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1513
 -#, fuzzy, c-format
 -#| msgid "error getting responder ID: %s\n"
++#: g10/tofu.c:1605
 +#, c-format
  msgid "error gathering other user IDs: %s\n"
 -msgstr "取得回應程式 ID 時出錯: %s\n"
 +msgstr ""
  
- #: g10/tofu.c:1523
 -#, fuzzy
 -#| msgid "list key and user IDs"
++#: g10/tofu.c:1615
  msgid "This key's user IDs:\n"
 -msgstr "列出金鑰和使用者 ID"
 +msgstr ""
  
- #: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
 -#, fuzzy, c-format
 -#| msgid "validity: %s"
++#: g10/tofu.c:1631 g10/tofu.c:1796
 +#, c-format
  msgid "policy: %s"
 -msgstr "有效性: %s"
 +msgstr ""
  
- #: g10/tofu.c:1630
 -#, fuzzy, c-format
 -#| msgid "error getting stored flags: %s\n"
++#: g10/tofu.c:1722
 +#, c-format
  msgid "error gathering signature stats: %s\n"
 -msgstr "取得已存放的旗標時出錯: %s\n"
 +msgstr ""
  
- #: g10/tofu.c:1634
++#: g10/tofu.c:1726
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/tofu.c:1651
++#: g10/tofu.c:1744
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1684 g10/tofu.c:1689
++#: g10/tofu.c:1785 g10/tofu.c:1790
  msgid ", "
  msgstr ""
  
- #: g10/tofu.c:1693
 -#, fuzzy
 -#| msgid "list keys"
++#: g10/tofu.c:1794
  msgid "this key"
 -msgstr "列出金鑰"
 +msgstr ""
  
- #: g10/tofu.c:1715
 -#, fuzzy, c-format
 -#| msgid "print message digests"
++#: g10/tofu.c:1820
++#, c-format
+ msgid "Verified %d message."
+ msgid_plural "Verified %d messages."
 -msgstr[0] "印出訊息摘要"
++msgstr[0] ""
++msgstr[1] ""
+ 
 -#, fuzzy, c-format
 -#| msgid "encrypted with %lu passphrases\n"
++#: g10/tofu.c:1824
 +#, c-format
- msgid "Verified %d message"
- msgid_plural "Verified %d messages"
+ msgid "Encrypted %d message."
+ msgid_plural "Encrypted %d messages."
 -msgstr[0] "已用 %lu 個密語加密了\n"
 +msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/tofu.c:1719
 -#, fuzzy, c-format
 -#| msgid "print message digests"
++#: g10/tofu.c:1831
 +#, c-format
- msgid "Encrypted %d message"
- msgid_plural "Encrypted %d messages"
+ msgid "Verified %d message in the future."
+ msgid_plural "Verified %d messages in the future."
 -msgstr[0] "印出訊息摘要"
 +msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/tofu.c:1734
 -#, fuzzy, c-format
 -#| msgid "print message digests"
++#: g10/tofu.c:1835
 +#, c-format
- msgid " over the past day."
- msgid_plural " over the past %d days."
+ msgid "Encrypted %d message in the future."
+ msgid_plural "Encrypted %d messages in the future."
 -msgstr[0] "印出訊息摘要"
 +msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/tofu.c:1740
++#: g10/tofu.c:1849
  #, c-format
- msgid " over the past month."
- msgid_plural " over the past %d months."
+ msgid "Messages verified over the past %d day: %d."
+ msgid_plural "Messages verified over the past %d days: %d."
  msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/tofu.c:1746
++#: g10/tofu.c:1855
  #, c-format
- msgid " over the past year."
- msgid_plural " over the past %d years."
+ msgid "Messages encrypted over the past %d day: %d."
+ msgid_plural "Messages encrypted over the past %d days: %d."
  msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/tofu.c:1752
- msgid " in the past."
++#: g10/tofu.c:1865
+ #, c-format
+ msgid "Messages verified over the past %d month: %d."
+ msgid_plural "Messages verified over the past %d months: %d."
+ msgstr[0] ""
++msgstr[1] ""
+ 
++#: g10/tofu.c:1871
+ #, c-format
+ msgid "Messages encrypted over the past %d month: %d."
+ msgid_plural "Messages encrypted over the past %d months: %d."
+ msgstr[0] ""
++msgstr[1] ""
+ 
++#: g10/tofu.c:1881
+ #, c-format
+ msgid "Messages verified over the past %d year: %d."
+ msgid_plural "Messages verified over the past %d years: %d."
+ msgstr[0] ""
++msgstr[1] ""
+ 
++#: g10/tofu.c:1887
+ #, c-format
+ msgid "Messages encrypted over the past %d year: %d."
+ msgid_plural "Messages encrypted over the past %d years: %d."
+ msgstr[0] ""
++msgstr[1] ""
+ 
++#: g10/tofu.c:1895
+ #, c-format
+ msgid "Messages verified in the past: %d."
+ msgstr ""
+ 
 -#, fuzzy, c-format
 -#| msgid "print message digests"
++#: g10/tofu.c:1899
++#, c-format
+ msgid "Messages encrypted in the past: %d."
 -msgstr "印出訊息摘要"
 +msgstr ""
  
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1767
++#: g10/tofu.c:1916
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1809
++#: g10/tofu.c:1958
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1815
++#: g10/tofu.c:1964
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1823
++#: g10/tofu.c:1972
  msgid "Defaulting to unknown."
  msgstr ""
  
- #: g10/tofu.c:1938 g10/tofu.c:2074
++#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
- #: g10/tofu.c:1994
 -#, fuzzy, c-format
 -#| msgid "error writing key: %s\n"
++#: g10/tofu.c:2143
 +#, c-format
  msgid "resetting keydb: %s\n"
 -msgstr "寫入金鑰時出錯: %s\n"
 +msgstr ""
  
- #: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
- #: g10/tofu.c:2425
 -#, fuzzy, c-format
 -#| msgid "error setting OCSP target: %s\n"
++#: g10/tofu.c:2601
 +#, c-format
- msgid "error setting TOFU binding's trust level to %s\n"
+ msgid "error setting TOFU binding's policy to %s\n"
 -msgstr "設定 OCSP 目標時出錯: %s\n"
 +msgstr ""
  
- #: g10/tofu.c:2473
 -#, fuzzy, c-format
 -#| msgid "error creating a pipe: %s\n"
++#: g10/tofu.c:2794
 +#, c-format
  msgid "error changing TOFU policy: %s\n"
 -msgstr "建立管道時出錯: %s\n"
 +msgstr ""
  
- #. TRANSLATORS: The tilde ('~') is used here to indicate a
- #. * non-breakable space
- #: g10/tofu.c:2574
++#: g10/tofu.c:2839
  #, c-format
- msgid "%d~year"
- msgid_plural "%d~years"
+ msgid "%lld~year"
+ msgid_plural "%lld~years"
  msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/tofu.c:2583
++#: g10/tofu.c:2844
  #, c-format
- msgid "%d~month"
- msgid_plural "%d~months"
+ msgid "%lld~month"
+ msgid_plural "%lld~months"
  msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/tofu.c:2592
++#: g10/tofu.c:2849
  #, c-format
- msgid "%d~day"
- msgid_plural "%d~days"
+ msgid "%lld~week"
+ msgid_plural "%lld~weeks"
  msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2854
+ #, c-format
+ msgid "%lld~day"
+ msgid_plural "%lld~days"
+ msgstr[0] ""
++msgstr[1] ""
+ 
++#: g10/tofu.c:2859
  #, c-format
- msgid "%d~hour"
- msgid_plural "%d~hours"
+ msgid "%lld~hour"
+ msgid_plural "%lld~hours"
  msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/tofu.c:2610
++#: g10/tofu.c:2864
  #, c-format
- msgid "%d~minute"
- msgid_plural "%d~minutes"
+ msgid "%lld~minute"
+ msgid_plural "%lld~minutes"
  msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/tofu.c:2619
++#: g10/tofu.c:2866
  #, c-format
- msgid "%d~second"
- msgid_plural "%d~seconds"
+ msgid "%lld~second"
+ msgid_plural "%lld~seconds"
  msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/tofu.c:2802
++#: g10/tofu.c:3103
  #, c-format
- msgid "%s: "
+ msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:2806
 -#, fuzzy, c-format
 -#| msgid "Deleted %d signatures.\n"
++#: g10/tofu.c:3109
 +#, c-format
- msgid "Verified %ld signatures"
+ msgid "%s: Verified 0 signatures."
 -msgstr "已經刪除了 %d 份簽章.\n"
 +msgstr ""
  
- #: g10/tofu.c:2816
 -#, fuzzy, c-format
 -#| msgid "print message digests"
++#: g10/tofu.c:3117
 +#, c-format
- msgid "Verified %ld signature in the past %s"
- msgid_plural "Verified %ld signatures in the past %s"
+ msgid "%s: Verified %ld~signature in the past %s."
+ msgid_plural "%s: Verified %ld~signatures in the past %s."
 -msgstr[0] "印出訊息摘要"
 +msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/tofu.c:2826
- #, c-format
- msgid ", and encrypted %ld messages"
 -#, fuzzy
 -#| msgid "encrypted with %lu passphrases\n"
++#: g10/tofu.c:3127
+ msgid "Encrypted 0 messages."
 -msgstr "已用 %lu 個密語加密了\n"
 +msgstr ""
  
- #: g10/tofu.c:2835
 -#, fuzzy, c-format
 -#| msgid "print message digests"
++#: g10/tofu.c:3135
 +#, c-format
- msgid ", and encrypted %ld message in the past %s"
- msgid_plural ", and encrypted %ld messages in the past %s"
+ msgid "Encrypted %ld~message in the past %s."
+ msgid_plural "Encrypted %ld~messages in the past %s."
 -msgstr[0] "印出訊息摘要"
 +msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/tofu.c:2880
 -#, fuzzy, c-format
 -#| msgid "validity: %s"
++#: g10/tofu.c:3146
++#, c-format
+ msgid "(policy: %s)"
 -msgstr "有效性: %s"
++msgstr ""
+ 
++#: g10/tofu.c:3177
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2883
++#: g10/tofu.c:3180
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2887
++#: g10/tofu.c:3184
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2890
++#: g10/tofu.c:3187
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2919
++#: g10/tofu.c:3216
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -6851,144 -5646,116 +6871,144 @@@ msgid_plural "
  "  %s\n"
  "to mark it as being bad.\n"
  msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
- #: g10/tofu.c:3480 g10/tofu.c:3572
 -#, fuzzy, c-format
 -#| msgid "error sending data: %s\n"
++#: g10/tofu.c:3298 g10/tofu.c:3449 g10/tofu.c:3627 g10/tofu.c:3670
++#: g10/tofu.c:3784 g10/tofu.c:3859 g10/tofu.c:3894
 +#, c-format
  msgid "error opening TOFU database: %s\n"
 -msgstr "送出資料時出錯: %s\n"
 +msgstr ""
  
- #: g10/tofu.c:3185
++#: g10/tofu.c:3482
  #, c-format
- msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
  msgstr ""
  
- #: g10/tofu.c:3515
 -#, fuzzy, c-format
 -#| msgid "error writing public keyring '%s': %s\n"
++#: g10/tofu.c:3819
 +#, c-format
  msgid "error setting policy for key %s, user id \"%s\": %s"
 -msgstr "寫入公鑰鑰匙圈 '%s' 時出錯: %s\n"
 +msgstr ""
  
 +#: g10/trustdb.c:216
  #, c-format
  msgid "'%s' is not a valid long keyID\n"
 -msgstr "'%s' 不是有效的長式金鑰 ID\n"
 +msgstr ""
  
 +#: g10/trustdb.c:242
  #, c-format
  msgid "key %s: accepted as trusted key\n"
 -msgstr "金鑰 %s: 如受信任的金鑰般被接受了\n"
 +msgstr ""
  
 +#: g10/trustdb.c:280
  #, c-format
  msgid "key %s occurs more than once in the trustdb\n"
 -msgstr "金鑰 %s 在信任資料庫中出現了不止一次\n"
 +msgstr ""
  
 +#: g10/trustdb.c:295
  #, c-format
  msgid "key %s: no public key for trusted key - skipped\n"
 -msgstr "金鑰 %s: 受信任的金鑰沒有公鑰 - 已跳過\n"
 +msgstr ""
  
 +#: g10/trustdb.c:305
  #, c-format
  msgid "key %s marked as ultimately trusted\n"
 -msgstr "金鑰 %s 已標記成徹底信任了\n"
 +msgstr ""
  
- #: g10/trustdb.c:341
++#: g10/trustdb.c:348
  #, c-format
  msgid "trust record %lu, req type %d: read failed: %s\n"
 -msgstr "信任記錄 %lu, 請求類別 %d: 讀取失敗: %s\n"
 +msgstr ""
  
- #: g10/trustdb.c:347
++#: g10/trustdb.c:354
  #, c-format
  msgid "trust record %lu is not of requested type %d\n"
 -msgstr "信任記錄 %lu 不是所請求的類別 %d\n"
 +msgstr ""
  
- #: g10/trustdb.c:422
++#: g10/trustdb.c:429
  msgid "You may try to re-create the trustdb using the commands:\n"
 -msgstr "你可以試著用下列指令來重建信任資料庫:\n"
 +msgstr ""
  
- #: g10/trustdb.c:431
++#: g10/trustdb.c:438
  msgid "If that does not work, please consult the manual\n"
 -msgstr "如果行不通的話, 請查閱手冊\n"
 +msgstr ""
  
- #: g10/trustdb.c:468
++#: g10/trustdb.c:475
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 -msgstr "無法使用未知的信任模型 (%d) - 現在採用 %s 信任模型\n"
 +msgstr ""
  
- #: g10/trustdb.c:474
++#: g10/trustdb.c:481
  #, c-format
  msgid "using %s trust model\n"
 -msgstr "正在使用 %s 信任模型\n"
 +msgstr ""
  
- #: g10/trustdb.c:511
++#: g10/trustdb.c:518
  msgid "no need for a trustdb check\n"
 -msgstr "不需要檢查信任資料庫\n"
 +msgstr ""
  
- #: g10/trustdb.c:517 g10/trustdb.c:2160
++#: g10/trustdb.c:524 g10/trustdb.c:2187
  #, c-format
  msgid "next trustdb check due at %s\n"
 -msgstr "下次信任資料庫檢查將於 %s 進行\n"
 +msgstr ""
  
- #: g10/trustdb.c:526
++#: g10/trustdb.c:533
  #, c-format
  msgid "no need for a trustdb check with '%s' trust model\n"
 -msgstr "在 '%s' 信任模型中並不需要檢查信任資料庫\n"
 +msgstr ""
  
- #: g10/trustdb.c:542
++#: g10/trustdb.c:549
  #, c-format
  msgid "no need for a trustdb update with '%s' trust model\n"
 -msgstr "在 '%s' 信任模型中並不需要更新信任資料庫\n"
 +msgstr ""
  
- #: g10/trustdb.c:749 g10/trustdb.c:1313
++#: g10/trustdb.c:756 g10/trustdb.c:1340
  #, c-format
  msgid "public key %s not found: %s\n"
 -msgstr "找不到公鑰 %s: %s\n"
 +msgstr ""
  
- #: g10/trustdb.c:966
++#: g10/trustdb.c:973
  msgid "please do a --check-trustdb\n"
 -msgstr "請做一次 --check-trustdb\n"
 +msgstr ""
  
- #: g10/trustdb.c:971
++#: g10/trustdb.c:978
  msgid "checking the trustdb\n"
 -msgstr "正在檢查信任資料庫\n"
 +msgstr ""
  
- #: g10/trustdb.c:1883
 -#, fuzzy, c-format
 -#| msgid "%lu keys processed so far\n"
++#: g10/trustdb.c:1910
 +#, c-format
  msgid "%d key processed"
  msgid_plural "%d keys processed"
 -msgstr[0] "目前已處理 %lu 把金鑰\n"
 +msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/trustdb.c:1886
 -#, fuzzy, c-format
 -#| msgid "%d keys processed (%d validity counts cleared)\n"
++#: g10/trustdb.c:1913
 +#, c-format
  msgid " (%d validity count cleared)\n"
  msgid_plural " (%d validity counts cleared)\n"
 -msgstr[0] "已經處理了 %d 把金鑰 (共計已解決了 %d 份有效性)\n"
 +msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/trustdb.c:1956
++#: g10/trustdb.c:1983
  msgid "no ultimately trusted keys found\n"
 -msgstr "沒有找到任何徹底信任的金鑰\n"
 +msgstr ""
  
- #: g10/trustdb.c:1970
++#: g10/trustdb.c:1997
  #, c-format
  msgid "public key of ultimately trusted key %s not found\n"
 -msgstr "找不到徹底信任金鑰 %s 的公鑰\n"
 +msgstr ""
  
- #: g10/trustdb.c:2087
++#: g10/trustdb.c:2114
  #, 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"
 +msgstr ""
  
- #: g10/trustdb.c:2167
++#: g10/trustdb.c:2194
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
 -msgstr "無法更新信任資料庫版本記錄: 寫入失敗: %s\n"
 +msgstr ""
  
 +#: g10/trust.c:105
  msgid "undefined"
  msgstr ""
  
@@@ -7086,53 -5846,42 +7106,53 @@@ msgid "
  "Syntax: kbxutil [options] [files]\n"
  "List, export, import Keybox data\n"
  msgstr ""
 -"語法: kbxutil [選項] [檔案]\n"
 -"列出, 匯出, 匯入金鑰鑰匙盒資料\n"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3208
++#: scd/app-nks.c:718 scd/app-openpgp.c:3221
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
 -msgstr "RSA 模組缺漏或者並非 %d 位元大\n"
 +msgstr ""
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3220
++#: scd/app-nks.c:726 scd/app-openpgp.c:3233
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
 -msgstr "RSA 公用指數缺漏或者大於 %d 位元\n"
 +msgstr ""
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
- #: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
- #: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1965 scd/app-openpgp.c:1984
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2166 scd/app-openpgp.c:2430
++#: scd/app-openpgp.c:2477 scd/app-openpgp.c:2582 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
 -msgstr "收回個人識別碼 (PIN) 時傳回錯誤: %s\n"
 +msgstr ""
  
 +#: scd/app-nks.c:839
  msgid "the NullPIN has not yet been changed\n"
 -msgstr "NullPIN 還沒有變更過\n"
 +msgstr ""
  
 +#: scd/app-nks.c:1100
  msgid "|N|Please enter a new PIN for the standard keys."
 -msgstr "|N|請輸入標準金鑰將採用的新個人識別碼 (PIN)."
 +msgstr ""
  
 +#: scd/app-nks.c:1101
  msgid "||Please enter the PIN for the standard keys."
 -msgstr "||請輸入標準金鑰的個人識別碼 (PIN)."
 +msgstr ""
  
 +#: scd/app-nks.c:1107
  msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 -msgstr "|NP|請輸入標準金鑰將採用的 PIN 重設碼 (PUK)."
 +msgstr ""
  
 +#: scd/app-nks.c:1109
  msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 -msgstr "|P|請輸入標準金鑰的 PIN 重設碼 (PUK)."
 +msgstr ""
  
 +#: scd/app-nks.c:1117
  msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 -msgstr "|N|請輸入金鑰的新個人識別碼 (PIN) 以建立完善的簽章."
 +msgstr ""
  
 +#: scd/app-nks.c:1119
  msgid "||Please enter the PIN for the key to create qualified signatures."
 -msgstr "||請輸入金鑰的個人識別碼 (PIN) 以建立完善的簽章."
 +msgstr ""
  
 +#: scd/app-nks.c:1127
  msgid ""
  "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
@@@ -7142,84 -5890,69 +7162,84 @@@ msgstr "
  msgid ""
  "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
 -msgstr "|P|請輸入金鑰的 PIN 重設碼 (PUK) 以建立完善的簽章."
 +msgstr ""
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2511 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
 -msgstr "取得新的個人識別碼 (PIN) 時出錯: %s\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:806
++#: scd/app-openpgp.c:801
  #, c-format
  msgid "failed to store the fingerprint: %s\n"
 -msgstr "存放指紋失敗: %s\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:819
++#: scd/app-openpgp.c:814
  #, c-format
  msgid "failed to store the creation date: %s\n"
 -msgstr "存放創生日期失敗: %s\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:1236
++#: scd/app-openpgp.c:1247
  msgid "response does not contain the RSA modulus\n"
 -msgstr "回應中未包含 RSA 系數\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:1243
++#: scd/app-openpgp.c:1254
  msgid "response does not contain the RSA public exponent\n"
 -msgstr "回應中未包含 RSA 公用指數\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:1353
 -#, fuzzy
 -#| msgid "response does not contain the EC public point\n"
++#: scd/app-openpgp.c:1364
  msgid "response does not contain the EC public key\n"
 -msgstr "回應中未包含 EC 公用指數\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:1464 scd/app-openpgp.c:3825
  msgid "response does not contain the public key data\n"
 -msgstr "回應中未包含公鑰資料\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:1551
++#: scd/app-openpgp.c:1564
  #, c-format
  msgid "reading public key failed: %s\n"
 -msgstr "讀取公鑰時失敗: %s\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:1903
++#: scd/app-openpgp.c:1916
  #, c-format
  msgid "using default PIN as %s\n"
 -msgstr "以 %s 做為預設 PIN\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:1910
++#: scd/app-openpgp.c:1923
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 -msgstr "使用 %s 做為預設個人識別碼 (PIN) 失敗: %s - 正在停用之後的預設使用\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:1925
++#: scd/app-openpgp.c:1938
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 -msgstr "||請輸入 PIN%%0A[簽署完成: %lu]"
 +msgstr ""
  
- #: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
++#: scd/app-openpgp.c:1949 scd/app-openpgp.c:2424
  msgid "||Please enter the PIN"
 -msgstr "||請輸入個人識別碼 (PIN)"
 +msgstr ""
  
- #: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2173 scd/app-openpgp.c:2437
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
 -msgstr "用於 CHV%d 的個人識別碼 (PIN) 太短; 長度最少要有 %d\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
- #: scd/app-openpgp.c:4114
++#: scd/app-openpgp.c:2004 scd/app-openpgp.c:2043 scd/app-openpgp.c:2185
++#: scd/app-openpgp.c:4126
  #, c-format
  msgid "verify CHV%d failed: %s\n"
 -msgstr "驗證 CHV%d 失敗: %s\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
++#: scd/app-openpgp.c:2072 scd/app-openpgp.c:2458 scd/app-openpgp.c:4556
  msgid "error retrieving CHV status from card\n"
 -msgstr "從卡片取回 CHV 狀態時出錯\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
++#: scd/app-openpgp.c:2078 scd/app-openpgp.c:4565
  msgid "card is permanently locked!\n"
 -msgstr "卡片永久鎖定了!!\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:2072
 -#, fuzzy, c-format
 -#| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
++#: scd/app-openpgp.c:2085
 +#, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
  "%d Admin PIN attempts remaining before card is permanently locked\n"
@@@ -7228,485 -5960,378 +7248,485 @@@ msgstr[1] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:2082
++#: scd/app-openpgp.c:2095
  #, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 -msgstr "|A|請在上輸入管理者 PIN%%0A[剩餘嘗試次數: %d]"
 +msgstr ""
  
- #: scd/app-openpgp.c:2086
++#: scd/app-openpgp.c:2099
  msgid "|A|Please enter the Admin PIN"
 -msgstr "|A|請輸入管理者 PIN"
 +msgstr ""
  
- #: scd/app-openpgp.c:2107
++#: scd/app-openpgp.c:2120
  msgid "access to admin commands is not configured\n"
 -msgstr "管理者指令存取權限尚未組態\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:2460
++#: scd/app-openpgp.c:2473
  msgid "||Please enter the Reset Code for the card"
 -msgstr "||請輸入卡片的重設碼"
 +msgstr ""
  
- #: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
++#: scd/app-openpgp.c:2483 scd/app-openpgp.c:2537
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
 -msgstr "重設碼太短; 長度最少要有 %d\n"
 +msgstr ""
  
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2493
++#: scd/app-openpgp.c:2506
  msgid "|RN|New Reset Code"
 -msgstr "|RN|新增重設碼"
 +msgstr ""
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|AN|New Admin PIN"
 -msgstr "|AN|新增管理者個人識別碼 (PIN)"
 +msgstr ""
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|N|New PIN"
 -msgstr "|N|新增個人識別碼 (PIN)"
 +msgstr ""
  
- #: scd/app-openpgp.c:2565
++#: scd/app-openpgp.c:2578
  msgid "||Please enter the Admin PIN and New Admin PIN"
 -msgstr "||請輸入管理者 PIN 及新的管理者 PIN"
 +msgstr ""
  
- #: scd/app-openpgp.c:2566
++#: scd/app-openpgp.c:2579
  msgid "||Please enter the PIN and New PIN"
 -msgstr "||請輸入個人識別碼及新的個人識別碼 (PIN)"
 +msgstr ""
  
- #: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
++#: scd/app-openpgp.c:2635 scd/app-openpgp.c:3885
  msgid "error reading application data\n"
 -msgstr "讀取應用程式資料時出錯\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
++#: scd/app-openpgp.c:2641 scd/app-openpgp.c:3892
  msgid "error reading fingerprint DO\n"
 -msgstr "讀取指紋 DO 時出錯\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:2638
++#: scd/app-openpgp.c:2651
  msgid "key already exists\n"
 -msgstr "金鑰已存在\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2655
  msgid "existing key will be replaced\n"
 -msgstr "既有的金鑰將被取代\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:2644
++#: scd/app-openpgp.c:2657
  msgid "generating new key\n"
 -msgstr "正在產生新的金鑰\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2659
  msgid "writing new key\n"
 -msgstr "正在寫入新的金鑰\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
++#: scd/app-openpgp.c:3201 scd/app-openpgp.c:3553
  msgid "creation timestamp missing\n"
 -msgstr "缺漏創生時間戳印\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
++#: scd/app-openpgp.c:3243 scd/app-openpgp.c:3251
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
 -msgstr "RSA 質數 %s 缺漏或者並非 %d 位元大\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
++#: scd/app-openpgp.c:3384 scd/app-openpgp.c:3647
  #, c-format
  msgid "failed to store the key: %s\n"
 -msgstr "存放金鑰失敗: %s\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:3534
 -#, fuzzy
 -#| msgid "unsupported inquiry '%s'\n"
++#: scd/app-openpgp.c:3547
  msgid "unsupported curve\n"
 -msgstr "未支援的查詢 '%s'\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:3790
++#: scd/app-openpgp.c:3802
  msgid "please wait while key is being generated ...\n"
 -msgstr "正在產生金鑰中, 請稍候 ...\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:3798
++#: scd/app-openpgp.c:3810
  msgid "generating key failed\n"
 -msgstr "產生金鑰時失敗\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:3804
 -#, fuzzy, c-format
 -#| msgid "key generation completed (%d seconds)\n"
++#: scd/app-openpgp.c:3816
 +#, c-format
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
 -msgstr[0] "金鑰產生完畢 (%d 秒)\n"
 +msgstr[0] ""
 +msgstr[1] ""
  
- #: scd/app-openpgp.c:3838
++#: scd/app-openpgp.c:3850
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 -msgstr "無效的 OpenPGP 卡片結構 (DO 0x93)\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:3900
  msgid "fingerprint on card does not match requested one\n"
 -msgstr "卡片上的指紋與所要求的那個並不吻合\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:4004
++#: scd/app-openpgp.c:4016
  #, c-format
  msgid "card does not support digest algorithm %s\n"
 -msgstr "卡片不支援 %s 摘要演算法\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:4089
++#: scd/app-openpgp.c:4101
  #, c-format
  msgid "signatures created so far: %lu\n"
 -msgstr "目前建立的簽章: %lu\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:4551
++#: scd/app-openpgp.c:4570
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
 -msgstr "目前在此指令中的管理者 PIN 驗證被禁止了\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
++#: scd/app-openpgp.c:4871 scd/app-openpgp.c:4882
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
 -msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\n"
 +msgstr ""
  
 +#: scd/app-dinsig.c:299
  msgid "||Please enter your PIN at the reader's pinpad"
 -msgstr "||請在讀卡機鍵盤上輸入你的個人識別碼 (PIN)"
 +msgstr ""
  
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
 +#: scd/app-dinsig.c:529
  msgid "|N|Initial New PIN"
 -msgstr "|N|開始新增個人識別碼 (PIN)"
 +msgstr ""
  
 +#: scd/scdaemon.c:114
  msgid "run in multi server mode (foreground)"
 -msgstr "以多重伺服器模式執行 (前景)"
 +msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
  msgid "|LEVEL|set the debugging level to LEVEL"
 -msgstr "|等級|設定除錯等級為指定等級"
 +msgstr ""
  
 +#: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
  msgid "|FILE|write a log to FILE"
 -msgstr "|檔案|將日誌寫入至指定檔案"
 +msgstr ""
  
 +#: scd/scdaemon.c:134
  msgid "|N|connect to reader at port N"
 -msgstr "|N|從 N 埠連線至讀卡機"
 +msgstr ""
  
 +#: scd/scdaemon.c:136
  msgid "|NAME|use NAME as ct-API driver"
 -msgstr "|名稱|使用指定名稱做為 ct-API 驅動程式"
 +msgstr ""
  
 +#: scd/scdaemon.c:138
  msgid "|NAME|use NAME as PC/SC driver"
 -msgstr "|名稱|使用指定名稱做為 PC/SC 驅動程式"
 +msgstr ""
  
 +#: scd/scdaemon.c:141
  msgid "do not use the internal CCID driver"
 -msgstr "不要使用內部的 CCID 驅動程式"
 +msgstr ""
  
 +#: scd/scdaemon.c:147
  msgid "|N|disconnect the card after N seconds of inactivity"
 -msgstr "|N|沒有活動達 N 秒後就與卡片斷線"
 +msgstr ""
  
 +#: scd/scdaemon.c:150
  msgid "do not use a reader's pinpad"
 -msgstr "不要使用讀卡機鍵盤"
 +msgstr ""
  
 +#: scd/scdaemon.c:155
  msgid "deny the use of admin card commands"
 -msgstr "禁用管理者卡片指令"
 +msgstr ""
  
 +#: scd/scdaemon.c:158
  msgid "use variable length input for pinpad"
 -msgstr "輸入 PIN 時在輸入區顯示成變動長度"
 +msgstr ""
  
- #: scd/scdaemon.c:287
++#: scd/scdaemon.c:286
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 -msgstr "用法: @SCDAEMON@ [選項] (或用 -h 求助)"
 +msgstr ""
  
- #: scd/scdaemon.c:289
++#: scd/scdaemon.c:288
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
  msgstr ""
 -"語法: scdaemon [選項] [指令 [引數]]\n"
 -"@GNUPG@ 智慧卡服務\n"
  
- #: scd/scdaemon.c:786
++#: scd/scdaemon.c:784
  msgid "please use the option '--daemon' to run the program in the background\n"
 -msgstr "請使用 '--daemon' 選項來將此程式執行於背景\n"
 +msgstr ""
  
- #: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1904
  #, c-format
  msgid "handler for fd %d started\n"
 -msgstr "用於 fd %d 的經手程式已啟動\n"
 +msgstr ""
  
- #: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
++#: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1909
  #, c-format
  msgid "handler for fd %d terminated\n"
 -msgstr "用於 fd %d 的經手程式已終止\n"
 +msgstr ""
  
 +#: sm/base64.c:327
  #, c-format
  msgid "invalid radix64 character %02x skipped\n"
 -msgstr "已跳過無效的 radix64 字符 %02x\n"
 +msgstr ""
  
 -#, fuzzy
 -#| msgid "no gpg-agent running in this session\n"
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  msgid "no dirmngr running in this session\n"
 -msgstr "在此階段中沒有執行中的 gpg-agent\n"
 +msgstr ""
  
 +#: sm/certchain.c:194
  #, c-format
  msgid "validation model requested by certificate: %s"
 -msgstr "憑證所要求的驗證模型: %s"
 +msgstr ""
  
 +#: sm/certchain.c:195 sm/certchain.c:1937
  msgid "chain"
 -msgstr "chain"
 +msgstr ""
  
 +#: sm/certchain.c:196 sm/certchain.c:1937
  msgid "shell"
 -msgstr "shell"
 +msgstr ""
  
 +#: sm/certchain.c:256 dirmngr/validate.c:107
  #, c-format
  msgid "critical certificate extension %s is not supported"
 -msgstr "未支援關鍵憑證擴充欄位 %s"
 +msgstr ""
  
 +#: sm/certchain.c:295 dirmngr/validate.c:205
  msgid "issuer certificate is not marked as a CA"
 -msgstr "發行者憑證並未標記為 CA"
 +msgstr ""
  
 +#: sm/certchain.c:333
  msgid "critical marked policy without configured policies"
 -msgstr "關鍵已標記原則沒有已組態的原則"
 +msgstr ""
  
 +#: sm/certchain.c:343
  #, c-format
  msgid "failed to open '%s': %s\n"
 -msgstr "開啟 '%s' 失敗: %s\n"
 +msgstr ""
  
 +#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
  msgid "Note: non-critical certificate policy not allowed"
 -msgstr "請注意: 不允許非關鍵的憑證原則"
 +msgstr ""
  
 +#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
  msgid "certificate policy not allowed"
 -msgstr "未允許憑證原則"
 +msgstr ""
  
 +#: sm/certchain.c:538
  msgid "looking up issuer at external location\n"
 -msgstr "從外部位置尋找發行者\n"
 +msgstr ""
  
 +#: sm/certchain.c:558
  #, c-format
  msgid "number of issuers matching: %d\n"
 -msgstr "吻合的發行者數量: %d\n"
 +msgstr ""
  
 +#: sm/certchain.c:606
  msgid "looking up issuer from the Dirmngr cache\n"
 -msgstr "從 Dirmngr 快取尋找發行者\n"
 +msgstr ""
  
 +#: sm/certchain.c:631
  #, c-format
  msgid "number of matching certificates: %d\n"
 -msgstr "吻合的憑證數量: %d\n"
 +msgstr ""
  
 +#: sm/certchain.c:634
  #, c-format
  msgid "dirmngr cache-only key lookup failed: %s\n"
 -msgstr "尋找限於 dirmngr 快取的金鑰時失敗: %s\n"
 +msgstr ""
  
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
 +#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  msgid "failed to allocate keyDB handle\n"
 -msgstr "配置 keyDB 代號失敗\n"
 +msgstr ""
  
 +#: sm/certchain.c:999
  msgid "certificate has been revoked"
 -msgstr "憑證已撤銷"
 +msgstr ""
  
 +#: sm/certchain.c:1014
  msgid "the status of the certificate is unknown"
 -msgstr "憑證的狀態未知"
 +msgstr ""
  
 +#: sm/certchain.c:1021
  msgid "please make sure that the \"dirmngr\" is properly installed\n"
 -msgstr "請確認 \"dirmngr\" 已安裝妥善\n"
 +msgstr ""
  
 +#: sm/certchain.c:1027
  #, c-format
  msgid "checking the CRL failed: %s"
 -msgstr "檢查 CRL 時失敗: %s"
 +msgstr ""
  
 +#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
  #, c-format
  msgid "certificate with invalid validity: %s"
 -msgstr "有效性無效的憑證: %s"
 +msgstr ""
  
 +#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
  msgid "certificate not yet valid"
 -msgstr "憑證尚未生效"
 +msgstr ""
  
 +#: sm/certchain.c:1072 sm/certchain.c:1157
  msgid "root certificate not yet valid"
 -msgstr "根憑證尚未生效"
 +msgstr ""
  
 +#: sm/certchain.c:1073 sm/certchain.c:1158
  msgid "intermediate certificate not yet valid"
 -msgstr "媒介憑證尚未生效"
 +msgstr ""
  
 +#: sm/certchain.c:1086 dirmngr/validate.c:498
  msgid "certificate has expired"
 -msgstr "憑證已過期"
 +msgstr ""
  
 +#: sm/certchain.c:1087
  msgid "root certificate has expired"
 -msgstr "根憑證已過期"
 +msgstr ""
  
 +#: sm/certchain.c:1088
  msgid "intermediate certificate has expired"
 -msgstr "媒介憑證已過期"
 +msgstr ""
  
 +#: sm/certchain.c:1130
  #, c-format
  msgid "required certificate attributes missing: %s%s%s"
 -msgstr "遺失所需的憑證屬性: %s%s%s"
 +msgstr ""
  
 +#: sm/certchain.c:1139
  msgid "certificate with invalid validity"
 -msgstr "有效性無效的憑證"
 +msgstr ""
  
 +#: sm/certchain.c:1176
  msgid "signature not created during lifetime of certificate"
 -msgstr "簽章並非在憑證生存時間內所造"
 +msgstr ""
  
 +#: sm/certchain.c:1178
  msgid "certificate not created during lifetime of issuer"
 -msgstr "憑證並非在發行者生存時間內所造"
 +msgstr ""
  
 +#: sm/certchain.c:1179
  msgid "intermediate certificate not created during lifetime of issuer"
 -msgstr "媒介憑證並非在發行者生存時間內所造"
 +msgstr ""
  
 +#: sm/certchain.c:1183
  msgid "  (  signature created at "
 -msgstr "  (            簽章建立於 "
 +msgstr ""
  
 +#: sm/certchain.c:1184
  msgid "  (certificate created at "
 -msgstr "  (            憑證建立於 "
 +msgstr ""
  
 +#: sm/certchain.c:1187
  msgid "  (certificate valid from "
 -msgstr "  (憑證有效自 "
 +msgstr ""
  
 +#: sm/certchain.c:1188
  msgid "  (     issuer valid from "
 -msgstr "  (        發行者有效自 "
 +msgstr ""
  
 +#: sm/certchain.c:1218 dirmngr/validate.c:548
  #, c-format
  msgid "fingerprint=%s\n"
 -msgstr "指紋=%s\n"
 +msgstr ""
  
 +#: sm/certchain.c:1227
  msgid "root certificate has now been marked as trusted\n"
 -msgstr "根憑證現在已標記為已信任\n"
 +msgstr ""
  
 +#: sm/certchain.c:1240
  msgid "interactive marking as trusted not enabled in gpg-agent\n"
 -msgstr "在 gpg-agent 中未啟用互動式標記為已信任\n"
 +msgstr ""
  
 +#: sm/certchain.c:1246
  msgid "interactive marking as trusted disabled for this session\n"
 -msgstr "互動式標記為已信任在此作業階段中已停用\n"
 +msgstr ""
  
 +#: sm/certchain.c:1304
  msgid "WARNING: creation time of signature not known - assuming current time"
 -msgstr "警告: 簽章創造時間未知 - 假設為此刻"
 +msgstr ""
  
 +#: sm/certchain.c:1368
  msgid "no issuer found in certificate"
 -msgstr "憑證中找不到發行者"
 +msgstr ""
  
 +#: sm/certchain.c:1446
  msgid "self-signed certificate has a BAD signature"
 -msgstr "自簽憑證有 不良 簽章"
 +msgstr ""
  
 +#: sm/certchain.c:1515 dirmngr/validate.c:546
  msgid "root certificate is not marked trusted"
 -msgstr "根憑證未標記為已信任"
 +msgstr ""
  
 +#: sm/certchain.c:1531
  #, c-format
  msgid "checking the trust list failed: %s\n"
 -msgstr "檢查信任清單時失敗: %s\n"
 +msgstr ""
  
 +#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
  msgid "certificate chain too long\n"
 -msgstr "憑證鏈太長\n"
 +msgstr ""
  
 +#: sm/certchain.c:1574 dirmngr/validate.c:613
  msgid "issuer certificate not found"
 -msgstr "找不到發行者憑證"
 +msgstr ""
  
 +#: sm/certchain.c:1607 dirmngr/validate.c:639
  msgid "certificate has a BAD signature"
 -msgstr "憑證有 不良 簽章"
 +msgstr ""
  
 +#: sm/certchain.c:1639 dirmngr/validate.c:663
  msgid "found another possible matching CA certificate - trying again"
 -msgstr "找到了另一個可能吻合的 CA 憑證 - 正再試一次"
 +msgstr ""
  
 +#: sm/certchain.c:1698 dirmngr/validate.c:688
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
 -msgstr "憑證鏈比 CA 所允許的 (%d) 還長"
 +msgstr ""
  
 +#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
  msgid "certificate is good\n"
 -msgstr "憑證完好\n"
 +msgstr ""
  
 +#: sm/certchain.c:1741
  msgid "intermediate certificate is good\n"
 -msgstr "媒介憑證良好\n"
 +msgstr ""
  
 +#: sm/certchain.c:1742
  msgid "root certificate is good\n"
 -msgstr "根憑證完好\n"
 +msgstr ""
  
 +#: sm/certchain.c:1924
  msgid "switching to chain model"
 -msgstr "切換至鏈模型"
 +msgstr ""
  
 +#: sm/certchain.c:1933
  #, c-format
  msgid "validation model used: %s"
 -msgstr "已使用的驗證模型: %s"
 +msgstr ""
  
 +#: sm/certcheck.c:107
  #, c-format
  msgid "a %u bit hash is not valid for a %u bit %s key\n"
 -msgstr "%u 位元的雜湊對 %u 位元的 %s 金鑰來說是無效的\n"
 +msgstr ""
  
 +#: sm/certcheck.c:244 sm/verify.c:202
  msgid "(this is the MD2 algorithm)\n"
 -msgstr "(這是 MD2 演算法)\n"
 +msgstr ""
  
 +#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
  msgid "none"
 -msgstr "無"
 +msgstr ""
  
 +#: sm/certdump.c:552 sm/certdump.c:617
  msgid "[Error - invalid encoding]"
 -msgstr "[錯誤 - 無效的編碼]"
 +msgstr ""
  
 +#: sm/certdump.c:560
  msgid "[Error - out of core]"
 -msgstr "[錯誤 - 超出核心]"
 +msgstr ""
  
 +#: sm/certdump.c:596
  msgid "[Error - No name]"
 -msgstr "[錯誤 - 沒有名稱]"
 +msgstr ""
  
 +#: sm/certdump.c:623
  msgid "[Error - invalid DN]"
 -msgstr "[錯誤 - 無效的 DN]"
 +msgstr ""
  
 +#: sm/certdump.c:833
  #, c-format
  msgid ""
  "Please enter the passphrase to unlock the secret key for the X.509 "
@@@ -7912,346 -6501,270 +7932,346 @@@ msgstr "
  #. adjust it do the length of your translation.  The
  #. second string is merely passed to atoi so you can
  #. drop everything after the number.
 +#: sm/certreqgen-ui.c:324
  #, c-format
  msgid "Invalid subject name '%s'\n"
 -msgstr "無效的主旨名稱 '%s'\n"
 +msgstr ""
  
 +#: sm/certreqgen-ui.c:326
  msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
 -msgstr "16"
 +msgstr ""
  
 +#: sm/certreqgen-ui.c:338
  msgid "Enter email addresses"
 -msgstr "請輸入電子郵件地址"
 +msgstr ""
  
 +#: sm/certreqgen-ui.c:339
  msgid " (end with an empty line):\n"
 -msgstr " (以空白列結束):\n"
 +msgstr ""
  
 +#: sm/certreqgen-ui.c:343
  msgid "Enter DNS names"
 -msgstr "請輸入 DNS 名稱"
 +msgstr ""
  
 +#: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
  msgid " (optional; end with an empty line):\n"
 -msgstr " (非必要; 以空白列結束):\n"
 +msgstr ""
  
 +#: sm/certreqgen-ui.c:348
  msgid "Enter URIs"
 -msgstr "請輸入 URI"
 +msgstr ""
  
 +#: sm/certreqgen-ui.c:355
  msgid "Create self-signed certificate? (y/N) "
 -msgstr "要建立自簽憑證嗎? (y/N) "
 +msgstr ""
  
 +#: sm/certreqgen-ui.c:382
  msgid "These parameters are used:\n"
 -msgstr "採用下列這些參數:\n"
 +msgstr ""
  
 +#: sm/certreqgen-ui.c:400
  msgid "Now creating self-signed certificate.  "
 -msgstr "現在正在建立自簽憑證.  "
 +msgstr ""
  
 +#: sm/certreqgen-ui.c:402
  msgid "Now creating certificate request.  "
 -msgstr "現在正在建立憑證請求.  "
 +msgstr ""
  
 +#: sm/certreqgen-ui.c:403
  msgid "This may take a while ...\n"
 -msgstr "這可能會花點時間 ...\n"
 +msgstr ""
  
 +#: sm/certreqgen-ui.c:414
  msgid "Ready.\n"
 -msgstr "準備妥當.\n"
 +msgstr ""
  
 +#: sm/certreqgen-ui.c:417
  msgid "Ready.  You should now send this request to your CA.\n"
 -msgstr "準備好了.  你現在就該把此請求送到你的 CA.\n"
 +msgstr ""
  
 +#: sm/certreqgen-ui.c:423
  msgid "resource problem: out of core\n"
 -msgstr "資源問題: 超出核心\n"
 +msgstr ""
  
- #: sm/decrypt.c:330
++#: sm/decrypt.c:332
  msgid "(this is the RC2 algorithm)\n"
 -msgstr "(這是 RC2 演算法)\n"
 +msgstr ""
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:334
  msgid "(this does not seem to be an encrypted message)\n"
 -msgstr "(這看起來不像是個加密過的訊息)\n"
 +msgstr ""
  
 +#: sm/delete.c:51 sm/delete.c:112
  #, c-format
  msgid "certificate '%s' not found: %s\n"
 -msgstr "找不到憑證 '%s': %s\n"
 +msgstr ""
  
 +#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
  #, c-format
  msgid "error locking keybox: %s\n"
 -msgstr "鎖住金鑰鑰匙盒時出錯: %s\n"
 +msgstr ""
  
 +#: sm/delete.c:143
  #, c-format
  msgid "duplicated certificate '%s' deleted\n"
 -msgstr "重複的憑證 '%s' 已刪除\n"
 +msgstr ""
  
 +#: sm/delete.c:145
  #, c-format
  msgid "certificate '%s' deleted\n"
 -msgstr "憑證 '%s' 已刪除\n"
 +msgstr ""
  
 +#: sm/delete.c:175
  #, c-format
  msgid "deleting certificate \"%s\" failed: %s\n"
 -msgstr "刪除憑證 \"%s\" 時失敗: %s\n"
 +msgstr ""
  
 +#: sm/encrypt.c:328
  msgid "no valid recipients given\n"
 -msgstr "沒有給定有效的收件者\n"
 +msgstr ""
  
 +#: sm/gpgsm.c:209
  msgid "list external keys"
 -msgstr "列出外部金鑰"
 +msgstr ""
  
 +#: sm/gpgsm.c:211
  msgid "list certificate chain"
 -msgstr "列出憑證鏈"
 +msgstr ""
  
- #: sm/gpgsm.c:218
++#: sm/gpgsm.c:219
  msgid "import certificates"
 -msgstr "匯入憑證"
 +msgstr ""
  
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
  msgid "export certificates"
 -msgstr "匯出憑證"
 +msgstr ""
  
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:228
  msgid "register a smartcard"
 -msgstr "註冊智慧卡"
 +msgstr ""
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:231
  msgid "pass a command to the dirmngr"
 -msgstr "將指令遞送給 dirmngr"
 +msgstr ""
  
- #: sm/gpgsm.c:232
++#: sm/gpgsm.c:233
  msgid "invoke gpg-protect-tool"
 -msgstr "叫用 gpg-protect-tool"
 +msgstr ""
  
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:250
  msgid "create base-64 encoded output"
 -msgstr "建立以 base-64 編碼過的輸出"
 +msgstr ""
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in PEM format"
 -msgstr "假設輸入的是 PEM 格式"
 +msgstr ""
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in base-64 format"
 -msgstr "假設輸入的是 base-64 格式"
 +msgstr ""
  
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:262
  msgid "assume input is in binary format"
 -msgstr "假設輸入的是二進制格式"
 +msgstr ""
  
- #: sm/gpgsm.c:267
++#: sm/gpgsm.c:269
  msgid "never consult a CRL"
 -msgstr "永遠不要查閱 CRL"
 +msgstr ""
  
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:279
  msgid "check validity using OCSP"
 -msgstr "用 OCSP 檢查有效性"
 +msgstr ""
  
- #: sm/gpgsm.c:282
++#: sm/gpgsm.c:284
  msgid "|N|number of certificates to include"
 -msgstr "|N|要包含的憑證數量"
 +msgstr ""
  
- #: sm/gpgsm.c:285
++#: sm/gpgsm.c:287
  msgid "|FILE|take policy information from FILE"
 -msgstr "|檔案|從指定檔案中取得原則資訊"
 +msgstr ""
  
- #: sm/gpgsm.c:288
++#: sm/gpgsm.c:290
  msgid "do not check certificate policies"
 -msgstr "不要檢查憑證原則"
 +msgstr ""
  
- #: sm/gpgsm.c:292
++#: sm/gpgsm.c:294
  msgid "fetch missing issuer certificates"
 -msgstr "取回遺失的發行者憑證"
 +msgstr ""
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "don't use the terminal at all"
 -msgstr "完全不要使用終端機"
 +msgstr ""
  
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:307
  msgid "|FILE|write a server mode log to FILE"
 -msgstr "|檔案|將伺服器模式日誌寫入至指定檔案"
 +msgstr ""
  
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:312
  msgid "|FILE|write an audit log to FILE"
 -msgstr "|檔案|將稽核日誌寫入至指定檔案"
 +msgstr ""
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "batch mode: never ask"
 -msgstr "批次模式: 永遠不詢問"
 +msgstr ""
  
- #: sm/gpgsm.c:314
++#: sm/gpgsm.c:316
  msgid "assume yes on most questions"
 -msgstr "假設大部分的問題都回答是"
 +msgstr ""
  
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:317
  msgid "assume no on most questions"
 -msgstr "假設大部分的問題都回答否"
 +msgstr ""
  
- #: sm/gpgsm.c:318
++#: sm/gpgsm.c:320
  msgid "|FILE|add keyring to the list of keyrings"
 -msgstr "|檔案|將此金鑰鑰匙圈加到指定金鑰鑰匙圈清單檔案中"
 +msgstr ""
  
- #: sm/gpgsm.c:321
++#: sm/gpgsm.c:323
  msgid "|USER-ID|use USER-ID as default secret key"
 -msgstr "|使用者-ID|使用指定使用者 ID 做為預設私鑰"
 +msgstr ""
  
- #: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
  msgid "|SPEC|use this keyserver to lookup keys"
 -msgstr "|SPEC|使用此金鑰伺服器來查找金鑰"
 +msgstr ""
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use cipher algorithm NAME"
 -msgstr "|名稱|使用指定名稱的編密演算法"
 +msgstr ""
  
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:352
  msgid "|NAME|use message digest algorithm NAME"
 -msgstr "|名稱|使用指定名稱的訊息摘要演算法"
 +msgstr ""
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:559
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 -msgstr "用法: @GPGSM@ [選項] [檔案] (或用 -h 求助)"
 +msgstr ""
  
- #: sm/gpgsm.c:570
++#: sm/gpgsm.c:562
  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 ""
 -"語法: @GPGSM@ [選項] [檔案]\n"
 -"用 S/MIME 協定來簽署, 檢查, 加密, 解密\n"
 -"預設的操作會依輸入資料而定\n"
  
- #: sm/gpgsm.c:774
++#: sm/gpgsm.c:766
  #, c-format
  msgid "Note: won't be able to encrypt to '%s': %s\n"
 -msgstr "請注意: 將無法加密為 '%s': %s\n"
 +msgstr ""
  
- #: sm/gpgsm.c:785
++#: sm/gpgsm.c:777
  #, c-format
  msgid "unknown validation model '%s'\n"
 -msgstr "未知的驗證模型 '%s'\n"
 +msgstr ""
  
- #: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
  #, c-format
  msgid "%s:%u: no hostname given\n"
 -msgstr "%s:%u: 沒有給定主機名稱\n"
 +msgstr ""
  
- #: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
 -msgstr "%s:%u: 給定的密碼沒有使用者\n"
 +msgstr ""
  
- #: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
  #, c-format
  msgid "%s:%u: skipping this line\n"
 -msgstr "%s:%u: 正在跳過這一列\n"
 +msgstr ""
  
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1427
  msgid "could not parse keyserver\n"
 -msgstr "無法剖析金鑰伺服器\n"
 +msgstr ""
  
- #: sm/gpgsm.c:1636
++#: sm/gpgsm.c:1630
  #, c-format
  msgid "importing common certificates '%s'\n"
 -msgstr "正在匯入通用憑證 '%s'\n"
 +msgstr ""
  
- #: sm/gpgsm.c:1677
++#: sm/gpgsm.c:1671
  #, c-format
  msgid "can't sign using '%s': %s\n"
 -msgstr "無法用 '%s' 來簽署: %s\n"
 +msgstr ""
  
- #: sm/gpgsm.c:2033
++#: sm/gpgsm.c:2028
  msgid "invalid command (there is no implicit command)\n"
 -msgstr "無效的指令 (沒有這樣的指令)\n"
 +msgstr ""
  
 +#: sm/import.c:127
  #, c-format
  msgid "total number processed: %lu\n"
 -msgstr "處理總量: %lu\n"
 +msgstr ""
  
 +#: sm/import.c:246
  msgid "error storing certificate\n"
 -msgstr "存放憑證時出錯\n"
 +msgstr ""
  
 +#: sm/import.c:254
  msgid "basic certificate checks failed - not imported\n"
 -msgstr "基本的憑證檢查失敗了 - 未匯入\n"
 +msgstr ""
  
 +#: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
  #, c-format
  msgid "error getting stored flags: %s\n"
 -msgstr "取得已存放的旗標時出錯: %s\n"
 +msgstr ""
  
 +#: sm/import.c:526 sm/import.c:558
  #, c-format
  msgid "error importing certificate: %s\n"
 -msgstr "匯入憑證時出錯: %s\n"
 +msgstr ""
  
 +#: sm/import.c:746 tools/gpg-connect-agent.c:1433
  #, c-format
  msgid "error reading input: %s\n"
 -msgstr "讀取輸入時出錯: %s\n"
 +msgstr ""
  
 +#: sm/keydb.c:1126 sm/keydb.c:1212
  msgid "failed to get the fingerprint\n"
 -msgstr "取得指紋失敗\n"
 +msgstr ""
  
 +#: sm/keydb.c:1168
  #, c-format
  msgid "problem looking for existing certificate: %s\n"
 -msgstr "查找既有憑證的問題: %s\n"
 +msgstr ""
  
 +#: sm/keydb.c:1180
  #, c-format
  msgid "error finding writable keyDB: %s\n"
 -msgstr "尋找可寫入的 keyDB 時出錯: %s\n"
 +msgstr ""
  
 +#: sm/keydb.c:1188
  #, c-format
  msgid "error storing certificate: %s\n"
 -msgstr "存放憑證時出錯: %s\n"
 +msgstr ""
  
 +#: sm/keydb.c:1240
  #, c-format
  msgid "problem re-searching certificate: %s\n"
 -msgstr "重新搜尋憑證的問題: %s\n"
 +msgstr ""
  
 +#: sm/keydb.c:1261 sm/keydb.c:1350
  #, c-format
  msgid "error storing flags: %s\n"
 -msgstr "存放旗標時出錯: %s\n"
 +msgstr ""
  
 +#: sm/keylist.c:657
  msgid "Error - "
 -msgstr "錯誤 - "
 +msgstr ""
  
 +#: sm/misc.c:58
  msgid "GPG_TTY has not been set - using maybe bogus default\n"
 -msgstr "尚未設定 GPG_TTY - 使用可能是偽造的預設值\n"
 +msgstr ""
  
 +#: sm/qualified.c:105
  #, c-format
  msgid "invalid formatted fingerprint in '%s', line %d\n"
 -msgstr "無效的格式化指紋於 '%s', 第 %d 列\n"
 +msgstr ""
  
 +#: sm/qualified.c:123
  #, c-format
  msgid "invalid country code in '%s', line %d\n"
 -msgstr "無效的國家代碼於 '%s', 第 %d 列\n"
 +msgstr ""
  
 +#: sm/qualified.c:206
  #, c-format
  msgid ""
  "You are about to create a signature using your certificate:\n"
@@@ -8838,1302 -7240,1049 +8858,1316 @@@ msgstr "
  msgid ""
  " ERROR: The CRL will not be used because it was still too old after an "
  "update!\n"
 -msgstr " 錯誤: 將不採用此 CRL, 因為更新之後仍然太過老舊!\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:2298
  msgid ""
  " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 -msgstr " 錯誤: 將不採用此 CRL, 因為有未知的關鍵擴充欄位!\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:2301
  msgid " ERROR: The CRL will not be used\n"
 -msgstr " 錯誤: 將不採用此 CRL\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:2308
  msgid " ERROR: This cached CRL may have been tampered with!\n"
 -msgstr " 錯誤: 這個快取中的 CRL 可能已遭竄改!\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:2326
  msgid " WARNING: invalid cache record length\n"
 -msgstr " 警告: 無效的快取記錄長度\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:2333
  #, c-format
  msgid "problem reading cache record: %s\n"
 -msgstr "讀取快取記錄時發生問題: %s\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:2344
  #, c-format
  msgid "problem reading cache key: %s\n"
 -msgstr "讀取快取金鑰時發生問題: %s\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:2375
  #, c-format
  msgid "error reading cache entry from db: %s\n"
 -msgstr "從資料庫讀取快取項目時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:2378
  msgid "End CRL dump\n"
 -msgstr "CRL 傾印結束\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:2499
  #, c-format
  msgid "crl_fetch via DP failed: %s\n"
 -msgstr "經由 DP 的 crl_fetch 失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:2510
  #, c-format
  msgid "crl_cache_insert via DP failed: %s\n"
 -msgstr "經由 DP 的 crl_cache_insert 失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:2570
  #, c-format
  msgid "crl_cache_insert via issuer failed: %s\n"
 -msgstr "經由發行者的 crl_cache_insert 失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/crlfetch.c:74
  msgid "reader to file mapping table full - waiting\n"
 -msgstr "讀取程式至檔案映射表已滿 - 正在等待\n"
 +msgstr ""
  
 +#: dirmngr/crlfetch.c:182
  msgid "using \"http\" instead of \"https\"\n"
 -msgstr "正改以 \"http\" 代替 \"https\"\n"
 +msgstr ""
  
 +#: dirmngr/crlfetch.c:193 dirmngr/crlfetch.c:289 dirmngr/crlfetch.c:327
 +#: dirmngr/crlfetch.c:359
  #, c-format
  msgid "CRL access not possible due to disabled %s\n"
 -msgstr "不可能存取 CRL 因已停用 %s\n"
 +msgstr ""
  
 +#: dirmngr/crlfetch.c:223 dirmngr/ldap-wrapper-ce.c:488
- #: dirmngr/ldap-wrapper.c:742 dirmngr/misc.c:563
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:563
  #, c-format
  msgid "error initializing reader object: %s\n"
 -msgstr "啟始讀取程式物件時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
  #, c-format
  msgid "URL '%s' redirected to '%s' (%u)\n"
 -msgstr "網址 '%s' 重新轉向至 '%s' (%u)\n"
 +msgstr ""
  
 +#: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
  msgid "too many redirections\n"
 -msgstr "太多重新導向\n"
 +msgstr ""
  
 +#: dirmngr/crlfetch.c:274
  #, c-format
  msgid "error retrieving '%s': %s\n"
 -msgstr "取回 '%s' 時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/crlfetch.c:279
  #, c-format
  msgid "error retrieving '%s': http status %u\n"
 -msgstr "取回 '%s' 時出錯: http 狀態 %u\n"
 +msgstr ""
  
 -#, fuzzy
 -#| msgid "CRL access not possible due to disabled %s\n"
 +#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
 +#: dirmngr/crlfetch.c:381
  msgid "CRL access not possible due to Tor mode\n"
 -msgstr "不可能存取 CRL 因已停用 %s\n"
 +msgstr ""
  
 +#: dirmngr/crlfetch.c:386
  #, c-format
  msgid "certificate search not possible due to disabled %s\n"
 -msgstr "不可能進行憑證搜尋, 因為已停用 %s\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:71
  msgid "use OCSP instead of CRLs"
 -msgstr "改以 OCSP 代替 CRL"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:72
  msgid "check whether a dirmngr is running"
 -msgstr "檢查 dirmngr 是否正在執行"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:73
  msgid "add a certificate to the cache"
 -msgstr "加入憑證至快取"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:74
  msgid "validate a certificate"
 -msgstr "驗證憑證"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:75
  msgid "lookup a certificate"
 -msgstr "查找憑證"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:76
  msgid "lookup only locally stored certificates"
 -msgstr "僅查找存放於本地端的憑證憑證"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:77
  msgid "expect an URL for --lookup"
 -msgstr "應該要給 --lookup 某個網址"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:78
  msgid "load a CRL into the dirmngr"
 -msgstr "載入 CRL 至 dirmngr"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:79
  msgid "special mode for use by Squid"
 -msgstr "搭配 Squid 使用的特殊模式"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:80
  msgid "expect certificates in PEM format"
 -msgstr "預期憑證應為 PEM 格式"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:82
  msgid "force the use of the default OCSP responder"
 -msgstr "強制使用預設的 OCSP 回應程式"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:169
  msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 -msgstr "用法: dirmngr-client [選項] [憑證檔案|模式](或用 -h 求助)\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:173
  msgid ""
  "Syntax: dirmngr-client [options] [certfile|pattern]\n"
  "Test an X.509 certificate against a CRL or do an OCSP check\n"
  "The process returns 0 if the certificate is valid, 1 if it is\n"
  "not valid and other error codes for general failures\n"
  msgstr ""
 -"語法: dirmngr-client [選項] [憑證檔案|模式]\n"
 -"以 CRL 測試 X.509 憑證, 或進行 OCSP 檢查\n"
 -"如果憑證有效, 此程序將傳回 0; 如果憑證無效\n"
 -"則傳回 1; 其他錯誤代碼則代表不同的一般性失敗\n"
  
 +#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
  #, c-format
  msgid "error reading certificate from stdin: %s\n"
 -msgstr "從標準輸入讀取憑證時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:281
  #, c-format
  msgid "error reading certificate from '%s': %s\n"
 -msgstr "從 '%s' 讀取憑證時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:295
  msgid "certificate too large to make any sense\n"
 -msgstr "憑證大到全然不合理的境界\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:310
  #, c-format
  msgid "can't connect to the dirmngr: %s\n"
 -msgstr "無法連接至 dirmngr: %s\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:332
  #, c-format
  msgid "lookup failed: %s\n"
 -msgstr "查找失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:347
  #, c-format
  msgid "loading CRL '%s' failed: %s\n"
 -msgstr "載入 CRL '%s' 時失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:375
  msgid "a dirmngr daemon is up and running\n"
 -msgstr "有個 dirmngr 服務已啟動並正在執行中\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:397
  #, c-format
  msgid "validation of certificate failed: %s\n"
 -msgstr "憑證之驗證失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
  msgid "certificate is valid\n"
 -msgstr "憑證有效\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
  msgid "certificate has been revoked\n"
 -msgstr "憑證已遭撤銷\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
  #, c-format
  msgid "certificate check failed: %s\n"
 -msgstr "憑證檢查失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:428
  #, c-format
  msgid "got status: '%s'\n"
 -msgstr "得到狀態: '%s'\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:443
  #, c-format
  msgid "error writing base64 encoding: %s\n"
 -msgstr "寫入 base64 編碼時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:701
  #, c-format
  msgid "unsupported inquiry '%s'\n"
 -msgstr "未支援的查詢 '%s'\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:803
  msgid "absolute file name expected\n"
 -msgstr "應該要有絕對檔名\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:848
  #, c-format
  msgid "looking up '%s'\n"
 -msgstr "正在查找 '%s'\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:160
  msgid "list the contents of the CRL cache"
 -msgstr "列出 CRL 快取的內容"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:158
++#: dirmngr/dirmngr.c:161
  msgid "|FILE|load CRL from FILE into cache"
 -msgstr "|檔案|從指定檔案載入 CRL 至快取"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:162
  msgid "|URL|fetch a CRL from URL"
 -msgstr "|網址|從指定網址取得 CRL"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:163
  msgid "shutdown the dirmngr"
 -msgstr "關閉 dirmngr"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:164
  msgid "flush the cache"
 -msgstr "清除快取"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
- #: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
++#: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
  msgid "|FILE|write server mode logs to FILE"
 -msgstr "|檔案|將伺服器模式日誌寫入至指定檔案"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:177
++#: dirmngr/dirmngr.c:180
  msgid "run without asking a user"
 -msgstr "以不詢問使用者的方式執行"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:181
  msgid "force loading of outdated CRLs"
 -msgstr "強迫載入過時的 CRL"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:182
  msgid "allow sending OCSP requests"
 -msgstr "允許送出 OCSP 請求"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:184
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:185
  msgid "inhibit the use of HTTP"
 -msgstr "避免使用 HTTP"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:186
  msgid "inhibit the use of LDAP"
 -msgstr "避免使用 LDAP"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:188
  msgid "ignore HTTP CRL distribution points"
 -msgstr "忽略 HTTP CRL 分布點"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
  msgid "ignore LDAP CRL distribution points"
 -msgstr "忽略 LDAP CRL 分布點"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:192
  msgid "ignore certificate contained OCSP service URLs"
 -msgstr "忽略含有 OCSP 伺服器網址的憑證"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
  msgid "|URL|redirect all HTTP requests to URL"
 -msgstr "|網址|重新導向所有對指定網址提出的 HTTP 請求"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
  msgid "|HOST|use HOST for LDAP queries"
 -msgstr "|主機|指定 LDAP 查詢主機"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
  msgid "do not use fallback hosts with --ldap-proxy"
 -msgstr "不要將主機備案與 --ldap-proxy 並用"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:202
  msgid "|FILE|read LDAP server list from FILE"
 -msgstr "|檔案|從指定檔案讀取 LDAP 伺服器清單"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
  msgid "add new servers discovered in CRL distribution points to serverlist"
 -msgstr "將從 CRL 分布點發現的新伺服器加入至伺服器清單"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
 -msgstr "|N|把 LDAP 逾時設成 N 秒"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:210
  msgid "|URL|use OCSP responder at URL"
 -msgstr "|網址|使用位於指定網址的 OCSP 回應程式"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:212
  msgid "|FPR|OCSP response signed by FPR"
 -msgstr "|FPR|由 FPR 簽署的 OCSP 回應"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:218
  msgid "|N|do not return more than N items in one query"
 -msgstr "|N|單次查詢不要傳回超過 N 筆項目"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:220
++#: dirmngr/dirmngr.c:223
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 -msgstr "|檔案|在 HKP over TLS 的指定檔案中使用 CA 憑證"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:225
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:240
++#: dirmngr/dirmngr.c:246
  msgid ""
  "@\n"
  "(See the \"info\" manual for a complete listing of all commands and "
  "options)\n"
  msgstr ""
 -"@\n"
 -"(請參照「資訊」手冊來取得所有命令和選項的完整清單)\n"
  
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:361
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 -msgstr "用法: @DIRMNGR@ [選項] (或用 -h 求助)"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:363
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
 -"語法: @DIRMNGR@ [選項] [指令 [引數]]\n"
 -"@GNUPG@ 的金鑰伺服器, CRL, OCSP 存取\n"
  
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:443
  #, c-format
  msgid "valid debug levels are: %s\n"
 -msgstr "有效的除錯等級為: %s\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
- #: tools/gpgconf.c:648
++#: dirmngr/dirmngr.c:496 tools/gpgconf.c:550 tools/gpgconf.c:585
++#: tools/gpgconf.c:656
  #, c-format
  msgid "usage: %s [options] "
 -msgstr "用法: %s [選項] "
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1062
++#: dirmngr/dirmngr.c:1074
  msgid "colons are not allowed in the socket name\n"
 -msgstr "socket 名稱內不允許使用冒號\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
++#: dirmngr/dirmngr.c:1300 dirmngr/server.c:1585
  #, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
 -msgstr "從 '%s' 取回 CRL 時失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
++#: dirmngr/dirmngr.c:1306 dirmngr/server.c:1591
  #, c-format
  msgid "processing CRL from '%s' failed: %s\n"
 -msgstr "從 '%s' 處理 CRL 時失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1484
++#: dirmngr/dirmngr.c:1487
  #, c-format
  msgid "%s:%u: line too long - skipped\n"
 -msgstr "%s:%u: 列太長 - 已跳過\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
++#: dirmngr/dirmngr.c:1542 dirmngr/dirmngr.c:1626
  #, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
 -msgstr "%s:%u: 偵測到無效的指紋\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
++#: dirmngr/dirmngr.c:1578 dirmngr/dirmngr.c:1604 tools/gpgconf-comp.c:4032
  #, c-format
  msgid "%s:%u: read error: %s\n"
 -msgstr "%s:%u: 讀取錯誤: %s\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1633
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
 -msgstr "%s:%u: 列尾的垃圾已忽略\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1700
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 -msgstr "收到 SIGHUP - 正在重新讀取組態並清除快取\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1734
++#: dirmngr/dirmngr.c:1738
  msgid "SIGUSR2 received - no action defined\n"
 -msgstr "收到 SIGUSR2 - 無定義行動\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1739
++#: dirmngr/dirmngr.c:1743
  msgid "SIGTERM received - shutting down ...\n"
 -msgstr "收到 SIGTERM - 正在關閉 ...\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1745
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
 -msgstr "收到 SIGTERM - 還有 %d 個使用中的連線\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1746
++#: dirmngr/dirmngr.c:1750
  msgid "shutdown forced\n"
 -msgstr "已強迫關閉\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1758
  msgid "SIGINT received - immediate shutdown\n"
 -msgstr "收到 SIGINT - 立即關閉\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1761
++#: dirmngr/dirmngr.c:1765
  #, c-format
  msgid "signal %d received - no action defined\n"
 -msgstr "收到訊號 %d - 無定義行動\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:138
  msgid "return all values in a record oriented format"
 -msgstr "以記錄導向格式傳回所有數值"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:141
  msgid "|NAME|ignore host part and connect through NAME"
 -msgstr "|名稱|忽略主機的部份並改以指定名稱連線"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:142
  msgid "|NAME|connect to host NAME"
 -msgstr "|名稱|連線至位於指定名稱的主機"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:143
  msgid "|N|connect to port N"
 -msgstr "|N|連線至 N 連接埠"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:144
  msgid "|NAME|use user NAME for authentication"
 -msgstr "|名字|使用指定名字做為認證用的使用者名稱"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:145
  msgid "|PASS|use password PASS for authentication"
 -msgstr "|密碼|使用指定密碼作為認證"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:147
  msgid "take password from $DIRMNGR_LDAP_PASS"
 -msgstr "從 $DIRMNGR_LDAP_PASS 取得密碼使用"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:148
  msgid "|STRING|query DN STRING"
 -msgstr "|字串|以只指定字串查詢 DN"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:149
  msgid "|STRING|use STRING as filter expression"
 -msgstr "|字串|以指定字串作為過濾器表示式"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:150
  msgid "|STRING|return the attribute STRING"
 -msgstr "|字串|以指定字串傳回屬性"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:209
  msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 -msgstr "用法: dirmngr_ldap [選項] [網址] (或用 -h 求助)\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:212
  msgid ""
  "Syntax: dirmngr_ldap [options] [URL]\n"
  "Internal LDAP helper for Dirmngr\n"
  "Interface and options may change without notice\n"
  msgstr ""
 -"語法: dirmngr_ldap [選項] [網址]\n"
 -"Dirmngr 的內部 LDAP 協助程式\n"
 -"介面及選項均可能未經通知即變更\n"
  
 +#: dirmngr/dirmngr_ldap.c:337
  #, c-format
  msgid "invalid port number %d\n"
 -msgstr "無效的連接埠號碼 %d\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:413
  #, c-format
  msgid "scanning result for attribute '%s'\n"
 -msgstr "正在掃描屬性 '%s' 之結果\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:420 dirmngr/dirmngr_ldap.c:503
 +#: dirmngr/dirmngr_ldap.c:527 dirmngr/dirmngr_ldap.c:539
 +#: dirmngr/dirmngr_ldap.c:677
  #, c-format
  msgid "error writing to stdout: %s\n"
 -msgstr "寫入標準輸出時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:437
  #, c-format
  msgid "          available attribute '%s'\n"
 -msgstr "          可用屬性 '%s'\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:475
  #, c-format
  msgid "attribute '%s' not found\n"
 -msgstr "找不到屬性 '%s'\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:482
  #, c-format
  msgid "found attribute '%s'\n"
 -msgstr "找到屬性 '%s'\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:591
  #, c-format
  msgid "processing url '%s'\n"
 -msgstr "正在處理網址 '%s'\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:593
  #, c-format
  msgid "          user '%s'\n"
 -msgstr "          使用者 '%s'\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:595
  #, c-format
  msgid "          pass '%s'\n"
 -msgstr "          密碼 '%s'\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:597
  #, c-format
  msgid "          host '%s'\n"
 -msgstr "          主機 '%s'\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:598
  #, c-format
  msgid "          port %d\n"
 -msgstr "          連接埠 %d\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:600
  #, c-format
  msgid "            DN '%s'\n"
 -msgstr "            域名 '%s'\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:602
  #, c-format
  msgid "        filter '%s'\n"
 -msgstr "        過濾器 '%s'\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:607 dirmngr/dirmngr_ldap.c:610
  #, c-format
  msgid "          attr '%s'\n"
 -msgstr "          屬性 '%s'\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:616
  #, c-format
  msgid "no host name in '%s'\n"
 -msgstr "'%s' 中沒有主機名稱\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:621
  #, c-format
  msgid "no attribute given for query '%s'\n"
 -msgstr "查詢 '%s' 無給定屬性\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:627
  msgid "WARNING: using first attribute only\n"
 -msgstr "警告: 僅使用第一個屬性\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:636
  #, c-format
  msgid "LDAP init to '%s:%d' failed: %s\n"
 -msgstr "LDAP 初始至 '%s:%d' 失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:659
  #, c-format
  msgid "binding to '%s:%d' failed: %s\n"
 -msgstr "綁定至 '%s:%d' 時失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:686
  #, c-format
  msgid "searching '%s' failed: %s\n"
 -msgstr "搜尋 '%s' 時失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:718
  #, c-format
  msgid "'%s' is not an LDAP URL\n"
 -msgstr "'%s' 不是一個 LDAP 位址\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:724
  #, c-format
  msgid "'%s' is an invalid LDAP URL\n"
 -msgstr "'%s' 是無效的 LDAP 網址\n"
 +msgstr ""
  
 +#: dirmngr/ldap-wrapper.c:207
  #, c-format
  msgid "error printing log line: %s\n"
 -msgstr "印出日誌記錄列時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/ldap-wrapper.c:236
  #, c-format
  msgid "error reading log from ldap wrapper %d: %s\n"
 -msgstr "從 ldap 封裝程式 %d 讀取日誌記錄時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/ldap-wrapper.c:304
  #, c-format
  msgid "npth_select failed: %s - waiting 1s\n"
 -msgstr "npth_select 失敗: %s - 等 1 秒鐘\n"
 +msgstr ""
  
 +#: dirmngr/ldap-wrapper.c:343
  #, c-format
  msgid "ldap wrapper %d ready"
 -msgstr "ldap 封裝程式 %d 準備妥當"
 +msgstr ""
  
 +#: dirmngr/ldap-wrapper.c:352
  #, c-format
  msgid "ldap wrapper %d ready: timeout\n"
 -msgstr "ldap 封裝程式 %d 準備妥當: 逾時\n"
 +msgstr ""
  
 +#: dirmngr/ldap-wrapper.c:355
  #, c-format
  msgid "ldap wrapper %d ready: exitcode=%d\n"
 -msgstr "ldap 封裝程式 %d 準備妥當: 離開代碼=%d\n"
 +msgstr ""
  
 +#: dirmngr/ldap-wrapper.c:364
  #, c-format
  msgid "waiting for ldap wrapper %d failed: %s\n"
 -msgstr "等候 ldap 封裝程式 %d 時失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/ldap-wrapper.c:376
  #, c-format
  msgid "ldap wrapper %d stalled - killing\n"
 -msgstr "ldap 封裝程式 %d 已卡住 - 正在中止\n"
 +msgstr ""
  
 +#: dirmngr/ldap-wrapper.c:444
  #, c-format
  msgid "error spawning ldap wrapper reaper thread: %s\n"
 -msgstr "繁衍 ldap 封裝程式收割執行緒時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/ldap-wrapper.c:496 dirmngr/ldap-wrapper.c:517
  #, c-format
  msgid "reading from ldap wrapper %d failed: %s\n"
 -msgstr "從 ldap 封裝程式 %d 讀取時失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/ldap.c:91
  #, c-format
  msgid "invalid char 0x%02x in host name - not added\n"
 -msgstr "主機名稱中有無效的字符 0x%02x - 不予加入\n"
 +msgstr ""
  
 +#: dirmngr/ldap.c:95
  #, c-format
  msgid "adding '%s:%d' to the ldap server list\n"
 -msgstr "正在加入 '%s:%d' 至 ldap 伺服器清單\n"
 +msgstr ""
  
 +#: dirmngr/ldap.c:98 dirmngr/misc.c:502
  #, c-format
  msgid "malloc failed: %s\n"
 -msgstr "動態記憶體配置失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/ldap.c:627
  #, c-format
  msgid "start_cert_fetch: invalid pattern '%s'\n"
 -msgstr "start_cert_fetch: 無效的模式 '%s'\n"
 +msgstr ""
  
 +#: dirmngr/ldap.c:840
  msgid "ldap_search hit the size limit of the server\n"
 -msgstr "ldap_search 達到伺服器的尺寸限制\n"
 +msgstr ""
  
 +#: dirmngr/misc.c:170
  msgid "invalid canonical S-expression found\n"
 -msgstr "發現無效的標準型 S-表示式\n"
 +msgstr ""
  
 +#: dirmngr/misc.c:194 dirmngr/misc.c:228
  #, c-format
  msgid "gcry_md_open failed: %s\n"
 -msgstr "gcry_md_open 失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/misc.c:199 dirmngr/misc.c:233
  #, c-format
  msgid "oops: ksba_cert_hash failed: %s\n"
 -msgstr "糟了: ksba_cert_hash 失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/misc.c:518
  msgid "bad URL encoding detected\n"
 -msgstr "偵測到不良的網址編碼\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:80
  #, c-format
  msgid "error reading from responder: %s\n"
 -msgstr "從回應程式讀取時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:98
  #, c-format
  msgid "response from server too large; limit is %d bytes\n"
 -msgstr "來自伺服器的回應太大; 上限是 %d 位元組\n"
 +msgstr ""
  
 -#, fuzzy
 -#| msgid "OCSP request not possible due to disabled HTTP\n"
 +#: dirmngr/ocsp.c:139
  msgid "OCSP request not possible due to Tor mode\n"
 -msgstr "因為已經停用 HTTP 而不可能有 OCSP 請求\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:145
  msgid "OCSP request not possible due to disabled HTTP\n"
 -msgstr "因為已經停用 HTTP 而不可能有 OCSP 請求\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:152
  #, c-format
  msgid "error setting OCSP target: %s\n"
 -msgstr "設定 OCSP 目標時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:170
  #, c-format
  msgid "error building OCSP request: %s\n"
 -msgstr "建立 OCSP 請求時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:181
  #, c-format
  msgid "error connecting to '%s': %s\n"
 -msgstr "連線至 '%s' 時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
  #, c-format
  msgid "error reading HTTP response for '%s': %s\n"
 -msgstr "讀取 '%s' HTTP 回應時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:240
  #, c-format
  msgid "error accessing '%s': http status %u\n"
 -msgstr "存取 '%s' 時出錯: http 狀態 %u\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:265
  #, c-format
  msgid "error parsing OCSP response for '%s': %s\n"
 -msgstr "剖析 '%s' OCSP 回應時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
  #, c-format
  msgid "OCSP responder at '%s' status: %s\n"
 -msgstr "位於 '%s' 的 OSCP 回應程式狀態: %s\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:293
  #, c-format
  msgid "hashing the OCSP response for '%s' failed: %s\n"
 -msgstr "計算 '%s' OSCP 回應雜湊時失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:328
  msgid "not signed by a default OCSP signer's certificate"
 -msgstr "並未由預設 OCSP 簽署者的憑證所簽署"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:413
  msgid "only SHA-1 is supported for OCSP responses\n"
 -msgstr "OCSP 回應僅支援 SHA-1\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:464
  #, c-format
  msgid "allocating list item failed: %s\n"
 -msgstr "配置清單項目時失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:479
  #, c-format
  msgid "error getting responder ID: %s\n"
 -msgstr "取得回應程式 ID 時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:514
  msgid "no suitable certificate found to verify the OCSP response\n"
 -msgstr "找不到適合用來驗證 OCSP 回應的憑證\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
  #, c-format
  msgid "issuer certificate not found: %s\n"
 -msgstr "找不到發行者憑證: %s\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:563
  msgid "caller did not return the target certificate\n"
 -msgstr "叫用者未傳為目標憑證\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:570
  msgid "caller did not return the issuing certificate\n"
 -msgstr "叫用者未傳回發行的憑證\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:580
  #, c-format
  msgid "failed to allocate OCSP context: %s\n"
 -msgstr "配置 OCSP 脈絡失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:614
  #, c-format
  msgid "can't get authorityInfoAccess: %s\n"
 -msgstr "無法取得 authorityInfoAccess: %s\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:621
  msgid "no default OCSP responder defined\n"
 -msgstr "無定義預設 OCSP 回應程式\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:627
  msgid "no default OCSP signer defined\n"
 -msgstr "未定義預設的 OCSP 簽署程式\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:634
  #, c-format
  msgid "using default OCSP responder '%s'\n"
 -msgstr "正在使用預設的 OCSP 回應程式 '%s'\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:639
  #, c-format
  msgid "using OCSP responder '%s'\n"
 -msgstr "正在使用 %s OCSP 回應程式\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:646
  #, c-format
  msgid "failed to establish a hashing context for OCSP: %s\n"
 -msgstr "對 OCSP 建立雜湊脈絡失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:676
  #, c-format
  msgid "error getting OCSP status for target certificate: %s\n"
 -msgstr "取得目標憑證 OCSP 狀態時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:701
  #, c-format
  msgid "certificate status is: %s  (this=%s  next=%s)\n"
 -msgstr "憑證狀態為: %s  (本次=%s  下次=%s)\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:702
  msgid "good"
 -msgstr "良好"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:708
  #, c-format
  msgid "certificate has been revoked at: %s due to: %s\n"
 -msgstr "憑證已撤銷於 %s 因: %s\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:743
  msgid "OCSP responder returned a status in the future\n"
 -msgstr "OCSP 回應程式傳回未來的狀態\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:755
  msgid "OCSP responder returned a non-current status\n"
 -msgstr "OCSP 回應程式傳回非當下的狀態\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:770
  msgid "OCSP responder returned an too old status\n"
 -msgstr "OCSP 回應程式傳回老舊的狀態\n"
 +msgstr ""
  
 +#: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
  #, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
 -msgstr "assuan_inquire(%s) 失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/server.c:938
  msgid "ldapserver missing"
 -msgstr "遺失 ldapserver"
 +msgstr ""
  
 +#: dirmngr/server.c:1012
  msgid "serialno missing in cert ID"
 -msgstr "憑證 ID 中遺失 serialno"
 +msgstr ""
  
 +#: dirmngr/server.c:1148 dirmngr/server.c:1234 dirmngr/server.c:1670
 +#: dirmngr/server.c:1721 dirmngr/server.c:2213 dirmngr/server.c:2229
  #, c-format
  msgid "assuan_inquire failed: %s\n"
 -msgstr "assuan_inquire 失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/server.c:1277
  #, c-format
  msgid "fetch_cert_by_url failed: %s\n"
 -msgstr "fetch_cert_by_url 失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/server.c:1289 dirmngr/server.c:1320 dirmngr/server.c:1479
  #, c-format
  msgid "error sending data: %s\n"
 -msgstr "送出資料時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/server.c:1427
  #, c-format
  msgid "start_cert_fetch failed: %s\n"
 -msgstr "start_cert_fetch 失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/server.c:1460
  #, c-format
  msgid "fetch_next_cert failed: %s\n"
 -msgstr "fetch_next_cert 失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/server.c:1487
  #, c-format
  msgid "max_replies %d exceeded\n"
 -msgstr "max_replies %d 已超出\n"
 +msgstr ""
  
- #: dirmngr/server.c:2463
++#: dirmngr/server.c:2469
  #, c-format
  msgid "can't allocate control structure: %s\n"
 -msgstr "無法配置控制結構: %s\n"
 +msgstr ""
  
- #: dirmngr/server.c:2474
++#: dirmngr/server.c:2480
  #, c-format
  msgid "failed to allocate assuan context: %s\n"
 -msgstr "配置 assuan 脈絡失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/server.c:2495
++#: dirmngr/server.c:2501
  #, c-format
  msgid "failed to initialize the server: %s\n"
 -msgstr "伺服器啟始失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/server.c:2503
++#: dirmngr/server.c:2509
  #, c-format
  msgid "failed to the register commands with Assuan: %s\n"
 -msgstr "向 Assuan 註冊指令時失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/server.c:2534
++#: dirmngr/server.c:2540
  #, c-format
  msgid "Assuan accept problem: %s\n"
 -msgstr "Assuan 接受問題: %s\n"
 +msgstr ""
  
- #: dirmngr/server.c:2553
++#: dirmngr/server.c:2559
  #, c-format
  msgid "Assuan processing failed: %s\n"
 -msgstr "Assuan 處理時失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/validate.c:201
  msgid "accepting root CA not marked as a CA"
 -msgstr "接受未標示為 CA 的根 CA"
 +msgstr ""
  
 +#: dirmngr/validate.c:227
  msgid "CRL checking too deeply nested\n"
 -msgstr "檢查 CRL 時遭遇太深層次的巢狀結構\n"
 +msgstr ""
  
 +#: dirmngr/validate.c:245
  msgid "not checking CRL for"
 -msgstr "不對此檢查 CRL:"
 +msgstr ""
  
 +#: dirmngr/validate.c:250
  msgid "checking CRL for"
 -msgstr "檢查 CRL: "
 +msgstr ""
  
 +#: dirmngr/validate.c:528
  msgid "selfsigned certificate has a BAD signature"
 -msgstr "自簽憑證有 不良 簽章"
 +msgstr ""
  
 +#: dirmngr/validate.c:561
  #, c-format
  msgid "checking trustworthiness of root certificate failed: %s\n"
 -msgstr "檢查根憑證可信度時失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/validate.c:738
  msgid "certificate chain is good\n"
 -msgstr "憑證鏈完好\n"
 +msgstr ""
  
 +#: dirmngr/validate.c:968
  msgid "DSA requires the use of a 160 bit hash algorithm\n"
 -msgstr "DSA 要求使用 160 位元的雜湊演算法\n"
 +msgstr ""
  
 +#: dirmngr/validate.c:1116
  msgid "certificate should not have been used for CRL signing\n"
 -msgstr "憑證應該還未被用於 CRL 簽署\n"
 +msgstr ""
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:167
  msgid "quiet"
 -msgstr "安靜模式"
 +msgstr ""
  
 +#: tools/gpg-connect-agent.c:79
  msgid "print data out hex encoded"
 -msgstr "列印資料超出十六進制編碼範圍"
 +msgstr ""
  
 +#: tools/gpg-connect-agent.c:80
  msgid "decode received data lines"
 -msgstr "對已收到的資料列解碼"
 +msgstr ""
  
 +#: tools/gpg-connect-agent.c:81
  msgid "connect to the dirmngr"
 -msgstr "連線至 dirmngr"
 +msgstr ""
  
 +#: tools/gpg-connect-agent.c:84
  msgid "|NAME|connect to Assuan socket NAME"
 -msgstr "|名稱|連線至指定名稱的 Assuan socket"
 +msgstr ""
  
 +#: tools/gpg-connect-agent.c:86
  msgid "|ADDR|connect to Assuan server at ADDR"
 -msgstr "|ADDR|連線至位於 ADDR 的 Assuan 伺服器"
 +msgstr ""
  
 +#: tools/gpg-connect-agent.c:88
  msgid "run the Assuan server given on the command line"
 -msgstr "執行命令列所給定的 Assuan 伺服器"
 +msgstr ""
  
 +#: tools/gpg-connect-agent.c:90
  msgid "do not use extended connect mode"
 -msgstr "不要使用延伸連線模式"
 +msgstr ""
  
 +#: tools/gpg-connect-agent.c:92
  msgid "|FILE|run commands from FILE on startup"
 -msgstr "|檔案|啟動時執行指定檔案中的指令"
 +msgstr ""
  
 +#: tools/gpg-connect-agent.c:93
  msgid "run /subst on startup"
 -msgstr "啟動時執行 /subst"
 +msgstr ""
  
 +#: tools/gpg-connect-agent.c:205
  msgid "Usage: @GPG at -connect-agent [options] (-h for help)"
 -msgstr "用法: @GPG at -connect-agent [選項] (或用 -h 求助)"
 +msgstr ""
  
 +#: tools/gpg-connect-agent.c:208
  msgid ""
  "Syntax: @GPG at -connect-agent [options]\n"
  "Connect to a running agent and send commands\n"
  msgstr ""
 -"語法: @GPG at -connect-agent [選項]\n"
 -"連線至運作中的代理程式並送出指令\n"
  
 +#: tools/gpg-connect-agent.c:1247
  #, c-format
  msgid "option \"%s\" requires a program and optional arguments\n"
 -msgstr "\"%s\" 選項需要有程式及選用的引數\n"
 +msgstr ""
  
 +#: tools/gpg-connect-agent.c:1258 tools/gpg-connect-agent.c:1264
 +#: tools/gpg-connect-agent.c:1270
  #, c-format
  msgid "option \"%s\" ignored due to \"%s\"\n"
 -msgstr "\"%s\" 選項因為 \"%s\" 而被忽略了\n"
 +msgstr ""
  
 +#: tools/gpg-connect-agent.c:1368 tools/gpg-connect-agent.c:1863
  #, c-format
  msgid "receiving line failed: %s\n"
 -msgstr "接收列時失敗: %s\n"
 +msgstr ""
  
 +#: tools/gpg-connect-agent.c:1458
  msgid "line too long - skipped\n"
 -msgstr "列太長 - 已跳過\n"
 +msgstr ""
  
 +#: tools/gpg-connect-agent.c:1462
  msgid "line shortened due to embedded Nul character\n"
 -msgstr "列因嵌入的 Nul 字符而縮短了\n"
 +msgstr ""
  
 +#: tools/gpg-connect-agent.c:1837
  #, c-format
  msgid "unknown command '%s'\n"
 -msgstr "未知的指令 '%s'\n"
 +msgstr ""
  
 +#: tools/gpg-connect-agent.c:1855
  #, c-format
  msgid "sending line failed: %s\n"
 -msgstr "送出列時失敗: %s\n"
 +msgstr ""
  
 +#: tools/gpg-connect-agent.c:2251
  #, c-format
  msgid "error sending standard options: %s\n"
 -msgstr "送出標準選項時出錯: %s\n"
 +msgstr ""
  
 +#: tools/gpgconf-comp.c:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
- #: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
++#: tools/gpgconf-comp.c:766 tools/gpgconf-comp.c:865
  msgid "Options controlling the diagnostic output"
 -msgstr "控制著診斷性輸出的選項"
 +msgstr ""
  
 +#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
- #: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
++#: tools/gpgconf-comp.c:779 tools/gpgconf-comp.c:888
  msgid "Options controlling the configuration"
 -msgstr "控制著組態的選項"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
- #: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
++#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:723
++#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:901
  msgid "Options useful for debugging"
 -msgstr "對除錯有幫助的選項"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
  msgid "Options controlling the security"
 -msgstr "控制著安全性的選項"
 +msgstr ""
  
 +#: tools/gpgconf-comp.c:528
  msgid "|N|expire SSH keys after N seconds"
 -msgstr "|N|在 N 秒之後讓 SSH 金鑰過期"
 +msgstr ""
  
 +#: tools/gpgconf-comp.c:532
  msgid "|N|set maximum PIN cache lifetime to N seconds"
 -msgstr "|N|把個人識別碼 (PIN) 快取最大生存時間設成 N 秒"
 +msgstr ""
  
 +#: tools/gpgconf-comp.c:536
  msgid "|N|set maximum SSH key lifetime to N seconds"
 -msgstr "|N|把 SSH 金鑰最大生存時間設成 N 秒"
 +msgstr ""
  
 +#: tools/gpgconf-comp.c:560
  msgid "Options enforcing a passphrase policy"
 -msgstr "強制執行密語原則的選項"
 +msgstr ""
  
 +#: tools/gpgconf-comp.c:563
  msgid "do not allow bypassing the passphrase policy"
 -msgstr "不允許略過密語原則"
 +msgstr ""
  
 +#: tools/gpgconf-comp.c:567
  msgid "|N|set minimal required length for new passphrases to N"
 -msgstr "|N|把新密語所需的最短長度設成 N"
 +msgstr ""
  
 +#: tools/gpgconf-comp.c:571
  msgid "|N|require at least N non-alpha characters for a new passphrase"
 -msgstr "|N|新密語至少要有 N 個非字母的字符"
 +msgstr ""
  
 +#: tools/gpgconf-comp.c:575
  msgid "|FILE|check new passphrases against pattern in FILE"
 -msgstr "|檔案|用指定檔案中的樣式來檢查新密語"
 +msgstr ""
  
 +#: tools/gpgconf-comp.c:579
  msgid "|N|expire the passphrase after N days"
 -msgstr "|N|在 N 天之後讓密語過期"
 +msgstr ""
  
 +#: tools/gpgconf-comp.c:583
  msgid "do not allow the reuse of old passphrases"
 -msgstr "不允許重複使用舊密語"
 +msgstr ""
  
 -#, fuzzy
 -#| msgid "|N|set LDAP timeout to N seconds"
 +#: tools/gpgconf-comp.c:587
  msgid "|N|set the Pinentry timeout to N seconds"
 -msgstr "|N|把 LDAP 逾時設成 N 秒"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
++#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
  msgid "|NAME|use NAME as default secret key"
 -msgstr "|名字|使用指定名字做為預設私鑰"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
++#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:784
  msgid "|NAME|encrypt to user ID NAME as well"
 -msgstr "|名字|也加密給指定名字的使用者 ID"
 +msgstr ""
  
 +#: tools/gpgconf-comp.c:704
  msgid "|SPEC|set up email aliases"
 -msgstr "|SPEC|設定電子郵件別名"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
++#: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
  msgid "Configuration for Keyservers"
 -msgstr "金鑰伺服器組態"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
++#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
  msgid "|URL|use keyserver at URL"
 -msgstr "|URL|使用位於 URL 的金鑰伺服器"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:741
  msgid "allow PKA lookups (DNS requests)"
 -msgstr "允許 PKA 查找 (DNS 請求)"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:738
++#: tools/gpgconf-comp.c:744
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 -msgstr "|MECHANISMS|使用 MECHANISMS 機制來從郵件地址找出金鑰"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:787
++#: tools/gpgconf-comp.c:793
  msgid "disable all access to the dirmngr"
 -msgstr "停用所有的 dirmngr 存取"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:790
++#: tools/gpgconf-comp.c:796
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 -msgstr "|名稱|將指定名稱的編碼用於 PKCS#12 密語"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:820
++#: tools/gpgconf-comp.c:829
  msgid "do not check CRLs for root certificates"
 -msgstr "不要為根憑證檢查 CRL"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:869
++#: tools/gpgconf-comp.c:878
  msgid "Options controlling the format of the output"
 -msgstr "控制著輸出格式的選項"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:905
++#: tools/gpgconf-comp.c:920
  msgid "Options controlling the interactivity and enforcement"
 -msgstr "控制著互動及強制執行的選項"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:918
 -#, fuzzy
 -#| msgid "Options controlling the security"
++#: tools/gpgconf-comp.c:933
  msgid "Options controlling the use of Tor"
 -msgstr "控制著安全性的選項"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:947
  msgid "Configuration for HTTP servers"
 -msgstr "HTTP 伺服器組態"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:958
  msgid "use system's HTTP proxy setting"
 -msgstr "使用系統的 HTTP 代理伺服器設定"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:948
++#: tools/gpgconf-comp.c:963
  msgid "Configuration of LDAP servers to use"
 -msgstr "要用的 LDAP 伺服器組態"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:977
++#: tools/gpgconf-comp.c:992
  msgid "LDAP server list"
 -msgstr "LDAP 伺服器清單"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:985
++#: tools/gpgconf-comp.c:1000
  msgid "Configuration for OCSP"
 -msgstr "OCSP 組態"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:1066
 -#, fuzzy
 -#| msgid "GPG for OpenPGP"
++#: tools/gpgconf-comp.c:1081
  msgid "OpenPGP"
 -msgstr "OpenPGP 版 GPG"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:1067
++#: tools/gpgconf-comp.c:1082
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1068
 -#, fuzzy
 -#| msgid "Smartcard Daemon"
++#: tools/gpgconf-comp.c:1083
  msgid "Smartcards"
 -msgstr "智慧卡服務"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:1069
 -#, fuzzy
 -#| msgid "GPG for S/MIME"
++#: tools/gpgconf-comp.c:1084
  msgid "S/MIME"
 -msgstr "S/MIME 版 GPG"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:1070
++#: tools/gpgconf-comp.c:1085
  msgid "Network"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1071
 -#, fuzzy
 -#| msgid "PIN and Passphrase Entry"
++#: tools/gpgconf-comp.c:1086
  msgid "Passphrase Entry"
 -msgstr "個人識別碼及密語項目"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:1225
++#: tools/gpgconf-comp.c:1240
  msgid "Component not suitable for launching"
 -msgstr "元件不適合啟動"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:3283
++#: tools/gpgconf-comp.c:3311
  #, c-format
  msgid "External verification of component %s failed"
 -msgstr "元件 %s 的外部驗證失敗"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:3434
++#: tools/gpgconf-comp.c:3462
  msgid "Note that group specifications are ignored\n"
 -msgstr "請注意群組規格已忽略\n"
 +msgstr ""
  
- #: tools/gpgconf.c:71
 -#, fuzzy, c-format
 -#| msgid "error closing '%s': %s\n"
++#: tools/gpgconf-comp.c:4036
++#, c-format
+ msgid "error closing '%s'\n"
 -msgstr "關閉 '%s' 時出錯: %s\n"
++msgstr ""
+ 
 -#, fuzzy, c-format
 -#| msgid "error hashing '%s': %s\n"
++#: tools/gpgconf-comp.c:4038
++#, c-format
+ msgid "error parsing '%s'\n"
 -msgstr "計算 '%s' 的雜湊時出錯: %s\n"
++msgstr ""
+ 
++#: tools/gpgconf.c:73
  msgid "list all components"
 -msgstr "列出所有的元件"
 +msgstr ""
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "check all programs"
 -msgstr "檢查所有的程式"
 +msgstr ""
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|list options"
 -msgstr "|元件|列出選項"
 +msgstr ""
  
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
  msgid "|COMPONENT|change options"
 -msgstr "|元件|變更選項"
 +msgstr ""
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "|COMPONENT|check options"
 -msgstr "|元件|檢查選項"
 +msgstr ""
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "apply global default values"
 -msgstr "套用全域預設值"
 +msgstr ""
  
- #: tools/gpgconf.c:79
 -#, fuzzy
 -#| msgid "|FILE|take policy information from FILE"
++#: tools/gpgconf.c:81
+ msgid "|FILE|update configuration files using FILE"
 -msgstr "|檔案|從指定檔案中取得原則資訊"
++msgstr ""
+ 
++#: tools/gpgconf.c:83
  msgid "get the configuration directories for @GPGCONF@"
 -msgstr "取得 @GPGCONF@ 的組態目錄"
 +msgstr ""
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:85
  msgid "list global configuration file"
 -msgstr "列出全域組態檔"
 +msgstr ""
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  msgid "check global configuration file"
 -msgstr "檢查全域組態檔案"
 +msgstr ""
  
- #: tools/gpgconf.c:85
 -#, fuzzy
 -#| msgid "update the trust database"
++#: tools/gpgconf.c:89
  msgid "query the software version database"
 -msgstr "更新信任資料庫"
 +msgstr ""
  
- #: tools/gpgconf.c:86
++#: tools/gpgconf.c:90
  msgid "reload all or a given component"
 -msgstr "重新載入所有或給定的元件"
 +msgstr ""
  
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:91
  msgid "launch a given component"
 -msgstr "啟動給定的元件"
 +msgstr ""
  
- #: tools/gpgconf.c:88
++#: tools/gpgconf.c:92
  msgid "kill a given component"
 -msgstr "刪除給定的元件"
 +msgstr ""
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "use as output file"
 -msgstr "當作輸出檔案來使用"
 +msgstr ""
  
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:102
  msgid "activate changes at runtime, if possible"
 -msgstr "如果可能的話, 在執行期啟用變更"
 +msgstr ""
  
- #: tools/gpgconf.c:122
++#: tools/gpgconf.c:127
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
 -msgstr "用法: @GPGCONF@ [選項] (或用 -h 求助)"
 +msgstr ""
  
- #: tools/gpgconf.c:125
++#: tools/gpgconf.c:130
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
  msgstr ""
 -"語法: @GPGCONF@ [選項]\n"
 -"管理 @GNUPG@ 系統工具的組態選項\n"
  
- #: tools/gpgconf.c:545 tools/gpgconf.c:579
++#: tools/gpgconf.c:552 tools/gpgconf.c:587
  msgid "Need one component argument"
 -msgstr "需要一個元件引數"
 +msgstr ""
  
- #: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
++#: tools/gpgconf.c:561 tools/gpgconf.c:599 tools/gpgconf.c:632
  msgid "Component not found"
 -msgstr "找不到元件"
 +msgstr ""
  
- #: tools/gpgconf.c:650
++#: tools/gpgconf.c:658
  msgid "No argument allowed"
 -msgstr "未允許使用引數"
 +msgstr ""
  
 +#: tools/symcryptrun.c:154
  msgid ""
  "@\n"
  "Commands:\n"
diff --cc po/hu.po
index 223c47f,f552b0e..097857d
--- a/po/hu.po
+++ b/po/hu.po
@@@ -6,7 -6,6 +6,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg 1.2.5\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-11-18 16:54+0100\n"
++"POT-Creation-Date: 2016-12-20 11:28+0100\n"
  "PO-Revision-Date: 2004-06-19 21:53+0200\n"
  "Last-Translator: Nagy Ferenc László <nfl at nfllab.com>\n"
  "Language-Team: Hungarian <translation-team-hu at lists.sourceforge.net>\n"
@@@ -155,25 -126,11 +155,25 @@@ msgstr "rossz jelszó
  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:838 common/dotlock.c:839 g10/card-util.c:839
- #: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1306 g10/keygen.c:4577
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
++#: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't create '%s': %s\n"
  msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n"
  
 +#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
- #: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1307
++#: g10/import.c:305 g10/import.c:448 g10/import.c:621 g10/keygen.c:3681
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
- #: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
- #: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:825 g10/sign.c:1025
++#: g10/sign.c:1130 g10/sign.c:1275 g10/tdbdump.c:143 g10/tdbdump.c:151
++#: g10/tdbio.c:720 g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161
++#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
++#: dirmngr/certcache.c:368 dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1564
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
@@@ -236,11 -182,9 +236,11 @@@ msgstr "Kérem, adja meg a jelszót! Ez
  msgid "failed to create stream from socket: %s\n"
  msgstr "%s: Hashtábla létrehozása sikertelen: %s.\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1100
++#: agent/divert-scd.c:92 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1101
++#: agent/divert-scd.c:93 g10/call-agent.c:1102
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  
@@@ -383,48 -301,33 +383,48 @@@ msgstr "
  "Opciók:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
  #, fuzzy
  #| msgid "Key is superseded"
  msgid "run in supervised mode"
  msgstr "A kulcsot lecserélték."
  
- #: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:170 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "bőbeszédű mód"
  
 +#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "még szűkszavúbb mód"
  
- #: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
  msgid "csh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
- #: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
++#: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
  #, fuzzy
  msgid "|FILE|read options from FILE"
  msgstr "|fájl|bővítő modul betöltése"
  
- #: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:177
  msgid "do not detach from the console"
  msgstr ""
  
@@@ -509,162 -395,120 +509,162 @@@ msgstr "nem támogatott
  #. 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:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:481 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1025 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:358
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:124 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  #, fuzzy
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr "A hibákat (angolul) a <gnupg-bugs at gnu.org> címre írja meg!\n"
  
- #: agent/gpg-agent.c:491
++#: agent/gpg-agent.c:490
  #, 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:493
++#: agent/gpg-agent.c:492
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:537 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:442
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:793
++#: agent/gpg-agent.c:1082 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:812
  #, 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"
  
- #: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
- #: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1093 agent/gpg-agent.c:1935 g10/gpg.c:2510
++#: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:817
++#: dirmngr/dirmngr.c:1670 tools/symcryptrun.c:932
  #, fuzzy, c-format
  #| msgid "option file `%s': %s\n"
  msgid "option file '%s': %s\n"
  msgstr "\"%s\" opciós fájl: %s\n"
  
- #: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:806
++#: agent/gpg-agent.c:1101 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:825
  #, 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:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
- #: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
++#: agent/gpg-agent.c:1223 g10/gpg.c:3643 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:936 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:527
  #, 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:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
++#: agent/gpg-agent.c:2080 scd/scdaemon.c:1073 dirmngr/dirmngr.c:1081
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
  msgstr "%s nem hozható létre: %s\n"
  
- #: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
++#: agent/gpg-agent.c:2097 scd/scdaemon.c:1086 dirmngr/dirmngr.c:1094
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2134
++#: agent/gpg-agent.c:2135
  #, fuzzy
  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:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
++#: agent/gpg-agent.c:2145 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1126
  #, fuzzy
  msgid "error getting nonce for the socket\n"
  msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
++#: agent/gpg-agent.c:2150 scd/scdaemon.c:1113 dirmngr/dirmngr.c:1129
  #, 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:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
- #: dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2160 agent/gpg-agent.c:2197 scd/scdaemon.c:1121
++#: dirmngr/dirmngr.c:1138
  #, 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:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:2165 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1143
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
  msgstr "Frissítés sikertelen: %s.\n"
  
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
++#: agent/gpg-agent.c:2172 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1149
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
  msgstr "Írom a titkos kulcsot a %s állományba.\n"
  
- #: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: agent/gpg-agent.c:2191 agent/gpg-agent.c:2234 g10/exec.c:199
 +#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, 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:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: agent/gpg-agent.c:2194 agent/gpg-agent.c:2239 g10/openfile.c:491
 +#: g10/openfile.c:520 sm/keydb.c:103
  #, fuzzy, c-format
  msgid "directory '%s' created\n"
  msgstr "%s: Könyvtárat létrehoztam.\n"
  
- #: agent/gpg-agent.c:2244
++#: agent/gpg-agent.c:2245
  #, 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:2248
++#: agent/gpg-agent.c:2249
  #, 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:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
++#: agent/gpg-agent.c:2392 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1871
  #, fuzzy, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
- #: agent/gpg-agent.c:2598
++#: agent/gpg-agent.c:2599
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2603
++#: agent/gpg-agent.c:2604
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2678
++#: agent/gpg-agent.c:2679
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2683
++#: agent/gpg-agent.c:2684
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
++#: agent/gpg-agent.c:2881 scd/scdaemon.c:1272 dirmngr/dirmngr.c:2075
  #, fuzzy, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "Titkoskulcs-blokk frissítése sikertelen: %s\n"
  
- #: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2954 scd/scdaemon.c:1321
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
  msgstr "%s: kihagyva: %s\n"
  
- #: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
++#: agent/gpg-agent.c:3092 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  #, fuzzy
  msgid "no gpg-agent running in this session\n"
  msgstr "GPG ügynök nem elérhető ebben a munkafolyamatban.\n"
@@@ -680,8 -522,6 +680,8 @@@ msgid "
  "Password cache maintenance\n"
  msgstr ""
  
- #: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
++#: agent/protect-tool.c:106 g10/gpg.c:424 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:153 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -689,9 -529,6 +689,9 @@@ msgstr "
  "@Parancsok:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
- #: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:92 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:168 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -745,8 -574,6 +745,8 @@@ 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:362 dirmngr/dirmngr.c:1469
- #: tools/gpgconf.c:323
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1472
++#: tools/gpgconf.c:328
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
  msgstr "Hiba \"%s\" olvasásakor: %s\n"
@@@ -916,9 -714,6 +916,9 @@@ msgstr "%d%s védő algoritmus nem tám
  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:438
 +#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
- #: dirmngr/ldap-wrapper.c:710
++#: dirmngr/ldap-wrapper.c:711
  #, fuzzy, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "Hiba a jelszó létrehozásakor: %s.\n"
@@@ -930,8 -722,6 +930,8 @@@
  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:848 dirmngr/dirmngr.c:1155
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1167
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
  msgstr "Hiba \"%s\" olvasásakor: %s\n"
@@@ -978,27 -759,22 +978,27 @@@ msgstr "Nem tudok kapcsolódni \"%s\" o
  msgid "problem setting the gpg-agent options\n"
  msgstr "Probléma az ügynökkel: ügynök válasza: 0x%lx\n"
  
- #: common/sysutils.c:144
++#: common/sysutils.c:148
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "Nem tudom letiltani a core fájlokat: %s.\n"
  
- #: common/sysutils.c:239
++#: common/sysutils.c:250
  #, fuzzy, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n"
  
- #: common/sysutils.c:271
++#: common/sysutils.c:282
  #, fuzzy, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n"
  
- #: common/sysutils.c:659
++#: common/sysutils.c:693
  #, fuzzy, c-format
  msgid "waiting for file '%s' to become accessible ...\n"
  msgstr "Frissítés sikertelen: %s.\n"
  
- #: common/sysutils.c:685
++#: common/sysutils.c:719
  #, fuzzy, c-format
  msgid "renaming '%s' to '%s' failed: %s\n"
  msgstr "Páncélozás nem sikerült: %s\n"
@@@ -1074,7 -835,6 +1074,7 @@@ msgstr "
  msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
  msgstr "FIGYELEM: \"%s\" elavult opció!\n"
  
- #: common/miscellaneous.c:554
++#: common/miscellaneous.c:556
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
@@@ -1189,8 -926,6 +1189,8 @@@ msgstr "%s: Kulcskarikát létrehoztam.
  msgid "algorithm: %s"
  msgstr "Páncél: %s\n"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3098
++#: scd/app-openpgp.c:3111
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
@@@ -1402,7 -1095,6 +1402,7 @@@ msgstr "
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr ""
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1173
++#: common/argparse.c:401 dirmngr/dirmngr.c:1185
  #, fuzzy
  msgid "out of core\n"
  msgstr "nem feldolgozott"
@@@ -1461,8 -1142,6 +1461,8 @@@ msgstr "A(z) %08lX nyilvános kulcsot n
  msgid "waiting for lock %s...\n"
  msgstr "Írom a titkos kulcsot a %s állományba.\n"
  
- #: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
- #: dirmngr/dirmngr.c:715
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:725
++#: dirmngr/dirmngr.c:734
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
@@@ -1502,7 -1173,6 +1502,7 @@@ msgstr "Váratlan páncél:
  msgid "invalid dash escaped line: "
  msgstr "Érvénytelen kötőjeles sor: "
  
- #: g10/armor.c:873 g10/armor.c:1490
++#: g10/armor.c:873 g10/armor.c:1493
  #, fuzzy, c-format
  msgid "invalid radix64 character %02X skipped\n"
  msgstr "Kihagytam a %02x kódú érvénytelen radix64 karaktert.\n"
@@@ -1519,7 -1186,6 +1519,7 @@@ msgstr "Korai állományvég (a CRC-ben
  msgid "malformed CRC\n"
  msgstr "Hibás formájú CRC.\n"
  
- #: g10/armor.c:962 g10/armor.c:1527
++#: g10/armor.c:962 g10/armor.c:1530
  #, fuzzy, c-format
  msgid "CRC error; %06lX - %06lX\n"
  msgstr "CRC hiba; %06lx - %06lx\n"
@@@ -1533,16 -1197,13 +1533,16 @@@ msgstr "Korai állományvég (a lezár�
  msgid "error in trailer line\n"
  msgstr "Hiba a záró sorban!\n"
  
- #: g10/armor.c:1303
++#: g10/armor.c:1306
  msgid "no valid OpenPGP data found.\n"
  msgstr "Nem találtam érvényes OpenPGP adatot.\n"
  
- #: g10/armor.c:1308
++#: g10/armor.c:1311
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
  msgstr "Érvénytelen páncél: %d karakternél hosszabb sor.\n"
  
- #: g10/armor.c:1312
++#: g10/armor.c:1315
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr ""
@@@ -1630,8 -1276,6 +1630,8 @@@ msgstr "titkos kulcs nem áll rendelkez
  msgid "OpenPGP card no. %s detected\n"
  msgstr ""
  
- #: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
- #: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2030
++#: g10/keygen.c:4087 g10/revoke.c:215 g10/revoke.c:618
  #, fuzzy
  msgid "can't do this in batch mode\n"
  msgstr "Nem tudom ezt megcsinálni kötegelt módban!\n"
@@@ -1641,15 -1284,10 +1641,15 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "Ez a parancs %s módban nem engedélyezett.\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2454
++#: g10/card-util.c:109 scd/app-openpgp.c:2467
  #, fuzzy
  msgid "Reset Code not or not anymore available\n"
  msgstr "Titkos kulcsrészek nem állnak rendelkezésre.\n"
  
 +#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
- #: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
- #: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1768
++#: g10/keygen.c:1945 g10/keygen.c:2313 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "Mit választ? "
  
@@@ -1716,10 -1340,6 +1716,10 @@@ msgstr "Nincs hozzá tartozó nyilváno
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
- #: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:334
++#: g10/import.c:592 g10/import.c:640 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
++#: dirmngr/dirmngr.c:1510 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
@@@ -1793,7 -1398,6 +1793,7 @@@ msgstr "Kulcsgenerálás sikertelen: %s
  msgid "not an OpenPGP card"
  msgstr "Nem találtam érvényes OpenPGP adatot.\n"
  
- #: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
++#: g10/card-util.c:1173 g10/keygen.c:4106 g10/keygen.c:5092
  #, fuzzy, c-format
  msgid "error getting current key info: %s\n"
  msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n"
@@@ -1824,13 -1423,10 +1824,13 @@@ msgstr "Milyen kulcsméretet szeretne? 
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "Milyen kulcsméretet szeretne? (1024) "
  
- #: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
++#: g10/card-util.c:1316 g10/keygen.c:2122 g10/keygen.c:2154
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "Felkerekítve %u bitre.\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2207 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr ""
@@@ -1885,9 -1471,6 +1885,9 @@@ msgstr "   (%d) RSA (csak titkosítás)
  msgid "   (3) Authentication key\n"
  msgstr ""
  
- #: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
- #: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
- #: g10/keygen.c:2314 g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1508
++#: g10/keygen.c:1794 g10/keygen.c:1822 g10/keygen.c:1952 g10/keygen.c:2060
++#: g10/keygen.c:2336 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Érvénytelen választás.\n"
  
@@@ -1921,7 -1498,6 +1921,7 @@@ msgstr "Valóban aláírja? 
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1816 g10/keyedit.c:1867
++#: g10/card-util.c:1816 g10/keyedit.c:1868
  msgid "quit this menu"
  msgstr "kilépés ebből a menüből"
  
@@@ -1930,7 -1505,6 +1930,7 @@@
  msgid "show admin commands"
  msgstr "Egymásnak ellentmondó parancsok!\n"
  
- #: g10/card-util.c:1819 g10/keyedit.c:1870
++#: g10/card-util.c:1819 g10/keyedit.c:1871
  msgid "show this help"
  msgstr "megmutatja ezt a súgót"
  
@@@ -2014,31 -1570,21 +2014,31 @@@ msgstr "Egymásnak ellentmondó parancs
  msgid "Admin commands are not allowed\n"
  msgstr "Írom a titkos kulcsot a %s állományba.\n"
  
- #: g10/card-util.c:2127 g10/keyedit.c:2816
++#: g10/card-util.c:2127 g10/keyedit.c:2817
  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:955
++#: g10/decrypt.c:190 g10/encrypt.c:955
  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:4851 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4904 g10/keyring.c:398 g10/keyring.c:771
  #, 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:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
- #: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
- #: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4858 g10/keyedit.c:2051
++#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2163
  #, fuzzy, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "\"%s\" kulcs nem található: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
- #: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
- #: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4866 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:645 g10/tofu.c:2171
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "Hiba a kulcsblokk olvasásakor: %s\n"
@@@ -2100,7 -1634,6 +2100,7 @@@ msgstr "Van egy titkos kulcs a \"%s\" n
  msgid "use option \"--delete-secret-keys\" to delete it first.\n"
  msgstr "Először azt törölje a \"--delete-secret-keys\" opcióval!\n"
  
- #: g10/encrypt.c:232 g10/sign.c:1292
++#: g10/encrypt.c:232 g10/sign.c:1294
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "Hiba a jelszó létrehozásakor: %s.\n"
@@@ -2120,7 -1650,6 +2120,7 @@@ msgstr "%s rejtjelezést használok.\n
  msgid "'%s' already compressed\n"
  msgstr "\"%s\" már tömörített.\n"
  
- #: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:610
  #, fuzzy, c-format
  #| msgid "WARNING: `%s' is an empty file\n"
  msgid "WARNING: '%s' is an empty file\n"
@@@ -2138,7 -1665,6 +2138,7 @@@ msgid "
  "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
  msgstr "A %s (%d) rejtjelező használata sérti a címzett preferenciáit!\n"
  
- #: g10/encrypt.c:707 g10/sign.c:984
++#: g10/encrypt.c:707 g10/sign.c:986
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2170,7 -1691,6 +2170,7 @@@ msgstr "%s titkosított adat.\n
  msgid "encrypted with unknown algorithm %d\n"
  msgstr "Ismeretlen algoritmussal (%d) titkosítva.\n"
  
- #: g10/decrypt-data.c:164 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:129
  msgid ""
  "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
  msgstr ""
@@@ -2269,8 -1771,6 +2269,8 @@@ msgstr "
  msgid " - skipped"
  msgstr "%s: kihagyva: %s\n"
  
- #: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:845 g10/sign.c:1148
++#: g10/export.c:1251 g10/import.c:1543 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:847 g10/sign.c:1150
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
@@@ -2295,8 -1791,6 +2295,8 @@@ msgstr "%08lX kulcs: PGP 2.x stílusú 
  msgid "WARNING: nothing exported\n"
  msgstr "FIGYELEM: Semmit sem exportáltam.\n"
  
- #: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
- #: g10/plaintext.c:151 g10/plaintext.c:174
++#: g10/export.c:2283 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/plaintext.c:167 g10/plaintext.c:190
  #, fuzzy, c-format
  #| msgid "error creating `%s': %s\n"
  msgid "error creating '%s': %s\n"
@@@ -2344,8 -1829,6 +2344,8 @@@ msgstr "Hiba \"%s\" létrehozásakor: %
  msgid "No fingerprint"
  msgstr "megmutatja az ujjlenyomatot"
  
- #: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
- #: g10/revoke.c:701
++#: g10/getkey.c:1873 g10/keyedit.c:2929 g10/keyedit.c:3016 g10/revoke.c:637
++#: g10/revoke.c:702
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "\"%s\" titkos kulcs nem található: %s\n"
@@@ -2379,218 -1857,174 +2379,224 @@@ 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/gpg.c:424 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:200
  #, fuzzy
  msgid "make a signature"
  msgstr "különálló aláírás készítése"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:427
  #, fuzzy
  msgid "make a clear text signature"
  msgstr "|[fájl]|olvasható szöveg aláírása"
  
- #: g10/gpg.c:426 sm/gpgsm.c:202
++#: g10/gpg.c:429 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "különálló aláírás készítése"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:430 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "adat titkosítása"
  
- #: g10/gpg.c:429
++#: g10/gpg.c:432
  msgid "encryption only with symmetric cipher"
  msgstr "titkosítás csak szimmetrikus rejtjelezővel"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:434 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "adat visszafejtése (alapértelmezés)"
  
- #: g10/gpg.c:433 sm/gpgsm.c:206
++#: g10/gpg.c:436 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "aláírás ellenőrzése"
  
- #: g10/gpg.c:435 sm/gpgsm.c:207
++#: g10/gpg.c:438 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "kulcsok listázása"
  
- #: g10/gpg.c:437
++#: g10/gpg.c:440
  msgid "list keys and signatures"
  msgstr "kulcsok és aláírások listázása"
  
- #: g10/gpg.c:438
++#: g10/gpg.c:443
  #, fuzzy
  msgid "list and check key signatures"
  msgstr "kulcsaláírások ellenőrzése"
  
- #: g10/gpg.c:439 sm/gpgsm.c:212
++#: g10/gpg.c:445 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "kulcsok és ujjlenyomatok listázása"
  
- #: g10/gpg.c:440 sm/gpgsm.c:210
++#: g10/gpg.c:446 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "titkos kulcsok listázása"
  
- #: g10/gpg.c:442 sm/gpgsm.c:213
++#: g10/gpg.c:448 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "új kulcspár létrehozása"
  
- #: g10/gpg.c:444
++#: g10/gpg.c:451
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly generate a new key pair"
  msgstr "új kulcspár létrehozása"
  
- #: g10/gpg.c:446
++#: g10/gpg.c:454
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly add a new user-id"
  msgstr "új kulcspár létrehozása"
  
- #: g10/gpg.c:449
++#: g10/gpg.c:459
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly revoke a user-id"
  msgstr "új kulcspár létrehozása"
  
- #: g10/gpg.c:451
++#: g10/gpg.c:462
+ #, fuzzy
+ #| msgid "generate a new key pair"
+ msgid "quickly set a new expiration date"
+ msgstr "új kulcspár létrehozása"
+ 
++#: g10/gpg.c:464
  msgid "full featured key pair generation"
  msgstr ""
  
- #: g10/gpg.c:452
++#: g10/gpg.c:467
  msgid "generate a revocation certificate"
  msgstr "visszavonási igazolás készítése"
  
- #: g10/gpg.c:454 sm/gpgsm.c:215
++#: g10/gpg.c:470 sm/gpgsm.c:216
  msgid "remove keys from the public keyring"
  msgstr "kulcsok eltávolítása a nyilvánoskulcs-karikáról"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:472
  msgid "remove keys from the secret keyring"
  msgstr "kulcsok eltávolítása a titkoskulcs-karikáról"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:474
  #, fuzzy
  #| msgid "sign a key"
  msgid "quickly sign a key"
  msgstr "kulcs aláírása"
  
- #: g10/gpg.c:460
++#: g10/gpg.c:476
  #, fuzzy
  #| msgid "sign a key locally"
  msgid "quickly sign a key locally"
  msgstr "kulcs aláírása helyileg"
  
- #: g10/gpg.c:461
++#: g10/gpg.c:477
  msgid "sign a key"
  msgstr "kulcs aláírása"
  
- #: g10/gpg.c:462
++#: g10/gpg.c:478
  msgid "sign a key locally"
  msgstr "kulcs aláírása helyileg"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:479
  msgid "sign or edit a key"
  msgstr "kulcs aláírása vagy szerkesztése"
  
- #: g10/gpg.c:465 sm/gpgsm.c:233
++#: g10/gpg.c:481 sm/gpgsm.c:234
  #, fuzzy
  msgid "change a passphrase"
  msgstr "jelszóváltoztatás"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:485
  msgid "export keys"
  msgstr "kulcsok exportálása"
  
- #: g10/gpg.c:468
++#: g10/gpg.c:486
  msgid "export keys to a keyserver"
  msgstr "kulcsok exportálása kulcsszerverre"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:487
  msgid "import keys from a keyserver"
  msgstr "kulcsok importálása kulcsszerverről"
  
- #: g10/gpg.c:471
++#: g10/gpg.c:490
  msgid "search for keys on a keyserver"
  msgstr "kulcsok keresése kulcsszerveren"
  
- #: g10/gpg.c:473
++#: g10/gpg.c:492
  msgid "update all keys from a keyserver"
  msgstr "minden kulcs frissítése kulcsszerverről"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:498
  msgid "import/merge keys"
  msgstr "kulcsok importálása/összefűzése"
  
- #: g10/gpg.c:482
++#: g10/gpg.c:501
  msgid "print the card status"
  msgstr ""
  
- #: g10/gpg.c:483
++#: g10/gpg.c:502
  msgid "change data on a card"
  msgstr ""
  
- #: g10/gpg.c:484
++#: g10/gpg.c:504
  msgid "change a card's PIN"
  msgstr ""
  
- #: g10/gpg.c:496
++#: g10/gpg.c:516
  msgid "update the trust database"
  msgstr "bizalmi adatbázis frissítése"
  
- #: g10/gpg.c:505
++#: g10/gpg.c:525
  #, fuzzy
  msgid "print message digests"
  msgstr "|algo [fájlok]|üzenet kivonatának kiírása"
  
- #: g10/gpg.c:508 sm/gpgsm.c:228
++#: g10/gpg.c:528 sm/gpgsm.c:229
  msgid "run in server mode"
  msgstr ""
  
- #: g10/gpg.c:510
++#: g10/gpg.c:530
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:514 sm/gpgsm.c:246
++#: g10/gpg.c:534 sm/gpgsm.c:248
  msgid "create ascii armored output"
  msgstr "ascii páncélozott kimenet létrehozása"
  
- #: g10/gpg.c:517 sm/gpgsm.c:262
++#: g10/gpg.c:537 sm/gpgsm.c:264
  #, fuzzy
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|NÉV|titkosítás NÉV részére"
  
- #: g10/gpg.c:533 sm/gpgsm.c:298
++#: g10/gpg.c:553 sm/gpgsm.c:300
  #, fuzzy
  msgid "|USER-ID|use USER-ID to sign or decrypt"
  msgstr "felh. azonosító aláíráshoz és visszafejtéshez"
  
- #: g10/gpg.c:539
++#: g10/gpg.c:559
  #, 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:546
++#: g10/gpg.c:566
  msgid "use canonical text mode"
  msgstr "kanonikus szöveges mód használata"
  
- #: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
++#: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
  #, fuzzy
  msgid "|FILE|write output to FILE"
  msgstr "|fájl|bővítő modul betöltése"
  
- #: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
++#: g10/gpg.c:598 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
  msgid "do not make any changes"
  msgstr "ne csináljon semmi változtatást"
  
- #: g10/gpg.c:579
++#: g10/gpg.c:599
  msgid "prompt before overwriting"
  msgstr "felülírás előtt rákérdezés"
  
- #: g10/gpg.c:628
++#: g10/gpg.c:648
  msgid "use strict OpenPGP behavior"
  msgstr ""
  
- #: g10/gpg.c:654 sm/gpgsm.c:355
++#: g10/gpg.c:674 sm/gpgsm.c:357
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2598,7 -2032,16 +2604,17 @@@ msgstr "
  "@\n"
  "(A parancsok és opciók teljes listáját a man oldalon tekintheti meg.)\n"
  
- #: g10/gpg.c:657 sm/gpgsm.c:358
++#: g10/gpg.c:677
+ #, fuzzy
+ #| msgid ""
+ #| "@\n"
+ #| "Examples:\n"
+ #| "\n"
+ #| " -se -r Bob [file]          sign and encrypt for user Bob\n"
+ #| " --clear-sign [file]         make a clear text signature\n"
+ #| " --detach-sign [file]       make a detached signature\n"
+ #| " --list-keys [names]        show keys\n"
+ #| " --fingerprint [names]      show fingerprints\n"
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2618,13 -2061,11 +2634,13 @@@ msgstr "
  " --list-keys [nevek]        kulcsok kiíratása\n"
  " --fingerprint [nevek]      ujjlenyomatok kiíratása\n"
  
- #: g10/gpg.c:1026
++#: g10/gpg.c:1047
  #, 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:1029
++#: g10/gpg.c:1050
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg [options] [files]\n"
@@@ -2639,7 -2080,6 +2655,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:1040 sm/gpgsm.c:588
++#: g10/gpg.c:1061 sm/gpgsm.c:580
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2647,607 -2087,429 +2663,544 @@@ msgstr "
  "\n"
  "Támogatott algoritmusok:\n"
  
- #: g10/gpg.c:1043
++#: g10/gpg.c:1064
  msgid "Pubkey: "
  msgstr "Nyilvános kulcsú (pubkey): "
  
- #: g10/gpg.c:1050 g10/keyedit.c:3402
++#: g10/gpg.c:1071 g10/keyedit.c:3483
  msgid "Cipher: "
  msgstr "Rejtjelező (cipher): "
  
- #: g10/gpg.c:1057
++#: g10/gpg.c:1078
  msgid "Hash: "
  msgstr "Kivonatoló (hash): "
  
- #: g10/gpg.c:1064 g10/keyedit.c:3451
++#: g10/gpg.c:1085 g10/keyedit.c:3532
  msgid "Compression: "
  msgstr "Tömörítő (compression): "
  
- #: g10/gpg.c:1133 sm/gpgsm.c:662
++#: g10/gpg.c:1154 sm/gpgsm.c:654
  #, fuzzy, c-format
  msgid "usage: %s [options] %s\n"
  msgstr "Használat: gpg [opciók] "
  
- #: g10/gpg.c:1321 sm/gpgsm.c:751
++#: g10/gpg.c:1342 sm/gpgsm.c:743
  msgid "conflicting commands\n"
  msgstr "Egymásnak ellentmondó parancsok!\n"
  
- #: g10/gpg.c:1339
++#: g10/gpg.c:1360
  #, 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:1537
++#: g10/gpg.c:1558
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n"
  
- #: g10/gpg.c:1540
++#: g10/gpg.c:1561
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
  msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n"
  
- #: g10/gpg.c:1543
++#: g10/gpg.c:1564
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on extension '%s'\n"
  msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n"
  
- #: g10/gpg.c:1549
++#: g10/gpg.c:1570
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
  msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n"
  
- #: g10/gpg.c:1552
++#: g10/gpg.c:1573
  #, 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:1555
++#: g10/gpg.c:1576
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on extension '%s'\n"
  msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n"
  
- #: g10/gpg.c:1561
++#: g10/gpg.c:1582
  #, 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:1564
++#: g10/gpg.c:1585
  #, 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:1567
++#: g10/gpg.c:1588
  #, 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:1573
++#: g10/gpg.c:1594
  #, 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:1576
++#: g10/gpg.c:1597
  #, 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:1579
++#: g10/gpg.c:1600
  #, 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:1786
++#: g10/gpg.c:1816
  #, fuzzy, c-format
  msgid "unknown configuration item '%s'\n"
  msgstr "\"%s\": ismeretlen konfigurációs elem.\n"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1925
  msgid "display photo IDs during key listings"
  msgstr ""
  
- #: g10/gpg.c:1895
++#: g10/gpg.c:1927
  #, fuzzy
  msgid "show key usage information during key listings"
  msgstr "Nincs megfelelő aláírás a titkoskulcs-karikán.\n"
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1929
  msgid "show policy URLs during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1931
  #, fuzzy
  msgid "show all notations during signature listings"
  msgstr "Nincs megfelelő aláírás a titkoskulcs-karikán.\n"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1933
  msgid "show IETF standard notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1937
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1939
  #, 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:1909
++#: g10/gpg.c:1941
  msgid "show user ID validity during key listings"
  msgstr ""
  
- #: g10/gpg.c:1911
++#: g10/gpg.c:1943
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  
- #: g10/gpg.c:1913
++#: g10/gpg.c:1945
  msgid "show revoked and expired subkeys in key listings"
  msgstr ""
  
- #: g10/gpg.c:1915
++#: g10/gpg.c:1947
  #, fuzzy
  msgid "show the keyring name in key listings"
  msgstr "mutatja a kilistázott kulcs kulcskarikáját is"
  
- #: g10/gpg.c:1917
++#: g10/gpg.c:1949
  #, fuzzy
  msgid "show expiration dates during signature listings"
  msgstr "Nincs megfelelő aláírás a titkoskulcs-karikán.\n"
  
- #: g10/gpg.c:2019 g10/gpg.c:2056
++#: g10/gpg.c:2051 g10/gpg.c:2088
  #, fuzzy, c-format
  msgid "valid values for option '%s':\n"
  msgstr "Érvénytelen import opciók!\n"
  
- #: g10/gpg.c:2030
++#: g10/gpg.c:2062
  #, fuzzy, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
  
- #: g10/gpg.c:2032 g10/gpg.c:2068
++#: g10/gpg.c:2064 g10/gpg.c:2100
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2066
++#: g10/gpg.c:2098 g10/keygen.c:167
  #, fuzzy, c-format
  msgid "invalid value for option '%s'\n"
  msgstr "Érvénytelen import opciók!\n"
  
- #: g10/gpg.c:2203
++#: g10/gpg.c:2235
  #, fuzzy, c-format
  #| msgid "NOTE: old default options file `%s' ignored\n"
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "MEGJEGYZÉS: Figyelmen kívül hagytam a régi opciókat (%s).\n"
  
- #: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
++#: g10/gpg.c:2839 g10/gpg.c:3610 g10/gpg.c:3622
  #, 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:2978 g10/gpg.c:2990
++#: g10/gpg.c:3011 g10/gpg.c:3023
  #, fuzzy, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "%s nem érvényes karakterkiosztás!\n"
  
- #: g10/gpg.c:3012
++#: g10/gpg.c:3045
  #, 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:3044 sm/gpgsm.c:1166
++#: g10/gpg.c:3077 sm/gpgsm.c:1158
  #, fuzzy, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3130
  #, fuzzy, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "%s nem érvényes karakterkiosztás!\n"
  
- #: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
++#: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
  #, fuzzy
  msgid "could not parse keyserver URL\n"
  msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
  
- #: g10/gpg.c:3137
++#: g10/gpg.c:3170
  #, fuzzy, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: Érvénytelen export opciók!\n"
  
- #: g10/gpg.c:3140
++#: g10/gpg.c:3173
  #, fuzzy
  msgid "invalid keyserver options\n"
  msgstr "Érvénytelen export opciók!\n"
  
- #: g10/gpg.c:3147
++#: g10/gpg.c:3180
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: Érvénytelen import opciók!\n"
  
- #: g10/gpg.c:3150
++#: g10/gpg.c:3183
  msgid "invalid import options\n"
  msgstr "Érvénytelen import opciók!\n"
  
- #: g10/gpg.c:3156 g10/gpg.c:3171
++#: g10/gpg.c:3189 g10/gpg.c:3204
  #, fuzzy, c-format
  msgid "invalid filter option: %s\n"
  msgstr "Érvénytelen import opciók!\n"
  
- #: g10/gpg.c:3162
++#: g10/gpg.c:3195
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: Érvénytelen export opciók!\n"
  
- #: g10/gpg.c:3165
++#: g10/gpg.c:3198
  msgid "invalid export options\n"
  msgstr "Érvénytelen export opciók!\n"
  
- #: g10/gpg.c:3177
++#: g10/gpg.c:3210
  #, fuzzy, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: Érvénytelen import opciók!\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3213
  #, fuzzy
  msgid "invalid list options\n"
  msgstr "Érvénytelen import opciók!\n"
  
- #: g10/gpg.c:3188
++#: g10/gpg.c:3221
  msgid "display photo IDs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3190
++#: g10/gpg.c:3223
  msgid "show policy URLs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3192
++#: g10/gpg.c:3225
  #, fuzzy
  msgid "show all notations during signature verification"
  msgstr "%s nem érvényes karakterkiosztás!\n"
  
- #: g10/gpg.c:3194
++#: g10/gpg.c:3227
  msgid "show IETF standard notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3231
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3200
++#: g10/gpg.c:3233
  #, 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:3202
++#: g10/gpg.c:3235
  #, fuzzy
  msgid "show user ID validity during signature verification"
  msgstr "%s nem érvényes karakterkiosztás!\n"
  
- #: g10/gpg.c:3204
++#: g10/gpg.c:3237
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  
- #: g10/gpg.c:3206
++#: g10/gpg.c:3239
  #, fuzzy
  msgid "show only the primary user ID in signature verification"
  msgstr "%s nem érvényes karakterkiosztás!\n"
  
- #: g10/gpg.c:3208
++#: g10/gpg.c:3241
  msgid "validate signatures with PKA data"
  msgstr ""
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3243
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr ""
  
- #: g10/gpg.c:3217
++#: g10/gpg.c:3250
  #, fuzzy, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: Érvénytelen export opciók!\n"
  
- #: g10/gpg.c:3220
++#: g10/gpg.c:3253
  #, fuzzy
  msgid "invalid verify options\n"
  msgstr "Érvénytelen export opciók!\n"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3260
  #, 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:3417
++#: g10/gpg.c:3452
  #, fuzzy, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: Érvénytelen export opciók!\n"
  
- #: g10/gpg.c:3420
++#: g10/gpg.c:3455
  msgid "invalid auto-key-locate list\n"
  msgstr ""
  
- #: g10/gpg.c:3553 sm/gpgsm.c:1507
++#: g10/gpg.c:3592 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
  msgstr "FIGYELEM: A program core állományt hozhat létre!\n"
  
- #: g10/gpg.c:3564
++#: g10/gpg.c:3603
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "FIGYELEM: %s hatástalanítja %s-t!\n"
  
- #: g10/gpg.c:3573
++#: g10/gpg.c:3612
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s és %s nem használható együtt!\n"
  
- #: g10/gpg.c:3576
++#: g10/gpg.c:3615
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s értelmetlen %s mellett!\n"
  
- #: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
++#: g10/gpg.c:3630 sm/gpgsm.c:1518 dirmngr/dirmngr.c:951
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3651
  #, 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:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
++#: g10/gpg.c:3686 g10/gpg.c:3710 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "A kiválasztott rejtjelező algoritmus érvénytelen!\n"
  
- #: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
++#: g10/gpg.c:3692 g10/gpg.c:3716 sm/gpgsm.c:1591 sm/gpgsm.c:1597
  msgid "selected digest algorithm is invalid\n"
  msgstr "A kiválasztott kivonatoló algoritmus érvénytelen!\n"
  
- #: g10/gpg.c:3659
++#: g10/gpg.c:3698
  #, fuzzy
  msgid "selected compression algorithm is invalid\n"
  msgstr "A kiválasztott rejtjelező algoritmus érvénytelen!\n"
  
- #: g10/gpg.c:3665
++#: g10/gpg.c:3704
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "Az igazoláshoz kiválasztott kivonatoló algoritmus érvénytelen!\n"
  
- #: g10/gpg.c:3680
++#: g10/gpg.c:3719
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed nagyobb kell legyen 0-nál!\n"
  
- #: g10/gpg.c:3682
++#: g10/gpg.c:3721
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed nagyobb kell legyen 1-nél!\n"
  
- #: g10/gpg.c:3684
++#: g10/gpg.c:3723
  #, fuzzy
  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:3686
++#: g10/gpg.c:3725
  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:3688
++#: g10/gpg.c:3727
  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:3691
++#: g10/gpg.c:3730
  #, fuzzy
  #| 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:3695
++#: g10/gpg.c:3734
  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:3702
++#: g10/gpg.c:3741
  msgid "invalid default preferences\n"
  msgstr "Érvénytelen alapértelmezett preferenciák!\n"
  
- #: g10/gpg.c:3706
++#: g10/gpg.c:3745
  msgid "invalid personal cipher preferences\n"
  msgstr "Érvénytelen személyes rejtjelező-preferenciák!\n"
  
- #: g10/gpg.c:3710
++#: g10/gpg.c:3749
  msgid "invalid personal digest preferences\n"
  msgstr "Érvénytelen személyes kivonatolópreferenciák!\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3753
  msgid "invalid personal compress preferences\n"
  msgstr "Érvénytelen személyes tömörítőpreferenciák!\n"
  
- #: g10/gpg.c:3750
++#: g10/gpg.c:3789
  #, 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:3797
++#: g10/gpg.c:3836
  #, fuzzy, c-format
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr ""
  "Lehet, hogy nem használhatja \"%s\" rejtjelező algoritmust %s módban!\n"
  
- #: g10/gpg.c:3802
++#: g10/gpg.c:3841
  #, fuzzy, c-format
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr ""
  "Lehet, hogy nem használhatja \"%s\" kivonatoló algoritmust %s módban!\n"
  
- #: g10/gpg.c:3807
++#: g10/gpg.c:3846
  #, fuzzy, c-format
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr "Lehet, hogy nem használhatja \"%s\" tömörítő algoritmust %s módban!\n"
  
- #: g10/gpg.c:3906
++#: g10/gpg.c:3945
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:3957
  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:3975
- msgid "--store [filename]"
- msgstr "--store [fájlnév]"
- 
- #: g10/gpg.c:3985
- msgid "--symmetric [filename]"
- msgstr "--symmetric [fájlnév]"
- 
- #: g10/gpg.c:3989
++#: g10/gpg.c:4028
  #, fuzzy, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "Visszafejtés sikertelen: %s.\n"
  
- #: g10/gpg.c:4000
- msgid "--encrypt [filename]"
- msgstr "--encrypt [fájlnév]"
- 
- #: g10/gpg.c:4016
- #, fuzzy
- msgid "--symmetric --encrypt [filename]"
- msgstr "--sign --encrypt [fájlnév]"
- 
- #: g10/gpg.c:4018
++#: g10/gpg.c:4057
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4021
++#: g10/gpg.c:4060
  #, fuzzy, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr "Lehet, hogy nem használhatja %s-t %s módban!\n"
  
- #: g10/gpg.c:4042
- msgid "--sign [filename]"
- msgstr "--sign [fájlnév]"
- 
- #: g10/gpg.c:4058
- msgid "--sign --encrypt [filename]"
- msgstr "--sign --encrypt [fájlnév]"
- 
- #: g10/gpg.c:4076
- #, fuzzy
- msgid "--symmetric --sign --encrypt [filename]"
- msgstr "--sign --encrypt [fájlnév]"
- 
- #: g10/gpg.c:4078
++#: g10/gpg.c:4117
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4081
++#: g10/gpg.c:4120
  #, fuzzy, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr "Lehet, hogy nem használhatja %s-t %s módban!\n"
  
- #: g10/gpg.c:4105
- msgid "--sign --symmetric [filename]"
- msgstr "--sign --symmetric [fájlnév]"
- 
- #: g10/gpg.c:4117
- msgid "--clearsign [filename]"
- msgstr "--clearsign [fájlnév]"
- 
- #: g10/gpg.c:4147
- msgid "--decrypt [filename]"
- msgstr "--decrypt [fájlnév]"
- 
- #: g10/gpg.c:4174
- msgid "--sign-key user-id"
- msgstr "--sign-key felh-azonosító"
- 
- #: g10/gpg.c:4178
- msgid "--lsign-key user-id"
- msgstr "--lsign-key felh-azonosító"
- 
- #: g10/gpg.c:4199
- msgid "--edit-key user-id [commands]"
- msgstr "--edit-key felh-azonosító [parancsok]"
- 
- #: g10/gpg.c:4215
- #, fuzzy
- msgid "--passwd <user-id>"
- msgstr "--sign-key felh-azonosító"
- 
- #: g10/gpg.c:4411 g10/keyserver.c:1837
++#: g10/gpg.c:4462 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "Küldés a kulcsszerverre sikertelen: %s\n"
  
- #: g10/gpg.c:4416
++#: g10/gpg.c:4467
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "Vétel a kulcsszerverről sikertelen: %s\n"
  
- #: g10/gpg.c:4422
++#: g10/gpg.c:4473
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "Kulcsexportálás sikertelen: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4486
  #, 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:4447
++#: g10/gpg.c:4498
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "Keresés a kulcsszerveren sikertelen: %s\n"
  
- #: g10/gpg.c:4460
++#: g10/gpg.c:4511
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "Frissítés a kulcsszerverről sikertelen: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4578
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "Páncél eltávolítása nem sikerült: %s\n"
  
- #: g10/gpg.c:4538
++#: g10/gpg.c:4589
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "Páncélozás nem sikerült: %s\n"
  
- #: g10/gpg.c:4630
++#: g10/gpg.c:4681
  #, 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:4776 g10/tofu.c:2002
++#: g10/gpg.c:4827 g10/tofu.c:2151
  #, fuzzy, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: g10/gpg.c:4788
++#: g10/gpg.c:4839
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4835
- msgid "[filename]"
- msgstr "[fájlnév]"
- 
- #: g10/gpg.c:4841
++#: g10/gpg.c:4894
  msgid "Go ahead and type your message ...\n"
  msgstr "Kezdheti gépelni az üzenetet...\n"
  
- #: g10/gpg.c:5179
++#: g10/gpg.c:5232
  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:5181
++#: g10/gpg.c:5234
  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:5214
++#: g10/gpg.c:5267
  #, fuzzy
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "A megadott aláírási eljárásmód URL-je érvénytelen!\n"
@@@ -3261,7 -2521,6 +3214,7 @@@ msgstr "a megadott kulcskarikáról veg
  msgid "make timestamp conflicts only a warning"
  msgstr "időbélyeg-konfliktus esetén csak figyelmeztessen"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:345
++#: g10/gpgv.c:82 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|ÁL|állapotinformációk írása ÁL állományleíróra"
  
@@@ -3292,328 -2546,262 +3245,328 @@@ msgstr "Nem áll rendelkezésre segíts
  msgid "No help available for '%s'"
  msgstr "Nem áll rendelkezésre segítség \"%s\" témához."
  
- #: g10/import.c:151
++#: g10/import.c:152
  msgid "import signatures that are marked as local-only"
  msgstr ""
  
- #: g10/import.c:154
++#: g10/import.c:155
  msgid "repair damage from the pks keyserver during import"
  msgstr ""
  
- #: g10/import.c:157
++#: g10/import.c:158
  #, fuzzy
  msgid "do not clear the ownertrust values during import"
  msgstr "bizalmi adatbázis frissítése"
  
- #: g10/import.c:160
++#: g10/import.c:161
  #, fuzzy
  msgid "do not update the trustdb after import"
  msgstr "bizalmi adatbázis frissítése"
  
- #: g10/import.c:163
++#: g10/import.c:164
  #, fuzzy
  msgid "show key during import"
  msgstr "megmutatja az ujjlenyomatot"
  
- #: g10/import.c:166
++#: g10/import.c:167
  msgid "only accept updates to existing keys"
  msgstr ""
  
- #: g10/import.c:169
++#: g10/import.c:170
  #, fuzzy
  msgid "remove unusable parts from key after import"
  msgstr "használhatatlan titkos kulcs"
  
- #: g10/import.c:172
++#: g10/import.c:173
  msgid "remove as much as possible from key after import"
  msgstr ""
  
- #: g10/import.c:175
++#: g10/import.c:176
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:326 g10/import.c:568
++#: g10/import.c:327 g10/import.c:569
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "%d típusú blokkot kihagyom.\n"
  
- #: g10/import.c:585
++#: g10/import.c:586
  #, fuzzy, c-format
  msgid "%lu keys processed so far\n"
  msgstr "Eddig %lu kulcsot dolgoztam fel.\n"
  
- #: g10/import.c:655
++#: g10/import.c:656
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "     Összesen feldolgoztam: %lu\n"
  
- #: g10/import.c:658
++#: g10/import.c:659
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "       új kulcsok kihagyva: %lu\n"
  
- #: g10/import.c:660
++#: g10/import.c:661
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "       új kulcsok kihagyva: %lu\n"
  
- #: g10/import.c:663
++#: g10/import.c:664
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "    felh. azonosító nélkül: %lu\n"
  
- #: g10/import.c:666 sm/import.c:130
++#: g10/import.c:667 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "                importálva: %lu"
  
- #: g10/import.c:670 sm/import.c:134
++#: g10/import.c:671 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "               változatlan: %lu\n"
  
- #: g10/import.c:672
++#: g10/import.c:673
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "       új felh. azonosítók: %lu\n"
  
- #: g10/import.c:674
++#: g10/import.c:675
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "              új alkulcsok: %lu\n"
  
- #: g10/import.c:676
++#: g10/import.c:677
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "              új aláírások: %lu\n"
  
- #: g10/import.c:678
++#: g10/import.c:679
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "     új kulcsvisszavonások: %lu\n"
  
- #: g10/import.c:680 sm/import.c:136
++#: g10/import.c:681 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "   olvasott titkos kulcsok: %lu\n"
  
- #: g10/import.c:682 sm/import.c:138
++#: g10/import.c:683 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "  importált titkos kulcsok: %lu\n"
  
- #: g10/import.c:684 sm/import.c:140
++#: g10/import.c:685 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr "változatlan titkos kulcsok: %lu\n"
  
- #: g10/import.c:686 sm/import.c:142
++#: g10/import.c:687 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "             nem importált: %lu\n"
  
- #: g10/import.c:688
++#: g10/import.c:689
  #, fuzzy, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "              új aláírások: %lu\n"
  
- #: g10/import.c:690
++#: g10/import.c:691
  #, fuzzy, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "   olvasott titkos kulcsok: %lu\n"
  
- #: g10/import.c:1034
++#: g10/import.c:1035
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
  "algorithms on these user IDs:\n"
  msgstr ""
  
- #: g10/import.c:1076
++#: g10/import.c:1077
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1091
++#: g10/import.c:1092
  #, fuzzy, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "%s aláírás, %s kivonatoló algoritmus.\n"
  
- #: g10/import.c:1103
++#: g10/import.c:1104
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1116
++#: g10/import.c:1117
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr ""
  
- #: g10/import.c:1118
++#: g10/import.c:1119
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  
- #: g10/import.c:1143
++#: g10/import.c:1144
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  
- #: g10/import.c:1379 g10/import.c:2167
++#: g10/import.c:1380 g10/import.c:2168
  #, fuzzy, c-format
  msgid "key %s: no user ID\n"
  msgstr "%08lX kulcs: Nincs felhasználói azonosító.\n"
  
- #: g10/import.c:1385
++#: g10/import.c:1386
  #, fuzzy, c-format
  msgid "key %s: %s\n"
  msgstr "Kihagytam \"%s\"-t: %s.\n"
  
- #: g10/import.c:1386 g10/import.c:2141
++#: g10/import.c:1387 g10/import.c:2142
  msgid "rejected by import screener"
  msgstr ""
  
- #: g10/import.c:1416
++#: g10/import.c:1417
  #, fuzzy, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "%08lX kulcs: HKP alkulcssérülés kijavítva.\n"
  
- #: g10/import.c:1434
++#: g10/import.c:1435
  #, fuzzy, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "%08lX kulcs: Nem önaláírt felh. azonosító (\"%s\") elfogadva.\n"
  
- #: g10/import.c:1444 g10/import.c:1475
++#: g10/import.c:1445 g10/import.c:1476
  #, fuzzy, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "%08lX kulcs: Nincs érvényes felhasználói azonosító.\n"
  
- #: g10/import.c:1446
++#: g10/import.c:1447
  msgid "this may be caused by a missing self-signature\n"
  msgstr "Ezt okozhatja egy hiányzó önaláírás.\n"
  
- #: g10/import.c:1516 g10/import.c:2318
++#: g10/import.c:1517 g10/import.c:2319
  #, fuzzy, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "%08lX kulcs: Nyilvános kulcs nem található: %s\n"
  
- #: g10/import.c:1522
++#: g10/import.c:1523
  #, fuzzy, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "%08lX kulcs: új kulcs - kihagytam.\n"
  
- #: g10/import.c:1537
++#: g10/import.c:1538
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "Nem írható kulcskarikát találtam: %s\n"
  
- #: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
++#: g10/import.c:1547 g10/import.c:1648 g10/import.c:2385
  #, fuzzy, c-format
  #| msgid "error writing keyring `%s': %s\n"
  msgid "error writing keyring '%s': %s\n"
  msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
  
- #: g10/import.c:1566
++#: g10/import.c:1567
  #, fuzzy, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "%08lX kulcs: \"%s\" nyilvános kulcs importálva.\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1591
  #, fuzzy, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "%08lX kulcs: Nem egyezik a mi másolatunkkal!\n"
  
- #: g10/import.c:1606 g10/import.c:2342
++#: g10/import.c:1607 g10/import.c:2343
  #, fuzzy, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "%08lX kulcs: Nem találom az eredeti kulcsblokkot: %s\n"
  
- #: g10/import.c:1614 g10/import.c:2349
++#: g10/import.c:1615 g10/import.c:2350
  #, fuzzy, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "%08lX kulcs: Nem tudom beolvasni az eredeti kulcsblokkot: %s\n"
  
- #: g10/import.c:1657
++#: g10/import.c:1658
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "%08lX kulcs: \"%s\" 1 új felhasználói azonosító.\n"
  
- #: g10/import.c:1660
++#: g10/import.c:1661
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "%08lX kulcs: \"%s\" %d új felhasználói azonosító.\n"
  
- #: g10/import.c:1663
++#: g10/import.c:1664
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "%08lX kulcs: \"%s\" 1 új aláírás.\n"
  
- #: g10/import.c:1666
++#: g10/import.c:1667
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "%08lX kulcs: \"%s\" %d új aláírás.\n"
  
- #: g10/import.c:1669
++#: g10/import.c:1670
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "%08lX kulcs: \"%s\" 1 új alkulcs.\n"
  
- #: g10/import.c:1672
++#: g10/import.c:1673
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "%08lX kulcs: \"%s\" %d új alkulcs.\n"
  
- #: g10/import.c:1675
++#: g10/import.c:1676
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "%08lX kulcs: \"%s\" %d új aláírás.\n"
  
- #: g10/import.c:1678
++#: g10/import.c:1679
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "%08lX kulcs: \"%s\" %d új aláírás.\n"
  
- #: g10/import.c:1681
++#: g10/import.c:1682
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "%08lX kulcs: \"%s\" %d új felhasználói azonosító.\n"
  
- #: g10/import.c:1684
++#: g10/import.c:1685
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "%08lX kulcs: \"%s\" %d új felhasználói azonosító.\n"
  
- #: g10/import.c:1707
++#: g10/import.c:1708
  #, fuzzy, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "%08lX kulcs: \"%s\" nem változott.\n"
  
- #: g10/import.c:2019 g10/import.c:2264
++#: g10/import.c:2020 g10/import.c:2265
  #, fuzzy, c-format
  msgid "key %s: secret key imported\n"
  msgstr "%08lX kulcs: Titkos kulcs importálva.\n"
  
- #: g10/import.c:2027
++#: g10/import.c:2028
  #, fuzzy, c-format
  #| msgid "skipped: secret key already present\n"
  msgid "key %s: secret key already exists\n"
  msgstr "Kihagytam: titkos kulcs már jelen van.\n"
  
- #: g10/import.c:2035
++#: g10/import.c:2036
  #, fuzzy, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "Hiba %s-ra/-re küldéskor: %s\n"
  
- #: g10/import.c:2140
++#: g10/import.c:2141
  #, fuzzy, c-format
  msgid "secret key %s: %s\n"
  msgstr "\"%s\" titkos kulcs nem található: %s\n"
  
- #: g10/import.c:2160 g10/import.c:2195
++#: g10/import.c:2161 g10/import.c:2196
  #, fuzzy
  msgid "importing secret keys not allowed\n"
  msgstr "Írom a titkos kulcsot a %s állományba.\n"
  
- #: g10/import.c:2184
++#: g10/import.c:2185
  #, fuzzy, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr ""
@@@ -3629,143 -2817,116 +3582,143 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2256
++#: g10/import.c:2257
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2311
++#: g10/import.c:2312
  #, fuzzy, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr "%08lX kulcs: Nincs nyilvános kulcs - nem tudok visszavonni.\n"
  
- #: g10/import.c:2360
++#: g10/import.c:2361
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "%08lX kulcs: Érvénytelen visszavonó igazolás: %s - visszautasítva.\n"
  
- #: g10/import.c:2393
++#: g10/import.c:2394
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "%08lX kulcs: \"%s\" visszavonó igazolást importáltam.\n"
  
- #: g10/import.c:2469
++#: g10/import.c:2470
  #, fuzzy, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "%08lX kulcs: Nincs felhasználói azonosító ehhez az aláíráshoz!\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2487
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr ""
  "%08lX kulcs: Nem támogatott nyilvános kulcsú alg. a \"%s\" felh. "
  "azonosítón!\n"
  
- #: g10/import.c:2488
++#: g10/import.c:2489
  #, fuzzy, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "%08lX kulcs: Érvénytelen önaláírás a \"%s\" felh. azonosítón!\n"
  
- #: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
++#: g10/import.c:2506 g10/import.c:2532 g10/import.c:2583
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "%08lX kulcs: Nem támogatott nyilvános kulcsú algoritmus!\n"
  
- #: g10/import.c:2506
++#: g10/import.c:2507
  #, fuzzy, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "%08lX kulcs: Kulcsaláírást hozzáadtam.\n"
  
- #: g10/import.c:2520
++#: g10/import.c:2521
  #, fuzzy, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "%08lX kulcs: Nincs alkulcs a kulcskötéshez!\n"
  
- #: g10/import.c:2533
++#: g10/import.c:2534
  #, fuzzy, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "%08lX kulcs: Érvénytelen alkulcskötés!\n"
  
- #: g10/import.c:2549
++#: g10/import.c:2550
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "%08lX kulcs: Eltávolítottam a többszörös alkulcskötést.\n"
  
- #: g10/import.c:2571
++#: g10/import.c:2572
  #, fuzzy, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "%08lX kulcs: Nincs alkulcs a kulcsvisszavonáshoz.\n"
  
- #: g10/import.c:2584
++#: g10/import.c:2585
  #, fuzzy, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "%08lX kulcs: Érvénytelen alkulcsvisszavonás.\n"
  
- #: g10/import.c:2599
++#: g10/import.c:2600
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "%08lX kulcs: Eltávolítottam a többszörös alkulcsvisszavonást.\n"
  
- #: g10/import.c:2641
++#: g10/import.c:2642
  #, fuzzy, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "%08lX kulcs: Kihagytam a felh. azonosítót: '"
  
- #: g10/import.c:2665
++#: g10/import.c:2666
  #, fuzzy, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "%08lX kulcs: Alkulcsot kihagytam.\n"
  
- #: g10/import.c:2694
++#: g10/import.c:2695
  #, fuzzy, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "%08lX kulcs: Nem exportálható aláírás (%02x. osztály) - kihagytam.\n"
  
- #: g10/import.c:2705
++#: g10/import.c:2706
  #, fuzzy, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "%08lX kulcs: Visszavonó igazolás rossz helyen - kihagytam.\n"
  
- #: g10/import.c:2723
++#: g10/import.c:2724
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "%08lX kulcs: Érvénytelen visszavonó igazolás: %s - kihagytam.\n"
  
- #: g10/import.c:2737
++#: g10/import.c:2738
  #, fuzzy, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "%08lX kulcs: Alkulcsaláírás rossz helyen - kihagytam.\n"
  
- #: g10/import.c:2745
++#: g10/import.c:2746
  #, fuzzy, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "%08lX kulcs: Váratlan aláírásosztály (0x%02X) - kihagytam.\n"
  
- #: g10/import.c:2887
++#: g10/import.c:2888
  #, fuzzy, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "%08lX kulcs: Duplázott felh. azonosítót találtam - összefűztem.\n"
  
- #: g10/import.c:2951
++#: g10/import.c:2952
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr ""
  "FIGYELEM: %08lX kulcsot visszavonhatták:\n"
  "lehívom a %08lX visszavonó kulcsot.\n"
  
- #: g10/import.c:2967
++#: g10/import.c:2968
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr ""
  "FIGYELEM: %08lX kulcsot visszavonhatták:\n"
  "visszavonó kulcs (%08lX) nincs jelen.\n"
  
- #: g10/import.c:3031
++#: g10/import.c:3032
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "%08lX kulcs: \"%s\" visszavonó igazolást hozzáadtam.\n"
  
- #: g10/import.c:3069
++#: g10/import.c:3070
  #, fuzzy, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "%08lX kulcs: Kulcsaláírást hozzáadtam.\n"
@@@ -3802,54 -2957,43 +3755,54 @@@ msgstr "Hiba \"%s\" létrehozásakor: %
  msgid "error opening key DB: %s\n"
  msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
- #: g10/keydb.c:1782
++#: g10/keydb.c:1786
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "Nem tudtam újraépíteni a kulcskarika cache-ét: %s\n"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[revocation]"
  msgstr "[visszavonás]"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[self-signature]"
  msgstr "[önaláírás]"
  
- #: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
++#: g10/keyedit.c:433 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: dirmngr/ldap-wrapper.c:694
  #, fuzzy, c-format
  msgid "error allocating memory: %s\n"
  msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
  
- #: g10/keyedit.c:629
++#: g10/keyedit.c:630
  #, fuzzy, c-format
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr "%08lX kulcs: Nem támogatott nyilvános kulcsú algoritmus!\n"
  
- #: g10/keyedit.c:638
++#: g10/keyedit.c:639
  #, fuzzy, c-format
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "%s aláírás, %s kivonatoló algoritmus.\n"
  
- #: g10/keyedit.c:800
++#: g10/keyedit.c:801
  #, fuzzy
  msgid " (reordered signatures follow)"
  msgstr "Jó aláírás a következőtől: \""
  
- #: g10/keyedit.c:913
++#: g10/keyedit.c:914
  #, fuzzy, c-format
  msgid "key %s:\n"
  msgstr "Kihagytam \"%s\"-t: %s.\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:917
  #, fuzzy, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
  msgstr[0] "\"%s\" felhasználói azonosítót visszavonták."
  msgstr[1] "\"%s\" felhasználói azonosítót visszavonták."
  
- #: g10/keyedit.c:919 g10/keylist.c:480
++#: g10/keyedit.c:920 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
@@@ -3857,7 -3001,6 +3810,7 @@@ msgid_plural "%d signatures not checke
  msgstr[0] "1 aláírást nem ellenőriztem hiányzó kulcs miatt.\n"
  msgstr[1] "1 aláírást nem ellenőriztem hiányzó kulcs miatt.\n"
  
- #: g10/keyedit.c:923 g10/keylist.c:476
++#: g10/keyedit.c:924 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
@@@ -3865,21 -3008,18 +3818,21 @@@ msgid_plural "%d bad signatures\n
  msgstr[0] "%d rossz aláírás.\n"
  msgstr[1] "%d rossz aláírás.\n"
  
- #: g10/keyedit.c:927
++#: g10/keyedit.c:928
  #, fuzzy, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
  msgstr[0] "Jó aláírás a következőtől: \""
  msgstr[1] "Jó aláírás a következőtől: \""
  
- #: g10/keyedit.c:932
++#: g10/keyedit.c:933
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:992 g10/pkclist.c:274
++#: g10/keyedit.c:993 g10/pkclist.c:274
  #, fuzzy
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
@@@ -3892,68 -3032,53 +3845,68 @@@ msgstr "
  "különböző forrásból származó digitális ujjlenyomatokkal...)!\n"
  "\n"
  
- #: g10/keyedit.c:996 g10/pkclist.c:286
++#: g10/keyedit.c:997 g10/pkclist.c:286
  #, fuzzy, c-format
  msgid "  %d = I trust marginally\n"
  msgstr " %d = részlegesen megbízom benne\n"
  
- #: g10/keyedit.c:997 g10/pkclist.c:288
++#: g10/keyedit.c:998 g10/pkclist.c:288
  #, fuzzy, c-format
  msgid "  %d = I trust fully\n"
  msgstr " %d = teljesen megbízom benne\n"
  
- #: g10/keyedit.c:1015
++#: g10/keyedit.c:1016
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
  "trust signatures on your behalf.\n"
  msgstr ""
  
- #: g10/keyedit.c:1032
++#: g10/keyedit.c:1033
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  
- #: g10/keyedit.c:1160
++#: g10/keyedit.c:1161
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1168
++#: g10/keyedit.c:1169
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "\"%s\" felhasználói azonosítót visszavonták."
  
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
- #: g10/keyedit.c:2246
++#: g10/keyedit.c:1178 g10/keyedit.c:1206 g10/keyedit.c:1233 g10/keyedit.c:1417
++#: g10/keyedit.c:2247
  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:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
- #: g10/keyedit.c:2251 g10/keyedit.c:3177
++#: g10/keyedit.c:1192 g10/keyedit.c:1220 g10/keyedit.c:1247 g10/keyedit.c:1423
++#: g10/keyedit.c:2252 g10/keyedit.c:3178
  msgid "  Unable to sign.\n"
  msgstr "  Nem tudom aláírni.\n"
  
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1197
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "\"%s\" felhasználói azonosító lejárt."
  
- #: g10/keyedit.c:1224
++#: g10/keyedit.c:1225
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "\"%s\" felhasználóazonosítón nincs önaláírás."
  
- #: g10/keyedit.c:1253
++#: g10/keyedit.c:1254
  #, fuzzy, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "\"%s\" felhasználóazonosítón nincs önaláírás."
  
- #: g10/keyedit.c:1255
++#: g10/keyedit.c:1256
  #, fuzzy
  msgid "Sign it? (y/N) "
  msgstr "Valóban aláírja? "
  
- #: g10/keyedit.c:1282
++#: g10/keyedit.c:1283
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -3962,11 -3087,9 +3915,11 @@@ msgstr "
  "\"%s\" önaláírása\n"
  "PGP 2.x stílusú.\n"
  
- #: g10/keyedit.c:1291
++#: g10/keyedit.c:1292
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr "Szeretné átalakítani OpenPGP önaláírássá? (i/N) "
  
- #: g10/keyedit.c:1304
++#: g10/keyedit.c:1305
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3975,11 -3098,9 +3928,11 @@@ msgstr "
  "Az Ön jelenlegi aláírása a(z) \"%s\"\n"
  "kulcson lejárt.\n"
  
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:1310
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr "Szeretne kiadni egy új aláírást, amellyel lecseréli a lejártat? (i/N) "
  
- #: g10/keyedit.c:1330
++#: g10/keyedit.c:1331
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3988,43 -3109,34 +3941,43 @@@ msgstr "
  "Az Ön jelenlegi aláírása a(z) \"%s\"\n"
  "kulcson helyi aláírás.\n"
  
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:1336
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr "Szeretné átalakítani teljes, exportálható aláírássá? (i/N) "
  
- #: g10/keyedit.c:1355
++#: g10/keyedit.c:1356
  #, fuzzy, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "\"%s\" már alá lett írva helyileg a %08lX kulccsal!\n"
  
- #: g10/keyedit.c:1359
++#: g10/keyedit.c:1360
  #, fuzzy, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "\"%s\" már alá lett írva a %08lX kulccsal!\n"
  
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:1365
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "Még egyszer alá akarja írni? (i/N) "
  
- #: g10/keyedit.c:1386
++#: g10/keyedit.c:1387
  #, fuzzy, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "Nincs mit aláírni a %08lX kulccsal!\n"
  
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1411
  msgid "This key has expired!"
  msgstr "Ez a kulcs lejárt!"
  
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1429
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "Ez a kulcs lejár: %s.\n"
  
- #: g10/keyedit.c:1434
++#: g10/keyedit.c:1435
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr "Szeretné, ha az aláírása ugyanekkor járna le? (I/n) "
  
- #: g10/keyedit.c:1475
++#: g10/keyedit.c:1476
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -4033,32 -3145,26 +3986,32 @@@ msgstr "
  "Mennyire gondosan ellenőrizte, hogy a kulcs, melyet aláírni készül, valóban\n"
  "a fent nevezett személyhez tartozik? Ha nem tudja a választ, írjon \"0\"-t!\n"
  
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1481
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) Nem válaszolok.%s\n"
  
- #: g10/keyedit.c:1482
++#: g10/keyedit.c:1483
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) Egyáltalán nem ellenőriztem.%s\n"
  
- #: g10/keyedit.c:1484
++#: g10/keyedit.c:1485
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) A szokásos ellenőrzéseket végeztem.%s\n"
  
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:1488
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) Nagyon alaposan ellenőriztem.%s\n"
  
- #: g10/keyedit.c:1494
++#: g10/keyedit.c:1495
  #, fuzzy
  msgid "Your selection? (enter '?' for more information): "
  msgstr "Mi a válasza? (Adjon meg \"?\"-et magyarázathoz!): "
  
- #: g10/keyedit.c:1521
++#: g10/keyedit.c:1522
  #, fuzzy, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -4067,265 -3173,211 +4020,265 @@@ msgstr "
  "Teljesen biztos abban, hogy alá akarja írni ezt a kulcsot\n"
  "az Ön kulcsával: \""
  
- #: g10/keyedit.c:1529
++#: g10/keyedit.c:1530
  #, fuzzy
  msgid "This will be a self-signature.\n"
  msgstr ""
  "\n"
  "Ez egy önaláírás lesz.\n"
  
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:1535
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr ""
  "\n"
  "FIGYELEM: Az aláírás nem lesz \"nem exportálhatóként\" megjelölve.\n"
  
- #: g10/keyedit.c:1541
++#: g10/keyedit.c:1542
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr ""
  "\n"
  "FIGYELEM: Az aláírás nem lesz \"nem visszavonhatóként\" megjelölve.\n"
  
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1552
  #, fuzzy
  msgid "The signature will be marked as non-exportable.\n"
  msgstr ""
  "\n"
  "Az aláírást \"nem exportálhatónak\" jelöljük.\n"
  
- #: g10/keyedit.c:1558
++#: g10/keyedit.c:1559
  #, fuzzy
  msgid "The signature will be marked as non-revocable.\n"
  msgstr ""
  "\n"
  "Az aláírást \"nem visszavonhatónak\" jelöljük.\n"
  
- #: g10/keyedit.c:1565
++#: g10/keyedit.c:1566
  #, fuzzy
  msgid "I have not checked this key at all.\n"
  msgstr ""
  "\n"
  "Egyáltalán nem ellenőriztem ezt a kulcsot.\n"
  
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:1571
  #, fuzzy
  msgid "I have checked this key casually.\n"
  msgstr ""
  "\n"
  "A szokásos módon ellenőriztem ezt a kulcsot.\n"
  
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:1576
  #, fuzzy
  msgid "I have checked this key very carefully.\n"
  msgstr ""
  "\n"
  "Nagyon gondosan ellenőriztem ezt a kulcsot.\n"
  
- #: g10/keyedit.c:1587
++#: g10/keyedit.c:1588
  #, fuzzy
  msgid "Really sign? (y/N) "
  msgstr "Valóban aláírja? "
  
- #: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
- #: g10/keyedit.c:6463 g10/sign.c:323
++#: g10/keyedit.c:1639 g10/keyedit.c:6308 g10/keyedit.c:6391 g10/keyedit.c:6500
++#: g10/keyedit.c:6562 g10/sign.c:325
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "Aláírás sikertelen: %s\n"
  
- #: g10/keyedit.c:1725
++#: g10/keyedit.c:1726
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  
- #: g10/keyedit.c:1755
++#: g10/keyedit.c:1756
  #, fuzzy, c-format
  #| msgid "error creating passphrase: %s\n"
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: g10/keyedit.c:1869
++#: g10/keyedit.c:1870
  msgid "save and quit"
  msgstr "mentés és kilépés"
  
- #: g10/keyedit.c:1872
++#: g10/keyedit.c:1873
  #, fuzzy
  msgid "show key fingerprint"
  msgstr "megmutatja az ujjlenyomatot"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1874
  #, fuzzy
  msgid "show the keygrip"
  msgstr "Aláírás-jelölés: "
  
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1875
  msgid "list key and user IDs"
  msgstr "kilistázza a kulcs- és felhasználóazonosítókat"
  
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1877
  msgid "select user ID N"
  msgstr "N. felhasználói azonosító kiválasztása"
  
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1878
  #, fuzzy
  msgid "select subkey N"
  msgstr "N. felhasználói azonosító kiválasztása"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1879
  #, fuzzy
  msgid "check signatures"
  msgstr "aláírások visszavonása"
  
- #: g10/keyedit.c:1884
++#: g10/keyedit.c:1885
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr ""
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1890
  #, fuzzy
  msgid "sign selected user IDs locally"
  msgstr "kulcs helyi aláírása"
  
- #: g10/keyedit.c:1890
++#: g10/keyedit.c:1891
  #, fuzzy
  msgid "sign selected user IDs with a trust signature"
  msgstr "Javaslat: Válassza ki az aláírni kívánt felhasználóazonosítókat!\n"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1893
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr ""
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1895
  msgid "add a user ID"
  msgstr "felhasználói azonosító hozzáadása"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1897
  msgid "add a photo ID"
  msgstr "fotóazonosító hozzáadása"
  
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1898
  #, fuzzy
  msgid "delete selected user IDs"
  msgstr "felhasználói azonosító törlése"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1901
  #, fuzzy
  msgid "add a subkey"
  msgstr "addkey"
  
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1904
  msgid "add a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1906
  msgid "move a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1908
  msgid "move a backup key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1910
  #, fuzzy
  msgid "delete selected subkeys"
  msgstr "másodlagos kulcs törlése"
  
- #: g10/keyedit.c:1911
++#: g10/keyedit.c:1912
  msgid "add a revocation key"
  msgstr "visszavonó kulcs hozzáadása"
  
- #: g10/keyedit.c:1913
++#: g10/keyedit.c:1914
  #, fuzzy
  msgid "delete signatures from the selected user IDs"
  msgstr "Valóban frissíti a kijelölt felhasználóazonosítók preferenciáit? "
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1916
  #, fuzzy
  msgid "change the expiration date for the key or selected subkeys"
  msgstr "Nem változtathatja meg egy v3 kulcs lejárati dátumát!\n"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1918
  #, fuzzy
  msgid "flag the selected user ID as primary"
  msgstr "felhasználóazonosító megjelölése elsődlegesként"
  
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1921
  msgid "list preferences (expert)"
  msgstr "preferenciák listázása (szakértő)"
  
- #: g10/keyedit.c:1921
++#: g10/keyedit.c:1922
  msgid "list preferences (verbose)"
  msgstr "preferenciák listázása (részletes)"
  
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:1924
  #, fuzzy
  msgid "set preference list for the selected user IDs"
  msgstr "Valóban frissíti a kijelölt felhasználóazonosítók preferenciáit? "
  
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1927
  #, fuzzy
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
  
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1929
  #, fuzzy
  msgid "set a notation for the selected user IDs"
  msgstr "Valóban frissíti a kijelölt felhasználóazonosítók preferenciáit? "
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1931
  msgid "change the passphrase"
  msgstr "jelszóváltoztatás"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1934
  msgid "change the ownertrust"
  msgstr "kulcstulajdonos megbízhatóságának beállítása"
  
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1937
  #, fuzzy
  msgid "revoke signatures on the selected user IDs"
  msgstr "Valóban visszavonja az összes kijelölt felhasználóazonosítót? "
  
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1939
  #, fuzzy
  msgid "revoke selected user IDs"
  msgstr "felhasználói azonosító visszavonása"
  
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1942
  #, fuzzy
  msgid "revoke key or selected subkeys"
  msgstr "másodlagos kulcs visszavonása"
  
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1944
  #, fuzzy
  msgid "enable key"
  msgstr "kulcs engedélyezése"
  
- #: g10/keyedit.c:1944
++#: g10/keyedit.c:1945
  #, fuzzy
  msgid "disable key"
  msgstr "kulcs tiltása"
  
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1947
  #, fuzzy
  msgid "show selected photo IDs"
  msgstr "fotóazonosító megmutatása"
  
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1949
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:1951
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2063
  msgid "Secret key is available.\n"
  msgstr "Titkos kulcs rendelkezésre áll.\n"
  
- #: g10/keyedit.c:2162
++#: g10/keyedit.c:2163
  msgid "Need the secret key to do this.\n"
  msgstr "Ehhez szükség van a titkos kulcsra.\n"
  
- #: g10/keyedit.c:2183
++#: g10/keyedit.c:2184
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4333,279 -3385,224 +4286,284 @@@
  "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
  msgstr ""
  
- #: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
++#: g10/keyedit.c:2240 g10/keyedit.c:3178 g10/keyedit.c:3317 g10/keyedit.c:3379
  msgid "Key is revoked."
  msgstr "A kulcsot visszavonták."
  
- #: g10/keyedit.c:2262
++#: g10/keyedit.c:2263
  #, fuzzy
  msgid "Really sign all user IDs? (y/N) "
  msgstr "Valóban aláírja az összes felhasználóazonosítót? "
  
- #: g10/keyedit.c:2266
++#: g10/keyedit.c:2267
  #, fuzzy
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "Valóban aláírja az összes felhasználóazonosítót? "
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2275
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Javaslat: Válassza ki az aláírni kívánt felhasználóazonosítókat!\n"
  
- #: g10/keyedit.c:2285
++#: g10/keyedit.c:2286
  #, fuzzy, c-format
  msgid "Unknown signature type '%s'\n"
  msgstr "ismeretlen aláírásosztály"
  
- #: g10/keyedit.c:2309
++#: g10/keyedit.c:2310
  #, 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/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
++#: g10/keyedit.c:2332 g10/keyedit.c:2356 g10/keyedit.c:2550
  msgid "You must select at least one user ID.\n"
  msgstr "Legalább egy felhasználóazonosítót ki kell választania!\n"
  
- #: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
++#: g10/keyedit.c:2334 g10/keyedit.c:2358 g10/keyedit.c:2512 g10/keyedit.c:2552
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2336
++#: g10/keyedit.c:2337
  msgid "You can't delete the last user ID!\n"
  msgstr "Nem törölheti az utolsó felhasználóazonosítót!\n"
  
- #: g10/keyedit.c:2339
++#: g10/keyedit.c:2340
  #, fuzzy
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "Valóban eltávolítja az összes kijelölt felhasználóazonosítót? "
  
- #: g10/keyedit.c:2340
++#: g10/keyedit.c:2341
  #, fuzzy
  msgid "Really remove this user ID? (y/N) "
  msgstr "Valóban eltávolítja ezt a felhasználóazonosítót? "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2397
++#: g10/keyedit.c:2398
  #, fuzzy
  msgid "Really move the primary key? (y/N) "
  msgstr "Valóban eltávolítja ezt a felhasználóazonosítót? "
  
- #: g10/keyedit.c:2409 g10/keyedit.c:4866
++#: g10/keyedit.c:2410 g10/keyedit.c:4964
  #, fuzzy
  msgid "You must select exactly one key.\n"
  msgstr "Legalább egy kulcsot ki kell választania!\n"
  
- #: g10/keyedit.c:2436
++#: g10/keyedit.c:2437
  msgid "Command expects a filename argument\n"
  msgstr ""
  
- #: g10/keyedit.c:2457
++#: g10/keyedit.c:2458
  #, fuzzy, c-format
  msgid "Can't open '%s': %s\n"
  msgstr "Nem tudom megnyitni a(z) \"%s\" állományt: %s.\n"
  
- #: g10/keyedit.c:2474
++#: g10/keyedit.c:2475
  #, fuzzy, c-format
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
  
- #: g10/keyedit.c:2509
++#: g10/keyedit.c:2510
  msgid "You must select at least one key.\n"
  msgstr "Legalább egy kulcsot ki kell választania!\n"
  
- #: g10/keyedit.c:2515
++#: g10/keyedit.c:2516
  #, fuzzy
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "Valóban törli a kiválasztott kulcsokat? "
  
- #: g10/keyedit.c:2517
++#: g10/keyedit.c:2518
  #, fuzzy
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "Valóban törli ezt a kulcsot? "
  
- #: g10/keyedit.c:2555
++#: g10/keyedit.c:2556
  #, fuzzy
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr "Valóban visszavonja az összes kijelölt felhasználóazonosítót? "
  
- #: g10/keyedit.c:2556
++#: g10/keyedit.c:2557
  #, fuzzy
  msgid "Really revoke this user ID? (y/N) "
  msgstr "Valóban visszavonja ezt a felhasználóazonosítót? "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2575
  #, fuzzy
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "Valóban visszavonja ezt a kulcsot? "
  
- #: g10/keyedit.c:2585
++#: g10/keyedit.c:2586
  #, fuzzy
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "Valóban visszavonja a kijelölt kulcsokat? "
  
- #: g10/keyedit.c:2587
++#: g10/keyedit.c:2588
  #, fuzzy
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "Valóban visszavonja ezt a kulcsot? "
  
- #: g10/keyedit.c:2645
++#: g10/keyedit.c:2646
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  
- #: g10/keyedit.c:2690
++#: g10/keyedit.c:2691
  #, fuzzy
  msgid "Set preference list to:\n"
  msgstr "preferencialista beállítása"
  
- #: g10/keyedit.c:2697
++#: g10/keyedit.c:2698
  #, fuzzy
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr "Valóban frissíti a kijelölt felhasználóazonosítók preferenciáit? "
  
- #: g10/keyedit.c:2699
++#: g10/keyedit.c:2700
  #, fuzzy
  msgid "Really update the preferences? (y/N) "
  msgstr "Valóban frissítsem a preferenciákat? "
  
- #: g10/keyedit.c:2773
++#: g10/keyedit.c:2774
  #, fuzzy
  msgid "Save changes? (y/N) "
  msgstr "Mentsem a változtatásokat? "
  
- #: g10/keyedit.c:2777
++#: g10/keyedit.c:2778
  #, fuzzy
  msgid "Quit without saving? (y/N) "
  msgstr "Kilépjek mentés nélkül? "
  
- #: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
- #: g10/keyedit.c:3267 g10/keyedit.c:3332
++#: g10/keyedit.c:2789 g10/keyedit.c:2799 g10/keyedit.c:2943 g10/keyedit.c:3046
++#: g10/keyedit.c:3268 g10/keyedit.c:3333 g10/keyedit.c:3409
  #, c-format
  msgid "update failed: %s\n"
  msgstr "Frissítés sikertelen: %s.\n"
  
- #: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
++#: g10/keyedit.c:2805 g10/keyedit.c:3273 g10/keyedit.c:3338 g10/keyedit.c:3416
  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:3038
++#: g10/keyedit.c:3039
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
  msgstr "Kulcsgenerálás sikertelen: %s\n"
  
- #: g10/keyedit.c:3083
++#: g10/keyedit.c:3084
  #, fuzzy, c-format
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
  
- #: g10/keyedit.c:3112
++#: g10/keyedit.c:3113
  #, fuzzy, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
  
- #: g10/keyedit.c:3248 g10/keyedit.c:3251
++#: g10/keyedit.c:3249 g10/keyedit.c:3252
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
  msgstr "Érvénytelen érték!\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  #, fuzzy
  #| msgid "No such user ID.\n"
  msgid "No matching user IDs."
  msgstr "Nincs ilyen felhasználói azonosító.\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  #, fuzzy
  msgid "Nothing to sign.\n"
  msgstr "Nincs mit aláírni a %08lX kulccsal!\n"
  
- #: g10/keyedit.c:3427
++#: g10/keyedit.c:3388
+ #, fuzzy, c-format
+ msgid "'%s' is not a valid expiration time\n"
+ msgstr "%s nem érvényes karakterkiosztás!\n"
+ 
++#: g10/keyedit.c:3508
  msgid "Digest: "
  msgstr "Kivonat: "
  
- #: g10/keyedit.c:3484
++#: g10/keyedit.c:3565
  msgid "Features: "
  msgstr "Jellemzők: "
  
- #: g10/keyedit.c:3495
++#: g10/keyedit.c:3576
  msgid "Keyserver no-modify"
  msgstr ""
  
- #: g10/keyedit.c:3510 g10/keylist.c:377
++#: g10/keyedit.c:3591 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr ""
  
- #: g10/keyedit.c:3518 g10/keyedit.c:3519
++#: g10/keyedit.c:3599 g10/keyedit.c:3600
  #, fuzzy
  msgid "Notations: "
  msgstr "Jelölés: "
  
- #: g10/keyedit.c:3764
++#: g10/keyedit.c:3845
  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:3836
++#: g10/keyedit.c:3917
  #, 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:3860
++#: g10/keyedit.c:3941
  #, 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:3866
++#: g10/keyedit.c:3947
  #, fuzzy
  msgid "(sensitive)"
  msgstr " (érzékeny)"
  
- #: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3989 g10/keyedit.c:4131 g10/keylist.c:262 g10/keyserver.c:538
  #, fuzzy, c-format
  msgid "created: %s"
  msgstr "%s nem hozható létre: %s\n"
  
- #: g10/keyedit.c:3911 g10/keylist.c:1852
++#: g10/keyedit.c:3992 g10/keylist.c:1852
  #, fuzzy, c-format
  msgid "revoked: %s"
  msgstr "[visszavont] "
  
- #: g10/keyedit.c:3913 g10/keylist.c:1858
++#: g10/keyedit.c:3994 g10/keylist.c:1858
  #, fuzzy, c-format
  msgid "expired: %s"
  msgstr " [lejár: %s]"
  
- #: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyedit.c:3996 g10/keyedit.c:4133 g10/keylist.c:264 g10/keylist.c:1864
 +#: g10/keyserver.c:544
  #, fuzzy, c-format
  msgid "expires: %s"
  msgstr " [lejár: %s]"
  
- #: g10/keyedit.c:3917
++#: g10/keyedit.c:3998
  #, fuzzy, c-format
  msgid "usage: %s"
  msgstr " bizalom: %c/%c"
  
- #: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
++#: g10/keyedit.c:4006 g10/keyedit.c:4026 g10/keylist.c:267
  msgid "card-no: "
  msgstr ""
  
- #: g10/keyedit.c:3984
++#: g10/keyedit.c:4065
  #, fuzzy, c-format
  msgid "trust: %s"
  msgstr " bizalom: %c/%c"
  
- #: g10/keyedit.c:3988
++#: g10/keyedit.c:4069
  #, c-format
  msgid "validity: %s"
  msgstr ""
  
- #: g10/keyedit.c:3995
++#: g10/keyedit.c:4076
  msgid "This key has been disabled"
  msgstr "Ez a kulcs tiltott."
  
- #: g10/keyedit.c:4013
++#: g10/keyedit.c:4094
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4613,20 -3610,14 +4571,20 @@@ 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:4069 g10/keyedit.c:4500 g10/keyserver.c:548
- #: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: g10/keyedit.c:4150 g10/keyedit.c:4581 g10/keyserver.c:548
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:712
 +#: dirmngr/ocsp.c:703
  #, fuzzy
  msgid "revoked"
  msgstr "[visszavont] "
  
- #: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
- #: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4152 g10/keyedit.c:4583 g10/keyserver.c:552
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:714
  #, fuzzy
  msgid "expired"
  msgstr "expire"
  
- #: g10/keyedit.c:4188
++#: g10/keyedit.c:4269
  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"
@@@ -4634,17 -3625,14 +4592,17 @@@ 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:4240
++#: g10/keyedit.c:4321
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr ""
  
- #: g10/keyedit.c:4241
++#: g10/keyedit.c:4322
  #, fuzzy
  #| 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:4300
++#: g10/keyedit.c:4381
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4654,35 -3642,27 +4612,35 @@@ msgstr "
  "okozhatja,\n"
  "          hogy a PGP egyes verziói visszautasítják ezt a kulcsot.\n"
  
- #: g10/keyedit.c:4305 g10/keyedit.c:4595
++#: g10/keyedit.c:4386 g10/keyedit.c:4676
  msgid "Are you sure you still want to add it? (y/N) "
  msgstr "Továbbra is hozzá akarja adni? (i/N) "
  
- #: g10/keyedit.c:4311
++#: g10/keyedit.c:4392
  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:4326 g10/keygen.c:2697
++#: g10/keyedit.c:4407 g10/keygen.c:2719
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4509
  msgid "Delete this good signature? (y/N/q)"
  msgstr "Törli ezt a jó aláírást? (i/N/k)"
  
- #: g10/keyedit.c:4438
++#: g10/keyedit.c:4519
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "Törli ezt az érvénytelen aláírást? (i/N/k)"
  
- #: g10/keyedit.c:4442
++#: g10/keyedit.c:4523
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "Törli ezt az ismeretlen aláírást? (i/N/k)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4530
  msgid "Really delete this self-signature? (y/N)"
  msgstr "Valóban törli ezt az önaláírást? (i/N)"
  
- #: g10/keyedit.c:4465
++#: g10/keyedit.c:4546
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
@@@ -4690,38 -3670,31 +4648,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:4469
++#: g10/keyedit.c:4550
  msgid "Nothing deleted.\n"
  msgstr "Nem töröltem semmit.\n"
  
- #: g10/keyedit.c:4504 g10/trust.c:693
++#: g10/keyedit.c:4585 g10/trust.c:716
  #, fuzzy
  msgid "invalid"
  msgstr "érvénytelen páncél"
  
- #: g10/keyedit.c:4506
++#: g10/keyedit.c:4587
  #, fuzzy, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "\"%s\" felhasználói azonosítót visszavonták."
  
- #: g10/keyedit.c:4512
++#: g10/keyedit.c:4593
  #, 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:4520
++#: g10/keyedit.c:4601
  #, 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:4521
++#: g10/keyedit.c:4602
  #, 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:4590
++#: g10/keyedit.c:4671
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4731,280 -3704,221 +4689,280 @@@ msgstr "
  "          azt okozhatja, hogy egyes PGP verziók visszautasítják ezt a "
  "kulcsot!\n"
  
- #: g10/keyedit.c:4601
++#: g10/keyedit.c:4682
  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:4618
++#: g10/keyedit.c:4699
  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:4643
++#: g10/keyedit.c:4724
  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:4658
++#: g10/keyedit.c:4739
  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:4680
++#: g10/keyedit.c:4761
  #, fuzzy
  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:4698
++#: g10/keyedit.c:4779
  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:4704
++#: g10/keyedit.c:4785
  #, 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:4755
++#: g10/keyedit.c:4848
  #, 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:4760
++#: g10/keyedit.c:4853
  #, fuzzy
  msgid "Changing expiration time for a subkey.\n"
  msgstr "Másodlagos kulcs lejárati idejének változtatása.\n"
  
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:4856
  msgid "Changing expiration time for the primary key.\n"
  msgstr "Elsődleges kulcs lejárati idejének változtatása.\n"
  
- #: g10/keyedit.c:4814
++#: g10/keyedit.c:4910
  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:4987
++#: g10/keyedit.c:5085
  #, 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:4993
++#: g10/keyedit.c:5091
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr ""
  
- #: g10/keyedit.c:5108
++#: g10/keyedit.c:5206
  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:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
++#: g10/keyedit.c:5247 g10/keyedit.c:5361 g10/keyedit.c:5474 g10/keyedit.c:5611
  #, 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:5320
++#: g10/keyedit.c:5418
  msgid "Enter your preferred keyserver URL: "
  msgstr ""
  
- #: g10/keyedit.c:5399
++#: g10/keyedit.c:5497
  #, fuzzy
  msgid "Are you sure you want to replace it? (y/N) "
  msgstr "Biztos abban, hogy használni akarja (i/N)? "
  
- #: g10/keyedit.c:5400
++#: g10/keyedit.c:5498
  #, fuzzy
  msgid "Are you sure you want to delete it? (y/N) "
  msgstr "Biztos abban, hogy használni akarja (i/N)? "
  
- #: g10/keyedit.c:5459
++#: g10/keyedit.c:5557
  #, fuzzy
  msgid "Enter the notation: "
  msgstr "Aláírás-jelölés: "
  
- #: g10/keyedit.c:5606
++#: g10/keyedit.c:5704
  #, fuzzy
  msgid "Proceed? (y/N) "
  msgstr "Felülírjam (i/N)? "
  
- #: g10/keyedit.c:5676
++#: g10/keyedit.c:5774
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "Nincs %d indexű felhasználóazonosító!\n"
  
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5836
  #, fuzzy, c-format
  msgid "No user ID with hash %s\n"
  msgstr "Nincs %d indexű felhasználóazonosító!\n"
  
- #: g10/keyedit.c:5839
++#: g10/keyedit.c:5937
  #, fuzzy, c-format
  msgid "No subkey with key ID '%s'.\n"
  msgstr "Nincs %d indexű felhasználóazonosító!\n"
  
- #: g10/keyedit.c:5861
++#: g10/keyedit.c:5959
  #, fuzzy, c-format
  msgid "No subkey with index %d\n"
  msgstr "Nincs %d indexű felhasználóazonosító!\n"
  
- #: g10/keyedit.c:6002
++#: g10/keyedit.c:6100
  #, fuzzy, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "Felhasználóazonosító: \""
  
- #: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
++#: g10/keyedit.c:6103 g10/keyedit.c:6205 g10/keyedit.c:6253
  #, 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:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
++#: g10/keyedit.c:6105 g10/keyedit.c:6207 g10/keyedit.c:6255
  msgid " (non-exportable)"
  msgstr " (nem exportálható)"
  
- #: g10/keyedit.c:6011
++#: g10/keyedit.c:6109
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "Ez az aláírás lejárt %s időpontban.\n"
  
- #: g10/keyedit.c:6016
++#: g10/keyedit.c:6114
  msgid "Are you sure you still want to revoke it? (y/N) "
  msgstr "Biztos benne, hogy mégis visszavonja? (i/N) "
  
- #: g10/keyedit.c:6021
++#: g10/keyedit.c:6119
  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:6075
++#: g10/keyedit.c:6173
  #, fuzzy
  msgid "Not signed by you.\n"
  msgstr "   aláírva %08lX által %s%s időpontban.\n"
  
- #: g10/keyedit.c:6081
++#: g10/keyedit.c:6179
  #, 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:6110
++#: g10/keyedit.c:6208
  #, fuzzy
  msgid " (non-revocable)"
  msgstr " (nem exportálható)"
  
- #: g10/keyedit.c:6117
++#: g10/keyedit.c:6215
  #, fuzzy, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "   visszavonva %08lX által %s időpontban.\n"
  
- #: g10/keyedit.c:6142
++#: g10/keyedit.c:6240
  msgid "You are about to revoke these signatures:\n"
  msgstr "A következő aláírásokat fogja visszavonni:\n"
  
- #: g10/keyedit.c:6165
++#: g10/keyedit.c:6263
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "Valóban létrehozzam a visszavonó igazolást? (i/N) "
  
- #: g10/keyedit.c:6198
++#: g10/keyedit.c:6296
  msgid "no secret key\n"
  msgstr "Nincs titkos kulcs.\n"
  
- #: g10/keyedit.c:6246
++#: g10/keyedit.c:6344
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6256
++#: g10/keyedit.c:6354
  #, 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:6273
++#: g10/keyedit.c:6371
  #, 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:6386
++#: g10/keyedit.c:6485
  #, 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:6448
++#: g10/keyedit.c:6547
  #, 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:6545
++#: g10/keyedit.c:6644
  #, fuzzy, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr "%s fotóazonosító (méret: %ld, kulcs: 0x%08lX, felh: %d) mutatása.\n"
  
- #: g10/keygen.c:305
++#: g10/keygen.c:316
  #, fuzzy, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "%c%lu preferencia kétszer szerepel!\n"
  
- #: g10/keygen.c:312
++#: g10/keygen.c:323
  #, fuzzy
  msgid "too many cipher preferences\n"
  msgstr "Túl sok \"%c\" preferencia.\n"
  
- #: g10/keygen.c:314
++#: g10/keygen.c:325
  #, fuzzy
  msgid "too many digest preferences\n"
  msgstr "Túl sok \"%c\" preferencia.\n"
  
- #: g10/keygen.c:316
++#: g10/keygen.c:327
  #, fuzzy
  msgid "too many compression preferences\n"
  msgstr "Túl sok \"%c\" preferencia.\n"
  
- #: g10/keygen.c:457
++#: g10/keygen.c:468
  #, fuzzy, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "Érvénytelen karakter a preferenciák között!\n"
  
- #: g10/keygen.c:936
++#: g10/keygen.c:947
  msgid "writing direct signature\n"
  msgstr "Sima aláírást írok.\n"
  
- #: g10/keygen.c:982
++#: g10/keygen.c:993
  msgid "writing self signature\n"
  msgstr "Önaláírást írok.\n"
  
- #: g10/keygen.c:1038
++#: g10/keygen.c:1049
  msgid "writing key binding signature\n"
  msgstr "Összefűző aláírást írok.\n"
  
- #: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
- #: g10/keygen.c:1610 g10/keygen.c:1615
++#: g10/keygen.c:1413 g10/keygen.c:1418 g10/keygen.c:1470 g10/keygen.c:1475
++#: g10/keygen.c:1622 g10/keygen.c:1627
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "Kulcsméret érvénytelen; %u bitet használok.\n"
  
- #: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
++#: g10/keygen.c:1424 g10/keygen.c:1481 g10/keygen.c:1489 g10/keygen.c:1633
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "Kulcsméretet felkerekítettem %u bitre.\n"
  
- #: g10/keygen.c:1503
++#: g10/keygen.c:1515
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1677
++#: g10/keygen.c:1689
  #, fuzzy
  msgid "Sign"
  msgstr "sign"
  
- #: g10/keygen.c:1680
++#: g10/keygen.c:1692
  msgid "Certify"
  msgstr ""
  
- #: g10/keygen.c:1683
++#: g10/keygen.c:1695
  #, fuzzy
  msgid "Encrypt"
  msgstr "adat titkosítása"
  
- #: g10/keygen.c:1686
++#: g10/keygen.c:1698
  msgid "Authenticate"
  msgstr ""
  
@@@ -5018,157 -3932,126 +4976,157 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1705
++#: g10/keygen.c:1717
  msgid "SsEeAaQq"
  msgstr ""
  
- #: g10/keygen.c:1732
++#: g10/keygen.c:1744
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr ""
  
- #: g10/keygen.c:1738
++#: g10/keygen.c:1750
  msgid "Current allowed actions: "
  msgstr ""
  
- #: g10/keygen.c:1743
++#: g10/keygen.c:1755
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr ""
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1758
  #, fuzzy, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%d) ElGamal (csak titkosítás)\n"
  
- #: g10/keygen.c:1749
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr ""
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr ""
  
- #: g10/keygen.c:1881 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1893 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Kérem, adja meg, milyen kulcsot kíván:\n"
  
- #: g10/keygen.c:1885
++#: g10/keygen.c:1897
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) DSA és ElGamal (alapértelmezés)\n"
  
- #: g10/keygen.c:1889
++#: g10/keygen.c:1901
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA és ElGamal (alapértelmezés)\n"
  
- #: g10/keygen.c:1892
++#: g10/keygen.c:1904
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (csak aláírás)\n"
  
- #: g10/keygen.c:1894
++#: g10/keygen.c:1906
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (csak aláírás)\n"
  
- #: g10/keygen.c:1900
++#: g10/keygen.c:1912
  #, fuzzy, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) ElGamal (csak titkosítás)\n"
  
- #: g10/keygen.c:1902
++#: g10/keygen.c:1914
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (csak titkosítás)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1920
  #, fuzzy, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (csak titkosítás)\n"
  
- #: g10/keygen.c:1910
++#: g10/keygen.c:1922
  #, fuzzy, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (csak titkosítás)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1928
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA és ElGamal (alapértelmezés)\n"
  
- #: g10/keygen.c:1918
++#: g10/keygen.c:1930
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (csak aláírás)\n"
  
- #: g10/keygen.c:1920
++#: g10/keygen.c:1932
  #, fuzzy, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) RSA (csak titkosítás)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1934
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) RSA (csak titkosítás)\n"
  
- #: g10/keygen.c:1926
++#: g10/keygen.c:1938
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) RSA (csak titkosítás)\n"
  
- #: g10/keygen.c:2022 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:206
  #, fuzzy
  msgid "Enter the keygrip: "
  msgstr "Aláírás-jelölés: "
  
- #: g10/keygen.c:2035 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2047 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2049 sm/certreqgen-ui.c:216
  #, fuzzy
  msgid "No key with this keygrip\n"
  msgstr "Nincs %d indexű felhasználóazonosító!\n"
  
- #: g10/keygen.c:2111 g10/keygen.c:2125
++#: g10/keygen.c:2133 g10/keygen.c:2147
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
  msgstr "Felkerekítve %u bitre.\n"
  
- #: g10/keygen.c:2166
++#: g10/keygen.c:2188
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr ""
  
- #: g10/keygen.c:2174
++#: g10/keygen.c:2196
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Milyen kulcsméretet szeretne? (1024) "
  
- #: g10/keygen.c:2177 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2199 sm/certreqgen-ui.c:183
  #, fuzzy, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Milyen kulcsméretet szeretne? (1024) "
  
- #: g10/keygen.c:2191 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2213 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "A kívánt kulcsméret %u bit.\n"
  
- #: g10/keygen.c:2237
++#: g10/keygen.c:2259
  #, fuzzy
  #| msgid "Please select what kind of key you want:\n"
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Kérem, adja meg, milyen kulcsot kíván:\n"
  
- #: g10/keygen.c:2409
++#: g10/keygen.c:2431
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5184,7 -4067,6 +5142,7 @@@ msgstr "
  "      <n>m = a kulcs n hónapig érvényes\n"
  "      <n>y = a kulcs n évig érvényes\n"
  
- #: g10/keygen.c:2420
++#: g10/keygen.c:2442
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5200,40 -4082,32 +5158,40 @@@ msgstr "
  "      <n>m = az aláírás n hónapig érvényes\n"
  "      <n>y = az aláírás n évig érvényes\n"
  
- #: g10/keygen.c:2443
++#: g10/keygen.c:2465
  msgid "Key is valid for? (0) "
  msgstr "Meddig érvényes a kulcs? (0) "
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2470
  #, fuzzy, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Meddig érvényes az aláírás? (0) "
  
- #: g10/keygen.c:2461 g10/keygen.c:2486
++#: g10/keygen.c:2483 g10/keygen.c:2508
  msgid "invalid value\n"
  msgstr "Érvénytelen érték!\n"
  
- #: g10/keygen.c:2468
++#: g10/keygen.c:2490
  #, fuzzy
  msgid "Key does not expire at all\n"
  msgstr "%s soha nem jár le.\n"
  
- #: g10/keygen.c:2469
++#: g10/keygen.c:2491
  #, fuzzy
  msgid "Signature does not expire at all\n"
  msgstr "%s soha nem jár le.\n"
  
- #: g10/keygen.c:2474
++#: g10/keygen.c:2496
  #, fuzzy, c-format
  msgid "Key expires at %s\n"
  msgstr "%s lejár: %s\n"
  
- #: g10/keygen.c:2475
++#: g10/keygen.c:2497
  #, fuzzy, c-format
  msgid "Signature expires at %s\n"
  msgstr "Az aláírás lejár: %s.\n"
  
- #: g10/keygen.c:2479
++#: g10/keygen.c:2501
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5241,12 -4115,10 +5199,12 @@@ msgstr "
  "Az Ön rendszere nem tud megjeleníteni 2038 utáni dátumokat.\n"
  "Azonban kezelni helyesen tudja őket egészen 2106-ig.\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2514
  #, fuzzy
  msgid "Is this correct? (y/N) "
  msgstr "Ez így helyes (i/n)? "
  
- #: g10/keygen.c:2560
++#: g10/keygen.c:2582
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5257,7 -4129,6 +5215,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2575
++#: g10/keygen.c:2597
  #, fuzzy
  msgid ""
  "\n"
@@@ -5274,50 -4145,39 +5232,50 @@@ msgstr "
  "    \"Heinrich Heine (a költő) <heinrichh at duesseldorf.de>\"\n"
  "\n"
  
- #: g10/keygen.c:2594
++#: g10/keygen.c:2616
  msgid "Real name: "
  msgstr "Teljes név: "
  
- #: g10/keygen.c:2603
++#: g10/keygen.c:2625
  msgid "Invalid character in name\n"
  msgstr "Érvénytelen karakter a névben!\n"
  
- #: g10/keygen.c:2604
++#: g10/keygen.c:2626
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2608
++#: g10/keygen.c:2630
  msgid "Name may not start with a digit\n"
  msgstr "A név lehet, hogy nem kezdődhet számmal!\n"
  
- #: g10/keygen.c:2611
++#: g10/keygen.c:2633
  msgid "Name must be at least 5 characters long\n"
  msgstr "A név legalább 5 karakter kell legyen!\n"
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2643
  msgid "Email address: "
  msgstr "E-mail cím: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2649
  msgid "Not a valid email address\n"
  msgstr "Ez nem érvényes e-mail cím.\n"
  
- #: g10/keygen.c:2636
++#: g10/keygen.c:2658
  msgid "Comment: "
  msgstr "Megjegyzés: "
  
- #: g10/keygen.c:2642
++#: g10/keygen.c:2664
  msgid "Invalid character in comment\n"
  msgstr "Érvénytelen karakter a megjegyzésben!\n"
  
- #: g10/keygen.c:2678
++#: g10/keygen.c:2700
  #, fuzzy, c-format
  #| msgid "You are using the `%s' character set.\n"
  msgid "You are using the '%s' character set.\n"
  msgstr "Ön a(z) %s karakterkódolást használja.\n"
  
- #: g10/keygen.c:2684
++#: g10/keygen.c:2706
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5328,7 -4188,6 +5286,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2689
++#: g10/keygen.c:2711
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr "Kérem, ne rakja az e-mail címet a teljes névbe vagy a megjegyzésbe!\n"
  
@@@ -5343,37 -4202,30 +5301,37 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2714
++#: g10/keygen.c:2736
  msgid "NnCcEeOoQq"
  msgstr "NnMmEeRrKk"
  
- #: g10/keygen.c:2724
++#: g10/keygen.c:2746
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "(N)év, (M)egjegyzés, (E)-mail megváltoztatása vagy (K)ilépés? "
  
- #: g10/keygen.c:2725
++#: g10/keygen.c:2747
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr ""
  "(N)év, (M)egjegyzés, (E)-mail megváltoztatása vagy (R)endben/(K)ilépés? "
  
- #: g10/keygen.c:2730
++#: g10/keygen.c:2752
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "(N)év, (M)egjegyzés, (E)-mail megváltoztatása vagy (K)ilépés? "
  
- #: g10/keygen.c:2731
++#: g10/keygen.c:2753
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr ""
  "(N)év, (M)egjegyzés, (E)-mail megváltoztatása vagy (R)endben/(K)ilépés? "
  
- #: g10/keygen.c:2750
++#: g10/keygen.c:2772
  msgid "Please correct the error first\n"
  msgstr "Kérem, előbb javítsa ki a hibát!\n"
  
- #: g10/keygen.c:2796
++#: g10/keygen.c:2818
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5385,13 -4237,10 +5343,13 @@@ msgstr "
  "a lemezeket) a prímszám generálása alatt. Ez segíti a véletlenszám-\n"
  "generátort, hogy entrópiát tudjon gyűjteni.\n"
  
- #: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
- #: g10/keygen.c:4777 g10/keygen.c:4882
++#: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
++#: g10/keygen.c:4330 g10/keygen.c:4803 g10/keygen.c:5064 g10/keygen.c:5169
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Kulcsgenerálás sikertelen: %s\n"
  
- #: g10/keygen.c:3598
++#: g10/keygen.c:3922
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5399,68 -4248,55 +5357,68 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3924
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3621
++#: g10/keygen.c:3945
  #, fuzzy, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "\"%s\" már tömörített.\n"
  
- #: g10/keygen.c:3626
++#: g10/keygen.c:3950
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "Create anyway? (y/N) "
  msgstr "Mégis létrehozzam? "
  
- #: g10/keygen.c:3632
++#: g10/keygen.c:3956
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "creating anyway\n"
  msgstr "Mégis létrehozzam? "
  
- #: g10/keygen.c:3981
++#: g10/keygen.c:4315
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:4013
++#: g10/keygen.c:4358
  msgid "Key generation canceled.\n"
  msgstr "Kulcs létrehozása megszakítva.\n"
  
- #: g10/keygen.c:4073
++#: g10/keygen.c:4418
  #, fuzzy, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n"
  
- #: g10/keygen.c:4093
++#: g10/keygen.c:4438
  #, fuzzy, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "MEGJEGYZÉS: %08lX titkos kulcs %s-kor lejárt.\n"
  
- #: g10/keygen.c:4244 g10/keygen.c:4393
++#: g10/keygen.c:4589 g10/keygen.c:4738
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
  msgstr "Írom a kulcsot a %s állományba.\n"
  
- #: g10/keygen.c:4387
++#: g10/keygen.c:4732
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "Nem írható nyilvánoskulcs-karikát találtam: %s\n"
  
- #: g10/keygen.c:4401
++#: g10/keygen.c:4746
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error writing public keyring '%s': %s\n"
  msgstr "Hiba a(z) \"%s\" nyilvánoskulcs-karika írásakor: %s.\n"
  
- #: g10/keygen.c:4433
++#: g10/keygen.c:4778
  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:4445
++#: g10/keygen.c:4790
  #, fuzzy
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
@@@ -5470,37 -4306,31 +5428,37 @@@ 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:4649 g10/keygen.c:4833
++#: g10/keygen.c:4936 g10/keygen.c:5120
  #, 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:4651 g10/keygen.c:4835
++#: g10/keygen.c:4938 g10/keygen.c:5122
  #, 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:4662 g10/keygen.c:4846
++#: g10/keygen.c:4949 g10/keygen.c:5133
  #, fuzzy
  #| 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:4674 g10/keygen.c:4676
++#: g10/keygen.c:4961 g10/keygen.c:4963
  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:4683 g10/keygen.c:4685
++#: g10/keygen.c:4970 g10/keygen.c:4972
  #, fuzzy
  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:4704 g10/keygen.c:4860
++#: g10/keygen.c:4991 g10/keygen.c:5147
  #, fuzzy
  msgid "Really create? (y/N) "
  msgstr "Valóban létrehozzam? "
@@@ -5830,127 -4595,101 +5788,127 @@@ msgid "standalone revocation - use \"gp
  msgstr ""
  "Különálló visszavonás. Használja a \"gpg --import\"-ot az alkalmazásához!\n"
  
- #: g10/mainproc.c:1233 g10/mainproc.c:1276
++#: g10/mainproc.c:1238 g10/mainproc.c:1281
  #, fuzzy
  msgid "no signature found\n"
  msgstr "Jó aláírás a következőtől: \""
  
- #: g10/mainproc.c:1607
++#: g10/mainproc.c:1612
  #, fuzzy, c-format
  msgid "BAD signature from \"%s\""
  msgstr "ROSSZ aláírás a következőtől: \""
  
- #: g10/mainproc.c:1609
++#: g10/mainproc.c:1614
  #, fuzzy, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Lejárt aláírás a következőtől: \""
  
- #: g10/mainproc.c:1611
++#: g10/mainproc.c:1616
  #, fuzzy, c-format
  msgid "Good signature from \"%s\""
  msgstr "Jó aláírás a következőtől: \""
  
- #: g10/mainproc.c:1630
++#: g10/mainproc.c:1635
  msgid "signature verification suppressed\n"
  msgstr "Aláírás-ellenőrzés elnyomva.\n"
  
- #: g10/mainproc.c:1739
++#: g10/mainproc.c:1744
  #, fuzzy
  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:1753 g10/mainproc.c:1761
++#: g10/mainproc.c:1758 g10/mainproc.c:1766
  #, fuzzy, c-format
  msgid "Signature made %s\n"
  msgstr "Az aláírás lejárt: %s.\n"
  
- #: g10/mainproc.c:1754 g10/mainproc.c:1762
++#: g10/mainproc.c:1759 g10/mainproc.c:1767
  #, fuzzy, c-format
  msgid "               using %s key %s\n"
  msgstr "               azaz \""
  
- #: g10/mainproc.c:1766
++#: g10/mainproc.c:1771
  #, fuzzy, c-format
  msgid "Signature made %s using %s key ID %s\n"
  msgstr "Aláírva: %.*s; kulcs: %s, %08lX.\n"
  
- #: g10/mainproc.c:1772
++#: g10/mainproc.c:1777
  #, fuzzy, c-format
  msgid "               issuer \"%s\"\n"
  msgstr "               azaz \""
  
- #: g10/mainproc.c:1789
++#: g10/mainproc.c:1794
  msgid "Key available at: "
  msgstr "Kulcs található: "
  
- #: g10/mainproc.c:2024
++#: g10/mainproc.c:2029
  msgid "[uncertain]"
  msgstr "[bizonytalan]"
  
- #: g10/mainproc.c:2062
++#: g10/mainproc.c:2067
  #, fuzzy, c-format
  msgid "                aka \"%s\""
  msgstr "               azaz \""
  
- #: g10/mainproc.c:2145
++#: g10/mainproc.c:2150
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "Az aláírás lejárt: %s.\n"
  
- #: g10/mainproc.c:2149
++#: g10/mainproc.c:2154
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "Az aláírás lejár: %s.\n"
  
- #: g10/mainproc.c:2160
++#: g10/mainproc.c:2165
  #, 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:2161
++#: g10/mainproc.c:2166
  msgid "binary"
  msgstr "Bináris"
  
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2167
  msgid "textmode"
  msgstr "Szövegmódú"
  
- #: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "Ismeretlen módú"
  
- #: g10/mainproc.c:2164
++#: g10/mainproc.c:2169
  #, fuzzy
  #| msgid "unknown pubkey algorithm"
  msgid ", key algorithm "
  msgstr "ismeretlen nyilvános kulcsú algoritmus"
  
- #: g10/mainproc.c:2199
++#: g10/mainproc.c:2204
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2229
++#: g10/mainproc.c:2234
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "Nem tudom ellenőrizni az aláírást: %s.\n"
  
- #: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
++#: g10/mainproc.c:2327 g10/mainproc.c:2346 g10/mainproc.c:2470
  msgid "not a detached signature\n"
  msgstr "Nem különálló aláírás.\n"
  
- #: g10/mainproc.c:2375
++#: g10/mainproc.c:2380
  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:2384
++#: g10/mainproc.c:2389
  #, 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:2469
++#: g10/mainproc.c:2474
  msgid "old style (PGP 2.x) signature\n"
  msgstr "Régi stílusú (PGP 2.x) aláírás.\n"
  
@@@ -6242,23 -4927,18 +6200,23 @@@ msgstr "Ez a fotó megfelelő (i/N/k)? 
  msgid "unable to display photo ID!\n"
  msgstr "Nem tudom megjeleníteni a fotóazonosítót!\n"
  
- #: g10/pkclist.c:72 g10/revoke.c:757
++#: g10/pkclist.c:72 g10/revoke.c:758
  msgid "No reason specified"
  msgstr "Nincs megadva ok."
  
- #: g10/pkclist.c:74 g10/revoke.c:759
++#: g10/pkclist.c:74 g10/revoke.c:760
  msgid "Key is superseded"
  msgstr "A kulcsot lecserélték."
  
- #: g10/pkclist.c:76 g10/revoke.c:758
++#: g10/pkclist.c:76 g10/revoke.c:759
  msgid "Key has been compromised"
  msgstr "A kulcs kompromittálódott."
  
- #: g10/pkclist.c:78 g10/revoke.c:760
++#: g10/pkclist.c:78 g10/revoke.c:761
  msgid "Key is no longer used"
  msgstr "A kulcs már nem használatos."
  
- #: g10/pkclist.c:80 g10/revoke.c:761
++#: g10/pkclist.c:80 g10/revoke.c:762
  msgid "User ID is no longer valid"
  msgstr "A felhasználói azonosító már nem érvényes."
  
@@@ -6339,7 -5006,6 +6297,7 @@@ msgid "
  "\n"
  msgstr ""
  
- #: g10/pkclist.c:310 g10/revoke.c:786
++#: g10/pkclist.c:310 g10/revoke.c:787
  msgid "Your decision? "
  msgstr "Mit választ? "
  
@@@ -6378,10 -5037,9 +6336,10 @@@ msgstr "Ez a kulcs hozzánk tartozik.\n
  msgid "%s: This key is bad!  It has been marked as untrusted!\n"
  msgstr ""
  
 +#: g10/pkclist.c:484
  #, fuzzy
  msgid ""
- "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "This key is bad!  It has been marked as untrusted!  If you\n"
  "*really* know what you are doing, you may answer the next\n"
  "question with yes.\n"
  msgstr ""
@@@ -6538,34 -5166,27 +6496,34 @@@ msgstr "
  msgid "No such user ID.\n"
  msgstr "Nincs ilyen felhasználói azonosító.\n"
  
- #: g10/pkclist.c:1197 g10/pkclist.c:1273
++#: g10/pkclist.c:1197 g10/pkclist.c:1274
  msgid "skipped: public key already set as default recipient\n"
  msgstr ""
  "Kihagyva: Nyilvános kulcs már be lett állítva alapértelmezett címzettnek.\n"
  
- #: g10/pkclist.c:1218
++#: g10/pkclist.c:1219
  msgid "Public key is disabled.\n"
  msgstr "Nyilvános kulcs nincs engedélyezve.\n"
  
- #: g10/pkclist.c:1228
++#: g10/pkclist.c:1229
  msgid "skipped: public key already set\n"
  msgstr "Kihagyva: Nyilvános kulcs már be lett állítva.\n"
  
- #: g10/pkclist.c:1263
++#: g10/pkclist.c:1264
  #, fuzzy, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
  
- #: g10/pkclist.c:1312
++#: g10/pkclist.c:1313
  msgid "no valid addressees\n"
  msgstr "Nincsenek érvényes címzettek!\n"
  
- #: g10/pkclist.c:1665
++#: g10/pkclist.c:1666
  #, 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:1690
++#: g10/pkclist.c:1691
  #, fuzzy, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "%08lX kulcs: Nincs felhasználói azonosító.\n"
@@@ -6575,29 -5195,23 +6533,29 @@@ msgid "data not saved; use option \"--o
  msgstr ""
  "Az adatot nem mentettem el. Használja az \"--output\" opciót a mentéshez!\n"
  
- #: g10/plaintext.c:598
++#: g10/plaintext.c:614
  msgid "Detached signature.\n"
  msgstr "Különálló aláírás.\n"
  
- #: g10/plaintext.c:606
++#: g10/plaintext.c:622
  msgid "Please enter name of data file: "
  msgstr "Kérem, adja meg az adatállomány nevét: "
  
- #: g10/plaintext.c:643
++#: g10/plaintext.c:659
  msgid "reading stdin ...\n"
  msgstr "Olvasom a szabványos bemenetet...\n"
  
- #: g10/plaintext.c:688
++#: g10/plaintext.c:704
  msgid "no signed data\n"
  msgstr "Nincs aláírt adat.\n"
  
- #: g10/plaintext.c:706
++#: g10/plaintext.c:722
  #, fuzzy, c-format
  #| msgid "can't open signed data `%s'\n"
  msgid "can't open signed data '%s'\n"
  msgstr "Nem tudom megnyitni a(z) \"%s\" aláírt adatot!\n"
  
- #: g10/plaintext.c:741
++#: g10/plaintext.c:757
  #, fuzzy, c-format
  msgid "can't open signed data fd=%d: %s\n"
  msgstr "Nem tudom megnyitni a(z) \"%s\" aláírt adatot!\n"
@@@ -6666,7 -5266,6 +6624,7 @@@ msgstr "Titkos kulcs rendelkezésre ál
  msgid "Create a designated revocation certificate for this key? (y/N) "
  msgstr "Csináljunk egy visszavonó igazolást ehhez a kulcshoz? "
  
- #: g10/revoke.c:336 g10/revoke.c:727
++#: g10/revoke.c:336 g10/revoke.c:728
  msgid "ASCII armored output forced.\n"
  msgstr "ASCII-páncélozott kimenet kiválasztva.\n"
  
@@@ -6702,23 -5295,20 +6660,23 @@@ msgid "
  "the secret key.  However, if the secret key is still accessible,\n"
  "it is better to generate a new revocation certificate and give\n"
  "a reason for the revocation.  For details see the description of\n"
- "of the gpg command \"--gen-revoke\" in the GnuPG manual."
+ "of the gpg command \"--generate-revocation\" in the GnuPG manual."
  msgstr ""
  
- #: g10/revoke.c:575
++#: g10/revoke.c:576
  msgid ""
  "To avoid an accidental use of this file, a colon has been inserted\n"
  "before the 5 dashes below.  Remove this colon with a text editor\n"
  "before importing and publishing this revocation certificate."
  msgstr ""
  
- #: g10/revoke.c:590
++#: g10/revoke.c:591
  #, fuzzy, c-format
  #| msgid "Revocation certificate created.\n"
  msgid "revocation certificate stored as '%s.rev'\n"
  msgstr "Visszavonó igazolás létrehozva.\n"
  
- #: g10/revoke.c:634
++#: g10/revoke.c:635
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found\n"
  msgstr "\"%s\" titkos kulcs nem található: %s\n"
@@@ -6726,23 -5316,19 +6684,23 @@@
  #. TRANSLATORS: The %s prints a key specification which
  #. for example has been given at the command line.  Several lines
  #. lines with secret key infos are printed after this message.
- #: g10/revoke.c:661
++#: g10/revoke.c:662
  #, c-format
  msgid "'%s' matches multiple secret keys:\n"
  msgstr ""
  
- #: g10/revoke.c:688
++#: g10/revoke.c:689
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error searching the keyring: %s\n"
  msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
  
- #: g10/revoke.c:711
++#: g10/revoke.c:712
  #, fuzzy
  msgid "Create a revocation certificate for this key? (y/N) "
  msgstr "Csináljunk egy visszavonó igazolást ehhez a kulcshoz? "
  
- #: g10/revoke.c:735
++#: g10/revoke.c:736
  msgid ""
  "Revocation certificate created.\n"
  "\n"
@@@ -6760,33 -5346,26 +6718,33 @@@ msgstr "
  "adathordozó olvashatatlanná válik. De vigyázat: az Ön gépének nyomtatási\n"
  "rendszere is tárolhatja az adatot, és mások esetleg hozzáférhetnek ehhez!\n"
  
- #: g10/revoke.c:769
++#: g10/revoke.c:770
  msgid "Please select the reason for the revocation:\n"
  msgstr "Kérem, válassza ki a visszavonás okát:\n"
  
- #: g10/revoke.c:779
++#: g10/revoke.c:780
  msgid "Cancel"
  msgstr "Mégsem"
  
- #: g10/revoke.c:781
++#: g10/revoke.c:782
  #, c-format
  msgid "(Probably you want to select %d here)\n"
  msgstr "(Valószínűleg a(z) %d. lehetőséget akarja választani.)\n"
  
- #: g10/revoke.c:822
++#: g10/revoke.c:823
  msgid "Enter an optional description; end it with an empty line:\n"
  msgstr "Adjon meg egy nem kötelező leírást! Üres sorral fejezze be:\n"
  
- #: g10/revoke.c:850
++#: g10/revoke.c:851
  #, c-format
  msgid "Reason for revocation: %s\n"
  msgstr "Visszavonás oka: %s\n"
  
- #: g10/revoke.c:852
++#: g10/revoke.c:853
  msgid "(No description given)\n"
  msgstr "(Nincs leírás.)\n"
  
- #: g10/revoke.c:857
++#: g10/revoke.c:858
  #, fuzzy
  msgid "Is this okay? (y/N) "
  msgstr "Ez így rendben van? "
@@@ -6919,12 -5478,10 +6877,12 @@@ msgstr "
  "hosszú).\n"
  "Kifejtés nélkül használom.\n"
  
- #: g10/sign.c:329
++#: g10/sign.c:331
  #, fuzzy, c-format
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s aláírás a következőtől: \"%s\"\n"
  
- #: g10/sign.c:878
++#: g10/sign.c:880
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6932,11 -5489,9 +6890,11 @@@ msgstr "
  "%s (%d) kivonatoló algoritmus használatának erőltetése ellentétes\n"
  "a címzett preferenciáival.\n"
  
- #: g10/sign.c:1009
++#: g10/sign.c:1011
  msgid "signing:"
  msgstr "Aláírom:"
  
- #: g10/sign.c:1286
++#: g10/sign.c:1288
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "%s titkosítást fogok használni.\n"
@@@ -6963,7 -5514,6 +6921,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:362
++#: g10/tdbdump.c:57 g10/trustdb.c:369
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "%lu bizalmi rekord, %d típus: írás sikertelen: %s.\n"
@@@ -7011,7 -5553,6 +6969,7 @@@ msgstr "Hiba bizalmi rekord kereséseko
  msgid "read error in '%s': %s\n"
  msgstr "Olvasási hiba: %s.\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "Bizalmi adatbázis: szinkronizáció sikertelen: %s.\n"
@@@ -7157,298 -5669,306 +7115,372 @@@ msgstr "Nem tudok %d karakternél hossz
  msgid "input line longer than %d characters\n"
  msgstr "A bemeneti sor hosszabb, mint %d karakter.\n"
  
- #: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
++#: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
  #, fuzzy, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "Hiba %s-ra/-re küldéskor: %s\n"
  
- #: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
++#: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:357 g10/tofu.c:699
++#: g10/tofu.c:355 g10/tofu.c:888
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:501
++#: g10/tofu.c:505
  #, fuzzy, c-format
  msgid "unsupported TOFU database version: %s\n"
  msgstr ""
  "\n"
  "Támogatott algoritmusok:\n"
  
- #: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
- #: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
- #: g10/tofu.c:3056
++#: g10/tofu.c:538
+ #, fuzzy, c-format
+ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
+ 
++#: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
+ msgid "TOFU DB error"
+ msgstr ""
+ 
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2340 g10/tofu.c:2359
++#: g10/tofu.c:2372 g10/tofu.c:2384 g10/tofu.c:2399 g10/tofu.c:2411
++#: g10/tofu.c:2980 g10/tofu.c:2997 g10/tofu.c:3033 g10/tofu.c:3050
++#: g10/tofu.c:3353
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "Hiba %s-ra/-re küldéskor: %s\n"
  
- #: g10/tofu.c:566 g10/tofu.c:574
++#: g10/tofu.c:716 g10/tofu.c:724
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error determining TOFU database's version: %s\n"
  msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n"
  
- #: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
++#: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing TOFU database: %s\n"
  msgstr "%s: Hiba könyvtárrekord írásakor: %s.\n"
  
- #: g10/tofu.c:765
++#: g10/tofu.c:844
+ #, fuzzy, c-format
+ msgid "error creating 'encryptions' TOFU table: %s\n"
+ msgstr "Hiba %s-ra/-re küldéskor: %s\n"
+ 
++#: g10/tofu.c:874
+ #, c-format
+ msgid "adding column effective_policy to bindings DB: %s\n"
+ msgstr ""
+ 
++#: g10/tofu.c:956
  #, fuzzy, c-format
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
- #: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
++#: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "Hiba %s-ra/-re küldéskor: %s\n"
  
- #: g10/tofu.c:1239
++#: g10/tofu.c:1328
  #, c-format
  msgid ""
  "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1247
++#: g10/tofu.c:1337
  #, c-format
- msgid "The email address \"%s\" is associated with %d keys!"
- msgstr ""
+ msgid "The email address \"%s\" is associated with %d key!"
+ msgid_plural "The email address \"%s\" is associated with %d keys!"
+ msgstr[0] ""
+ msgstr[1] ""
  
- #: g10/tofu.c:1251
++#: g10/tofu.c:1343
  msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  
- #: g10/tofu.c:1257
++#: g10/tofu.c:1349
  #, c-format
  msgid ""
  "Please indicate whether this email address should be associated with key %s "
  "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1513
++#: g10/tofu.c:1605
  #, fuzzy, c-format
  msgid "error gathering other user IDs: %s\n"
  msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: g10/tofu.c:1523
++#: g10/tofu.c:1615
  #, fuzzy
  #| msgid "list key and user IDs"
  msgid "This key's user IDs:\n"
  msgstr "kilistázza a kulcs- és felhasználóazonosítókat"
  
- #: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
++#: g10/tofu.c:1631 g10/tofu.c:1796
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "policy: %s"
  msgstr "Eljárásmód: "
  
- #: g10/tofu.c:1630
++#: g10/tofu.c:1722
  #, fuzzy, c-format
  msgid "error gathering signature stats: %s\n"
  msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: g10/tofu.c:1634
++#: g10/tofu.c:1726
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1651
++#: g10/tofu.c:1744
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1684 g10/tofu.c:1689
++#: g10/tofu.c:1785 g10/tofu.c:1790
  msgid ", "
  msgstr ""
  
- #: g10/tofu.c:1693
++#: g10/tofu.c:1794
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
  msgstr "kulcsok listázása"
  
- #: g10/tofu.c:1715
++#: g10/tofu.c:1820
+ #, fuzzy, c-format
+ msgid "Verified %d message."
+ msgid_plural "Verified %d messages."
+ msgstr[0] "|algo [fájlok]|üzenet kivonatának kiírása"
+ msgstr[1] "|algo [fájlok]|üzenet kivonatának kiírása"
+ 
++#: g10/tofu.c:1824
  #, fuzzy, c-format
- msgid "Verified %d message"
- msgid_plural "Verified %d messages"
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid "Encrypted %d message."
+ msgid_plural "Encrypted %d messages."
+ msgstr[0] "%lu jelszóval rejtjelezve\n"
+ msgstr[1] "%lu jelszóval rejtjelezve\n"
+ 
++#: g10/tofu.c:1831
+ #, fuzzy, c-format
+ msgid "Verified %d message in the future."
+ msgid_plural "Verified %d messages in the future."
+ msgstr[0] "|algo [fájlok]|üzenet kivonatának kiírása"
+ msgstr[1] "|algo [fájlok]|üzenet kivonatának kiírása"
+ 
++#: g10/tofu.c:1835
+ #, fuzzy, c-format
+ msgid "Encrypted %d message in the future."
+ msgid_plural "Encrypted %d messages in the future."
  msgstr[0] "|algo [fájlok]|üzenet kivonatának kiírása"
  msgstr[1] "|algo [fájlok]|üzenet kivonatának kiírása"
  
- #: g10/tofu.c:1719
++#: g10/tofu.c:1849
  #, c-format
- msgid "Encrypted %d message"
- msgid_plural "Encrypted %d messages"
+ msgid "Messages verified over the past %d day: %d."
+ msgid_plural "Messages verified over the past %d days: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1734
++#: g10/tofu.c:1855
  #, c-format
- msgid " over the past day."
- msgid_plural " over the past %d days."
+ msgid "Messages encrypted over the past %d day: %d."
+ msgid_plural "Messages encrypted over the past %d days: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1740
++#: g10/tofu.c:1865
  #, c-format
- msgid " over the past month."
- msgid_plural " over the past %d months."
+ msgid "Messages verified over the past %d month: %d."
+ msgid_plural "Messages verified over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1746
++#: g10/tofu.c:1871
  #, c-format
- msgid " over the past year."
- msgid_plural " over the past %d years."
+ msgid "Messages encrypted over the past %d month: %d."
+ msgid_plural "Messages encrypted over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1752
- msgid " in the past."
++#: g10/tofu.c:1881
+ #, c-format
+ msgid "Messages verified over the past %d year: %d."
+ msgid_plural "Messages verified over the past %d years: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1887
+ #, c-format
+ msgid "Messages encrypted over the past %d year: %d."
+ msgid_plural "Messages encrypted over the past %d years: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1895
+ #, c-format
+ msgid "Messages verified in the past: %d."
  msgstr ""
  
++#: g10/tofu.c:1899
+ #, fuzzy, c-format
+ msgid "Messages encrypted in the past: %d."
+ msgstr "|algo [fájlok]|üzenet kivonatának kiírása"
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1767
++#: g10/tofu.c:1916
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1809
++#: g10/tofu.c:1958
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1815
++#: g10/tofu.c:1964
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1823
++#: g10/tofu.c:1972
  msgid "Defaulting to unknown."
  msgstr ""
  
- #: g10/tofu.c:1938 g10/tofu.c:2074
++#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
- #: g10/tofu.c:1994
++#: g10/tofu.c:2143
  #, fuzzy, c-format
  msgid "resetting keydb: %s\n"
  msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
  
- #: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
- #: g10/tofu.c:2425
++#: g10/tofu.c:2601
  #, fuzzy, c-format
- msgid "error setting TOFU binding's trust level to %s\n"
+ msgid "error setting TOFU binding's policy to %s\n"
  msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
- #: g10/tofu.c:2473
++#: g10/tofu.c:2794
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #. TRANSLATORS: The tilde ('~') is used here to indicate a
- #. * non-breakable space
- #: g10/tofu.c:2574
++#: g10/tofu.c:2839
  #, c-format
- msgid "%d~year"
- msgid_plural "%d~years"
+ msgid "%lld~year"
+ msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2583
++#: g10/tofu.c:2844
  #, c-format
- msgid "%d~month"
- msgid_plural "%d~months"
+ msgid "%lld~month"
+ msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2592
++#: g10/tofu.c:2849
  #, c-format
- msgid "%d~day"
- msgid_plural "%d~days"
+ msgid "%lld~week"
+ msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2854
  #, c-format
- msgid "%d~hour"
- msgid_plural "%d~hours"
+ msgid "%lld~day"
+ msgid_plural "%lld~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2610
++#: g10/tofu.c:2859
  #, c-format
- msgid "%d~minute"
- msgid_plural "%d~minutes"
+ msgid "%lld~hour"
+ msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2619
++#: g10/tofu.c:2864
  #, c-format
- msgid "%d~second"
- msgid_plural "%d~seconds"
+ msgid "%lld~minute"
+ msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2802
++#: g10/tofu.c:2866
  #, c-format
- msgid "%s: "
+ msgid "%lld~second"
+ msgid_plural "%lld~seconds"
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:3103
+ #, c-format
+ msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:2806
++#: g10/tofu.c:3109
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
- msgid "Verified %ld signatures"
+ msgid "%s: Verified 0 signatures."
  msgstr "Töröltem %d aláírást.\n"
  
- #: g10/tofu.c:2816
++#: g10/tofu.c:3117
  #, fuzzy, c-format
- msgid "Verified %ld signature in the past %s"
- msgid_plural "Verified %ld signatures in the past %s"
+ msgid "%s: Verified %ld~signature in the past %s."
+ msgid_plural "%s: Verified %ld~signatures in the past %s."
  msgstr[0] "|algo [fájlok]|üzenet kivonatának kiírása"
  msgstr[1] "|algo [fájlok]|üzenet kivonatának kiírása"
  
- #: g10/tofu.c:2826
- #, fuzzy, c-format
++#: g10/tofu.c:3127
+ #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
- msgid ", and encrypted %ld messages"
+ msgid "Encrypted 0 messages."
  msgstr "%lu jelszóval rejtjelezve\n"
  
- #: g10/tofu.c:2835
++#: g10/tofu.c:3135
  #, fuzzy, c-format
- msgid ", and encrypted %ld message in the past %s"
- msgid_plural ", and encrypted %ld messages in the past %s"
+ msgid "Encrypted %ld~message in the past %s."
+ msgid_plural "Encrypted %ld~messages in the past %s."
  msgstr[0] "|algo [fájlok]|üzenet kivonatának kiírása"
  msgstr[1] "|algo [fájlok]|üzenet kivonatának kiírása"
  
- #: g10/tofu.c:2880
++#: g10/tofu.c:3146
+ #, fuzzy, c-format
+ #| msgid "Policy: "
+ msgid "(policy: %s)"
+ msgstr "Eljárásmód: "
+ 
++#: g10/tofu.c:3177
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2883
++#: g10/tofu.c:3180
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2887
++#: g10/tofu.c:3184
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2890
++#: g10/tofu.c:3187
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2919
++#: g10/tofu.c:3216
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7465,18 -5985,14 +7497,18 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
- #: g10/tofu.c:3480 g10/tofu.c:3572
++#: g10/tofu.c:3298 g10/tofu.c:3449 g10/tofu.c:3627 g10/tofu.c:3670
++#: g10/tofu.c:3784 g10/tofu.c:3859 g10/tofu.c:3894
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "Hiba %s-ra/-re küldéskor: %s\n"
  
- #: g10/tofu.c:3185
++#: g10/tofu.c:3482
  #, c-format
- msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
  msgstr ""
  
- #: g10/tofu.c:3515
++#: g10/tofu.c:3819
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7509,74 -6020,59 +7541,74 @@@ msgstr "
  msgid "key %s marked as ultimately trusted\n"
  msgstr "A kulcsot alapvetően megbízhatónak jelöltem.\n"
  
- #: g10/trustdb.c:341
++#: g10/trustdb.c:348
  #, 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:347
++#: g10/trustdb.c:354
  #, 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:422
++#: g10/trustdb.c:429
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr ""
  
- #: g10/trustdb.c:431
++#: g10/trustdb.c:438
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:468
++#: g10/trustdb.c:475
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:474
++#: g10/trustdb.c:481
  #, c-format
  msgid "using %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:511
++#: g10/trustdb.c:518
  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:517 g10/trustdb.c:2160
++#: g10/trustdb.c:524 g10/trustdb.c:2187
  #, 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:526
++#: g10/trustdb.c:533
  #, 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:542
++#: g10/trustdb.c:549
  #, 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:749 g10/trustdb.c:1313
++#: g10/trustdb.c:756 g10/trustdb.c:1340
  #, 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:966
++#: g10/trustdb.c:973
  msgid "please do a --check-trustdb\n"
  msgstr "Kérem, hajtson végre egy --check-trustdb parancsot!\n"
  
- #: g10/trustdb.c:971
++#: g10/trustdb.c:978
  msgid "checking the trustdb\n"
  msgstr "Ellenőrzöm a bizalmi adatbázist.\n"
  
- #: g10/trustdb.c:1883
++#: g10/trustdb.c:1910
  #, 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:1886
++#: g10/trustdb.c:1913
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7584,22 -6080,18 +7616,22 @@@ msgid_plural " (%d validity counts clea
  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:1956
++#: g10/trustdb.c:1983
  msgid "no ultimately trusted keys found\n"
  msgstr "Nem találtam alapvetően megbízható kulcsot.\n"
  
- #: g10/trustdb.c:1970
++#: g10/trustdb.c:1997
  #, 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:2087
++#: g10/trustdb.c:2114
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr ""
  
- #: g10/trustdb.c:2167
++#: g10/trustdb.c:2194
  #, 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"
@@@ -7713,19 -6184,14 +7745,19 @@@ msgid "
  "List, export, import Keybox data\n"
  msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3208
++#: scd/app-nks.c:718 scd/app-openpgp.c:3221
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3220
++#: scd/app-nks.c:726 scd/app-openpgp.c:3233
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
- #: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
- #: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1965 scd/app-openpgp.c:1984
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2166 scd/app-openpgp.c:2430
++#: scd/app-openpgp.c:2477 scd/app-openpgp.c:2582 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr ""
@@@ -7774,84 -6231,66 +7806,84 @@@ msgid "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2511 scd/app-dinsig.c:532
  #, fuzzy, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: scd/app-openpgp.c:806
++#: scd/app-openpgp.c:801
  #, fuzzy, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
  
- #: scd/app-openpgp.c:819
++#: scd/app-openpgp.c:814
  #, fuzzy, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "Nem tudtam újraépíteni a kulcskarika cache-ét: %s\n"
  
- #: scd/app-openpgp.c:1236
++#: scd/app-openpgp.c:1247
  msgid "response does not contain the RSA modulus\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1243
++#: scd/app-openpgp.c:1254
  msgid "response does not contain the RSA public exponent\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1353
++#: scd/app-openpgp.c:1364
  #, fuzzy
  #| msgid "remove keys from the public keyring"
  msgid "response does not contain the EC public key\n"
  msgstr "kulcsok eltávolítása a nyilvánoskulcs-karikáról"
  
- #: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:1464 scd/app-openpgp.c:3825
  msgid "response does not contain the public key data\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1551
++#: scd/app-openpgp.c:1564
  #, fuzzy, c-format
  msgid "reading public key failed: %s\n"
  msgstr "A kulcsblokk törlése sikertelen: %s.\n"
  
- #: scd/app-openpgp.c:1903
++#: scd/app-openpgp.c:1916
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1910
++#: scd/app-openpgp.c:1923
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1925
++#: scd/app-openpgp.c:1938
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr ""
  
- #: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
++#: scd/app-openpgp.c:1949 scd/app-openpgp.c:2424
  #, fuzzy
  msgid "||Please enter the PIN"
  msgstr "jelszóváltoztatás"
  
- #: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2173 scd/app-openpgp.c:2437
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
- #: scd/app-openpgp.c:4114
++#: scd/app-openpgp.c:2004 scd/app-openpgp.c:2043 scd/app-openpgp.c:2185
++#: scd/app-openpgp.c:4126
  #, fuzzy, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "Küldés a kulcsszerverre sikertelen: %s\n"
  
- #: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
++#: scd/app-openpgp.c:2072 scd/app-openpgp.c:2458 scd/app-openpgp.c:4556
  msgid "error retrieving CHV status from card\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
++#: scd/app-openpgp.c:2078 scd/app-openpgp.c:4565
  msgid "card is permanently locked!\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2072
++#: scd/app-openpgp.c:2085
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7861,26 -6300,21 +7893,26 @@@ msgstr[1] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:2082
++#: scd/app-openpgp.c:2095
  #, fuzzy, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "jelszóváltoztatás"
  
- #: scd/app-openpgp.c:2086
++#: scd/app-openpgp.c:2099
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
  msgstr "jelszóváltoztatás"
  
- #: scd/app-openpgp.c:2107
++#: scd/app-openpgp.c:2120
  msgid "access to admin commands is not configured\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2460
++#: scd/app-openpgp.c:2473
  #, fuzzy
  msgid "||Please enter the Reset Code for the card"
  msgstr "Kérem, válassza ki a visszavonás okát:\n"
  
- #: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
++#: scd/app-openpgp.c:2483 scd/app-openpgp.c:2537
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr ""
@@@ -7888,117 -6322,93 +7920,117 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2493
++#: scd/app-openpgp.c:2506
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|AN|New Admin PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|N|New PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2565
++#: scd/app-openpgp.c:2578
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "jelszóváltoztatás"
  
- #: scd/app-openpgp.c:2566
++#: scd/app-openpgp.c:2579
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
  msgstr "jelszóváltoztatás"
  
- #: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
++#: scd/app-openpgp.c:2635 scd/app-openpgp.c:3885
  #, fuzzy
  msgid "error reading application data\n"
  msgstr "Hiba a kulcsblokk olvasásakor: %s\n"
  
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
++#: scd/app-openpgp.c:2641 scd/app-openpgp.c:3892
  #, fuzzy
  msgid "error reading fingerprint DO\n"
  msgstr "%s: Hiba szabad rekord olvasásakor: %s.\n"
  
- #: scd/app-openpgp.c:2638
++#: scd/app-openpgp.c:2651
  #, fuzzy
  msgid "key already exists\n"
  msgstr "\"%s\" már tömörített.\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2655
  msgid "existing key will be replaced\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2644
++#: scd/app-openpgp.c:2657
  #, fuzzy
  msgid "generating new key\n"
  msgstr "új kulcspár létrehozása"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2659
  #, fuzzy
  msgid "writing new key\n"
  msgstr "új kulcspár létrehozása"
  
- #: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
++#: scd/app-openpgp.c:3201 scd/app-openpgp.c:3553
  msgid "creation timestamp missing\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
++#: scd/app-openpgp.c:3243 scd/app-openpgp.c:3251
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
++#: scd/app-openpgp.c:3384 scd/app-openpgp.c:3647
  #, fuzzy, c-format
  msgid "failed to store the key: %s\n"
  msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
  
- #: scd/app-openpgp.c:3534
++#: scd/app-openpgp.c:3547
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "nem támogatott URI"
  
- #: scd/app-openpgp.c:3790
++#: scd/app-openpgp.c:3802
  msgid "please wait while key is being generated ...\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3798
++#: scd/app-openpgp.c:3810
  #, fuzzy
  msgid "generating key failed\n"
  msgstr "A kulcsblokk törlése sikertelen: %s.\n"
  
- #: scd/app-openpgp.c:3804
++#: scd/app-openpgp.c:3816
  #, fuzzy, c-format
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
  msgstr[0] "Kulcsgenerálás sikertelen: %s\n"
  msgstr[1] "Kulcsgenerálás sikertelen: %s\n"
  
- #: scd/app-openpgp.c:3838
++#: scd/app-openpgp.c:3850
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:3900
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4004
++#: scd/app-openpgp.c:4016
  #, fuzzy, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "%s aláírás, %s kivonatoló algoritmus.\n"
  
- #: scd/app-openpgp.c:4089
++#: scd/app-openpgp.c:4101
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4551
++#: scd/app-openpgp.c:4570
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
++#: scd/app-openpgp.c:4871 scd/app-openpgp.c:4882
  #, fuzzy, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "Nem találtam érvényes OpenPGP adatot.\n"
@@@ -8019,7 -6426,6 +8051,7 @@@ msgstr "
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
@@@ -8064,27 -6461,22 +8096,27 @@@ msgstr "Egymásnak ellentmondó parancs
  msgid "use variable length input for pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:287
++#: scd/scdaemon.c:286
  #, fuzzy
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
  
- #: scd/scdaemon.c:289
++#: scd/scdaemon.c:288
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
  msgstr ""
  
- #: scd/scdaemon.c:786
++#: scd/scdaemon.c:784
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1904
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
++#: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1909
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
@@@ -8164,9 -6540,6 +8196,9 @@@ msgstr "Hiba a jelszó létrehozásakor
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "A kulcsblokk törlése sikertelen: %s.\n"
  
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
 +#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  #, fuzzy
  msgid "failed to allocate keyDB handle\n"
  msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
@@@ -8662,11 -6933,9 +8694,11 @@@ msgstr "
  msgid "resource problem: out of core\n"
  msgstr ""
  
- #: sm/decrypt.c:330
++#: sm/decrypt.c:332
  msgid "(this is the RC2 algorithm)\n"
  msgstr ""
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:334
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr ""
  
@@@ -8710,124 -6971,96 +8742,124 @@@ msgstr "titkos kulcsok listázása
  msgid "list certificate chain"
  msgstr "rossz igazolás"
  
- #: sm/gpgsm.c:218
++#: sm/gpgsm.c:219
  #, fuzzy
  msgid "import certificates"
  msgstr "rossz igazolás"
  
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
  #, fuzzy
  msgid "export certificates"
  msgstr "rossz igazolás"
  
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:228
  msgid "register a smartcard"
  msgstr ""
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:231
  msgid "pass a command to the dirmngr"
  msgstr ""
  
- #: sm/gpgsm.c:232
++#: sm/gpgsm.c:233
  msgid "invoke gpg-protect-tool"
  msgstr ""
  
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:250
  #, fuzzy
  msgid "create base-64 encoded output"
  msgstr "ascii páncélozott kimenet létrehozása"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in PEM format"
  msgstr ""
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in base-64 format"
  msgstr ""
  
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:262
  msgid "assume input is in binary format"
  msgstr ""
  
- #: sm/gpgsm.c:267
++#: sm/gpgsm.c:269
  msgid "never consult a CRL"
  msgstr ""
  
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:279
  msgid "check validity using OCSP"
  msgstr ""
  
- #: sm/gpgsm.c:282
++#: sm/gpgsm.c:284
  msgid "|N|number of certificates to include"
  msgstr ""
  
- #: sm/gpgsm.c:285
++#: sm/gpgsm.c:287
  msgid "|FILE|take policy information from FILE"
  msgstr ""
  
- #: sm/gpgsm.c:288
++#: sm/gpgsm.c:290
  msgid "do not check certificate policies"
  msgstr ""
  
- #: sm/gpgsm.c:292
++#: sm/gpgsm.c:294
  msgid "fetch missing issuer certificates"
  msgstr ""
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "don't use the terminal at all"
  msgstr "ne használja a terminált egyáltalán"
  
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:307
  msgid "|FILE|write a server mode log to FILE"
  msgstr ""
  
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:312
  #, fuzzy
  msgid "|FILE|write an audit log to FILE"
  msgstr "|fájl|bővítő modul betöltése"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "batch mode: never ask"
  msgstr "kötegelt mód: soha nem kérdez"
  
- #: sm/gpgsm.c:314
++#: sm/gpgsm.c:316
  msgid "assume yes on most questions"
  msgstr "igen válasz feltételezése a legtöbb kérdésre"
  
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:317
  msgid "assume no on most questions"
  msgstr "nem válasz feltételezése a legtöbb kérdésre"
  
- #: sm/gpgsm.c:318
++#: sm/gpgsm.c:320
  #, fuzzy
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "kulcskarika hozzáadása a kulcskarikalistához"
  
- #: sm/gpgsm.c:321
++#: sm/gpgsm.c:323
  #, 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:331 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
  #, 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:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|NÉV|NÉV rejtjelező algoritmus használata"
  
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:352
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|NÉV|NÉV kivonatoló algoritmus használata"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:559
  #, 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:570
++#: sm/gpgsm.c:562
  #, fuzzy
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
@@@ -8838,47 -7071,38 +8870,47 @@@ 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:774
++#: sm/gpgsm.c:766
  #, 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:785
++#: sm/gpgsm.c:777
  #, fuzzy, c-format
  msgid "unknown validation model '%s'\n"
  msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
  
- #: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
  #, fuzzy, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "(Nincs leírás.)\n"
  
- #: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr ""
  
- #: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
  #, fuzzy, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr " h = kulcs kihagyása\n"
  
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1427
  #, fuzzy
  msgid "could not parse keyserver\n"
  msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
  
- #: sm/gpgsm.c:1636
++#: sm/gpgsm.c:1630
  #, fuzzy, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "Írok a \"%s\" állományba.\n"
  
- #: sm/gpgsm.c:1677
++#: sm/gpgsm.c:1671
  #, 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:2033
++#: sm/gpgsm.c:2028
  msgid "invalid command (there is no implicit command)\n"
  msgstr ""
  
@@@ -9638,8 -7711,6 +9670,8 @@@ msgstr "
  msgid "CRL access not possible due to disabled %s\n"
  msgstr ""
  
 +#: dirmngr/crlfetch.c:223 dirmngr/ldap-wrapper-ce.c:488
- #: dirmngr/ldap-wrapper.c:742 dirmngr/misc.c:563
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:563
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
@@@ -9824,116 -7859,88 +9856,116 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:160
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:158
++#: dirmngr/dirmngr.c:161
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|fájl|bővítő modul betöltése"
  
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:162
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:163
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:164
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
- #: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
++#: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:177
++#: dirmngr/dirmngr.c:180
  #, fuzzy
  msgid "run without asking a user"
  msgstr "Kilépjek mentés nélkül? "
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:181
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:182
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:184
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:185
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:186
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:188
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:192
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:202
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|fájl|bővítő modul betöltése"
  
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:210
  #, fuzzy
  msgid "|URL|use OCSP responder at URL"
  msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:212
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:218
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:220
++#: dirmngr/dirmngr.c:223
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:225
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:240
++#: dirmngr/dirmngr.c:246
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -9946,91 -7953,72 +9978,91 @@@ msgstr "
  "@\n"
  "(A parancsok és opciók teljes listáját a man oldalon tekintheti meg.)\n"
  
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:361
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
  
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:363
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:443
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
- #: tools/gpgconf.c:648
++#: dirmngr/dirmngr.c:496 tools/gpgconf.c:550 tools/gpgconf.c:585
++#: tools/gpgconf.c:656
  #, fuzzy, c-format
  msgid "usage: %s [options] "
  msgstr "Használat: gpg [opciók] "
  
- #: dirmngr/dirmngr.c:1062
++#: dirmngr/dirmngr.c:1074
  #, fuzzy
  #| 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:1301 dirmngr/server.c:1585
++#: dirmngr/dirmngr.c:1300 dirmngr/server.c:1585
  #, fuzzy, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "Páncélozás nem sikerült: %s\n"
  
- #: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
++#: dirmngr/dirmngr.c:1306 dirmngr/server.c:1591
  #, fuzzy, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "Páncélozás nem sikerült: %s\n"
  
- #: dirmngr/dirmngr.c:1484
++#: dirmngr/dirmngr.c:1487
  #, fuzzy, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "A sor túl hosszú!\n"
  
- #: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
++#: dirmngr/dirmngr.c:1542 dirmngr/dirmngr.c:1626
  #, fuzzy, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
++#: dirmngr/dirmngr.c:1578 dirmngr/dirmngr.c:1604 tools/gpgconf-comp.c:4032
  #, fuzzy, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "Olvasási hiba: %s.\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1633
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1700
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1734
++#: dirmngr/dirmngr.c:1738
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1739
++#: dirmngr/dirmngr.c:1743
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1745
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1746
++#: dirmngr/dirmngr.c:1750
  #, fuzzy
  msgid "shutdown forced\n"
  msgstr "nem feldolgozott"
  
- #: dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1758
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1761
++#: dirmngr/dirmngr.c:1765
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10512,33 -8401,27 +10544,33 @@@ msgstr "A kulcsblokk törlése sikertel
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2463
++#: dirmngr/server.c:2469
  #, 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:2474
++#: dirmngr/server.c:2480
  #, fuzzy, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "%s: Hashtábla létrehozása sikertelen: %s.\n"
  
- #: dirmngr/server.c:2495
++#: dirmngr/server.c:2501
  #, 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:2503
++#: dirmngr/server.c:2509
  #, 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:2534
++#: dirmngr/server.c:2540
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2553
++#: dirmngr/server.c:2559
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
@@@ -10586,7 -8460,6 +10618,7 @@@ msgstr "A DSA 160 bites hash (kivonatol
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:167
  #, fuzzy
  msgid "quiet"
  msgstr "kilépés|kilepes"
@@@ -10679,22 -8532,15 +10711,22 @@@ 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:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
- #: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
++#: tools/gpgconf-comp.c:766 tools/gpgconf-comp.c:865
  msgid "Options controlling the diagnostic output"
  msgstr ""
  
 +#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
- #: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
++#: tools/gpgconf-comp.c:779 tools/gpgconf-comp.c:888
  msgid "Options controlling the configuration"
  msgstr ""
  
- #: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
- #: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
++#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:723
++#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:901
  msgid "Options useful for debugging"
  msgstr ""
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
  msgid "Options controlling the security"
  msgstr ""
  
@@@ -10744,11 -8579,9 +10776,11 @@@ msgstr "Hiba a jelszó létrehozásakor
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
++#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
  msgid "|NAME|use NAME as default secret key"
  msgstr "|NÉV|NÉV használata alapértelmezett titkos kulcsként"
  
- #: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
++#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:784
  #, fuzzy
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NÉV|titkosítás NÉV részére"
@@@ -10757,194 -8589,161 +10789,208 @@@
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
++#: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
  msgid "Configuration for Keyservers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
++#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
  #, fuzzy
  msgid "|URL|use keyserver at URL"
  msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
  
- #: tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:741
  msgid "allow PKA lookups (DNS requests)"
  msgstr ""
  
- #: tools/gpgconf-comp.c:738
++#: tools/gpgconf-comp.c:744
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr ""
  
- #: tools/gpgconf-comp.c:787
++#: tools/gpgconf-comp.c:793
  msgid "disable all access to the dirmngr"
  msgstr ""
  
- #: tools/gpgconf-comp.c:790
++#: tools/gpgconf-comp.c:796
  #, fuzzy
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
  msgstr "|NÉV|NÉV rejtjelező algoritmus haszn. jelszavakhoz"
  
- #: tools/gpgconf-comp.c:820
++#: tools/gpgconf-comp.c:829
  msgid "do not check CRLs for root certificates"
  msgstr ""
  
- #: tools/gpgconf-comp.c:869
++#: tools/gpgconf-comp.c:878
  msgid "Options controlling the format of the output"
  msgstr ""
  
- #: tools/gpgconf-comp.c:905
++#: tools/gpgconf-comp.c:920
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:918
++#: tools/gpgconf-comp.c:933
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:947
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:958
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:948
++#: tools/gpgconf-comp.c:963
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:977
++#: tools/gpgconf-comp.c:992
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:985
++#: tools/gpgconf-comp.c:1000
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1066
++#: tools/gpgconf-comp.c:1081
  msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1067
++#: tools/gpgconf-comp.c:1082
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1083
  msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1069
++#: tools/gpgconf-comp.c:1084
  msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1070
++#: tools/gpgconf-comp.c:1085
  #, fuzzy
  #| msgid "network error"
  msgid "Network"
  msgstr "hálózati hiba"
  
- #: tools/gpgconf-comp.c:1071
++#: tools/gpgconf-comp.c:1086
  #, fuzzy
  msgid "Passphrase Entry"
  msgstr "rossz jelszó"
  
- #: tools/gpgconf-comp.c:1225
++#: tools/gpgconf-comp.c:1240
  #, fuzzy
  msgid "Component not suitable for launching"
  msgstr "nyilvános kulcs nem található"
  
- #: tools/gpgconf-comp.c:3283
++#: tools/gpgconf-comp.c:3311
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3434
++#: tools/gpgconf-comp.c:3462
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf-comp.c:4036
+ #, fuzzy, c-format
+ msgid "error closing '%s'\n"
+ msgstr "Hiba \"%s\" olvasásakor: %s\n"
+ 
++#: tools/gpgconf-comp.c:4038
+ #, fuzzy, c-format
+ msgid "error parsing '%s'\n"
+ msgstr "Hiba \"%s\" olvasásakor: %s\n"
+ 
++#: tools/gpgconf.c:73
  msgid "list all components"
  msgstr ""
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "check all programs"
  msgstr ""
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|list options"
  msgstr ""
  
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
  msgid "|COMPONENT|change options"
  msgstr ""
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "|COMPONENT|check options"
  msgstr ""
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "apply global default values"
  msgstr ""
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
+ msgid "|FILE|update configuration files using FILE"
+ msgstr ""
+ 
++#: tools/gpgconf.c:83
  msgid "get the configuration directories for @GPGCONF@"
  msgstr ""
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:85
  #, fuzzy
  msgid "list global configuration file"
  msgstr "\"%s\": ismeretlen konfigurációs elem.\n"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  #, fuzzy
  msgid "check global configuration file"
  msgstr "\"%s\": ismeretlen konfigurációs elem.\n"
  
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:89
  #, fuzzy
  #| msgid "update the trust database"
  msgid "query the software version database"
  msgstr "bizalmi adatbázis frissítése"
  
- #: tools/gpgconf.c:86
++#: tools/gpgconf.c:90
  msgid "reload all or a given component"
  msgstr ""
  
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:91
  msgid "launch a given component"
  msgstr ""
  
- #: tools/gpgconf.c:88
++#: tools/gpgconf.c:92
  msgid "kill a given component"
  msgstr ""
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "use as output file"
  msgstr "kimeneti állomány megadása"
  
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:102
  msgid "activate changes at runtime, if possible"
  msgstr ""
  
- #: tools/gpgconf.c:122
++#: tools/gpgconf.c:127
  #, fuzzy
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
  
- #: tools/gpgconf.c:125
++#: tools/gpgconf.c:130
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
  msgstr ""
  
- #: tools/gpgconf.c:545 tools/gpgconf.c:579
++#: tools/gpgconf.c:552 tools/gpgconf.c:587
  msgid "Need one component argument"
  msgstr ""
  
- #: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
++#: tools/gpgconf.c:561 tools/gpgconf.c:599 tools/gpgconf.c:632
  #, fuzzy
  msgid "Component not found"
  msgstr "nyilvános kulcs nem található"
  
- #: tools/gpgconf.c:650
++#: tools/gpgconf.c:658
  #, fuzzy
  msgid "No argument allowed"
  msgstr "Írom a titkos kulcsot a %s állományba.\n"
diff --cc po/id.po
index 9c24705,dbc4155..62db904
--- a/po/id.po
+++ b/po/id.po
@@@ -10,7 -10,6 +10,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg-id\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-11-18 16:54+0100\n"
++"POT-Creation-Date: 2016-12-20 11:28+0100\n"
  "PO-Revision-Date: 2004-06-17 16:32+0700\n"
  "Last-Translator: Tedi Heriyanto <tedi_h at gmx.net>\n"
  "Language-Team: Indonesian <translation-team-id at lists.sourceforge.net>\n"
@@@ -160,25 -131,11 +160,25 @@@ msgstr "passphrase yang buruk
  msgid "ssh keys greater than %d bits are not supported\n"
  msgstr "algoritma proteksi %d%s tidak didukung\n"
  
 +#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
- #: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1306 g10/keygen.c:4577
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
++#: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't create '%s': %s\n"
  msgstr "tidak dapat membuat %s: %s\n"
  
 +#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
- #: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1307
++#: g10/import.c:305 g10/import.c:448 g10/import.c:621 g10/keygen.c:3681
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
- #: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
- #: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:825 g10/sign.c:1025
++#: g10/sign.c:1130 g10/sign.c:1275 g10/tdbdump.c:143 g10/tdbdump.c:151
++#: g10/tdbio.c:720 g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161
++#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
++#: dirmngr/certcache.c:368 dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1564
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
@@@ -241,11 -187,9 +241,11 @@@ msgstr "Silakan masukkan passphrase; in
  msgid "failed to create stream from socket: %s\n"
  msgstr "%s: gagal membuat hashtable: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1100
++#: agent/divert-scd.c:92 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1101
++#: agent/divert-scd.c:93 g10/call-agent.c:1102
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  
@@@ -388,48 -306,33 +388,48 @@@ msgstr "
  "Pilihan:\n"
  "  "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
  #, fuzzy
  #| msgid "Key is superseded"
  msgid "run in supervised mode"
  msgstr "Kunci dilampaui"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:170 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "detil"
  
 +#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "lebih diam"
  
- #: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
  msgid "csh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
- #: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
++#: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
  #, fuzzy
  msgid "|FILE|read options from FILE"
  msgstr "|FILE|muat modul ekstensi FILE"
  
- #: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:177
  msgid "do not detach from the console"
  msgstr ""
  
@@@ -514,162 -400,120 +514,162 @@@ msgstr "tidak didukung
  #. 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:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:481 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1025 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:358
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:124 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  #, fuzzy
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr "Laporkan bug ke <gnupg-bugs at gnu.org>.\n"
  
- #: agent/gpg-agent.c:491
++#: agent/gpg-agent.c:490
  #, fuzzy
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
  
- #: agent/gpg-agent.c:493
++#: agent/gpg-agent.c:492
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:537 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:442
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:793
++#: agent/gpg-agent.c:1082 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:812
  #, 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"
  
- #: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
- #: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1093 agent/gpg-agent.c:1935 g10/gpg.c:2510
++#: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:817
++#: dirmngr/dirmngr.c:1670 tools/symcryptrun.c:932
  #, fuzzy, c-format
  #| msgid "option file `%s': %s\n"
  msgid "option file '%s': %s\n"
  msgstr "file pilihan `%s': %s\n"
  
- #: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:806
++#: agent/gpg-agent.c:1101 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:825
  #, 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:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
- #: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
++#: agent/gpg-agent.c:1223 g10/gpg.c:3643 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:936 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:527
  #, 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:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
++#: agent/gpg-agent.c:2080 scd/scdaemon.c:1073 dirmngr/dirmngr.c:1081
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
  msgstr "tidak dapat membuat %s: %s\n"
  
- #: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
++#: agent/gpg-agent.c:2097 scd/scdaemon.c:1086 dirmngr/dirmngr.c:1094
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2134
++#: agent/gpg-agent.c:2135
  #, fuzzy
  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:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
++#: agent/gpg-agent.c:2145 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1126
  #, fuzzy
  msgid "error getting nonce for the socket\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
++#: agent/gpg-agent.c:2150 scd/scdaemon.c:1113 dirmngr/dirmngr.c:1129
  #, fuzzy, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "kesalahan mengirim ke `%s': %s\n"
  
- #: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
- #: dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2160 agent/gpg-agent.c:2197 scd/scdaemon.c:1121
++#: dirmngr/dirmngr.c:1138
  #, 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:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:2165 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1143
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
  msgstr "gagal memperbarui: %s\n"
  
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
++#: agent/gpg-agent.c:2172 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1149
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
  msgstr "menulis kunci rahasia ke `%s'\n"
  
- #: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: agent/gpg-agent.c:2191 agent/gpg-agent.c:2234 g10/exec.c:199
 +#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, 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:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: agent/gpg-agent.c:2194 agent/gpg-agent.c:2239 g10/openfile.c:491
 +#: g10/openfile.c:520 sm/keydb.c:103
  #, fuzzy, c-format
  msgid "directory '%s' created\n"
  msgstr "%s: direktori tercipta\n"
  
- #: agent/gpg-agent.c:2244
++#: agent/gpg-agent.c:2245
  #, fuzzy, c-format
  msgid "stat() failed for '%s': %s\n"
  msgstr "trustdb: read failed (n=%d): %s\n"
  
- #: agent/gpg-agent.c:2248
++#: agent/gpg-agent.c:2249
  #, fuzzy, c-format
  msgid "can't use '%s' as home directory\n"
  msgstr "%s: tidak dapat membuat direktori: %s\n"
  
- #: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
++#: agent/gpg-agent.c:2392 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1871
  #, fuzzy, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "kesalahan membaca `%s': %s\n"
  
- #: agent/gpg-agent.c:2598
++#: agent/gpg-agent.c:2599
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2603
++#: agent/gpg-agent.c:2604
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2678
++#: agent/gpg-agent.c:2679
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2683
++#: agent/gpg-agent.c:2684
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
++#: agent/gpg-agent.c:2881 scd/scdaemon.c:1272 dirmngr/dirmngr.c:2075
  #, fuzzy, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "gagal perbarui rahasia: %s\n"
  
- #: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2954 scd/scdaemon.c:1321
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
  msgstr "%s: dilewati: %s\n"
  
- #: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
++#: agent/gpg-agent.c:3092 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  #, fuzzy
  msgid "no gpg-agent running in this session\n"
  msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
@@@ -685,8 -527,6 +685,8 @@@ msgid "
  "Password cache maintenance\n"
  msgstr ""
  
- #: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
++#: agent/protect-tool.c:106 g10/gpg.c:424 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:153 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -694,9 -534,6 +694,9 @@@ msgstr "
  "@Perintah:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
- #: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:92 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:168 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -750,8 -579,6 +750,8 @@@ msgstr "Batal
  msgid "error while asking for the passphrase: %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
- #: tools/gpgconf.c:323
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1472
++#: tools/gpgconf.c:328
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
  msgstr "kesalahan membaca `%s': %s\n"
@@@ -921,9 -719,6 +921,9 @@@ msgstr "algoritma proteksi %d%s tidak d
  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:438
 +#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
- #: dirmngr/ldap-wrapper.c:710
++#: dirmngr/ldap-wrapper.c:711
  #, fuzzy, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
@@@ -935,8 -727,6 +935,8 @@@
  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:848 dirmngr/dirmngr.c:1155
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1167
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
  msgstr "kesalahan membaca `%s': %s\n"
@@@ -983,27 -764,22 +983,27 @@@ msgstr "tidak dapat terkoneksi ke `%s'
  msgid "problem setting the gpg-agent options\n"
  msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
  
- #: common/sysutils.c:144
++#: common/sysutils.c:148
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "tidak dapat meniadakan core dump: %s\n"
  
- #: common/sysutils.c:239
++#: common/sysutils.c:250
  #, fuzzy, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
  
- #: common/sysutils.c:271
++#: common/sysutils.c:282
  #, fuzzy, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
  
- #: common/sysutils.c:659
++#: common/sysutils.c:693
  #, fuzzy, c-format
  msgid "waiting for file '%s' to become accessible ...\n"
  msgstr "gagal memperbarui: %s\n"
  
- #: common/sysutils.c:685
++#: common/sysutils.c:719
  #, fuzzy, c-format
  msgid "renaming '%s' to '%s' failed: %s\n"
  msgstr "gagal enarmoring: %s\n"
@@@ -1079,7 -840,6 +1079,7 @@@ msgstr "
  msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
  msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
  
- #: common/miscellaneous.c:554
++#: common/miscellaneous.c:556
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
@@@ -1194,8 -931,6 +1194,8 @@@ msgstr "%s: keyring tercipta\n
  msgid "algorithm: %s"
  msgstr "armor: %s\n"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3098
++#: scd/app-openpgp.c:3111
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
@@@ -1407,7 -1100,6 +1407,7 @@@ msgstr "
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr ""
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1173
++#: common/argparse.c:401 dirmngr/dirmngr.c:1185
  #, fuzzy
  msgid "out of core\n"
  msgstr "tidak diproses"
@@@ -1466,8 -1147,6 +1466,8 @@@ msgstr "kunci publik %08lX tidak ditemu
  msgid "waiting for lock %s...\n"
  msgstr "menulis kunci rahasia ke `%s'\n"
  
- #: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
- #: dirmngr/dirmngr.c:715
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:725
++#: dirmngr/dirmngr.c:734
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
@@@ -1507,7 -1178,6 +1507,7 @@@ msgstr "armor tidak terduga:
  msgid "invalid dash escaped line: "
  msgstr "dash escaped line tidak valid: "
  
- #: g10/armor.c:873 g10/armor.c:1490
++#: g10/armor.c:873 g10/armor.c:1493
  #, fuzzy, c-format
  msgid "invalid radix64 character %02X skipped\n"
  msgstr "karakter radix64 tidak valid %02x dilewati\n"
@@@ -1524,7 -1191,6 +1524,7 @@@ msgstr "eof prematur (dalam CRC)\n
  msgid "malformed CRC\n"
  msgstr "CRC tidak tepat\n"
  
- #: g10/armor.c:962 g10/armor.c:1527
++#: g10/armor.c:962 g10/armor.c:1530
  #, fuzzy, c-format
  msgid "CRC error; %06lX - %06lX\n"
  msgstr "kesalahan CRC; %06lx - %06lx\n"
@@@ -1538,16 -1202,13 +1538,16 @@@ msgstr "eof prematur (dalam Trailer)\n
  msgid "error in trailer line\n"
  msgstr "kesalahan dalam garis trailer\n"
  
- #: g10/armor.c:1303
++#: g10/armor.c:1306
  msgid "no valid OpenPGP data found.\n"
  msgstr "tidak ditemukan data OpenPGP yang valid.\n"
  
- #: g10/armor.c:1308
++#: g10/armor.c:1311
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
  msgstr "armor tidak valid: baris melebihi %d karakter\n"
  
- #: g10/armor.c:1312
++#: g10/armor.c:1315
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr ""
@@@ -1636,8 -1282,6 +1636,8 @@@ msgstr "kunci rahasia tidak tersedia
  msgid "OpenPGP card no. %s detected\n"
  msgstr ""
  
- #: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
- #: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2030
++#: g10/keygen.c:4087 g10/revoke.c:215 g10/revoke.c:618
  #, fuzzy
  msgid "can't do this in batch mode\n"
  msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
@@@ -1647,15 -1290,10 +1647,15 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2454
++#: g10/card-util.c:109 scd/app-openpgp.c:2467
  #, fuzzy
  msgid "Reset Code not or not anymore available\n"
  msgstr "bagian kunci rahasia tidak tersedia\n"
  
 +#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
- #: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
- #: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1768
++#: g10/keygen.c:1945 g10/keygen.c:2313 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "Pilihan anda? "
  
@@@ -1722,10 -1346,6 +1722,10 @@@ msgstr "tidak ada kunci publik yang ses
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
- #: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:334
++#: g10/import.c:592 g10/import.c:640 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
++#: dirmngr/dirmngr.c:1510 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
@@@ -1799,7 -1404,6 +1799,7 @@@ msgstr "Pembuatan kunci gagal: %s\n
  msgid "not an OpenPGP card"
  msgstr "tidak ditemukan data OpenPGP yang valid.\n"
  
- #: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
++#: g10/card-util.c:1173 g10/keygen.c:4106 g10/keygen.c:5092
  #, fuzzy, c-format
  msgid "error getting current key info: %s\n"
  msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
@@@ -1830,13 -1429,10 +1830,13 @@@ msgstr "Keysize yang anda inginkan? (10
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "Keysize yang anda inginkan? (1024) "
  
- #: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
++#: g10/card-util.c:1316 g10/keygen.c:2122 g10/keygen.c:2154
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "dibulatkan hingga %u bit\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2207 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr ""
@@@ -1891,9 -1477,6 +1891,9 @@@ msgstr "  (%d) RSA (hanya enkripsi)\n
  msgid "   (3) Authentication key\n"
  msgstr ""
  
- #: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
- #: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
- #: g10/keygen.c:2314 g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1508
++#: g10/keygen.c:1794 g10/keygen.c:1822 g10/keygen.c:1952 g10/keygen.c:2060
++#: g10/keygen.c:2336 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Pilihan tidak valid.\n"
  
@@@ -1927,7 -1504,6 +1927,7 @@@ msgstr "Ditandai? 
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1816 g10/keyedit.c:1867
++#: g10/card-util.c:1816 g10/keyedit.c:1868
  msgid "quit this menu"
  msgstr "berhenti dari menu ini"
  
@@@ -1936,7 -1511,6 +1936,7 @@@
  msgid "show admin commands"
  msgstr "perintah saling konflik\n"
  
- #: g10/card-util.c:1819 g10/keyedit.c:1870
++#: g10/card-util.c:1819 g10/keyedit.c:1871
  msgid "show this help"
  msgstr "tampilkan bantuan"
  
@@@ -2020,31 -1576,21 +2020,31 @@@ msgstr "perintah saling konflik\n
  msgid "Admin commands are not allowed\n"
  msgstr "menulis kunci rahasia ke `%s'\n"
  
- #: g10/card-util.c:2127 g10/keyedit.c:2816
++#: g10/card-util.c:2127 g10/keyedit.c:2817
  msgid "Invalid command  (try \"help\")\n"
  msgstr "Perintah tidak valid (coba \"help\")\n"
  
- #: g10/decrypt.c:191 g10/encrypt.c:955
++#: g10/decrypt.c:190 g10/encrypt.c:955
  msgid "--output doesn't work for this command\n"
  msgstr "--output tidak berfungsi untuk perintah ini\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4904 g10/keyring.c:398 g10/keyring.c:771
  #, fuzzy, c-format
  #| msgid "can't open `%s'\n"
  msgid "can't open '%s'\n"
  msgstr "tidak dapat membuka `%s'\n"
  
 +#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
- #: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
- #: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4858 g10/keyedit.c:2051
++#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2163
  #, fuzzy, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "kunci '%s' tidak ditemukan: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
- #: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
- #: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4866 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:645 g10/tofu.c:2171
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "gagal membaca keyblock: %s\n"
@@@ -2106,7 -1640,6 +2106,7 @@@ msgstr "terdapat kunci rahasia untuk ku
  msgid "use option \"--delete-secret-keys\" to delete it first.\n"
  msgstr "gunakan pilihan \"--delete-secret-key\" untuk menghapusnya.\n"
  
- #: g10/encrypt.c:232 g10/sign.c:1292
++#: g10/encrypt.c:232 g10/sign.c:1294
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
@@@ -2126,7 -1656,6 +2126,7 @@@ msgstr "menggunakan cipher %s\n
  msgid "'%s' already compressed\n"
  msgstr "`%s' sudah dikompresi\n"
  
- #: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:610
  #, fuzzy, c-format
  #| msgid "WARNING: `%s' is an empty file\n"
  msgid "WARNING: '%s' is an empty file\n"
@@@ -2144,7 -1671,6 +2144,7 @@@ msgid "
  "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
  msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
  
- #: g10/encrypt.c:707 g10/sign.c:984
++#: g10/encrypt.c:707 g10/sign.c:986
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2176,7 -1697,6 +2176,7 @@@ msgstr "%s data terenkripsi\n
  msgid "encrypted with unknown algorithm %d\n"
  msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
  
- #: g10/decrypt-data.c:164 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:129
  msgid ""
  "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
  msgstr ""
@@@ -2274,8 -1776,6 +2274,8 @@@ msgstr "
  msgid " - skipped"
  msgstr "%s: dilewati: %s\n"
  
- #: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:845 g10/sign.c:1148
++#: g10/export.c:1251 g10/import.c:1543 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:847 g10/sign.c:1150
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
@@@ -2300,8 -1796,6 +2300,8 @@@ msgstr "kunci %08lX: kunci gaya PGP 2.
  msgid "WARNING: nothing exported\n"
  msgstr "PERINGATAN: tidak ada yang diekspor\n"
  
- #: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
- #: g10/plaintext.c:151 g10/plaintext.c:174
++#: g10/export.c:2283 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/plaintext.c:167 g10/plaintext.c:190
  #, fuzzy, c-format
  #| msgid "error creating `%s': %s\n"
  msgid "error creating '%s': %s\n"
@@@ -2349,8 -1834,6 +2349,8 @@@ msgstr "kesalahan penciptaan : `%s': %s
  msgid "No fingerprint"
  msgstr "tampilkan fingerprint"
  
- #: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
- #: g10/revoke.c:701
++#: g10/getkey.c:1873 g10/keyedit.c:2929 g10/keyedit.c:3016 g10/revoke.c:637
++#: g10/revoke.c:702
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "kunci rahasia `%s' tidak ditemukan: %s\n"
@@@ -2382,218 -1860,174 +2382,224 @@@ msgstr "kunci tidak valid %08lX dibuat 
  msgid "using subkey %s instead of primary key %s\n"
  msgstr "menggunakan kunci sekunder %08lX bukannya kunci primer %08lX\n"
  
- #: g10/gpg.c:424 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:200
  #, fuzzy
  msgid "make a signature"
  msgstr "buat detached signature"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:427
  #, fuzzy
  msgid "make a clear text signature"
  msgstr "|[file]|buat signature teks"
  
- #: g10/gpg.c:426 sm/gpgsm.c:202
++#: g10/gpg.c:429 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "buat detached signature"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:430 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "enkripsi data"
  
- #: g10/gpg.c:429
++#: g10/gpg.c:432
  msgid "encryption only with symmetric cipher"
  msgstr "enkripsi hanya dengan symmetric cipher"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:434 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "dekripsi data (default)"
  
- #: g10/gpg.c:433 sm/gpgsm.c:206
++#: g10/gpg.c:436 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "verifikasi signature"
  
- #: g10/gpg.c:435 sm/gpgsm.c:207
++#: g10/gpg.c:438 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "tampilkan kunci"
  
- #: g10/gpg.c:437
++#: g10/gpg.c:440
  msgid "list keys and signatures"
  msgstr "tampilkan kunci dan signature"
  
- #: g10/gpg.c:438
++#: g10/gpg.c:443
  #, fuzzy
  msgid "list and check key signatures"
  msgstr "periksa signature kunci"
  
- #: g10/gpg.c:439 sm/gpgsm.c:212
++#: g10/gpg.c:445 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "tampilkan kunci dan fingerprint"
  
- #: g10/gpg.c:440 sm/gpgsm.c:210
++#: g10/gpg.c:446 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "tampilkan kunci rahasia"
  
- #: g10/gpg.c:442 sm/gpgsm.c:213
++#: g10/gpg.c:448 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "buat sepasang kunci baru"
  
- #: g10/gpg.c:444
++#: g10/gpg.c:451
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly generate a new key pair"
  msgstr "buat sepasang kunci baru"
  
- #: g10/gpg.c:446
++#: g10/gpg.c:454
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly add a new user-id"
  msgstr "buat sepasang kunci baru"
  
- #: g10/gpg.c:449
++#: g10/gpg.c:459
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly revoke a user-id"
  msgstr "buat sepasang kunci baru"
  
- #: g10/gpg.c:451
++#: g10/gpg.c:462
+ #, fuzzy
+ #| msgid "generate a new key pair"
+ msgid "quickly set a new expiration date"
+ msgstr "buat sepasang kunci baru"
+ 
++#: g10/gpg.c:464
  msgid "full featured key pair generation"
  msgstr ""
  
- #: g10/gpg.c:452
++#: g10/gpg.c:467
  msgid "generate a revocation certificate"
  msgstr "buat sertifikat revokasi"
  
- #: g10/gpg.c:454 sm/gpgsm.c:215
++#: g10/gpg.c:470 sm/gpgsm.c:216
  msgid "remove keys from the public keyring"
  msgstr "hapus kunci dari keyring publik"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:472
  msgid "remove keys from the secret keyring"
  msgstr "hapus kunci dari keyring pribadi"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:474
  #, fuzzy
  #| msgid "sign a key"
  msgid "quickly sign a key"
  msgstr "tandai kunci"
  
- #: g10/gpg.c:460
++#: g10/gpg.c:476
  #, fuzzy
  #| msgid "sign a key locally"
  msgid "quickly sign a key locally"
  msgstr "tandai kunci secara lokal"
  
- #: g10/gpg.c:461
++#: g10/gpg.c:477
  msgid "sign a key"
  msgstr "tandai kunci"
  
- #: g10/gpg.c:462
++#: g10/gpg.c:478
  msgid "sign a key locally"
  msgstr "tandai kunci secara lokal"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:479
  msgid "sign or edit a key"
  msgstr "tandai atau edit kunci"
  
- #: g10/gpg.c:465 sm/gpgsm.c:233
++#: g10/gpg.c:481 sm/gpgsm.c:234
  #, fuzzy
  msgid "change a passphrase"
  msgstr "ubah passphrase"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:485
  msgid "export keys"
  msgstr "ekspor kunci"
  
- #: g10/gpg.c:468
++#: g10/gpg.c:486
  msgid "export keys to a keyserver"
  msgstr "ekspor kunci ke keyserver"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:487
  msgid "import keys from a keyserver"
  msgstr "impor kunci dari keyserver"
  
- #: g10/gpg.c:471
++#: g10/gpg.c:490
  msgid "search for keys on a keyserver"
  msgstr "cari kunci di keyserver"
  
- #: g10/gpg.c:473
++#: g10/gpg.c:492
  msgid "update all keys from a keyserver"
  msgstr "update semua kunci dari keyserver"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:498
  msgid "import/merge keys"
  msgstr "impor/gabung kunci"
  
- #: g10/gpg.c:482
++#: g10/gpg.c:501
  msgid "print the card status"
  msgstr ""
  
- #: g10/gpg.c:483
++#: g10/gpg.c:502
  msgid "change data on a card"
  msgstr ""
  
- #: g10/gpg.c:484
++#: g10/gpg.c:504
  msgid "change a card's PIN"
  msgstr ""
  
- #: g10/gpg.c:496
++#: g10/gpg.c:516
  msgid "update the trust database"
  msgstr "perbarui database trust"
  
- #: g10/gpg.c:505
++#: g10/gpg.c:525
  #, fuzzy
  msgid "print message digests"
  msgstr "|algo [file]|cetak digest pesan"
  
- #: g10/gpg.c:508 sm/gpgsm.c:228
++#: g10/gpg.c:528 sm/gpgsm.c:229
  msgid "run in server mode"
  msgstr ""
  
- #: g10/gpg.c:510
++#: g10/gpg.c:530
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:514 sm/gpgsm.c:246
++#: g10/gpg.c:534 sm/gpgsm.c:248
  msgid "create ascii armored output"
  msgstr "ciptakan output ascii"
  
- #: g10/gpg.c:517 sm/gpgsm.c:262
++#: g10/gpg.c:537 sm/gpgsm.c:264
  #, fuzzy
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|NAMA|enkripsi untuk NAMA"
  
- #: g10/gpg.c:533 sm/gpgsm.c:298
++#: g10/gpg.c:553 sm/gpgsm.c:300
  #, fuzzy
  msgid "|USER-ID|use USER-ID to sign or decrypt"
  msgstr "gunakan id-user ini untuk menandai/dekripsi"
  
- #: g10/gpg.c:539
++#: g10/gpg.c:559
  #, fuzzy
  msgid "|N|set compress level to N (0 disables)"
  msgstr "|N|set tingkat kompresi N (0 tidak ada)"
  
- #: g10/gpg.c:546
++#: g10/gpg.c:566
  msgid "use canonical text mode"
  msgstr "gunakan mode teks kanonikal"
  
- #: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
++#: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
  #, fuzzy
  msgid "|FILE|write output to FILE"
  msgstr "|FILE|muat modul ekstensi FILE"
  
- #: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
++#: g10/gpg.c:598 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
  msgid "do not make any changes"
  msgstr "jangan buat perubahan"
  
- #: g10/gpg.c:579
++#: g10/gpg.c:599
  msgid "prompt before overwriting"
  msgstr "tanya sebelum menimpa"
  
- #: g10/gpg.c:628
++#: g10/gpg.c:648
  msgid "use strict OpenPGP behavior"
  msgstr ""
  
- #: g10/gpg.c:654 sm/gpgsm.c:355
++#: g10/gpg.c:674 sm/gpgsm.c:357
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2601,7 -2035,16 +2607,17 @@@ msgstr "
  "@\n"
  "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
  
- #: g10/gpg.c:657 sm/gpgsm.c:358
++#: g10/gpg.c:677
+ #, fuzzy
+ #| msgid ""
+ #| "@\n"
+ #| "Examples:\n"
+ #| "\n"
+ #| " -se -r Bob [file]          sign and encrypt for user Bob\n"
+ #| " --clear-sign [file]         make a clear text signature\n"
+ #| " --detach-sign [file]       make a detached signature\n"
+ #| " --list-keys [names]        show keys\n"
+ #| " --fingerprint [names]      show fingerprints\n"
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2621,13 -2064,11 +2637,13 @@@ msgstr "
  " --list-keys [nama]      tampilkan kunci\n"
  " --fingerprint [nama]    tampilkan fingerprint\n"
  
- #: g10/gpg.c:1026
++#: g10/gpg.c:1047
  #, 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:1029
++#: g10/gpg.c:1050
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg [options] [files]\n"
@@@ -2642,7 -2083,6 +2658,7 @@@ msgstr "
  "tandai, cek, enkripsi atau dekripsi\n"
  "operasi baku tergantung pada data input\n"
  
- #: g10/gpg.c:1040 sm/gpgsm.c:588
++#: g10/gpg.c:1061 sm/gpgsm.c:580
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2650,609 -2090,431 +2666,546 @@@ msgstr "
  "\n"
  "Algoritma yang didukung:\n"
  
- #: g10/gpg.c:1043
++#: g10/gpg.c:1064
  msgid "Pubkey: "
  msgstr "Pubkey: "
  
- #: g10/gpg.c:1050 g10/keyedit.c:3402
++#: g10/gpg.c:1071 g10/keyedit.c:3483
  msgid "Cipher: "
  msgstr "Cipher: "
  
- #: g10/gpg.c:1057
++#: g10/gpg.c:1078
  msgid "Hash: "
  msgstr "Hash: "
  
- #: g10/gpg.c:1064 g10/keyedit.c:3451
++#: g10/gpg.c:1085 g10/keyedit.c:3532
  msgid "Compression: "
  msgstr "Kompresi: "
  
- #: g10/gpg.c:1133 sm/gpgsm.c:662
++#: g10/gpg.c:1154 sm/gpgsm.c:654
  #, fuzzy, c-format
  msgid "usage: %s [options] %s\n"
  msgstr "pemakaian: gpg [pilihan] "
  
- #: g10/gpg.c:1321 sm/gpgsm.c:751
++#: g10/gpg.c:1342 sm/gpgsm.c:743
  msgid "conflicting commands\n"
  msgstr "perintah saling konflik\n"
  
- #: g10/gpg.c:1339
++#: g10/gpg.c:1360
  #, fuzzy, c-format
  msgid "no = sign found in group definition '%s'\n"
  msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n"
  
- #: g10/gpg.c:1537
++#: g10/gpg.c:1558
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
  
- #: g10/gpg.c:1540
++#: g10/gpg.c:1561
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
  msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
  
- #: g10/gpg.c:1543
++#: g10/gpg.c:1564
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on extension '%s'\n"
  msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
  
- #: g10/gpg.c:1549
++#: g10/gpg.c:1570
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
  msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
  
- #: g10/gpg.c:1552
++#: g10/gpg.c:1573
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
  msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
  
- #: g10/gpg.c:1555
++#: g10/gpg.c:1576
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on extension '%s'\n"
  msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
  
- #: g10/gpg.c:1561
++#: g10/gpg.c:1582
  #, 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:1564
++#: g10/gpg.c:1585
  #, 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:1567
++#: g10/gpg.c:1588
  #, 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:1573
++#: g10/gpg.c:1594
  #, 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:1576
++#: g10/gpg.c:1597
  #, 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:1579
++#: g10/gpg.c:1600
  #, 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:1786
++#: g10/gpg.c:1816
  #, fuzzy, c-format
  msgid "unknown configuration item '%s'\n"
  msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1925
  msgid "display photo IDs during key listings"
  msgstr ""
  
- #: g10/gpg.c:1895
++#: g10/gpg.c:1927
  #, fuzzy
  msgid "show key usage information during key listings"
  msgstr "Tidak ada signature koresponden di ring rahasia\n"
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1929
  msgid "show policy URLs during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1931
  #, fuzzy
  msgid "show all notations during signature listings"
  msgstr "Tidak ada signature koresponden di ring rahasia\n"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1933
  msgid "show IETF standard notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1937
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1939
  #, fuzzy
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "URL signature kebijakan yang diberikan tidak valid\n"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1941
  msgid "show user ID validity during key listings"
  msgstr ""
  
- #: g10/gpg.c:1911
++#: g10/gpg.c:1943
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  
- #: g10/gpg.c:1913
++#: g10/gpg.c:1945
  msgid "show revoked and expired subkeys in key listings"
  msgstr ""
  
- #: g10/gpg.c:1915
++#: g10/gpg.c:1947
  #, fuzzy
  msgid "show the keyring name in key listings"
  msgstr "tampilkan keyring tempat kunci yang dipilih berada"
  
- #: g10/gpg.c:1917
++#: g10/gpg.c:1949
  #, fuzzy
  msgid "show expiration dates during signature listings"
  msgstr "Tidak ada signature koresponden di ring rahasia\n"
  
- #: g10/gpg.c:2019 g10/gpg.c:2056
++#: g10/gpg.c:2051 g10/gpg.c:2088
  #, fuzzy, c-format
  msgid "valid values for option '%s':\n"
  msgstr "opsi impor tidak valid\n"
  
- #: g10/gpg.c:2030
++#: g10/gpg.c:2062
  #, fuzzy, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "penerima baku tidak dikenal `%s'\n"
  
- #: g10/gpg.c:2032 g10/gpg.c:2068
++#: g10/gpg.c:2064 g10/gpg.c:2100
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2066
++#: g10/gpg.c:2098 g10/keygen.c:167
  #, fuzzy, c-format
  msgid "invalid value for option '%s'\n"
  msgstr "opsi impor tidak valid\n"
  
- #: g10/gpg.c:2203
++#: g10/gpg.c:2235
  #, fuzzy, c-format
  #| msgid "NOTE: old default options file `%s' ignored\n"
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n"
  
- #: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
++#: g10/gpg.c:2839 g10/gpg.c:3610 g10/gpg.c:3622
  #, 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:2978 g10/gpg.c:2990
++#: g10/gpg.c:3011 g10/gpg.c:3023
  #, fuzzy, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "%s bukanlah set karakter yang valid\n"
  
- #: g10/gpg.c:3012
++#: g10/gpg.c:3045
  #, fuzzy, c-format
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "Bukan alamat email yang valid\n"
  
- #: g10/gpg.c:3044 sm/gpgsm.c:1166
++#: g10/gpg.c:3077 sm/gpgsm.c:1158
  #, fuzzy, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "algoritma hash tidak valid `%s'\n"
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3130
  #, fuzzy, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "%s bukanlah set karakter yang valid\n"
  
- #: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
++#: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
  #, fuzzy
  msgid "could not parse keyserver URL\n"
  msgstr "tidak dapat memparsing URI keyserver\n"
  
- #: g10/gpg.c:3137
++#: g10/gpg.c:3170
  #, fuzzy, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: opsi ekspor tidak valid\n"
  
- #: g10/gpg.c:3140
++#: g10/gpg.c:3173
  #, fuzzy
  msgid "invalid keyserver options\n"
  msgstr "opsi ekspor tidak valid\n"
  
- #: g10/gpg.c:3147
++#: g10/gpg.c:3180
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: opsi impor tidak valid\n"
  
- #: g10/gpg.c:3150
++#: g10/gpg.c:3183
  msgid "invalid import options\n"
  msgstr "opsi impor tidak valid\n"
  
- #: g10/gpg.c:3156 g10/gpg.c:3171
++#: g10/gpg.c:3189 g10/gpg.c:3204
  #, fuzzy, c-format
  msgid "invalid filter option: %s\n"
  msgstr "opsi impor tidak valid\n"
  
- #: g10/gpg.c:3162
++#: g10/gpg.c:3195
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: opsi ekspor tidak valid\n"
  
- #: g10/gpg.c:3165
++#: g10/gpg.c:3198
  msgid "invalid export options\n"
  msgstr "opsi ekspor tidak valid\n"
  
- #: g10/gpg.c:3177
++#: g10/gpg.c:3210
  #, fuzzy, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: opsi impor tidak valid\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3213
  #, fuzzy
  msgid "invalid list options\n"
  msgstr "opsi impor tidak valid\n"
  
- #: g10/gpg.c:3188
++#: g10/gpg.c:3221
  msgid "display photo IDs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3190
++#: g10/gpg.c:3223
  msgid "show policy URLs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3192
++#: g10/gpg.c:3225
  #, fuzzy
  msgid "show all notations during signature verification"
  msgstr "%s bukanlah set karakter yang valid\n"
  
- #: g10/gpg.c:3194
++#: g10/gpg.c:3227
  msgid "show IETF standard notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3231
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3200
++#: g10/gpg.c:3233
  #, fuzzy
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "URL signature kebijakan yang diberikan tidak valid\n"
  
- #: g10/gpg.c:3202
++#: g10/gpg.c:3235
  #, fuzzy
  msgid "show user ID validity during signature verification"
  msgstr "%s bukanlah set karakter yang valid\n"
  
- #: g10/gpg.c:3204
++#: g10/gpg.c:3237
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  
- #: g10/gpg.c:3206
++#: g10/gpg.c:3239
  #, fuzzy
  msgid "show only the primary user ID in signature verification"
  msgstr "%s bukanlah set karakter yang valid\n"
  
- #: g10/gpg.c:3208
++#: g10/gpg.c:3241
  msgid "validate signatures with PKA data"
  msgstr ""
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3243
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr ""
  
- #: g10/gpg.c:3217
++#: g10/gpg.c:3250
  #, fuzzy, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: opsi ekspor tidak valid\n"
  
- #: g10/gpg.c:3220
++#: g10/gpg.c:3253
  #, fuzzy
  msgid "invalid verify options\n"
  msgstr "opsi ekspor tidak valid\n"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3260
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "tidak dapat menset path exec ke %s\n"
  
- #: g10/gpg.c:3417
++#: g10/gpg.c:3452
  #, fuzzy, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: opsi ekspor tidak valid\n"
  
- #: g10/gpg.c:3420
++#: g10/gpg.c:3455
  msgid "invalid auto-key-locate list\n"
  msgstr ""
  
- #: g10/gpg.c:3553 sm/gpgsm.c:1507
++#: g10/gpg.c:3592 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
  msgstr "PERINGATAN: program mungkin membuat file core!\n"
  
- #: g10/gpg.c:3564
++#: g10/gpg.c:3603
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "PERINGATAN: %s menimpa %s\n"
  
- #: g10/gpg.c:3573
++#: g10/gpg.c:3612
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s tidak dibolehkan dengan %s!\n"
  
- #: g10/gpg.c:3576
++#: g10/gpg.c:3615
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s tidak masuk akal dengan %s!\n"
  
- #: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
++#: g10/gpg.c:3630 sm/gpgsm.c:1518 dirmngr/dirmngr.c:951
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3651
  #, fuzzy, c-format
  msgid "will not run with insecure memory due to %s\n"
  msgstr "menulis kunci rahasia ke `%s'\n"
  
- #: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
++#: g10/gpg.c:3686 g10/gpg.c:3710 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "algoritma cipher yang dipilih tidak valid\n"
  
- #: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
++#: g10/gpg.c:3692 g10/gpg.c:3716 sm/gpgsm.c:1591 sm/gpgsm.c:1597
  msgid "selected digest algorithm is invalid\n"
  msgstr "algoritma digest yang dipilih tidak valid\n"
  
- #: g10/gpg.c:3659
++#: g10/gpg.c:3698
  #, fuzzy
  msgid "selected compression algorithm is invalid\n"
  msgstr "algoritma cipher yang dipilih tidak valid\n"
  
- #: g10/gpg.c:3665
++#: g10/gpg.c:3704
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
  
- #: g10/gpg.c:3680
++#: g10/gpg.c:3719
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed harus lebih dari 0\n"
  
- #: g10/gpg.c:3682
++#: g10/gpg.c:3721
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed harus lebih dari 1\n"
  
- #: g10/gpg.c:3684
++#: g10/gpg.c:3723
  #, fuzzy
  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:3686
++#: g10/gpg.c:3725
  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:3688
++#: g10/gpg.c:3727
  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:3691
++#: g10/gpg.c:3730
  #, fuzzy
  #| 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:3695
++#: g10/gpg.c:3734
  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:3702
++#: g10/gpg.c:3741
  msgid "invalid default preferences\n"
  msgstr "preferensi baku tidak valid\n"
  
- #: g10/gpg.c:3706
++#: g10/gpg.c:3745
  msgid "invalid personal cipher preferences\n"
  msgstr "preferensi cipher personal tidak valid\n"
  
- #: g10/gpg.c:3710
++#: g10/gpg.c:3749
  msgid "invalid personal digest preferences\n"
  msgstr "preferensi digest personal tidak valid\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3753
  msgid "invalid personal compress preferences\n"
  msgstr "preferensi kompresi personal tidak valid\n"
  
- #: g10/gpg.c:3750
++#: g10/gpg.c:3789
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s belum dapat dipakai dengan %s\n"
  
- #: g10/gpg.c:3797
++#: g10/gpg.c:3836
  #, fuzzy, c-format
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr ""
  "anda tidak boleh menggunakan algoritma cipher \"%s\" saat dalam mode %s.\n"
  
- #: g10/gpg.c:3802
++#: g10/gpg.c:3841
  #, fuzzy, c-format
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr ""
  "anda tidak boleh menggunakan algoritma digest \"%s\" saat dalam mode %s.\n"
  
- #: g10/gpg.c:3807
++#: g10/gpg.c:3846
  #, fuzzy, c-format
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr ""
  "anda tidak boleh menggunakan algoritma kompresi \"%s\" saat dalam mode %s.\n"
  
- #: g10/gpg.c:3906
++#: g10/gpg.c:3945
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "gagal inisialisasi TrustDB: %s\n"
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:3957
  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:3975
- msgid "--store [filename]"
- msgstr "--store [namafile]"
- 
- #: g10/gpg.c:3985
- msgid "--symmetric [filename]"
- msgstr "--symmetric [namafile]"
- 
- #: g10/gpg.c:3989
++#: g10/gpg.c:4028
  #, fuzzy, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "dekripsi gagal: %s\n"
  
- #: g10/gpg.c:4000
- msgid "--encrypt [filename]"
- msgstr "--encrypt [namafile]"
- 
- #: g10/gpg.c:4016
- #, fuzzy
- msgid "--symmetric --encrypt [filename]"
- msgstr "--sign --encrypt [namafile]"
- 
- #: g10/gpg.c:4018
++#: g10/gpg.c:4057
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4021
++#: g10/gpg.c:4060
  #, fuzzy, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
  
- #: g10/gpg.c:4042
- msgid "--sign [filename]"
- msgstr "--sign [namafile]"
- 
- #: g10/gpg.c:4058
- msgid "--sign --encrypt [filename]"
- msgstr "--sign --encrypt [namafile]"
- 
- #: g10/gpg.c:4076
- #, fuzzy
- msgid "--symmetric --sign --encrypt [filename]"
- msgstr "--sign --encrypt [namafile]"
- 
- #: g10/gpg.c:4078
++#: g10/gpg.c:4117
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4081
++#: g10/gpg.c:4120
  #, fuzzy, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
  
- #: g10/gpg.c:4105
- msgid "--sign --symmetric [filename]"
- msgstr "--sign --symmetric [namafile]"
- 
- #: g10/gpg.c:4117
- msgid "--clearsign [filename]"
- msgstr "--clearsign [namafile]"
- 
- #: g10/gpg.c:4147
- msgid "--decrypt [filename]"
- msgstr "--decrypt [namafile]"
- 
- #: g10/gpg.c:4174
- msgid "--sign-key user-id"
- msgstr "--sign-key id-user"
- 
- #: g10/gpg.c:4178
- msgid "--lsign-key user-id"
- msgstr "--lsign-key id-user"
- 
- #: g10/gpg.c:4199
- msgid "--edit-key user-id [commands]"
- msgstr "--edit-key id-user [perintah]"
- 
- #: g10/gpg.c:4215
- #, fuzzy
- msgid "--passwd <user-id>"
- msgstr "--sign-key id-user"
- 
- #: g10/gpg.c:4411 g10/keyserver.c:1837
++#: g10/gpg.c:4462 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "Pengiriman keyserver gagal: %s\n"
  
- #: g10/gpg.c:4416
++#: g10/gpg.c:4467
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "Penerimaan keyserver gagal: %s\n"
  
- #: g10/gpg.c:4422
++#: g10/gpg.c:4473
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "Ekspor kunci gagal: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4486
  #, 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:4447
++#: g10/gpg.c:4498
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "Pencarian keyserver gagal: %s\n"
  
- #: g10/gpg.c:4460
++#: g10/gpg.c:4511
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "Refresh keyserver gagal: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4578
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "gagal dearmoring: %s\n"
  
- #: g10/gpg.c:4538
++#: g10/gpg.c:4589
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "gagal enarmoring: %s\n"
  
- #: g10/gpg.c:4630
++#: g10/gpg.c:4681
  #, 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:4776 g10/tofu.c:2002
++#: g10/gpg.c:4827 g10/tofu.c:2151
  #, fuzzy, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: g10/gpg.c:4788
++#: g10/gpg.c:4839
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4835
- msgid "[filename]"
- msgstr "[namafile]"
- 
- #: g10/gpg.c:4841
++#: g10/gpg.c:4894
  msgid "Go ahead and type your message ...\n"
  msgstr "Teruskan dan ketikkan pesan anda ....\n"
  
- #: g10/gpg.c:5179
++#: g10/gpg.c:5232
  msgid "the given certification policy URL is invalid\n"
  msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
  
- #: g10/gpg.c:5181
++#: g10/gpg.c:5234
  msgid "the given signature policy URL is invalid\n"
  msgstr "URL signature kebijakan yang diberikan tidak valid\n"
  
- #: g10/gpg.c:5214
++#: g10/gpg.c:5267
  #, fuzzy
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "URL signature kebijakan yang diberikan tidak valid\n"
@@@ -3266,7 -2526,6 +3219,7 @@@ msgstr "mengambil kunci ini dari keyrin
  msgid "make timestamp conflicts only a warning"
  msgstr "buat timestamp konflik hanya sebagai peringatan"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:345
++#: g10/gpgv.c:82 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|tulis info status ke FD ini"
  
@@@ -3297,328 -2551,262 +3250,328 @@@ msgstr "Tidak tersedia bantuan
  msgid "No help available for '%s'"
  msgstr "Tidak tersedia bantuan untuk `%s'"
  
- #: g10/import.c:151
++#: g10/import.c:152
  msgid "import signatures that are marked as local-only"
  msgstr ""
  
- #: g10/import.c:154
++#: g10/import.c:155
  msgid "repair damage from the pks keyserver during import"
  msgstr ""
  
- #: g10/import.c:157
++#: g10/import.c:158
  #, fuzzy
  msgid "do not clear the ownertrust values during import"
  msgstr "perbarui database trust"
  
- #: g10/import.c:160
++#: g10/import.c:161
  #, fuzzy
  msgid "do not update the trustdb after import"
  msgstr "perbarui database trust"
  
- #: g10/import.c:163
++#: g10/import.c:164
  #, fuzzy
  msgid "show key during import"
  msgstr "tampilkan fingerprint"
  
- #: g10/import.c:166
++#: g10/import.c:167
  msgid "only accept updates to existing keys"
  msgstr ""
  
- #: g10/import.c:169
++#: g10/import.c:170
  #, fuzzy
  msgid "remove unusable parts from key after import"
  msgstr "kunci rahasia tidak dapat dipakai"
  
- #: g10/import.c:172
++#: g10/import.c:173
  msgid "remove as much as possible from key after import"
  msgstr ""
  
- #: g10/import.c:175
++#: g10/import.c:176
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:326 g10/import.c:568
++#: g10/import.c:327 g10/import.c:569
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "melewati blok tipe %d\n"
  
- #: g10/import.c:585
++#: g10/import.c:586
  #, fuzzy, c-format
  msgid "%lu keys processed so far\n"
  msgstr "%lu kunci telah diproses\n"
  
- #: g10/import.c:655
++#: g10/import.c:656
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "Jumlah yang telah diproses: %lu\n"
  
- #: g10/import.c:658
++#: g10/import.c:659
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "        lewati kunci baru: %lu\n"
  
- #: g10/import.c:660
++#: g10/import.c:661
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "        lewati kunci baru: %lu\n"
  
- #: g10/import.c:663
++#: g10/import.c:664
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "         tanpa ID user: %lu\n"
  
- #: g10/import.c:666 sm/import.c:130
++#: g10/import.c:667 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "             diimpor: %lu"
  
- #: g10/import.c:670 sm/import.c:134
++#: g10/import.c:671 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "            tidak berubah: %lu\n"
  
- #: g10/import.c:672
++#: g10/import.c:673
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "         ID user baru: %lu\n"
  
- #: g10/import.c:674
++#: g10/import.c:675
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "          subkey baru: %lu\n"
  
- #: g10/import.c:676
++#: g10/import.c:677
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "       signature baru: %lu\n"
  
- #: g10/import.c:678
++#: g10/import.c:679
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "  pembatalan kunci baru: %lu\n"
  
- #: g10/import.c:680 sm/import.c:136
++#: g10/import.c:681 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "     kunci rahasia dibaca: %lu\n"
  
- #: g10/import.c:682 sm/import.c:138
++#: g10/import.c:683 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "  kunci rahasia diimpor: %lu\n"
  
- #: g10/import.c:684 sm/import.c:140
++#: g10/import.c:685 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr " kunci rahasia tidak berubah: %lu\n"
  
- #: g10/import.c:686 sm/import.c:142
++#: g10/import.c:687 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "            tidak diimpor: %lu\n"
  
- #: g10/import.c:688
++#: g10/import.c:689
  #, fuzzy, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "       signature baru: %lu\n"
  
- #: g10/import.c:690
++#: g10/import.c:691
  #, fuzzy, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "     kunci rahasia dibaca: %lu\n"
  
- #: g10/import.c:1034
++#: g10/import.c:1035
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
  "algorithms on these user IDs:\n"
  msgstr ""
  
- #: g10/import.c:1076
++#: g10/import.c:1077
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1091
++#: g10/import.c:1092
  #, fuzzy, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "%s signature, algoritma digest %s\n"
  
- #: g10/import.c:1103
++#: g10/import.c:1104
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1116
++#: g10/import.c:1117
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr ""
  
- #: g10/import.c:1118
++#: g10/import.c:1119
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  
- #: g10/import.c:1143
++#: g10/import.c:1144
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  
- #: g10/import.c:1379 g10/import.c:2167
++#: g10/import.c:1380 g10/import.c:2168
  #, fuzzy, c-format
  msgid "key %s: no user ID\n"
  msgstr "kunci %08lX: tidak ada ID user\n"
  
- #: g10/import.c:1385
++#: g10/import.c:1386
  #, fuzzy, c-format
  msgid "key %s: %s\n"
  msgstr "melewati `%s': %s\n"
  
- #: g10/import.c:1386 g10/import.c:2141
++#: g10/import.c:1387 g10/import.c:2142
  msgid "rejected by import screener"
  msgstr ""
  
- #: g10/import.c:1416
++#: g10/import.c:1417
  #, fuzzy, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "kunci %08lX: subkey HKP yang rusak diperbaiki\n"
  
- #: g10/import.c:1434
++#: g10/import.c:1435
  #, fuzzy, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "kunci %08lX: menerima ID user '%s' yang tidak self-signed\n"
  
- #: g10/import.c:1444 g10/import.c:1475
++#: g10/import.c:1445 g10/import.c:1476
  #, fuzzy, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "kunci %08lX: tidak ada ID user yang valid\n"
  
- #: g10/import.c:1446
++#: g10/import.c:1447
  msgid "this may be caused by a missing self-signature\n"
  msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
  
- #: g10/import.c:1516 g10/import.c:2318
++#: g10/import.c:1517 g10/import.c:2319
  #, fuzzy, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n"
  
- #: g10/import.c:1522
++#: g10/import.c:1523
  #, fuzzy, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "kunci %08lX: kunci baru - dilewati\n"
  
- #: g10/import.c:1537
++#: g10/import.c:1538
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "tidak ditemukan keyring yang dapat ditulisi: %s\n"
  
- #: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
++#: g10/import.c:1547 g10/import.c:1648 g10/import.c:2385
  #, fuzzy, c-format
  #| msgid "error writing keyring `%s': %s\n"
  msgid "error writing keyring '%s': %s\n"
  msgstr "kesalahan menulis keyring `%s': %s\n"
  
- #: g10/import.c:1566
++#: g10/import.c:1567
  #, fuzzy, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "kunci %08lX: kunci publik \"%s\" diimpor\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1591
  #, fuzzy, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "kunci %08lX: tidak cocok dengan duplikat kami\n"
  
- #: g10/import.c:1606 g10/import.c:2342
++#: g10/import.c:1607 g10/import.c:2343
  #, fuzzy, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "kunci %08lX: tidak dapat menemukan keyblock orisinal: %s\n"
  
- #: g10/import.c:1614 g10/import.c:2349
++#: g10/import.c:1615 g10/import.c:2350
  #, fuzzy, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "kunci %08lX: tidak dapat membaca keyblok orisinal: %s\n"
  
- #: g10/import.c:1657
++#: g10/import.c:1658
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "kunci %08lX: 1 user ID baru \"%s\"\n"
  
- #: g10/import.c:1660
++#: g10/import.c:1661
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
  
- #: g10/import.c:1663
++#: g10/import.c:1664
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "kunci %08lX: \"%s\" 1 signature baru\n"
  
- #: g10/import.c:1666
++#: g10/import.c:1667
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "kunci %08lX: \"%s\" %d signature baru\n"
  
- #: g10/import.c:1669
++#: g10/import.c:1670
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "kunci %08lX: \"%s\" 1 subkey baru\n"
  
- #: g10/import.c:1672
++#: g10/import.c:1673
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "kunci %08lX: \"%s\" %d subkey baru\n"
  
- #: g10/import.c:1675
++#: g10/import.c:1676
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "kunci %08lX: \"%s\" %d signature baru\n"
  
- #: g10/import.c:1678
++#: g10/import.c:1679
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "kunci %08lX: \"%s\" %d signature baru\n"
  
- #: g10/import.c:1681
++#: g10/import.c:1682
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
  
- #: g10/import.c:1684
++#: g10/import.c:1685
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
  
- #: g10/import.c:1707
++#: g10/import.c:1708
  #, fuzzy, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "kunci %08lX: \"%s\" tidak berubah\n"
  
- #: g10/import.c:2019 g10/import.c:2264
++#: g10/import.c:2020 g10/import.c:2265
  #, fuzzy, c-format
  msgid "key %s: secret key imported\n"
  msgstr "kunci %08lX: kunci rahasia diimpor\n"
  
- #: g10/import.c:2027
++#: g10/import.c:2028
  #, fuzzy, c-format
  #| msgid "skipped: secret key already present\n"
  msgid "key %s: secret key already exists\n"
  msgstr "dilewati: kunci pribadi telah ada\n"
  
- #: g10/import.c:2035
++#: g10/import.c:2036
  #, fuzzy, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "kesalahan mengirim ke `%s': %s\n"
  
- #: g10/import.c:2140
++#: g10/import.c:2141
  #, fuzzy, c-format
  msgid "secret key %s: %s\n"
  msgstr "kunci rahasia `%s' tidak ditemukan: %s\n"
  
- #: g10/import.c:2160 g10/import.c:2195
++#: g10/import.c:2161 g10/import.c:2196
  #, fuzzy
  msgid "importing secret keys not allowed\n"
  msgstr "menulis kunci rahasia ke `%s'\n"
  
- #: g10/import.c:2184
++#: g10/import.c:2185
  #, fuzzy, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr "kunci %08lX: kunci rahasia dengan cipher tidak valid %d - dilewati\n"
@@@ -3633,141 -2821,114 +3586,141 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2256
++#: g10/import.c:2257
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2311
++#: g10/import.c:2312
  #, fuzzy, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
  "kunci %08lX: tdk ada kunci publik-tdk dpt mengaplikasikan sertifikat "
  "pembatalan\n"
  
- #: g10/import.c:2360
++#: g10/import.c:2361
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - ditolak\n"
  
- #: g10/import.c:2393
++#: g10/import.c:2394
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "kunci %08lX: \"%s\" sertifikat pembatalan diimpor\n"
  
- #: g10/import.c:2469
++#: g10/import.c:2470
  #, fuzzy, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "kunci %08lX: tidak ada ID user untuk signature\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2487
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr "kunci %08lX: algoritma publik key tidak didukung pada user id \"%s\"\n"
  
- #: g10/import.c:2488
++#: g10/import.c:2489
  #, fuzzy, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "kunci %08lX: self-signature tidak valid pada user id \"%s\"\n"
  
- #: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
++#: g10/import.c:2506 g10/import.c:2532 g10/import.c:2583
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
  
- #: g10/import.c:2506
++#: g10/import.c:2507
  #, fuzzy, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
  
- #: g10/import.c:2520
++#: g10/import.c:2521
  #, fuzzy, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "kunci %08lX: tidak ada subkey untuk key binding\n"
  
- #: g10/import.c:2533
++#: g10/import.c:2534
  #, fuzzy, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "kunci %08lX: subkey binding tidak valid\n"
  
- #: g10/import.c:2549
++#: g10/import.c:2550
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "kunci %08lX: hapus subkey binding ganda\n"
  
- #: g10/import.c:2571
++#: g10/import.c:2572
  #, fuzzy, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "kunci %08lX: tidak ada subkey untuk pembatalan kunci\n"
  
- #: g10/import.c:2584
++#: g10/import.c:2585
  #, fuzzy, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "kunci %08lX: pembatalan subkey tidak valid\n"
  
- #: g10/import.c:2599
++#: g10/import.c:2600
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "kunci %08lX: hapus pembatalan subkey ganda\n"
  
- #: g10/import.c:2641
++#: g10/import.c:2642
  #, fuzzy, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "kunci %08lX: melewati ID user "
  
- #: g10/import.c:2665
++#: g10/import.c:2666
  #, fuzzy, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "kunci %08lX: melewati subkey\n"
  
- #: g10/import.c:2694
++#: g10/import.c:2695
  #, fuzzy, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "kunci %08lX: signature tidak dapat diekpor (kelas %02x) - dilewati\n"
  
- #: g10/import.c:2705
++#: g10/import.c:2706
  #, fuzzy, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "kunci %08lX: sertifikat pembatalan di tempat yang salah - dilewati\n"
  
- #: g10/import.c:2723
++#: g10/import.c:2724
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - dilewati\n"
  
- #: g10/import.c:2737
++#: g10/import.c:2738
  #, fuzzy, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "kunci %08lX: signature subkey di tempat yang salah - dilewati\n"
  
- #: g10/import.c:2745
++#: g10/import.c:2746
  #, fuzzy, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "kunci %08lX: klas signature tidak diharapkan (0x%02x) - dilewati\n"
  
- #: g10/import.c:2887
++#: g10/import.c:2888
  #, fuzzy, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
  
- #: g10/import.c:2951
++#: g10/import.c:2952
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr ""
  "Peringatan: kunci %08lX dapat dibatalkan: mengambil kunci pembatalan %08lX\n"
  
- #: g10/import.c:2967
++#: g10/import.c:2968
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr ""
  "Peringatan: kunci %08lX dapat dibatalkan: kunci pembatalan %08lX tidak ada\n"
  
- #: g10/import.c:3031
++#: g10/import.c:3032
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "kunci %08lX: \"%s\" penambahan sertifikat pembatalan\n"
  
- #: g10/import.c:3069
++#: g10/import.c:3070
  #, fuzzy, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
@@@ -3804,54 -2959,43 +3757,54 @@@ msgstr "kesalahan penciptaan : `%s': %s
  msgid "error opening key DB: %s\n"
  msgstr "kesalahan membaca `%s': %s\n"
  
- #: g10/keydb.c:1782
++#: g10/keydb.c:1786
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "gagal membuat kembali cache keyring: %s\n"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[revocation]"
  msgstr "[pembatalan]"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[self-signature]"
  msgstr "[self-signature]"
  
- #: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
++#: g10/keyedit.c:433 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: dirmngr/ldap-wrapper.c:694
  #, fuzzy, c-format
  msgid "error allocating memory: %s\n"
  msgstr "kesalahan menulis keyring `%s': %s\n"
  
- #: g10/keyedit.c:629
++#: g10/keyedit.c:630
  #, fuzzy, c-format
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
  
- #: g10/keyedit.c:638
++#: g10/keyedit.c:639
  #, fuzzy, c-format
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "%s signature, algoritma digest %s\n"
  
- #: g10/keyedit.c:800
++#: g10/keyedit.c:801
  #, fuzzy
  msgid " (reordered signatures follow)"
  msgstr "Signature baik dari \""
  
- #: g10/keyedit.c:913
++#: g10/keyedit.c:914
  #, fuzzy, c-format
  msgid "key %s:\n"
  msgstr "melewati `%s': %s\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:917
  #, fuzzy, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
  msgstr[0] "User ID \"%s\" dibatalkan."
  msgstr[1] "User ID \"%s\" dibatalkan."
  
- #: g10/keyedit.c:919 g10/keylist.c:480
++#: g10/keyedit.c:920 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
@@@ -3859,7 -3003,6 +3812,7 @@@ msgid_plural "%d signatures not checke
  msgstr[0] "1 signature tidak diperiksa karena tidak ada kunci\n"
  msgstr[1] "1 signature tidak diperiksa karena tidak ada kunci\n"
  
- #: g10/keyedit.c:923 g10/keylist.c:476
++#: g10/keyedit.c:924 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
@@@ -3867,21 -3010,18 +3820,21 @@@ msgid_plural "%d bad signatures\n
  msgstr[0] "%d signature yang buruk\n"
  msgstr[1] "%d signature yang buruk\n"
  
- #: g10/keyedit.c:927
++#: g10/keyedit.c:928
  #, fuzzy, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
  msgstr[0] "Signature baik dari \""
  msgstr[1] "Signature baik dari \""
  
- #: g10/keyedit.c:932
++#: g10/keyedit.c:933
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:992 g10/pkclist.c:274
++#: g10/keyedit.c:993 g10/pkclist.c:274
  #, fuzzy
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
@@@ -3894,68 -3034,53 +3847,68 @@@ msgstr "
  "memeriksa fingerprint dari berbagai sumber...)?\n"
  "\n"
  
- #: g10/keyedit.c:996 g10/pkclist.c:286
++#: g10/keyedit.c:997 g10/pkclist.c:286
  #, fuzzy, c-format
  msgid "  %d = I trust marginally\n"
  msgstr " %d = Saya cukup percaya\n"
  
- #: g10/keyedit.c:997 g10/pkclist.c:288
++#: g10/keyedit.c:998 g10/pkclist.c:288
  #, fuzzy, c-format
  msgid "  %d = I trust fully\n"
  msgstr " %d = Saya sangat percaya\n"
  
- #: g10/keyedit.c:1015
++#: g10/keyedit.c:1016
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
  "trust signatures on your behalf.\n"
  msgstr ""
  
- #: g10/keyedit.c:1032
++#: g10/keyedit.c:1033
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  
- #: g10/keyedit.c:1160
++#: g10/keyedit.c:1161
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1168
++#: g10/keyedit.c:1169
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "User ID \"%s\" dibatalkan."
  
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
- #: g10/keyedit.c:2246
++#: g10/keyedit.c:1178 g10/keyedit.c:1206 g10/keyedit.c:1233 g10/keyedit.c:1417
++#: g10/keyedit.c:2247
  msgid "Are you sure you still want to sign it? (y/N) "
  msgstr "Apakah anda yakin masih ingin menandainya? (y/N) "
  
- #: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
- #: g10/keyedit.c:2251 g10/keyedit.c:3177
++#: g10/keyedit.c:1192 g10/keyedit.c:1220 g10/keyedit.c:1247 g10/keyedit.c:1423
++#: g10/keyedit.c:2252 g10/keyedit.c:3178
  msgid "  Unable to sign.\n"
  msgstr "..Tidak dapat menandai.\n"
  
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1197
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "User ID \"%s\" kadaluwarsa."
  
- #: g10/keyedit.c:1224
++#: g10/keyedit.c:1225
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "User ID \"%s\" bukan self-signed."
  
- #: g10/keyedit.c:1253
++#: g10/keyedit.c:1254
  #, fuzzy, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "User ID \"%s\" bukan self-signed."
  
- #: g10/keyedit.c:1255
++#: g10/keyedit.c:1256
  #, fuzzy
  msgid "Sign it? (y/N) "
  msgstr "Ditandai? "
  
- #: g10/keyedit.c:1282
++#: g10/keyedit.c:1283
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -3964,11 -3089,9 +3917,11 @@@ msgstr "
  "Self-signature pada \"%s\"\n"
  "adalah signature bergaya PGP 2.x.\n"
  
- #: g10/keyedit.c:1291
++#: g10/keyedit.c:1292
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr "Anda ingin mempromosikannya ke self-signature OpenPGP ? (y/N) "
  
- #: g10/keyedit.c:1304
++#: g10/keyedit.c:1305
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3977,13 -3100,11 +3930,13 @@@ msgstr "
  "Signature anda saat ini pada \"%s\"\n"
  "telah habis berlaku.\n"
  
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:1310
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr ""
  "Anda ingin mengeluarkan signature baru untuk menggantikan yang telah habis "
  "berlaku? (y/N)"
  
- #: g10/keyedit.c:1330
++#: g10/keyedit.c:1331
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3992,43 -3113,34 +3945,43 @@@ msgstr "
  "Signature anda saat ini pada \"%s\"\n"
  "adalah signature.lokal \n"
  
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:1336
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr "Apakah anda ingin menjadikannya signature yang full exportable? (y/N)"
  
- #: g10/keyedit.c:1355
++#: g10/keyedit.c:1356
  #, fuzzy, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "\"%s\" Sudah ditandai secara lokal dengan kunci %08lX\n"
  
- #: g10/keyedit.c:1359
++#: g10/keyedit.c:1360
  #, fuzzy, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "\"%s\" Sudah ditandai dengan kunci %08lX\n"
  
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:1365
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "Apakah anda ingin menandainya lagi? (y/N) "
  
- #: g10/keyedit.c:1386
++#: g10/keyedit.c:1387
  #, fuzzy, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
  
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1411
  msgid "This key has expired!"
  msgstr "Kunci ini telah berakhir!"
  
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1429
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "Kunci ini akan kadaluarsa pada %s \n"
  
- #: g10/keyedit.c:1434
++#: g10/keyedit.c:1435
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr "Anda ingin signature anda kadaluarsa pada waktu yang sama? (y/n) "
  
- #: g10/keyedit.c:1475
++#: g10/keyedit.c:1476
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -4038,32 -3150,26 +3991,32 @@@ msgstr "
  "menandai benar benar milik\n"
  "orang tersebut?  Jika anda tidak tahu jawabannya. masukkan \"0\".\n"
  
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1481
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) Saya tidak akan menjawab.%s\n"
  
- #: g10/keyedit.c:1482
++#: g10/keyedit.c:1483
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) Saya belum memeriksanya.%s\n"
  
- #: g10/keyedit.c:1484
++#: g10/keyedit.c:1485
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) Saya telah melakukan pemeriksaan biasa.%s\n"
  
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:1488
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) Saya telah melakukan pemeriksaan hati-hati.%s\n"
  
- #: g10/keyedit.c:1494
++#: g10/keyedit.c:1495
  #, fuzzy
  msgid "Your selection? (enter '?' for more information): "
  msgstr "Pilihan Anda? (berikan '?' untuk informasi lebih lanjut):"
  
- #: g10/keyedit.c:1521
++#: g10/keyedit.c:1522
  #, fuzzy, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -4072,265 -3178,211 +4025,265 @@@ msgstr "
  "Apakah anda yakin untuk menandai kunci ini \n"
  "dengan kunci anda: "
  
- #: g10/keyedit.c:1529
++#: g10/keyedit.c:1530
  #, fuzzy
  msgid "This will be a self-signature.\n"
  msgstr ""
  "\n"
  "Ini akan jadi self-signature.\n"
  
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:1535
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr ""
  "\n"
  "Peringatan: Signature akan ditandai sebagai tidak dapat diekspor.\n"
  
- #: g10/keyedit.c:1541
++#: g10/keyedit.c:1542
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr ""
  "\n"
  "Peringatan: Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
  
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1552
  #, fuzzy
  msgid "The signature will be marked as non-exportable.\n"
  msgstr ""
  "\n"
  "Signature akan ditandai sebagai tidak dapat diekspor.\n"
  
- #: g10/keyedit.c:1558
++#: g10/keyedit.c:1559
  #, fuzzy
  msgid "The signature will be marked as non-revocable.\n"
  msgstr ""
  "\n"
  "Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
  
- #: g10/keyedit.c:1565
++#: g10/keyedit.c:1566
  #, fuzzy
  msgid "I have not checked this key at all.\n"
  msgstr ""
  "\n"
  "Saya belum memeriksa kunci ini sama sekali.\n"
  
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:1571
  #, fuzzy
  msgid "I have checked this key casually.\n"
  msgstr ""
  "\n"
  "Saya telah memeriksa kunci ini.\n"
  
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:1576
  #, fuzzy
  msgid "I have checked this key very carefully.\n"
  msgstr ""
  "\n"
  "Saya telah memeriksa kunci ini dengan sangat hati-hati.\n"
  
- #: g10/keyedit.c:1587
++#: g10/keyedit.c:1588
  #, fuzzy
  msgid "Really sign? (y/N) "
  msgstr "Ditandai? "
  
- #: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
- #: g10/keyedit.c:6463 g10/sign.c:323
++#: g10/keyedit.c:1639 g10/keyedit.c:6308 g10/keyedit.c:6391 g10/keyedit.c:6500
++#: g10/keyedit.c:6562 g10/sign.c:325
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "gagal menandai: %s\n"
  
- #: g10/keyedit.c:1725
++#: g10/keyedit.c:1726
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  
- #: g10/keyedit.c:1755
++#: g10/keyedit.c:1756
  #, fuzzy, c-format
  #| msgid "error creating passphrase: %s\n"
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: g10/keyedit.c:1869
++#: g10/keyedit.c:1870
  msgid "save and quit"
  msgstr "simpan dan berhenti"
  
- #: g10/keyedit.c:1872
++#: g10/keyedit.c:1873
  #, fuzzy
  msgid "show key fingerprint"
  msgstr "tampilkan fingerprint"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1874
  #, fuzzy
  msgid "show the keygrip"
  msgstr "Notasi signature: "
  
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1875
  msgid "list key and user IDs"
  msgstr "tampilkan kunci dan ID user"
  
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1877
  msgid "select user ID N"
  msgstr "pilih ID user N"
  
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1878
  #, fuzzy
  msgid "select subkey N"
  msgstr "pilih ID user N"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1879
  #, fuzzy
  msgid "check signatures"
  msgstr "batalkan signature"
  
- #: g10/keyedit.c:1884
++#: g10/keyedit.c:1885
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr ""
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1890
  #, fuzzy
  msgid "sign selected user IDs locally"
  msgstr "tandai kunci secara lokal"
  
- #: g10/keyedit.c:1890
++#: g10/keyedit.c:1891
  #, fuzzy
  msgid "sign selected user IDs with a trust signature"
  msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1893
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr ""
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1895
  msgid "add a user ID"
  msgstr "tambah sebuah ID user"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1897
  msgid "add a photo ID"
  msgstr "tambah sebuah photo ID"
  
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1898
  #, fuzzy
  msgid "delete selected user IDs"
  msgstr "hapus ID user"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1901
  #, fuzzy
  msgid "add a subkey"
  msgstr "addkey"
  
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1904
  msgid "add a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1906
  msgid "move a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1908
  msgid "move a backup key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1910
  #, fuzzy
  msgid "delete selected subkeys"
  msgstr "hapus kunci sekunder"
  
- #: g10/keyedit.c:1911
++#: g10/keyedit.c:1912
  msgid "add a revocation key"
  msgstr "tambah kunci pembatalan"
  
- #: g10/keyedit.c:1913
++#: g10/keyedit.c:1914
  #, fuzzy
  msgid "delete signatures from the selected user IDs"
  msgstr "Perbarui preferensi untuk user ID terpilih?"
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1916
  #, fuzzy
  msgid "change the expiration date for the key or selected subkeys"
  msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1918
  #, fuzzy
  msgid "flag the selected user ID as primary"
  msgstr "tandai ID user sebagai primer"
  
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1921
  msgid "list preferences (expert)"
  msgstr "tampilkan preferensi (ahli)"
  
- #: g10/keyedit.c:1921
++#: g10/keyedit.c:1922
  msgid "list preferences (verbose)"
  msgstr "tampilkan preferensi (verbose)"
  
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:1924
  #, fuzzy
  msgid "set preference list for the selected user IDs"
  msgstr "Perbarui preferensi untuk user ID terpilih?"
  
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1927
  #, fuzzy
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr "tidak dapat memparsing URI keyserver\n"
  
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1929
  #, fuzzy
  msgid "set a notation for the selected user IDs"
  msgstr "Perbarui preferensi untuk user ID terpilih?"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1931
  msgid "change the passphrase"
  msgstr "ubah passphrase"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1934
  msgid "change the ownertrust"
  msgstr "ubah ownertrust"
  
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1937
  #, fuzzy
  msgid "revoke signatures on the selected user IDs"
  msgstr "Benar-benar hapus seluruh ID user terpilih? "
  
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1939
  #, fuzzy
  msgid "revoke selected user IDs"
  msgstr "batalkan sebuah ID user"
  
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1942
  #, fuzzy
  msgid "revoke key or selected subkeys"
  msgstr "batalkan kunci sekunder"
  
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1944
  #, fuzzy
  msgid "enable key"
  msgstr "aktifkan kunci"
  
- #: g10/keyedit.c:1944
++#: g10/keyedit.c:1945
  #, fuzzy
  msgid "disable key"
  msgstr "tiadakan kunci"
  
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1947
  #, fuzzy
  msgid "show selected photo IDs"
  msgstr "tampilkan photo ID"
  
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1949
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:1951
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2063
  msgid "Secret key is available.\n"
  msgstr "Kunci rahasia tersedia.\n"
  
- #: g10/keyedit.c:2162
++#: g10/keyedit.c:2163
  msgid "Need the secret key to do this.\n"
  msgstr "Perlu kunci rahasia untuk melakukan hal ini.\n"
  
- #: g10/keyedit.c:2183
++#: g10/keyedit.c:2184
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4338,279 -3390,224 +4291,284 @@@
  "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
  msgstr ""
  
- #: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
++#: g10/keyedit.c:2240 g10/keyedit.c:3178 g10/keyedit.c:3317 g10/keyedit.c:3379
  msgid "Key is revoked."
  msgstr "Kunci dibatalkan"
  
- #: g10/keyedit.c:2262
++#: g10/keyedit.c:2263
  #, fuzzy
  msgid "Really sign all user IDs? (y/N) "
  msgstr "Tandai ID seluruh user? "
  
- #: g10/keyedit.c:2266
++#: g10/keyedit.c:2267
  #, fuzzy
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "Tandai ID seluruh user? "
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2275
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
  
- #: g10/keyedit.c:2285
++#: g10/keyedit.c:2286
  #, fuzzy, c-format
  msgid "Unknown signature type '%s'\n"
  msgstr "kelas signature tidak dikenal"
  
- #: g10/keyedit.c:2309
++#: g10/keyedit.c:2310
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
  msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
  
- #: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
++#: g10/keyedit.c:2332 g10/keyedit.c:2356 g10/keyedit.c:2550
  msgid "You must select at least one user ID.\n"
  msgstr "Anda harus memilih minimum satu ID user.\n"
  
- #: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
++#: g10/keyedit.c:2334 g10/keyedit.c:2358 g10/keyedit.c:2512 g10/keyedit.c:2552
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2336
++#: g10/keyedit.c:2337
  msgid "You can't delete the last user ID!\n"
  msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
  
- #: g10/keyedit.c:2339
++#: g10/keyedit.c:2340
  #, fuzzy
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "Hapus seluruh ID user terpilih? "
  
- #: g10/keyedit.c:2340
++#: g10/keyedit.c:2341
  #, fuzzy
  msgid "Really remove this user ID? (y/N) "
  msgstr "Hapus ID user ini? "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2397
++#: g10/keyedit.c:2398
  #, fuzzy
  msgid "Really move the primary key? (y/N) "
  msgstr "Hapus ID user ini? "
  
- #: g10/keyedit.c:2409 g10/keyedit.c:4866
++#: g10/keyedit.c:2410 g10/keyedit.c:4964
  #, fuzzy
  msgid "You must select exactly one key.\n"
  msgstr "Anda harus memilih minimum satu kunci.\n"
  
- #: g10/keyedit.c:2436
++#: g10/keyedit.c:2437
  msgid "Command expects a filename argument\n"
  msgstr ""
  
- #: g10/keyedit.c:2457
++#: g10/keyedit.c:2458
  #, fuzzy, c-format
  msgid "Can't open '%s': %s\n"
  msgstr "tidak dapat membuka `%s': %s\n"
  
- #: g10/keyedit.c:2474
++#: g10/keyedit.c:2475
  #, fuzzy, c-format
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "kesalahan menulis keyring `%s': %s\n"
  
- #: g10/keyedit.c:2509
++#: g10/keyedit.c:2510
  msgid "You must select at least one key.\n"
  msgstr "Anda harus memilih minimum satu kunci.\n"
  
- #: g10/keyedit.c:2515
++#: g10/keyedit.c:2516
  #, fuzzy
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "Anda ingin menghapus kunci terpilih ini? "
  
- #: g10/keyedit.c:2517
++#: g10/keyedit.c:2518
  #, fuzzy
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "Anda ingin menghapus kunci ini? "
  
- #: g10/keyedit.c:2555
++#: g10/keyedit.c:2556
  #, fuzzy
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr "Benar-benar hapus seluruh ID user terpilih? "
  
- #: g10/keyedit.c:2556
++#: g10/keyedit.c:2557
  #, fuzzy
  msgid "Really revoke this user ID? (y/N) "
  msgstr "Benar-benar hapus ID user ini? "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2575
  #, fuzzy
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "Anda ingin membatalkan kunci ini? "
  
- #: g10/keyedit.c:2585
++#: g10/keyedit.c:2586
  #, fuzzy
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "Anda ingin membatalkan kunci terpilih ini? "
  
- #: g10/keyedit.c:2587
++#: g10/keyedit.c:2588
  #, fuzzy
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "Anda ingin membatalkan kunci ini? "
  
- #: g10/keyedit.c:2645
++#: g10/keyedit.c:2646
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  
- #: g10/keyedit.c:2690
++#: g10/keyedit.c:2691
  #, fuzzy
  msgid "Set preference list to:\n"
  msgstr "set daftar preferensi"
  
- #: g10/keyedit.c:2697
++#: g10/keyedit.c:2698
  #, fuzzy
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr "Perbarui preferensi untuk user ID terpilih?"
  
- #: g10/keyedit.c:2699
++#: g10/keyedit.c:2700
  #, fuzzy
  msgid "Really update the preferences? (y/N) "
  msgstr "Update preferensi?"
  
- #: g10/keyedit.c:2773
++#: g10/keyedit.c:2774
  #, fuzzy
  msgid "Save changes? (y/N) "
  msgstr "Simpan perubahan? "
  
- #: g10/keyedit.c:2777
++#: g10/keyedit.c:2778
  #, fuzzy
  msgid "Quit without saving? (y/N) "
  msgstr "Berhenti tanpa menyimpan? "
  
- #: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
- #: g10/keyedit.c:3267 g10/keyedit.c:3332
++#: g10/keyedit.c:2789 g10/keyedit.c:2799 g10/keyedit.c:2943 g10/keyedit.c:3046
++#: g10/keyedit.c:3268 g10/keyedit.c:3333 g10/keyedit.c:3409
  #, c-format
  msgid "update failed: %s\n"
  msgstr "gagal memperbarui: %s\n"
  
- #: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
++#: g10/keyedit.c:2805 g10/keyedit.c:3273 g10/keyedit.c:3338 g10/keyedit.c:3416
  msgid "Key not changed so no update needed.\n"
  msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
  
- #: g10/keyedit.c:3038
++#: g10/keyedit.c:3039
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
  msgstr "Pembuatan kunci gagal: %s\n"
  
- #: g10/keyedit.c:3083
++#: g10/keyedit.c:3084
  #, fuzzy, c-format
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "kesalahan: fingerprint tidak valid\n"
  
- #: g10/keyedit.c:3112
++#: g10/keyedit.c:3113
  #, fuzzy, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "gagal inisialisasi TrustDB: %s\n"
  
- #: g10/keyedit.c:3248 g10/keyedit.c:3251
++#: g10/keyedit.c:3249 g10/keyedit.c:3252
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
  msgstr "nilai yang tidak valid\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  #, fuzzy
  #| msgid "No such user ID.\n"
  msgid "No matching user IDs."
  msgstr "Tidak ada ID user tersebut.\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  #, fuzzy
  msgid "Nothing to sign.\n"
  msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
  
- #: g10/keyedit.c:3427
++#: g10/keyedit.c:3388
+ #, fuzzy, c-format
+ msgid "'%s' is not a valid expiration time\n"
+ msgstr "%s bukanlah set karakter yang valid\n"
+ 
++#: g10/keyedit.c:3508
  msgid "Digest: "
  msgstr "Digest: "
  
- #: g10/keyedit.c:3484
++#: g10/keyedit.c:3565
  msgid "Features: "
  msgstr "Fitur: "
  
- #: g10/keyedit.c:3495
++#: g10/keyedit.c:3576
  msgid "Keyserver no-modify"
  msgstr ""
  
- #: g10/keyedit.c:3510 g10/keylist.c:377
++#: g10/keyedit.c:3591 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr ""
  
- #: g10/keyedit.c:3518 g10/keyedit.c:3519
++#: g10/keyedit.c:3599 g10/keyedit.c:3600
  #, fuzzy
  msgid "Notations: "
  msgstr "Notasi: "
  
- #: g10/keyedit.c:3764
++#: g10/keyedit.c:3845
  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:3836
++#: g10/keyedit.c:3917
  #, 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:3860
++#: g10/keyedit.c:3941
  #, fuzzy, c-format
  msgid "This key may be revoked by %s key %s"
  msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
  
- #: g10/keyedit.c:3866
++#: g10/keyedit.c:3947
  #, fuzzy
  msgid "(sensitive)"
  msgstr " (sensitive)"
  
- #: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3989 g10/keyedit.c:4131 g10/keylist.c:262 g10/keyserver.c:538
  #, fuzzy, c-format
  msgid "created: %s"
  msgstr "tidak dapat membuat %s: %s\n"
  
- #: g10/keyedit.c:3911 g10/keylist.c:1852
++#: g10/keyedit.c:3992 g10/keylist.c:1852
  #, fuzzy, c-format
  msgid "revoked: %s"
  msgstr "[revoked] "
  
- #: g10/keyedit.c:3913 g10/keylist.c:1858
++#: g10/keyedit.c:3994 g10/keylist.c:1858
  #, fuzzy, c-format
  msgid "expired: %s"
  msgstr " [berakhir: %s]"
  
- #: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyedit.c:3996 g10/keyedit.c:4133 g10/keylist.c:264 g10/keylist.c:1864
 +#: g10/keyserver.c:544
  #, fuzzy, c-format
  msgid "expires: %s"
  msgstr " [berakhir: %s]"
  
- #: g10/keyedit.c:3917
++#: g10/keyedit.c:3998
  #, fuzzy, c-format
  msgid "usage: %s"
  msgstr " trust: %c/%c"
  
- #: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
++#: g10/keyedit.c:4006 g10/keyedit.c:4026 g10/keylist.c:267
  msgid "card-no: "
  msgstr ""
  
- #: g10/keyedit.c:3984
++#: g10/keyedit.c:4065
  #, fuzzy, c-format
  msgid "trust: %s"
  msgstr " trust: %c/%c"
  
- #: g10/keyedit.c:3988
++#: g10/keyedit.c:4069
  #, c-format
  msgid "validity: %s"
  msgstr ""
  
- #: g10/keyedit.c:3995
++#: g10/keyedit.c:4076
  msgid "This key has been disabled"
  msgstr "Kunci ini telah ditiadakan"
  
- #: g10/keyedit.c:4013
++#: g10/keyedit.c:4094
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4618,20 -3615,14 +4576,20 @@@ msgstr "
  "Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n"
  "kecuali anda memulai kembali program.\n"
  
- #: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
- #: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: g10/keyedit.c:4150 g10/keyedit.c:4581 g10/keyserver.c:548
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:712
 +#: dirmngr/ocsp.c:703
  #, fuzzy
  msgid "revoked"
  msgstr "[revoked] "
  
- #: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
- #: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4152 g10/keyedit.c:4583 g10/keyserver.c:552
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:714
  #, fuzzy
  msgid "expired"
  msgstr "expire"
  
- #: g10/keyedit.c:4188
++#: g10/keyedit.c:4269
  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"
@@@ -4639,17 -3630,14 +4597,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:4240
++#: g10/keyedit.c:4321
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr ""
  
- #: g10/keyedit.c:4241
++#: g10/keyedit.c:4322
  #, fuzzy
  #| 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:4300
++#: g10/keyedit.c:4381
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4659,35 -3647,27 +4617,35 @@@ msgstr "
  "dapat menyebabkan beberapa versi\n"
  "          PGP menolak kunci ini.\n"
  
- #: g10/keyedit.c:4305 g10/keyedit.c:4595
++#: g10/keyedit.c:4386 g10/keyedit.c:4676
  msgid "Are you sure you still want to add it? (y/N) "
  msgstr "Anda tetap ingin menambahkannya? (y/n) "
  
- #: g10/keyedit.c:4311
++#: g10/keyedit.c:4392
  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:4326 g10/keygen.c:2697
++#: g10/keyedit.c:4407 g10/keygen.c:2719
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4509
  msgid "Delete this good signature? (y/N/q)"
  msgstr "Hapus signature baik ini? (y/T/q)"
  
- #: g10/keyedit.c:4438
++#: g10/keyedit.c:4519
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "Hapus signature tidak valid ini? (y/T/q)"
  
- #: g10/keyedit.c:4442
++#: g10/keyedit.c:4523
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4530
  msgid "Really delete this self-signature? (y/N)"
  msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
  
- #: g10/keyedit.c:4465
++#: g10/keyedit.c:4546
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
@@@ -4695,38 -3675,31 +4653,38 @@@ msgid_plural "Deleted %d signatures.\n
  msgstr[0] "Menghapus %d signature.\n"
  msgstr[1] "Menghapus %d signature.\n"
  
- #: g10/keyedit.c:4469
++#: g10/keyedit.c:4550
  msgid "Nothing deleted.\n"
  msgstr "Tidak ada yang dihapus.\n"
  
- #: g10/keyedit.c:4504 g10/trust.c:693
++#: g10/keyedit.c:4585 g10/trust.c:716
  #, fuzzy
  msgid "invalid"
  msgstr "armor tidak valid"
  
- #: g10/keyedit.c:4506
++#: g10/keyedit.c:4587
  #, fuzzy, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "User ID \"%s\" dibatalkan."
  
- #: g10/keyedit.c:4512
++#: g10/keyedit.c:4593
  #, 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:4520
++#: g10/keyedit.c:4601
  #, fuzzy, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "User ID \"%s\" telah dibatalkan\n"
  
- #: g10/keyedit.c:4521
++#: g10/keyedit.c:4602
  #, fuzzy, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "User ID \"%s\" telah dibatalkan\n"
  
- #: g10/keyedit.c:4590
++#: g10/keyedit.c:4671
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4736,44 -3709,36 +4694,44 @@@ msgstr "
  "designated dapat\n"
  "............menyebabkan beberapa versi PGP menolak kunci ini.\n"
  
- #: g10/keyedit.c:4601
++#: g10/keyedit.c:4682
  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:4618
++#: g10/keyedit.c:4699
  msgid "Enter the user ID of the designated revoker: "
  msgstr "Masukkan user ID pihak yang ingin dibatalkan: "
  
- #: g10/keyedit.c:4643
++#: g10/keyedit.c:4724
  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:4658
++#: g10/keyedit.c:4739
  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:4680
++#: g10/keyedit.c:4761
  #, fuzzy
  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:4698
++#: g10/keyedit.c:4779
  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:4704
++#: g10/keyedit.c:4785
  #, 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:4755
++#: g10/keyedit.c:4848
  #, fuzzy
  msgid ""
  "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@@ -4781,239 -3746,188 +4739,239 @@@
  msgstr ""
  "Anda yakin ingin menunjuk kunci inin sebagai pihak yang dibatalkan? (y/N):"
  
- #: g10/keyedit.c:4760
++#: g10/keyedit.c:4853
  #, fuzzy
  msgid "Changing expiration time for a subkey.\n"
  msgstr "Merubah batas waktu untuk kunci sekunder.\n"
  
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:4856
  msgid "Changing expiration time for the primary key.\n"
  msgstr "Merubah batas waktu untuk kunci primer.\n"
  
- #: g10/keyedit.c:4814
++#: g10/keyedit.c:4910
  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:4987
++#: g10/keyedit.c:5085
  #, fuzzy, c-format
  msgid "signing subkey %s is already cross-certified\n"
  msgstr "PERINGATAN: subkey penandatangan %08lX tidak tersertifikasi silang\n"
  
- #: g10/keyedit.c:4993
++#: g10/keyedit.c:5091
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr ""
  
- #: g10/keyedit.c:5108
++#: g10/keyedit.c:5206
  msgid "Please select exactly one user ID.\n"
  msgstr "Anda harus memilih minimum satu ID user.\n"
  
- #: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
++#: g10/keyedit.c:5247 g10/keyedit.c:5361 g10/keyedit.c:5474 g10/keyedit.c:5611
  #, 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:5320
++#: g10/keyedit.c:5418
  msgid "Enter your preferred keyserver URL: "
  msgstr ""
  
- #: g10/keyedit.c:5399
++#: g10/keyedit.c:5497
  #, fuzzy
  msgid "Are you sure you want to replace it? (y/N) "
  msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
  
- #: g10/keyedit.c:5400
++#: g10/keyedit.c:5498
  #, fuzzy
  msgid "Are you sure you want to delete it? (y/N) "
  msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
  
- #: g10/keyedit.c:5459
++#: g10/keyedit.c:5557
  #, fuzzy
  msgid "Enter the notation: "
  msgstr "Notasi signature: "
  
- #: g10/keyedit.c:5606
++#: g10/keyedit.c:5704
  #, fuzzy
  msgid "Proceed? (y/N) "
  msgstr "Ditimpa (y/T)? "
  
- #: g10/keyedit.c:5676
++#: g10/keyedit.c:5774
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "Tidak ada ID user dengan index %d\n"
  
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5836
  #, fuzzy, c-format
  msgid "No user ID with hash %s\n"
  msgstr "Tidak ada ID user dengan index %d\n"
  
- #: g10/keyedit.c:5839
++#: g10/keyedit.c:5937
  #, fuzzy, c-format
  msgid "No subkey with key ID '%s'.\n"
  msgstr "Tidak ada ID user dengan index %d\n"
  
- #: g10/keyedit.c:5861
++#: g10/keyedit.c:5959
  #, fuzzy, c-format
  msgid "No subkey with index %d\n"
  msgstr "Tidak ada ID user dengan index %d\n"
  
- #: g10/keyedit.c:6002
++#: g10/keyedit.c:6100
  #, fuzzy, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "ID user: "
  
- #: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
++#: g10/keyedit.c:6103 g10/keyedit.c:6205 g10/keyedit.c:6253
  #, 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:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
++#: g10/keyedit.c:6105 g10/keyedit.c:6207 g10/keyedit.c:6255
  msgid " (non-exportable)"
  msgstr " (tidak dapat diekspor)"
  
- #: g10/keyedit.c:6011
++#: g10/keyedit.c:6109
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "Kunci ini akan kadaluarsa pada %s \n"
  
- #: g10/keyedit.c:6016
++#: g10/keyedit.c:6114
  msgid "Are you sure you still want to revoke it? (y/N) "
  msgstr "Anda tetap ingin membatalkannya? (y/n) "
  
- #: g10/keyedit.c:6021
++#: g10/keyedit.c:6119
  msgid "Create a revocation certificate for this signature? (y/N) "
  msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
  
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6173
  #, fuzzy
  msgid "Not signed by you.\n"
  msgstr "   ditandai oleh %08lX pada %s%s\n"
  
- #: g10/keyedit.c:6081
++#: g10/keyedit.c:6179
  #, 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:6110
++#: g10/keyedit.c:6208
  #, fuzzy
  msgid " (non-revocable)"
  msgstr " (tidak dapat diekspor)"
  
- #: g10/keyedit.c:6117
++#: g10/keyedit.c:6215
  #, fuzzy, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "   dibatalkan oleh %08lX pada %s\n"
  
- #: g10/keyedit.c:6142
++#: g10/keyedit.c:6240
  msgid "You are about to revoke these signatures:\n"
  msgstr "Anda akan membatalkan signature ini:\n"
  
- #: g10/keyedit.c:6165
++#: g10/keyedit.c:6263
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
  
- #: g10/keyedit.c:6198
++#: g10/keyedit.c:6296
  msgid "no secret key\n"
  msgstr "tidak ada kunci rahasia\n"
  
- #: g10/keyedit.c:6246
++#: g10/keyedit.c:6344
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6256
++#: g10/keyedit.c:6354
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "User ID \"%s\" telah dibatalkan\n"
  
- #: g10/keyedit.c:6273
++#: g10/keyedit.c:6371
  #, 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:6386
++#: g10/keyedit.c:6485
  #, fuzzy, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "User ID \"%s\" telah dibatalkan\n"
  
- #: g10/keyedit.c:6448
++#: g10/keyedit.c:6547
  #, fuzzy, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "User ID \"%s\" telah dibatalkan\n"
  
- #: g10/keyedit.c:6545
++#: g10/keyedit.c:6644
  #, fuzzy, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr "Menampilkan photo ID %s berukuran %ld untuk kunci 0x%08lX (uid %d)\n"
  
- #: g10/keygen.c:305
++#: g10/keygen.c:316
  #, fuzzy, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "preferensi %c%lu ganda \n"
  
- #: g10/keygen.c:312
++#: g10/keygen.c:323
  #, fuzzy
  msgid "too many cipher preferences\n"
  msgstr "terlalu banyak preferensi `%c'\n"
  
- #: g10/keygen.c:314
++#: g10/keygen.c:325
  #, fuzzy
  msgid "too many digest preferences\n"
  msgstr "terlalu banyak preferensi `%c'\n"
  
- #: g10/keygen.c:316
++#: g10/keygen.c:327
  #, fuzzy
  msgid "too many compression preferences\n"
  msgstr "terlalu banyak preferensi `%c'\n"
  
- #: g10/keygen.c:457
++#: g10/keygen.c:468
  #, fuzzy, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "Karakter tidak valid dalam string preferensi\n"
  
- #: g10/keygen.c:936
++#: g10/keygen.c:947
  msgid "writing direct signature\n"
  msgstr "menulis signature direct\n"
  
- #: g10/keygen.c:982
++#: g10/keygen.c:993
  msgid "writing self signature\n"
  msgstr "menulis self signature\n"
  
- #: g10/keygen.c:1038
++#: g10/keygen.c:1049
  msgid "writing key binding signature\n"
  msgstr "menulis key binding signature\n"
  
- #: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
- #: g10/keygen.c:1610 g10/keygen.c:1615
++#: g10/keygen.c:1413 g10/keygen.c:1418 g10/keygen.c:1470 g10/keygen.c:1475
++#: g10/keygen.c:1622 g10/keygen.c:1627
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "keysize tidak valid; menggunakan %u bit\n"
  
- #: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
++#: g10/keygen.c:1424 g10/keygen.c:1481 g10/keygen.c:1489 g10/keygen.c:1633
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "keysize dibulatkan hingga %u bit\n"
  
- #: g10/keygen.c:1503
++#: g10/keygen.c:1515
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1677
++#: g10/keygen.c:1689
  #, fuzzy
  msgid "Sign"
  msgstr "tandai"
  
- #: g10/keygen.c:1680
++#: g10/keygen.c:1692
  msgid "Certify"
  msgstr ""
  
- #: g10/keygen.c:1683
++#: g10/keygen.c:1695
  #, fuzzy
  msgid "Encrypt"
  msgstr "enkripsi data"
  
- #: g10/keygen.c:1686
++#: g10/keygen.c:1698
  msgid "Authenticate"
  msgstr ""
  
@@@ -5027,157 -3941,126 +4985,157 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1705
++#: g10/keygen.c:1717
  msgid "SsEeAaQq"
  msgstr ""
  
- #: g10/keygen.c:1732
++#: g10/keygen.c:1744
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr ""
  
- #: g10/keygen.c:1738
++#: g10/keygen.c:1750
  msgid "Current allowed actions: "
  msgstr ""
  
- #: g10/keygen.c:1743
++#: g10/keygen.c:1755
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr ""
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1758
  #, fuzzy, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "  (%d) ElGamal (hanya enkripsi)\n"
  
- #: g10/keygen.c:1749
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr ""
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr ""
  
- #: g10/keygen.c:1881 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1893 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Silakan pilih kunci yang anda inginkan:\n"
  
- #: g10/keygen.c:1885
++#: g10/keygen.c:1897
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "  (%d) DSA dan ElGamal (baku)\n"
  
- #: g10/keygen.c:1889
++#: g10/keygen.c:1901
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "  (%d) DSA dan ElGamal (baku)\n"
  
- #: g10/keygen.c:1892
++#: g10/keygen.c:1904
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "  (%d) DSA (hanya menandai)\n"
  
- #: g10/keygen.c:1894
++#: g10/keygen.c:1906
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "  (%d) RSA (hanya menandai)\n"
  
- #: g10/keygen.c:1900
++#: g10/keygen.c:1912
  #, fuzzy, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "  (%d) ElGamal (hanya enkripsi)\n"
  
- #: g10/keygen.c:1902
++#: g10/keygen.c:1914
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "  (%d) RSA (hanya enkripsi)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1920
  #, fuzzy, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "  (%d) RSA (hanya enkripsi)\n"
  
- #: g10/keygen.c:1910
++#: g10/keygen.c:1922
  #, fuzzy, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "  (%d) RSA (hanya enkripsi)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1928
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "  (%d) DSA dan ElGamal (baku)\n"
  
- #: g10/keygen.c:1918
++#: g10/keygen.c:1930
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "  (%d) DSA (hanya menandai)\n"
  
- #: g10/keygen.c:1920
++#: g10/keygen.c:1932
  #, fuzzy, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "  (%d) RSA (hanya enkripsi)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1934
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "  (%d) RSA (hanya enkripsi)\n"
  
- #: g10/keygen.c:1926
++#: g10/keygen.c:1938
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
  msgstr "  (%d) RSA (hanya enkripsi)\n"
  
- #: g10/keygen.c:2022 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:206
  #, fuzzy
  msgid "Enter the keygrip: "
  msgstr "Notasi signature: "
  
- #: g10/keygen.c:2035 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2047 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2049 sm/certreqgen-ui.c:216
  #, fuzzy
  msgid "No key with this keygrip\n"
  msgstr "Tidak ada ID user dengan index %d\n"
  
- #: g10/keygen.c:2111 g10/keygen.c:2125
++#: g10/keygen.c:2133 g10/keygen.c:2147
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
  msgstr "dibulatkan hingga %u bit\n"
  
- #: g10/keygen.c:2166
++#: g10/keygen.c:2188
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr ""
  
- #: g10/keygen.c:2174
++#: g10/keygen.c:2196
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Keysize yang anda inginkan? (1024) "
  
- #: g10/keygen.c:2177 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2199 sm/certreqgen-ui.c:183
  #, fuzzy, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Keysize yang anda inginkan? (1024) "
  
- #: g10/keygen.c:2191 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2213 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Keysize yang diminta adalah %u bit\n"
  
- #: g10/keygen.c:2237
++#: g10/keygen.c:2259
  #, fuzzy
  #| msgid "Please select what kind of key you want:\n"
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Silakan pilih kunci yang anda inginkan:\n"
  
- #: g10/keygen.c:2409
++#: g10/keygen.c:2431
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5193,7 -4076,6 +5151,7 @@@ msgstr "
  "     <n>m = kunci berakhir dalam n bulan\n"
  "     <n>y = kunci berakhir dalam n tahun\n"
  
- #: g10/keygen.c:2420
++#: g10/keygen.c:2442
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5209,40 -4091,32 +5167,40 @@@ msgstr "
  "     <n>m = signature berakhir dalam n bulan\n"
  "     <n>y = signature berakhir dalam n tahun\n"
  
- #: g10/keygen.c:2443
++#: g10/keygen.c:2465
  msgid "Key is valid for? (0) "
  msgstr "Kunci valid untuk? (0) "
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2470
  #, fuzzy, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Signature valid untuk? (0) "
  
- #: g10/keygen.c:2461 g10/keygen.c:2486
++#: g10/keygen.c:2483 g10/keygen.c:2508
  msgid "invalid value\n"
  msgstr "nilai yang tidak valid\n"
  
- #: g10/keygen.c:2468
++#: g10/keygen.c:2490
  #, fuzzy
  msgid "Key does not expire at all\n"
  msgstr "%s tidak pernah berakhir\n"
  
- #: g10/keygen.c:2469
++#: g10/keygen.c:2491
  #, fuzzy
  msgid "Signature does not expire at all\n"
  msgstr "%s tidak pernah berakhir\n"
  
- #: g10/keygen.c:2474
++#: g10/keygen.c:2496
  #, fuzzy, c-format
  msgid "Key expires at %s\n"
  msgstr "%s berakhir pada %s\n"
  
- #: g10/keygen.c:2475
++#: g10/keygen.c:2497
  #, fuzzy, c-format
  msgid "Signature expires at %s\n"
  msgstr "Signature kadaluarsa pada %s \n"
  
- #: g10/keygen.c:2479
++#: g10/keygen.c:2501
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5250,12 -4124,10 +5208,12 @@@ msgstr "
  "Sistem anda tidak dapat menampilkan tanggal melebihi 2038.\n"
  "Namun, ia dapat menanganinya secara benar hingga 2106.\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2514
  #, fuzzy
  msgid "Is this correct? (y/N) "
  msgstr "Benar (y/t)? "
  
- #: g10/keygen.c:2560
++#: g10/keygen.c:2582
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5266,7 -4138,6 +5224,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2575
++#: g10/keygen.c:2597
  #, fuzzy
  msgid ""
  "\n"
@@@ -5282,50 -4153,39 +5240,50 @@@ msgstr "
  "user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
  "  \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
  
- #: g10/keygen.c:2594
++#: g10/keygen.c:2616
  msgid "Real name: "
  msgstr "Nama sebenarnya: "
  
- #: g10/keygen.c:2603
++#: g10/keygen.c:2625
  msgid "Invalid character in name\n"
  msgstr "Karakter tidak valid dalam nama\n"
  
- #: g10/keygen.c:2604
++#: g10/keygen.c:2626
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2608
++#: g10/keygen.c:2630
  msgid "Name may not start with a digit\n"
  msgstr "Nama tidak boleh dimulai dengan digit\n"
  
- #: g10/keygen.c:2611
++#: g10/keygen.c:2633
  msgid "Name must be at least 5 characters long\n"
  msgstr "Nama harus berukuran minimum 5 karakter\n"
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2643
  msgid "Email address: "
  msgstr "Alamat email: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2649
  msgid "Not a valid email address\n"
  msgstr "Bukan alamat email yang valid\n"
  
- #: g10/keygen.c:2636
++#: g10/keygen.c:2658
  msgid "Comment: "
  msgstr "Komentar: "
  
- #: g10/keygen.c:2642
++#: g10/keygen.c:2664
  msgid "Invalid character in comment\n"
  msgstr "Karakter tidak valid dalam komentar\n"
  
- #: g10/keygen.c:2678
++#: g10/keygen.c:2700
  #, fuzzy, c-format
  #| msgid "You are using the `%s' character set.\n"
  msgid "You are using the '%s' character set.\n"
  msgstr "Anda menggunakan set karakter `%s'.\n"
  
- #: g10/keygen.c:2684
++#: g10/keygen.c:2706
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5335,7 -4195,6 +5293,7 @@@ msgstr "
  "Anda memilih USER-ID ini:\n"
  "   \"%s\"\n"
  
- #: g10/keygen.c:2689
++#: g10/keygen.c:2711
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n"
  
@@@ -5350,35 -4209,28 +5308,35 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2714
++#: g10/keygen.c:2736
  msgid "NnCcEeOoQq"
  msgstr "NnKkEeOoQq"
  
- #: g10/keygen.c:2724
++#: g10/keygen.c:2746
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (Q)uit? "
  
- #: g10/keygen.c:2725
++#: g10/keygen.c:2747
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (O)ke/(Q)uit? "
  
- #: g10/keygen.c:2730
++#: g10/keygen.c:2752
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (Q)uit? "
  
- #: g10/keygen.c:2731
++#: g10/keygen.c:2753
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (O)ke/(Q)uit? "
  
- #: g10/keygen.c:2750
++#: g10/keygen.c:2772
  msgid "Please correct the error first\n"
  msgstr "Silakan perbaiki kesalahan ini dulu\n"
  
- #: g10/keygen.c:2796
++#: g10/keygen.c:2818
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5390,13 -4242,10 +5348,13 @@@ msgstr "
  "selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
  "yang baik untuk memperoleh entropi.\n"
  
- #: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
- #: g10/keygen.c:4777 g10/keygen.c:4882
++#: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
++#: g10/keygen.c:4330 g10/keygen.c:4803 g10/keygen.c:5064 g10/keygen.c:5169
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Pembuatan kunci gagal: %s\n"
  
- #: g10/keygen.c:3598
++#: g10/keygen.c:3922
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5404,68 -4253,55 +5362,68 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3924
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3621
++#: g10/keygen.c:3945
  #, fuzzy, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "`%s' sudah dikompresi\n"
  
- #: g10/keygen.c:3626
++#: g10/keygen.c:3950
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "Create anyway? (y/N) "
  msgstr "Tetap dibuat? "
  
- #: g10/keygen.c:3632
++#: g10/keygen.c:3956
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "creating anyway\n"
  msgstr "Tetap dibuat? "
  
- #: g10/keygen.c:3981
++#: g10/keygen.c:4315
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:4013
++#: g10/keygen.c:4358
  msgid "Key generation canceled.\n"
  msgstr "Pembuatan kunci dibatalkan.\n"
  
- #: g10/keygen.c:4073
++#: g10/keygen.c:4418
  #, fuzzy, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "tidak dapat membuat %s: %s\n"
  
- #: g10/keygen.c:4093
++#: g10/keygen.c:4438
  #, fuzzy, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
  
- #: g10/keygen.c:4244 g10/keygen.c:4393
++#: g10/keygen.c:4589 g10/keygen.c:4738
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
  msgstr "menulis kunci publik ke `%s'\n"
  
- #: g10/keygen.c:4387
++#: g10/keygen.c:4732
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
  
- #: g10/keygen.c:4401
++#: g10/keygen.c:4746
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error writing public keyring '%s': %s\n"
  msgstr "kesalahan menulis keyring publik `%s': %s\n"
  
- #: g10/keygen.c:4433
++#: g10/keygen.c:4778
  msgid "public and secret key created and signed.\n"
  msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
  
- #: g10/keygen.c:4445
++#: g10/keygen.c:4790
  #, fuzzy
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
@@@ -5475,36 -4311,30 +5433,36 @@@ msgstr "
  "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
  "untuk tujuan ini.\n"
  
- #: g10/keygen.c:4649 g10/keygen.c:4833
++#: g10/keygen.c:4936 g10/keygen.c:5120
  #, 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:4651 g10/keygen.c:4835
++#: g10/keygen.c:4938 g10/keygen.c:5122
  #, 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:4662 g10/keygen.c:4846
++#: g10/keygen.c:4949 g10/keygen.c:5133
  #, fuzzy
  #| 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:4674 g10/keygen.c:4676
++#: g10/keygen.c:4961 g10/keygen.c:4963
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
  
- #: g10/keygen.c:4683 g10/keygen.c:4685
++#: g10/keygen.c:4970 g10/keygen.c:4972
  #, fuzzy
  msgid "Secret parts of primary key are stored on-card.\n"
  msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
  
- #: g10/keygen.c:4704 g10/keygen.c:4860
++#: g10/keygen.c:4991 g10/keygen.c:5147
  #, fuzzy
  msgid "Really create? (y/N) "
  msgstr "Ingin diciptakan? "
@@@ -5829,128 -4594,102 +5787,128 @@@ msgstr "
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
  msgstr "pembatalan mandiri - gunakan \"gpg --import\" untuk mengaplikasikan\n"
  
- #: g10/mainproc.c:1233 g10/mainproc.c:1276
++#: g10/mainproc.c:1238 g10/mainproc.c:1281
  #, fuzzy
  msgid "no signature found\n"
  msgstr "Signature baik dari \""
  
- #: g10/mainproc.c:1607
++#: g10/mainproc.c:1612
  #, fuzzy, c-format
  msgid "BAD signature from \"%s\""
  msgstr "signature BURUK dari \""
  
- #: g10/mainproc.c:1609
++#: g10/mainproc.c:1614
  #, fuzzy, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Signature kadaluarsa dari \""
  
- #: g10/mainproc.c:1611
++#: g10/mainproc.c:1616
  #, fuzzy, c-format
  msgid "Good signature from \"%s\""
  msgstr "Signature baik dari \""
  
- #: g10/mainproc.c:1630
++#: g10/mainproc.c:1635
  msgid "signature verification suppressed\n"
  msgstr "verifikasi signature tidak diabaikan\n"
  
- #: g10/mainproc.c:1739
++#: g10/mainproc.c:1744
  #, fuzzy
  msgid "can't handle this ambiguous signature data\n"
  msgstr "tidak dapat menangani banyak signature ini\n"
  
- #: g10/mainproc.c:1753 g10/mainproc.c:1761
++#: g10/mainproc.c:1758 g10/mainproc.c:1766
  #, fuzzy, c-format
  msgid "Signature made %s\n"
  msgstr "Signature kadaluwarsa %s\n"
  
- #: g10/mainproc.c:1754 g10/mainproc.c:1762
++#: g10/mainproc.c:1759 g10/mainproc.c:1767
  #, fuzzy, c-format
  msgid "               using %s key %s\n"
  msgstr "              alias \""
  
- #: g10/mainproc.c:1766
++#: g10/mainproc.c:1771
  #, 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:1772
++#: g10/mainproc.c:1777
  #, fuzzy, c-format
  msgid "               issuer \"%s\"\n"
  msgstr "              alias \""
  
- #: g10/mainproc.c:1789
++#: g10/mainproc.c:1794
  msgid "Key available at: "
  msgstr "Kunci tersedia di:"
  
- #: g10/mainproc.c:2024
++#: g10/mainproc.c:2029
  msgid "[uncertain]"
  msgstr "[uncertain]"
  
- #: g10/mainproc.c:2062
++#: g10/mainproc.c:2067
  #, fuzzy, c-format
  msgid "                aka \"%s\""
  msgstr "              alias \""
  
- #: g10/mainproc.c:2145
++#: g10/mainproc.c:2150
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "Signature kadaluwarsa %s\n"
  
- #: g10/mainproc.c:2149
++#: g10/mainproc.c:2154
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "Signature kadaluarsa pada %s \n"
  
- #: g10/mainproc.c:2160
++#: g10/mainproc.c:2165
  #, 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:2161
++#: g10/mainproc.c:2166
  msgid "binary"
  msgstr "biner"
  
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2167
  msgid "textmode"
  msgstr "modeteks"
  
- #: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "tidak dikenal"
  
- #: g10/mainproc.c:2164
++#: g10/mainproc.c:2169
  #, fuzzy
  #| msgid "unknown pubkey algorithm"
  msgid ", key algorithm "
  msgstr "algoritma pubkey tidak dikenal"
  
- #: g10/mainproc.c:2199
++#: g10/mainproc.c:2204
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2229
++#: g10/mainproc.c:2234
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "Tidak dapat memeriksa signature: %s\n"
  
- #: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
++#: g10/mainproc.c:2327 g10/mainproc.c:2346 g10/mainproc.c:2470
  msgid "not a detached signature\n"
  msgstr "bukan detached signature\n"
  
- #: g10/mainproc.c:2375
++#: g10/mainproc.c:2380
  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:2384
++#: g10/mainproc.c:2389
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "kelas signature mandiri 0x%02x\n"
  
- #: g10/mainproc.c:2469
++#: g10/mainproc.c:2474
  msgid "old style (PGP 2.x) signature\n"
  msgstr "signature model lama (PGP 2.X)\n"
  
@@@ -6236,23 -4921,18 +6194,23 @@@ msgstr "Apakah foto ini benar (y/N/q)? 
  msgid "unable to display photo ID!\n"
  msgstr "tidak dapat menampilkan photo ID!\n"
  
- #: g10/pkclist.c:72 g10/revoke.c:757
++#: g10/pkclist.c:72 g10/revoke.c:758
  msgid "No reason specified"
  msgstr "Tidak ada alasan diberikan"
  
- #: g10/pkclist.c:74 g10/revoke.c:759
++#: g10/pkclist.c:74 g10/revoke.c:760
  msgid "Key is superseded"
  msgstr "Kunci dilampaui"
  
- #: g10/pkclist.c:76 g10/revoke.c:758
++#: g10/pkclist.c:76 g10/revoke.c:759
  msgid "Key has been compromised"
  msgstr "Kunci ini telah dikompromikan"
  
- #: g10/pkclist.c:78 g10/revoke.c:760
++#: g10/pkclist.c:78 g10/revoke.c:761
  msgid "Key is no longer used"
  msgstr "Kunci tidak lagi digunakan"
  
- #: g10/pkclist.c:80 g10/revoke.c:761
++#: g10/pkclist.c:80 g10/revoke.c:762
  msgid "User ID is no longer valid"
  msgstr "ID User tidak lagi valid"
  
@@@ -6333,7 -5000,6 +6291,7 @@@ msgid "
  "\n"
  msgstr ""
  
- #: g10/pkclist.c:310 g10/revoke.c:786
++#: g10/pkclist.c:310 g10/revoke.c:787
  msgid "Your decision? "
  msgstr "Keputusan anda? "
  
@@@ -6372,10 -5031,9 +6330,10 @@@ msgstr "Kunci ini milik kita\n
  msgid "%s: This key is bad!  It has been marked as untrusted!\n"
  msgstr ""
  
 +#: g10/pkclist.c:484
  #, fuzzy
  msgid ""
- "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "This key is bad!  It has been marked as untrusted!  If you\n"
  "*really* know what you are doing, you may answer the next\n"
  "question with yes.\n"
  msgstr ""
@@@ -6532,33 -5160,26 +6490,33 @@@ msgstr "
  msgid "No such user ID.\n"
  msgstr "Tidak ada ID user tersebut.\n"
  
- #: g10/pkclist.c:1197 g10/pkclist.c:1273
++#: g10/pkclist.c:1197 g10/pkclist.c:1274
  msgid "skipped: public key already set as default recipient\n"
  msgstr "dilewati: kunci publik telah diset sebagai penerima baku\n"
  
- #: g10/pkclist.c:1218
++#: g10/pkclist.c:1219
  msgid "Public key is disabled.\n"
  msgstr "Kunci publik dimatikan.\n"
  
- #: g10/pkclist.c:1228
++#: g10/pkclist.c:1229
  msgid "skipped: public key already set\n"
  msgstr "dilewati: kunci publik telah diset\n"
  
- #: g10/pkclist.c:1263
++#: g10/pkclist.c:1264
  #, fuzzy, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "penerima baku tidak dikenal `%s'\n"
  
- #: g10/pkclist.c:1312
++#: g10/pkclist.c:1313
  msgid "no valid addressees\n"
  msgstr "tidak ada alamat yang valid\n"
  
- #: g10/pkclist.c:1665
++#: g10/pkclist.c:1666
  #, fuzzy, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "kunci %08lX: tidak ada ID user\n"
  
- #: g10/pkclist.c:1690
++#: g10/pkclist.c:1691
  #, fuzzy, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "kunci %08lX: tidak ada ID user\n"
@@@ -6567,29 -5187,23 +6525,29 @@@
  msgid "data not saved; use option \"--output\" to save it\n"
  msgstr "data tidak disimpan; gunakan pilihan \"--output\" untuk menyimpannya\n"
  
- #: g10/plaintext.c:598
++#: g10/plaintext.c:614
  msgid "Detached signature.\n"
  msgstr "Menghapus signature.\n"
  
- #: g10/plaintext.c:606
++#: g10/plaintext.c:622
  msgid "Please enter name of data file: "
  msgstr "Silakan masukkan nama file data: "
  
- #: g10/plaintext.c:643
++#: g10/plaintext.c:659
  msgid "reading stdin ...\n"
  msgstr "membaca stdin ...\n"
  
- #: g10/plaintext.c:688
++#: g10/plaintext.c:704
  msgid "no signed data\n"
  msgstr "tidak ada data tertandai\n"
  
- #: g10/plaintext.c:706
++#: g10/plaintext.c:722
  #, fuzzy, c-format
  #| msgid "can't open signed data `%s'\n"
  msgid "can't open signed data '%s'\n"
  msgstr "tidak dapat membuka data tertandai `%s'\n"
  
- #: g10/plaintext.c:741
++#: g10/plaintext.c:757
  #, fuzzy, c-format
  msgid "can't open signed data fd=%d: %s\n"
  msgstr "tidak dapat membuka data tertandai `%s'\n"
@@@ -6658,7 -5258,6 +6616,7 @@@ msgstr "Kunci rahasia tersedia.\n
  msgid "Create a designated revocation certificate for this key? (y/N) "
  msgstr "Buat sertifikat pembatalan untuk kunci ini?"
  
- #: g10/revoke.c:336 g10/revoke.c:727
++#: g10/revoke.c:336 g10/revoke.c:728
  msgid "ASCII armored output forced.\n"
  msgstr "Pemaksaan output mode ASCII.\n"
  
@@@ -6694,23 -5287,20 +6652,23 @@@ msgid "
  "the secret key.  However, if the secret key is still accessible,\n"
  "it is better to generate a new revocation certificate and give\n"
  "a reason for the revocation.  For details see the description of\n"
- "of the gpg command \"--gen-revoke\" in the GnuPG manual."
+ "of the gpg command \"--generate-revocation\" in the GnuPG manual."
  msgstr ""
  
- #: g10/revoke.c:575
++#: g10/revoke.c:576
  msgid ""
  "To avoid an accidental use of this file, a colon has been inserted\n"
  "before the 5 dashes below.  Remove this colon with a text editor\n"
  "before importing and publishing this revocation certificate."
  msgstr ""
  
- #: g10/revoke.c:590
++#: g10/revoke.c:591
  #, fuzzy, c-format
  #| msgid "Revocation certificate created.\n"
  msgid "revocation certificate stored as '%s.rev'\n"
  msgstr "Sertifikat pembatalan tercipta.\n"
  
- #: g10/revoke.c:634
++#: g10/revoke.c:635
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found\n"
  msgstr "kunci rahasia `%s' tidak ditemukan: %s\n"
@@@ -6718,23 -5308,19 +6676,23 @@@
  #. TRANSLATORS: The %s prints a key specification which
  #. for example has been given at the command line.  Several lines
  #. lines with secret key infos are printed after this message.
- #: g10/revoke.c:661
++#: g10/revoke.c:662
  #, c-format
  msgid "'%s' matches multiple secret keys:\n"
  msgstr ""
  
- #: g10/revoke.c:688
++#: g10/revoke.c:689
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error searching the keyring: %s\n"
  msgstr "kesalahan menulis keyring `%s': %s\n"
  
- #: g10/revoke.c:711
++#: g10/revoke.c:712
  #, fuzzy
  msgid "Create a revocation certificate for this key? (y/N) "
  msgstr "Buat sertifikat pembatalan untuk kunci ini?"
  
- #: g10/revoke.c:735
++#: g10/revoke.c:736
  msgid ""
  "Revocation certificate created.\n"
  "\n"
@@@ -6754,34 -5340,27 +6712,34 @@@ msgstr "
  "pencetakan\n"
  "mesin anda mungkin menyimpan data dan menyediakannya untuk yang lain!\n"
  
- #: g10/revoke.c:769
++#: g10/revoke.c:770
  msgid "Please select the reason for the revocation:\n"
  msgstr "Silakan pilih alasan untuk pembatalan:\n"
  
- #: g10/revoke.c:779
++#: g10/revoke.c:780
  msgid "Cancel"
  msgstr "Batal"
  
- #: g10/revoke.c:781
++#: g10/revoke.c:782
  #, c-format
  msgid "(Probably you want to select %d here)\n"
  msgstr "(Mungkin anda ingin memilih %d di sini)\n"
  
- #: g10/revoke.c:822
++#: g10/revoke.c:823
  msgid "Enter an optional description; end it with an empty line:\n"
  msgstr ""
  "Masukkan sebuah deskripsi opsional; akhiri dengan sebuah baris kosong:\n"
  
- #: g10/revoke.c:850
++#: g10/revoke.c:851
  #, c-format
  msgid "Reason for revocation: %s\n"
  msgstr "Alasan pembatalan: %s\n"
  
- #: g10/revoke.c:852
++#: g10/revoke.c:853
  msgid "(No description given)\n"
  msgstr "(Tidak diberikan deskripsi)\n"
  
- #: g10/revoke.c:857
++#: g10/revoke.c:858
  #, fuzzy
  msgid "Is this okay? (y/N) "
  msgstr "Ini oke? "
@@@ -6913,22 -5472,18 +6871,22 @@@ msgstr "
  "PERINGATAN: tidak dapat melakukan %%-expand policy url (terlalu besar).  "
  "Menggunakan yang tidak expand.\n"
  
- #: g10/sign.c:329
++#: g10/sign.c:331
  #, fuzzy, c-format
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s signature dari: \"%s\"\n"
  
- #: g10/sign.c:878
++#: g10/sign.c:880
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
  msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
  
- #: g10/sign.c:1009
++#: g10/sign.c:1011
  msgid "signing:"
  msgstr "menandai:"
  
- #: g10/sign.c:1286
++#: g10/sign.c:1288
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "%s enkripsi akan digunakan\n"
@@@ -6955,7 -5506,6 +6913,7 @@@ msgstr "
  "melewati `%s': ini adalah kunci ElGamal yang dihasilkan PGP yang tidak aman "
  "untuk signature!\n"
  
- #: g10/tdbdump.c:57 g10/trustdb.c:362
++#: g10/tdbdump.c:57 g10/trustdb.c:369
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
@@@ -7003,7 -5545,6 +6961,7 @@@ msgstr "kesalahan: gagal menemukan cata
  msgid "read error in '%s': %s\n"
  msgstr "kesalahan pembacaan: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "trustdb: gagal sync: %s\n"
@@@ -7149,298 -5661,306 +7107,372 @@@ msgstr "tidak dapat menangani baris tek
  msgid "input line longer than %d characters\n"
  msgstr "baris input lebih dari %d karakter\n"
  
- #: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
++#: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
  #, fuzzy, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "kesalahan mengirim ke `%s': %s\n"
  
- #: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
++#: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:357 g10/tofu.c:699
++#: g10/tofu.c:355 g10/tofu.c:888
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:501
++#: g10/tofu.c:505
  #, fuzzy, c-format
  msgid "unsupported TOFU database version: %s\n"
  msgstr ""
  "\n"
  "Algoritma yang didukung:\n"
  
- #: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
- #: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
- #: g10/tofu.c:3056
++#: g10/tofu.c:538
+ #, fuzzy, c-format
+ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
+ msgstr "kesalahan penciptaan passphrase: %s\n"
+ 
++#: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
+ msgid "TOFU DB error"
+ msgstr ""
+ 
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2340 g10/tofu.c:2359
++#: g10/tofu.c:2372 g10/tofu.c:2384 g10/tofu.c:2399 g10/tofu.c:2411
++#: g10/tofu.c:2980 g10/tofu.c:2997 g10/tofu.c:3033 g10/tofu.c:3050
++#: g10/tofu.c:3353
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "kesalahan mengirim ke `%s': %s\n"
  
- #: g10/tofu.c:566 g10/tofu.c:574
++#: g10/tofu.c:716 g10/tofu.c:724
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error determining TOFU database's version: %s\n"
  msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
  
- #: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
++#: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing TOFU database: %s\n"
  msgstr "%s: kesalahan menulis dir record: %s\n"
  
- #: g10/tofu.c:765
++#: g10/tofu.c:844
+ #, fuzzy, c-format
+ msgid "error creating 'encryptions' TOFU table: %s\n"
+ msgstr "kesalahan mengirim ke `%s': %s\n"
+ 
++#: g10/tofu.c:874
+ #, c-format
+ msgid "adding column effective_policy to bindings DB: %s\n"
+ msgstr ""
+ 
++#: g10/tofu.c:956
  #, fuzzy, c-format
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "kesalahan membaca `%s': %s\n"
  
- #: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
++#: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "kesalahan mengirim ke `%s': %s\n"
  
- #: g10/tofu.c:1239
++#: g10/tofu.c:1328
  #, c-format
  msgid ""
  "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1247
++#: g10/tofu.c:1337
  #, c-format
- msgid "The email address \"%s\" is associated with %d keys!"
- msgstr ""
+ msgid "The email address \"%s\" is associated with %d key!"
+ msgid_plural "The email address \"%s\" is associated with %d keys!"
+ msgstr[0] ""
+ msgstr[1] ""
  
- #: g10/tofu.c:1251
++#: g10/tofu.c:1343
  msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  
- #: g10/tofu.c:1257
++#: g10/tofu.c:1349
  #, c-format
  msgid ""
  "Please indicate whether this email address should be associated with key %s "
  "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1513
++#: g10/tofu.c:1605
  #, fuzzy, c-format
  msgid "error gathering other user IDs: %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: g10/tofu.c:1523
++#: g10/tofu.c:1615
  #, fuzzy
  #| msgid "list key and user IDs"
  msgid "This key's user IDs:\n"
  msgstr "tampilkan kunci dan ID user"
  
- #: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
++#: g10/tofu.c:1631 g10/tofu.c:1796
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "policy: %s"
  msgstr "Kebijakan: "
  
- #: g10/tofu.c:1630
++#: g10/tofu.c:1722
  #, fuzzy, c-format
  msgid "error gathering signature stats: %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: g10/tofu.c:1634
++#: g10/tofu.c:1726
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1651
++#: g10/tofu.c:1744
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1684 g10/tofu.c:1689
++#: g10/tofu.c:1785 g10/tofu.c:1790
  msgid ", "
  msgstr ""
  
- #: g10/tofu.c:1693
++#: g10/tofu.c:1794
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
  msgstr "tampilkan kunci"
  
- #: g10/tofu.c:1715
++#: g10/tofu.c:1820
+ #, fuzzy, c-format
+ msgid "Verified %d message."
+ msgid_plural "Verified %d messages."
+ msgstr[0] "|algo [file]|cetak digest pesan"
+ msgstr[1] "|algo [file]|cetak digest pesan"
+ 
++#: g10/tofu.c:1824
  #, fuzzy, c-format
- msgid "Verified %d message"
- msgid_plural "Verified %d messages"
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid "Encrypted %d message."
+ msgid_plural "Encrypted %d messages."
+ msgstr[0] "dienkripsi dengan passphrase %lu\n"
+ msgstr[1] "dienkripsi dengan passphrase %lu\n"
+ 
++#: g10/tofu.c:1831
+ #, fuzzy, c-format
+ msgid "Verified %d message in the future."
+ msgid_plural "Verified %d messages in the future."
+ msgstr[0] "|algo [file]|cetak digest pesan"
+ msgstr[1] "|algo [file]|cetak digest pesan"
+ 
++#: g10/tofu.c:1835
+ #, fuzzy, c-format
+ msgid "Encrypted %d message in the future."
+ msgid_plural "Encrypted %d messages in the future."
  msgstr[0] "|algo [file]|cetak digest pesan"
  msgstr[1] "|algo [file]|cetak digest pesan"
  
- #: g10/tofu.c:1719
++#: g10/tofu.c:1849
  #, c-format
- msgid "Encrypted %d message"
- msgid_plural "Encrypted %d messages"
+ msgid "Messages verified over the past %d day: %d."
+ msgid_plural "Messages verified over the past %d days: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1734
++#: g10/tofu.c:1855
  #, c-format
- msgid " over the past day."
- msgid_plural " over the past %d days."
+ msgid "Messages encrypted over the past %d day: %d."
+ msgid_plural "Messages encrypted over the past %d days: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1740
++#: g10/tofu.c:1865
  #, c-format
- msgid " over the past month."
- msgid_plural " over the past %d months."
+ msgid "Messages verified over the past %d month: %d."
+ msgid_plural "Messages verified over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1746
++#: g10/tofu.c:1871
  #, c-format
- msgid " over the past year."
- msgid_plural " over the past %d years."
+ msgid "Messages encrypted over the past %d month: %d."
+ msgid_plural "Messages encrypted over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1752
- msgid " in the past."
++#: g10/tofu.c:1881
+ #, c-format
+ msgid "Messages verified over the past %d year: %d."
+ msgid_plural "Messages verified over the past %d years: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1887
+ #, c-format
+ msgid "Messages encrypted over the past %d year: %d."
+ msgid_plural "Messages encrypted over the past %d years: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1895
+ #, c-format
+ msgid "Messages verified in the past: %d."
  msgstr ""
  
++#: g10/tofu.c:1899
+ #, fuzzy, c-format
+ msgid "Messages encrypted in the past: %d."
+ msgstr "|algo [file]|cetak digest pesan"
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1767
++#: g10/tofu.c:1916
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1809
++#: g10/tofu.c:1958
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1815
++#: g10/tofu.c:1964
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1823
++#: g10/tofu.c:1972
  msgid "Defaulting to unknown."
  msgstr ""
  
- #: g10/tofu.c:1938 g10/tofu.c:2074
++#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
- #: g10/tofu.c:1994
++#: g10/tofu.c:2143
  #, fuzzy, c-format
  msgid "resetting keydb: %s\n"
  msgstr "kesalahan menulis keyring `%s': %s\n"
  
- #: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
- #: g10/tofu.c:2425
++#: g10/tofu.c:2601
  #, fuzzy, c-format
- msgid "error setting TOFU binding's trust level to %s\n"
+ msgid "error setting TOFU binding's policy to %s\n"
  msgstr "kesalahan membaca `%s': %s\n"
  
- #: g10/tofu.c:2473
++#: g10/tofu.c:2794
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #. TRANSLATORS: The tilde ('~') is used here to indicate a
- #. * non-breakable space
- #: g10/tofu.c:2574
++#: g10/tofu.c:2839
  #, c-format
- msgid "%d~year"
- msgid_plural "%d~years"
+ msgid "%lld~year"
+ msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2583
++#: g10/tofu.c:2844
  #, c-format
- msgid "%d~month"
- msgid_plural "%d~months"
+ msgid "%lld~month"
+ msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2592
++#: g10/tofu.c:2849
  #, c-format
- msgid "%d~day"
- msgid_plural "%d~days"
+ msgid "%lld~week"
+ msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2854
  #, c-format
- msgid "%d~hour"
- msgid_plural "%d~hours"
+ msgid "%lld~day"
+ msgid_plural "%lld~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2610
++#: g10/tofu.c:2859
  #, c-format
- msgid "%d~minute"
- msgid_plural "%d~minutes"
+ msgid "%lld~hour"
+ msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2619
++#: g10/tofu.c:2864
  #, c-format
- msgid "%d~second"
- msgid_plural "%d~seconds"
+ msgid "%lld~minute"
+ msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2802
++#: g10/tofu.c:2866
  #, c-format
- msgid "%s: "
+ msgid "%lld~second"
+ msgid_plural "%lld~seconds"
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:3103
+ #, c-format
+ msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:2806
++#: g10/tofu.c:3109
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
- msgid "Verified %ld signatures"
+ msgid "%s: Verified 0 signatures."
  msgstr "Menghapus %d signature.\n"
  
- #: g10/tofu.c:2816
++#: g10/tofu.c:3117
  #, fuzzy, c-format
- msgid "Verified %ld signature in the past %s"
- msgid_plural "Verified %ld signatures in the past %s"
+ msgid "%s: Verified %ld~signature in the past %s."
+ msgid_plural "%s: Verified %ld~signatures in the past %s."
  msgstr[0] "|algo [file]|cetak digest pesan"
  msgstr[1] "|algo [file]|cetak digest pesan"
  
- #: g10/tofu.c:2826
- #, fuzzy, c-format
++#: g10/tofu.c:3127
+ #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
- msgid ", and encrypted %ld messages"
+ msgid "Encrypted 0 messages."
  msgstr "dienkripsi dengan passphrase %lu\n"
  
- #: g10/tofu.c:2835
++#: g10/tofu.c:3135
  #, fuzzy, c-format
- msgid ", and encrypted %ld message in the past %s"
- msgid_plural ", and encrypted %ld messages in the past %s"
+ msgid "Encrypted %ld~message in the past %s."
+ msgid_plural "Encrypted %ld~messages in the past %s."
  msgstr[0] "|algo [file]|cetak digest pesan"
  msgstr[1] "|algo [file]|cetak digest pesan"
  
- #: g10/tofu.c:2880
++#: g10/tofu.c:3146
+ #, fuzzy, c-format
+ #| msgid "Policy: "
+ msgid "(policy: %s)"
+ msgstr "Kebijakan: "
+ 
++#: g10/tofu.c:3177
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2883
++#: g10/tofu.c:3180
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2887
++#: g10/tofu.c:3184
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2890
++#: g10/tofu.c:3187
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2919
++#: g10/tofu.c:3216
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7457,18 -5977,14 +7489,18 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
- #: g10/tofu.c:3480 g10/tofu.c:3572
++#: g10/tofu.c:3298 g10/tofu.c:3449 g10/tofu.c:3627 g10/tofu.c:3670
++#: g10/tofu.c:3784 g10/tofu.c:3859 g10/tofu.c:3894
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "kesalahan mengirim ke `%s': %s\n"
  
- #: g10/tofu.c:3185
++#: g10/tofu.c:3482
  #, c-format
- msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
  msgstr ""
  
- #: g10/tofu.c:3515
++#: g10/tofu.c:3819
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7500,74 -6011,59 +7532,74 @@@ msgstr "kunci %08lX: tidak ada kunci pu
  msgid "key %s marked as ultimately trusted\n"
  msgstr "kunci ditandai sebagai sangat dipercaya.\n"
  
- #: g10/trustdb.c:341
++#: g10/trustdb.c:348
  #, 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:347
++#: g10/trustdb.c:354
  #, 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:422
++#: g10/trustdb.c:429
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr ""
  
- #: g10/trustdb.c:431
++#: g10/trustdb.c:438
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:468
++#: g10/trustdb.c:475
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:474
++#: g10/trustdb.c:481
  #, c-format
  msgid "using %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:511
++#: g10/trustdb.c:518
  msgid "no need for a trustdb check\n"
  msgstr "tidak perlu memeriksa trustdb\n"
  
- #: g10/trustdb.c:517 g10/trustdb.c:2160
++#: g10/trustdb.c:524 g10/trustdb.c:2187
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "pemeriksaan trustdb berikutnya pada %s\n"
  
- #: g10/trustdb.c:526
++#: g10/trustdb.c:533
  #, fuzzy, c-format
  msgid "no need for a trustdb check with '%s' trust model\n"
  msgstr "tidak perlu memeriksa trustdb\n"
  
- #: g10/trustdb.c:542
++#: g10/trustdb.c:549
  #, fuzzy, c-format
  msgid "no need for a trustdb update with '%s' trust model\n"
  msgstr "tidak perlu memeriksa trustdb\n"
  
- #: g10/trustdb.c:749 g10/trustdb.c:1313
++#: g10/trustdb.c:756 g10/trustdb.c:1340
  #, fuzzy, c-format
  msgid "public key %s not found: %s\n"
  msgstr "kunci publik %08lX tidak ditemukan: %s\n"
  
- #: g10/trustdb.c:966
++#: g10/trustdb.c:973
  msgid "please do a --check-trustdb\n"
  msgstr "lakukanlah --check-trustdb\n"
  
- #: g10/trustdb.c:971
++#: g10/trustdb.c:978
  msgid "checking the trustdb\n"
  msgstr "memeriksa trustdb\n"
  
- #: g10/trustdb.c:1883
++#: g10/trustdb.c:1910
  #, 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:1886
++#: g10/trustdb.c:1913
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7575,22 -6071,18 +7607,22 @@@ msgid_plural " (%d validity counts clea
  msgstr[0] "%d kunci diproses (%d hitungan validitas dihapus)\n"
  msgstr[1] "%d kunci diproses (%d hitungan validitas dihapus)\n"
  
- #: g10/trustdb.c:1956
++#: g10/trustdb.c:1983
  msgid "no ultimately trusted keys found\n"
  msgstr "tidak ditemukan kunci yang benar-benar terpercaya\n"
  
- #: g10/trustdb.c:1970
++#: g10/trustdb.c:1997
  #, 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:2087
++#: g10/trustdb.c:2114
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr ""
  
- #: g10/trustdb.c:2167
++#: g10/trustdb.c:2194
  #, fuzzy, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
@@@ -7704,19 -6175,14 +7736,19 @@@ msgid "
  "List, export, import Keybox data\n"
  msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3208
++#: scd/app-nks.c:718 scd/app-openpgp.c:3221
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3220
++#: scd/app-nks.c:726 scd/app-openpgp.c:3233
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
- #: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
- #: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1965 scd/app-openpgp.c:1984
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2166 scd/app-openpgp.c:2430
++#: scd/app-openpgp.c:2477 scd/app-openpgp.c:2582 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr ""
@@@ -7765,84 -6222,66 +7797,84 @@@ msgid "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2511 scd/app-dinsig.c:532
  #, fuzzy, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: scd/app-openpgp.c:806
++#: scd/app-openpgp.c:801
  #, fuzzy, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "gagal inisialisasi TrustDB: %s\n"
  
- #: scd/app-openpgp.c:819
++#: scd/app-openpgp.c:814
  #, fuzzy, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "gagal membuat kembali cache keyring: %s\n"
  
- #: scd/app-openpgp.c:1236
++#: scd/app-openpgp.c:1247
  msgid "response does not contain the RSA modulus\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1243
++#: scd/app-openpgp.c:1254
  msgid "response does not contain the RSA public exponent\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1353
++#: scd/app-openpgp.c:1364
  #, fuzzy
  #| msgid "remove keys from the public keyring"
  msgid "response does not contain the EC public key\n"
  msgstr "hapus kunci dari keyring publik"
  
- #: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:1464 scd/app-openpgp.c:3825
  msgid "response does not contain the public key data\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1551
++#: scd/app-openpgp.c:1564
  #, fuzzy, c-format
  msgid "reading public key failed: %s\n"
  msgstr "gagal menghapus keyblok: %s\n"
  
- #: scd/app-openpgp.c:1903
++#: scd/app-openpgp.c:1916
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1910
++#: scd/app-openpgp.c:1923
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1925
++#: scd/app-openpgp.c:1938
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr ""
  
- #: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
++#: scd/app-openpgp.c:1949 scd/app-openpgp.c:2424
  #, fuzzy
  msgid "||Please enter the PIN"
  msgstr "ubah passphrase"
  
- #: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2173 scd/app-openpgp.c:2437
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
- #: scd/app-openpgp.c:4114
++#: scd/app-openpgp.c:2004 scd/app-openpgp.c:2043 scd/app-openpgp.c:2185
++#: scd/app-openpgp.c:4126
  #, fuzzy, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "Pengiriman keyserver gagal: %s\n"
  
- #: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
++#: scd/app-openpgp.c:2072 scd/app-openpgp.c:2458 scd/app-openpgp.c:4556
  msgid "error retrieving CHV status from card\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
++#: scd/app-openpgp.c:2078 scd/app-openpgp.c:4565
  msgid "card is permanently locked!\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2072
++#: scd/app-openpgp.c:2085
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7852,26 -6291,21 +7884,26 @@@ msgstr[1] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:2082
++#: scd/app-openpgp.c:2095
  #, fuzzy, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "ubah passphrase"
  
- #: scd/app-openpgp.c:2086
++#: scd/app-openpgp.c:2099
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
  msgstr "ubah passphrase"
  
- #: scd/app-openpgp.c:2107
++#: scd/app-openpgp.c:2120
  msgid "access to admin commands is not configured\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2460
++#: scd/app-openpgp.c:2473
  #, fuzzy
  msgid "||Please enter the Reset Code for the card"
  msgstr "Silakan pilih alasan untuk pembatalan:\n"
  
- #: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
++#: scd/app-openpgp.c:2483 scd/app-openpgp.c:2537
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr ""
@@@ -7879,117 -6313,93 +7911,117 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2493
++#: scd/app-openpgp.c:2506
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|AN|New Admin PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|N|New PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2565
++#: scd/app-openpgp.c:2578
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "ubah passphrase"
  
- #: scd/app-openpgp.c:2566
++#: scd/app-openpgp.c:2579
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
  msgstr "ubah passphrase"
  
- #: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
++#: scd/app-openpgp.c:2635 scd/app-openpgp.c:3885
  #, fuzzy
  msgid "error reading application data\n"
  msgstr "gagal membaca keyblock: %s\n"
  
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
++#: scd/app-openpgp.c:2641 scd/app-openpgp.c:3892
  #, fuzzy
  msgid "error reading fingerprint DO\n"
  msgstr "%s: kesalahan membaca record bebas: %s\n"
  
- #: scd/app-openpgp.c:2638
++#: scd/app-openpgp.c:2651
  #, fuzzy
  msgid "key already exists\n"
  msgstr "`%s' sudah dikompresi\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2655
  msgid "existing key will be replaced\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2644
++#: scd/app-openpgp.c:2657
  #, fuzzy
  msgid "generating new key\n"
  msgstr "buat sepasang kunci baru"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2659
  #, fuzzy
  msgid "writing new key\n"
  msgstr "buat sepasang kunci baru"
  
- #: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
++#: scd/app-openpgp.c:3201 scd/app-openpgp.c:3553
  msgid "creation timestamp missing\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
++#: scd/app-openpgp.c:3243 scd/app-openpgp.c:3251
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
++#: scd/app-openpgp.c:3384 scd/app-openpgp.c:3647
  #, fuzzy, c-format
  msgid "failed to store the key: %s\n"
  msgstr "gagal inisialisasi TrustDB: %s\n"
  
- #: scd/app-openpgp.c:3534
++#: scd/app-openpgp.c:3547
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "URI tidak didukung"
  
- #: scd/app-openpgp.c:3790
++#: scd/app-openpgp.c:3802
  msgid "please wait while key is being generated ...\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3798
++#: scd/app-openpgp.c:3810
  #, fuzzy
  msgid "generating key failed\n"
  msgstr "gagal menghapus keyblok: %s\n"
  
- #: scd/app-openpgp.c:3804
++#: scd/app-openpgp.c:3816
  #, fuzzy, c-format
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
  msgstr[0] "Pembuatan kunci gagal: %s\n"
  msgstr[1] "Pembuatan kunci gagal: %s\n"
  
- #: scd/app-openpgp.c:3838
++#: scd/app-openpgp.c:3850
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:3900
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4004
++#: scd/app-openpgp.c:4016
  #, fuzzy, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "%s signature, algoritma digest %s\n"
  
- #: scd/app-openpgp.c:4089
++#: scd/app-openpgp.c:4101
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4551
++#: scd/app-openpgp.c:4570
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
++#: scd/app-openpgp.c:4871 scd/app-openpgp.c:4882
  #, fuzzy, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "tidak ditemukan data OpenPGP yang valid.\n"
@@@ -8010,7 -6417,6 +8042,7 @@@ msgstr "
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
@@@ -8055,27 -6452,22 +8087,27 @@@ msgstr "perintah saling konflik\n
  msgid "use variable length input for pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:287
++#: scd/scdaemon.c:286
  #, fuzzy
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
  
- #: scd/scdaemon.c:289
++#: scd/scdaemon.c:288
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
  msgstr ""
  
- #: scd/scdaemon.c:786
++#: scd/scdaemon.c:784
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1904
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
++#: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1909
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
@@@ -8155,9 -6531,6 +8187,9 @@@ msgstr "kesalahan penciptaan passphrase
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "gagal menghapus keyblok: %s\n"
  
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
 +#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  #, fuzzy
  msgid "failed to allocate keyDB handle\n"
  msgstr "gagal inisialisasi TrustDB: %s\n"
@@@ -8653,11 -6924,9 +8685,11 @@@ msgstr "
  msgid "resource problem: out of core\n"
  msgstr ""
  
- #: sm/decrypt.c:330
++#: sm/decrypt.c:332
  msgid "(this is the RC2 algorithm)\n"
  msgstr ""
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:334
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr ""
  
@@@ -8701,124 -6962,96 +8733,124 @@@ msgstr "tampilkan kunci rahasia
  msgid "list certificate chain"
  msgstr "sertifikat yang buruk"
  
- #: sm/gpgsm.c:218
++#: sm/gpgsm.c:219
  #, fuzzy
  msgid "import certificates"
  msgstr "sertifikat yang buruk"
  
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
  #, fuzzy
  msgid "export certificates"
  msgstr "sertifikat yang buruk"
  
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:228
  msgid "register a smartcard"
  msgstr ""
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:231
  msgid "pass a command to the dirmngr"
  msgstr ""
  
- #: sm/gpgsm.c:232
++#: sm/gpgsm.c:233
  msgid "invoke gpg-protect-tool"
  msgstr ""
  
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:250
  #, fuzzy
  msgid "create base-64 encoded output"
  msgstr "ciptakan output ascii"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in PEM format"
  msgstr ""
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in base-64 format"
  msgstr ""
  
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:262
  msgid "assume input is in binary format"
  msgstr ""
  
- #: sm/gpgsm.c:267
++#: sm/gpgsm.c:269
  msgid "never consult a CRL"
  msgstr ""
  
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:279
  msgid "check validity using OCSP"
  msgstr ""
  
- #: sm/gpgsm.c:282
++#: sm/gpgsm.c:284
  msgid "|N|number of certificates to include"
  msgstr ""
  
- #: sm/gpgsm.c:285
++#: sm/gpgsm.c:287
  msgid "|FILE|take policy information from FILE"
  msgstr ""
  
- #: sm/gpgsm.c:288
++#: sm/gpgsm.c:290
  msgid "do not check certificate policies"
  msgstr ""
  
- #: sm/gpgsm.c:292
++#: sm/gpgsm.c:294
  msgid "fetch missing issuer certificates"
  msgstr ""
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "don't use the terminal at all"
  msgstr "jangan menggunakan terminal"
  
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:307
  msgid "|FILE|write a server mode log to FILE"
  msgstr ""
  
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:312
  #, fuzzy
  msgid "|FILE|write an audit log to FILE"
  msgstr "|FILE|muat modul ekstensi FILE"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "batch mode: never ask"
  msgstr "mode batch: tanpa tanya"
  
- #: sm/gpgsm.c:314
++#: sm/gpgsm.c:316
  msgid "assume yes on most questions"
  msgstr "asumsikan ya untuk seluruh pertanyaan"
  
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:317
  msgid "assume no on most questions"
  msgstr "asumsikan tidak untuk seluruh pertanyaan"
  
- #: sm/gpgsm.c:318
++#: sm/gpgsm.c:320
  #, fuzzy
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "tambah keyring ini ke daftar keyring"
  
- #: sm/gpgsm.c:321
++#: sm/gpgsm.c:323
  #, fuzzy
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
  
- #: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
  #, fuzzy
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|NAMA|gunakan algoritma cipher NAMA"
  
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:352
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:559
  #, 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:570
++#: sm/gpgsm.c:562
  #, fuzzy
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
@@@ -8829,47 -7062,38 +8861,47 @@@ msgstr "
  "tandai, cek, enkripsi atau dekripsi\n"
  "operasi baku tergantung pada data input\n"
  
- #: sm/gpgsm.c:774
++#: sm/gpgsm.c:766
  #, 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:785
++#: sm/gpgsm.c:777
  #, fuzzy, c-format
  msgid "unknown validation model '%s'\n"
  msgstr "penerima baku tidak dikenal `%s'\n"
  
- #: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
  #, fuzzy, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "(Tidak diberikan deskripsi)\n"
  
- #: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr ""
  
- #: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
  #, fuzzy, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr " s = lewati kunci ini\n"
  
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1427
  #, fuzzy
  msgid "could not parse keyserver\n"
  msgstr "tidak dapat memparsing URI keyserver\n"
  
- #: sm/gpgsm.c:1636
++#: sm/gpgsm.c:1630
  #, fuzzy, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "menulis ke `%s'\n"
  
- #: sm/gpgsm.c:1677
++#: sm/gpgsm.c:1671
  #, fuzzy, c-format
  msgid "can't sign using '%s': %s\n"
  msgstr "tidak dapat menutup `%s': %s\n"
  
- #: sm/gpgsm.c:2033
++#: sm/gpgsm.c:2028
  msgid "invalid command (there is no implicit command)\n"
  msgstr ""
  
@@@ -9629,8 -7702,6 +9661,8 @@@ msgstr "
  msgid "CRL access not possible due to disabled %s\n"
  msgstr ""
  
 +#: dirmngr/crlfetch.c:223 dirmngr/ldap-wrapper-ce.c:488
- #: dirmngr/ldap-wrapper.c:742 dirmngr/misc.c:563
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:563
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
@@@ -9815,116 -7850,88 +9847,116 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:160
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:158
++#: dirmngr/dirmngr.c:161
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|FILE|muat modul ekstensi FILE"
  
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:162
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:163
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:164
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
- #: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
++#: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:177
++#: dirmngr/dirmngr.c:180
  #, fuzzy
  msgid "run without asking a user"
  msgstr "Berhenti tanpa menyimpan? "
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:181
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:182
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:184
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:185
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:186
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:188
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:192
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:202
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FILE|muat modul ekstensi FILE"
  
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:210
  #, fuzzy
  msgid "|URL|use OCSP responder at URL"
  msgstr "tidak dapat memparsing URI keyserver\n"
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:212
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:218
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:220
++#: dirmngr/dirmngr.c:223
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:225
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:240
++#: dirmngr/dirmngr.c:246
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -9937,91 -7944,72 +9969,91 @@@ msgstr "
  "@\n"
  "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
  
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:361
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
  
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:363
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:443
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
- #: tools/gpgconf.c:648
++#: dirmngr/dirmngr.c:496 tools/gpgconf.c:550 tools/gpgconf.c:585
++#: tools/gpgconf.c:656
  #, fuzzy, c-format
  msgid "usage: %s [options] "
  msgstr "pemakaian: gpg [pilihan] "
  
- #: dirmngr/dirmngr.c:1062
++#: dirmngr/dirmngr.c:1074
  #, fuzzy
  #| 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:1301 dirmngr/server.c:1585
++#: dirmngr/dirmngr.c:1300 dirmngr/server.c:1585
  #, fuzzy, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "gagal enarmoring: %s\n"
  
- #: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
++#: dirmngr/dirmngr.c:1306 dirmngr/server.c:1591
  #, fuzzy, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "gagal enarmoring: %s\n"
  
- #: dirmngr/dirmngr.c:1484
++#: dirmngr/dirmngr.c:1487
  #, fuzzy, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "baris terlalu panjang\n"
  
- #: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
++#: dirmngr/dirmngr.c:1542 dirmngr/dirmngr.c:1626
  #, fuzzy, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "kesalahan: fingerprint tidak valid\n"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
++#: dirmngr/dirmngr.c:1578 dirmngr/dirmngr.c:1604 tools/gpgconf-comp.c:4032
  #, fuzzy, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "kesalahan pembacaan: %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1633
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1700
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1734
++#: dirmngr/dirmngr.c:1738
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1739
++#: dirmngr/dirmngr.c:1743
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1745
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1746
++#: dirmngr/dirmngr.c:1750
  #, fuzzy
  msgid "shutdown forced\n"
  msgstr "tidak diproses"
  
- #: dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1758
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1761
++#: dirmngr/dirmngr.c:1765
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10503,33 -8392,27 +10535,33 @@@ msgstr "gagal menghapus keyblok: %s\n
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2463
++#: dirmngr/server.c:2469
  #, fuzzy, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "tidak dapat membuat %s: %s\n"
  
- #: dirmngr/server.c:2474
++#: dirmngr/server.c:2480
  #, fuzzy, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "%s: gagal membuat hashtable: %s\n"
  
- #: dirmngr/server.c:2495
++#: dirmngr/server.c:2501
  #, 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:2503
++#: dirmngr/server.c:2509
  #, fuzzy, c-format
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "gagal membuat kembali cache keyring: %s\n"
  
- #: dirmngr/server.c:2534
++#: dirmngr/server.c:2540
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2553
++#: dirmngr/server.c:2559
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
@@@ -10577,7 -8451,6 +10609,7 @@@ msgstr "DSA butuh penggunaan algoritma 
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:167
  #, fuzzy
  msgid "quiet"
  msgstr "q|k|keluar"
@@@ -10670,22 -8523,15 +10702,22 @@@ msgstr "gagal menandai: %s\n
  msgid "error sending standard options: %s\n"
  msgstr "kesalahan mengirim ke `%s': %s\n"
  
 +#: tools/gpgconf-comp.c:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
- #: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
++#: tools/gpgconf-comp.c:766 tools/gpgconf-comp.c:865
  msgid "Options controlling the diagnostic output"
  msgstr ""
  
 +#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
- #: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
++#: tools/gpgconf-comp.c:779 tools/gpgconf-comp.c:888
  msgid "Options controlling the configuration"
  msgstr ""
  
- #: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
- #: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
++#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:723
++#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:901
  msgid "Options useful for debugging"
  msgstr ""
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
  msgid "Options controlling the security"
  msgstr ""
  
@@@ -10735,11 -8570,9 +10767,11 @@@ msgstr "kesalahan penciptaan passphrase
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
++#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
  msgid "|NAME|use NAME as default secret key"
  msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
  
- #: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
++#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:784
  #, fuzzy
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NAMA|enkripsi untuk NAMA"
@@@ -10748,194 -8580,161 +10780,208 @@@
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
++#: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
  msgid "Configuration for Keyservers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
++#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
  #, fuzzy
  msgid "|URL|use keyserver at URL"
  msgstr "tidak dapat memparsing URI keyserver\n"
  
- #: tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:741
  msgid "allow PKA lookups (DNS requests)"
  msgstr ""
  
- #: tools/gpgconf-comp.c:738
++#: tools/gpgconf-comp.c:744
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr ""
  
- #: tools/gpgconf-comp.c:787
++#: tools/gpgconf-comp.c:793
  msgid "disable all access to the dirmngr"
  msgstr ""
  
- #: tools/gpgconf-comp.c:790
++#: tools/gpgconf-comp.c:796
  #, fuzzy
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
  msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
  
- #: tools/gpgconf-comp.c:820
++#: tools/gpgconf-comp.c:829
  msgid "do not check CRLs for root certificates"
  msgstr ""
  
- #: tools/gpgconf-comp.c:869
++#: tools/gpgconf-comp.c:878
  msgid "Options controlling the format of the output"
  msgstr ""
  
- #: tools/gpgconf-comp.c:905
++#: tools/gpgconf-comp.c:920
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:918
++#: tools/gpgconf-comp.c:933
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:947
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:958
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:948
++#: tools/gpgconf-comp.c:963
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:977
++#: tools/gpgconf-comp.c:992
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:985
++#: tools/gpgconf-comp.c:1000
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1066
++#: tools/gpgconf-comp.c:1081
  msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1067
++#: tools/gpgconf-comp.c:1082
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1083
  msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1069
++#: tools/gpgconf-comp.c:1084
  msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1070
++#: tools/gpgconf-comp.c:1085
  #, fuzzy
  #| msgid "network error"
  msgid "Network"
  msgstr "kesalahan jaringan"
  
- #: tools/gpgconf-comp.c:1071
++#: tools/gpgconf-comp.c:1086
  #, fuzzy
  msgid "Passphrase Entry"
  msgstr "passphrase yang buruk"
  
- #: tools/gpgconf-comp.c:1225
++#: tools/gpgconf-comp.c:1240
  #, fuzzy
  msgid "Component not suitable for launching"
  msgstr "kunci publik tidak ditemukan"
  
- #: tools/gpgconf-comp.c:3283
++#: tools/gpgconf-comp.c:3311
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3434
++#: tools/gpgconf-comp.c:3462
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf-comp.c:4036
+ #, fuzzy, c-format
+ msgid "error closing '%s'\n"
+ msgstr "kesalahan membaca `%s': %s\n"
+ 
++#: tools/gpgconf-comp.c:4038
+ #, fuzzy, c-format
+ msgid "error parsing '%s'\n"
+ msgstr "kesalahan membaca `%s': %s\n"
+ 
++#: tools/gpgconf.c:73
  msgid "list all components"
  msgstr ""
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "check all programs"
  msgstr ""
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|list options"
  msgstr ""
  
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
  msgid "|COMPONENT|change options"
  msgstr ""
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "|COMPONENT|check options"
  msgstr ""
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "apply global default values"
  msgstr ""
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
+ msgid "|FILE|update configuration files using FILE"
+ msgstr ""
+ 
++#: tools/gpgconf.c:83
  msgid "get the configuration directories for @GPGCONF@"
  msgstr ""
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:85
  #, fuzzy
  msgid "list global configuration file"
  msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  #, fuzzy
  msgid "check global configuration file"
  msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
  
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:89
  #, fuzzy
  #| msgid "update the trust database"
  msgid "query the software version database"
  msgstr "perbarui database trust"
  
- #: tools/gpgconf.c:86
++#: tools/gpgconf.c:90
  msgid "reload all or a given component"
  msgstr ""
  
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:91
  msgid "launch a given component"
  msgstr ""
  
- #: tools/gpgconf.c:88
++#: tools/gpgconf.c:92
  msgid "kill a given component"
  msgstr ""
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "use as output file"
  msgstr "gunakan sebagai file output"
  
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:102
  msgid "activate changes at runtime, if possible"
  msgstr ""
  
- #: tools/gpgconf.c:122
++#: tools/gpgconf.c:127
  #, fuzzy
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
  
- #: tools/gpgconf.c:125
++#: tools/gpgconf.c:130
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
  msgstr ""
  
- #: tools/gpgconf.c:545 tools/gpgconf.c:579
++#: tools/gpgconf.c:552 tools/gpgconf.c:587
  msgid "Need one component argument"
  msgstr ""
  
- #: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
++#: tools/gpgconf.c:561 tools/gpgconf.c:599 tools/gpgconf.c:632
  #, fuzzy
  msgid "Component not found"
  msgstr "kunci publik tidak ditemukan"
  
- #: tools/gpgconf.c:650
++#: tools/gpgconf.c:658
  #, fuzzy
  msgid "No argument allowed"
  msgstr "menulis kunci rahasia ke `%s'\n"
diff --cc po/it.po
index bba9c33,1d8b580..1a1d6f7
--- a/po/it.po
+++ b/po/it.po
@@@ -6,7 -6,6 +6,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg 1.1.92\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-11-18 16:54+0100\n"
++"POT-Creation-Date: 2016-12-20 11:28+0100\n"
  "PO-Revision-Date: 2008-05-26 12:02+0200\n"
  "Last-Translator: Marco d'Itri <md at linux.it>\n"
  "Language-Team: Italian <tp at lists.linux.it>\n"
@@@ -155,25 -126,11 +155,25 @@@ msgstr "passphrase errata
  msgid "ssh keys greater than %d bits are not supported\n"
  msgstr "l'algoritmo di protezione %d%s non è gestito\n"
  
 +#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
- #: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1306 g10/keygen.c:4577
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
++#: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't create '%s': %s\n"
  msgstr "impossibile creare `%s': %s\n"
  
 +#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
- #: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1307
++#: g10/import.c:305 g10/import.c:448 g10/import.c:621 g10/keygen.c:3681
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
- #: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
- #: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:825 g10/sign.c:1025
++#: g10/sign.c:1130 g10/sign.c:1275 g10/tdbdump.c:143 g10/tdbdump.c:151
++#: g10/tdbio.c:720 g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161
++#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
++#: dirmngr/certcache.c:368 dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1564
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
@@@ -236,11 -182,9 +236,11 @@@ msgstr "Inserisci la passphrase, cioè 
  msgid "failed to create stream from socket: %s\n"
  msgstr "%s: creazione della tabella hash fallita: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1100
++#: agent/divert-scd.c:92 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1101
++#: agent/divert-scd.c:93 g10/call-agent.c:1102
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  
@@@ -383,48 -301,33 +383,48 @@@ msgstr "
  "Opzioni:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
  #, fuzzy
  #| msgid "Key is superseded"
  msgid "run in supervised mode"
  msgstr "Questa chiave è stata sostituita"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:170 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "prolisso"
  
 +#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "meno prolisso"
  
- #: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
  msgid "csh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
- #: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
++#: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
  #, fuzzy
  msgid "|FILE|read options from FILE"
  msgstr "|FILE|carica il modulo di estensione FILE"
  
- #: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:177
  msgid "do not detach from the console"
  msgstr ""
  
@@@ -509,162 -395,120 +509,162 @@@ msgstr "non gestito
  #. 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:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:481 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1025 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:358
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:124 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  #, fuzzy
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr "Per favore segnala i bug a <gnupg-bugs at gnu.org>.\n"
  
- #: agent/gpg-agent.c:491
++#: agent/gpg-agent.c:490
  #, fuzzy
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
  
- #: agent/gpg-agent.c:493
++#: agent/gpg-agent.c:492
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:537 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:442
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:793
++#: agent/gpg-agent.c:1082 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:812
  #, fuzzy, c-format
  #| msgid "NOTE: no default option file `%s'\n"
  msgid "Note: no default option file '%s'\n"
  msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
  
- #: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
- #: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1093 agent/gpg-agent.c:1935 g10/gpg.c:2510
++#: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:817
++#: dirmngr/dirmngr.c:1670 tools/symcryptrun.c:932
  #, fuzzy, c-format
  #| msgid "option file `%s': %s\n"
  msgid "option file '%s': %s\n"
  msgstr "file con le opzioni `%s': %s\n"
  
- #: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:806
++#: agent/gpg-agent.c:1101 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:825
  #, fuzzy, c-format
  #| msgid "reading options from `%s'\n"
  msgid "reading options from '%s'\n"
  msgstr "lettura delle opzioni da `%s'\n"
  
- #: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
- #: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
++#: agent/gpg-agent.c:1223 g10/gpg.c:3643 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:936 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:527
  #, fuzzy, c-format
  #| msgid "WARNING: \"%s\" is a deprecated option\n"
  msgid "Note: '%s' is not considered an option\n"
  msgstr "ATTENZIONE: \"%s\" è una opzione deprecata\n"
  
- #: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
++#: agent/gpg-agent.c:2080 scd/scdaemon.c:1073 dirmngr/dirmngr.c:1081
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
  msgstr "impossibile creare %s: %s\n"
  
- #: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
++#: agent/gpg-agent.c:2097 scd/scdaemon.c:1086 dirmngr/dirmngr.c:1094
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2134
++#: agent/gpg-agent.c:2135
  #, fuzzy
  msgid "a gpg-agent is already running - not starting a new one\n"
  msgstr "gpg-agent non è disponibile in questa sessione\n"
  
- #: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
++#: agent/gpg-agent.c:2145 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1126
  #, fuzzy
  msgid "error getting nonce for the socket\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
++#: agent/gpg-agent.c:2150 scd/scdaemon.c:1113 dirmngr/dirmngr.c:1129
  #, fuzzy, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
- #: dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2160 agent/gpg-agent.c:2197 scd/scdaemon.c:1121
++#: dirmngr/dirmngr.c:1138
  #, fuzzy, c-format
  msgid "can't set permissions of '%s': %s\n"
  msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
  
- #: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:2165 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1143
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
  msgstr "aggiornamento fallito: %s\n"
  
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
++#: agent/gpg-agent.c:2172 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1149
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
  msgstr "scrittura della chiave segreta in `%s'\n"
  
- #: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: agent/gpg-agent.c:2191 agent/gpg-agent.c:2234 g10/exec.c:199
 +#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, fuzzy, c-format
  #| msgid "can't create directory `%s': %s\n"
  msgid "can't create directory '%s': %s\n"
  msgstr "impossibile creare la directory `%s': %s\n"
  
- #: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: agent/gpg-agent.c:2194 agent/gpg-agent.c:2239 g10/openfile.c:491
 +#: g10/openfile.c:520 sm/keydb.c:103
  #, fuzzy, c-format
  msgid "directory '%s' created\n"
  msgstr "%s: directory creata\n"
  
- #: agent/gpg-agent.c:2244
++#: agent/gpg-agent.c:2245
  #, fuzzy, c-format
  msgid "stat() failed for '%s': %s\n"
  msgstr "trustdb: read fallita (n=%d): %s\n"
  
- #: agent/gpg-agent.c:2248
++#: agent/gpg-agent.c:2249
  #, fuzzy, c-format
  msgid "can't use '%s' as home directory\n"
  msgstr "%s: impossibile creare la directory: %s\n"
  
- #: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
++#: agent/gpg-agent.c:2392 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1871
  #, fuzzy, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: agent/gpg-agent.c:2598
++#: agent/gpg-agent.c:2599
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2603
++#: agent/gpg-agent.c:2604
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2678
++#: agent/gpg-agent.c:2679
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2683
++#: agent/gpg-agent.c:2684
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
++#: agent/gpg-agent.c:2881 scd/scdaemon.c:1272 dirmngr/dirmngr.c:2075
  #, fuzzy, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "aggiornamento della chiave segreta fallito: %s\n"
  
- #: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2954 scd/scdaemon.c:1321
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
  msgstr "%s: saltata: %s\n"
  
- #: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
++#: agent/gpg-agent.c:3092 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  #, fuzzy
  msgid "no gpg-agent running in this session\n"
  msgstr "gpg-agent non è disponibile in questa sessione\n"
@@@ -680,8 -522,6 +680,8 @@@ msgid "
  "Password cache maintenance\n"
  msgstr ""
  
- #: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
++#: agent/protect-tool.c:106 g10/gpg.c:424 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:153 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -689,9 -529,6 +689,9 @@@ msgstr "
  "@Comandi:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
- #: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:92 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:168 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -745,8 -574,6 +745,8 @@@ msgstr "Cancella
  msgid "error while asking for the passphrase: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
- #: tools/gpgconf.c:323
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1472
++#: tools/gpgconf.c:328
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
  msgstr "errore leggendo `%s': %s\n"
@@@ -916,9 -714,6 +916,9 @@@ msgstr "l'algoritmo di protezione %d%s 
  msgid "protection hash algorithm %d (%s) is not supported\n"
  msgstr "l'algoritmo di protezione %d%s non è gestito\n"
  
 +#: common/exechelp-posix.c:359 common/exechelp-w32.c:438
 +#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
- #: dirmngr/ldap-wrapper.c:710
++#: dirmngr/ldap-wrapper.c:711
  #, fuzzy, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
@@@ -930,8 -722,6 +930,8 @@@
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1155
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1167
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
  msgstr "errore leggendo `%s': %s\n"
@@@ -978,27 -759,22 +978,27 @@@ msgstr "impossibile connettersi a `%s'
  msgid "problem setting the gpg-agent options\n"
  msgstr "problema con l'agent: ha restituito 0x%lx\n"
  
- #: common/sysutils.c:144
++#: common/sysutils.c:148
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "impossibile disabilitare i core dump: %s\n"
  
- #: common/sysutils.c:239
++#: common/sysutils.c:250
  #, fuzzy, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n"
  
- #: common/sysutils.c:271
++#: common/sysutils.c:282
  #, fuzzy, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
  
- #: common/sysutils.c:659
++#: common/sysutils.c:693
  #, fuzzy, c-format
  msgid "waiting for file '%s' to become accessible ...\n"
  msgstr "aggiornamento fallito: %s\n"
  
- #: common/sysutils.c:685
++#: common/sysutils.c:719
  #, fuzzy, c-format
  msgid "renaming '%s' to '%s' failed: %s\n"
  msgstr "creazione dell'armatura fallita: %s\n"
@@@ -1074,7 -835,6 +1074,7 @@@ msgstr "
  msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
  msgstr "ATTENZIONE: \"%s\" è una opzione deprecata\n"
  
- #: common/miscellaneous.c:554
++#: common/miscellaneous.c:556
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
@@@ -1189,8 -926,6 +1189,8 @@@ msgstr "%s: portachiavi creato\n
  msgid "algorithm: %s"
  msgstr "armatura: %s\n"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3098
++#: scd/app-openpgp.c:3111
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
@@@ -1404,7 -1097,6 +1404,7 @@@ msgid "command \"%.50s\" is ambiguous\n
  msgstr ""
  
  # ??? (Md)
- #: common/argparse.c:401 dirmngr/dirmngr.c:1173
++#: common/argparse.c:401 dirmngr/dirmngr.c:1185
  #, fuzzy
  msgid "out of core\n"
  msgstr "non esaminato"
@@@ -1463,8 -1144,6 +1463,8 @@@ msgstr "chiave pubblica %08lX non trova
  msgid "waiting for lock %s...\n"
  msgstr "scrittura della chiave segreta in `%s'\n"
  
- #: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
- #: dirmngr/dirmngr.c:715
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:725
++#: dirmngr/dirmngr.c:734
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
@@@ -1504,7 -1175,6 +1504,7 @@@ msgstr "armatura inaspettata:
  msgid "invalid dash escaped line: "
  msgstr "riga protetta con il trattino non valida: "
  
- #: g10/armor.c:873 g10/armor.c:1490
++#: g10/armor.c:873 g10/armor.c:1493
  #, fuzzy, c-format
  msgid "invalid radix64 character %02X skipped\n"
  msgstr "Carattere radix64 non valido %02x saltato\n"
@@@ -1521,7 -1188,6 +1521,7 @@@ msgstr "eof prematura (nel CRC)\n
  msgid "malformed CRC\n"
  msgstr "CRC malformato\n"
  
- #: g10/armor.c:962 g10/armor.c:1527
++#: g10/armor.c:962 g10/armor.c:1530
  #, fuzzy, c-format
  msgid "CRC error; %06lX - %06lX\n"
  msgstr "errore nel CRC; %06lx - %06lx\n"
@@@ -1535,16 -1199,13 +1535,16 @@@ msgstr "eof prematura (nella coda)\n
  msgid "error in trailer line\n"
  msgstr "errore nella riga della coda\n"
  
- #: g10/armor.c:1303
++#: g10/armor.c:1306
  msgid "no valid OpenPGP data found.\n"
  msgstr "Non sono stati trovati dati OpenPGP validi.\n"
  
- #: g10/armor.c:1308
++#: g10/armor.c:1311
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
  msgstr "armatura non valida: linea più lunga di %d caratteri\n"
  
- #: g10/armor.c:1312
++#: g10/armor.c:1315
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr ""
@@@ -1633,8 -1279,6 +1633,8 @@@ msgstr "la chiave segreta non è dispon
  msgid "OpenPGP card no. %s detected\n"
  msgstr ""
  
- #: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
- #: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2030
++#: g10/keygen.c:4087 g10/revoke.c:215 g10/revoke.c:618
  #, fuzzy
  msgid "can't do this in batch mode\n"
  msgstr "impossibile fare questo in modo batch\n"
@@@ -1644,15 -1287,10 +1644,15 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "Questo comando non è permesso in modalità %s.\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2454
++#: g10/card-util.c:109 scd/app-openpgp.c:2467
  #, fuzzy
  msgid "Reset Code not or not anymore available\n"
  msgstr "parti della chiave segreta non sono disponibili\n"
  
 +#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
- #: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
- #: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1768
++#: g10/keygen.c:1945 g10/keygen.c:2313 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "Cosa scegli? "
  
@@@ -1720,10 -1344,6 +1720,10 @@@ msgstr "non c'è una chiave pubblica co
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
- #: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:334
++#: g10/import.c:592 g10/import.c:640 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
++#: dirmngr/dirmngr.c:1510 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
@@@ -1797,7 -1402,6 +1797,7 @@@ msgstr "Generazione della chiave fallit
  msgid "not an OpenPGP card"
  msgstr "Non sono stati trovati dati OpenPGP validi.\n"
  
- #: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
++#: g10/card-util.c:1173 g10/keygen.c:4106 g10/keygen.c:5092
  #, fuzzy, c-format
  msgid "error getting current key info: %s\n"
  msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
@@@ -1828,13 -1427,10 +1828,13 @@@ msgstr "Di che dimensioni vuoi la chiav
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "Di che dimensioni vuoi la chiave? (1024) "
  
- #: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
++#: g10/card-util.c:1316 g10/keygen.c:2122 g10/keygen.c:2154
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "arrotondate a %u bit\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2207 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr ""
@@@ -1889,9 -1475,6 +1889,9 @@@ msgstr "   (%d) RSA (cifra solo)\n
  msgid "   (3) Authentication key\n"
  msgstr ""
  
- #: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
- #: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
- #: g10/keygen.c:2314 g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1508
++#: g10/keygen.c:1794 g10/keygen.c:1822 g10/keygen.c:1952 g10/keygen.c:2060
++#: g10/keygen.c:2336 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Scelta non valida.\n"
  
@@@ -1925,7 -1502,6 +1925,7 @@@ msgstr "Firmo davvero? 
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1816 g10/keyedit.c:1867
++#: g10/card-util.c:1816 g10/keyedit.c:1868
  msgid "quit this menu"
  msgstr "abbandona questo menù"
  
@@@ -1934,7 -1509,6 +1934,7 @@@
  msgid "show admin commands"
  msgstr "comandi in conflitto\n"
  
- #: g10/card-util.c:1819 g10/keyedit.c:1870
++#: g10/card-util.c:1819 g10/keyedit.c:1871
  msgid "show this help"
  msgstr "mostra questo aiuto"
  
@@@ -2018,31 -1574,21 +2018,31 @@@ msgstr "comandi in conflitto\n
  msgid "Admin commands are not allowed\n"
  msgstr "scrittura della chiave segreta in `%s'\n"
  
- #: g10/card-util.c:2127 g10/keyedit.c:2816
++#: g10/card-util.c:2127 g10/keyedit.c:2817
  msgid "Invalid command  (try \"help\")\n"
  msgstr "Comando non valido  (prova \"help\")\n"
  
- #: g10/decrypt.c:191 g10/encrypt.c:955
++#: g10/decrypt.c:190 g10/encrypt.c:955
  msgid "--output doesn't work for this command\n"
  msgstr "--output non funziona con questo comando\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4904 g10/keyring.c:398 g10/keyring.c:771
  #, fuzzy, c-format
  #| msgid "can't open `%s'\n"
  msgid "can't open '%s'\n"
  msgstr "impossibile aprire `%s'\n"
  
 +#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
- #: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
- #: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4858 g10/keyedit.c:2051
++#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2163
  #, fuzzy, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "chiave `%s' non trovata: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
- #: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
- #: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4866 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:645 g10/tofu.c:2171
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "errore leggendo il keyblock: %s\n"
@@@ -2104,7 -1638,6 +2104,7 @@@ msgstr "c'è una chiave segreta per la 
  msgid "use option \"--delete-secret-keys\" to delete it first.\n"
  msgstr "usa prima l'opzione \"--delete-secret-keys\" per cancellarla.\n"
  
- #: g10/encrypt.c:232 g10/sign.c:1292
++#: g10/encrypt.c:232 g10/sign.c:1294
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
@@@ -2125,7 -1655,6 +2125,7 @@@ msgstr "uso il cifrario %s\n
  msgid "'%s' already compressed\n"
  msgstr "`%s' è già compresso\n"
  
- #: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:610
  #, fuzzy, c-format
  #| msgid "WARNING: `%s' is an empty file\n"
  msgid "WARNING: '%s' is an empty file\n"
@@@ -2145,7 -1672,6 +2145,7 @@@ msgstr "
  "forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
  "del destinatario\n"
  
- #: g10/encrypt.c:707 g10/sign.c:984
++#: g10/encrypt.c:707 g10/sign.c:986
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2181,7 -1702,6 +2181,7 @@@ msgstr "dati cifrati con %s\n
  msgid "encrypted with unknown algorithm %d\n"
  msgstr "cifrato con l'algoritmo sconosciuto %d\n"
  
- #: g10/decrypt-data.c:164 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:129
  msgid ""
  "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
  msgstr ""
@@@ -2281,8 -1783,6 +2281,8 @@@ msgstr "
  msgid " - skipped"
  msgstr "%s: saltata: %s\n"
  
- #: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:845 g10/sign.c:1148
++#: g10/export.c:1251 g10/import.c:1543 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:847 g10/sign.c:1150
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
@@@ -2307,8 -1803,6 +2307,8 @@@ msgstr "chiave %08lX: chiave in stile P
  msgid "WARNING: nothing exported\n"
  msgstr "ATTENZIONE: non è stato esportato nulla\n"
  
- #: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
- #: g10/plaintext.c:151 g10/plaintext.c:174
++#: g10/export.c:2283 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/plaintext.c:167 g10/plaintext.c:190
  #, fuzzy, c-format
  #| msgid "error creating `%s': %s\n"
  msgid "error creating '%s': %s\n"
@@@ -2356,8 -1841,6 +2356,8 @@@ msgstr "errore creando `%s': %s\n
  msgid "No fingerprint"
  msgstr "mostra le impronte digitali"
  
- #: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
- #: g10/revoke.c:701
++#: g10/getkey.c:1873 g10/keyedit.c:2929 g10/keyedit.c:3016 g10/revoke.c:637
++#: g10/revoke.c:702
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "chiave segreta `%s' non trovata: %s\n"
@@@ -2389,218 -1867,174 +2389,224 @@@ msgstr "Chiave %08lX non valida resa va
  msgid "using subkey %s instead of primary key %s\n"
  msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
  
- #: g10/gpg.c:424 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:200
  #, fuzzy
  msgid "make a signature"
  msgstr "fai una firma separata"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:427
  #, fuzzy
  msgid "make a clear text signature"
  msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
  
- #: g10/gpg.c:426 sm/gpgsm.c:202
++#: g10/gpg.c:429 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "fai una firma separata"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:430 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "cifra dati"
  
- #: g10/gpg.c:429
++#: g10/gpg.c:432
  msgid "encryption only with symmetric cipher"
  msgstr "cifra solo con un cifrario simmetrico"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:434 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "decifra dati (predefinito)"
  
- #: g10/gpg.c:433 sm/gpgsm.c:206
++#: g10/gpg.c:436 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "verifica una firma"
  
- #: g10/gpg.c:435 sm/gpgsm.c:207
++#: g10/gpg.c:438 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "elenca le chiavi"
  
- #: g10/gpg.c:437
++#: g10/gpg.c:440
  msgid "list keys and signatures"
  msgstr "elenca le chiavi e le firme"
  
- #: g10/gpg.c:438
++#: g10/gpg.c:443
  #, fuzzy
  msgid "list and check key signatures"
  msgstr "controlla le firme delle chiavi"
  
- #: g10/gpg.c:439 sm/gpgsm.c:212
++#: g10/gpg.c:445 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "elenca le chiavi e le impronte digitali"
  
- #: g10/gpg.c:440 sm/gpgsm.c:210
++#: g10/gpg.c:446 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "elenca le chiavi segrete"
  
- #: g10/gpg.c:442 sm/gpgsm.c:213
++#: g10/gpg.c:448 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "genera una nuova coppia di chiavi"
  
- #: g10/gpg.c:444
++#: g10/gpg.c:451
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly generate a new key pair"
  msgstr "genera una nuova coppia di chiavi"
  
- #: g10/gpg.c:446
++#: g10/gpg.c:454
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly add a new user-id"
  msgstr "genera una nuova coppia di chiavi"
  
- #: g10/gpg.c:449
++#: g10/gpg.c:459
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly revoke a user-id"
  msgstr "genera una nuova coppia di chiavi"
  
- #: g10/gpg.c:451
++#: g10/gpg.c:462
+ #, fuzzy
+ #| msgid "generate a new key pair"
+ msgid "quickly set a new expiration date"
+ msgstr "genera una nuova coppia di chiavi"
+ 
++#: g10/gpg.c:464
  msgid "full featured key pair generation"
  msgstr ""
  
- #: g10/gpg.c:452
++#: g10/gpg.c:467
  msgid "generate a revocation certificate"
  msgstr "genera un certificato di revoca"
  
- #: g10/gpg.c:454 sm/gpgsm.c:215
++#: g10/gpg.c:470 sm/gpgsm.c:216
  msgid "remove keys from the public keyring"
  msgstr "rimuove le chiavi dal portachiavi pubblico"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:472
  msgid "remove keys from the secret keyring"
  msgstr "rimuove le chiavi dal portachiavi privato"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:474
  #, fuzzy
  #| msgid "sign a key"
  msgid "quickly sign a key"
  msgstr "firma una chiave"
  
- #: g10/gpg.c:460
++#: g10/gpg.c:476
  #, fuzzy
  #| msgid "sign a key locally"
  msgid "quickly sign a key locally"
  msgstr "firma una chiave localmente"
  
- #: g10/gpg.c:461
++#: g10/gpg.c:477
  msgid "sign a key"
  msgstr "firma una chiave"
  
- #: g10/gpg.c:462
++#: g10/gpg.c:478
  msgid "sign a key locally"
  msgstr "firma una chiave localmente"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:479
  msgid "sign or edit a key"
  msgstr "firma o modifica una chiave"
  
- #: g10/gpg.c:465 sm/gpgsm.c:233
++#: g10/gpg.c:481 sm/gpgsm.c:234
  #, fuzzy
  msgid "change a passphrase"
  msgstr "cambia la passphrase"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:485
  msgid "export keys"
  msgstr "esporta delle chiavi"
  
- #: g10/gpg.c:468
++#: g10/gpg.c:486
  msgid "export keys to a keyserver"
  msgstr "esporta le chiavi a un keyserver"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:487
  msgid "import keys from a keyserver"
  msgstr "importa le chiavi da un keyserver"
  
- #: g10/gpg.c:471
++#: g10/gpg.c:490
  msgid "search for keys on a keyserver"
  msgstr "cerca delle chiavi su un keyserver"
  
- #: g10/gpg.c:473
++#: g10/gpg.c:492
  msgid "update all keys from a keyserver"
  msgstr "aggiorna tutte le chiavi da un keyserver"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:498
  msgid "import/merge keys"
  msgstr "importa/aggiungi delle chiavi"
  
- #: g10/gpg.c:482
++#: g10/gpg.c:501
  msgid "print the card status"
  msgstr ""
  
- #: g10/gpg.c:483
++#: g10/gpg.c:502
  msgid "change data on a card"
  msgstr ""
  
- #: g10/gpg.c:484
++#: g10/gpg.c:504
  msgid "change a card's PIN"
  msgstr ""
  
- #: g10/gpg.c:496
++#: g10/gpg.c:516
  msgid "update the trust database"
  msgstr "aggiorna il database della fiducia"
  
- #: g10/gpg.c:505
++#: g10/gpg.c:525
  #, fuzzy
  msgid "print message digests"
  msgstr "|algo [files]|stampa tutti i message digests"
  
- #: g10/gpg.c:508 sm/gpgsm.c:228
++#: g10/gpg.c:528 sm/gpgsm.c:229
  msgid "run in server mode"
  msgstr ""
  
- #: g10/gpg.c:510
++#: g10/gpg.c:530
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:514 sm/gpgsm.c:246
++#: g10/gpg.c:534 sm/gpgsm.c:248
  msgid "create ascii armored output"
  msgstr "crea un output ascii con armatura"
  
- #: g10/gpg.c:517 sm/gpgsm.c:262
++#: g10/gpg.c:537 sm/gpgsm.c:264
  #, fuzzy
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|NOME|cifra per NOME"
  
- #: g10/gpg.c:533 sm/gpgsm.c:298
++#: g10/gpg.c:553 sm/gpgsm.c:300
  #, fuzzy
  msgid "|USER-ID|use USER-ID to sign or decrypt"
  msgstr "usa questo user-id per firmare o decifrare"
  
- #: g10/gpg.c:539
++#: g10/gpg.c:559
  #, fuzzy
  msgid "|N|set compress level to N (0 disables)"
  msgstr "|N|imposta il livello di compressione (0 disab.)"
  
- #: g10/gpg.c:546
++#: g10/gpg.c:566
  msgid "use canonical text mode"
  msgstr "usa il modo testo canonico"
  
- #: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
++#: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
  #, fuzzy
  msgid "|FILE|write output to FILE"
  msgstr "|FILE|carica il modulo di estensione FILE"
  
- #: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
++#: g10/gpg.c:598 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
  msgid "do not make any changes"
  msgstr "non fa cambiamenti"
  
- #: g10/gpg.c:579
++#: g10/gpg.c:599
  msgid "prompt before overwriting"
  msgstr "chiede prima di sovrascrivere"
  
- #: g10/gpg.c:628
++#: g10/gpg.c:648
  msgid "use strict OpenPGP behavior"
  msgstr ""
  
- #: g10/gpg.c:654 sm/gpgsm.c:355
++#: g10/gpg.c:674 sm/gpgsm.c:357
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2608,7 -2042,16 +2614,17 @@@ msgstr "
  "@\n"
  "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
  
- #: g10/gpg.c:657 sm/gpgsm.c:358
++#: g10/gpg.c:677
+ #, fuzzy
+ #| msgid ""
+ #| "@\n"
+ #| "Examples:\n"
+ #| "\n"
+ #| " -se -r Bob [file]          sign and encrypt for user Bob\n"
+ #| " --clear-sign [file]         make a clear text signature\n"
+ #| " --detach-sign [file]       make a detached signature\n"
+ #| " --list-keys [names]        show keys\n"
+ #| " --fingerprint [names]      show fingerprints\n"
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2628,13 -2071,11 +2644,13 @@@ msgstr "
  " --list-keys [nomi]         mostra le chiavi\n"
  " --fingerprint [nomi]       mostra le impronte digitali\n"
  
- #: g10/gpg.c:1026
++#: g10/gpg.c:1047
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
  msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
  
- #: g10/gpg.c:1029
++#: g10/gpg.c:1050
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg [options] [files]\n"
@@@ -2649,7 -2090,6 +2665,7 @@@ msgstr "
  "firma, controlla, cifra o decifra\n"
  "l'operazione predefinita dipende dai dati di input\n"
  
- #: g10/gpg.c:1040 sm/gpgsm.c:588
++#: g10/gpg.c:1061 sm/gpgsm.c:580
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2657,608 -2097,430 +2673,545 @@@ msgstr "
  "\n"
  "Algoritmi gestiti:\n"
  
- #: g10/gpg.c:1043
++#: g10/gpg.c:1064
  msgid "Pubkey: "
  msgstr "A chiave pubblica: "
  
- #: g10/gpg.c:1050 g10/keyedit.c:3402
++#: g10/gpg.c:1071 g10/keyedit.c:3483
  msgid "Cipher: "
  msgstr "Cifrari: "
  
- #: g10/gpg.c:1057
++#: g10/gpg.c:1078
  msgid "Hash: "
  msgstr "Hash: "
  
- #: g10/gpg.c:1064 g10/keyedit.c:3451
++#: g10/gpg.c:1085 g10/keyedit.c:3532
  msgid "Compression: "
  msgstr "Compressione: "
  
- #: g10/gpg.c:1133 sm/gpgsm.c:662
++#: g10/gpg.c:1154 sm/gpgsm.c:654
  #, fuzzy, c-format
  msgid "usage: %s [options] %s\n"
  msgstr "uso: gpg [opzioni] "
  
- #: g10/gpg.c:1321 sm/gpgsm.c:751
++#: g10/gpg.c:1342 sm/gpgsm.c:743
  msgid "conflicting commands\n"
  msgstr "comandi in conflitto\n"
  
- #: g10/gpg.c:1339
++#: g10/gpg.c:1360
  #, fuzzy, c-format
  msgid "no = sign found in group definition '%s'\n"
  msgstr "non è stato trovato il segno = nella definizione del gruppo \"%s\"\n"
  
- #: g10/gpg.c:1537
++#: g10/gpg.c:1558
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n"
  
- #: g10/gpg.c:1540
++#: g10/gpg.c:1561
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
  msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n"
  
- #: g10/gpg.c:1543
++#: g10/gpg.c:1564
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on extension '%s'\n"
  msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n"
  
- #: g10/gpg.c:1549
++#: g10/gpg.c:1570
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
  msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
  
- #: g10/gpg.c:1552
++#: g10/gpg.c:1573
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
  msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
  
- #: g10/gpg.c:1555
++#: g10/gpg.c:1576
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on extension '%s'\n"
  msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
  
- #: g10/gpg.c:1561
++#: g10/gpg.c:1582
  #, fuzzy, c-format
  msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
  msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n"
  
- #: g10/gpg.c:1564
++#: g10/gpg.c:1585
  #, fuzzy, c-format
  msgid ""
  "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
  msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n"
  
- #: g10/gpg.c:1567
++#: g10/gpg.c:1588
  #, fuzzy, c-format
  msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
  msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n"
  
- #: g10/gpg.c:1573
++#: g10/gpg.c:1594
  #, fuzzy, c-format
  msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
  msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
  
- #: g10/gpg.c:1576
++#: g10/gpg.c:1597
  #, fuzzy, c-format
  msgid ""
  "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
  msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
  
- #: g10/gpg.c:1579
++#: g10/gpg.c:1600
  #, fuzzy, c-format
  msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
  msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
  
- #: g10/gpg.c:1786
++#: g10/gpg.c:1816
  #, fuzzy, c-format
  msgid "unknown configuration item '%s'\n"
  msgstr "elemento della configurazione sconosciuto \"%s\"\n"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1925
  msgid "display photo IDs during key listings"
  msgstr ""
  
- #: g10/gpg.c:1895
++#: g10/gpg.c:1927
  #, fuzzy
  msgid "show key usage information during key listings"
  msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1929
  msgid "show policy URLs during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1931
  #, fuzzy
  msgid "show all notations during signature listings"
  msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1933
  msgid "show IETF standard notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1937
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1939
  #, fuzzy
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "l'URL della politica di firma indicato non è valido\n"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1941
  msgid "show user ID validity during key listings"
  msgstr ""
  
- #: g10/gpg.c:1911
++#: g10/gpg.c:1943
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  
- #: g10/gpg.c:1913
++#: g10/gpg.c:1945
  msgid "show revoked and expired subkeys in key listings"
  msgstr ""
  
- #: g10/gpg.c:1915
++#: g10/gpg.c:1947
  #, fuzzy
  msgid "show the keyring name in key listings"
  msgstr "mostra in quali portachiavi sono contenute le chiavi elencate"
  
- #: g10/gpg.c:1917
++#: g10/gpg.c:1949
  #, fuzzy
  msgid "show expiration dates during signature listings"
  msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
  
- #: g10/gpg.c:2019 g10/gpg.c:2056
++#: g10/gpg.c:2051 g10/gpg.c:2088
  #, fuzzy, c-format
  msgid "valid values for option '%s':\n"
  msgstr "opzioni di importazione non valide\n"
  
- #: g10/gpg.c:2030
++#: g10/gpg.c:2062
  #, fuzzy, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "destinatario predefinito `%s' sconosciuto\n"
  
- #: g10/gpg.c:2032 g10/gpg.c:2068
++#: g10/gpg.c:2064 g10/gpg.c:2100
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2066
++#: g10/gpg.c:2098 g10/keygen.c:167
  #, fuzzy, c-format
  msgid "invalid value for option '%s'\n"
  msgstr "opzioni di importazione non valide\n"
  
- #: g10/gpg.c:2203
++#: g10/gpg.c:2235
  #, fuzzy, c-format
  #| msgid "NOTE: old default options file `%s' ignored\n"
  msgid "Note: old default options file '%s' ignored\n"
  msgstr ""
  "NOTA: il vecchio file `%s' con le opzioni predefinite è stato ignorato\n"
  
- #: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
++#: g10/gpg.c:2839 g10/gpg.c:3610 g10/gpg.c:3622
  #, fuzzy, c-format
  #| msgid "NOTE: %s is not for normal use!\n"
  msgid "Note: %s is not for normal use!\n"
  msgstr "NOTA: %s normalmente non deve essere usato!\n"
  
- #: g10/gpg.c:2978 g10/gpg.c:2990
++#: g10/gpg.c:3011 g10/gpg.c:3023
  #, fuzzy, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "%s non è un set di caratteri valido\n"
  
- #: g10/gpg.c:3012
++#: g10/gpg.c:3045
  #, fuzzy, c-format
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "L'indirizzo di email non è valido\n"
  
- #: g10/gpg.c:3044 sm/gpgsm.c:1166
++#: g10/gpg.c:3077 sm/gpgsm.c:1158
  #, fuzzy, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "algoritmo di hash non valido `%s'\n"
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3130
  #, fuzzy, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "%s non è un set di caratteri valido\n"
  
- #: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
++#: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
  #, fuzzy
  msgid "could not parse keyserver URL\n"
  msgstr "impossibile fare il parsing dell'URI del keyserver\n"
  
- #: g10/gpg.c:3137
++#: g10/gpg.c:3170
  #, fuzzy, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: opzioni di esportazione non valide\n"
  
- #: g10/gpg.c:3140
++#: g10/gpg.c:3173
  #, fuzzy
  msgid "invalid keyserver options\n"
  msgstr "opzioni di esportazione non valide\n"
  
- #: g10/gpg.c:3147
++#: g10/gpg.c:3180
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: opzioni di importazione non valide\n"
  
- #: g10/gpg.c:3150
++#: g10/gpg.c:3183
  msgid "invalid import options\n"
  msgstr "opzioni di importazione non valide\n"
  
- #: g10/gpg.c:3156 g10/gpg.c:3171
++#: g10/gpg.c:3189 g10/gpg.c:3204
  #, fuzzy, c-format
  msgid "invalid filter option: %s\n"
  msgstr "opzioni di importazione non valide\n"
  
- #: g10/gpg.c:3162
++#: g10/gpg.c:3195
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: opzioni di esportazione non valide\n"
  
- #: g10/gpg.c:3165
++#: g10/gpg.c:3198
  msgid "invalid export options\n"
  msgstr "opzioni di esportazione non valide\n"
  
- #: g10/gpg.c:3177
++#: g10/gpg.c:3210
  #, fuzzy, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: opzioni di importazione non valide\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3213
  #, fuzzy
  msgid "invalid list options\n"
  msgstr "opzioni di importazione non valide\n"
  
- #: g10/gpg.c:3188
++#: g10/gpg.c:3221
  msgid "display photo IDs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3190
++#: g10/gpg.c:3223
  msgid "show policy URLs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3192
++#: g10/gpg.c:3225
  #, fuzzy
  msgid "show all notations during signature verification"
  msgstr "%s non è un set di caratteri valido\n"
  
- #: g10/gpg.c:3194
++#: g10/gpg.c:3227
  msgid "show IETF standard notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3231
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3200
++#: g10/gpg.c:3233
  #, fuzzy
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "l'URL della politica di firma indicato non è valido\n"
  
- #: g10/gpg.c:3202
++#: g10/gpg.c:3235
  #, fuzzy
  msgid "show user ID validity during signature verification"
  msgstr "%s non è un set di caratteri valido\n"
  
- #: g10/gpg.c:3204
++#: g10/gpg.c:3237
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  
- #: g10/gpg.c:3206
++#: g10/gpg.c:3239
  #, fuzzy
  msgid "show only the primary user ID in signature verification"
  msgstr "%s non è un set di caratteri valido\n"
  
- #: g10/gpg.c:3208
++#: g10/gpg.c:3241
  msgid "validate signatures with PKA data"
  msgstr ""
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3243
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr ""
  
- #: g10/gpg.c:3217
++#: g10/gpg.c:3250
  #, fuzzy, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: opzioni di esportazione non valide\n"
  
- #: g10/gpg.c:3220
++#: g10/gpg.c:3253
  #, fuzzy
  msgid "invalid verify options\n"
  msgstr "opzioni di esportazione non valide\n"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3260
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "impossibile impostare exec-path a %s\n"
  
- #: g10/gpg.c:3417
++#: g10/gpg.c:3452
  #, fuzzy, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: opzioni di esportazione non valide\n"
  
- #: g10/gpg.c:3420
++#: g10/gpg.c:3455
  msgid "invalid auto-key-locate list\n"
  msgstr ""
  
- #: g10/gpg.c:3553 sm/gpgsm.c:1507
++#: g10/gpg.c:3592 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
  msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
  
- #: g10/gpg.c:3564
++#: g10/gpg.c:3603
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
  
- #: g10/gpg.c:3573
++#: g10/gpg.c:3612
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "Non è permesso usare %s con %s!\n"
  
- #: g10/gpg.c:3576
++#: g10/gpg.c:3615
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "Non ha senso usare %s con %s!\n"
  
- #: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
++#: g10/gpg.c:3630 sm/gpgsm.c:1518 dirmngr/dirmngr.c:951
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3651
  #, fuzzy, c-format
  msgid "will not run with insecure memory due to %s\n"
  msgstr "scrittura della chiave segreta in `%s'\n"
  
- #: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
++#: g10/gpg.c:3686 g10/gpg.c:3710 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "l'algoritmo di cifratura selezionato non è valido\n"
  
- #: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
++#: g10/gpg.c:3692 g10/gpg.c:3716 sm/gpgsm.c:1591 sm/gpgsm.c:1597
  msgid "selected digest algorithm is invalid\n"
  msgstr "l'algoritmo di digest selezionato non è valido\n"
  
- #: g10/gpg.c:3659
++#: g10/gpg.c:3698
  #, fuzzy
  msgid "selected compression algorithm is invalid\n"
  msgstr "l'algoritmo di cifratura selezionato non è valido\n"
  
- #: g10/gpg.c:3665
++#: g10/gpg.c:3704
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "l'algoritmo di digest selezionato non è valido\n"
  
- #: g10/gpg.c:3680
++#: g10/gpg.c:3719
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed deve essere maggiore di 0\n"
  
- #: g10/gpg.c:3682
++#: g10/gpg.c:3721
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed deve essere maggiore di 1\n"
  
- #: g10/gpg.c:3684
++#: g10/gpg.c:3723
  #, fuzzy
  msgid "max-cert-depth must be in the range from 1 to 255\n"
  msgstr "max-cert-depth deve essere tra 1 e 255\n"
  
- #: g10/gpg.c:3686
++#: g10/gpg.c:3725
  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:3688
++#: g10/gpg.c:3727
  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:3691
++#: g10/gpg.c:3730
  #, fuzzy
  #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
  msgstr "NOTA: l'uso del modo S2K semplice (0) è fortemente scoraggiato\n"
  
- #: g10/gpg.c:3695
++#: g10/gpg.c:3734
  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:3702
++#: g10/gpg.c:3741
  msgid "invalid default preferences\n"
  msgstr "preferenze predefinite non valide\n"
  
- #: g10/gpg.c:3706
++#: g10/gpg.c:3745
  msgid "invalid personal cipher preferences\n"
  msgstr "preferenze personali del cifrario non valide\n"
  
- #: g10/gpg.c:3710
++#: g10/gpg.c:3749
  msgid "invalid personal digest preferences\n"
  msgstr "preferenze personali del digest non valide\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3753
  msgid "invalid personal compress preferences\n"
  msgstr "preferenze personali di compressione non valide\n"
  
- #: g10/gpg.c:3750
++#: g10/gpg.c:3789
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s non funziona ancora con %s\n"
  
- #: g10/gpg.c:3797
++#: g10/gpg.c:3836
  #, fuzzy, c-format
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr "non è possibile usare l'algoritmo di cifratura \"%s\" in modalità %s\n"
  
- #: g10/gpg.c:3802
++#: g10/gpg.c:3841
  #, fuzzy, c-format
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr "non è possibile usare l'algoritmo di digest \"%s\" in modalità %s\n"
  
- #: g10/gpg.c:3807
++#: g10/gpg.c:3846
  #, fuzzy, c-format
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr ""
  "non è possibile usare l'algoritmo di compressione \"%s\" in modalità %s\n"
  
- #: g10/gpg.c:3906
++#: g10/gpg.c:3945
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "inizializzazione del trustdb fallita: %s\n"
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:3957
  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:3975
- msgid "--store [filename]"
- msgstr "--store [nomefile]"
- 
- #: g10/gpg.c:3985
- msgid "--symmetric [filename]"
- msgstr "--symmetric [nomefile]"
- 
- #: g10/gpg.c:3989
++#: g10/gpg.c:4028
  #, fuzzy, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "decifratura fallita: %s\n"
  
- #: g10/gpg.c:4000
- msgid "--encrypt [filename]"
- msgstr "--encrypt [nomefile]"
- 
- #: g10/gpg.c:4016
- #, fuzzy
- msgid "--symmetric --encrypt [filename]"
- msgstr "--sign --encrypt [nomefile]"
- 
- #: g10/gpg.c:4018
++#: g10/gpg.c:4057
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4021
++#: g10/gpg.c:4060
  #, fuzzy, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr "non è possibile usare %s in modalità %s\n"
  
- #: g10/gpg.c:4042
- msgid "--sign [filename]"
- msgstr "--sign [nomefile]"
- 
- #: g10/gpg.c:4058
- msgid "--sign --encrypt [filename]"
- msgstr "--sign --encrypt [nomefile]"
- 
- #: g10/gpg.c:4076
- #, fuzzy
- msgid "--symmetric --sign --encrypt [filename]"
- msgstr "--sign --encrypt [nomefile]"
- 
- #: g10/gpg.c:4078
++#: g10/gpg.c:4117
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4081
++#: g10/gpg.c:4120
  #, fuzzy, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr "non è possibile usare %s in modalità %s\n"
  
- #: g10/gpg.c:4105
- msgid "--sign --symmetric [filename]"
- msgstr "--sign --symmetric [nomefile]"
- 
- #: g10/gpg.c:4117
- msgid "--clearsign [filename]"
- msgstr "--clearsign [nomefile]"
- 
- #: g10/gpg.c:4147
- msgid "--decrypt [filename]"
- msgstr "--decrypt [nomefile]"
- 
- #: g10/gpg.c:4174
- msgid "--sign-key user-id"
- msgstr "--sign-key user-id"
- 
- #: g10/gpg.c:4178
- msgid "--lsign-key user-id"
- msgstr "--lsign-key user-id"
- 
- #: g10/gpg.c:4199
- msgid "--edit-key user-id [commands]"
- msgstr "--edit-key user-id [comandi]"
- 
- #: g10/gpg.c:4215
- #, fuzzy
- msgid "--passwd <user-id>"
- msgstr "--sign-key user-id"
- 
- #: g10/gpg.c:4411 g10/keyserver.c:1837
++#: g10/gpg.c:4462 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "invio al keyserver fallito: %s\n"
  
- #: g10/gpg.c:4416
++#: g10/gpg.c:4467
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "ricezione dal keyserver fallita: %s\n"
  
- #: g10/gpg.c:4422
++#: g10/gpg.c:4473
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "esportazione della chiave fallita: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4486
  #, fuzzy, c-format
  #| msgid "key export failed: %s\n"
  msgid "export as ssh key failed: %s\n"
  msgstr "esportazione della chiave fallita: %s\n"
  
- #: g10/gpg.c:4447
++#: g10/gpg.c:4498
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "ricerca nel keyserver fallita: %s\n"
  
- #: g10/gpg.c:4460
++#: g10/gpg.c:4511
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "aggiornamento del keyserver fallito: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4578
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "rimozione dell'armatura fallita: %s\n"
  
- #: g10/gpg.c:4538
++#: g10/gpg.c:4589
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "creazione dell'armatura fallita: %s\n"
  
- #: g10/gpg.c:4630
++#: g10/gpg.c:4681
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
  msgstr "algoritmo di hash non valido `%s'\n"
  
- #: g10/gpg.c:4776 g10/tofu.c:2002
++#: g10/gpg.c:4827 g10/tofu.c:2151
  #, fuzzy, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: g10/gpg.c:4788
++#: g10/gpg.c:4839
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4835
- msgid "[filename]"
- msgstr "[nomefile]"
- 
- #: g10/gpg.c:4841
++#: g10/gpg.c:4894
  msgid "Go ahead and type your message ...\n"
  msgstr "Vai avanti e scrivi il messaggio...\n"
  
- #: g10/gpg.c:5179
++#: g10/gpg.c:5232
  msgid "the given certification policy URL is invalid\n"
  msgstr "l'URL della politica di certificazione indicato non è valido\n"
  
- #: g10/gpg.c:5181
++#: g10/gpg.c:5234
  msgid "the given signature policy URL is invalid\n"
  msgstr "l'URL della politica di firma indicato non è valido\n"
  
- #: g10/gpg.c:5214
++#: g10/gpg.c:5267
  #, fuzzy
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "l'URL della politica di firma indicato non è valido\n"
@@@ -3272,7 -2532,6 +3225,7 @@@ msgstr "prende le chiavi da questo port
  msgid "make timestamp conflicts only a warning"
  msgstr "segnala i conflitti di data solo con un avvertimento"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:345
++#: g10/gpgv.c:82 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|scrivi le informazioni di stato sul FD"
  
@@@ -3303,328 -2557,262 +3256,328 @@@ msgstr "Non è disponibile un aiuto
  msgid "No help available for '%s'"
  msgstr "Non è disponibile un aiuto per `%s'"
  
- #: g10/import.c:151
++#: g10/import.c:152
  msgid "import signatures that are marked as local-only"
  msgstr ""
  
- #: g10/import.c:154
++#: g10/import.c:155
  msgid "repair damage from the pks keyserver during import"
  msgstr ""
  
- #: g10/import.c:157
++#: g10/import.c:158
  #, fuzzy
  msgid "do not clear the ownertrust values during import"
  msgstr "aggiorna il database della fiducia"
  
- #: g10/import.c:160
++#: g10/import.c:161
  #, fuzzy
  msgid "do not update the trustdb after import"
  msgstr "aggiorna il database della fiducia"
  
- #: g10/import.c:163
++#: g10/import.c:164
  #, fuzzy
  msgid "show key during import"
  msgstr "mostra le impronte digitali"
  
- #: g10/import.c:166
++#: g10/import.c:167
  msgid "only accept updates to existing keys"
  msgstr ""
  
- #: g10/import.c:169
++#: g10/import.c:170
  #, fuzzy
  msgid "remove unusable parts from key after import"
  msgstr "chiave segreta inutilizzabile"
  
- #: g10/import.c:172
++#: g10/import.c:173
  msgid "remove as much as possible from key after import"
  msgstr ""
  
- #: g10/import.c:175
++#: g10/import.c:176
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:326 g10/import.c:568
++#: g10/import.c:327 g10/import.c:569
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "salto un blocco di tipo %d\n"
  
- #: g10/import.c:585
++#: g10/import.c:586
  #, fuzzy, c-format
  msgid "%lu keys processed so far\n"
  msgstr "Per ora sono state esaminate %lu chiavi\n"
  
- #: g10/import.c:655
++#: g10/import.c:656
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "Numero totale esaminato: %lu\n"
  
- #: g10/import.c:658
++#: g10/import.c:659
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "  nuove chiavi saltate: %lu\n"
  
- #: g10/import.c:660
++#: g10/import.c:661
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "  nuove chiavi saltate: %lu\n"
  
- #: g10/import.c:663
++#: g10/import.c:664
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "         senza user ID: %lu\n"
  
- #: g10/import.c:666 sm/import.c:130
++#: g10/import.c:667 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "             importate: %lu"
  
- #: g10/import.c:670 sm/import.c:134
++#: g10/import.c:671 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "        non modificate: %lu\n"
  
- #: g10/import.c:672
++#: g10/import.c:673
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "         nuovi user ID: %lu\n"
  
- #: g10/import.c:674
++#: g10/import.c:675
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "       nuove subchiavi: %lu\n"
  
- #: g10/import.c:676
++#: g10/import.c:677
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "           nuove firme: %lu\n"
  
- #: g10/import.c:678
++#: g10/import.c:679
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "nuove revoche di chiavi: %lu\n"
  
- #: g10/import.c:680 sm/import.c:136
++#: g10/import.c:681 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "  chiavi segrete lette: %lu\n"
  
- #: g10/import.c:682 sm/import.c:138
++#: g10/import.c:683 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "chiavi segrete importate: %lu\n"
  
- #: g10/import.c:684 sm/import.c:140
++#: g10/import.c:685 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr "chiavi segrete non cambiate: %lu\n"
  
- #: g10/import.c:686 sm/import.c:142
++#: g10/import.c:687 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "             importate: %lu\n"
  
- #: g10/import.c:688
++#: g10/import.c:689
  #, fuzzy, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "           nuove firme: %lu\n"
  
- #: g10/import.c:690
++#: g10/import.c:691
  #, fuzzy, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "  chiavi segrete lette: %lu\n"
  
- #: g10/import.c:1034
++#: g10/import.c:1035
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
  "algorithms on these user IDs:\n"
  msgstr ""
  
- #: g10/import.c:1076
++#: g10/import.c:1077
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1091
++#: g10/import.c:1092
  #, fuzzy, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "Firma %s, algoritmo di digest %s\n"
  
- #: g10/import.c:1103
++#: g10/import.c:1104
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1116
++#: g10/import.c:1117
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr ""
  
- #: g10/import.c:1118
++#: g10/import.c:1119
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  
- #: g10/import.c:1143
++#: g10/import.c:1144
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  
- #: g10/import.c:1379 g10/import.c:2167
++#: g10/import.c:1380 g10/import.c:2168
  #, fuzzy, c-format
  msgid "key %s: no user ID\n"
  msgstr "chiave %08lX: nessun user ID\n"
  
- #: g10/import.c:1385
++#: g10/import.c:1386
  #, fuzzy, c-format
  msgid "key %s: %s\n"
  msgstr "saltata `%s': %s\n"
  
- #: g10/import.c:1386 g10/import.c:2141
++#: g10/import.c:1387 g10/import.c:2142
  msgid "rejected by import screener"
  msgstr ""
  
- #: g10/import.c:1416
++#: g10/import.c:1417
  #, fuzzy, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "chiave %08lX: riparati i danni di HKP alla subchiave\n"
  
- #: g10/import.c:1434
++#: g10/import.c:1435
  #, fuzzy, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "chiave %08lX: accettato l'user ID non autofirmato '%s'\n"
  
- #: g10/import.c:1444 g10/import.c:1475
++#: g10/import.c:1445 g10/import.c:1476
  #, fuzzy, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "chiave %08lX: nessun user ID valido\n"
  
- #: g10/import.c:1446
++#: g10/import.c:1447
  msgid "this may be caused by a missing self-signature\n"
  msgstr "questo può essere causato da una autofirma mancante\n"
  
- #: g10/import.c:1516 g10/import.c:2318
++#: g10/import.c:1517 g10/import.c:2319
  #, fuzzy, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
  
- #: g10/import.c:1522
++#: g10/import.c:1523
  #, fuzzy, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "chiave %08lX: nuova chiave - saltata\n"
  
- #: g10/import.c:1537
++#: g10/import.c:1538
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "non è stato trovato un portachiavi scrivibile: %s\n"
  
- #: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
++#: g10/import.c:1547 g10/import.c:1648 g10/import.c:2385
  #, fuzzy, c-format
  #| msgid "error writing keyring `%s': %s\n"
  msgid "error writing keyring '%s': %s\n"
  msgstr "errore scrivendo il portachiavi `%s': %s\n"
  
- #: g10/import.c:1566
++#: g10/import.c:1567
  #, fuzzy, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "chiave %08lX: importata la chiave pubblica \"%s\"\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1591
  #, fuzzy, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
  
- #: g10/import.c:1606 g10/import.c:2342
++#: g10/import.c:1607 g10/import.c:2343
  #, fuzzy, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "chiave %08lX: impossibile individuare il keyblock originale: %s\n"
  
- #: g10/import.c:1614 g10/import.c:2349
++#: g10/import.c:1615 g10/import.c:2350
  #, fuzzy, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "chiave %08lX: impossibile leggere il keyblock originale: %s\n"
  
- #: g10/import.c:1657
++#: g10/import.c:1658
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "chiave %08lX: \"%s\" 1 nuovo user ID\n"
  
- #: g10/import.c:1660
++#: g10/import.c:1661
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
  
- #: g10/import.c:1663
++#: g10/import.c:1664
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "chiave %08lX: \"%s\" una nuova firma\n"
  
- #: g10/import.c:1666
++#: g10/import.c:1667
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
  
- #: g10/import.c:1669
++#: g10/import.c:1670
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "chiave %08lX: \"%s\" una nuova subchiave\n"
  
- #: g10/import.c:1672
++#: g10/import.c:1673
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "chiave %08lX: \"%s\" %d nuove subchiavi\n"
  
- #: g10/import.c:1675
++#: g10/import.c:1676
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
  
- #: g10/import.c:1678
++#: g10/import.c:1679
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
  
- #: g10/import.c:1681
++#: g10/import.c:1682
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
  
- #: g10/import.c:1684
++#: g10/import.c:1685
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
  
- #: g10/import.c:1707
++#: g10/import.c:1708
  #, fuzzy, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "chiave %08lX: \"%s\" non cambiata\n"
  
- #: g10/import.c:2019 g10/import.c:2264
++#: g10/import.c:2020 g10/import.c:2265
  #, fuzzy, c-format
  msgid "key %s: secret key imported\n"
  msgstr "chiave %08lX: chiave segreta importata\n"
  
- #: g10/import.c:2027
++#: g10/import.c:2028
  #, fuzzy, c-format
  #| msgid "skipped: secret key already present\n"
  msgid "key %s: secret key already exists\n"
  msgstr "saltata: chiave pubblica già presente\n"
  
- #: g10/import.c:2035
++#: g10/import.c:2036
  #, fuzzy, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: g10/import.c:2140
++#: g10/import.c:2141
  #, fuzzy, c-format
  msgid "secret key %s: %s\n"
  msgstr "chiave segreta `%s' non trovata: %s\n"
  
- #: g10/import.c:2160 g10/import.c:2195
++#: g10/import.c:2161 g10/import.c:2196
  #, fuzzy
  msgid "importing secret keys not allowed\n"
  msgstr "scrittura della chiave segreta in `%s'\n"
  
- #: g10/import.c:2184
++#: g10/import.c:2185
  #, fuzzy, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr "chiave %08lX: chiave segreta con cifrario %d non valido - saltata\n"
@@@ -3639,144 -2827,117 +3592,144 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2256
++#: g10/import.c:2257
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2311
++#: g10/import.c:2312
  #, fuzzy, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
  "chiave %08lX: manca la chiave pubblica - impossibile applicare il\n"
  "certificato di revoca\n"
  
- #: g10/import.c:2360
++#: g10/import.c:2361
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "chiave %08lX: certificato di revoca non valido: %s - rifiutato\n"
  
- #: g10/import.c:2393
++#: g10/import.c:2394
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "chiave %08lX: \"%s\" certificato di revoca importato\n"
  
- #: g10/import.c:2469
++#: g10/import.c:2470
  #, fuzzy, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "chiave %08lX: nessun user ID per la firma\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2487
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr ""
  "chiave %08lX: algoritmo a chiave pubblica non gestito sull'user ID \"%s\"\n"
  
- #: g10/import.c:2488
++#: g10/import.c:2489
  #, fuzzy, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "chiave %08lX: autofirma non valida sull'user ID \"%s\"\n"
  
- #: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
++#: g10/import.c:2506 g10/import.c:2532 g10/import.c:2583
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
  
- #: g10/import.c:2506
++#: g10/import.c:2507
  #, fuzzy, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n"
  
- #: g10/import.c:2520
++#: g10/import.c:2521
  #, fuzzy, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "chiave %08lX: non ci sono subchiavi per il legame con la chiave\n"
  
- #: g10/import.c:2533
++#: g10/import.c:2534
  #, fuzzy, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "chiave %08lX: legame con la subchiave non valido:\n"
  
- #: g10/import.c:2549
++#: g10/import.c:2550
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "chiave %08lX: rimossi i legami con subochiavi multiple\n"
  
- #: g10/import.c:2571
++#: g10/import.c:2572
  #, fuzzy, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "chiave %08lX: non ci sono subchiavi per la revoca della chiave\n"
  
- #: g10/import.c:2584
++#: g10/import.c:2585
  #, fuzzy, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "chiave %08lX: revoca della subchiave non valida\n"
  
- #: g10/import.c:2599
++#: g10/import.c:2600
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "chiave %08lX: rimosse le revoche di subchiavi multiple\n"
  
- #: g10/import.c:2641
++#: g10/import.c:2642
  #, fuzzy, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "chiave %08lX: saltato l'user ID '"
  
- #: g10/import.c:2665
++#: g10/import.c:2666
  #, fuzzy, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "chiave %08lX: saltata la subchiave\n"
  
- #: g10/import.c:2694
++#: g10/import.c:2695
  #, fuzzy, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "chiave %08lX: firma non esportabile (classe %02x) - saltata\n"
  
- #: g10/import.c:2705
++#: g10/import.c:2706
  #, fuzzy, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "chiave %08lX: certificato di revoca nel posto sbagliato - saltata\n"
  
- #: g10/import.c:2723
++#: g10/import.c:2724
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "chiave %08lX: certificato di revoca non valido: %s - saltata\n"
  
- #: g10/import.c:2737
++#: g10/import.c:2738
  #, fuzzy, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "chiave %08lX: firma della subchiave nel posto sbagliato - saltata\n"
  
- #: g10/import.c:2745
++#: g10/import.c:2746
  #, fuzzy, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "chiave %08lX: classe della firma inaspettata (0x%02x) - saltata\n"
  
- #: g10/import.c:2887
++#: g10/import.c:2888
  #, fuzzy, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "chiave %08lX: trovato un user ID duplicato - unito\n"
  
- #: g10/import.c:2951
++#: g10/import.c:2952
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr ""
  "ATTENZIONE: la chiave %08lX può essere stata revocata: scarico la chiave\n"
  "di revoca %08lX.\n"
  
- #: g10/import.c:2967
++#: g10/import.c:2968
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr ""
  "ATTENZIONE: la chiave %08lX può essere stata revocata: la chiave di\n"
  "revoca %08lX non è presente.\n"
  
- #: g10/import.c:3031
++#: g10/import.c:3032
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "chiave %08lX: certificato di revoca \"%s\" aggiunto\n"
  
- #: g10/import.c:3069
++#: g10/import.c:3070
  #, fuzzy, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n"
@@@ -3813,54 -2968,43 +3766,54 @@@ msgstr "errore creando `%s': %s\n
  msgid "error opening key DB: %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: g10/keydb.c:1782
++#: g10/keydb.c:1786
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "rebuild della cache del portachiavi fallito: %s\n"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[revocation]"
  msgstr "[revoca]"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[self-signature]"
  msgstr "[autofirma]"
  
- #: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
++#: g10/keyedit.c:433 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: dirmngr/ldap-wrapper.c:694
  #, fuzzy, c-format
  msgid "error allocating memory: %s\n"
  msgstr "errore creando il portachiavi `%s': %s\n"
  
- #: g10/keyedit.c:629
++#: g10/keyedit.c:630
  #, fuzzy, c-format
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
  
- #: g10/keyedit.c:638
++#: g10/keyedit.c:639
  #, fuzzy, c-format
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "Firma %s, algoritmo di digest %s\n"
  
- #: g10/keyedit.c:800
++#: g10/keyedit.c:801
  #, fuzzy
  msgid " (reordered signatures follow)"
  msgstr "Firma valida da \""
  
- #: g10/keyedit.c:913
++#: g10/keyedit.c:914
  #, fuzzy, c-format
  msgid "key %s:\n"
  msgstr "saltata `%s': %s\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:917
  #, fuzzy, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
  msgstr[0] "L'user ID \"%s\" è stato revocato."
  msgstr[1] "L'user ID \"%s\" è stato revocato."
  
- #: g10/keyedit.c:919 g10/keylist.c:480
++#: g10/keyedit.c:920 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
@@@ -3868,7 -3012,6 +3821,7 @@@ msgid_plural "%d signatures not checke
  msgstr[0] "una firma non controllata per mancanza della chiave\n"
  msgstr[1] "una firma non controllata per mancanza della chiave\n"
  
- #: g10/keyedit.c:923 g10/keylist.c:476
++#: g10/keyedit.c:924 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
@@@ -3876,21 -3019,18 +3829,21 @@@ msgid_plural "%d bad signatures\n
  msgstr[0] "%d firme non corrette\n"
  msgstr[1] "%d firme non corrette\n"
  
- #: g10/keyedit.c:927
++#: g10/keyedit.c:928
  #, fuzzy, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
  msgstr[0] "Firma valida da \""
  msgstr[1] "Firma valida da \""
  
- #: g10/keyedit.c:932
++#: g10/keyedit.c:933
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:992 g10/pkclist.c:274
++#: g10/keyedit.c:993 g10/pkclist.c:274
  #, fuzzy
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
@@@ -3903,68 -3043,53 +3856,68 @@@ msgstr "
  "impronte digitali da diverse fonti...)?\n"
  "\n"
  
- #: g10/keyedit.c:996 g10/pkclist.c:286
++#: g10/keyedit.c:997 g10/pkclist.c:286
  #, fuzzy, c-format
  msgid "  %d = I trust marginally\n"
  msgstr " %d = Mi fido marginalmente\n"
  
- #: g10/keyedit.c:997 g10/pkclist.c:288
++#: g10/keyedit.c:998 g10/pkclist.c:288
  #, fuzzy, c-format
  msgid "  %d = I trust fully\n"
  msgstr " %d = Mi fido completamente\n"
  
- #: g10/keyedit.c:1015
++#: g10/keyedit.c:1016
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
  "trust signatures on your behalf.\n"
  msgstr ""
  
- #: g10/keyedit.c:1032
++#: g10/keyedit.c:1033
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  
- #: g10/keyedit.c:1160
++#: g10/keyedit.c:1161
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1168
++#: g10/keyedit.c:1169
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "L'user ID \"%s\" è stato revocato."
  
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
- #: g10/keyedit.c:2246
++#: g10/keyedit.c:1178 g10/keyedit.c:1206 g10/keyedit.c:1233 g10/keyedit.c:1417
++#: g10/keyedit.c:2247
  msgid "Are you sure you still want to sign it? (y/N) "
  msgstr "Sei ancora sicuro di volerla firmare? (s/N) "
  
- #: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
- #: g10/keyedit.c:2251 g10/keyedit.c:3177
++#: g10/keyedit.c:1192 g10/keyedit.c:1220 g10/keyedit.c:1247 g10/keyedit.c:1423
++#: g10/keyedit.c:2252 g10/keyedit.c:3178
  msgid "  Unable to sign.\n"
  msgstr "  Impossibile firmarla.\n"
  
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1197
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "L'user ID \"%s\" è scaduto."
  
- #: g10/keyedit.c:1224
++#: g10/keyedit.c:1225
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "L'user ID \"%s\" non è autofirmato."
  
- #: g10/keyedit.c:1253
++#: g10/keyedit.c:1254
  #, fuzzy, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "L'user ID \"%s\" non è autofirmato."
  
- #: g10/keyedit.c:1255
++#: g10/keyedit.c:1256
  #, fuzzy
  msgid "Sign it? (y/N) "
  msgstr "Firmo davvero? "
  
- #: g10/keyedit.c:1282
++#: g10/keyedit.c:1283
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -3973,11 -3098,9 +3926,11 @@@ msgstr "
  "L'autofirma su \"%s\"\n"
  "è una firma in stile PGP 2.x.\n"
  
- #: g10/keyedit.c:1291
++#: g10/keyedit.c:1292
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr "Vuoi promuoverla in una autofirma di OpenPGP? (s/N) "
  
- #: g10/keyedit.c:1304
++#: g10/keyedit.c:1305
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3986,11 -3109,9 +3939,11 @@@ msgstr "
  "La tua firma attuale su \"%s\"\n"
  "è scaduta\n"
  
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:1310
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr "Vuoi fare una nuova firma per sostituire quella scaduta? (s/N) "
  
- #: g10/keyedit.c:1330
++#: g10/keyedit.c:1331
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3999,43 -3120,34 +3952,43 @@@ msgstr "
  "La tua firma attuale su \"%s\"\n"
  "è una firma locale.\n"
  
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:1336
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr "Vuoi trasformarla in una firma completa esportabile? (s/N) "
  
- #: g10/keyedit.c:1355
++#: g10/keyedit.c:1356
  #, fuzzy, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "\"%s\" era già stato firmato localmente dalla chiave %08lX\n"
  
- #: g10/keyedit.c:1359
++#: g10/keyedit.c:1360
  #, fuzzy, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "\"%s\" era già stato firmato dalla chiave %08lX\n"
  
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:1365
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "Sei ancora sicuro di volerla firmare di nuovo? (s/N) "
  
- #: g10/keyedit.c:1386
++#: g10/keyedit.c:1387
  #, fuzzy, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "Niente da firmare con la chiave %08lX\n"
  
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1411
  msgid "This key has expired!"
  msgstr "Questa chiave è scaduta!"
  
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1429
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "Questa chiave scadrà il %s.\n"
  
- #: g10/keyedit.c:1434
++#: g10/keyedit.c:1435
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr "Vuoi che la tua firma scada nello stesso momento? (S/n) "
  
- #: g10/keyedit.c:1475
++#: g10/keyedit.c:1476
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -4045,32 -3157,26 +3998,32 @@@ msgstr "
  "appartiene veramente alla persona indicata sopra?\n"
  "Se non sai cosa rispondere digita \"0\".\n"
  
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1481
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) Preferisco non rispondere.%s\n"
  
- #: g10/keyedit.c:1482
++#: g10/keyedit.c:1483
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) Non l'ho controllata per niente.%s\n"
  
- #: g10/keyedit.c:1484
++#: g10/keyedit.c:1485
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) L'ho controllata superficialmente.%s\n"
  
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:1488
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) L'ho controllata molto attentamente.%s\n"
  
- #: g10/keyedit.c:1494
++#: g10/keyedit.c:1495
  #, fuzzy
  msgid "Your selection? (enter '?' for more information): "
  msgstr "Cosa scegli? (inserisci '?' per ulteriori informazioni): "
  
- #: g10/keyedit.c:1521
++#: g10/keyedit.c:1522
  #, fuzzy, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -4079,265 -3185,211 +4032,265 @@@ msgstr "
  "Sei davvero sicuro di volere firmare questa chiave\n"
  "con la tua chiave: \""
  
- #: g10/keyedit.c:1529
++#: g10/keyedit.c:1530
  #, fuzzy
  msgid "This will be a self-signature.\n"
  msgstr ""
  "\n"
  "Questa sarà una autofirma.\n"
  
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:1535
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr ""
  "\n"
  "ATTENZIONE: la firma non sarà marcata come non esportabile.\n"
  
- #: g10/keyedit.c:1541
++#: g10/keyedit.c:1542
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr ""
  "\n"
  "ATTENZIONE: la firma sarà marcata come irrevocabile.\n"
  
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1552
  #, fuzzy
  msgid "The signature will be marked as non-exportable.\n"
  msgstr ""
  "\n"
  "La firma sarà marcata come non esportabile.\n"
  
- #: g10/keyedit.c:1558
++#: g10/keyedit.c:1559
  #, fuzzy
  msgid "The signature will be marked as non-revocable.\n"
  msgstr ""
  "\n"
  "La firma sarà marcata come irrevocabile.\n"
  
- #: g10/keyedit.c:1565
++#: g10/keyedit.c:1566
  #, fuzzy
  msgid "I have not checked this key at all.\n"
  msgstr ""
  "\n"
  "Non ho controllato per niente questa chiave.\n"
  
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:1571
  #, fuzzy
  msgid "I have checked this key casually.\n"
  msgstr ""
  "\n"
  "Ho controllato questa chiave superficialmente.\n"
  
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:1576
  #, fuzzy
  msgid "I have checked this key very carefully.\n"
  msgstr ""
  "\n"
  "Ho controllato questa chiave molto attentamente.\n"
  
- #: g10/keyedit.c:1587
++#: g10/keyedit.c:1588
  #, fuzzy
  msgid "Really sign? (y/N) "
  msgstr "Firmo davvero? "
  
- #: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
- #: g10/keyedit.c:6463 g10/sign.c:323
++#: g10/keyedit.c:1639 g10/keyedit.c:6308 g10/keyedit.c:6391 g10/keyedit.c:6500
++#: g10/keyedit.c:6562 g10/sign.c:325
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "firma fallita: %s\n"
  
- #: g10/keyedit.c:1725
++#: g10/keyedit.c:1726
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  
- #: g10/keyedit.c:1755
++#: g10/keyedit.c:1756
  #, fuzzy, c-format
  #| msgid "error creating passphrase: %s\n"
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: g10/keyedit.c:1869
++#: g10/keyedit.c:1870
  msgid "save and quit"
  msgstr "salva ed esci"
  
- #: g10/keyedit.c:1872
++#: g10/keyedit.c:1873
  #, fuzzy
  msgid "show key fingerprint"
  msgstr "mostra le impronte digitali"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1874
  #, fuzzy
  msgid "show the keygrip"
  msgstr "Annotazione della firma: "
  
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1875
  msgid "list key and user IDs"
  msgstr "elenca le chiavi e gli user ID"
  
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1877
  msgid "select user ID N"
  msgstr "scegli l'user ID N"
  
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1878
  #, fuzzy
  msgid "select subkey N"
  msgstr "scegli l'user ID N"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1879
  #, fuzzy
  msgid "check signatures"
  msgstr "revoca firme"
  
- #: g10/keyedit.c:1884
++#: g10/keyedit.c:1885
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr ""
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1890
  #, fuzzy
  msgid "sign selected user IDs locally"
  msgstr "firma la chiave localmente"
  
- #: g10/keyedit.c:1890
++#: g10/keyedit.c:1891
  #, fuzzy
  msgid "sign selected user IDs with a trust signature"
  msgstr "Suggerimento: seleziona gli user ID da firmare\n"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1893
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr ""
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1895
  msgid "add a user ID"
  msgstr "aggiungi un user ID"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1897
  msgid "add a photo ID"
  msgstr "aggiungi un ID fotografico"
  
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1898
  #, fuzzy
  msgid "delete selected user IDs"
  msgstr "cancella un user ID"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1901
  #, fuzzy
  msgid "add a subkey"
  msgstr "addkey"
  
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1904
  msgid "add a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1906
  msgid "move a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1908
  msgid "move a backup key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1910
  #, fuzzy
  msgid "delete selected subkeys"
  msgstr "cancella una chiave secondaria"
  
- #: g10/keyedit.c:1911
++#: g10/keyedit.c:1912
  msgid "add a revocation key"
  msgstr "aggiungi una chiave di revoca"
  
- #: g10/keyedit.c:1913
++#: g10/keyedit.c:1914
  #, fuzzy
  msgid "delete signatures from the selected user IDs"
  msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1916
  #, fuzzy
  msgid "change the expiration date for the key or selected subkeys"
  msgstr "Non è possibile cambiare la data di scadenza di una chiave v3\n"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1918
  #, fuzzy
  msgid "flag the selected user ID as primary"
  msgstr "imposta l'user ID come primario"
  
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1921
  msgid "list preferences (expert)"
  msgstr "elenca le preferenze (per esperti)"
  
- #: g10/keyedit.c:1921
++#: g10/keyedit.c:1922
  msgid "list preferences (verbose)"
  msgstr "elenca le preferenze (prolisso)"
  
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:1924
  #, fuzzy
  msgid "set preference list for the selected user IDs"
  msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
  
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1927
  #, fuzzy
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr "impossibile fare il parsing dell'URI del keyserver\n"
  
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1929
  #, fuzzy
  msgid "set a notation for the selected user IDs"
  msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1931
  msgid "change the passphrase"
  msgstr "cambia la passphrase"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1934
  msgid "change the ownertrust"
  msgstr "cambia il valore di fiducia"
  
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1937
  #, fuzzy
  msgid "revoke signatures on the selected user IDs"
  msgstr "Revoco davvero tutti gli user ID selezionati? "
  
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1939
  #, fuzzy
  msgid "revoke selected user IDs"
  msgstr "revoca un user ID"
  
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1942
  #, fuzzy
  msgid "revoke key or selected subkeys"
  msgstr "revoca una chiave secondaria"
  
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1944
  #, fuzzy
  msgid "enable key"
  msgstr "abilita una chiave"
  
- #: g10/keyedit.c:1944
++#: g10/keyedit.c:1945
  #, fuzzy
  msgid "disable key"
  msgstr "disabilita una chiave"
  
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1947
  #, fuzzy
  msgid "show selected photo IDs"
  msgstr "mostra l'ID fotografico"
  
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1949
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:1951
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2063
  msgid "Secret key is available.\n"
  msgstr "È disponibile una chiave segreta.\n"
  
- #: g10/keyedit.c:2162
++#: g10/keyedit.c:2163
  msgid "Need the secret key to do this.\n"
  msgstr "Per fare questo serve la chiave segreta.\n"
  
- #: g10/keyedit.c:2183
++#: g10/keyedit.c:2184
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4345,279 -3397,224 +4298,284 @@@
  "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
  msgstr ""
  
- #: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
++#: g10/keyedit.c:2240 g10/keyedit.c:3178 g10/keyedit.c:3317 g10/keyedit.c:3379
  msgid "Key is revoked."
  msgstr "La chiave è stata revocata."
  
- #: g10/keyedit.c:2262
++#: g10/keyedit.c:2263
  #, fuzzy
  msgid "Really sign all user IDs? (y/N) "
  msgstr "Firmo davvero tutti gli user ID? "
  
- #: g10/keyedit.c:2266
++#: g10/keyedit.c:2267
  #, fuzzy
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "Firmo davvero tutti gli user ID? "
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2275
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Suggerimento: seleziona gli user ID da firmare\n"
  
- #: g10/keyedit.c:2285
++#: g10/keyedit.c:2286
  #, fuzzy, c-format
  msgid "Unknown signature type '%s'\n"
  msgstr "classe della firma sconosciuta"
  
- #: g10/keyedit.c:2309
++#: g10/keyedit.c:2310
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
  msgstr "Questo comando non è permesso in modalità %s.\n"
  
- #: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
++#: g10/keyedit.c:2332 g10/keyedit.c:2356 g10/keyedit.c:2550
  msgid "You must select at least one user ID.\n"
  msgstr "Devi selezionare almeno un user ID.\n"
  
- #: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
++#: g10/keyedit.c:2334 g10/keyedit.c:2358 g10/keyedit.c:2512 g10/keyedit.c:2552
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2336
++#: g10/keyedit.c:2337
  msgid "You can't delete the last user ID!\n"
  msgstr "Non puoi cancellare l'ultimo user ID!\n"
  
- #: g10/keyedit.c:2339
++#: g10/keyedit.c:2340
  #, fuzzy
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "Tolgo davvero tutti gli user ID selezionati? "
  
- #: g10/keyedit.c:2340
++#: g10/keyedit.c:2341
  #, fuzzy
  msgid "Really remove this user ID? (y/N) "
  msgstr "Tolgo davvero questo user ID? "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2397
++#: g10/keyedit.c:2398
  #, fuzzy
  msgid "Really move the primary key? (y/N) "
  msgstr "Tolgo davvero questo user ID? "
  
- #: g10/keyedit.c:2409 g10/keyedit.c:4866
++#: g10/keyedit.c:2410 g10/keyedit.c:4964
  #, fuzzy
  msgid "You must select exactly one key.\n"
  msgstr "Devi selezionare almeno una chiave.\n"
  
- #: g10/keyedit.c:2436
++#: g10/keyedit.c:2437
  msgid "Command expects a filename argument\n"
  msgstr ""
  
- #: g10/keyedit.c:2457
++#: g10/keyedit.c:2458
  #, fuzzy, c-format
  msgid "Can't open '%s': %s\n"
  msgstr "impossibile aprire `%s': %s\n"
  
- #: g10/keyedit.c:2474
++#: g10/keyedit.c:2475
  #, fuzzy, c-format
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "errore creando il portachiavi `%s': %s\n"
  
- #: g10/keyedit.c:2509
++#: g10/keyedit.c:2510
  msgid "You must select at least one key.\n"
  msgstr "Devi selezionare almeno una chiave.\n"
  
- #: g10/keyedit.c:2515
++#: g10/keyedit.c:2516
  #, fuzzy
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "Vuoi davvero cancellare le chiavi selezionate? "
  
- #: g10/keyedit.c:2517
++#: g10/keyedit.c:2518
  #, fuzzy
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "Vuoi davvero cancellare questa chiave? "
  
- #: g10/keyedit.c:2555
++#: g10/keyedit.c:2556
  #, fuzzy
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr "Revoco davvero tutti gli user ID selezionati? "
  
- #: g10/keyedit.c:2556
++#: g10/keyedit.c:2557
  #, fuzzy
  msgid "Really revoke this user ID? (y/N) "
  msgstr "Revoco davvero questo user ID? "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2575
  #, fuzzy
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "Vuoi davvero revocare questa chiave? "
  
- #: g10/keyedit.c:2585
++#: g10/keyedit.c:2586
  #, fuzzy
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "Vuoi davvero revocare le chiavi selezionate? "
  
- #: g10/keyedit.c:2587
++#: g10/keyedit.c:2588
  #, fuzzy
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "Vuoi davvero revocare questa chiave? "
  
- #: g10/keyedit.c:2645
++#: g10/keyedit.c:2646
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  
- #: g10/keyedit.c:2690
++#: g10/keyedit.c:2691
  #, fuzzy
  msgid "Set preference list to:\n"
  msgstr "imposta la lista di preferenze"
  
- #: g10/keyedit.c:2697
++#: g10/keyedit.c:2698
  #, fuzzy
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
  
- #: g10/keyedit.c:2699
++#: g10/keyedit.c:2700
  #, fuzzy
  msgid "Really update the preferences? (y/N) "
  msgstr "Aggiorno davvero le preferenze? "
  
- #: g10/keyedit.c:2773
++#: g10/keyedit.c:2774
  #, fuzzy
  msgid "Save changes? (y/N) "
  msgstr "Salvo i cambiamenti? "
  
- #: g10/keyedit.c:2777
++#: g10/keyedit.c:2778
  #, fuzzy
  msgid "Quit without saving? (y/N) "
  msgstr "Esco senza salvare? "
  
- #: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
- #: g10/keyedit.c:3267 g10/keyedit.c:3332
++#: g10/keyedit.c:2789 g10/keyedit.c:2799 g10/keyedit.c:2943 g10/keyedit.c:3046
++#: g10/keyedit.c:3268 g10/keyedit.c:3333 g10/keyedit.c:3409
  #, c-format
  msgid "update failed: %s\n"
  msgstr "aggiornamento fallito: %s\n"
  
- #: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
++#: g10/keyedit.c:2805 g10/keyedit.c:3273 g10/keyedit.c:3338 g10/keyedit.c:3416
  msgid "Key not changed so no update needed.\n"
  msgstr "La chiave non è cambiata quindi non sono necessari aggiornamenti.\n"
  
- #: g10/keyedit.c:3038
++#: g10/keyedit.c:3039
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
  msgstr "Generazione della chiave fallita: %s\n"
  
- #: g10/keyedit.c:3083
++#: g10/keyedit.c:3084
  #, fuzzy, c-format
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "errore: impronta digitale non valida\n"
  
- #: g10/keyedit.c:3112
++#: g10/keyedit.c:3113
  #, fuzzy, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "inizializzazione del trustdb fallita: %s\n"
  
- #: g10/keyedit.c:3248 g10/keyedit.c:3251
++#: g10/keyedit.c:3249 g10/keyedit.c:3252
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
  msgstr "valore non valido\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  #, fuzzy
  #| msgid "No such user ID.\n"
  msgid "No matching user IDs."
  msgstr "User ID inesistente.\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  #, fuzzy
  msgid "Nothing to sign.\n"
  msgstr "Niente da firmare con la chiave %08lX\n"
  
- #: g10/keyedit.c:3427
++#: g10/keyedit.c:3388
+ #, fuzzy, c-format
+ msgid "'%s' is not a valid expiration time\n"
+ msgstr "%s non è un set di caratteri valido\n"
+ 
++#: g10/keyedit.c:3508
  msgid "Digest: "
  msgstr "Digest: "
  
- #: g10/keyedit.c:3484
++#: g10/keyedit.c:3565
  msgid "Features: "
  msgstr "Caratteristiche: "
  
- #: g10/keyedit.c:3495
++#: g10/keyedit.c:3576
  msgid "Keyserver no-modify"
  msgstr ""
  
- #: g10/keyedit.c:3510 g10/keylist.c:377
++#: g10/keyedit.c:3591 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr ""
  
- #: g10/keyedit.c:3518 g10/keyedit.c:3519
++#: g10/keyedit.c:3599 g10/keyedit.c:3600
  #, fuzzy
  msgid "Notations: "
  msgstr "Nota: "
  
- #: g10/keyedit.c:3764
++#: g10/keyedit.c:3845
  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:3836
++#: g10/keyedit.c:3917
  #, fuzzy, c-format
  msgid "The following key was revoked on %s by %s key %s\n"
  msgstr "Questa chiave può essere revocata dalla chiave %s "
  
- #: g10/keyedit.c:3860
++#: g10/keyedit.c:3941
  #, fuzzy, c-format
  msgid "This key may be revoked by %s key %s"
  msgstr "Questa chiave può essere revocata dalla chiave %s "
  
- #: g10/keyedit.c:3866
++#: g10/keyedit.c:3947
  #, fuzzy
  msgid "(sensitive)"
  msgstr " (sensibile)"
  
- #: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3989 g10/keyedit.c:4131 g10/keylist.c:262 g10/keyserver.c:538
  #, fuzzy, c-format
  msgid "created: %s"
  msgstr "impossibile creare %s: %s\n"
  
- #: g10/keyedit.c:3911 g10/keylist.c:1852
++#: g10/keyedit.c:3992 g10/keylist.c:1852
  #, fuzzy, c-format
  msgid "revoked: %s"
  msgstr "[revocata]"
  
- #: g10/keyedit.c:3913 g10/keylist.c:1858
++#: g10/keyedit.c:3994 g10/keylist.c:1858
  #, fuzzy, c-format
  msgid "expired: %s"
  msgstr "[scadenza: %s]"
  
- #: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyedit.c:3996 g10/keyedit.c:4133 g10/keylist.c:264 g10/keylist.c:1864
 +#: g10/keyserver.c:544
  #, fuzzy, c-format
  msgid "expires: %s"
  msgstr "[scadenza: %s]"
  
- #: g10/keyedit.c:3917
++#: g10/keyedit.c:3998
  #, fuzzy, c-format
  msgid "usage: %s"
  msgstr " fiducia: %c/%c"
  
- #: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
++#: g10/keyedit.c:4006 g10/keyedit.c:4026 g10/keylist.c:267
  msgid "card-no: "
  msgstr ""
  
- #: g10/keyedit.c:3984
++#: g10/keyedit.c:4065
  #, fuzzy, c-format
  msgid "trust: %s"
  msgstr " fiducia: %c/%c"
  
- #: g10/keyedit.c:3988
++#: g10/keyedit.c:4069
  #, c-format
  msgid "validity: %s"
  msgstr ""
  
- #: g10/keyedit.c:3995
++#: g10/keyedit.c:4076
  msgid "This key has been disabled"
  msgstr "Questa chiave è stata disabilitata"
  
- #: g10/keyedit.c:4013
++#: g10/keyedit.c:4094
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4626,20 -3623,14 +4584,20 @@@ msgstr "
  "corretta\n"
  "finchè non eseguirai di nuovo il programma.\n"
  
- #: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
- #: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: g10/keyedit.c:4150 g10/keyedit.c:4581 g10/keyserver.c:548
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:712
 +#: dirmngr/ocsp.c:703
  #, fuzzy
  msgid "revoked"
  msgstr "[revocata]"
  
- #: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
- #: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4152 g10/keyedit.c:4583 g10/keyserver.c:552
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:714
  #, fuzzy
  msgid "expired"
  msgstr "expire"
  
- #: g10/keyedit.c:4188
++#: g10/keyedit.c:4269
  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"
@@@ -4648,17 -3639,14 +4606,17 @@@ msgstr "
  "            potrebbe fare diventare un altro user ID il primario "
  "predefinito.\n"
  
- #: g10/keyedit.c:4240
++#: g10/keyedit.c:4321
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr ""
  
- #: g10/keyedit.c:4241
++#: g10/keyedit.c:4322
  #, fuzzy
  #| 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 è possibile cambiare la data di scadenza di una chiave v3\n"
  
- #: g10/keyedit.c:4300
++#: g10/keyedit.c:4381
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4667,36 -3655,28 +4625,36 @@@ 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:4305 g10/keyedit.c:4595
++#: g10/keyedit.c:4386 g10/keyedit.c:4676
  msgid "Are you sure you still want to add it? (y/N) "
  msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
  
- #: g10/keyedit.c:4311
++#: g10/keyedit.c:4392
  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:4326 g10/keygen.c:2697
++#: g10/keyedit.c:4407 g10/keygen.c:2719
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4509
  msgid "Delete this good signature? (y/N/q)"
  msgstr "Cancellare questa firma corretta? (s/N/q)"
  
- #: g10/keyedit.c:4438
++#: g10/keyedit.c:4519
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "Cancellare questa firma non valida? (s/N/q)"
  
- #: g10/keyedit.c:4442
++#: g10/keyedit.c:4523
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4530
  msgid "Really delete this self-signature? (y/N)"
  msgstr "Cancellare davvero questa autofirma? (s/N)"
  
- #: g10/keyedit.c:4465
++#: g10/keyedit.c:4546
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
@@@ -4704,38 -3684,31 +4662,38 @@@ msgid_plural "Deleted %d signatures.\n
  msgstr[0] "Cancellata %d firma.\n"
  msgstr[1] "Cancellata %d firma.\n"
  
- #: g10/keyedit.c:4469
++#: g10/keyedit.c:4550
  msgid "Nothing deleted.\n"
  msgstr "Non è stato cancellato nulla.\n"
  
- #: g10/keyedit.c:4504 g10/trust.c:693
++#: g10/keyedit.c:4585 g10/trust.c:716
  #, fuzzy
  msgid "invalid"
  msgstr "armatura non valida"
  
- #: g10/keyedit.c:4506
++#: g10/keyedit.c:4587
  #, fuzzy, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "L'user ID \"%s\" è stato revocato."
  
- #: g10/keyedit.c:4512
++#: g10/keyedit.c:4593
  #, fuzzy, c-format
  msgid "User ID \"%s\": %d signature removed\n"
  msgid_plural "User ID \"%s\": %d signatures removed\n"
  msgstr[0] "L'user ID \"%s\" è stato revocato."
  msgstr[1] "L'user ID \"%s\" è stato revocato."
  
- #: g10/keyedit.c:4520
++#: g10/keyedit.c:4601
  #, fuzzy, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "l'user ID \"%s\" è già stato revocato\n"
  
- #: g10/keyedit.c:4521
++#: g10/keyedit.c:4602
  #, fuzzy, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "l'user ID \"%s\" è già stato revocato\n"
  
- #: g10/keyedit.c:4590
++#: g10/keyedit.c:4671
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4745,46 -3718,38 +4703,46 @@@ msgstr "
  "            designato può causarne il rifiuto da parte di alcune versioni\n"
  "            di PGP.\n"
  
- #: g10/keyedit.c:4601
++#: g10/keyedit.c:4682
  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:4618
++#: g10/keyedit.c:4699
  msgid "Enter the user ID of the designated revoker: "
  msgstr "Inserisci l'user ID del revocatore designato: "
  
- #: g10/keyedit.c:4643
++#: g10/keyedit.c:4724
  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:4658
++#: g10/keyedit.c:4739
  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:4680
++#: g10/keyedit.c:4761
  #, fuzzy
  msgid "this key has already been designated as a revoker\n"
  msgstr ""
  "ATTENZIONE: questa chiave è stata revocata dal suo revocatore designato!\n"
  
- #: g10/keyedit.c:4698
++#: g10/keyedit.c:4779
  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:4704
++#: g10/keyedit.c:4785
  #, fuzzy
  msgid ""
  "Are you sure you want to appoint this key as a designated revoker? (y/N) "
  msgstr ""
  "Sei sicuro di volere nominare questa chiave revocatrice designata? (s/N):"
  
- #: g10/keyedit.c:4755
++#: g10/keyedit.c:4848
  #, fuzzy
  msgid ""
  "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@@ -4792,243 -3757,192 +4750,243 @@@
  msgstr ""
  "Sei sicuro di volere nominare questa chiave revocatrice designata? (s/N):"
  
- #: g10/keyedit.c:4760
++#: g10/keyedit.c:4853
  #, fuzzy
  msgid "Changing expiration time for a subkey.\n"
  msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
  
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:4856
  msgid "Changing expiration time for the primary key.\n"
  msgstr "Cambio la data di scadenza per la chiave primaria.\n"
  
- #: g10/keyedit.c:4814
++#: g10/keyedit.c:4910
  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:4987
++#: g10/keyedit.c:5085
  #, fuzzy, c-format
  msgid "signing subkey %s is already cross-certified\n"
  msgstr ""
  "ATTENZIONE: la sottochiave per firme %08lX non ha una certificature "
  "incrociata\n"
  
- #: g10/keyedit.c:4993
++#: g10/keyedit.c:5091
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr ""
  
- #: g10/keyedit.c:5108
++#: g10/keyedit.c:5206
  msgid "Please select exactly one user ID.\n"
  msgstr "Devi selezionare esattamente un user ID.\n"
  
- #: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
++#: g10/keyedit.c:5247 g10/keyedit.c:5361 g10/keyedit.c:5474 g10/keyedit.c:5611
  #, fuzzy, c-format
  msgid "skipping v3 self-signature on user ID \"%s\"\n"
  msgstr "salto una autofirma v3 sull'user ID \"%s\"\n"
  
- #: g10/keyedit.c:5320
++#: g10/keyedit.c:5418
  msgid "Enter your preferred keyserver URL: "
  msgstr ""
  
- #: g10/keyedit.c:5399
++#: g10/keyedit.c:5497
  #, fuzzy
  msgid "Are you sure you want to replace it? (y/N) "
  msgstr "Sei sicuro di volerla usare? (s/N) "
  
- #: g10/keyedit.c:5400
++#: g10/keyedit.c:5498
  #, fuzzy
  msgid "Are you sure you want to delete it? (y/N) "
  msgstr "Sei sicuro di volerla usare? (s/N) "
  
- #: g10/keyedit.c:5459
++#: g10/keyedit.c:5557
  #, fuzzy
  msgid "Enter the notation: "
  msgstr "Annotazione della firma: "
  
- #: g10/keyedit.c:5606
++#: g10/keyedit.c:5704
  #, fuzzy
  msgid "Proceed? (y/N) "
  msgstr "Sovrascrivo (s/N)? "
  
- #: g10/keyedit.c:5676
++#: g10/keyedit.c:5774
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "Nessun user ID con l'indice %d\n"
  
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5836
  #, fuzzy, c-format
  msgid "No user ID with hash %s\n"
  msgstr "Nessun user ID con l'indice %d\n"
  
- #: g10/keyedit.c:5839
++#: g10/keyedit.c:5937
  #, fuzzy, c-format
  msgid "No subkey with key ID '%s'.\n"
  msgstr "Nessun user ID con l'indice %d\n"
  
- #: g10/keyedit.c:5861
++#: g10/keyedit.c:5959
  #, fuzzy, c-format
  msgid "No subkey with index %d\n"
  msgstr "Nessun user ID con l'indice %d\n"
  
- #: g10/keyedit.c:6002
++#: g10/keyedit.c:6100
  #, fuzzy, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "user ID: \""
  
- #: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
++#: g10/keyedit.c:6103 g10/keyedit.c:6205 g10/keyedit.c:6253
  #, fuzzy, c-format
  msgid "signed by your key %s on %s%s%s\n"
  msgstr "   firmata da %08lX il %s%s%s\n"
  
- #: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
++#: g10/keyedit.c:6105 g10/keyedit.c:6207 g10/keyedit.c:6255
  msgid " (non-exportable)"
  msgstr " (non esportabile)"
  
- #: g10/keyedit.c:6011
++#: g10/keyedit.c:6109
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "Questa chiave è scaduta il %s.\n"
  
- #: g10/keyedit.c:6016
++#: g10/keyedit.c:6114
  msgid "Are you sure you still want to revoke it? (y/N) "
  msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
  
- #: g10/keyedit.c:6021
++#: g10/keyedit.c:6119
  msgid "Create a revocation certificate for this signature? (y/N) "
  msgstr "Creare un certificato di revoca per questa firma? (s/N) "
  
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6173
  #, fuzzy
  msgid "Not signed by you.\n"
  msgstr "   firmata da %08lX il %s%s\n"
  
- #: g10/keyedit.c:6081
++#: g10/keyedit.c:6179
  #, fuzzy, c-format
  msgid "You have signed these user IDs on key %s:\n"
  msgstr "Non puoi cancellare l'ultimo user ID!\n"
  
- #: g10/keyedit.c:6110
++#: g10/keyedit.c:6208
  #, fuzzy
  msgid " (non-revocable)"
  msgstr " (non esportabile)"
  
- #: g10/keyedit.c:6117
++#: g10/keyedit.c:6215
  #, fuzzy, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "   revocata da %08lX il %s\n"
  
- #: g10/keyedit.c:6142
++#: g10/keyedit.c:6240
  msgid "You are about to revoke these signatures:\n"
  msgstr "Stai per revocare queste firme:\n"
  
- #: g10/keyedit.c:6165
++#: g10/keyedit.c:6263
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "Creare davvero i certificati di revoca? (s/N) "
  
- #: g10/keyedit.c:6198
++#: g10/keyedit.c:6296
  msgid "no secret key\n"
  msgstr "manca la chiave segreta\n"
  
- #: g10/keyedit.c:6246
++#: g10/keyedit.c:6344
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6256
++#: g10/keyedit.c:6354
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "l'user ID \"%s\" è già stato revocato\n"
  
- #: g10/keyedit.c:6273
++#: g10/keyedit.c:6371
  #, 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:6386
++#: g10/keyedit.c:6485
  #, fuzzy, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "l'user ID \"%s\" è già stato revocato\n"
  
- #: g10/keyedit.c:6448
++#: g10/keyedit.c:6547
  #, fuzzy, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "l'user ID \"%s\" è già stato revocato\n"
  
- #: g10/keyedit.c:6545
++#: g10/keyedit.c:6644
  #, fuzzy, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr ""
  "Mostro %s ID fotografici di dimensioni %ld per la chaive 0x%08lX (uid %d)\n"
  
- #: g10/keygen.c:305
++#: g10/keygen.c:316
  #, fuzzy, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "la preferenza %c%lu è doppia\n"
  
- #: g10/keygen.c:312
++#: g10/keygen.c:323
  #, fuzzy
  msgid "too many cipher preferences\n"
  msgstr "ci sono troppe preferenze `%c'\n"
  
- #: g10/keygen.c:314
++#: g10/keygen.c:325
  #, fuzzy
  msgid "too many digest preferences\n"
  msgstr "ci sono troppe preferenze `%c'\n"
  
- #: g10/keygen.c:316
++#: g10/keygen.c:327
  #, fuzzy
  msgid "too many compression preferences\n"
  msgstr "ci sono troppe preferenze `%c'\n"
  
- #: g10/keygen.c:457
++#: g10/keygen.c:468
  #, fuzzy, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "carattere non valido nella stringa delle preferenze\n"
  
- #: g10/keygen.c:936
++#: g10/keygen.c:947
  msgid "writing direct signature\n"
  msgstr "scrittura della firma diretta\n"
  
- #: g10/keygen.c:982
++#: g10/keygen.c:993
  msgid "writing self signature\n"
  msgstr "scrittura della autofirma\n"
  
- #: g10/keygen.c:1038
++#: g10/keygen.c:1049
  msgid "writing key binding signature\n"
  msgstr "scrittura della firma di collegamento alla chiave\n"
  
- #: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
- #: g10/keygen.c:1610 g10/keygen.c:1615
++#: g10/keygen.c:1413 g10/keygen.c:1418 g10/keygen.c:1470 g10/keygen.c:1475
++#: g10/keygen.c:1622 g10/keygen.c:1627
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "dimensione della chiave non valida; uso %u bit\n"
  
- #: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
++#: g10/keygen.c:1424 g10/keygen.c:1481 g10/keygen.c:1489 g10/keygen.c:1633
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "dimensioni della chiave arrotondate a %u bit\n"
  
- #: g10/keygen.c:1503
++#: g10/keygen.c:1515
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1677
++#: g10/keygen.c:1689
  #, fuzzy
  msgid "Sign"
  msgstr "sign"
  
- #: g10/keygen.c:1680
++#: g10/keygen.c:1692
  msgid "Certify"
  msgstr ""
  
- #: g10/keygen.c:1683
++#: g10/keygen.c:1695
  #, fuzzy
  msgid "Encrypt"
  msgstr "cifra dati"
  
- #: g10/keygen.c:1686
++#: g10/keygen.c:1698
  msgid "Authenticate"
  msgstr ""
  
@@@ -5042,157 -3956,126 +5000,157 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1705
++#: g10/keygen.c:1717
  msgid "SsEeAaQq"
  msgstr ""
  
- #: g10/keygen.c:1732
++#: g10/keygen.c:1744
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr ""
  
- #: g10/keygen.c:1738
++#: g10/keygen.c:1750
  msgid "Current allowed actions: "
  msgstr ""
  
- #: g10/keygen.c:1743
++#: g10/keygen.c:1755
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr ""
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1758
  #, fuzzy, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%d) ElGamal (cifra solo)\n"
  
- #: g10/keygen.c:1749
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr ""
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr ""
  
- #: g10/keygen.c:1881 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1893 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Per favore scegli che tipo di chiave vuoi:\n"
  
- #: g10/keygen.c:1885
++#: g10/keygen.c:1897
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) DSA e ElGamal (default)\n"
  
- #: g10/keygen.c:1889
++#: g10/keygen.c:1901
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA e ElGamal (default)\n"
  
- #: g10/keygen.c:1892
++#: g10/keygen.c:1904
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (firma solo)\n"
  
- #: g10/keygen.c:1894
++#: g10/keygen.c:1906
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (firma solo)\n"
  
- #: g10/keygen.c:1900
++#: g10/keygen.c:1912
  #, fuzzy, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) ElGamal (cifra solo)\n"
  
- #: g10/keygen.c:1902
++#: g10/keygen.c:1914
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (cifra solo)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1920
  #, fuzzy, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (cifra solo)\n"
  
- #: g10/keygen.c:1910
++#: g10/keygen.c:1922
  #, fuzzy, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (cifra solo)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1928
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA e ElGamal (default)\n"
  
- #: g10/keygen.c:1918
++#: g10/keygen.c:1930
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (firma solo)\n"
  
- #: g10/keygen.c:1920
++#: g10/keygen.c:1932
  #, fuzzy, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) RSA (cifra solo)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1934
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) RSA (cifra solo)\n"
  
- #: g10/keygen.c:1926
++#: g10/keygen.c:1938
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) RSA (cifra solo)\n"
  
- #: g10/keygen.c:2022 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:206
  #, fuzzy
  msgid "Enter the keygrip: "
  msgstr "Annotazione della firma: "
  
- #: g10/keygen.c:2035 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2047 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2049 sm/certreqgen-ui.c:216
  #, fuzzy
  msgid "No key with this keygrip\n"
  msgstr "Nessun user ID con l'indice %d\n"
  
- #: g10/keygen.c:2111 g10/keygen.c:2125
++#: g10/keygen.c:2133 g10/keygen.c:2147
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
  msgstr "arrotondate a %u bit\n"
  
- #: g10/keygen.c:2166
++#: g10/keygen.c:2188
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr ""
  
- #: g10/keygen.c:2174
++#: g10/keygen.c:2196
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Di che dimensioni vuoi la chiave? (1024) "
  
- #: g10/keygen.c:2177 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2199 sm/certreqgen-ui.c:183
  #, fuzzy, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Di che dimensioni vuoi la chiave? (1024) "
  
- #: g10/keygen.c:2191 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2213 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "La dimensione richiesta della chiave è %u bit\n"
  
- #: g10/keygen.c:2237
++#: g10/keygen.c:2259
  #, fuzzy
  #| msgid "Please select what kind of key you want:\n"
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Per favore scegli che tipo di chiave vuoi:\n"
  
- #: g10/keygen.c:2409
++#: g10/keygen.c:2431
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5208,7 -4091,6 +5166,7 @@@ msgstr "
  "      <n>m = la chiave scadrà dopo n mesi\n"
  "      <n>y = la chiave scadrà dopo n anni\n"
  
- #: g10/keygen.c:2420
++#: g10/keygen.c:2442
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5224,40 -4106,32 +5182,40 @@@ msgstr "
  "      <n>m = la chiave scadrà dopo n mesi\n"
  "      <n>y = la chiave scadrà dopo n anni\n"
  
- #: g10/keygen.c:2443
++#: g10/keygen.c:2465
  msgid "Key is valid for? (0) "
  msgstr "Chiave valida per? (0) "
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2470
  #, fuzzy, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Firma valida per? (0) "
  
- #: g10/keygen.c:2461 g10/keygen.c:2486
++#: g10/keygen.c:2483 g10/keygen.c:2508
  msgid "invalid value\n"
  msgstr "valore non valido\n"
  
- #: g10/keygen.c:2468
++#: g10/keygen.c:2490
  #, fuzzy
  msgid "Key does not expire at all\n"
  msgstr "%s non ha scadenza\n"
  
- #: g10/keygen.c:2469
++#: g10/keygen.c:2491
  #, fuzzy
  msgid "Signature does not expire at all\n"
  msgstr "%s non ha scadenza\n"
  
- #: g10/keygen.c:2474
++#: g10/keygen.c:2496
  #, fuzzy, c-format
  msgid "Key expires at %s\n"
  msgstr "%s scadrà il %s\n"
  
- #: g10/keygen.c:2475
++#: g10/keygen.c:2497
  #, fuzzy, c-format
  msgid "Signature expires at %s\n"
  msgstr "Questa firma scadrà il %s\n"
  
- #: g10/keygen.c:2479
++#: g10/keygen.c:2501
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5265,12 -4139,10 +5223,12 @@@ msgstr "
  "Il tuo sistema non può mostrare date oltre il 2038.\n"
  "Comunque, sarà gestita correttamente fino al 2106.\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2514
  #, fuzzy
  msgid "Is this correct? (y/N) "
  msgstr "È giusto (s/n)? "
  
- #: g10/keygen.c:2560
++#: g10/keygen.c:2582
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5281,7 -4153,6 +5239,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2575
++#: g10/keygen.c:2597
  #, fuzzy
  msgid ""
  "\n"
@@@ -5298,50 -4169,39 +5256,50 @@@ msgstr "
  "    \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
  "\n"
  
- #: g10/keygen.c:2594
++#: g10/keygen.c:2616
  msgid "Real name: "
  msgstr "Nome e Cognome: "
  
- #: g10/keygen.c:2603
++#: g10/keygen.c:2625
  msgid "Invalid character in name\n"
  msgstr "Carattere non valido nel nome\n"
  
- #: g10/keygen.c:2604
++#: g10/keygen.c:2626
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2608
++#: g10/keygen.c:2630
  msgid "Name may not start with a digit\n"
  msgstr "Il nome non può iniziare con una cifra\n"
  
- #: g10/keygen.c:2611
++#: g10/keygen.c:2633
  msgid "Name must be at least 5 characters long\n"
  msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2643
  msgid "Email address: "
  msgstr "Indirizzo di Email: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2649
  msgid "Not a valid email address\n"
  msgstr "L'indirizzo di email non è valido\n"
  
- #: g10/keygen.c:2636
++#: g10/keygen.c:2658
  msgid "Comment: "
  msgstr "Commento: "
  
- #: g10/keygen.c:2642
++#: g10/keygen.c:2664
  msgid "Invalid character in comment\n"
  msgstr "Carattere non valido nel commento\n"
  
- #: g10/keygen.c:2678
++#: g10/keygen.c:2700
  #, fuzzy, c-format
  #| msgid "You are using the `%s' character set.\n"
  msgid "You are using the '%s' character set.\n"
  msgstr "Stai usando il set di caratteri `%s'.\n"
  
- #: g10/keygen.c:2684
++#: g10/keygen.c:2706
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5352,7 -4212,6 +5310,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2689
++#: g10/keygen.c:2711
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr "Per favore non mettere l'indirizzo di email nel nome o nel commento\n"
  
@@@ -5367,35 -4226,28 +5325,35 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2714
++#: g10/keygen.c:2736
  msgid "NnCcEeOoQq"
  msgstr "NnCcEeOoQq"
  
- #: g10/keygen.c:2724
++#: g10/keygen.c:2746
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (Q)uit? "
  
- #: g10/keygen.c:2725
++#: g10/keygen.c:2747
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (O)kay/(Q)uit? "
  
- #: g10/keygen.c:2730
++#: g10/keygen.c:2752
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (Q)uit? "
  
- #: g10/keygen.c:2731
++#: g10/keygen.c:2753
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (O)kay/(Q)uit? "
  
- #: g10/keygen.c:2750
++#: g10/keygen.c:2772
  msgid "Please correct the error first\n"
  msgstr "Per favore correggi prima l'errore\n"
  
- #: g10/keygen.c:2796
++#: g10/keygen.c:2818
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5407,13 -4259,10 +5365,13 @@@ msgstr "
  "dischi) durante la generazione dei numeri primi; questo da al generatore di\n"
  "numeri casuali migliori possibilità di raccogliere abbastanza entropia.\n"
  
- #: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
- #: g10/keygen.c:4777 g10/keygen.c:4882
++#: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
++#: g10/keygen.c:4330 g10/keygen.c:4803 g10/keygen.c:5064 g10/keygen.c:5169
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Generazione della chiave fallita: %s\n"
  
- #: g10/keygen.c:3598
++#: g10/keygen.c:3922
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5421,66 -4270,53 +5379,66 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3924
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3621
++#: g10/keygen.c:3945
  #, fuzzy, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "`%s' è già compresso\n"
  
- #: g10/keygen.c:3626
++#: g10/keygen.c:3950
  #, fuzzy
  msgid "Create anyway? (y/N) "
  msgstr "Uso lo stesso questa chiave? "
  
- #: g10/keygen.c:3632
++#: g10/keygen.c:3956
  #, fuzzy
  msgid "creating anyway\n"
  msgstr "genera una nuova coppia di chiavi"
  
- #: g10/keygen.c:3981
++#: g10/keygen.c:4315
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:4013
++#: g10/keygen.c:4358
  msgid "Key generation canceled.\n"
  msgstr "Generazione della chiave annullata.\n"
  
- #: g10/keygen.c:4073
++#: g10/keygen.c:4418
  #, fuzzy, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "impossibile creare `%s': %s\n"
  
- #: g10/keygen.c:4093
++#: g10/keygen.c:4438
  #, fuzzy, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "NOTA: chiave %08lX scaduta il %s\n"
  
- #: g10/keygen.c:4244 g10/keygen.c:4393
++#: g10/keygen.c:4589 g10/keygen.c:4738
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
  msgstr "scrittura della chiave pubblica in `%s'\n"
  
- #: g10/keygen.c:4387
++#: g10/keygen.c:4732
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "non è stato trovato un portachiavi pubblico scrivibile: %s\n"
  
- #: g10/keygen.c:4401
++#: g10/keygen.c:4746
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error writing public keyring '%s': %s\n"
  msgstr "errore scrivendo il portachiavi pubblico `%s': %s\n"
  
- #: g10/keygen.c:4433
++#: g10/keygen.c:4778
  msgid "public and secret key created and signed.\n"
  msgstr "chiavi pubbliche e segrete create e firmate.\n"
  
- #: g10/keygen.c:4445
++#: g10/keygen.c:4790
  #, fuzzy
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
@@@ -5490,7 -4326,6 +5448,7 @@@ msgstr "
  "il comando \"--edit-key\" per generare una chiave secondaria per questo "
  "scopo.\n"
  
- #: g10/keygen.c:4649 g10/keygen.c:4833
++#: g10/keygen.c:4936 g10/keygen.c:5120
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5498,7 -4333,6 +5456,7 @@@ msgstr "
  "la chiave è stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
  "con l'orologio)\n"
  
- #: g10/keygen.c:4651 g10/keygen.c:4835
++#: g10/keygen.c:4938 g10/keygen.c:5122
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5506,22 -4340,18 +5464,22 @@@ msgstr "
  "la chiave è stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
  "con l'orologio)\n"
  
- #: g10/keygen.c:4662 g10/keygen.c:4846
++#: g10/keygen.c:4949 g10/keygen.c:5133
  #, fuzzy
  #| 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 "NB: la creazione di subchiavi per chiavi v3 non rispetta OpenPGP.\n"
  
- #: g10/keygen.c:4674 g10/keygen.c:4676
++#: g10/keygen.c:4961 g10/keygen.c:4963
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Parti della chiave segreta non sono disponibili.\n"
  
- #: g10/keygen.c:4683 g10/keygen.c:4685
++#: g10/keygen.c:4970 g10/keygen.c:4972
  #, fuzzy
  msgid "Secret parts of primary key are stored on-card.\n"
  msgstr "Parti della chiave segreta non sono disponibili.\n"
  
- #: g10/keygen.c:4704 g10/keygen.c:4860
++#: g10/keygen.c:4991 g10/keygen.c:5147
  #, fuzzy
  msgid "Really create? (y/N) "
  msgstr "Crea davvero? "
@@@ -5847,127 -4612,101 +5805,127 @@@ msgstr "
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
  msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n"
  
- #: g10/mainproc.c:1233 g10/mainproc.c:1276
++#: g10/mainproc.c:1238 g10/mainproc.c:1281
  #, fuzzy
  msgid "no signature found\n"
  msgstr "Firma valida da \""
  
- #: g10/mainproc.c:1607
++#: g10/mainproc.c:1612
  #, fuzzy, c-format
  msgid "BAD signature from \"%s\""
  msgstr "Firma NON corretta da \""
  
- #: g10/mainproc.c:1609
++#: g10/mainproc.c:1614
  #, fuzzy, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Firma scaduta da \""
  
- #: g10/mainproc.c:1611
++#: g10/mainproc.c:1616
  #, fuzzy, c-format
  msgid "Good signature from \"%s\""
  msgstr "Firma valida da \""
  
- #: g10/mainproc.c:1630
++#: g10/mainproc.c:1635
  msgid "signature verification suppressed\n"
  msgstr "verifica della firma soppressa\n"
  
- #: g10/mainproc.c:1739
++#: g10/mainproc.c:1744
  #, fuzzy
  msgid "can't handle this ambiguous signature data\n"
  msgstr "impossibile gestire queste firme multiple\n"
  
- #: g10/mainproc.c:1753 g10/mainproc.c:1761
++#: g10/mainproc.c:1758 g10/mainproc.c:1766
  #, fuzzy, c-format
  msgid "Signature made %s\n"
  msgstr "Firma scaduta il %s\n"
  
- #: g10/mainproc.c:1754 g10/mainproc.c:1762
++#: g10/mainproc.c:1759 g10/mainproc.c:1767
  #, fuzzy, c-format
  msgid "               using %s key %s\n"
  msgstr "                alias \""
  
- #: g10/mainproc.c:1766
++#: g10/mainproc.c:1771
  #, fuzzy, c-format
  msgid "Signature made %s using %s key ID %s\n"
  msgstr "Firma fatta %.*s usando %s con ID %08lX\n"
  
- #: g10/mainproc.c:1772
++#: g10/mainproc.c:1777
  #, fuzzy, c-format
  msgid "               issuer \"%s\"\n"
  msgstr "                alias \""
  
- #: g10/mainproc.c:1789
++#: g10/mainproc.c:1794
  msgid "Key available at: "
  msgstr "Chiave disponibile presso: "
  
- #: g10/mainproc.c:2024
++#: g10/mainproc.c:2029
  msgid "[uncertain]"
  msgstr "[incerta]"
  
- #: g10/mainproc.c:2062
++#: g10/mainproc.c:2067
  #, fuzzy, c-format
  msgid "                aka \"%s\""
  msgstr "                alias \""
  
- #: g10/mainproc.c:2145
++#: g10/mainproc.c:2150
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "Firma scaduta il %s\n"
  
- #: g10/mainproc.c:2149
++#: g10/mainproc.c:2154
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "Questa firma scadrà il %s\n"
  
- #: g10/mainproc.c:2160
++#: g10/mainproc.c:2165
  #, fuzzy, c-format
  #| msgid "%s signature, digest algorithm %s\n"
  msgid "%s signature, digest algorithm %s%s%s\n"
  msgstr "Firma %s, algoritmo di digest %s\n"
  
- #: g10/mainproc.c:2161
++#: g10/mainproc.c:2166
  msgid "binary"
  msgstr "binario"
  
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2167
  msgid "textmode"
  msgstr "modo testo"
  
- #: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "sconosciuto"
  
- #: g10/mainproc.c:2164
++#: g10/mainproc.c:2169
  #, fuzzy
  #| msgid "unknown pubkey algorithm"
  msgid ", key algorithm "
  msgstr "algoritmo della chiave pubblica sconosciuto"
  
- #: g10/mainproc.c:2199
++#: g10/mainproc.c:2204
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2229
++#: g10/mainproc.c:2234
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "Impossibile controllare la firma: %s\n"
  
- #: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
++#: g10/mainproc.c:2327 g10/mainproc.c:2346 g10/mainproc.c:2470
  msgid "not a detached signature\n"
  msgstr "non è una firma separata\n"
  
- #: g10/mainproc.c:2375
++#: g10/mainproc.c:2380
  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:2384
++#: g10/mainproc.c:2389
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "firma solitaria di classe 0x%02x\n"
  
- #: g10/mainproc.c:2469
++#: g10/mainproc.c:2474
  msgid "old style (PGP 2.x) signature\n"
  msgstr "firma vecchio stile (PGP 2.x)\n"
  
@@@ -6260,23 -4945,18 +6218,23 @@@ msgstr "Questa foto è giusta? (s/N/q) 
  msgid "unable to display photo ID!\n"
  msgstr "impossibile mostrare l'ID fotografico\n"
  
- #: g10/pkclist.c:72 g10/revoke.c:757
++#: g10/pkclist.c:72 g10/revoke.c:758
  msgid "No reason specified"
  msgstr "Nessuna ragione specificata"
  
- #: g10/pkclist.c:74 g10/revoke.c:759
++#: g10/pkclist.c:74 g10/revoke.c:760
  msgid "Key is superseded"
  msgstr "Questa chiave è stata sostituita"
  
- #: g10/pkclist.c:76 g10/revoke.c:758
++#: g10/pkclist.c:76 g10/revoke.c:759
  msgid "Key has been compromised"
  msgstr "Questa chiave è stata compromessa"
  
- #: g10/pkclist.c:78 g10/revoke.c:760
++#: g10/pkclist.c:78 g10/revoke.c:761
  msgid "Key is no longer used"
  msgstr "La chiave non è più usata"
  
- #: g10/pkclist.c:80 g10/revoke.c:761
++#: g10/pkclist.c:80 g10/revoke.c:762
  msgid "User ID is no longer valid"
  msgstr "L'user ID non è più valido"
  
@@@ -6357,7 -5024,6 +6315,7 @@@ msgid "
  "\n"
  msgstr ""
  
- #: g10/pkclist.c:310 g10/revoke.c:786
++#: g10/pkclist.c:310 g10/revoke.c:787
  msgid "Your decision? "
  msgstr "Cosa hai deciso? "
  
@@@ -6396,10 -5055,9 +6354,10 @@@ msgstr "Questa chiave ci appartiene\n
  msgid "%s: This key is bad!  It has been marked as untrusted!\n"
  msgstr ""
  
 +#: g10/pkclist.c:484
  #, fuzzy
  msgid ""
- "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "This key is bad!  It has been marked as untrusted!  If you\n"
  "*really* know what you are doing, you may answer the next\n"
  "question with yes.\n"
  msgstr ""
@@@ -6558,33 -5186,26 +6516,33 @@@ msgstr "
  msgid "No such user ID.\n"
  msgstr "User ID inesistente.\n"
  
- #: g10/pkclist.c:1197 g10/pkclist.c:1273
++#: g10/pkclist.c:1197 g10/pkclist.c:1274
  msgid "skipped: public key already set as default recipient\n"
  msgstr "saltata: chiave pubblica già impostata come destinatario predefinito\n"
  
- #: g10/pkclist.c:1218
++#: g10/pkclist.c:1219
  msgid "Public key is disabled.\n"
  msgstr "La chiave pubblica è disabilitata.\n"
  
- #: g10/pkclist.c:1228
++#: g10/pkclist.c:1229
  msgid "skipped: public key already set\n"
  msgstr "saltata: chiave pubblica già impostata\n"
  
- #: g10/pkclist.c:1263
++#: g10/pkclist.c:1264
  #, fuzzy, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "destinatario predefinito `%s' sconosciuto\n"
  
- #: g10/pkclist.c:1312
++#: g10/pkclist.c:1313
  msgid "no valid addressees\n"
  msgstr "nessun indirizzo valido\n"
  
- #: g10/pkclist.c:1665
++#: g10/pkclist.c:1666
  #, fuzzy, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "chiave %08lX: nessun user ID\n"
  
- #: g10/pkclist.c:1690
++#: g10/pkclist.c:1691
  #, fuzzy, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "chiave %08lX: nessun user ID\n"
@@@ -6594,29 -5214,23 +6552,29 @@@ msgid "data not saved; use option \"--o
  msgstr ""
  "i dati non sono stati salvati; usa l'opzione \"--output\" per salvarli\n"
  
- #: g10/plaintext.c:598
++#: g10/plaintext.c:614
  msgid "Detached signature.\n"
  msgstr "Firma separata.\n"
  
- #: g10/plaintext.c:606
++#: g10/plaintext.c:622
  msgid "Please enter name of data file: "
  msgstr "Inserisci il nome del file di dati: "
  
- #: g10/plaintext.c:643
++#: g10/plaintext.c:659
  msgid "reading stdin ...\n"
  msgstr "viene letto stdin...\n"
  
- #: g10/plaintext.c:688
++#: g10/plaintext.c:704
  msgid "no signed data\n"
  msgstr "non ci sono dati firmati\n"
  
- #: g10/plaintext.c:706
++#: g10/plaintext.c:722
  #, fuzzy, c-format
  #| msgid "can't open signed data `%s'\n"
  msgid "can't open signed data '%s'\n"
  msgstr "impossibile aprire i dati firmati `%s'\n"
  
- #: g10/plaintext.c:741
++#: g10/plaintext.c:757
  #, fuzzy, c-format
  msgid "can't open signed data fd=%d: %s\n"
  msgstr "impossibile aprire i dati firmati `%s'\n"
@@@ -6686,7 -5286,6 +6644,7 @@@ msgstr "È disponibile una chiave segre
  msgid "Create a designated revocation certificate for this key? (y/N) "
  msgstr "Creare un certificato di revoca per questa chiave? "
  
- #: g10/revoke.c:336 g10/revoke.c:727
++#: g10/revoke.c:336 g10/revoke.c:728
  msgid "ASCII armored output forced.\n"
  msgstr "Forzato l'output con armatura ASCII.\n"
  
@@@ -6722,23 -5315,20 +6680,23 @@@ msgid "
  "the secret key.  However, if the secret key is still accessible,\n"
  "it is better to generate a new revocation certificate and give\n"
  "a reason for the revocation.  For details see the description of\n"
- "of the gpg command \"--gen-revoke\" in the GnuPG manual."
+ "of the gpg command \"--generate-revocation\" in the GnuPG manual."
  msgstr ""
  
- #: g10/revoke.c:575
++#: g10/revoke.c:576
  msgid ""
  "To avoid an accidental use of this file, a colon has been inserted\n"
  "before the 5 dashes below.  Remove this colon with a text editor\n"
  "before importing and publishing this revocation certificate."
  msgstr ""
  
- #: g10/revoke.c:590
++#: g10/revoke.c:591
  #, fuzzy, c-format
  #| msgid "Revocation certificate created.\n"
  msgid "revocation certificate stored as '%s.rev'\n"
  msgstr "Certificato di revoca creato.\n"
  
- #: g10/revoke.c:634
++#: g10/revoke.c:635
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found\n"
  msgstr "chiave segreta `%s' non trovata: %s\n"
@@@ -6746,23 -5336,19 +6704,23 @@@
  #. TRANSLATORS: The %s prints a key specification which
  #. for example has been given at the command line.  Several lines
  #. lines with secret key infos are printed after this message.
- #: g10/revoke.c:661
++#: g10/revoke.c:662
  #, c-format
  msgid "'%s' matches multiple secret keys:\n"
  msgstr ""
  
- #: g10/revoke.c:688
++#: g10/revoke.c:689
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error searching the keyring: %s\n"
  msgstr "errore creando il portachiavi `%s': %s\n"
  
- #: g10/revoke.c:711
++#: g10/revoke.c:712
  #, fuzzy
  msgid "Create a revocation certificate for this key? (y/N) "
  msgstr "Creare un certificato di revoca per questa chiave? "
  
- #: g10/revoke.c:735
++#: g10/revoke.c:736
  msgid ""
  "Revocation certificate created.\n"
  "\n"
@@@ -6782,33 -5368,26 +6740,33 @@@ msgstr "
  "disponibili\n"
  "ad altri!\n"
  
- #: g10/revoke.c:769
++#: g10/revoke.c:770
  msgid "Please select the reason for the revocation:\n"
  msgstr "Per favore scegli il motivo della revoca:\n"
  
- #: g10/revoke.c:779
++#: g10/revoke.c:780
  msgid "Cancel"
  msgstr "Cancella"
  
- #: g10/revoke.c:781
++#: g10/revoke.c:782
  #, c-format
  msgid "(Probably you want to select %d here)\n"
  msgstr "(Probabilmente volevi scegliere %d)\n"
  
- #: g10/revoke.c:822
++#: g10/revoke.c:823
  msgid "Enter an optional description; end it with an empty line:\n"
  msgstr "Inserisci una descrizione opzionale; terminala con una riga vuota:\n"
  
- #: g10/revoke.c:850
++#: g10/revoke.c:851
  #, c-format
  msgid "Reason for revocation: %s\n"
  msgstr "Motivo della revoca: %s\n"
  
- #: g10/revoke.c:852
++#: g10/revoke.c:853
  msgid "(No description given)\n"
  msgstr "(Non è stata data una descrizione)\n"
  
- #: g10/revoke.c:857
++#: g10/revoke.c:858
  #, fuzzy
  msgid "Is this okay? (y/N) "
  msgstr "Va bene così? "
@@@ -6953,23 -5512,19 +6911,23 @@@ msgstr "
  "lunga).\n"
  "Usata inespansa.\n"
  
- #: g10/sign.c:329
++#: g10/sign.c:331
  #, fuzzy, c-format
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "Firma %s da: \"%s\"\n"
  
- #: g10/sign.c:878
++#: g10/sign.c:880
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
  msgstr ""
  "forzare l'algoritmo di digest %s (%d) viola le preferenze del destinatario\n"
  
- #: g10/sign.c:1009
++#: g10/sign.c:1011
  msgid "signing:"
  msgstr "firma:"
  
- #: g10/sign.c:1286
++#: g10/sign.c:1288
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "sarà usato il cifrario %s\n"
@@@ -6996,7 -5547,6 +6954,7 @@@ msgstr "
  "saltata %s: questa è una chiave ElGamal generata da PGP che NON è sicura per "
  "le firme!\n"
  
- #: g10/tdbdump.c:57 g10/trustdb.c:362
++#: g10/tdbdump.c:57 g10/trustdb.c:369
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "trust record %lu, req type %d: write fallita: %s\n"
@@@ -7044,7 -5586,6 +7002,7 @@@ msgstr "errore cercando il record dell
  msgid "read error in '%s': %s\n"
  msgstr "errore di lettura: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "trustdb: sync fallita: %s\n"
@@@ -7190,298 -5702,306 +7148,372 @@@ msgstr "impossibile gestire linee di te
  msgid "input line longer than %d characters\n"
  msgstr "linea di input più lunga di %d caratteri\n"
  
- #: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
++#: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
  #, fuzzy, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
++#: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:357 g10/tofu.c:699
++#: g10/tofu.c:355 g10/tofu.c:888
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:501
++#: g10/tofu.c:505
  #, fuzzy, c-format
  msgid "unsupported TOFU database version: %s\n"
  msgstr ""
  "\n"
  "Algoritmi gestiti:\n"
  
- #: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
- #: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
- #: g10/tofu.c:3056
++#: g10/tofu.c:538
+ #, fuzzy, c-format
+ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
+ msgstr "errore nella creazione della passhprase: %s\n"
+ 
++#: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
+ msgid "TOFU DB error"
+ msgstr ""
+ 
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2340 g10/tofu.c:2359
++#: g10/tofu.c:2372 g10/tofu.c:2384 g10/tofu.c:2399 g10/tofu.c:2411
++#: g10/tofu.c:2980 g10/tofu.c:2997 g10/tofu.c:3033 g10/tofu.c:3050
++#: g10/tofu.c:3353
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: g10/tofu.c:566 g10/tofu.c:574
++#: g10/tofu.c:716 g10/tofu.c:724
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error determining TOFU database's version: %s\n"
  msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
  
- #: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
++#: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing TOFU database: %s\n"
  msgstr "%s: errore durante la scrittura del dir record: %s\n"
  
- #: g10/tofu.c:765
++#: g10/tofu.c:844
+ #, fuzzy, c-format
+ msgid "error creating 'encryptions' TOFU table: %s\n"
+ msgstr "errore leggendo `%s': %s\n"
+ 
++#: g10/tofu.c:874
+ #, c-format
+ msgid "adding column effective_policy to bindings DB: %s\n"
+ msgstr ""
+ 
++#: g10/tofu.c:956
  #, fuzzy, c-format
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
++#: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: g10/tofu.c:1239
++#: g10/tofu.c:1328
  #, c-format
  msgid ""
  "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1247
++#: g10/tofu.c:1337
  #, c-format
- msgid "The email address \"%s\" is associated with %d keys!"
- msgstr ""
+ msgid "The email address \"%s\" is associated with %d key!"
+ msgid_plural "The email address \"%s\" is associated with %d keys!"
+ msgstr[0] ""
+ msgstr[1] ""
  
- #: g10/tofu.c:1251
++#: g10/tofu.c:1343
  msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  
- #: g10/tofu.c:1257
++#: g10/tofu.c:1349
  #, c-format
  msgid ""
  "Please indicate whether this email address should be associated with key %s "
  "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1513
++#: g10/tofu.c:1605
  #, fuzzy, c-format
  msgid "error gathering other user IDs: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: g10/tofu.c:1523
++#: g10/tofu.c:1615
  #, fuzzy
  #| msgid "list key and user IDs"
  msgid "This key's user IDs:\n"
  msgstr "elenca le chiavi e gli user ID"
  
- #: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
++#: g10/tofu.c:1631 g10/tofu.c:1796
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "policy: %s"
  msgstr "Policy: "
  
- #: g10/tofu.c:1630
++#: g10/tofu.c:1722
  #, fuzzy, c-format
  msgid "error gathering signature stats: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: g10/tofu.c:1634
++#: g10/tofu.c:1726
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1651
++#: g10/tofu.c:1744
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1684 g10/tofu.c:1689
++#: g10/tofu.c:1785 g10/tofu.c:1790
  msgid ", "
  msgstr ""
  
- #: g10/tofu.c:1693
++#: g10/tofu.c:1794
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
  msgstr "elenca le chiavi"
  
- #: g10/tofu.c:1715
++#: g10/tofu.c:1820
+ #, fuzzy, c-format
+ msgid "Verified %d message."
+ msgid_plural "Verified %d messages."
+ msgstr[0] "|algo [files]|stampa tutti i message digests"
+ msgstr[1] "|algo [files]|stampa tutti i message digests"
+ 
++#: g10/tofu.c:1824
  #, fuzzy, c-format
- msgid "Verified %d message"
- msgid_plural "Verified %d messages"
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid "Encrypted %d message."
+ msgid_plural "Encrypted %d messages."
+ msgstr[0] "cifratto con %lu passphrase\n"
+ msgstr[1] "cifratto con %lu passphrase\n"
+ 
++#: g10/tofu.c:1831
+ #, fuzzy, c-format
+ msgid "Verified %d message in the future."
+ msgid_plural "Verified %d messages in the future."
+ msgstr[0] "|algo [files]|stampa tutti i message digests"
+ msgstr[1] "|algo [files]|stampa tutti i message digests"
+ 
++#: g10/tofu.c:1835
+ #, fuzzy, c-format
+ msgid "Encrypted %d message in the future."
+ msgid_plural "Encrypted %d messages in the future."
  msgstr[0] "|algo [files]|stampa tutti i message digests"
  msgstr[1] "|algo [files]|stampa tutti i message digests"
  
- #: g10/tofu.c:1719
++#: g10/tofu.c:1849
  #, c-format
- msgid "Encrypted %d message"
- msgid_plural "Encrypted %d messages"
+ msgid "Messages verified over the past %d day: %d."
+ msgid_plural "Messages verified over the past %d days: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1734
++#: g10/tofu.c:1855
  #, c-format
- msgid " over the past day."
- msgid_plural " over the past %d days."
+ msgid "Messages encrypted over the past %d day: %d."
+ msgid_plural "Messages encrypted over the past %d days: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1740
++#: g10/tofu.c:1865
  #, c-format
- msgid " over the past month."
- msgid_plural " over the past %d months."
+ msgid "Messages verified over the past %d month: %d."
+ msgid_plural "Messages verified over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1746
++#: g10/tofu.c:1871
  #, c-format
- msgid " over the past year."
- msgid_plural " over the past %d years."
+ msgid "Messages encrypted over the past %d month: %d."
+ msgid_plural "Messages encrypted over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1752
- msgid " in the past."
++#: g10/tofu.c:1881
+ #, c-format
+ msgid "Messages verified over the past %d year: %d."
+ msgid_plural "Messages verified over the past %d years: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1887
+ #, c-format
+ msgid "Messages encrypted over the past %d year: %d."
+ msgid_plural "Messages encrypted over the past %d years: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1895
+ #, c-format
+ msgid "Messages verified in the past: %d."
  msgstr ""
  
++#: g10/tofu.c:1899
+ #, fuzzy, c-format
+ msgid "Messages encrypted in the past: %d."
+ msgstr "|algo [files]|stampa tutti i message digests"
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1767
++#: g10/tofu.c:1916
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1809
++#: g10/tofu.c:1958
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1815
++#: g10/tofu.c:1964
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1823
++#: g10/tofu.c:1972
  msgid "Defaulting to unknown."
  msgstr ""
  
- #: g10/tofu.c:1938 g10/tofu.c:2074
++#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
- #: g10/tofu.c:1994
++#: g10/tofu.c:2143
  #, fuzzy, c-format
  msgid "resetting keydb: %s\n"
  msgstr "errore scrivendo il portachiavi `%s': %s\n"
  
- #: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
- #: g10/tofu.c:2425
++#: g10/tofu.c:2601
  #, fuzzy, c-format
- msgid "error setting TOFU binding's trust level to %s\n"
+ msgid "error setting TOFU binding's policy to %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: g10/tofu.c:2473
++#: g10/tofu.c:2794
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #. TRANSLATORS: The tilde ('~') is used here to indicate a
- #. * non-breakable space
- #: g10/tofu.c:2574
++#: g10/tofu.c:2839
  #, c-format
- msgid "%d~year"
- msgid_plural "%d~years"
+ msgid "%lld~year"
+ msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2583
++#: g10/tofu.c:2844
  #, c-format
- msgid "%d~month"
- msgid_plural "%d~months"
+ msgid "%lld~month"
+ msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2592
++#: g10/tofu.c:2849
  #, c-format
- msgid "%d~day"
- msgid_plural "%d~days"
+ msgid "%lld~week"
+ msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2854
  #, c-format
- msgid "%d~hour"
- msgid_plural "%d~hours"
+ msgid "%lld~day"
+ msgid_plural "%lld~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2610
++#: g10/tofu.c:2859
  #, c-format
- msgid "%d~minute"
- msgid_plural "%d~minutes"
+ msgid "%lld~hour"
+ msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2619
++#: g10/tofu.c:2864
  #, c-format
- msgid "%d~second"
- msgid_plural "%d~seconds"
+ msgid "%lld~minute"
+ msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2802
++#: g10/tofu.c:2866
  #, c-format
- msgid "%s: "
+ msgid "%lld~second"
+ msgid_plural "%lld~seconds"
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:3103
+ #, c-format
+ msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:2806
++#: g10/tofu.c:3109
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
- msgid "Verified %ld signatures"
+ msgid "%s: Verified 0 signatures."
  msgstr "Cancellate %d firme.\n"
  
- #: g10/tofu.c:2816
++#: g10/tofu.c:3117
  #, fuzzy, c-format
- msgid "Verified %ld signature in the past %s"
- msgid_plural "Verified %ld signatures in the past %s"
+ msgid "%s: Verified %ld~signature in the past %s."
+ msgid_plural "%s: Verified %ld~signatures in the past %s."
  msgstr[0] "|algo [files]|stampa tutti i message digests"
  msgstr[1] "|algo [files]|stampa tutti i message digests"
  
- #: g10/tofu.c:2826
- #, fuzzy, c-format
++#: g10/tofu.c:3127
+ #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
- msgid ", and encrypted %ld messages"
+ msgid "Encrypted 0 messages."
  msgstr "cifratto con %lu passphrase\n"
  
- #: g10/tofu.c:2835
++#: g10/tofu.c:3135
  #, fuzzy, c-format
- msgid ", and encrypted %ld message in the past %s"
- msgid_plural ", and encrypted %ld messages in the past %s"
+ msgid "Encrypted %ld~message in the past %s."
+ msgid_plural "Encrypted %ld~messages in the past %s."
  msgstr[0] "|algo [files]|stampa tutti i message digests"
  msgstr[1] "|algo [files]|stampa tutti i message digests"
  
- #: g10/tofu.c:2880
++#: g10/tofu.c:3146
+ #, fuzzy, c-format
+ #| msgid "Policy: "
+ msgid "(policy: %s)"
+ msgstr "Policy: "
+ 
++#: g10/tofu.c:3177
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2883
++#: g10/tofu.c:3180
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2887
++#: g10/tofu.c:3184
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2890
++#: g10/tofu.c:3187
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2919
++#: g10/tofu.c:3216
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7498,18 -6018,14 +7530,18 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
- #: g10/tofu.c:3480 g10/tofu.c:3572
++#: g10/tofu.c:3298 g10/tofu.c:3449 g10/tofu.c:3627 g10/tofu.c:3670
++#: g10/tofu.c:3784 g10/tofu.c:3859 g10/tofu.c:3894
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: g10/tofu.c:3185
++#: g10/tofu.c:3482
  #, c-format
- msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
  msgstr ""
  
- #: g10/tofu.c:3515
++#: g10/tofu.c:3819
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7542,74 -6053,59 +7574,74 @@@ msgstr "
  msgid "key %s marked as ultimately trusted\n"
  msgstr "chiavi marcate definitivamente affidabili.\n"
  
- #: g10/trustdb.c:341
++#: g10/trustdb.c:348
  #, 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:347
++#: g10/trustdb.c:354
  #, 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:422
++#: g10/trustdb.c:429
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr ""
  
- #: g10/trustdb.c:431
++#: g10/trustdb.c:438
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:468
++#: g10/trustdb.c:475
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:474
++#: g10/trustdb.c:481
  #, c-format
  msgid "using %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:511
++#: g10/trustdb.c:518
  msgid "no need for a trustdb check\n"
  msgstr "non è necessario un controllo del trustdb\n"
  
- #: g10/trustdb.c:517 g10/trustdb.c:2160
++#: g10/trustdb.c:524 g10/trustdb.c:2187
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "il prossimo controllo del trustdb sarà fatto il %s\n"
  
- #: g10/trustdb.c:526
++#: g10/trustdb.c:533
  #, fuzzy, c-format
  msgid "no need for a trustdb check with '%s' trust model\n"
  msgstr "non è necessario un controllo del trustdb\n"
  
- #: g10/trustdb.c:542
++#: g10/trustdb.c:549
  #, fuzzy, c-format
  msgid "no need for a trustdb update with '%s' trust model\n"
  msgstr "non è necessario un controllo del trustdb\n"
  
- #: g10/trustdb.c:749 g10/trustdb.c:1313
++#: g10/trustdb.c:756 g10/trustdb.c:1340
  #, fuzzy, c-format
  msgid "public key %s not found: %s\n"
  msgstr "chiave pubblica %08lX non trovata: %s\n"
  
- #: g10/trustdb.c:966
++#: g10/trustdb.c:973
  msgid "please do a --check-trustdb\n"
  msgstr "per favore usa --check-trustdb\n"
  
- #: g10/trustdb.c:971
++#: g10/trustdb.c:978
  msgid "checking the trustdb\n"
  msgstr "controllo il trustdb\n"
  
- #: g10/trustdb.c:1883
++#: g10/trustdb.c:1910
  #, fuzzy, c-format
  msgid "%d key processed"
  msgid_plural "%d keys processed"
  msgstr[0] "Per ora sono state esaminate %lu chiavi\n"
  msgstr[1] "Per ora sono state esaminate %lu chiavi\n"
  
- #: g10/trustdb.c:1886
++#: g10/trustdb.c:1913
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7617,22 -6113,18 +7649,22 @@@ msgid_plural " (%d validity counts clea
  msgstr[0] "%d chiavi processate (%d conteggi di validità azzerati)\n"
  msgstr[1] "%d chiavi processate (%d conteggi di validità azzerati)\n"
  
- #: g10/trustdb.c:1956
++#: g10/trustdb.c:1983
  msgid "no ultimately trusted keys found\n"
  msgstr "non è stata trovata alcuna chiave definitivamente affidabile\n"
  
- #: g10/trustdb.c:1970
++#: g10/trustdb.c:1997
  #, fuzzy, c-format
  msgid "public key of ultimately trusted key %s not found\n"
  msgstr "chiave pubblica definitivamente affidabile %08lX non trovata\n"
  
- #: g10/trustdb.c:2087
++#: g10/trustdb.c:2114
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr ""
  
- #: g10/trustdb.c:2167
++#: g10/trustdb.c:2194
  #, fuzzy, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr "trust record %lu, req type %d: write fallita: %s\n"
@@@ -7746,19 -6217,14 +7778,19 @@@ msgid "
  "List, export, import Keybox data\n"
  msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3208
++#: scd/app-nks.c:718 scd/app-openpgp.c:3221
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3220
++#: scd/app-nks.c:726 scd/app-openpgp.c:3233
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
- #: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
- #: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1965 scd/app-openpgp.c:1984
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2166 scd/app-openpgp.c:2430
++#: scd/app-openpgp.c:2477 scd/app-openpgp.c:2582 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr ""
@@@ -7807,84 -6264,66 +7839,84 @@@ msgid "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2511 scd/app-dinsig.c:532
  #, fuzzy, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: scd/app-openpgp.c:806
++#: scd/app-openpgp.c:801
  #, fuzzy, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "inizializzazione del trustdb fallita: %s\n"
  
- #: scd/app-openpgp.c:819
++#: scd/app-openpgp.c:814
  #, fuzzy, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "rebuild della cache del portachiavi fallito: %s\n"
  
- #: scd/app-openpgp.c:1236
++#: scd/app-openpgp.c:1247
  msgid "response does not contain the RSA modulus\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1243
++#: scd/app-openpgp.c:1254
  msgid "response does not contain the RSA public exponent\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1353
++#: scd/app-openpgp.c:1364
  #, fuzzy
  #| msgid "remove keys from the public keyring"
  msgid "response does not contain the EC public key\n"
  msgstr "rimuove le chiavi dal portachiavi pubblico"
  
- #: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:1464 scd/app-openpgp.c:3825
  msgid "response does not contain the public key data\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1551
++#: scd/app-openpgp.c:1564
  #, fuzzy, c-format
  msgid "reading public key failed: %s\n"
  msgstr "cancellazione del keyblock fallita: %s\n"
  
- #: scd/app-openpgp.c:1903
++#: scd/app-openpgp.c:1916
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1910
++#: scd/app-openpgp.c:1923
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1925
++#: scd/app-openpgp.c:1938
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr ""
  
- #: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
++#: scd/app-openpgp.c:1949 scd/app-openpgp.c:2424
  #, fuzzy
  msgid "||Please enter the PIN"
  msgstr "cambia la passphrase"
  
- #: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2173 scd/app-openpgp.c:2437
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
- #: scd/app-openpgp.c:4114
++#: scd/app-openpgp.c:2004 scd/app-openpgp.c:2043 scd/app-openpgp.c:2185
++#: scd/app-openpgp.c:4126
  #, fuzzy, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "invio al keyserver fallito: %s\n"
  
- #: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
++#: scd/app-openpgp.c:2072 scd/app-openpgp.c:2458 scd/app-openpgp.c:4556
  msgid "error retrieving CHV status from card\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
++#: scd/app-openpgp.c:2078 scd/app-openpgp.c:4565
  msgid "card is permanently locked!\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2072
++#: scd/app-openpgp.c:2085
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7894,26 -6333,21 +7926,26 @@@ msgstr[1] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:2082
++#: scd/app-openpgp.c:2095
  #, fuzzy, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "cambia la passphrase"
  
- #: scd/app-openpgp.c:2086
++#: scd/app-openpgp.c:2099
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
  msgstr "cambia la passphrase"
  
- #: scd/app-openpgp.c:2107
++#: scd/app-openpgp.c:2120
  msgid "access to admin commands is not configured\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2460
++#: scd/app-openpgp.c:2473
  #, fuzzy
  msgid "||Please enter the Reset Code for the card"
  msgstr "Per favore scegli il motivo della revoca:\n"
  
- #: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
++#: scd/app-openpgp.c:2483 scd/app-openpgp.c:2537
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr ""
@@@ -7921,117 -6355,93 +7953,117 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2493
++#: scd/app-openpgp.c:2506
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|AN|New Admin PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|N|New PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2565
++#: scd/app-openpgp.c:2578
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "cambia la passphrase"
  
- #: scd/app-openpgp.c:2566
++#: scd/app-openpgp.c:2579
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
  msgstr "cambia la passphrase"
  
- #: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
++#: scd/app-openpgp.c:2635 scd/app-openpgp.c:3885
  #, fuzzy
  msgid "error reading application data\n"
  msgstr "errore leggendo il keyblock: %s\n"
  
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
++#: scd/app-openpgp.c:2641 scd/app-openpgp.c:3892
  #, fuzzy
  msgid "error reading fingerprint DO\n"
  msgstr "%s: errore durante la lettura del record libero: %s\n"
  
- #: scd/app-openpgp.c:2638
++#: scd/app-openpgp.c:2651
  #, fuzzy
  msgid "key already exists\n"
  msgstr "`%s' è già compresso\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2655
  msgid "existing key will be replaced\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2644
++#: scd/app-openpgp.c:2657
  #, fuzzy
  msgid "generating new key\n"
  msgstr "genera una nuova coppia di chiavi"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2659
  #, fuzzy
  msgid "writing new key\n"
  msgstr "genera una nuova coppia di chiavi"
  
- #: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
++#: scd/app-openpgp.c:3201 scd/app-openpgp.c:3553
  msgid "creation timestamp missing\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
++#: scd/app-openpgp.c:3243 scd/app-openpgp.c:3251
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
++#: scd/app-openpgp.c:3384 scd/app-openpgp.c:3647
  #, fuzzy, c-format
  msgid "failed to store the key: %s\n"
  msgstr "inizializzazione del trustdb fallita: %s\n"
  
- #: scd/app-openpgp.c:3534
++#: scd/app-openpgp.c:3547
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "URI non gestito"
  
- #: scd/app-openpgp.c:3790
++#: scd/app-openpgp.c:3802
  msgid "please wait while key is being generated ...\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3798
++#: scd/app-openpgp.c:3810
  #, fuzzy
  msgid "generating key failed\n"
  msgstr "cancellazione del keyblock fallita: %s\n"
  
- #: scd/app-openpgp.c:3804
++#: scd/app-openpgp.c:3816
  #, fuzzy, c-format
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
  msgstr[0] "Generazione della chiave fallita: %s\n"
  msgstr[1] "Generazione della chiave fallita: %s\n"
  
- #: scd/app-openpgp.c:3838
++#: scd/app-openpgp.c:3850
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:3900
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4004
++#: scd/app-openpgp.c:4016
  #, fuzzy, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "Firma %s, algoritmo di digest %s\n"
  
- #: scd/app-openpgp.c:4089
++#: scd/app-openpgp.c:4101
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4551
++#: scd/app-openpgp.c:4570
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
++#: scd/app-openpgp.c:4871 scd/app-openpgp.c:4882
  #, fuzzy, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "Non sono stati trovati dati OpenPGP validi.\n"
@@@ -8052,7 -6459,6 +8084,7 @@@ msgstr "
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
@@@ -8097,27 -6494,22 +8129,27 @@@ msgstr "comandi in conflitto\n
  msgid "use variable length input for pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:287
++#: scd/scdaemon.c:286
  #, fuzzy
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
  
- #: scd/scdaemon.c:289
++#: scd/scdaemon.c:288
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
  msgstr ""
  
- #: scd/scdaemon.c:786
++#: scd/scdaemon.c:784
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1904
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
++#: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1909
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
@@@ -8197,9 -6573,6 +8229,9 @@@ msgstr "errore nella creazione della pa
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "cancellazione del keyblock fallita: %s\n"
  
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
 +#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  #, fuzzy
  msgid "failed to allocate keyDB handle\n"
  msgstr "inizializzazione del trustdb fallita: %s\n"
@@@ -8694,11 -6965,9 +8726,11 @@@ msgstr "
  msgid "resource problem: out of core\n"
  msgstr ""
  
- #: sm/decrypt.c:330
++#: sm/decrypt.c:332
  msgid "(this is the RC2 algorithm)\n"
  msgstr ""
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:334
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr ""
  
@@@ -8742,124 -7003,96 +8774,124 @@@ msgstr "elenca le chiavi segrete
  msgid "list certificate chain"
  msgstr "certificato danneggiato"
  
- #: sm/gpgsm.c:218
++#: sm/gpgsm.c:219
  #, fuzzy
  msgid "import certificates"
  msgstr "certificato danneggiato"
  
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
  #, fuzzy
  msgid "export certificates"
  msgstr "certificato danneggiato"
  
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:228
  msgid "register a smartcard"
  msgstr ""
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:231
  msgid "pass a command to the dirmngr"
  msgstr ""
  
- #: sm/gpgsm.c:232
++#: sm/gpgsm.c:233
  msgid "invoke gpg-protect-tool"
  msgstr ""
  
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:250
  #, fuzzy
  msgid "create base-64 encoded output"
  msgstr "crea un output ascii con armatura"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in PEM format"
  msgstr ""
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in base-64 format"
  msgstr ""
  
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:262
  msgid "assume input is in binary format"
  msgstr ""
  
- #: sm/gpgsm.c:267
++#: sm/gpgsm.c:269
  msgid "never consult a CRL"
  msgstr ""
  
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:279
  msgid "check validity using OCSP"
  msgstr ""
  
- #: sm/gpgsm.c:282
++#: sm/gpgsm.c:284
  msgid "|N|number of certificates to include"
  msgstr ""
  
- #: sm/gpgsm.c:285
++#: sm/gpgsm.c:287
  msgid "|FILE|take policy information from FILE"
  msgstr ""
  
- #: sm/gpgsm.c:288
++#: sm/gpgsm.c:290
  msgid "do not check certificate policies"
  msgstr ""
  
- #: sm/gpgsm.c:292
++#: sm/gpgsm.c:294
  msgid "fetch missing issuer certificates"
  msgstr ""
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "don't use the terminal at all"
  msgstr "non usa per niente il terminale"
  
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:307
  msgid "|FILE|write a server mode log to FILE"
  msgstr ""
  
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:312
  #, fuzzy
  msgid "|FILE|write an audit log to FILE"
  msgstr "|FILE|carica il modulo di estensione FILE"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "batch mode: never ask"
  msgstr "modo batch: non fa domande"
  
- #: sm/gpgsm.c:314
++#: sm/gpgsm.c:316
  msgid "assume yes on most questions"
  msgstr "risponde \"sì\" a quasi tutte le domande"
  
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:317
  msgid "assume no on most questions"
  msgstr "risponde \"no\" a quasi tutte le domande"
  
- #: sm/gpgsm.c:318
++#: sm/gpgsm.c:320
  #, fuzzy
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "aggiungi questo portachiavi alla lista"
  
- #: sm/gpgsm.c:321
++#: sm/gpgsm.c:323
  #, fuzzy
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|NOME|usa NOME come chiave segreta predefinita"
  
- #: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
  #, fuzzy
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|HOST|cerca le chiavi in questo keyserver"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|NOME|usa l'algoritmo di cifratura NOME"
  
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:352
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|NOME|usa l'algoritmo di message digest NOME"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:559
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
  msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
  
- #: sm/gpgsm.c:570
++#: sm/gpgsm.c:562
  #, fuzzy
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
@@@ -8870,47 -7103,38 +8902,47 @@@ msgstr "
  "firma, controlla, cifra o decifra\n"
  "l'operazione predefinita dipende dai dati di input\n"
  
- #: sm/gpgsm.c:774
++#: sm/gpgsm.c:766
  #, fuzzy, c-format
  msgid "Note: won't be able to encrypt to '%s': %s\n"
  msgstr "impossibile connettersi a `%s': %s\n"
  
- #: sm/gpgsm.c:785
++#: sm/gpgsm.c:777
  #, fuzzy, c-format
  msgid "unknown validation model '%s'\n"
  msgstr "destinatario predefinito `%s' sconosciuto\n"
  
- #: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
  #, fuzzy, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "(Non è stata data una descrizione)\n"
  
- #: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr ""
  
- #: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
  #, fuzzy, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr " s = salta questa chiave\n"
  
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1427
  #, fuzzy
  msgid "could not parse keyserver\n"
  msgstr "impossibile fare il parsing dell'URI del keyserver\n"
  
- #: sm/gpgsm.c:1636
++#: sm/gpgsm.c:1630
  #, fuzzy, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "scrittura in `%s'\n"
  
- #: sm/gpgsm.c:1677
++#: sm/gpgsm.c:1671
  #, fuzzy, c-format
  msgid "can't sign using '%s': %s\n"
  msgstr "impossibile chiudere `%s': %s\n"
  
- #: sm/gpgsm.c:2033
++#: sm/gpgsm.c:2028
  msgid "invalid command (there is no implicit command)\n"
  msgstr ""
  
@@@ -9672,8 -7745,6 +9704,8 @@@ msgstr "
  msgid "CRL access not possible due to disabled %s\n"
  msgstr ""
  
 +#: dirmngr/crlfetch.c:223 dirmngr/ldap-wrapper-ce.c:488
- #: dirmngr/ldap-wrapper.c:742 dirmngr/misc.c:563
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:563
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
@@@ -9858,116 -7893,88 +9890,116 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:160
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:158
++#: dirmngr/dirmngr.c:161
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|FILE|carica il modulo di estensione FILE"
  
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:162
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:163
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:164
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
- #: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
++#: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:177
++#: dirmngr/dirmngr.c:180
  #, fuzzy
  msgid "run without asking a user"
  msgstr "Esco senza salvare? "
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:181
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:182
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:184
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:185
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:186
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:188
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:192
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:202
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FILE|carica il modulo di estensione FILE"
  
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:210
  #, fuzzy
  msgid "|URL|use OCSP responder at URL"
  msgstr "impossibile fare il parsing dell'URI del keyserver\n"
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:212
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:218
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:220
++#: dirmngr/dirmngr.c:223
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:225
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:240
++#: dirmngr/dirmngr.c:246
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -9980,92 -7987,73 +10012,92 @@@ msgstr "
  "@\n"
  "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
  
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:361
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
  
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:363
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:443
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
- #: tools/gpgconf.c:648
++#: dirmngr/dirmngr.c:496 tools/gpgconf.c:550 tools/gpgconf.c:585
++#: tools/gpgconf.c:656
  #, fuzzy, c-format
  msgid "usage: %s [options] "
  msgstr "uso: gpg [opzioni] "
  
- #: dirmngr/dirmngr.c:1062
++#: dirmngr/dirmngr.c:1074
  #, fuzzy
  #| msgid "%s not allowed with %s!\n"
  msgid "colons are not allowed in the socket name\n"
  msgstr "Non è permesso usare %s con %s!\n"
  
- #: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
++#: dirmngr/dirmngr.c:1300 dirmngr/server.c:1585
  #, fuzzy, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "creazione dell'armatura fallita: %s\n"
  
- #: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
++#: dirmngr/dirmngr.c:1306 dirmngr/server.c:1591
  #, fuzzy, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "creazione dell'armatura fallita: %s\n"
  
- #: dirmngr/dirmngr.c:1484
++#: dirmngr/dirmngr.c:1487
  #, fuzzy, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "riga troppo lunga\n"
  
- #: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
++#: dirmngr/dirmngr.c:1542 dirmngr/dirmngr.c:1626
  #, fuzzy, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "errore: impronta digitale non valida\n"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
++#: dirmngr/dirmngr.c:1578 dirmngr/dirmngr.c:1604 tools/gpgconf-comp.c:4032
  #, fuzzy, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "errore di lettura: %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1633
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1700
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1734
++#: dirmngr/dirmngr.c:1738
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1739
++#: dirmngr/dirmngr.c:1743
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1745
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
  # ??? (Md)
- #: dirmngr/dirmngr.c:1746
++#: dirmngr/dirmngr.c:1750
  #, fuzzy
  msgid "shutdown forced\n"
  msgstr "non esaminato"
  
- #: dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1758
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1761
++#: dirmngr/dirmngr.c:1765
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10547,33 -8436,27 +10579,33 @@@ msgstr "cancellazione del keyblock fall
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2463
++#: dirmngr/server.c:2469
  #, fuzzy, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "impossibile creare `%s': %s\n"
  
- #: dirmngr/server.c:2474
++#: dirmngr/server.c:2480
  #, fuzzy, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "%s: creazione della tabella hash fallita: %s\n"
  
- #: dirmngr/server.c:2495
++#: dirmngr/server.c:2501
  #, fuzzy, c-format
  #| msgid "failed to initialize the TrustDB: %s\n"
  msgid "failed to initialize the server: %s\n"
  msgstr "inizializzazione del trustdb fallita: %s\n"
  
- #: dirmngr/server.c:2503
++#: dirmngr/server.c:2509
  #, fuzzy, c-format
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "rebuild della cache del portachiavi fallito: %s\n"
  
- #: dirmngr/server.c:2534
++#: dirmngr/server.c:2540
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2553
++#: dirmngr/server.c:2559
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
@@@ -10621,7 -8495,6 +10653,7 @@@ msgstr "DSA richiede l'uso di un algori
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:167
  #, fuzzy
  msgid "quiet"
  msgstr "quit"
@@@ -10714,22 -8567,15 +10746,22 @@@ msgstr "firma fallita: %s\n
  msgid "error sending standard options: %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
 +#: tools/gpgconf-comp.c:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
- #: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
++#: tools/gpgconf-comp.c:766 tools/gpgconf-comp.c:865
  msgid "Options controlling the diagnostic output"
  msgstr ""
  
 +#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
- #: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
++#: tools/gpgconf-comp.c:779 tools/gpgconf-comp.c:888
  msgid "Options controlling the configuration"
  msgstr ""
  
- #: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
- #: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
++#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:723
++#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:901
  msgid "Options useful for debugging"
  msgstr ""
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
  msgid "Options controlling the security"
  msgstr ""
  
@@@ -10779,11 -8614,9 +10811,11 @@@ msgstr "errore nella creazione della pa
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
++#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
  msgid "|NAME|use NAME as default secret key"
  msgstr "|NOME|usa NOME come chiave segreta predefinita"
  
- #: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
++#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:784
  #, fuzzy
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NOME|cifra per NOME"
@@@ -10792,194 -8624,161 +10824,208 @@@
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
++#: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
  msgid "Configuration for Keyservers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
++#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
  #, fuzzy
  msgid "|URL|use keyserver at URL"
  msgstr "impossibile fare il parsing dell'URI del keyserver\n"
  
- #: tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:741
  msgid "allow PKA lookups (DNS requests)"
  msgstr ""
  
- #: tools/gpgconf-comp.c:738
++#: tools/gpgconf-comp.c:744
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr ""
  
- #: tools/gpgconf-comp.c:787
++#: tools/gpgconf-comp.c:793
  msgid "disable all access to the dirmngr"
  msgstr ""
  
- #: tools/gpgconf-comp.c:790
++#: tools/gpgconf-comp.c:796
  #, fuzzy
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
  msgstr "|NOME|usa l'alg. di cifratura NOME per le passphrase"
  
- #: tools/gpgconf-comp.c:820
++#: tools/gpgconf-comp.c:829
  msgid "do not check CRLs for root certificates"
  msgstr ""
  
- #: tools/gpgconf-comp.c:869
++#: tools/gpgconf-comp.c:878
  msgid "Options controlling the format of the output"
  msgstr ""
  
- #: tools/gpgconf-comp.c:905
++#: tools/gpgconf-comp.c:920
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:918
++#: tools/gpgconf-comp.c:933
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:947
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:958
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:948
++#: tools/gpgconf-comp.c:963
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:977
++#: tools/gpgconf-comp.c:992
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:985
++#: tools/gpgconf-comp.c:1000
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1066
++#: tools/gpgconf-comp.c:1081
  msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1067
++#: tools/gpgconf-comp.c:1082
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1083
  msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1069
++#: tools/gpgconf-comp.c:1084
  msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1070
++#: tools/gpgconf-comp.c:1085
  #, fuzzy
  #| msgid "network error"
  msgid "Network"
  msgstr "errore di rete"
  
- #: tools/gpgconf-comp.c:1071
++#: tools/gpgconf-comp.c:1086
  #, fuzzy
  msgid "Passphrase Entry"
  msgstr "passphrase errata"
  
- #: tools/gpgconf-comp.c:1225
++#: tools/gpgconf-comp.c:1240
  #, fuzzy
  msgid "Component not suitable for launching"
  msgstr "chiave pubblica non trovata"
  
- #: tools/gpgconf-comp.c:3283
++#: tools/gpgconf-comp.c:3311
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3434
++#: tools/gpgconf-comp.c:3462
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf-comp.c:4036
+ #, fuzzy, c-format
+ msgid "error closing '%s'\n"
+ msgstr "errore leggendo `%s': %s\n"
+ 
++#: tools/gpgconf-comp.c:4038
+ #, fuzzy, c-format
+ msgid "error parsing '%s'\n"
+ msgstr "errore leggendo `%s': %s\n"
+ 
++#: tools/gpgconf.c:73
  msgid "list all components"
  msgstr ""
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "check all programs"
  msgstr ""
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|list options"
  msgstr ""
  
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
  msgid "|COMPONENT|change options"
  msgstr ""
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "|COMPONENT|check options"
  msgstr ""
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "apply global default values"
  msgstr ""
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
+ msgid "|FILE|update configuration files using FILE"
+ msgstr ""
+ 
++#: tools/gpgconf.c:83
  msgid "get the configuration directories for @GPGCONF@"
  msgstr ""
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:85
  #, fuzzy
  msgid "list global configuration file"
  msgstr "elemento della configurazione sconosciuto \"%s\"\n"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  #, fuzzy
  msgid "check global configuration file"
  msgstr "elemento della configurazione sconosciuto \"%s\"\n"
  
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:89
  #, fuzzy
  #| msgid "update the trust database"
  msgid "query the software version database"
  msgstr "aggiorna il database della fiducia"
  
- #: tools/gpgconf.c:86
++#: tools/gpgconf.c:90
  msgid "reload all or a given component"
  msgstr ""
  
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:91
  msgid "launch a given component"
  msgstr ""
  
- #: tools/gpgconf.c:88
++#: tools/gpgconf.c:92
  msgid "kill a given component"
  msgstr ""
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "use as output file"
  msgstr "usa come file di output"
  
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:102
  msgid "activate changes at runtime, if possible"
  msgstr ""
  
- #: tools/gpgconf.c:122
++#: tools/gpgconf.c:127
  #, fuzzy
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
  
- #: tools/gpgconf.c:125
++#: tools/gpgconf.c:130
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
  msgstr ""
  
- #: tools/gpgconf.c:545 tools/gpgconf.c:579
++#: tools/gpgconf.c:552 tools/gpgconf.c:587
  msgid "Need one component argument"
  msgstr ""
  
- #: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
++#: tools/gpgconf.c:561 tools/gpgconf.c:599 tools/gpgconf.c:632
  #, fuzzy
  msgid "Component not found"
  msgstr "chiave pubblica non trovata"
  
- #: tools/gpgconf.c:650
++#: tools/gpgconf.c:658
  #, fuzzy
  msgid "No argument allowed"
  msgstr "scrittura della chiave segreta in `%s'\n"
diff --cc po/ja.po
index 444aa20,bd143bf..5e979a0
--- a/po/ja.po
+++ b/po/ja.po
@@@ -8,10 -8,9 +8,10 @@@
  #
  msgid ""
  msgstr ""
- "Project-Id-Version: gnupg 2.1.15\n"
+ "Project-Id-Version: gnupg 2.1.16\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-11-18 16:54+0100\n"
- "PO-Revision-Date: 2016-09-02 16:58+0200\n"
++"POT-Creation-Date: 2016-12-20 11:28+0100\n"
+ "PO-Revision-Date: 2016-12-17 16:29+0900\n"
  "Last-Translator: NIIBE Yutaka <gniibe at fsij.org>\n"
  "Language-Team: none\n"
  "Language: ja\n"
@@@ -154,24 -125,10 +154,24 @@@ msgstr "パスフレーズが不正で�
  msgid "ssh keys greater than %d bits are not supported\n"
  msgstr "ssh鍵で%dビットより大きいものはサポートされません\n"
  
 +#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
- #: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1306 g10/keygen.c:4577
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
++#: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
  #, c-format
  msgid "can't create '%s': %s\n"
  msgstr "'%s'が作成できません: %s\n"
  
 +#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
- #: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1307
++#: g10/import.c:305 g10/import.c:448 g10/import.c:621 g10/keygen.c:3681
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
- #: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
- #: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:825 g10/sign.c:1025
++#: g10/sign.c:1130 g10/sign.c:1275 g10/tdbdump.c:143 g10/tdbdump.c:151
++#: g10/tdbio.c:720 g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161
++#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
++#: dirmngr/certcache.c:368 dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1564
  #, c-format
  msgid "can't open '%s': %s\n"
  msgstr "'%s'が開けません: %s\n"
@@@ -236,11 -182,9 +236,11 @@@ msgstr "
  msgid "failed to create stream from socket: %s\n"
  msgstr "ソケットからストリームを作成するのに失敗しました: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1100
++#: agent/divert-scd.c:92 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr "以下のシリアル番号のカードを挿入してください"
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1101
++#: agent/divert-scd.c:93 g10/call-agent.c:1102
  msgid "Please remove the current card and insert the one with serial number"
  msgstr "今のカードを抜き、以下のシリアル番号のカードを挿入してください"
  
@@@ -372,47 -290,30 +372,45 @@@ msgstr "
  "@オプション:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
  msgid "run in daemon mode (background)"
  msgstr "デーモン・モードで実行 (バックグラウンド)"
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
  msgid "run in server mode (foreground)"
  msgstr "サーバ・モードで実行 (フォアグラウンド)"
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
- #, fuzzy
- #| msgid "run in server mode"
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
  msgid "run in supervised mode"
- msgstr "サーバ・モードで実行"
+ msgstr "スーパーバイズド・モードで実行"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:170 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "冗長"
  
 +#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "いくらかおとなしく"
  
- #: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
  msgid "sh-style command output"
  msgstr "sh-形式のコマンド出力"
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
  msgid "csh-style command output"
  msgstr "csh-形式のコマンド出力"
  
- #: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
- #: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
++#: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
  msgid "|FILE|read options from FILE"
  msgstr "|FILE|FILEからオプションを読み込みます"
  
- #: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:177
  msgid "do not detach from the console"
  msgstr "コンソールからデタッチしない"
  
@@@ -487,19 -371,12 +485,19 @@@ msgstr "puttyサポートを有功に�
  #. 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:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:481 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1025 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:358
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:124 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr "バグは <@EMAIL@> までご報告ください。\n"
  
- #: agent/gpg-agent.c:491
++#: agent/gpg-agent.c:490
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "使い方: @GPG_AGENT@ [オプション] (ヘルプは -h)"
  
- #: agent/gpg-agent.c:493
++#: agent/gpg-agent.c:492
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
@@@ -507,135 -384,100 +505,135 @@@ msgstr "
  "形式: @GPG_AGENT@ [オプション] [コマンド [引数]]\n"
  "@GnuPG@の秘密鍵の管理\n"
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:537 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:442
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr "無効なdebug-level '%s'が与えられました\n"
  
- #: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:793
++#: agent/gpg-agent.c:1082 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:812
  #, c-format
  msgid "Note: no default option file '%s'\n"
  msgstr "*注意*: デフォルトのオプション・ファイル '%s' がありません\n"
  
- #: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
- #: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1093 agent/gpg-agent.c:1935 g10/gpg.c:2510
++#: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:817
++#: dirmngr/dirmngr.c:1670 tools/symcryptrun.c:932
  #, c-format
  msgid "option file '%s': %s\n"
  msgstr "オプション・ファイル '%s': %s\n"
  
- #: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:806
++#: agent/gpg-agent.c:1101 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:825
  #, c-format
  msgid "reading options from '%s'\n"
  msgstr "'%s' からオプションを読み込みます\n"
  
- #: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
- #: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
++#: agent/gpg-agent.c:1223 g10/gpg.c:3643 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:936 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:527
  #, c-format
  msgid "Note: '%s' is not considered an option\n"
  msgstr "*注意*: '%s'はオプションとは考えられません\n"
  
- #: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
++#: agent/gpg-agent.c:2080 scd/scdaemon.c:1073 dirmngr/dirmngr.c:1081
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "ソケットが作成できません: %s\n"
  
- #: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
++#: agent/gpg-agent.c:2097 scd/scdaemon.c:1086 dirmngr/dirmngr.c:1094
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr "ソケット名'%s'は長すぎます\n"
  
- #: agent/gpg-agent.c:2134
++#: agent/gpg-agent.c:2135
  msgid "a gpg-agent is already running - not starting a new one\n"
  msgstr "gpg-agentは既に実行されています - 新しいものをスタートさせません\n"
  
- #: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
++#: agent/gpg-agent.c:2145 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1126
  msgid "error getting nonce for the socket\n"
  msgstr "ソケットのナンス取得エラー\n"
  
- #: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
++#: agent/gpg-agent.c:2150 scd/scdaemon.c:1113 dirmngr/dirmngr.c:1129
  #, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "'%s'でソケットのバインドのエラー: %s\n"
  
- #: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
- #: dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2160 agent/gpg-agent.c:2197 scd/scdaemon.c:1121
++#: dirmngr/dirmngr.c:1138
  #, c-format
  msgid "can't set permissions of '%s': %s\n"
  msgstr "'%s'の許可が設定できません: %s\n"
  
- #: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:2165 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1143
  #, c-format
  msgid "listen() failed: %s\n"
  msgstr "listen() に失敗しました: %s\n"
  
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
++#: agent/gpg-agent.c:2172 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1149
  #, c-format
  msgid "listening on socket '%s'\n"
  msgstr "ソケット'%s'でlisten\n"
  
- #: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: agent/gpg-agent.c:2191 agent/gpg-agent.c:2234 g10/exec.c:199
 +#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, c-format
  msgid "can't create directory '%s': %s\n"
  msgstr "ディレクトリ'%s'が作成できません: %s\n"
  
- #: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: agent/gpg-agent.c:2194 agent/gpg-agent.c:2239 g10/openfile.c:491
 +#: g10/openfile.c:520 sm/keydb.c:103
  #, c-format
  msgid "directory '%s' created\n"
  msgstr "ディレクトリ'%s'が作成されました\n"
  
- #: agent/gpg-agent.c:2244
++#: agent/gpg-agent.c:2245
  #, c-format
  msgid "stat() failed for '%s': %s\n"
  msgstr "'%s'でstat()が失敗しました: %s\n"
  
- #: agent/gpg-agent.c:2248
++#: agent/gpg-agent.c:2249
  #, c-format
  msgid "can't use '%s' as home directory\n"
  msgstr "'%s'をホーム・ディレクトリに使えません\n"
  
- #: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
++#: agent/gpg-agent.c:2392 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1871
  #, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "fd %dでナンスの読み込みエラー: %s\n"
  
- #: agent/gpg-agent.c:2598
++#: agent/gpg-agent.c:2599
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr "ハンドラ0x%lx (fd %d に対する)が開始\n"
  
- #: agent/gpg-agent.c:2603
++#: agent/gpg-agent.c:2604
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr "ハンドラ0x%lx (fd %d に対する)が終了\n"
  
- #: agent/gpg-agent.c:2678
++#: agent/gpg-agent.c:2679
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr "ssh ハンドラ0x%lx (fd %d に対する)が開始\n"
  
- #: agent/gpg-agent.c:2683
++#: agent/gpg-agent.c:2684
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr "ssh ハンドラ0x%lx (fd %d に対する)が終了\n"
  
- #: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
++#: agent/gpg-agent.c:2881 scd/scdaemon.c:1272 dirmngr/dirmngr.c:2075
  #, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "npth_pselectに失敗しました: %s - 一秒待ちます\n"
  
- #: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2954 scd/scdaemon.c:1321
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s 停止しました\n"
  
- #: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
++#: agent/gpg-agent.c:3092 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  msgid "no gpg-agent running in this session\n"
  msgstr "このセッションでgpg-agentは実行されていません\n"
  
@@@ -651,8 -491,6 +649,8 @@@ msgstr "
  "形式: gpg-preset-passphrase [オプション] KEYGRIP\n"
  "パスワードキャッシュの管理\n"
  
- #: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
++#: agent/protect-tool.c:106 g10/gpg.c:424 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:153 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -660,9 -498,6 +658,9 @@@ msgstr "
  "@コマンド:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
- #: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:92 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:168 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -718,8 -545,6 +716,8 @@@ msgstr "キャンセルされました\
  msgid "error while asking for the passphrase: %s\n"
  msgstr "パスフレーズを問い合わせする際、エラー: %s\n"
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
- #: tools/gpgconf.c:323
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1472
++#: tools/gpgconf.c:328
  #, c-format
  msgid "error opening '%s': %s\n"
  msgstr "'%s'を開く際、エラー: %s\n"
@@@ -889,9 -685,6 +887,9 @@@ 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:438
 +#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
- #: dirmngr/ldap-wrapper.c:710
++#: dirmngr/ldap-wrapper.c:711
  #, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "パイプの作成エラー: %s\n"
@@@ -903,8 -693,6 +901,8 @@@
  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:848 dirmngr/dirmngr.c:1155
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1167
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "プロセスforkエラー: %s\n"
@@@ -949,28 -728,22 +947,27 @@@ msgstr "'%s'へ接続できません: %
  msgid "problem setting the gpg-agent options\n"
  msgstr "gpg-agentオプションの設定の問題\n"
  
- #: common/sysutils.c:144
++#: common/sysutils.c:148
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "コア・ダンプを無効にできません: %s\n"
  
- #: common/sysutils.c:239
++#: common/sysutils.c:250
  #, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "警告: '%s'の安全でない所有 \"%s\"\n"
  
- #: common/sysutils.c:271
++#: common/sysutils.c:282
  #, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "警告: '%s'の安全でない許可 \"%s\"\n"
  
- #: common/sysutils.c:659
- #, fuzzy, c-format
- #| msgid "waiting for the agent to come up ... (%ds)\n"
++#: common/sysutils.c:693
+ #, c-format
  msgid "waiting for file '%s' to become accessible ...\n"
- msgstr "agentの起動のため、%d秒待ちます\n"
+ msgstr "ファイル'%s'がアクセスできるのを待ちます...\n"
  
- #: common/sysutils.c:685
++#: common/sysutils.c:719
  #, c-format
  msgid "renaming '%s' to '%s' failed: %s\n"
  msgstr "'%s'から'%s'へ名前変更に失敗: %s\n"
@@@ -1047,7 -805,6 +1044,7 @@@ msgid "WARNING: \"%s%s\" is an obsolet
  msgstr ""
  "*警告*: \"%s%s\"は、使われなくなったオプションです - なんの効果もありません\n"
  
- #: common/miscellaneous.c:554
++#: common/miscellaneous.c:556
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr "未知のdebugフラグ'%s'は無視されました\n"
@@@ -1151,8 -885,6 +1148,8 @@@ msgstr "セッション・キーが作�
  msgid "algorithm: %s"
  msgstr "アルゴリズム: %s"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3098
++#: scd/app-openpgp.c:3111
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "サポートされていないアルゴリズム: %s"
@@@ -1338,7 -1028,6 +1335,7 @@@ msgstr "オプション\"%.50s\"はあ�
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr "コマンド\"%.50s\"はあいまいです\n"
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1173
++#: common/argparse.c:401 dirmngr/dirmngr.c:1185
  msgid "out of core\n"
  msgstr "メモリがありません\n"
  
@@@ -1396,8 -1074,6 +1393,8 @@@ msgstr "lock '%s' は作成されませ
  msgid "waiting for lock %s...\n"
  msgstr "lock %s を待ちます...\n"
  
- #: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
- #: dirmngr/dirmngr.c:715
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:725
++#: dirmngr/dirmngr.c:734
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr "%s が古すぎます (%s が必要、現在 %s)\n"
@@@ -1435,7 -1103,6 +1432,7 @@@ msgstr "予期せぬ外装: 
  msgid "invalid dash escaped line: "
  msgstr "無効なダッシュでエスケープされた行: "
  
- #: g10/armor.c:873 g10/armor.c:1490
++#: g10/armor.c:873 g10/armor.c:1493
  #, c-format
  msgid "invalid radix64 character %02X skipped\n"
  msgstr "無効な64進文字%02Xをスキップしました\n"
@@@ -1452,7 -1116,6 +1449,7 @@@ msgstr "ファイル末尾が早すぎ�
  msgid "malformed CRC\n"
  msgstr "CRCの書式が正しくありません\n"
  
- #: g10/armor.c:962 g10/armor.c:1527
++#: g10/armor.c:962 g10/armor.c:1530
  #, c-format
  msgid "CRC error; %06lX - %06lX\n"
  msgstr "CRCエラー。%06lX - %06lX\n"
@@@ -1465,16 -1126,13 +1462,16 @@@ msgstr "ファイル末尾が早すぎ�
  msgid "error in trailer line\n"
  msgstr "後尾の行にエラーがあります\n"
  
- #: g10/armor.c:1303
++#: g10/armor.c:1306
  msgid "no valid OpenPGP data found.\n"
  msgstr "有効なOpenPGPデータが見つかりません。\n"
  
- #: g10/armor.c:1308
++#: g10/armor.c:1311
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
  msgstr "無効な外装: 行の長さが%d文字を超えています\n"
  
- #: g10/armor.c:1312
++#: g10/armor.c:1315
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr ""
@@@ -1551,8 -1194,6 +1548,8 @@@ msgstr "OpenPGPカードが利用でき
  msgid "OpenPGP card no. %s detected\n"
  msgstr "OpenPGPカードno. %sを検出\n"
  
- #: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
- #: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2030
++#: g10/keygen.c:4087 g10/revoke.c:215 g10/revoke.c:618
  msgid "can't do this in batch mode\n"
  msgstr "これはバッチ・モードではできません\n"
  
@@@ -1560,14 -1200,9 +1557,14 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "このコマンドが使えるのはバージョン2のカードだけです\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2454
++#: g10/card-util.c:109 scd/app-openpgp.c:2467
  msgid "Reset Code not or not anymore available\n"
  msgstr "リセット・コードが(もはや)利用可能ではありません\n"
  
 +#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
- #: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
- #: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1768
++#: g10/keygen.c:1945 g10/keygen.c:2313 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "あなたの選択は? "
  
@@@ -1629,10 -1250,6 +1626,10 @@@ msgstr "公開鍵を取得するURL: 
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr "エラー: URLが長すぎます (上限%d文字)。\n"
  
- #: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
- #: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:334
++#: g10/import.c:592 g10/import.c:640 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
++#: dirmngr/dirmngr.c:1510 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, c-format
  msgid "error reading '%s': %s\n"
  msgstr "'%s'の読み込みエラー: %s\n"
@@@ -1698,7 -1300,6 +1695,7 @@@ msgstr "鍵は操作できません: %s
  msgid "not an OpenPGP card"
  msgstr "OpenPGPカードでありません"
  
- #: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
++#: g10/card-util.c:1173 g10/keygen.c:4106 g10/keygen.c:5092
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr "現行鍵情報の取得エラー: %s\n"
@@@ -1732,13 -1328,10 +1729,13 @@@ msgstr "暗号化鍵の鍵長は? (%u) 
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "認証鍵の鍵長は? (%u) "
  
- #: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
++#: g10/card-util.c:1316 g10/keygen.c:2122 g10/keygen.c:2154
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "%uビットに切り上げます\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2207 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr "%s 鍵長は %u-%u の範囲でなければなりません\n"
@@@ -1792,9 -1375,6 +1789,9 @@@ msgstr "   (2) 暗号化鍵\n
  msgid "   (3) Authentication key\n"
  msgstr "   (3) 認証鍵\n"
  
- #: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
- #: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
- #: g10/keygen.c:2314 g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1508
++#: g10/keygen.c:1794 g10/keygen.c:1822 g10/keygen.c:1952 g10/keygen.c:2060
++#: g10/keygen.c:2336 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "無効な選択です。\n"
  
@@@ -1823,7 -1397,6 +1820,7 @@@ msgstr "続けますか? (y/N) 
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr "工場出荷リセットを行いますか? (本当なら \"yes\" と入力) "
  
- #: g10/card-util.c:1816 g10/keyedit.c:1867
++#: g10/card-util.c:1816 g10/keyedit.c:1868
  msgid "quit this menu"
  msgstr "このメニューを終了"
  
@@@ -1831,7 -1403,6 +1828,7 @@@
  msgid "show admin commands"
  msgstr "管理コマンドを表示"
  
- #: g10/card-util.c:1819 g10/keyedit.c:1870
++#: g10/card-util.c:1819 g10/keyedit.c:1871
  msgid "show this help"
  msgstr "このヘルプを表示"
  
@@@ -1907,30 -1460,20 +1904,30 @@@ msgstr "管理者コマンドが許可�
  msgid "Admin commands are not allowed\n"
  msgstr "管理者コマンドは禁止されています\n"
  
- #: g10/card-util.c:2127 g10/keyedit.c:2816
++#: g10/card-util.c:2127 g10/keyedit.c:2817
  msgid "Invalid command  (try \"help\")\n"
  msgstr "無効なコマンド (\"help\"を参照)\n"
  
- #: g10/decrypt.c:191 g10/encrypt.c:955
++#: g10/decrypt.c:190 g10/encrypt.c:955
  msgid "--output doesn't work for this command\n"
  msgstr "このコマンドで--outputは機能しません\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4904 g10/keyring.c:398 g10/keyring.c:771
  #, c-format
  msgid "can't open '%s'\n"
  msgstr "'%s'が開けません\n"
  
 +#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
- #: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
- #: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4858 g10/keyedit.c:2051
++#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2163
  #, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "鍵\"%s\"が見つかりません: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
- #: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
- #: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4866 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:645 g10/tofu.c:2171
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "鍵ブロックの読み込みエラー: %s\n"
@@@ -1987,7 -1518,6 +1984,7 @@@ msgstr "この公開鍵にたいする�
  msgid "use option \"--delete-secret-keys\" to delete it first.\n"
  msgstr "まず\"--delete-secret-keys\"オプションでこれを削除してください。\n"
  
- #: g10/encrypt.c:232 g10/sign.c:1292
++#: g10/encrypt.c:232 g10/sign.c:1294
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "パスフレーズの作成エラー: %s\n"
@@@ -2006,7 -1533,6 +2003,7 @@@ msgstr "暗号方式 %s を使います
  msgid "'%s' already compressed\n"
  msgstr "'%s'はもう圧縮済みです\n"
  
- #: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:610
  #, c-format
  msgid "WARNING: '%s' is an empty file\n"
  msgstr "*警告*: '%s'は空のファイルです\n"
@@@ -2023,7 -1547,6 +2020,7 @@@ msgid "
  msgstr ""
  "*警告*: 共通鍵暗号方式 %s (%d) の強制が、受取人の優先指定をそむきます\n"
  
- #: g10/encrypt.c:707 g10/sign.c:984
++#: g10/encrypt.c:707 g10/sign.c:986
  #, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2056,7 -1574,6 +2053,7 @@@ msgstr "%s暗号化済みデータ\n
  msgid "encrypted with unknown algorithm %d\n"
  msgstr "不明のアルゴリズム%dによる暗号化\n"
  
- #: g10/decrypt-data.c:164 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:129
  msgid ""
  "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
  msgstr "*警告*: メッセージは共通鍵暗号方式の弱い鍵で暗号化されています。\n"
@@@ -2143,8 -1642,6 +2140,8 @@@ msgstr "エクスポートの際、で�
  msgid " - skipped"
  msgstr " - スキップされました"
  
- #: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:845 g10/sign.c:1148
++#: g10/export.c:1251 g10/import.c:1543 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:847 g10/sign.c:1150
  #, c-format
  msgid "writing to '%s'\n"
  msgstr "'%s'への書き込み\n"
@@@ -2167,8 -1660,6 +2164,8 @@@ msgstr "鍵%s: PGP 2.x形式の鍵で�
  msgid "WARNING: nothing exported\n"
  msgstr "*警告*: 何もエクスポートされていません\n"
  
- #: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
- #: g10/plaintext.c:151 g10/plaintext.c:174
++#: g10/export.c:2283 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/plaintext.c:167 g10/plaintext.c:190
  #, c-format
  msgid "error creating '%s': %s\n"
  msgstr "'%s'の作成エラー: %s\n"
@@@ -2212,8 -1694,6 +2209,8 @@@ msgstr "'%s'を %s から取得する�
  msgid "No fingerprint"
  msgstr "フィンガープリントがありません"
  
- #: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
- #: g10/revoke.c:701
++#: g10/getkey.c:1873 g10/keyedit.c:2929 g10/keyedit.c:3016 g10/revoke.c:637
++#: g10/revoke.c:702
  #, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "秘密鍵\"%s\"が見つかりません: %s\n"
@@@ -2243,199 -1718,153 +2240,203 @@@ msgstr "--allow-non-selfsigned-uidで�
  msgid "using subkey %s instead of primary key %s\n"
  msgstr "副鍵%s(主鍵%sではなく)を用います\n"
  
- #: g10/gpg.c:424 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:200
  msgid "make a signature"
  msgstr "署名を作成"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:427
  msgid "make a clear text signature"
  msgstr "クリア・テクスト署名を作成"
  
- #: g10/gpg.c:426 sm/gpgsm.c:202
++#: g10/gpg.c:429 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "分遣署名を作成"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:430 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "データを暗号化"
  
- #: g10/gpg.c:429
++#: g10/gpg.c:432
  msgid "encryption only with symmetric cipher"
  msgstr "暗号化には共通鍵暗号方式のみを使用"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:434 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "データを復号 (デフォルト)"
  
- #: g10/gpg.c:433 sm/gpgsm.c:206
++#: g10/gpg.c:436 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "署名を検証"
  
- #: g10/gpg.c:435 sm/gpgsm.c:207
++#: g10/gpg.c:438 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "鍵の一覧"
  
- #: g10/gpg.c:437
++#: g10/gpg.c:440
  msgid "list keys and signatures"
  msgstr "鍵と署名の一覧"
  
- #: g10/gpg.c:438
++#: g10/gpg.c:443
  msgid "list and check key signatures"
  msgstr "鍵署名の検査と一覧"
  
- #: g10/gpg.c:439 sm/gpgsm.c:212
++#: g10/gpg.c:445 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "鍵とフィンガープリントの一覧"
  
- #: g10/gpg.c:440 sm/gpgsm.c:210
++#: g10/gpg.c:446 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "秘密鍵の一覧"
  
- #: g10/gpg.c:442 sm/gpgsm.c:213
++#: g10/gpg.c:448 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "新しい鍵ペアを生成"
  
- #: g10/gpg.c:444
++#: g10/gpg.c:451
  msgid "quickly generate a new key pair"
  msgstr "すばやく新しい鍵ペアを生成"
  
- #: g10/gpg.c:446
++#: g10/gpg.c:454
  msgid "quickly add a new user-id"
  msgstr "すばやく新しいユーザIDを追加"
  
- #: g10/gpg.c:449
++#: g10/gpg.c:459
  msgid "quickly revoke a user-id"
  msgstr "すばやくユーザIDを失効"
  
- #: g10/gpg.c:451
++#: g10/gpg.c:462
+ msgid "quickly set a new expiration date"
+ msgstr "すばやく新しい有効期限を設定"
+ 
++#: g10/gpg.c:464
  msgid "full featured key pair generation"
  msgstr "全機能の鍵ペアを生成"
  
- #: g10/gpg.c:452
++#: g10/gpg.c:467
  msgid "generate a revocation certificate"
  msgstr "失効証明書を生成"
  
- #: g10/gpg.c:454 sm/gpgsm.c:215
++#: g10/gpg.c:470 sm/gpgsm.c:216
  msgid "remove keys from the public keyring"
  msgstr "公開鍵リングから鍵を削除"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:472
  msgid "remove keys from the secret keyring"
  msgstr "秘密鍵リングから鍵を削除"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:474
  msgid "quickly sign a key"
  msgstr "鍵にすばやく署名"
  
- #: g10/gpg.c:460
++#: g10/gpg.c:476
  msgid "quickly sign a key locally"
  msgstr "鍵へすばやくローカルに署名"
  
- #: g10/gpg.c:461
++#: g10/gpg.c:477
  msgid "sign a key"
  msgstr "鍵に署名"
  
- #: g10/gpg.c:462
++#: g10/gpg.c:478
  msgid "sign a key locally"
  msgstr "鍵へローカルに署名"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:479
  msgid "sign or edit a key"
  msgstr "鍵への署名や編集"
  
- #: g10/gpg.c:465 sm/gpgsm.c:233
++#: g10/gpg.c:481 sm/gpgsm.c:234
  msgid "change a passphrase"
  msgstr "パスフレーズの変更"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:485
  msgid "export keys"
  msgstr "鍵をエクスポートする"
  
- #: g10/gpg.c:468
++#: g10/gpg.c:486
  msgid "export keys to a keyserver"
  msgstr "鍵サーバに鍵をエクスポートする"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:487
  msgid "import keys from a keyserver"
  msgstr "鍵サーバから鍵をインポートする"
  
- #: g10/gpg.c:471
++#: g10/gpg.c:490
  msgid "search for keys on a keyserver"
  msgstr "鍵サーバの鍵を検索する"
  
- #: g10/gpg.c:473
++#: g10/gpg.c:492
  msgid "update all keys from a keyserver"
  msgstr "鍵サーバから鍵を全部更新する"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:498
  msgid "import/merge keys"
  msgstr "鍵のインポート/マージ"
  
- #: g10/gpg.c:482
++#: g10/gpg.c:501
  msgid "print the card status"
  msgstr "カード・ステイタスを表示"
  
- #: g10/gpg.c:483
++#: g10/gpg.c:502
  msgid "change data on a card"
  msgstr "カードのデータを変更"
  
- #: g10/gpg.c:484
++#: g10/gpg.c:504
  msgid "change a card's PIN"
  msgstr "カードのPINを変更"
  
- #: g10/gpg.c:496
++#: g10/gpg.c:516
  msgid "update the trust database"
  msgstr "信用データベースを更新"
  
- #: g10/gpg.c:505
++#: g10/gpg.c:525
  msgid "print message digests"
  msgstr "メッセージ・ダイジェストを表示"
  
- #: g10/gpg.c:508 sm/gpgsm.c:228
++#: g10/gpg.c:528 sm/gpgsm.c:229
  msgid "run in server mode"
  msgstr "サーバ・モードで実行"
  
- #: g10/gpg.c:510
++#: g10/gpg.c:530
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr "|VALUE|TOFUポリシーを鍵に設定する"
  
- #: g10/gpg.c:514 sm/gpgsm.c:246
++#: g10/gpg.c:534 sm/gpgsm.c:248
  msgid "create ascii armored output"
  msgstr "ASCII形式の外装を作成"
  
- #: g10/gpg.c:517 sm/gpgsm.c:262
++#: g10/gpg.c:537 sm/gpgsm.c:264
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|USER-ID|USER-ID用に暗号化"
  
- #: g10/gpg.c:533 sm/gpgsm.c:298
++#: g10/gpg.c:553 sm/gpgsm.c:300
  msgid "|USER-ID|use USER-ID to sign or decrypt"
  msgstr "|USER-ID|署名や復号にこのUSER-IDを使用"
  
- #: g10/gpg.c:539
++#: g10/gpg.c:559
  msgid "|N|set compress level to N (0 disables)"
  msgstr "|N|圧縮レベルをNに設定 (0は非圧縮)"
  
- #: g10/gpg.c:546
++#: g10/gpg.c:566
  msgid "use canonical text mode"
  msgstr "正準テキスト・モードを使用"
  
- #: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
++#: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
  msgid "|FILE|write output to FILE"
  msgstr "|FILE|出力をFILEに書き出す"
  
- #: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
++#: g10/gpg.c:598 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
  msgid "do not make any changes"
  msgstr "無変更"
  
- #: g10/gpg.c:579
++#: g10/gpg.c:599
  msgid "prompt before overwriting"
  msgstr "上書き前に確認"
  
- #: g10/gpg.c:628
++#: g10/gpg.c:648
  msgid "use strict OpenPGP behavior"
  msgstr "厳密なOpenPGPの振舞を採用"
  
- #: g10/gpg.c:654 sm/gpgsm.c:355
++#: g10/gpg.c:674 sm/gpgsm.c:357
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2443,7 -1872,6 +2444,7 @@@ msgstr "
  "@\n"
  "(コマンドとオプション全部の一覧は、マニュアル・ページをご覧ください)\n"
  
- #: g10/gpg.c:657 sm/gpgsm.c:358
++#: g10/gpg.c:677
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2463,11 -1891,9 +2464,11 @@@ msgstr "
  " --list-keys [名前]         鍵を表示\n"
  " --fingerprint [名前]       フィンガープリントを表示\n"
  
- #: g10/gpg.c:1026
++#: g10/gpg.c:1047
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
  msgstr "使い方: @GPG@ [オプション] [ファイル] (ヘルプは -h)"
  
- #: g10/gpg.c:1029
++#: g10/gpg.c:1050
  msgid ""
  "Syntax: @GPG@ [options] [files]\n"
  "Sign, check, encrypt or decrypt\n"
@@@ -2477,7 -1903,6 +2478,7 @@@ msgstr "
  "署名、検査、暗号化または復号\n"
  "デフォルトの操作は、入力データに依存\n"
  
- #: g10/gpg.c:1040 sm/gpgsm.c:588
++#: g10/gpg.c:1061 sm/gpgsm.c:580
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2485,584 -1910,407 +2486,522 @@@ msgstr "
  "\n"
  "サポートしているアルゴリズム:\n"
  
- #: g10/gpg.c:1043
++#: g10/gpg.c:1064
  msgid "Pubkey: "
  msgstr "公開鍵: "
  
- #: g10/gpg.c:1050 g10/keyedit.c:3402
++#: g10/gpg.c:1071 g10/keyedit.c:3483
  msgid "Cipher: "
  msgstr "暗号方式: "
  
- #: g10/gpg.c:1057
++#: g10/gpg.c:1078
  msgid "Hash: "
  msgstr "ハッシュ: "
  
- #: g10/gpg.c:1064 g10/keyedit.c:3451
++#: g10/gpg.c:1085 g10/keyedit.c:3532
  msgid "Compression: "
  msgstr "圧縮: "
  
- #: g10/gpg.c:1133 sm/gpgsm.c:662
++#: g10/gpg.c:1154 sm/gpgsm.c:654
  #, c-format
  msgid "usage: %s [options] %s\n"
  msgstr "使い方: %s [オプション] %s\n"
  
- #: g10/gpg.c:1321 sm/gpgsm.c:751
++#: g10/gpg.c:1342 sm/gpgsm.c:743
  msgid "conflicting commands\n"
  msgstr "対立するコマンド\n"
  
- #: g10/gpg.c:1339
++#: g10/gpg.c:1360
  #, c-format
  msgid "no = sign found in group definition '%s'\n"
  msgstr "=記号が、グループ定義'%s'内に見つかりません\n"
  
- #: g10/gpg.c:1537
++#: g10/gpg.c:1558
  #, c-format
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr "*警告*: homedir '%s'の安全でない所有\n"
  
- #: g10/gpg.c:1540
++#: g10/gpg.c:1561
  #, c-format
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
  msgstr "*警告*: コンフィグレーション・ファイル'%s'の安全でない所有\n"
  
- #: g10/gpg.c:1543
++#: g10/gpg.c:1564
  #, c-format
  msgid "WARNING: unsafe ownership on extension '%s'\n"
  msgstr "*警告*: 拡張'%s'の安全でない所有\n"
  
- #: g10/gpg.c:1549
++#: g10/gpg.c:1570
  #, c-format
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
  msgstr "*警告*: homedir '%s'の安全でない許可\n"
  
- #: g10/gpg.c:1552
++#: g10/gpg.c:1573
  #, c-format
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
  msgstr "*警告*: コンフィグレーション・ファイル'%s'の安全でない許可\n"
  
- #: g10/gpg.c:1555
++#: g10/gpg.c:1576
  #, c-format
  msgid "WARNING: unsafe permissions on extension '%s'\n"
  msgstr "*警告*: 拡張'%s'の安全でない許可\n"
  
- #: g10/gpg.c:1561
++#: g10/gpg.c:1582
  #, c-format
  msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
  msgstr "*警告*: homedir '%s'の安全でない上位ディレクトリ所有\n"
  
- #: g10/gpg.c:1564
++#: g10/gpg.c:1585
  #, c-format
  msgid ""
  "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
  msgstr ""
  "*警告*: コンフィグレーション・ファイル'%s'の安全でない上位ディレクトリ所有\n"
  
- #: g10/gpg.c:1567
++#: g10/gpg.c:1588
  #, c-format
  msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
  msgstr "*警告*: 拡張'%s'の安全でない上位ディレクトリ所有\n"
  
- #: g10/gpg.c:1573
++#: g10/gpg.c:1594
  #, c-format
  msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
  msgstr "*警告*: homedir '%s'の安全でない上位ディレクトリ許可\n"
  
- #: g10/gpg.c:1576
++#: g10/gpg.c:1597
  #, c-format
  msgid ""
  "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
  msgstr ""
  "*警告*: コンフィグレーション・ファイル'%s'の安全でない上位ディレクトリ許可\n"
  
- #: g10/gpg.c:1579
++#: g10/gpg.c:1600
  #, c-format
  msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
  msgstr "*警告*: 拡張'%s'の安全でない上位ディレクトリ許可\n"
  
- #: g10/gpg.c:1786
++#: g10/gpg.c:1816
  #, c-format
  msgid "unknown configuration item '%s'\n"
  msgstr "不明のコンフィグレーション項目'%s'\n"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1925
  msgid "display photo IDs during key listings"
  msgstr "鍵の一覧時にフォトIDを表示する"
  
- #: g10/gpg.c:1895
++#: g10/gpg.c:1927
  msgid "show key usage information during key listings"
  msgstr "鍵の一覧時に鍵の使い方の情報を表示する"
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1929
  msgid "show policy URLs during signature listings"
  msgstr "署名の一覧時にポリシーURLを表示する"
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1931
  msgid "show all notations during signature listings"
  msgstr "署名の一覧時にすべての注釈を表示する"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1933
  msgid "show IETF standard notations during signature listings"
  msgstr "署名の一覧時にIETF標準注釈を表示する"
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1937
  msgid "show user-supplied notations during signature listings"
  msgstr "署名の一覧時にユーザの注釈を表示する"
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1939
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "署名の一覧時に優先鍵サーバURLを表示する"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1941
  msgid "show user ID validity during key listings"
  msgstr "鍵の一覧時にユーザIDの有効性を表示する"
  
- #: g10/gpg.c:1911
++#: g10/gpg.c:1943
  msgid "show revoked and expired user IDs in key listings"
  msgstr "鍵の一覧に失効したユーザID、期限切れとなったユーザIDを表示する"
  
- #: g10/gpg.c:1913
++#: g10/gpg.c:1945
  msgid "show revoked and expired subkeys in key listings"
  msgstr "鍵の一覧に失効した副鍵、期限切れとなった副鍵を表示する"
  
- #: g10/gpg.c:1915
++#: g10/gpg.c:1947
  msgid "show the keyring name in key listings"
  msgstr "鍵の一覧に鍵リングの名前を表示する"
  
- #: g10/gpg.c:1917
++#: g10/gpg.c:1949
  msgid "show expiration dates during signature listings"
  msgstr "署名の一覧時に有効期限の日付を表示する"
  
- #: g10/gpg.c:2019 g10/gpg.c:2056
- #, fuzzy, c-format
- #| msgid "invalid argument for option \"%.50s\"\n"
++#: g10/gpg.c:2051 g10/gpg.c:2088
+ #, c-format
  msgid "valid values for option '%s':\n"
- msgstr "オプション\"%.50s\"には無効な引数です\n"
+ msgstr "オプション'%s'に有効な値:\n"
  
- #: g10/gpg.c:2030
++#: g10/gpg.c:2062
  #, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "不明のTOFUポリシー'%s'\n"
  
- #: g10/gpg.c:2032 g10/gpg.c:2068
++#: g10/gpg.c:2064 g10/gpg.c:2100
  msgid "(use \"help\" to list choices)\n"
  msgstr "(選択肢の一覧には\"help\"を使ってください)\n"
  
- #: g10/gpg.c:2066
- #, fuzzy, c-format
- #| msgid "invalid argument for option \"%.50s\"\n"
++#: g10/gpg.c:2098 g10/keygen.c:167
+ #, c-format
  msgid "invalid value for option '%s'\n"
- msgstr "オプション\"%.50s\"には無効な引数です\n"
+ msgstr "オプション'%s'に無効な値です\n"
  
- #: g10/gpg.c:2203
++#: g10/gpg.c:2235
  #, c-format
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "*注意*: 以前デフォルトだったオプション・ファイル'%s'は、無視されます\n"
  
- #: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
++#: g10/gpg.c:2839 g10/gpg.c:3610 g10/gpg.c:3622
  #, c-format
  msgid "Note: %s is not for normal use!\n"
  msgstr "*注意*: 普通%sは使いません!\n"
  
- #: g10/gpg.c:2978 g10/gpg.c:2990
++#: g10/gpg.c:3011 g10/gpg.c:3023
  #, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "'%s'は、有効な署名表現ではありません\n"
  
- #: g10/gpg.c:3012
++#: g10/gpg.c:3045
  #, c-format
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "\"%s\"は正しいメール・アドレスではありません\n"
  
- #: g10/gpg.c:3044 sm/gpgsm.c:1166
++#: g10/gpg.c:3077 sm/gpgsm.c:1158
  #, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "無効な pinentry mode '%s'です\n"
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3130
  #, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "'%s'は、有効な文字集合ではありません\n"
  
- #: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
++#: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
  msgid "could not parse keyserver URL\n"
  msgstr "鍵サーバのURLを解析不能\n"
  
- #: g10/gpg.c:3137
++#: g10/gpg.c:3170
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: 無効な鍵サーバ・オプションです\n"
  
- #: g10/gpg.c:3140
++#: g10/gpg.c:3173
  msgid "invalid keyserver options\n"
  msgstr "無効な鍵サーバ・オプションです\n"
  
- #: g10/gpg.c:3147
++#: g10/gpg.c:3180
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: 無効なインポート・オプションです\n"
  
- #: g10/gpg.c:3150
++#: g10/gpg.c:3183
  msgid "invalid import options\n"
  msgstr "無効なインポート・オプションです\n"
  
- #: g10/gpg.c:3156 g10/gpg.c:3171
++#: g10/gpg.c:3189 g10/gpg.c:3204
  #, c-format
  msgid "invalid filter option: %s\n"
  msgstr "無効なフィルタ・オプションです: %s\n"
  
- #: g10/gpg.c:3162
++#: g10/gpg.c:3195
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: 無効なエクスポート・オプションです\n"
  
- #: g10/gpg.c:3165
++#: g10/gpg.c:3198
  msgid "invalid export options\n"
  msgstr "無効なエクスポート・オプションです\n"
  
- #: g10/gpg.c:3177
++#: g10/gpg.c:3210
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: 無効な一覧オプションです\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3213
  msgid "invalid list options\n"
  msgstr "無効な一覧オプションです\n"
  
- #: g10/gpg.c:3188
++#: g10/gpg.c:3221
  msgid "display photo IDs during signature verification"
  msgstr "署名の検証時にフォトIDを表示する"
  
- #: g10/gpg.c:3190
++#: g10/gpg.c:3223
  msgid "show policy URLs during signature verification"
  msgstr "署名の検証時にポリシーURLを表示する"
  
- #: g10/gpg.c:3192
++#: g10/gpg.c:3225
  msgid "show all notations during signature verification"
  msgstr "署名の検証時にすべての注釈を表示する"
  
- #: g10/gpg.c:3194
++#: g10/gpg.c:3227
  msgid "show IETF standard notations during signature verification"
  msgstr "署名の検証時にIETF標準注釈を表示する"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3231
  msgid "show user-supplied notations during signature verification"
  msgstr "署名の検証時にユーザの注釈を表示する"
  
- #: g10/gpg.c:3200
++#: g10/gpg.c:3233
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "署名の検証時に優先鍵サーバURLを表示する"
  
- #: g10/gpg.c:3202
++#: g10/gpg.c:3235
  msgid "show user ID validity during signature verification"
  msgstr "署名の検証時にユーザIDの有効性を表示する"
  
- #: g10/gpg.c:3204
++#: g10/gpg.c:3237
  msgid "show revoked and expired user IDs in signature verification"
  msgstr "署名の検証時に失効したユーザID、期限切れとなったユーザIDを表示する"
  
- #: g10/gpg.c:3206
++#: g10/gpg.c:3239
  msgid "show only the primary user ID in signature verification"
  msgstr "署名の検証時に主なユーザIDだけをを表示する"
  
- #: g10/gpg.c:3208
++#: g10/gpg.c:3241
  msgid "validate signatures with PKA data"
  msgstr "PKAデータで署名を検証する"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3243
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr "有効なPKAデータで署名の信用度を上昇させる"
  
- #: g10/gpg.c:3217
++#: g10/gpg.c:3250
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: 無効な検証オプションです\n"
  
- #: g10/gpg.c:3220
++#: g10/gpg.c:3253
  msgid "invalid verify options\n"
  msgstr "無効な検証オプションです\n"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3260
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "exec-pathを%sに設定不能\n"
  
- #: g10/gpg.c:3417
++#: g10/gpg.c:3452
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: 無効な auto-key-locate リストです\n"
  
- #: g10/gpg.c:3420
++#: g10/gpg.c:3455
  msgid "invalid auto-key-locate list\n"
  msgstr "無効な auto-key-locate リストです\n"
  
- #: g10/gpg.c:3553 sm/gpgsm.c:1507
++#: g10/gpg.c:3592 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
  msgstr "*警告*: プログラムはcoreファイルを作成することがあります!\n"
  
- #: g10/gpg.c:3564
++#: g10/gpg.c:3603
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "*警告*: %sは%sより優先\n"
  
- #: g10/gpg.c:3573
++#: g10/gpg.c:3612
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%sは%sとともに使うことはできません!\n"
  
- #: g10/gpg.c:3576
++#: g10/gpg.c:3615
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%sは%sとともに使っても無意味です!\n"
  
- #: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
++#: g10/gpg.c:3630 sm/gpgsm.c:1518 dirmngr/dirmngr.c:951
  msgid "WARNING: running with faked system time: "
  msgstr "*警告*: ニセモノのシステム時刻で実行しています: "
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3651
  #, c-format
  msgid "will not run with insecure memory due to %s\n"
  msgstr "%s のため、セキュアでないメモリで実行しません\n"
  
- #: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
++#: g10/gpg.c:3686 g10/gpg.c:3710 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "選択された暗号アルゴリズムは、無効です\n"
  
- #: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
++#: g10/gpg.c:3692 g10/gpg.c:3716 sm/gpgsm.c:1591 sm/gpgsm.c:1597
  msgid "selected digest algorithm is invalid\n"
  msgstr "選択されたダイジェスト・アルゴリズムは、無効です\n"
  
- #: g10/gpg.c:3659
++#: g10/gpg.c:3698
  msgid "selected compression algorithm is invalid\n"
  msgstr "選択された圧縮アルゴリズムは、無効です\n"
  
- #: g10/gpg.c:3665
++#: g10/gpg.c:3704
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "選択された証明書ダイジェスト・アルゴリズムは、無効です\n"
  
- #: g10/gpg.c:3680
++#: g10/gpg.c:3719
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-neededは正の値が必要です\n"
  
- #: g10/gpg.c:3682
++#: g10/gpg.c:3721
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-neededは1より大きな値が必要です\n"
  
- #: g10/gpg.c:3684
++#: g10/gpg.c:3723
  msgid "max-cert-depth must be in the range from 1 to 255\n"
  msgstr "max-cert-depthは1から255の範囲でなければなりません\n"
  
- #: g10/gpg.c:3686
++#: g10/gpg.c:3725
  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:3688
++#: g10/gpg.c:3727
  msgid "invalid min-cert-level; must be 1, 2, or 3\n"
  msgstr "無効なmin-cert-level。0か1か2か3でなければなりません\n"
  
- #: g10/gpg.c:3691
++#: g10/gpg.c:3730
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
  msgstr "*注意*: 単純なS2Kモード(0)の使用には強く反対します\n"
  
- #: g10/gpg.c:3695
++#: g10/gpg.c:3734
  msgid "invalid S2K mode; must be 0, 1 or 3\n"
  msgstr "無効なS2Kモード。0か1か3でなければなりません\n"
  
- #: g10/gpg.c:3702
++#: g10/gpg.c:3741
  msgid "invalid default preferences\n"
  msgstr "無効なデフォルトの優先指定\n"
  
- #: g10/gpg.c:3706
++#: g10/gpg.c:3745
  msgid "invalid personal cipher preferences\n"
  msgstr "無効な個人用暗号方式の優先指定\n"
  
- #: g10/gpg.c:3710
++#: g10/gpg.c:3749
  msgid "invalid personal digest preferences\n"
  msgstr "無効な個人用ダイジェストの優先指定\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3753
  msgid "invalid personal compress preferences\n"
  msgstr "無効な個人用圧縮の優先指定\n"
  
- #: g10/gpg.c:3750
++#: g10/gpg.c:3789
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%sは%sではまだ機能しません\n"
  
- #: g10/gpg.c:3797
++#: g10/gpg.c:3836
  #, c-format
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr "暗号アルゴリズム'%s'を%sモードで使うことはできません\n"
  
- #: g10/gpg.c:3802
++#: g10/gpg.c:3841
  #, c-format
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr "ダイジェスト・アルゴリズム'%s'を%sモードで使うことはできません\n"
  
- #: g10/gpg.c:3807
++#: g10/gpg.c:3846
  #, c-format
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr "圧縮アルゴリズム'%s'を%sモードで使うことはできません\n"
  
- #: g10/gpg.c:3906
++#: g10/gpg.c:3945
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "信用データベースの初期化に失敗しました: %s\n"
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:3957
  msgid "WARNING: recipients (-r) given without using public key encryption\n"
  msgstr "*警告*: 公開鍵暗号を使わずに、受取人 (-r) を指定しています\n"
  
- #: g10/gpg.c:3975
- msgid "--store [filename]"
- msgstr "--store [ファイル名]"
- 
- #: g10/gpg.c:3985
- msgid "--symmetric [filename]"
- msgstr "--symmetric [ファイル名]"
- 
- #: g10/gpg.c:3989
++#: g10/gpg.c:4028
  #, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "'%s'の共通鍵暗号に失敗しました: %s\n"
  
- #: g10/gpg.c:4000
- msgid "--encrypt [filename]"
- msgstr "--encrypt [ファイル名]"
- 
- #: g10/gpg.c:4016
- msgid "--symmetric --encrypt [filename]"
- msgstr "--symmetric --encrypt [ファイル名]"
- 
- #: g10/gpg.c:4018
++#: g10/gpg.c:4057
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr "--symmetric --encryptを--s2k-mode 0で使うことはできません\n"
  
- #: g10/gpg.c:4021
++#: g10/gpg.c:4060
  #, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr "--symmetric --encryptを%sモードで使うことはできません\n"
  
- #: g10/gpg.c:4042
- msgid "--sign [filename]"
- msgstr "--sign [ファイル名]"
- 
- #: g10/gpg.c:4058
- msgid "--sign --encrypt [filename]"
- msgstr "--sign --encrypt [ファイル名]"
- 
- #: g10/gpg.c:4076
- msgid "--symmetric --sign --encrypt [filename]"
- msgstr "--symmetric --sign --encrypt [ファイル名]"
- 
- #: g10/gpg.c:4078
++#: g10/gpg.c:4117
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr "--symmetric --sign --encryptを--s2k-mode 0で使うことはできません\n"
  
- #: g10/gpg.c:4081
++#: g10/gpg.c:4120
  #, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr "--symmetric --sign --encryptを%sモードで使うことはできません\n"
  
- #: g10/gpg.c:4105
- msgid "--sign --symmetric [filename]"
- msgstr "--sign --symmetric [ファイル名]"
- 
- #: g10/gpg.c:4117
- msgid "--clearsign [filename]"
- msgstr "--clearsign [ファイル名]"
- 
- #: g10/gpg.c:4147
- msgid "--decrypt [filename]"
- msgstr "--decrypt [ファイル名]"
- 
- #: g10/gpg.c:4174
- msgid "--sign-key user-id"
- msgstr "--sign-key ユーザid"
- 
- #: g10/gpg.c:4178
- msgid "--lsign-key user-id"
- msgstr "--lsign-key ユーザid"
- 
- #: g10/gpg.c:4199
- msgid "--edit-key user-id [commands]"
- msgstr "--edit-key ユーザid [コマンド]"
- 
- #: g10/gpg.c:4215
- msgid "--passwd <user-id>"
- msgstr "--passwd <ユーザid>"
- 
- #: g10/gpg.c:4411 g10/keyserver.c:1837
++#: g10/gpg.c:4462 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "鍵サーバへの送信に失敗しました: %s\n"
  
- #: g10/gpg.c:4416
++#: g10/gpg.c:4467
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "鍵サーバからの受信に失敗しました: %s\n"
  
- #: g10/gpg.c:4422
++#: g10/gpg.c:4473
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "鍵のエクスポートに失敗しました: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4486
  #, c-format
  msgid "export as ssh key failed: %s\n"
  msgstr "ssh鍵としてのエクスポートに失敗しました: %s\n"
  
- #: g10/gpg.c:4447
++#: g10/gpg.c:4498
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "鍵サーバの検索に失敗しました: %s\n"
  
- #: g10/gpg.c:4460
++#: g10/gpg.c:4511
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "鍵サーバの更新に失敗しました: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4578
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "外装除去に失敗しました: %s\n"
  
- #: g10/gpg.c:4538
++#: g10/gpg.c:4589
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "外装に失敗しました: %s\n"
  
- #: g10/gpg.c:4630
++#: g10/gpg.c:4681
  #, c-format
  msgid "invalid hash algorithm '%s'\n"
  msgstr "無効なハッシュ・アルゴリズム'%s'です\n"
  
- #: g10/gpg.c:4776 g10/tofu.c:2002
++#: g10/gpg.c:4827 g10/tofu.c:2151
  #, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "鍵指定'%s'の構文解析エラー: %s\n"
  
- #: g10/gpg.c:4788
++#: g10/gpg.c:4839
  #, 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:4835
- msgid "[filename]"
- msgstr "[ファイル名]"
- 
- #: g10/gpg.c:4841
++#: g10/gpg.c:4894
  msgid "Go ahead and type your message ...\n"
  msgstr "開始します。メッセージを打ってください ...\n"
  
- #: g10/gpg.c:5179
++#: g10/gpg.c:5232
  msgid "the given certification policy URL is invalid\n"
  msgstr "あたえられた証明書ポリシーURLは無効です\n"
  
- #: g10/gpg.c:5181
++#: g10/gpg.c:5234
  msgid "the given signature policy URL is invalid\n"
  msgstr "あたえられた署名ポリシーURLは無効です\n"
  
- #: g10/gpg.c:5214
++#: g10/gpg.c:5267
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "指定された優先鍵サーバURLは無効です\n"
  
@@@ -3074,7 -2320,6 +3013,7 @@@ msgstr "|FILE|鍵リングFILEの鍵を
  msgid "make timestamp conflicts only a warning"
  msgstr "日時の矛盾を警告だけにします"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:345
++#: g10/gpgv.c:82 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|このFDにステイタス情報を書き出す"
  
@@@ -3103,133 -2343,105 +3042,133 @@@ msgstr "ヘルプはありません
  msgid "No help available for '%s'"
  msgstr "'%s'のヘルプはありません"
  
- #: g10/import.c:151
++#: g10/import.c:152
  msgid "import signatures that are marked as local-only"
  msgstr "ローカルだけとマークされた署名をインポートします"
  
- #: g10/import.c:154
++#: g10/import.c:155
  msgid "repair damage from the pks keyserver during import"
  msgstr "インポートの際、にpksキーサーバからのダメージを修正します"
  
- #: g10/import.c:157
++#: g10/import.c:158
  msgid "do not clear the ownertrust values during import"
  msgstr "インポートの際、所有者信用の値をクリアしない"
  
- #: g10/import.c:160
++#: g10/import.c:161
  msgid "do not update the trustdb after import"
  msgstr "インポート後、信用データベースを更新しない"
  
- #: g10/import.c:163
++#: g10/import.c:164
  msgid "show key during import"
  msgstr "インポートの際、鍵を表示"
  
- #: g10/import.c:166
++#: g10/import.c:167
  msgid "only accept updates to existing keys"
  msgstr "既存の鍵に対する更新のみ認めます"
  
- #: g10/import.c:169
++#: g10/import.c:170
  msgid "remove unusable parts from key after import"
  msgstr "インポート後、利用できない部分を鍵から除去します"
  
- #: g10/import.c:172
++#: g10/import.c:173
  msgid "remove as much as possible from key after import"
  msgstr "インポート後、できるだけ除去します"
  
- #: g10/import.c:175
++#: g10/import.c:176
  msgid "run import filters and export key immediately"
  msgstr "インポート・フィルタを実行し鍵をすぐにエクスポートします"
  
- #: g10/import.c:326 g10/import.c:568
++#: g10/import.c:327 g10/import.c:569
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "型%dのブロックをスキップします\n"
  
- #: g10/import.c:585
++#: g10/import.c:586
  #, c-format
  msgid "%lu keys processed so far\n"
  msgstr "これまで%lu個の鍵を処理\n"
  
- #: g10/import.c:655
++#: g10/import.c:656
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "          処理数の合計: %lu\n"
  
- #: g10/import.c:658
++#: g10/import.c:659
  #, c-format
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "   スキップしたPGP-2鍵: %lu\n"
  
- #: g10/import.c:660
++#: g10/import.c:661
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "  スキップした新しい鍵: %lu\n"
  
- #: g10/import.c:663
++#: g10/import.c:664
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "          ユーザIDなし: %lu\n"
  
- #: g10/import.c:666 sm/import.c:130
++#: g10/import.c:667 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "            インポート: %lu"
  
- #: g10/import.c:670 sm/import.c:134
++#: g10/import.c:671 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "              変更なし: %lu\n"
  
- #: g10/import.c:672
++#: g10/import.c:673
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "        新しいユーザID: %lu\n"
  
- #: g10/import.c:674
++#: g10/import.c:675
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "            新しい副鍵: %lu\n"
  
- #: g10/import.c:676
++#: g10/import.c:677
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "            新しい署名: %lu\n"
  
- #: g10/import.c:678
++#: g10/import.c:679
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "        新しい鍵の失効: %lu\n"
  
- #: g10/import.c:680 sm/import.c:136
++#: g10/import.c:681 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "      秘密鍵の読み込み: %lu\n"
  
- #: g10/import.c:682 sm/import.c:138
++#: g10/import.c:683 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "    秘密鍵のインポート: %lu\n"
  
- #: g10/import.c:684 sm/import.c:140
++#: g10/import.c:685 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr "        無変更の秘密鍵: %lu\n"
  
- #: g10/import.c:686 sm/import.c:142
++#: g10/import.c:687 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "          未インポート: %lu\n"
  
- #: g10/import.c:688
++#: g10/import.c:689
  #, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "        掃除された署名: %lu\n"
  
- #: g10/import.c:690
++#: g10/import.c:691
  #, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "    掃除されたユーザID: %lu\n"
  
- #: g10/import.c:1034
++#: g10/import.c:1035
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
@@@ -3238,187 -2450,149 +3177,187 @@@ msgstr "
  "*警告*: 鍵%sには、これらのユーザIDに対して使用不可のアルゴリズムの優先指定が"
  "あります\n"
  
- #: g10/import.c:1076
++#: g10/import.c:1077
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr "         \"%s\": 暗号アルゴリズムの優先指定 %s\n"
  
- #: g10/import.c:1091
++#: g10/import.c:1092
  #, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "         \"%s\": ダイジェスト・アルゴリズムの優先指定 %s\n"
  
- #: g10/import.c:1103
++#: g10/import.c:1104
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr "         \"%s\": 圧縮アルゴリズムの優先指定 %s\n"
  
- #: g10/import.c:1116
++#: g10/import.c:1117
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr "あなたの優先指定を更新し、この鍵を再配布することが強く推奨されます\n"
  
- #: g10/import.c:1118
++#: g10/import.c:1119
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr "それによって、潜在的なアルゴリズム不一致の問題を避けられます\n"
  
- #: g10/import.c:1143
++#: g10/import.c:1144
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr "以下で、優先指定を更新できます: gpg --edit-key %s updpref save\n"
  
- #: g10/import.c:1379 g10/import.c:2167
++#: g10/import.c:1380 g10/import.c:2168
  #, c-format
  msgid "key %s: no user ID\n"
  msgstr "鍵%s: ユーザIDがありません\n"
  
- #: g10/import.c:1385
++#: g10/import.c:1386
  #, c-format
  msgid "key %s: %s\n"
  msgstr "鍵  %s: %s\n"
  
- #: g10/import.c:1386 g10/import.c:2141
++#: g10/import.c:1387 g10/import.c:2142
  msgid "rejected by import screener"
  msgstr "インポートの検査で拒否されました"
  
- #: g10/import.c:1416
++#: g10/import.c:1417
  #, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "鍵%s: PKSの副鍵変造を修復\n"
  
- #: g10/import.c:1434
++#: g10/import.c:1435
  #, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "鍵%s: 受理した未自己署名のユーザID\"%s\"\n"
  
- #: g10/import.c:1444 g10/import.c:1475
++#: g10/import.c:1445 g10/import.c:1476
  #, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "鍵%s: 有効なユーザIDがありません\n"
  
- #: g10/import.c:1446
++#: g10/import.c:1447
  msgid "this may be caused by a missing self-signature\n"
  msgstr "これはおそらく自己署名のないせいでしょう\n"
  
- #: g10/import.c:1516 g10/import.c:2318
++#: g10/import.c:1517 g10/import.c:2319
  #, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "鍵%s: 公開鍵が見つかりません: %s\n"
  
- #: g10/import.c:1522
++#: g10/import.c:1523
  #, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "鍵%s: 新しい鍵です - スキップします\n"
  
- #: g10/import.c:1537
++#: g10/import.c:1538
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "書き込み可能な鍵リングが見つかりません: %s\n"
  
- #: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
++#: g10/import.c:1547 g10/import.c:1648 g10/import.c:2385
  #, c-format
  msgid "error writing keyring '%s': %s\n"
  msgstr "鍵リング'%s'の書き込みエラー: %s\n"
  
- #: g10/import.c:1566
++#: g10/import.c:1567
  #, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "鍵%s: 公開鍵\"%s\"をインポートしました\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1591
  #, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "鍵%s: こちらの複製と合いません\n"
  
- #: g10/import.c:1606 g10/import.c:2342
++#: g10/import.c:1607 g10/import.c:2343
  #, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "鍵%s: 元の鍵ブロックに位置づけできません: %s\n"
  
- #: g10/import.c:1614 g10/import.c:2349
++#: g10/import.c:1615 g10/import.c:2350
  #, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "鍵%s: 元の鍵ブロックを読み込めません: %s\n"
  
- #: g10/import.c:1657
++#: g10/import.c:1658
  #, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "鍵%s: \"%s\" 新しいユーザIDを1個\n"
  
- #: g10/import.c:1660
++#: g10/import.c:1661
  #, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "鍵%s: \"%s\" 新しいユーザIDを%d個\n"
  
- #: g10/import.c:1663
++#: g10/import.c:1664
  #, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "鍵%s: \"%s\" 新しい署名を1個\n"
  
- #: g10/import.c:1666
++#: g10/import.c:1667
  #, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "鍵%s: \"%s\" 新しい署名を%d個\n"
  
- #: g10/import.c:1669
++#: g10/import.c:1670
  #, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "鍵%s: \"%s\" 新しい副鍵を1個\n"
  
- #: g10/import.c:1672
++#: g10/import.c:1673
  #, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "鍵%s: \"%s\" 新しい副鍵を%d個\n"
  
- #: g10/import.c:1675
++#: g10/import.c:1676
  #, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "鍵%s: \"%s\" %d個の署名をきれいにしました\n"
  
- #: g10/import.c:1678
++#: g10/import.c:1679
  #, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "鍵%s: \"%s\" %d個の署名をきれいにしました\n"
  
- #: g10/import.c:1681
++#: g10/import.c:1682
  #, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "鍵%s: \"%s\" %d個のユーザIDをきれいにしました\n"
  
- #: g10/import.c:1684
++#: g10/import.c:1685
  #, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "鍵%s: \"%s\" %d個のユーザIDをきれいにしました\n"
  
- #: g10/import.c:1707
++#: g10/import.c:1708
  #, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "鍵%s:\"%s\"変更なし\n"
  
- #: g10/import.c:2019 g10/import.c:2264
++#: g10/import.c:2020 g10/import.c:2265
  #, c-format
  msgid "key %s: secret key imported\n"
  msgstr "鍵%s: 秘密鍵をインポートしました\n"
  
- #: g10/import.c:2027
++#: g10/import.c:2028
  #, c-format
  msgid "key %s: secret key already exists\n"
  msgstr "鍵 %s: 秘密鍵はもうあります\n"
  
- #: g10/import.c:2035
++#: g10/import.c:2036
  #, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "鍵 %s: エージェントへの送信エラー: %s\n"
  
- #: g10/import.c:2140
++#: g10/import.c:2141
  #, c-format
  msgid "secret key %s: %s\n"
  msgstr "秘密鍵 %s: %s\n"
  
- #: g10/import.c:2160 g10/import.c:2195
++#: g10/import.c:2161 g10/import.c:2196
  msgid "importing secret keys not allowed\n"
  msgstr "秘密鍵のインポートは禁止です\n"
  
- #: g10/import.c:2184
++#: g10/import.c:2185
  #, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr "鍵%s: 無効な暗号方式%dの秘密鍵です - スキップします\n"
@@@ -3433,137 -2607,110 +3372,137 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2256
++#: g10/import.c:2257
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr "'%s'の移行には、スマードカードそれぞれで、以下を実行してください: %s\n"
  
- #: g10/import.c:2311
++#: g10/import.c:2312
  #, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr "鍵%s: 公開鍵がありません - 失効証明書を適用できません\n"
  
- #: g10/import.c:2360
++#: g10/import.c:2361
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "鍵%s: 無効な失効証明書: %s - 拒否\n"
  
- #: g10/import.c:2393
++#: g10/import.c:2394
  #, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "鍵%s:\"%s\"失効証明書をインポートしました\n"
  
- #: g10/import.c:2469
++#: g10/import.c:2470
  #, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "鍵%s: 署名に対応するユーザIDがありません\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2487
  #, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr "鍵%s: ユーザID\"%s\"のサポートしていない公開鍵アルゴリズムです\n"
  
- #: g10/import.c:2488
++#: g10/import.c:2489
  #, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "鍵%s: ユーザID\"%s\"の自己署名が、無効です\n"
  
- #: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
++#: g10/import.c:2506 g10/import.c:2532 g10/import.c:2583
  #, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "鍵%s: サポートしていない公開鍵アルゴリズムです\n"
  
- #: g10/import.c:2506
++#: g10/import.c:2507
  #, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "鍵%s: 無効な直接鍵署名\n"
  
- #: g10/import.c:2520
++#: g10/import.c:2521
  #, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "鍵%s: 鍵に対応する副鍵がありません\n"
  
- #: g10/import.c:2533
++#: g10/import.c:2534
  #, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "鍵%s: 無効な副鍵の対応です\n"
  
- #: g10/import.c:2549
++#: g10/import.c:2550
  #, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "鍵%s: 多重副鍵の対応を削除します\n"
  
- #: g10/import.c:2571
++#: g10/import.c:2572
  #, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "鍵%s: 鍵失効に対する副鍵がありません\n"
  
- #: g10/import.c:2584
++#: g10/import.c:2585
  #, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "鍵%s: 無効な副鍵失効です\n"
  
- #: g10/import.c:2599
++#: g10/import.c:2600
  #, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "鍵%s: 無効な副鍵の多重失効を削除します\n"
  
- #: g10/import.c:2641
++#: g10/import.c:2642
  #, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "鍵%s: スキップしたユーザID\"%s\"\n"
  
- #: g10/import.c:2665
++#: g10/import.c:2666
  #, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "鍵%s: スキップした副鍵\n"
  
- #: g10/import.c:2694
++#: g10/import.c:2695
  #, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "鍵%s: エクスポート不可な署名 (クラス0x%02X) - スキップします\n"
  
- #: g10/import.c:2705
++#: g10/import.c:2706
  #, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "鍵%s: 失効証明書が誤って設定されています - スキップします\n"
  
- #: g10/import.c:2723
++#: g10/import.c:2724
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "鍵%s: 無効な失効証明書: %s - スキップします\n"
  
- #: g10/import.c:2737
++#: g10/import.c:2738
  #, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "鍵%s: 副鍵署名の場所が、誤っています - スキップします\n"
  
- #: g10/import.c:2745
++#: g10/import.c:2746
  #, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "鍵%s: 予期せぬ署名クラス (0x%02X) - スキップします\n"
  
- #: g10/import.c:2887
++#: g10/import.c:2888
  #, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "鍵%s: 重複したユーザIDの検出 - マージ\n"
  
- #: g10/import.c:2951
++#: g10/import.c:2952
  #, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr "*警告*: 鍵%sは失効されたかもしれません: 失効鍵%sを取ってきます\n"
  
- #: g10/import.c:2967
++#: g10/import.c:2968
  #, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr "*警告*: 鍵%sは失効されたかもしれません: 失効鍵%sが存在しません。\n"
  
- #: g10/import.c:3031
++#: g10/import.c:3032
  #, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "鍵%s:\"%s\"失効証明書の追加\n"
  
- #: g10/import.c:3069
++#: g10/import.c:3070
  #, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "鍵%s: 直接鍵署名を追加\n"
@@@ -3598,71 -2739,57 +3537,71 @@@ msgstr "keyblock リソース'%s': %s\n
  msgid "error opening key DB: %s\n"
  msgstr "鍵DBを開く際のエラー: %s\n"
  
- #: g10/keydb.c:1782
++#: g10/keydb.c:1786
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "鍵リング・キャッシュの再構築に失敗しました: %s\n"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[revocation]"
  msgstr "[失効]"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[self-signature]"
  msgstr "[自己署名]"
  
- #: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
++#: g10/keyedit.c:433 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: dirmngr/ldap-wrapper.c:694
  #, c-format
  msgid "error allocating memory: %s\n"
  msgstr "メモリの確保のエラー: %s\n"
  
- #: g10/keyedit.c:629
++#: g10/keyedit.c:630
  #, c-format
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr "サポートしていない公開鍵アルゴリズム(%d)の署名は確認できません: %s.\n"
  
- #: g10/keyedit.c:638
++#: g10/keyedit.c:639
  #, c-format
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr ""
  "サポートしていないメッセージ・ダイジェスト(%d)の署名は確認できません: %s.\n"
  
- #: g10/keyedit.c:800
++#: g10/keyedit.c:801
  msgid " (reordered signatures follow)"
  msgstr "(順番を変えた署名が続きます)"
  
- #: g10/keyedit.c:913
++#: g10/keyedit.c:914
  #, c-format
  msgid "key %s:\n"
  msgstr "鍵  %s:\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:917
  #, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
  msgstr[0] "%d個の重複した署名が除去されました\n"
  
- #: g10/keyedit.c:919 g10/keylist.c:480
++#: g10/keyedit.c:920 g10/keylist.c:480
  #, c-format
  msgid "%d signature not checked due to a missing key\n"
  msgid_plural "%d signatures not checked due to missing keys\n"
  msgstr[0] "鍵がないため%d個の署名は検査しません\n"
  
- #: g10/keyedit.c:923 g10/keylist.c:476
++#: g10/keyedit.c:924 g10/keylist.c:476
  #, c-format
  msgid "%d bad signature\n"
  msgid_plural "%d bad signatures\n"
  msgstr[0] "%d個の不正な署名\n"
  
- #: g10/keyedit.c:927
++#: g10/keyedit.c:928
  #, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
  msgstr[0] "%d個の正しい署名\n"
  
- #: g10/keyedit.c:932
++#: g10/keyedit.c:933
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
@@@ -3671,7 -2798,6 +3610,7 @@@ msgstr "
  "警告: エラーがあり、自己署名だけ確認しました。'%s'を実行してすべての署名を確"
  "認ください。\n"
  
- #: g10/keyedit.c:992 g10/pkclist.c:274
++#: g10/keyedit.c:993 g10/pkclist.c:274
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
  "keys\n"
@@@ -3682,17 -2808,14 +3621,17 @@@ msgstr "
  "(パスポートを見せてもらったり、他から得たフィンガープリントを検査したり、など"
  "など)\n"
  
- #: g10/keyedit.c:996 g10/pkclist.c:286
++#: g10/keyedit.c:997 g10/pkclist.c:286
  #, c-format
  msgid "  %d = I trust marginally\n"
  msgstr "  %d = まぁまぁ信用する\n"
  
- #: g10/keyedit.c:997 g10/pkclist.c:288
++#: g10/keyedit.c:998 g10/pkclist.c:288
  #, c-format
  msgid "  %d = I trust fully\n"
  msgstr "  %d = 充分に信用する\n"
  
- #: g10/keyedit.c:1015
++#: g10/keyedit.c:1016
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
@@@ -3701,50 -2824,38 +3640,50 @@@ msgstr "
  "信用署名の深さを入力してください。\n"
  "深さが1より大きいと、署名しようとしている鍵で信用署名を作れます。\n"
  
- #: g10/keyedit.c:1032
++#: g10/keyedit.c:1033
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr "署名を制限するドメインを入力するか、空行を入力してください。\n"
  
- #: g10/keyedit.c:1160
++#: g10/keyedit.c:1161
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr "ユーザID\"%s\"をスキップします、テキストのIDではありません。\n"
  
- #: g10/keyedit.c:1168
++#: g10/keyedit.c:1169
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "ユーザID\"%s\"は、失効されています。"
  
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
- #: g10/keyedit.c:2246
++#: g10/keyedit.c:1178 g10/keyedit.c:1206 g10/keyedit.c:1233 g10/keyedit.c:1417
++#: g10/keyedit.c:2247
  msgid "Are you sure you still want to sign it? (y/N) "
  msgstr "それでもこの鍵に署名したいですか? (y/N) "
  
- #: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
- #: g10/keyedit.c:2251 g10/keyedit.c:3177
++#: g10/keyedit.c:1192 g10/keyedit.c:1220 g10/keyedit.c:1247 g10/keyedit.c:1423
++#: g10/keyedit.c:2252 g10/keyedit.c:3178
  msgid "  Unable to sign.\n"
  msgstr "  署名不能。\n"
  
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1197
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "ユーザID \"%s\"は、期限切れです。"
  
- #: g10/keyedit.c:1224
++#: g10/keyedit.c:1225
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "ユーザID \"%s\"は、自己署名されていません。"
  
- #: g10/keyedit.c:1253
++#: g10/keyedit.c:1254
  #, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "ユーザID \"%s\"は署名可能です。 "
  
- #: g10/keyedit.c:1255
++#: g10/keyedit.c:1256
  msgid "Sign it? (y/N) "
  msgstr "署名しますか? (y/N) "
  
- #: g10/keyedit.c:1282
++#: g10/keyedit.c:1283
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -3753,11 -2864,9 +3692,11 @@@ msgstr "
  "\"%s\"にたいする自己署名は、\n"
  "PGP 2.x形式の署名です。\n"
  
- #: g10/keyedit.c:1291
++#: g10/keyedit.c:1292
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr "OpenPGPの自己署名に格上げしたいですか? (y/N) "
  
- #: g10/keyedit.c:1304
++#: g10/keyedit.c:1305
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3766,11 -2875,9 +3705,11 @@@ msgstr "
  "\"%s\"に対するあなたの今の署名\n"
  "は期限切れです。\n"
  
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:1310
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr "新しい署名を発行し、期限切れ署名と置き換えたいですか? (y/N) "
  
- #: g10/keyedit.c:1330
++#: g10/keyedit.c:1331
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3779,43 -2886,34 +3718,43 @@@ msgstr "
  "\"%s\"にたいするあなたの今の署名\n"
  "はローカルな署名です。\n"
  
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:1336
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr "エクスポート可能な署名に格上げしたいですか? (y/N) "
  
- #: g10/keyedit.c:1355
++#: g10/keyedit.c:1356
  #, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "\"%s\"は鍵%sでもうローカルに署名してあります\n"
  
- #: g10/keyedit.c:1359
++#: g10/keyedit.c:1360
  #, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "\"%s\"は鍵%sでもう署名してあります\n"
  
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:1365
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "それでも再署名したいですか? (y/N) "
  
- #: g10/keyedit.c:1386
++#: g10/keyedit.c:1387
  #, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "鍵%sで署名すべきものはありません\n"
  
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1411
  msgid "This key has expired!"
  msgstr "この鍵は期限切れです!"
  
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1429
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "この鍵は%sで期限が切れます。\n"
  
- #: g10/keyedit.c:1434
++#: g10/keyedit.c:1435
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr "同時に署名も期限切れとしたいですか? (Y/n) "
  
- #: g10/keyedit.c:1475
++#: g10/keyedit.c:1476
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -3824,31 -2922,25 +3763,31 @@@ msgstr "
  "署名しようとしている鍵が実際に上記の名前の人のものかどうか、どの程度\n"
  "注意して検証しましたか? 答がわからなければ、\"0\"を入力してください。\n"
  
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1481
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) 答えません。%s\n"
  
- #: g10/keyedit.c:1482
++#: g10/keyedit.c:1483
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) 全然、検査していません。%s\n"
  
- #: g10/keyedit.c:1484
++#: g10/keyedit.c:1485
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) 一応、検査しました。%s\n"
  
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:1488
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) かなり注意して検査しました。%s\n"
  
- #: g10/keyedit.c:1494
++#: g10/keyedit.c:1495
  msgid "Your selection? (enter '?' for more information): "
  msgstr "選択は? (詳細は '?'): "
  
- #: g10/keyedit.c:1521
++#: g10/keyedit.c:1522
  #, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -3857,220 -2949,166 +3796,220 @@@ msgstr "
  "本当にこの鍵にあなたの鍵\"%s\"で署名してよいですか\n"
  "(%s)\n"
  
- #: g10/keyedit.c:1529
++#: g10/keyedit.c:1530
  msgid "This will be a self-signature.\n"
  msgstr "自己署名になるでしょう。\n"
  
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:1535
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr "*警告*: 署名は、エクスポート不可に設定されません。\n"
  
- #: g10/keyedit.c:1541
++#: g10/keyedit.c:1542
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr "*警告*: 署名は、失効不可に設定されません。\n"
  
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1552
  msgid "The signature will be marked as non-exportable.\n"
  msgstr "署名は、エクスポート不可に設定されます。\n"
  
- #: g10/keyedit.c:1558
++#: g10/keyedit.c:1559
  msgid "The signature will be marked as non-revocable.\n"
  msgstr "署名は、失効不可に設定されます。\n"
  
- #: g10/keyedit.c:1565
++#: g10/keyedit.c:1566
  msgid "I have not checked this key at all.\n"
  msgstr "この鍵は全然、検査していません。\n"
  
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:1571
  msgid "I have checked this key casually.\n"
  msgstr "この鍵は一応、検査しました。\n"
  
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:1576
  msgid "I have checked this key very carefully.\n"
  msgstr "この鍵は、かなり注意して検査しました。\n"
  
- #: g10/keyedit.c:1587
++#: g10/keyedit.c:1588
  msgid "Really sign? (y/N) "
  msgstr "本当に署名しますか? (y/N) "
  
- #: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
- #: g10/keyedit.c:6463 g10/sign.c:323
++#: g10/keyedit.c:1639 g10/keyedit.c:6308 g10/keyedit.c:6391 g10/keyedit.c:6500
++#: g10/keyedit.c:6562 g10/sign.c:325
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "署名に失敗しました: %s\n"
  
- #: g10/keyedit.c:1725
++#: g10/keyedit.c:1726
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  "鍵にはスタブあるいはカード上の項目しかありません - パスフレーズは変更されませ"
  "ん。\n"
  
- #: g10/keyedit.c:1755
++#: g10/keyedit.c:1756
  #, c-format
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "鍵 %s: パスフレーズの変更エラー: %s\n"
  
- #: g10/keyedit.c:1869
++#: g10/keyedit.c:1870
  msgid "save and quit"
  msgstr "保存して終了"
  
- #: g10/keyedit.c:1872
++#: g10/keyedit.c:1873
  msgid "show key fingerprint"
  msgstr "鍵のフィンガープリントを表示"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1874
  msgid "show the keygrip"
  msgstr "keygripを表示"
  
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1875
  msgid "list key and user IDs"
  msgstr "鍵とユーザIDの一覧"
  
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1877
  msgid "select user ID N"
  msgstr "ユーザID Nの選択"
  
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1878
  msgid "select subkey N"
  msgstr "副鍵Nの選択"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1879
  msgid "check signatures"
  msgstr "署名の確認"
  
- #: g10/keyedit.c:1884
++#: g10/keyedit.c:1885
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr "選択したユーザIDに署名する [* 以下の関連コマンドを参照 ]"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1890
  msgid "sign selected user IDs locally"
  msgstr "選択したユーザIDにローカルに署名"
  
- #: g10/keyedit.c:1890
++#: g10/keyedit.c:1891
  msgid "sign selected user IDs with a trust signature"
  msgstr "選択したユーザIDに信用署名を署名する"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1893
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr "選択したユーザIDに失効不可の署名をする"
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1895
  msgid "add a user ID"
  msgstr "ユーザIDの追加"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1897
  msgid "add a photo ID"
  msgstr "フォトIDの追加"
  
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1898
  msgid "delete selected user IDs"
  msgstr "選択したユーザIDの削除"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1901
  msgid "add a subkey"
  msgstr "副鍵を追加"
  
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1904
  msgid "add a key to a smartcard"
  msgstr "スマートカードへ鍵の追加"
  
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1906
  msgid "move a key to a smartcard"
  msgstr "鍵をスマートカードへ移動"
  
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1908
  msgid "move a backup key to a smartcard"
  msgstr "バックアップ鍵をスマートカードへ移動"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1910
  msgid "delete selected subkeys"
  msgstr "選択した副鍵の削除"
  
- #: g10/keyedit.c:1911
++#: g10/keyedit.c:1912
  msgid "add a revocation key"
  msgstr "失効鍵の追加"
  
- #: g10/keyedit.c:1913
++#: g10/keyedit.c:1914
  msgid "delete signatures from the selected user IDs"
  msgstr "選択したユーザIDから署名を削除する"
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1916
  msgid "change the expiration date for the key or selected subkeys"
  msgstr "鍵または選択した副鍵の有効期限を変更する"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1918
  msgid "flag the selected user ID as primary"
  msgstr "選択したユーザIDを主にする"
  
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1921
  msgid "list preferences (expert)"
  msgstr "優先指定の一覧 (エキスパート)"
  
- #: g10/keyedit.c:1921
++#: g10/keyedit.c:1922
  msgid "list preferences (verbose)"
  msgstr "優先指定の一覧 (冗長)"
  
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:1924
  msgid "set preference list for the selected user IDs"
  msgstr "選択したユーザIDに優先指定リストを設定"
  
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1927
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr "選択したユーザIDに優先鍵サーバのURLを設定"
  
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1929
  msgid "set a notation for the selected user IDs"
  msgstr "選択したユーザIDに注釈を設定する"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1931
  msgid "change the passphrase"
  msgstr "パスフレーズの変更"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1934
  msgid "change the ownertrust"
  msgstr "所有者信用の変更"
  
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1937
  msgid "revoke signatures on the selected user IDs"
  msgstr "選択したユーザIDの署名を失効"
  
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1939
  msgid "revoke selected user IDs"
  msgstr "選択したユーザIDの失効"
  
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1942
  msgid "revoke key or selected subkeys"
  msgstr "鍵の失効または選択した副鍵の失効"
  
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1944
  msgid "enable key"
  msgstr "鍵を有効にする"
  
- #: g10/keyedit.c:1944
++#: g10/keyedit.c:1945
  msgid "disable key"
  msgstr "鍵を無効にする"
  
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1947
  msgid "show selected photo IDs"
  msgstr "選択したフォトIDを表示"
  
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1949
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr "使えないユーザIDをコンパクトにし、使えない署名を鍵から除去"
  
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:1951
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr "使えないユーザIDをコンパクトにし、すべての署名を鍵から除去"
  
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2063
  msgid "Secret key is available.\n"
  msgstr "秘密鍵が利用できます。\n"
  
- #: g10/keyedit.c:2162
++#: g10/keyedit.c:2163
  msgid "Need the secret key to do this.\n"
  msgstr "この実行には秘密鍵がいります。\n"
  
- #: g10/keyedit.c:2183
++#: g10/keyedit.c:2184
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4081,255 -3119,200 +4020,260 @@@ msgstr "
  "  't' で始まると信用署名 (tsign)、'nr' で始まると失効不可署名\n"
  "  (nrsign)、もしくはこれらの組み合わせ (ltsign, tnrsign, など)となります。\n"
  
- #: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
++#: g10/keyedit.c:2240 g10/keyedit.c:3178 g10/keyedit.c:3317 g10/keyedit.c:3379
  msgid "Key is revoked."
  msgstr "鍵は、失効されています。"
  
- #: g10/keyedit.c:2262
++#: g10/keyedit.c:2263
  msgid "Really sign all user IDs? (y/N) "
  msgstr "本当に全ユーザIDに署名しますか? (y/N) "
  
- #: g10/keyedit.c:2266
++#: g10/keyedit.c:2267
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "本当に全てのテキストユーザIDに署名しますか? (y/N) "
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2275
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "ヒント: まず署名するユーザIDを選択します\n"
  
- #: g10/keyedit.c:2285
++#: g10/keyedit.c:2286
  #, c-format
  msgid "Unknown signature type '%s'\n"
  msgstr "不明の署名タイプ'%s'\n"
  
- #: g10/keyedit.c:2309
++#: g10/keyedit.c:2310
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
  msgstr "%sモードでこのコマンドは禁止です。\n"
  
- #: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
++#: g10/keyedit.c:2332 g10/keyedit.c:2356 g10/keyedit.c:2550
  msgid "You must select at least one user ID.\n"
  msgstr "ユーザIDを少なくともひとつ選択してください。\n"
  
- #: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
++#: g10/keyedit.c:2334 g10/keyedit.c:2358 g10/keyedit.c:2512 g10/keyedit.c:2552
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr "('%s'コマンドを使用してください。)\n"
  
- #: g10/keyedit.c:2336
++#: g10/keyedit.c:2337
  msgid "You can't delete the last user ID!\n"
  msgstr "最後のユーザIDは削除できません!\n"
  
- #: g10/keyedit.c:2339
++#: g10/keyedit.c:2340
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "選択した全ユーザIDを本当に削除しますか? (y/N) "
  
- #: g10/keyedit.c:2340
++#: g10/keyedit.c:2341
  msgid "Really remove this user ID? (y/N) "
  msgstr "このユーザIDを本当に削除しますか? (y/N) "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2397
++#: g10/keyedit.c:2398
  msgid "Really move the primary key? (y/N) "
  msgstr "この主鍵を本当に移動しますか? (y/N) "
  
- #: g10/keyedit.c:2409 g10/keyedit.c:4866
++#: g10/keyedit.c:2410 g10/keyedit.c:4964
  msgid "You must select exactly one key.\n"
  msgstr "鍵をきっかり1つ選択してください。\n"
  
- #: g10/keyedit.c:2436
++#: g10/keyedit.c:2437
  msgid "Command expects a filename argument\n"
  msgstr "コマンドはファイル名の引数を期待します\n"
  
- #: g10/keyedit.c:2457
++#: g10/keyedit.c:2458
  #, c-format
  msgid "Can't open '%s': %s\n"
  msgstr "'%s'が開けません: %s\n"
  
- #: g10/keyedit.c:2474
++#: g10/keyedit.c:2475
  #, c-format
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "バックアップ鍵を'%s'から読み込みする際のエラー: %s\n"
  
- #: g10/keyedit.c:2509
++#: g10/keyedit.c:2510
  msgid "You must select at least one key.\n"
  msgstr "鍵を少なくとも1本選択してください。\n"
  
- #: g10/keyedit.c:2515
++#: g10/keyedit.c:2516
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "選択した鍵を本当に削除しますか? (y/N) "
  
- #: g10/keyedit.c:2517
++#: g10/keyedit.c:2518
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "この鍵を本当に削除しますか? (y/N) "
  
- #: g10/keyedit.c:2555
++#: g10/keyedit.c:2556
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr "選択した全ユーザIDを本当に失効しますか? (y/N) "
  
- #: g10/keyedit.c:2556
++#: g10/keyedit.c:2557
  msgid "Really revoke this user ID? (y/N) "
  msgstr "このユーザIDを本当に失効しますか? (y/N) "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2575
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "この鍵全体を本当に失効しますか? (y/N) "
  
- #: g10/keyedit.c:2585
++#: g10/keyedit.c:2586
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "選択した副鍵を本当に失効しますか? (y/N) "
  
- #: g10/keyedit.c:2587
++#: g10/keyedit.c:2588
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "この副鍵を本当に失効しますか? (y/N) "
  
- #: g10/keyedit.c:2645
++#: g10/keyedit.c:2646
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  "ユーザが指定した信用データベースを利用中、所有者信用は設定できません。\n"
  
- #: g10/keyedit.c:2690
++#: g10/keyedit.c:2691
  msgid "Set preference list to:\n"
  msgstr "優先指定の一覧を設定:\n"
  
- #: g10/keyedit.c:2697
++#: g10/keyedit.c:2698
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr "選択したユーザIDの優先指定を本当に更新しますか? (y/N) "
  
- #: g10/keyedit.c:2699
++#: g10/keyedit.c:2700
  msgid "Really update the preferences? (y/N) "
  msgstr "優先指定を本当に更新しますか? (y/N) "
  
- #: g10/keyedit.c:2773
++#: g10/keyedit.c:2774
  msgid "Save changes? (y/N) "
  msgstr "変更を保存しますか? (y/N) "
  
- #: g10/keyedit.c:2777
++#: g10/keyedit.c:2778
  msgid "Quit without saving? (y/N) "
  msgstr "保存せずに終了しますか? (y/N) "
  
- #: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
- #: g10/keyedit.c:3267 g10/keyedit.c:3332
++#: g10/keyedit.c:2789 g10/keyedit.c:2799 g10/keyedit.c:2943 g10/keyedit.c:3046
++#: g10/keyedit.c:3268 g10/keyedit.c:3333 g10/keyedit.c:3409
  #, c-format
  msgid "update failed: %s\n"
  msgstr "更新に失敗しました: %s\n"
  
- #: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
++#: g10/keyedit.c:2805 g10/keyedit.c:3273 g10/keyedit.c:3338 g10/keyedit.c:3416
  msgid "Key not changed so no update needed.\n"
  msgstr "鍵は無変更なので更新は不要です。\n"
  
- #: g10/keyedit.c:3038
++#: g10/keyedit.c:3039
  #, c-format
  msgid "User ID revocation failed: %s\n"
  msgstr "ユーザIDの失効に失敗しました: %s\n"
  
- #: g10/keyedit.c:3083
++#: g10/keyedit.c:3084
  #, c-format
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "\"%s\"はフィンガープリントではありません\n"
  
- #: g10/keyedit.c:3112
++#: g10/keyedit.c:3113
  #, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "\"%s\" はプライマリ・フィンガープリントではありません\n"
  
- #: g10/keyedit.c:3248 g10/keyedit.c:3251
++#: g10/keyedit.c:3249 g10/keyedit.c:3252
  #, c-format
  msgid "Invalid user ID '%s': %s\n"
  msgstr "無効なユーザID '%s': %s\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  msgid "No matching user IDs."
  msgstr "マッチするユーザIDはありません。"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  msgid "Nothing to sign.\n"
  msgstr "署名するものがありません。\n"
  
- #: g10/keyedit.c:3427
++#: g10/keyedit.c:3388
+ #, c-format
+ msgid "'%s' is not a valid expiration time\n"
+ msgstr "'%s'は、有効な有効期限ではありません\n"
+ 
++#: g10/keyedit.c:3508
  msgid "Digest: "
  msgstr "ダイジェスト: "
  
- #: g10/keyedit.c:3484
++#: g10/keyedit.c:3565
  msgid "Features: "
  msgstr "機能: "
  
- #: g10/keyedit.c:3495
++#: g10/keyedit.c:3576
  msgid "Keyserver no-modify"
  msgstr "鍵サーバ 修正しない"
  
- #: g10/keyedit.c:3510 g10/keylist.c:377
++#: g10/keyedit.c:3591 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr "優先鍵サーバ: "
  
- #: g10/keyedit.c:3518 g10/keyedit.c:3519
++#: g10/keyedit.c:3599 g10/keyedit.c:3600
  msgid "Notations: "
  msgstr "注釈: "
  
- #: g10/keyedit.c:3764
++#: g10/keyedit.c:3845
  msgid "There are no preferences on a PGP 2.x-style user ID.\n"
  msgstr "PGP 2.x形式ユーザIDの優先指定が、ありません。\n"
  
- #: g10/keyedit.c:3836
++#: g10/keyedit.c:3917
  #, c-format
  msgid "The following key was revoked on %s by %s key %s\n"
  msgstr "%sで%s鍵%sによって以下の鍵は、失効されました\n"
  
- #: g10/keyedit.c:3860
++#: g10/keyedit.c:3941
  #, c-format
  msgid "This key may be revoked by %s key %s"
  msgstr "この鍵は、%s鍵%sによって失効可能です"
  
- #: g10/keyedit.c:3866
++#: g10/keyedit.c:3947
  msgid "(sensitive)"
  msgstr "(機密指定)"
  
- #: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3989 g10/keyedit.c:4131 g10/keylist.c:262 g10/keyserver.c:538
  #, c-format
  msgid "created: %s"
  msgstr "作成: %s"
  
- #: g10/keyedit.c:3911 g10/keylist.c:1852
++#: g10/keyedit.c:3992 g10/keylist.c:1852
  #, c-format
  msgid "revoked: %s"
  msgstr "失効: %s"
  
- #: g10/keyedit.c:3913 g10/keylist.c:1858
++#: g10/keyedit.c:3994 g10/keylist.c:1858
  #, c-format
  msgid "expired: %s"
  msgstr "期限切れ: %s"
  
- #: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyedit.c:3996 g10/keyedit.c:4133 g10/keylist.c:264 g10/keylist.c:1864
 +#: g10/keyserver.c:544
  #, c-format
  msgid "expires: %s"
  msgstr "有効期限: %s"
  
- #: g10/keyedit.c:3917
++#: g10/keyedit.c:3998
  #, c-format
  msgid "usage: %s"
  msgstr "利用法: %s"
  
- #: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
++#: g10/keyedit.c:4006 g10/keyedit.c:4026 g10/keylist.c:267
  msgid "card-no: "
  msgstr "カード番号: "
  
- #: g10/keyedit.c:3984
++#: g10/keyedit.c:4065
  #, c-format
  msgid "trust: %s"
  msgstr "信用: %s"
  
- #: g10/keyedit.c:3988
++#: g10/keyedit.c:4069
  #, c-format
  msgid "validity: %s"
  msgstr "有効性: %s"
  
- #: g10/keyedit.c:3995
++#: g10/keyedit.c:4076
  msgid "This key has been disabled"
  msgstr "この鍵は使用禁止に設定されています"
  
- #: g10/keyedit.c:4013
++#: g10/keyedit.c:4094
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4337,18 -3320,12 +4281,18 @@@ msgstr "
  "プログラムを再起動するまで、表示された鍵の有効性は正しくないかもしれない、\n"
  "ということを念頭においてください。\n"
  
- #: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
- #: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: g10/keyedit.c:4150 g10/keyedit.c:4581 g10/keyserver.c:548
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:712
 +#: dirmngr/ocsp.c:703
  msgid "revoked"
  msgstr "失効"
  
- #: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
- #: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4152 g10/keyedit.c:4583 g10/keyserver.c:552
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:714
  msgid "expired"
  msgstr "期限切れ"
  
- #: g10/keyedit.c:4188
++#: g10/keyedit.c:4269
  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"
@@@ -4356,15 -3333,12 +4300,15 @@@ msgstr "
  "*警告*: 主たるユーザIDがありません。このコマンドは、別な\n"
  "              ユーザIDが主になると仮定する場合があります。\n"
  
- #: g10/keyedit.c:4240
++#: g10/keyedit.c:4321
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr "*警告*: あなたの暗号副鍵はもうすぐ期限切れとなります。\n"
  
- #: g10/keyedit.c:4241
++#: g10/keyedit.c:4322
  msgid "You may want to change its expiration date too.\n"
  msgstr "その有効期限も変更したいでしょう\n"
  
- #: g10/keyedit.c:4300
++#: g10/keyedit.c:4381
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4374,70 -3348,55 +4318,70 @@@ msgstr "
  "は、\n"
  "        この鍵を拒否するかもしれません。\n"
  
- #: g10/keyedit.c:4305 g10/keyedit.c:4595
++#: g10/keyedit.c:4386 g10/keyedit.c:4676
  msgid "Are you sure you still want to add it? (y/N) "
  msgstr "それでも追加したいですか? (y/N) "
  
- #: g10/keyedit.c:4311
++#: g10/keyedit.c:4392
  msgid "You may not add a photo ID to a PGP2-style key.\n"
  msgstr "PGP2形式の鍵にはフォトIDを追加できません。\n"
  
- #: g10/keyedit.c:4326 g10/keygen.c:2697
++#: g10/keyedit.c:4407 g10/keygen.c:2719
  msgid "Such a user ID already exists on this key!\n"
  msgstr "そういったユーザIDはすでにこの鍵に存在しています!\n"
  
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4509
  msgid "Delete this good signature? (y/N/q)"
  msgstr "この正しい署名を削除しますか? (y/N/q)"
  
- #: g10/keyedit.c:4438
++#: g10/keyedit.c:4519
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "この無効な署名を削除しますか? (y/N/q)"
  
- #: g10/keyedit.c:4442
++#: g10/keyedit.c:4523
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "この不明の署名を削除しますか? (y/N/q)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4530
  msgid "Really delete this self-signature? (y/N)"
  msgstr "この自己署名を本当に削除しますか? (y/N)"
  
- #: g10/keyedit.c:4465
++#: g10/keyedit.c:4546
  #, c-format
  msgid "Deleted %d signature.\n"
  msgid_plural "Deleted %d signatures.\n"
  msgstr[0] "%d個の署名を削除しました。\n"
  
- #: g10/keyedit.c:4469
++#: g10/keyedit.c:4550
  msgid "Nothing deleted.\n"
  msgstr "何も削除していません。\n"
  
- #: g10/keyedit.c:4504 g10/trust.c:693
++#: g10/keyedit.c:4585 g10/trust.c:716
  msgid "invalid"
  msgstr "無効"
  
- #: g10/keyedit.c:4506
++#: g10/keyedit.c:4587
  #, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "ユーザID \"%s\" は、コンパクトになりました: %s\n"
  
- #: g10/keyedit.c:4512
++#: g10/keyedit.c:4593
  #, 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:4520
++#: g10/keyedit.c:4601
  #, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "ユーザID \"%s\": 既に最小化されています\n"
  
- #: g10/keyedit.c:4521
++#: g10/keyedit.c:4602
  #, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "ユーザID \"%s\": 既にクリーンとなっています\n"
  
- #: g10/keyedit.c:4590
++#: g10/keyedit.c:4671
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4447,264 -3406,205 +4391,264 @@@ msgstr "
  "では、\n"
  "        この鍵を拒否するかもしれません。\n"
  
- #: g10/keyedit.c:4601
++#: g10/keyedit.c:4682
  msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
  msgstr "PGP 2.x形式の鍵には指名失効者を追加できません。\n"
  
- #: g10/keyedit.c:4618
++#: g10/keyedit.c:4699
  msgid "Enter the user ID of the designated revoker: "
  msgstr "指名失効者のユーザIDを入力してください: "
  
- #: g10/keyedit.c:4643
++#: g10/keyedit.c:4724
  msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
  msgstr "PGP 2.x形式の鍵は、指名失効者に任命できません\n"
  
- #: g10/keyedit.c:4658
++#: g10/keyedit.c:4739
  msgid "you cannot appoint a key as its own designated revoker\n"
  msgstr "指名失効者には、その鍵自体を任命できません\n"
  
- #: g10/keyedit.c:4680
++#: g10/keyedit.c:4761
  msgid "this key has already been designated as a revoker\n"
  msgstr "この鍵は失効者としてもう指名されています\n"
  
- #: g10/keyedit.c:4698
++#: g10/keyedit.c:4779
  msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
  msgstr "*警告*: ある鍵を指名失効者に設定すると、元に戻せません!\n"
  
- #: g10/keyedit.c:4704
++#: g10/keyedit.c:4785
  msgid ""
  "Are you sure you want to appoint this key as a designated revoker? (y/N) "
  msgstr "本当にこの鍵を指名失効者に任命しますか? (y/N) "
  
- #: g10/keyedit.c:4755
++#: g10/keyedit.c:4848
  msgid ""
  "Are you sure you want to change the expiration time for multiple subkeys? (y/"
  "N) "
  msgstr "本当に複数の副鍵の失効期限を変更しますか? (y/N) "
  
- #: g10/keyedit.c:4760
++#: g10/keyedit.c:4853
  msgid "Changing expiration time for a subkey.\n"
  msgstr "副鍵の有効期限を変更します。\n"
  
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:4856
  msgid "Changing expiration time for the primary key.\n"
  msgstr "主鍵の有効期限を変更します。\n"
  
- #: g10/keyedit.c:4814
++#: g10/keyedit.c:4910
  msgid "You can't change the expiration date of a v3 key\n"
  msgstr "v3鍵の有効期限は変更できません\n"
  
- #: g10/keyedit.c:4987
++#: g10/keyedit.c:5085
  #, c-format
  msgid "signing subkey %s is already cross-certified\n"
  msgstr "署名する副鍵%sはすでに相互証明されています\n"
  
- #: g10/keyedit.c:4993
++#: g10/keyedit.c:5091
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr "副鍵 %s は署名をしないので、相互証明の必要はありません\n"
  
- #: g10/keyedit.c:5108
++#: g10/keyedit.c:5206
  msgid "Please select exactly one user ID.\n"
  msgstr "ユーザIDをきっかりひとつ選択してください。\n"
  
- #: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
++#: g10/keyedit.c:5247 g10/keyedit.c:5361 g10/keyedit.c:5474 g10/keyedit.c:5611
  #, c-format
  msgid "skipping v3 self-signature on user ID \"%s\"\n"
  msgstr "ユーザID\"%s\"のv3自己署名をスキップします\n"
  
- #: g10/keyedit.c:5320
++#: g10/keyedit.c:5418
  msgid "Enter your preferred keyserver URL: "
  msgstr "優先鍵サーバURLを入力してください: "
  
- #: g10/keyedit.c:5399
++#: g10/keyedit.c:5497
  msgid "Are you sure you want to replace it? (y/N) "
  msgstr "本当に置き換えたいですか? (y/N) "
  
- #: g10/keyedit.c:5400
++#: g10/keyedit.c:5498
  msgid "Are you sure you want to delete it? (y/N) "
  msgstr "本当に削除したいですか? (y/N) "
  
- #: g10/keyedit.c:5459
++#: g10/keyedit.c:5557
  msgid "Enter the notation: "
  msgstr "注釈を入力: "
  
- #: g10/keyedit.c:5606
++#: g10/keyedit.c:5704
  msgid "Proceed? (y/N) "
  msgstr "進みますか? (y/N) "
  
- #: g10/keyedit.c:5676
++#: g10/keyedit.c:5774
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "%d番のユーザIDはありません\n"
  
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5836
  #, c-format
  msgid "No user ID with hash %s\n"
  msgstr "ハッシュ%sのユーザIDはありません\n"
  
- #: g10/keyedit.c:5839
++#: g10/keyedit.c:5937
  #, c-format
  msgid "No subkey with key ID '%s'.\n"
  msgstr "鍵ID'%s'の副鍵はありません\n"
  
- #: g10/keyedit.c:5861
++#: g10/keyedit.c:5959
  #, c-format
  msgid "No subkey with index %d\n"
  msgstr "%d番の副鍵はありません\n"
  
- #: g10/keyedit.c:6002
++#: g10/keyedit.c:6100
  #, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "ユーザID:\"%s\"\n"
  
- #: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
++#: g10/keyedit.c:6103 g10/keyedit.c:6205 g10/keyedit.c:6253
  #, c-format
  msgid "signed by your key %s on %s%s%s\n"
  msgstr "%sで%s%s%sに署名されています\n"
  
- #: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
++#: g10/keyedit.c:6105 g10/keyedit.c:6207 g10/keyedit.c:6255
  msgid " (non-exportable)"
  msgstr " (エクスポート不可)"
  
- #: g10/keyedit.c:6011
++#: g10/keyedit.c:6109
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "この署名は%sで期限切れです。\n"
  
- #: g10/keyedit.c:6016
++#: g10/keyedit.c:6114
  msgid "Are you sure you still want to revoke it? (y/N) "
  msgstr "それでも本当に失効したいですか? (y/N) "
  
- #: g10/keyedit.c:6021
++#: g10/keyedit.c:6119
  msgid "Create a revocation certificate for this signature? (y/N) "
  msgstr "この署名に対する失効証明書を作成しますか? (y/N) "
  
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6173
  msgid "Not signed by you.\n"
  msgstr "あなたによって署名されていません。\n"
  
- #: g10/keyedit.c:6081
++#: g10/keyedit.c:6179
  #, c-format
  msgid "You have signed these user IDs on key %s:\n"
  msgstr "これらのユーザIDに鍵%sで署名しました:\n"
  
- #: g10/keyedit.c:6110
++#: g10/keyedit.c:6208
  msgid " (non-revocable)"
  msgstr " (失効不可)"
  
- #: g10/keyedit.c:6117
++#: g10/keyedit.c:6215
  #, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "あなたの鍵%sで%sに失効されています\n"
  
- #: g10/keyedit.c:6142
++#: g10/keyedit.c:6240
  msgid "You are about to revoke these signatures:\n"
  msgstr "これらの署名を失効しようとしています:\n"
  
- #: g10/keyedit.c:6165
++#: g10/keyedit.c:6263
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "失効証明書を本当に作成しますか? (y/N) "
  
- #: g10/keyedit.c:6198
++#: g10/keyedit.c:6296
  msgid "no secret key\n"
  msgstr "秘密鍵がありません\n"
  
- #: g10/keyedit.c:6246
++#: g10/keyedit.c:6344
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr "ユーザIDでないものを失効しようとしました: %s\n"
  
- #: g10/keyedit.c:6256
++#: g10/keyedit.c:6354
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "ユーザID\"%s\"は、もう失効されています\n"
  
- #: g10/keyedit.c:6273
++#: g10/keyedit.c:6371
  #, c-format
  msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
  msgstr "*警告*: ユーザID署名が、%d秒未来です\n"
  
- #: g10/keyedit.c:6386
++#: g10/keyedit.c:6485
  #, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "鍵 %s は、もう失効されています。\n"
  
- #: g10/keyedit.c:6448
++#: g10/keyedit.c:6547
  #, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "副鍵 %s は、もう失効されています。\n"
  
- #: g10/keyedit.c:6545
++#: g10/keyedit.c:6644
  #, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr "%s (大きさ%ld) の鍵%s (uid %d) のフォトIDとして表示\n"
  
- #: g10/keygen.c:305
++#: g10/keygen.c:316
  #, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "優先指定'%s'の重複\n"
  
- #: g10/keygen.c:312
++#: g10/keygen.c:323
  msgid "too many cipher preferences\n"
  msgstr "暗号方式の優先指定が多すぎます\n"
  
- #: g10/keygen.c:314
++#: g10/keygen.c:325
  msgid "too many digest preferences\n"
  msgstr "ダイジェストの優先指定が多すぎます\n"
  
- #: g10/keygen.c:316
++#: g10/keygen.c:327
  msgid "too many compression preferences\n"
  msgstr "圧縮の優先指定が多すぎます\n"
  
- #: g10/keygen.c:457
++#: g10/keygen.c:468
  #, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "優先指定の文字列に無効な項目'%s'があります\n"
  
- #: g10/keygen.c:936
++#: g10/keygen.c:947
  msgid "writing direct signature\n"
  msgstr "直接署名を書き込みます\n"
  
- #: g10/keygen.c:982
++#: g10/keygen.c:993
  msgid "writing self signature\n"
  msgstr "自己署名を書き込みます\n"
  
- #: g10/keygen.c:1038
++#: g10/keygen.c:1049
  msgid "writing key binding signature\n"
  msgstr "鍵対応への署名を書き込みます\n"
  
- #: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
- #: g10/keygen.c:1610 g10/keygen.c:1615
++#: g10/keygen.c:1413 g10/keygen.c:1418 g10/keygen.c:1470 g10/keygen.c:1475
++#: g10/keygen.c:1622 g10/keygen.c:1627
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "無効な鍵長。%uビットにします\n"
  
- #: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
++#: g10/keygen.c:1424 g10/keygen.c:1481 g10/keygen.c:1489 g10/keygen.c:1633
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "鍵長を%uビットに丸めます\n"
  
- #: g10/keygen.c:1503
++#: g10/keygen.c:1515
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  "*警告*: いくつかのOpenPGPプログラムはこのダイジェスト長のDSA鍵を扱うことがで"
  "きません\n"
  
- #: g10/keygen.c:1677
++#: g10/keygen.c:1689
  msgid "Sign"
  msgstr "Sign"
  
- #: g10/keygen.c:1680
++#: g10/keygen.c:1692
  msgid "Certify"
  msgstr "Certify"
  
- #: g10/keygen.c:1683
++#: g10/keygen.c:1695
  msgid "Encrypt"
  msgstr "Encrypt"
  
- #: g10/keygen.c:1686
++#: g10/keygen.c:1698
  msgid "Authenticate"
  msgstr "Authenticate"
  
@@@ -4718,150 -3618,119 +4662,150 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1705
++#: g10/keygen.c:1717
  msgid "SsEeAaQq"
  msgstr "SsEeAaQq"
  
- #: g10/keygen.c:1732
++#: g10/keygen.c:1744
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "鍵%sに認められた操作: "
  
- #: g10/keygen.c:1738
++#: g10/keygen.c:1750
  msgid "Current allowed actions: "
  msgstr "現在の認められた操作: "
  
- #: g10/keygen.c:1743
++#: g10/keygen.c:1755
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) 署名機能を反転する\n"
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) 暗号機能を反転する\n"
  
- #: g10/keygen.c:1749
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) 認証機能を反転する\n"
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) 完了\n"
  
- #: g10/keygen.c:1881 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1893 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "ご希望の鍵の種類を選択してください:\n"
  
- #: g10/keygen.c:1885
++#: g10/keygen.c:1897
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) RSA と RSA (デフォルト)\n"
  
- #: g10/keygen.c:1889
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA と Elgamal\n"
  
- #: g10/keygen.c:1892
++#: g10/keygen.c:1904
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (署名のみ)\n"
  
- #: g10/keygen.c:1894
++#: g10/keygen.c:1906
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (署名のみ)\n"
  
- #: g10/keygen.c:1900
++#: g10/keygen.c:1912
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) Elgamal (暗号化のみ)\n"
  
- #: g10/keygen.c:1902
++#: g10/keygen.c:1914
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (暗号化のみ)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1920
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (機能をあなた自身で設定)\n"
  
- #: g10/keygen.c:1910
++#: g10/keygen.c:1922
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (機能をあなた自身で設定)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1928
  #, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) ECC と ECC\n"
  
- #: g10/keygen.c:1918
++#: g10/keygen.c:1930
  #, c-format
  msgid "  (%d) ECC (sign only)\n"
  msgstr "  (%d) ECC (署名のみ)\n"
  
- #: g10/keygen.c:1920
++#: g10/keygen.c:1932
  #, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "  (%d) ECC (機能をあなた自身で設定)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1934
  #, c-format
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "  (%d) ECC (暗号化のみ)\n"
  
- #: g10/keygen.c:1926
++#: g10/keygen.c:1938
  #, c-format
  msgid "  (%d) Existing key\n"
  msgstr "  (%d) 既存の鍵\n"
  
- #: g10/keygen.c:2022 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:206
  msgid "Enter the keygrip: "
  msgstr "keygripを入力: "
  
- #: g10/keygen.c:2035 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2047 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr "有効なkeygrip (40桁の16進数字)ではありません\n"
  
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2049 sm/certreqgen-ui.c:216
  msgid "No key with this keygrip\n"
  msgstr "このkeygripの鍵はありません\n"
  
- #: g10/keygen.c:2111 g10/keygen.c:2125
++#: g10/keygen.c:2133 g10/keygen.c:2147
  #, c-format
  msgid "rounded to %u bits\n"
  msgstr "%uビットに切り上げます\n"
  
- #: g10/keygen.c:2166
++#: g10/keygen.c:2188
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr "%s 鍵は %u から %u ビットの長さで可能です。\n"
  
- #: g10/keygen.c:2174
++#: g10/keygen.c:2196
  #, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "副鍵の鍵長は? (%u) "
  
- #: g10/keygen.c:2177 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2199 sm/certreqgen-ui.c:183
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "鍵長は? (%u) "
  
- #: g10/keygen.c:2191 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2213 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "要求された鍵長は%uビット\n"
  
- #: g10/keygen.c:2237
++#: g10/keygen.c:2259
  msgid "Please select which elliptic curve you want:\n"
  msgstr "ご希望の楕円曲線を選択してください:\n"
  
- #: g10/keygen.c:2409
++#: g10/keygen.c:2431
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -4877,7 -3746,6 +4821,7 @@@ msgstr "
  "      <n>m = 鍵は n か月間で期限切れ\n"
  "      <n>y = 鍵は n 年間で期限切れ\n"
  
- #: g10/keygen.c:2420
++#: g10/keygen.c:2442
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -4893,38 -3761,30 +4837,38 @@@ msgstr "
  "      <n>m = 署名は n か月間で期限切れ\n"
  "      <n>y = 署名は n 年間で期限切れ\n"
  
- #: g10/keygen.c:2443
++#: g10/keygen.c:2465
  msgid "Key is valid for? (0) "
  msgstr "鍵の有効期間は? (0)"
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2470
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "署名の有効期間は? (%s)"
  
- #: g10/keygen.c:2461 g10/keygen.c:2486
++#: g10/keygen.c:2483 g10/keygen.c:2508
  msgid "invalid value\n"
  msgstr "無効な値\n"
  
- #: g10/keygen.c:2468
++#: g10/keygen.c:2490
  msgid "Key does not expire at all\n"
  msgstr "%sは無期限です\n"
  
- #: g10/keygen.c:2469
++#: g10/keygen.c:2491
  msgid "Signature does not expire at all\n"
  msgstr "%署名は無期限です\n"
  
- #: g10/keygen.c:2474
++#: g10/keygen.c:2496
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "鍵は%sで期限切れとなります\n"
  
- #: g10/keygen.c:2475
++#: g10/keygen.c:2497
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "署名は%sで期限切れとなります\n"
  
- #: g10/keygen.c:2479
++#: g10/keygen.c:2501
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -4932,11 -3792,9 +4876,11 @@@ msgstr "
  "このシステムでは、2038年以降の日付を表示することはできませんが、\n"
  "2106年まで正しく処理されます。\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2514
  msgid "Is this correct? (y/N) "
  msgstr "これで正しいですか? (y/N) "
  
- #: g10/keygen.c:2560
++#: g10/keygen.c:2582
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -4950,7 -3808,6 +4894,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2575
++#: g10/keygen.c:2597
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -4966,49 -3823,38 +4910,49 @@@ msgstr "
  "    \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
  "\n"
  
- #: g10/keygen.c:2594
++#: g10/keygen.c:2616
  msgid "Real name: "
  msgstr "本名: "
  
- #: g10/keygen.c:2603
++#: g10/keygen.c:2625
  msgid "Invalid character in name\n"
  msgstr "名前に無効な文字があります\n"
  
- #: g10/keygen.c:2604
++#: g10/keygen.c:2626
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr "キャラクタ'%s'と'%s'は名前に使えません\n"
  
- #: g10/keygen.c:2608
++#: g10/keygen.c:2630
  msgid "Name may not start with a digit\n"
  msgstr "名前を数字で始めてはいけません\n"
  
- #: g10/keygen.c:2611
++#: g10/keygen.c:2633
  msgid "Name must be at least 5 characters long\n"
  msgstr "名前は5文字以上でなければなりません\n"
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2643
  msgid "Email address: "
  msgstr "電子メール・アドレス: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2649
  msgid "Not a valid email address\n"
  msgstr "有効な電子メール・アドレスではありません\n"
  
- #: g10/keygen.c:2636
++#: g10/keygen.c:2658
  msgid "Comment: "
  msgstr "コメント: "
  
- #: g10/keygen.c:2642
++#: g10/keygen.c:2664
  msgid "Invalid character in comment\n"
  msgstr "コメントに無効な文字があります\n"
  
- #: g10/keygen.c:2678
++#: g10/keygen.c:2700
  #, c-format
  msgid "You are using the '%s' character set.\n"
  msgstr "あなたは文字集合'%s'を使っています。\n"
  
- #: g10/keygen.c:2684
++#: g10/keygen.c:2706
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5019,7 -3865,6 +4963,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2689
++#: g10/keygen.c:2711
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr "電子メールのアドレスを本名やコメントに入れないように\n"
  
@@@ -5034,31 -3879,24 +4978,31 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2714
++#: g10/keygen.c:2736
  msgid "NnCcEeOoQq"
  msgstr "NnCcEeOoQq"
  
- #: g10/keygen.c:2724
++#: g10/keygen.c:2746
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "名前(N)、コメント(C)、電子メール(E)の変更、または終了(Q)? "
  
- #: g10/keygen.c:2725
++#: g10/keygen.c:2747
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr "名前(N)、コメント(C)、電子メール(E)の変更、またはOK(O)か終了(Q)? "
  
- #: g10/keygen.c:2730
++#: g10/keygen.c:2752
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "名前(N)、電子メール(E)の変更、または終了(Q)? "
  
- #: g10/keygen.c:2731
++#: g10/keygen.c:2753
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "名前(N)、電子メール(E)の変更、またはOK(O)か終了(Q)? "
  
- #: g10/keygen.c:2750
++#: g10/keygen.c:2772
  msgid "Please correct the error first\n"
  msgstr "まずエラーを修正してください\n"
  
- #: g10/keygen.c:2796
++#: g10/keygen.c:2818
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5069,13 -3907,10 +5013,13 @@@ msgstr "
  "す、ディスクにアクセスするなどの他の操作を素数生成の間に行うことで、乱数生\n"
  "成器に十分なエントロピーを供給する機会を与えることができます。\n"
  
- #: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
- #: g10/keygen.c:4777 g10/keygen.c:4882
++#: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
++#: g10/keygen.c:4330 g10/keygen.c:4803 g10/keygen.c:5064 g10/keygen.c:5169
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "鍵の生成に失敗しました: %s\n"
  
- #: g10/keygen.c:3598
++#: g10/keygen.c:3922
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5086,62 -3921,49 +5030,62 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3924
  msgid "Continue? (Y/n) "
  msgstr "続けますか? (Y/n) "
  
- #: g10/keygen.c:3621
++#: g10/keygen.c:3945
  #, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "\"%s\" の鍵はもうあります\n"
  
- #: g10/keygen.c:3626
++#: g10/keygen.c:3950
  msgid "Create anyway? (y/N) "
  msgstr "それでも鍵を作成しますか? (y/N) "
  
- #: g10/keygen.c:3632
++#: g10/keygen.c:3956
  msgid "creating anyway\n"
  msgstr "いずれにしろ鍵を作成\n"
  
- #: g10/keygen.c:3981
++#: g10/keygen.c:4315
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr "注意: 全機能の鍵生成には \"%s %s\" を使います。\n"
  
- #: g10/keygen.c:4013
++#: g10/keygen.c:4358
  msgid "Key generation canceled.\n"
  msgstr "鍵の生成が取り消されました。\n"
  
- #: g10/keygen.c:4073
++#: g10/keygen.c:4418
  #, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "バックアップ・ファイル'%s'が作成できません: %s\n"
  
- #: g10/keygen.c:4093
++#: g10/keygen.c:4438
  #, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "*注意*: カード鍵のバックアップが'%s'へ保存されます\n"
  
- #: g10/keygen.c:4244 g10/keygen.c:4393
++#: g10/keygen.c:4589 g10/keygen.c:4738
  #, c-format
  msgid "writing public key to '%s'\n"
  msgstr "'%s'へ公開鍵を書き込みます\n"
  
- #: g10/keygen.c:4387
++#: g10/keygen.c:4732
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "書き込み可能な公開鍵リングが見つかりません: %s\n"
  
- #: g10/keygen.c:4401
++#: g10/keygen.c:4746
  #, c-format
  msgid "error writing public keyring '%s': %s\n"
  msgstr "公開鍵リング'%s'の書き込みエラー: %s\n"
  
- #: g10/keygen.c:4433
++#: g10/keygen.c:4778
  msgid "public and secret key created and signed.\n"
  msgstr "公開鍵と秘密鍵を作成し、署名しました。\n"
  
- #: g10/keygen.c:4445
++#: g10/keygen.c:4790
  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"
@@@ -5149,31 -3971,25 +5093,31 @@@ msgstr "
  "この鍵は暗号化には使用できないことに注意してください。暗号化を行うには、\n"
  "\"--edit-key\"コマンドを使って副鍵を生成してください。\n"
  
- #: g10/keygen.c:4649 g10/keygen.c:4833
++#: g10/keygen.c:4936 g10/keygen.c:5120
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
  msgstr "鍵は%lu秒未来にできました (時間歪曲か時計の障害でしょう)\n"
  
- #: g10/keygen.c:4651 g10/keygen.c:4835
++#: g10/keygen.c:4938 g10/keygen.c:5122
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
  msgstr "鍵は%lu秒未来にできました (時間歪曲か時計の障害でしょう)\n"
  
- #: g10/keygen.c:4662 g10/keygen.c:4846
++#: g10/keygen.c:4949 g10/keygen.c:5133
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgstr "*注意*: v3鍵に対する副鍵の作成は、OpenPGPに適合しません\n"
  
- #: g10/keygen.c:4674 g10/keygen.c:4676
++#: g10/keygen.c:4961 g10/keygen.c:4963
  msgid "Secret parts of primary key are not available.\n"
  msgstr "主鍵の秘密部分が利用できません。\n"
  
- #: g10/keygen.c:4683 g10/keygen.c:4685
++#: g10/keygen.c:4970 g10/keygen.c:4972
  msgid "Secret parts of primary key are stored on-card.\n"
  msgstr "主鍵の秘密部分はカード上に保存されています。\n"
  
- #: g10/keygen.c:4704 g10/keygen.c:4860
++#: g10/keygen.c:4991 g10/keygen.c:5147
  msgid "Really create? (y/N) "
  msgstr "本当に作成しますか? (y/N) "
  
@@@ -5478,123 -4229,97 +5422,123 @@@ msgstr "*警告*: 複数のプレイン
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
  msgstr "スタンドアロン失効 - \"gpg --import\"を使って適用してください\n"
  
- #: g10/mainproc.c:1233 g10/mainproc.c:1276
++#: g10/mainproc.c:1238 g10/mainproc.c:1281
  msgid "no signature found\n"
  msgstr "署名が見つかりません\n"
  
- #: g10/mainproc.c:1607
++#: g10/mainproc.c:1612
  #, c-format
  msgid "BAD signature from \"%s\""
  msgstr "\"%s\"からの*不正な*署名"
  
- #: g10/mainproc.c:1609
++#: g10/mainproc.c:1614
  #, c-format
  msgid "Expired signature from \"%s\""
  msgstr "\"%s\"からの期限切れの署名"
  
- #: g10/mainproc.c:1611
++#: g10/mainproc.c:1616
  #, c-format
  msgid "Good signature from \"%s\""
  msgstr "\"%s\"からの正しい署名"
  
- #: g10/mainproc.c:1630
++#: g10/mainproc.c:1635
  msgid "signature verification suppressed\n"
  msgstr "署名の検証を省略\n"
  
- #: g10/mainproc.c:1739
++#: g10/mainproc.c:1744
  msgid "can't handle this ambiguous signature data\n"
  msgstr "このあいまいな署名データは取り扱えません\n"
  
- #: g10/mainproc.c:1753 g10/mainproc.c:1761
++#: g10/mainproc.c:1758 g10/mainproc.c:1766
  #, c-format
  msgid "Signature made %s\n"
  msgstr "%sに施された署名\n"
  
- #: g10/mainproc.c:1754 g10/mainproc.c:1762
++#: g10/mainproc.c:1759 g10/mainproc.c:1767
  #, c-format
  msgid "               using %s key %s\n"
  msgstr "               %s鍵%sを使用\n"
  
- #: g10/mainproc.c:1766
++#: g10/mainproc.c:1771
  #, c-format
  msgid "Signature made %s using %s key ID %s\n"
  msgstr "%sに%s鍵ID %sで施された署名\n"
  
- #: g10/mainproc.c:1772
++#: g10/mainproc.c:1777
  #, c-format
  msgid "               issuer \"%s\"\n"
  msgstr "               発行者\"%s\"\n"
  
- #: g10/mainproc.c:1789
++#: g10/mainproc.c:1794
  msgid "Key available at: "
  msgstr "以下に鍵があります: "
  
- #: g10/mainproc.c:2024
++#: g10/mainproc.c:2029
  msgid "[uncertain]"
  msgstr "[不確定]"
  
- #: g10/mainproc.c:2062
++#: g10/mainproc.c:2067
  #, c-format
  msgid "                aka \"%s\""
  msgstr "                別名\"%s\""
  
- #: g10/mainproc.c:2145
++#: g10/mainproc.c:2150
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "期限切れの署名 %s\n"
  
- #: g10/mainproc.c:2149
++#: g10/mainproc.c:2154
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "この署名は%sで期限切れとなります\n"
  
- #: g10/mainproc.c:2160
++#: g10/mainproc.c:2165
  #, c-format
  msgid "%s signature, digest algorithm %s%s%s\n"
  msgstr "%s署名、ダイジェスト・アルゴリズム %s%s%s\n"
  
- #: g10/mainproc.c:2161
++#: g10/mainproc.c:2166
  msgid "binary"
  msgstr "バイナリ"
  
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2167
  msgid "textmode"
  msgstr "テキストモード"
  
- #: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "不明の"
  
- #: g10/mainproc.c:2164
++#: g10/mainproc.c:2169
  msgid ", key algorithm "
  msgstr "、鍵アルゴリズム "
  
- #: g10/mainproc.c:2199
++#: g10/mainproc.c:2204
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  "*警告*: 分遣署名ではありません。ファイル「%s」は検証され*ませんでした*!\n"
  
- #: g10/mainproc.c:2229
++#: g10/mainproc.c:2234
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "署名を検査できません: %s\n"
  
- #: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
++#: g10/mainproc.c:2327 g10/mainproc.c:2346 g10/mainproc.c:2470
  msgid "not a detached signature\n"
  msgstr "分遣署名でありません\n"
  
- #: g10/mainproc.c:2375
++#: g10/mainproc.c:2380
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
  msgstr "*警告*: 多重署名の検出。最初のものだけ検査します。\n"
  
- #: g10/mainproc.c:2384
++#: g10/mainproc.c:2389
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "クラス0x%02xのスタンドアロン署名\n"
  
- #: g10/mainproc.c:2469
++#: g10/mainproc.c:2474
  msgid "old style (PGP 2.x) signature\n"
  msgstr "古い形式 (PGP 2.x) の署名\n"
  
@@@ -5873,23 -4544,18 +5817,23 @@@ msgstr "この写真は正しいです�
  msgid "unable to display photo ID!\n"
  msgstr "フォトIDが表示不能!\n"
  
- #: g10/pkclist.c:72 g10/revoke.c:757
++#: g10/pkclist.c:72 g10/revoke.c:758
  msgid "No reason specified"
  msgstr "理由は指定されていません"
  
- #: g10/pkclist.c:74 g10/revoke.c:759
++#: g10/pkclist.c:74 g10/revoke.c:760
  msgid "Key is superseded"
  msgstr "鍵がとりかわっています"
  
- #: g10/pkclist.c:76 g10/revoke.c:758
++#: g10/pkclist.c:76 g10/revoke.c:759
  msgid "Key has been compromised"
  msgstr "鍵(の信頼性)が損なわれています"
  
- #: g10/pkclist.c:78 g10/revoke.c:760
++#: g10/pkclist.c:78 g10/revoke.c:761
  msgid "Key is no longer used"
  msgstr "鍵はもはや使われていません"
  
- #: g10/pkclist.c:80 g10/revoke.c:761
++#: g10/pkclist.c:80 g10/revoke.c:762
  msgid "User ID is no longer valid"
  msgstr "ユーザIDがもはや有効でありません"
  
@@@ -5964,7 -4617,6 +5908,7 @@@ msgid "
  "\n"
  msgstr "この鍵の最小信用レベル: %s\n"
  
- #: g10/pkclist.c:310 g10/revoke.c:786
++#: g10/pkclist.c:310 g10/revoke.c:787
  msgid "Your decision? "
  msgstr "あなたの決定は? "
  
@@@ -5994,28 -4640,19 +5938,22 @@@ msgstr "この鍵はたぶん本人の�
  msgid "This key belongs to us\n"
  msgstr "この鍵は自分のものです\n"
  
 +#: g10/pkclist.c:456
- #, fuzzy, c-format
- #| msgid "root certificate has now been marked as trusted\n"
+ #, c-format
  msgid "%s: This key is bad!  It has been marked as untrusted!\n"
- msgstr "ルート証明書は信用すると今、マークされました\n"
+ msgstr "%s: この鍵はダメです! 信用できないとマークされています!\n"
  
 +#: g10/pkclist.c:484
- #, fuzzy
- #| msgid ""
- #| "It is NOT certain that the key belongs to the person named\n"
- #| "in the user ID.  If you *really* know what you are doing,\n"
- #| "you may answer the next question with yes.\n"
  msgid ""
- "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "This key is bad!  It has been marked as untrusted!  If you\n"
  "*really* know what you are doing, you may answer the next\n"
  "question with yes.\n"
  msgstr ""
- "この鍵は、このユーザIDをなのる本人のものかどうか確信でき\n"
- "ません。今から行うことを*本当に*理解していない場合には、\n"
- "次の質問にはnoと答えてください。\n"
+ "この鍵は、ダメです! 信用できないとマークされています! *本当に*\n"
+ "なにをしているのか分かっている場合には、次の質問には yes と\n"
+ "答えてください。\n"
  
 +#: g10/pkclist.c:489
  msgid ""
  "It is NOT certain that the key belongs to the person named\n"
  "in the user ID.  If you *really* know what you are doing,\n"
@@@ -6156,33 -4764,26 +6094,33 @@@ msgstr "
  msgid "No such user ID.\n"
  msgstr "そのユーザIDはありません。\n"
  
- #: g10/pkclist.c:1197 g10/pkclist.c:1273
++#: g10/pkclist.c:1197 g10/pkclist.c:1274
  msgid "skipped: public key already set as default recipient\n"
  msgstr "スキップ: 公開鍵はデフォルトの受取人としてもう設定済みです\n"
  
- #: g10/pkclist.c:1218
++#: g10/pkclist.c:1219
  msgid "Public key is disabled.\n"
  msgstr "公開鍵は使用禁止です。\n"
  
- #: g10/pkclist.c:1228
++#: g10/pkclist.c:1229
  msgid "skipped: public key already set\n"
  msgstr "スキップ: 公開鍵はもう設定済みです\n"
  
- #: g10/pkclist.c:1263
++#: g10/pkclist.c:1264
  #, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "デフォルトの受取人\"%s\"が不明です\n"
  
- #: g10/pkclist.c:1312
++#: g10/pkclist.c:1313
  msgid "no valid addressees\n"
  msgstr "有効な宛先がありません\n"
  
- #: g10/pkclist.c:1665
++#: g10/pkclist.c:1666
  #, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "注意: 鍵%sには %s の機能がありません\n"
  
- #: g10/pkclist.c:1690
++#: g10/pkclist.c:1691
  #, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "注意: 鍵%sには%sに対する優先指定がありません\n"
@@@ -6192,28 -4792,22 +6130,28 @@@ msgid "data not saved; use option \"--o
  msgstr ""
  "データは保存されていません。保存には\"--output\"オプションを使ってください\n"
  
- #: g10/plaintext.c:598
++#: g10/plaintext.c:614
  msgid "Detached signature.\n"
  msgstr "分遣署名。\n"
  
- #: g10/plaintext.c:606
++#: g10/plaintext.c:622
  msgid "Please enter name of data file: "
  msgstr "データ・ファイルの名前を入力: "
  
- #: g10/plaintext.c:643
++#: g10/plaintext.c:659
  msgid "reading stdin ...\n"
  msgstr "標準入力より読み込み中 ...\n"
  
- #: g10/plaintext.c:688
++#: g10/plaintext.c:704
  msgid "no signed data\n"
  msgstr "署名されたデータがありません\n"
  
- #: g10/plaintext.c:706
++#: g10/plaintext.c:722
  #, c-format
  msgid "can't open signed data '%s'\n"
  msgstr "署名されたデータ'%s'が開けません\n"
  
- #: g10/plaintext.c:741
++#: g10/plaintext.c:757
  #, c-format
  msgid "can't open signed data fd=%d: %s\n"
  msgstr "署名されたデータ fd=%d が開けません: %s\n"
@@@ -6277,7 -4857,6 +6215,7 @@@ msgstr "秘密鍵が利用できませ�
  msgid "Create a designated revocation certificate for this key? (y/N) "
  msgstr "この鍵に対する指名失効証明書を作成しますか? (y/N) "
  
- #: g10/revoke.c:336 g10/revoke.c:727
++#: g10/revoke.c:336 g10/revoke.c:728
  msgid "ASCII armored output forced.\n"
  msgstr "ASCII外装出力を強制します。\n"
  
@@@ -6320,9 -4893,8 +6258,9 @@@ msgstr "
  "秘密鍵のコンプロマイズや紛失の場合、これを使ってこの鍵を失効させます。\n"
  "しかし、秘密鍵がまだアクセス可能である場合、新しい失効証明書を生成し、\n"
  "失効の理由をつける方がよいでしょう。詳細は、GnuPGマニュアルのgpgコマンド \"--"
- "gen-revoke\"の記述をご覧ください。"
+ "generate-revocation\"の記述をご覧ください。"
  
- #: g10/revoke.c:575
++#: g10/revoke.c:576
  msgid ""
  "To avoid an accidental use of this file, a colon has been inserted\n"
  "before the 5 dashes below.  Remove this colon with a text editor\n"
@@@ -6332,12 -4904,10 +6270,12 @@@ msgstr "
  "の前に挿入されます。この失効証明書をインポートして公開する前に、テク\n"
  "スト・エディタでこのコロンを削除してください。"
  
- #: g10/revoke.c:590
++#: g10/revoke.c:591
  #, c-format
  msgid "revocation certificate stored as '%s.rev'\n"
  msgstr "失効証明書を '%s.rev' に保管しました。\n"
  
- #: g10/revoke.c:634
++#: g10/revoke.c:635
  #, c-format
  msgid "secret key \"%s\" not found\n"
  msgstr "秘密鍵\"%s\"が見つかりません\n"
@@@ -6345,21 -4915,17 +6283,21 @@@
  #. TRANSLATORS: The %s prints a key specification which
  #. for example has been given at the command line.  Several lines
  #. lines with secret key infos are printed after this message.
- #: g10/revoke.c:661
++#: g10/revoke.c:662
  #, c-format
  msgid "'%s' matches multiple secret keys:\n"
  msgstr "'%s'は以下の複数の秘密鍵にマッチします:\n"
  
- #: g10/revoke.c:688
++#: g10/revoke.c:689
  #, c-format
  msgid "error searching the keyring: %s\n"
  msgstr "鍵リング探索エラー: %s\n"
  
- #: g10/revoke.c:711
++#: g10/revoke.c:712
  msgid "Create a revocation certificate for this key? (y/N) "
  msgstr "この鍵に対する失効証明書を作成しますか? (y/N) "
  
- #: g10/revoke.c:735
++#: g10/revoke.c:736
  msgid ""
  "Revocation certificate created.\n"
  "\n"
@@@ -6380,33 -4946,26 +6318,33 @@@ msgstr "
  "る\n"
  "場所にデータをおくことがあります!\n"
  
- #: g10/revoke.c:769
++#: g10/revoke.c:770
  msgid "Please select the reason for the revocation:\n"
  msgstr "失効の理由を選択してください:\n"
  
- #: g10/revoke.c:779
++#: g10/revoke.c:780
  msgid "Cancel"
  msgstr "キャンセル"
  
- #: g10/revoke.c:781
++#: g10/revoke.c:782
  #, c-format
  msgid "(Probably you want to select %d here)\n"
  msgstr "(ここではたぶん%dを選びたいでしょう)\n"
  
- #: g10/revoke.c:822
++#: g10/revoke.c:823
  msgid "Enter an optional description; end it with an empty line:\n"
  msgstr "予備の説明を入力。空行で終了:\n"
  
- #: g10/revoke.c:850
++#: g10/revoke.c:851
  #, c-format
  msgid "Reason for revocation: %s\n"
  msgstr "失効理由: %s\n"
  
- #: g10/revoke.c:852
++#: g10/revoke.c:853
  msgid "(No description given)\n"
  msgstr "(説明はありません)\n"
  
- #: g10/revoke.c:857
++#: g10/revoke.c:858
  msgid "Is this okay? (y/N) "
  msgstr "よろしいですか? (y/N) "
  
@@@ -6519,12 -5058,10 +6457,12 @@@ msgid "
  "unexpanded.\n"
  msgstr "*警告*: 優先鍵サーバURLを%%拡張不能 (大きすぎ)。拡張せずに使用。\n"
  
- #: g10/sign.c:329
++#: g10/sign.c:331
  #, c-format
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s/%s署名。署名者:\"%s\"\n"
  
- #: g10/sign.c:878
++#: g10/sign.c:880
  #, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6532,11 -5069,9 +6470,11 @@@ msgstr "
  "*警告*: ダイジェスト・アルゴリズム %s (%d) の強制が、受取人の優先指定と対立し"
  "ます\n"
  
- #: g10/sign.c:1009
++#: g10/sign.c:1011
  msgid "signing:"
  msgstr "署名:"
  
- #: g10/sign.c:1286
++#: g10/sign.c:1288
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "%s暗号化を使用します\n"
@@@ -6560,7 -5091,6 +6498,7 @@@ msgstr "スキップ: 秘密鍵はも�
  msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
  msgstr "これはPGPの生成したElgamal鍵で、署名用には安全ではありません!"
  
- #: g10/tdbdump.c:57 g10/trustdb.c:362
++#: g10/tdbdump.c:57 g10/trustdb.c:369
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "信用レコード%lu, 型%d: 書き込みに失敗しました: %s\n"
@@@ -6605,7 -5127,6 +6543,7 @@@ msgstr "'%s'で信用レコードの検
  msgid "read error in '%s': %s\n"
  msgstr "'%s'で読み込みエラー: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "信用データベース: 同期に失敗しました: %s\n"
@@@ -6748,335 -5240,277 +6686,343 @@@ msgstr "%d文字以上の長さのテ�
  msgid "input line longer than %d characters\n"
  msgstr "入力行の長さが%d文字を超えています\n"
  
- #: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
++#: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
  #, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "TOFUデータベースのトランザクション開始エラー: %s\n"
  
- #: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
++#: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr "TOFUデータベースのトランザクションコミットのエラー: %s\n"
  
- #: g10/tofu.c:357 g10/tofu.c:699
++#: g10/tofu.c:355 g10/tofu.c:888
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr "TOFUデータベースのトランザクションのロールバックのエラー: %s\n"
  
- #: g10/tofu.c:501
++#: g10/tofu.c:505
  #, c-format
  msgid "unsupported TOFU database version: %s\n"
  msgstr "サポートされていないTOFUデータベースバージョン: %s\n"
  
- #: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
- #: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
- #: g10/tofu.c:3056
++#: g10/tofu.c:538
+ #, c-format
+ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
+ msgstr "'ultimately_trusted_keys' TOFUテーブル作成エラー: %s\n"
+ 
++#: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
+ msgid "TOFU DB error"
+ msgstr "TOFU DBエラー"
+ 
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2340 g10/tofu.c:2359
++#: g10/tofu.c:2372 g10/tofu.c:2384 g10/tofu.c:2399 g10/tofu.c:2411
++#: g10/tofu.c:2980 g10/tofu.c:2997 g10/tofu.c:3033 g10/tofu.c:3050
++#: g10/tofu.c:3353
  #, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "TOFUデータベースの読み込みエラー: %s\n"
  
- #: g10/tofu.c:566 g10/tofu.c:574
++#: g10/tofu.c:716 g10/tofu.c:724
  #, c-format
  msgid "error determining TOFU database's version: %s\n"
  msgstr "TOFUデータベースのバージョン判定エラー: %s\n"
  
- #: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
++#: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
  #, c-format
  msgid "error initializing TOFU database: %s\n"
  msgstr "TOFUデータベースの初期化エラー: %s\n"
  
- #: g10/tofu.c:765
++#: g10/tofu.c:844
+ #, c-format
+ msgid "error creating 'encryptions' TOFU table: %s\n"
+ msgstr "'encryptions' TOFUデータベースの作成エラー: %s\n"
+ 
++#: g10/tofu.c:874
+ #, c-format
+ msgid "adding column effective_policy to bindings DB: %s\n"
+ msgstr "バインディングDBにカラムeffective_policyを追加: %s\n"
+ 
++#: g10/tofu.c:956
  #, c-format
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "TOFUデータベースのオープンでエラー '%s': %s\n"
  
- #: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
++#: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
  #, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "TOFUデータベースの更新エラー: %s\n"
  
- #: g10/tofu.c:1239
- #, fuzzy, c-format
- #| msgid "The email address \"%s\" is associated with %d key:\n"
- #| msgid_plural "The email address \"%s\" is associated with %d keys:\n"
++#: g10/tofu.c:1328
+ #, c-format
  msgid ""
  "This is the first time the email address \"%s\" is being used with key %s."
- msgstr "電子メールアドレス\"%s\"は%d個の鍵に結びつけられます:\n"
- 
- #: g10/tofu.c:1247
- #, fuzzy, c-format
- #| msgid "The email address \"%s\" is associated with %d key:\n"
- #| msgid_plural "The email address \"%s\" is associated with %d keys:\n"
- msgid "The email address \"%s\" is associated with %d keys!"
- msgstr "電子メールアドレス\"%s\"は%d個の鍵に結びつけられます:\n"
- 
- #: g10/tofu.c:1251
- #, fuzzy
- #| msgid ""
- #| "The key with fingerprint %s raised a conflict with the binding %s.  Since "
- #| "this binding's policy was 'auto', it was changed to 'ask'."
+ msgstr "電子メールアドレス\"%s\"が鍵%sに使われたのはこれが最初です。"
+ 
++#: g10/tofu.c:1337
+ #, c-format
+ msgid "The email address \"%s\" is associated with %d key!"
+ msgid_plural "The email address \"%s\" is associated with %d keys!"
+ msgstr[0] "電子メールアドレス\"%s\"は%d個の鍵に結びつけられます!"
+ 
++#: g10/tofu.c:1343
  msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
- "鍵のフィンガープリント%sがバインディング%sと衝突しました。このバインディング"
- "ポリシーは'auto'だったので、'ask'に変更されました。"
+ "  このバインディングポリシーは'auto'だったので、'ask'に変更されました。"
  
- #: g10/tofu.c:1257
++#: g10/tofu.c:1349
  #, c-format
  msgid ""
  "Please indicate whether this email address should be associated with key %s "
  "or whether you think someone is impersonating \"%s\"."
  msgstr ""
+ "この電子メールアドレスが鍵 %s に結びつけられるべきか、あるいは誰かが\"%s\" に"
+ "なりすましていると思うか指定してください。"
  
- #: g10/tofu.c:1513
++#: g10/tofu.c:1605
  #, c-format
  msgid "error gathering other user IDs: %s\n"
  msgstr "ほかのユーザIDの収集エラー: %s\n"
  
- #: g10/tofu.c:1523
- #, fuzzy
- #| msgid "list key and user IDs"
++#: g10/tofu.c:1615
  msgid "This key's user IDs:\n"
- msgstr "鍵とユーザIDの一覧"
+ msgstr "この鍵のユーザID:\n"
  
- #: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
++#: g10/tofu.c:1631 g10/tofu.c:1796
  #, c-format
  msgid "policy: %s"
  msgstr "ポリシー: %s"
  
- #: g10/tofu.c:1630
++#: g10/tofu.c:1722
  #, c-format
  msgid "error gathering signature stats: %s\n"
  msgstr "署名の統計の収集エラー: %s\n"
  
- #: g10/tofu.c:1634
++#: g10/tofu.c:1726
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] "電子メールアドレス\"%s\"は%d個の鍵に結びつけられます:\n"
  
- #: g10/tofu.c:1651
++#: g10/tofu.c:1744
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr "この電子メールアドレス\"%s\"の鍵の統計:\n"
  
- #: g10/tofu.c:1684 g10/tofu.c:1689
++#: g10/tofu.c:1785 g10/tofu.c:1790
  msgid ", "
- msgstr ""
+ msgstr ", "
  
- #: g10/tofu.c:1693
++#: g10/tofu.c:1794
  msgid "this key"
  msgstr "この鍵"
  
- #: g10/tofu.c:1715
- #, fuzzy, c-format
- #| msgid "Verified %ld messages signed by \"%s\"."
- msgid "Verified %d message"
- msgid_plural "Verified %d messages"
- msgstr[0] "%ld個のメッセージを検証しました(\"%s\"で署名されたもの)。"
++#: g10/tofu.c:1820
+ #, c-format
+ msgid "Verified %d message."
+ msgid_plural "Verified %d messages."
+ msgstr[0] "%d個のメッセージを検証しました。"
  
- #: g10/tofu.c:1719
++#: g10/tofu.c:1824
  #, c-format
- msgid "Encrypted %d message"
- msgid_plural "Encrypted %d messages"
- msgstr[0] ""
+ msgid "Encrypted %d message."
+ msgid_plural "Encrypted %d messages."
+ msgstr[0] "%d個のメッセージを暗号化しました。"
  
- #: g10/tofu.c:1734
- #, fuzzy, c-format
- #| msgid " over the past %ld day."
- #| msgid_plural " over the past %ld days."
- msgid " over the past day."
- msgid_plural " over the past %d days."
- msgstr[0] "過去%ld日に。"
- 
- #: g10/tofu.c:1740
- #, fuzzy, c-format
- #| msgid " over the past %ld month."
- #| msgid_plural " over the past %ld months."
- msgid " over the past month."
- msgid_plural " over the past %d months."
- msgstr[0] "過去%ld月に。"
- 
- #: g10/tofu.c:1746
- #, fuzzy, c-format
- #| msgid " over the past %ld day."
- #| msgid_plural " over the past %ld days."
- msgid " over the past year."
- msgid_plural " over the past %d years."
- msgstr[0] "過去%ld日に。"
- 
- #: g10/tofu.c:1752
- #, fuzzy
- #| msgid " over the past %ld day."
- #| msgid_plural " over the past %ld days."
- msgid " in the past."
- msgstr "過去%ld日に。"
++#: g10/tofu.c:1831
+ #, c-format
+ msgid "Verified %d message in the future."
+ msgid_plural "Verified %d messages in the future."
+ msgstr[0] "%d個のメッセージが未来に検証されました。"
+ 
++#: g10/tofu.c:1835
+ #, c-format
+ msgid "Encrypted %d message in the future."
+ msgid_plural "Encrypted %d messages in the future."
+ msgstr[0] "%d個のメッセージが未来に暗号化されました。"
+ 
++#: g10/tofu.c:1849
+ #, c-format
+ msgid "Messages verified over the past %d day: %d."
+ msgid_plural "Messages verified over the past %d days: %d."
+ msgstr[0] "過去%d日間に検証されたメッセージの数: %d."
+ 
++#: g10/tofu.c:1855
+ #, c-format
+ msgid "Messages encrypted over the past %d day: %d."
+ msgid_plural "Messages encrypted over the past %d days: %d."
+ msgstr[0] "過去%d日間に暗号化されたメッセージの数: %d."
+ 
++#: g10/tofu.c:1865
+ #, c-format
+ msgid "Messages verified over the past %d month: %d."
+ msgid_plural "Messages verified over the past %d months: %d."
+ msgstr[0] "過去%d月の間に検証されたメッセージの数: %d."
+ 
++#: g10/tofu.c:1871
+ #, c-format
+ msgid "Messages encrypted over the past %d month: %d."
+ msgid_plural "Messages encrypted over the past %d months: %d."
+ msgstr[0] "過去%d月の間に暗号化されたメッセージの数: %d."
+ 
++#: g10/tofu.c:1881
+ #, c-format
+ msgid "Messages verified over the past %d year: %d."
+ msgid_plural "Messages verified over the past %d years: %d."
+ msgstr[0] "過去%d年間に検証されたメッセージの数: %d."
+ 
++#: g10/tofu.c:1887
+ #, c-format
+ msgid "Messages encrypted over the past %d year: %d."
+ msgid_plural "Messages encrypted over the past %d years: %d."
+ msgstr[0] "過去%d年間に暗号化されたメッセージの数: %d."
+ 
++#: g10/tofu.c:1895
+ #, c-format
+ msgid "Messages verified in the past: %d."
+ msgstr "これまでに検証されたメッセージの数: %d."
+ 
++#: g10/tofu.c:1899
+ #, c-format
+ msgid "Messages encrypted in the past: %d."
+ msgstr "これまでに暗号化されたメッセージの数: %d."
  
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1767
++#: g10/tofu.c:1916
  msgid "TOFU detected a binding conflict"
  msgstr "TOFUはバインディングの衝突を検出しました"
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1809
++#: g10/tofu.c:1958
  msgid "gGaAuUrRbB"
  msgstr "gGaAuUrRbB"
  
- #: g10/tofu.c:1815
++#: g10/tofu.c:1964
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
- "(G)ood-良, (A)ccept once-一度だけ良, (U)nknown-不明, (R)eject once-一度だけ"
- "否, (B)ad-ダメ? "
+ "(G)ood-良, (A)ccept once-一度だけ認める, (U)nknown-不明, (R)eject once-一度だ"
+ "け否, (B)ad-ダメ? "
  
- #: g10/tofu.c:1823
++#: g10/tofu.c:1972
  msgid "Defaulting to unknown."
- msgstr ""
+ msgstr "不明がデフォルトです。"
  
- #: g10/tofu.c:1938 g10/tofu.c:2074
++#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
- msgstr ""
+ msgstr "TOFU dbが壊れていることが検出されました。\n"
  
- #: g10/tofu.c:1994
- #, fuzzy, c-format
- #| msgid "error writing key: %s\n"
++#: g10/tofu.c:2143
+ #, c-format
  msgid "resetting keydb: %s\n"
- msgstr "鍵の書き込みエラー: %s\n"
+ msgstr "keydbをリセット: %s\n"
  
- #: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
- #: g10/tofu.c:2425
++#: g10/tofu.c:2601
  #, c-format
- msgid "error setting TOFU binding's trust level to %s\n"
- msgstr "TOFUデータベースの信用レベルの設定エラー: %s\n"
+ msgid "error setting TOFU binding's policy to %s\n"
+ msgstr "TOFUバインディングのポリシーを %s に設定エラー\n"
  
- #: g10/tofu.c:2473
++#: g10/tofu.c:2794
  #, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "TOFUポリシーの作成エラー: %s\n"
  
- #. TRANSLATORS: The tilde ('~') is used here to indicate a
- #. * non-breakable space
- #: g10/tofu.c:2574
++#: g10/tofu.c:2839
  #, c-format
- msgid "%d~year"
- msgid_plural "%d~years"
- msgstr[0] "%d~年"
+ msgid "%lld~year"
+ msgid_plural "%lld~years"
+ msgstr[0] "%lld年"
  
- #: g10/tofu.c:2583
++#: g10/tofu.c:2844
  #, c-format
- msgid "%d~month"
- msgid_plural "%d~months"
- msgstr[0] "%d~月"
+ msgid "%lld~month"
+ msgid_plural "%lld~months"
+ msgstr[0] "%lld月"
  
- #: g10/tofu.c:2592
++#: g10/tofu.c:2849
  #, c-format
- msgid "%d~day"
- msgid_plural "%d~days"
- msgstr[0] "%d~月"
+ msgid "%lld~week"
+ msgid_plural "%lld~weeks"
+ msgstr[0] "%lld週"
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2854
  #, c-format
- msgid "%d~hour"
- msgid_plural "%d~hours"
- msgstr[0] "%d~時間"
+ msgid "%lld~day"
+ msgid_plural "%lld~days"
+ msgstr[0] "%lld日"
  
- #: g10/tofu.c:2610
++#: g10/tofu.c:2859
  #, c-format
- msgid "%d~minute"
- msgid_plural "%d~minutes"
- msgstr[0] "%d~分"
+ msgid "%lld~hour"
+ msgid_plural "%lld~hours"
+ msgstr[0] "%lld時間"
  
- #: g10/tofu.c:2619
++#: g10/tofu.c:2864
  #, c-format
- msgid "%d~second"
- msgid_plural "%d~seconds"
- msgstr[0] "%d~秒"
+ msgid "%lld~minute"
+ msgid_plural "%lld~minutes"
+ msgstr[0] "%lld分"
  
- #: g10/tofu.c:2802
++#: g10/tofu.c:2866
  #, c-format
- msgid "%s: "
- msgstr ""
+ msgid "%lld~second"
+ msgid_plural "%lld~seconds"
+ msgstr[0] "%lld秒"
  
- #: g10/tofu.c:2806
- #, fuzzy, c-format
- #| msgid "Deleted %d signatures.\n"
- msgid "Verified %ld signatures"
- msgstr "%d個の署名を削除しました。\n"
- 
- #: g10/tofu.c:2816
- #, fuzzy, c-format
- #| msgid ""
- #| "Verified %ld message signed by \"%s\"\n"
- #| "in the past %s."
- #| msgid_plural ""
- #| "Verified %ld messages signed by \"%s\"\n"
- #| "in the past %s."
- msgid "Verified %ld signature in the past %s"
- msgid_plural "Verified %ld signatures in the past %s"
- msgstr[0] "メッセージを%ld回検証しました(\"%s\"で署名されたもの。かつて %s)。"
- 
- #: g10/tofu.c:2826
- #, fuzzy, c-format
- #| msgid "encrypted with %lu passphrases\n"
- msgid ", and encrypted %ld messages"
- msgstr "%lu 個のパスフレーズで暗号化\n"
++#: g10/tofu.c:3103
+ #, c-format
+ msgid "%s: Verified 0~signatures and encrypted 0~messages."
+ msgstr "%s: 0個の署名を検証、0個のメッセージを暗号化しました。"
+ 
++#: g10/tofu.c:3109
+ #, c-format
+ msgid "%s: Verified 0 signatures."
+ msgstr "%s: 0個の署名を検証しました。"
+ 
++#: g10/tofu.c:3117
+ #, c-format
+ msgid "%s: Verified %ld~signature in the past %s."
+ msgid_plural "%s: Verified %ld~signatures in the past %s."
+ msgstr[0] "%s: 署名を%ld個検証しました(これまで %s に)。"
+ 
++#: g10/tofu.c:3127
+ msgid "Encrypted 0 messages."
+ msgstr "0 個のメッセージを暗号化しました。"
+ 
++#: g10/tofu.c:3135
+ #, c-format
+ msgid "Encrypted %ld~message in the past %s."
+ msgid_plural "Encrypted %ld~messages in the past %s."
+ msgstr[0] "メッセージを%ld個暗号化しました(これまで %s に)。"
+ 
++#: g10/tofu.c:3146
+ #, c-format
+ msgid "(policy: %s)"
+ msgstr "(ポリシー: %s)"
  
- #: g10/tofu.c:2835
- #, fuzzy, c-format
- #| msgid ""
- #| "Verified %ld message signed by \"%s\"\n"
- #| "in the past %s."
- #| msgid_plural ""
- #| "Verified %ld messages signed by \"%s\"\n"
- #| "in the past %s."
- msgid ", and encrypted %ld message in the past %s"
- msgid_plural ", and encrypted %ld messages in the past %s"
- msgstr[0] "メッセージを%ld回検証しました(\"%s\"で署名されたもの。かつて %s)。"
- 
- #: g10/tofu.c:2880
- #, fuzzy
- #| msgid "Warning: we've have yet to see a message signed by this key!\n"
++#: g10/tofu.c:3177
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
- msgstr "警告: この鍵で署名されたメッセージを検証したことはありません!\n"
+ msgstr "警告: この鍵とユーザIDで署名されたメッセージは一度も見てません!\n"
  
- #: g10/tofu.c:2883
- #, fuzzy
- #| msgid "Warning: we've only seen a single message signed by this key!\n"
++#: g10/tofu.c:3180
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
- msgstr ""
- "警告: この鍵で署名されたメッセージを検証したことは一度しかありません!\n"
+ msgstr "警告: この鍵とユーザIDで署名されたメッセージは一度しか見てません!\n"
  
- #: g10/tofu.c:2887
- #, fuzzy
- #| msgid "Warning: we've have yet to see a message signed by this key!\n"
++#: g10/tofu.c:3184
  msgid "Warning: you have yet to encrypt a message to this key!\n"
- msgstr "警告: この鍵で署名されたメッセージを検証したことはありません!\n"
+ msgstr "警告: この鍵へは一つもメッセージを暗号化したことがありません!\n"
  
- #: g10/tofu.c:2890
- #, fuzzy
- #| msgid "Warning: we've only seen a single message signed by this key!\n"
++#: g10/tofu.c:3187
  msgid "Warning: you have only encrypted one message to this key!\n"
- msgstr ""
- "警告: この鍵で署名されたメッセージを検証したことは一度しかありません!\n"
- 
- #: g10/tofu.c:2919
- #, fuzzy, c-format
- #| msgid ""
- #| "Warning: if you think you've seen more than %ld message signed by this "
- #| "key, then this key might be a forgery!  Carefully examine the email "
- #| "address for small variations.  If the key is suspect, then use\n"
- #| "  %s\n"
- #| "to mark it as being bad.\n"
- #| msgid_plural ""
- #| "Warning: if you think you've seen more than %ld messages signed by this "
- #| "key, then this key might be a forgery!  Carefully examine the email "
- #| "address for small variations.  If the key is suspect, then use\n"
- #| "  %s\n"
- #| "to mark it as being bad.\n"
+ msgstr "警告: この鍵へは一つのメッセージしか暗号化したことがありません!\n"
+ 
++#: g10/tofu.c:3216
+ #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
  "then this key might be a forgery!  Carefully examine the email address for "
@@@ -7096,24 -5530,19 +7042,24 @@@ msgstr[0] "
  "  %s\n"
  "でダメとマークしてください。\n"
  
- #: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
- #: g10/tofu.c:3480 g10/tofu.c:3572
++#: g10/tofu.c:3298 g10/tofu.c:3449 g10/tofu.c:3627 g10/tofu.c:3670
++#: g10/tofu.c:3784 g10/tofu.c:3859 g10/tofu.c:3894
  #, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "TOFUデータベースのオープンでエラー: %s\n"
  
- #: g10/tofu.c:3185
++#: g10/tofu.c:3482
  #, c-format
- msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
  msgstr ""
+ "*警告*: %s に暗号化します。失効していないユーザIDが一つもないものです。\n"
  
- #: g10/tofu.c:3515
- #, fuzzy, c-format
- #| msgid "error writing public keyring '%s': %s\n"
++#: g10/tofu.c:3819
+ #, c-format
  msgid "error setting policy for key %s, user id \"%s\": %s"
- msgstr "公開鍵リング'%s'の書き込みエラー: %s\n"
+ msgstr "鍵%s, ユーザID \"%s\"のポリシーの設定エラー: %s"
  
 +#: g10/trustdb.c:216
  #, c-format
  msgid "'%s' is not a valid long keyID\n"
  msgstr "'%s'は、有効な大型鍵IDでありません\n"
@@@ -7138,94 -5563,75 +7084,94 @@@ msgstr "鍵%s: 信用される鍵の公
  msgid "key %s marked as ultimately trusted\n"
  msgstr "鍵%sを究極的に信用するよう記録しました\n"
  
- #: g10/trustdb.c:341
++#: g10/trustdb.c:348
  #, c-format
  msgid "trust record %lu, req type %d: read failed: %s\n"
  msgstr "信用レコード%lu, リクエスト型%d: 読み込みに失敗しました: %s\n"
  
- #: g10/trustdb.c:347
++#: g10/trustdb.c:354
  #, c-format
  msgid "trust record %lu is not of requested type %d\n"
  msgstr "信用レコード%luが要求された型%dではありません\n"
  
- #: g10/trustdb.c:422
++#: g10/trustdb.c:429
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr "trustdbを下記のコマンドで再生成することを試すことができます:\n"
  
- #: g10/trustdb.c:431
++#: g10/trustdb.c:438
  msgid "If that does not work, please consult the manual\n"
  msgstr "もし、それがうまくいかなかったら、マニュアルをご覧ください\n"
  
- #: g10/trustdb.c:468
++#: g10/trustdb.c:475
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr "不明の信用モデル (%d) は使えません - %s信用モデルを仮定\n"
  
- #: g10/trustdb.c:474
++#: g10/trustdb.c:481
  #, c-format
  msgid "using %s trust model\n"
  msgstr "%s信用モデルを使用\n"
  
- #: g10/trustdb.c:511
++#: g10/trustdb.c:518
  msgid "no need for a trustdb check\n"
  msgstr "信用データベースの検査は、不要です\n"
  
- #: g10/trustdb.c:517 g10/trustdb.c:2160
++#: g10/trustdb.c:524 g10/trustdb.c:2187
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "次回の信用データベース検査は、%sです\n"
  
- #: g10/trustdb.c:526
++#: g10/trustdb.c:533
  #, c-format
  msgid "no need for a trustdb check with '%s' trust model\n"
  msgstr "信用モデル'%s'で信用データベースの検査は、不要です\n"
  
- #: g10/trustdb.c:542
++#: g10/trustdb.c:549
  #, c-format
  msgid "no need for a trustdb update with '%s' trust model\n"
  msgstr "信用モデル'%s'で信用データベースの更新は、不要です\n"
  
- #: g10/trustdb.c:749 g10/trustdb.c:1313
++#: g10/trustdb.c:756 g10/trustdb.c:1340
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "公開鍵%sが見つかりません: %s\n"
  
- #: g10/trustdb.c:966
++#: g10/trustdb.c:973
  msgid "please do a --check-trustdb\n"
  msgstr "--check-trustdbを実行してください\n"
  
- #: g10/trustdb.c:971
++#: g10/trustdb.c:978
  msgid "checking the trustdb\n"
  msgstr "信用データベースの検査\n"
  
- #: g10/trustdb.c:1883
++#: g10/trustdb.c:1910
  #, c-format
  msgid "%d key processed"
  msgid_plural "%d keys processed"
  msgstr[0] "%d個の鍵を処理"
  
- #: g10/trustdb.c:1886
++#: g10/trustdb.c:1913
  #, c-format
  msgid " (%d validity count cleared)\n"
  msgid_plural " (%d validity counts cleared)\n"
  msgstr[0] " (うち%d本の有効性数をクリア)\n"
  
- #: g10/trustdb.c:1956
++#: g10/trustdb.c:1983
  msgid "no ultimately trusted keys found\n"
  msgstr "究極的に信用する鍵が見つかりません\n"
  
- #: g10/trustdb.c:1970
++#: g10/trustdb.c:1997
  #, c-format
  msgid "public key of ultimately trusted key %s not found\n"
  msgstr "究極的に信用する鍵%sの公開鍵が見つかりません\n"
  
- #: g10/trustdb.c:2087
++#: g10/trustdb.c:2114
  #, 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:2167
++#: g10/trustdb.c:2194
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr ""
@@@ -7336,19 -5721,14 +7282,19 @@@ msgstr "
  "形式:  kbxutil [オプション] [ファイル]\n"
  "Keyboxデータを一覧、エクスポート、インポート\n"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3208
++#: scd/app-nks.c:718 scd/app-openpgp.c:3221
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr "RSAのモジュラスがないか、%dビットのものではありません\n"
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3220
++#: scd/app-nks.c:726 scd/app-openpgp.c:3233
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr "RSA公開指数がないか %d ビットより大きすぎます\n"
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
- #: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
- #: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1965 scd/app-openpgp.c:1984
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2166 scd/app-openpgp.c:2430
++#: scd/app-openpgp.c:2477 scd/app-openpgp.c:2582 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "PINコールバックがエラーを返しました: %s\n"
@@@ -7395,85 -5766,65 +7341,83 @@@ msgid "
  msgstr ""
  "|P|認定署名の鍵のために新しいPINブロック解除コード(PUK)を入力してください。"
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2511 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "新しいPINの取得エラー: %s\n"
  
- #: scd/app-openpgp.c:806
++#: scd/app-openpgp.c:801
  #, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "指紋の保管に失敗しました: %s\n"
  
- #: scd/app-openpgp.c:819
++#: scd/app-openpgp.c:814
  #, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "生成日の保管に失敗しました: %s\n"
  
- #: scd/app-openpgp.c:1236
++#: scd/app-openpgp.c:1247
  msgid "response does not contain the RSA modulus\n"
  msgstr "応答にRSAのモジュラスが含まれていません\n"
  
- #: scd/app-openpgp.c:1243
++#: scd/app-openpgp.c:1254
  msgid "response does not contain the RSA public exponent\n"
  msgstr "応答にRSA公開指数が含まれていません\n"
  
- #: scd/app-openpgp.c:1353
- #, fuzzy
- #| msgid "response does not contain the EC public point\n"
++#: scd/app-openpgp.c:1364
  msgid "response does not contain the EC public key\n"
- msgstr "応答に楕円曲線の公開点が含まれていません\n"
+ msgstr "応答に楕円曲線の公開鍵が含まれていません\n"
  
- #: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:1464 scd/app-openpgp.c:3825
  msgid "response does not contain the public key data\n"
  msgstr "応答に公開鍵データが含まれていません\n"
  
- #: scd/app-openpgp.c:1551
++#: scd/app-openpgp.c:1564
  #, c-format
  msgid "reading public key failed: %s\n"
  msgstr "公開鍵の読み込みに失敗しました: %s\n"
  
- #: scd/app-openpgp.c:1903
++#: scd/app-openpgp.c:1916
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr "デフォルトPINを%sとして使います\n"
  
- #: scd/app-openpgp.c:1910
++#: scd/app-openpgp.c:1923
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  "デフォルトのPIN %s を使うのに失敗しました: %s - これ以上デフォルトとしての使"
  "用を無効とします\n"
  
- #: scd/app-openpgp.c:1925
++#: scd/app-openpgp.c:1938
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr "||PINを入力してください%%0A[署名数: %lu]"
  
- #: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
++#: scd/app-openpgp.c:1949 scd/app-openpgp.c:2424
  msgid "||Please enter the PIN"
  msgstr "||PINを入力してください"
  
- #: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2173 scd/app-openpgp.c:2437
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr "CHV%dのPINが短すぎます。最短で%dです\n"
  
- #: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
- #: scd/app-openpgp.c:4114
++#: scd/app-openpgp.c:2004 scd/app-openpgp.c:2043 scd/app-openpgp.c:2185
++#: scd/app-openpgp.c:4126
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "CHV%dの認証に失敗しました: %s\n"
  
- #: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
++#: scd/app-openpgp.c:2072 scd/app-openpgp.c:2458 scd/app-openpgp.c:4556
  msgid "error retrieving CHV status from card\n"
  msgstr "カードからCHVステイタスの取得でエラー\n"
  
- #: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
++#: scd/app-openpgp.c:2078 scd/app-openpgp.c:4565
  msgid "card is permanently locked!\n"
  msgstr "カードが永久にロックされてます!\n"
  
- #: scd/app-openpgp.c:2072
++#: scd/app-openpgp.c:2085
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7482,24 -5833,19 +7426,24 @@@ msgstr[0] "カードの永久ロック�
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:2082
++#: scd/app-openpgp.c:2095
  #, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "|A|管理者PINを入力してください%%0A[残り回数: %d]"
  
- #: scd/app-openpgp.c:2086
++#: scd/app-openpgp.c:2099
  msgid "|A|Please enter the Admin PIN"
  msgstr "|A|管理者PINを入力してください"
  
- #: scd/app-openpgp.c:2107
++#: scd/app-openpgp.c:2120
  msgid "access to admin commands is not configured\n"
  msgstr "管理コマンドへのアクセスが設定されていません\n"
  
- #: scd/app-openpgp.c:2460
++#: scd/app-openpgp.c:2473
  msgid "||Please enter the Reset Code for the card"
  msgstr "||カードのリセット・コードを入力してください"
  
- #: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
++#: scd/app-openpgp.c:2483 scd/app-openpgp.c:2537
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr "リセット・コードが短すぎます。最短の長さは%dです。\n"
@@@ -7507,106 -5853,82 +7451,106 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2493
++#: scd/app-openpgp.c:2506
  msgid "|RN|New Reset Code"
  msgstr "|RN|新しいリセット・コード"
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|AN|New Admin PIN"
  msgstr "|AN|新しい管理者PIN"
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|N|New PIN"
  msgstr "|N|新しいPIN"
  
- #: scd/app-openpgp.c:2565
++#: scd/app-openpgp.c:2578
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "||管理者PINと新しい管理者PINを入力してください"
  
- #: scd/app-openpgp.c:2566
++#: scd/app-openpgp.c:2579
  msgid "||Please enter the PIN and New PIN"
  msgstr "||PINと新しいPINを入力してください"
  
- #: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
++#: scd/app-openpgp.c:2635 scd/app-openpgp.c:3885
  msgid "error reading application data\n"
  msgstr "アプリケーション・データの読み込みエラー\n"
  
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
++#: scd/app-openpgp.c:2641 scd/app-openpgp.c:3892
  msgid "error reading fingerprint DO\n"
  msgstr "フィンガープリントのデータ・オブジェクトの読み込みエラー\n"
  
- #: scd/app-openpgp.c:2638
++#: scd/app-openpgp.c:2651
  msgid "key already exists\n"
  msgstr "鍵はもうあります\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2655
  msgid "existing key will be replaced\n"
  msgstr "既存の鍵は置き換えられます\n"
  
- #: scd/app-openpgp.c:2644
++#: scd/app-openpgp.c:2657
  msgid "generating new key\n"
  msgstr "新しい鍵を生成\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2659
  msgid "writing new key\n"
  msgstr "新しい鍵を書き込み\n"
  
- #: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
++#: scd/app-openpgp.c:3201 scd/app-openpgp.c:3553
  msgid "creation timestamp missing\n"
  msgstr "作成時刻スタンプがありません\n"
  
- #: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
++#: scd/app-openpgp.c:3243 scd/app-openpgp.c:3251
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr "RSA素数 %s がありません、または%dビットのものではありません\n"
  
- #: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
++#: scd/app-openpgp.c:3384 scd/app-openpgp.c:3647
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "鍵の保管に失敗しました: %s\n"
  
- #: scd/app-openpgp.c:3534
++#: scd/app-openpgp.c:3547
  msgid "unsupported curve\n"
  msgstr "サポートされていない曲線\n"
  
- #: scd/app-openpgp.c:3790
++#: scd/app-openpgp.c:3802
  msgid "please wait while key is being generated ...\n"
  msgstr "鍵生成の間、お待ちください ...\n"
  
- #: scd/app-openpgp.c:3798
++#: scd/app-openpgp.c:3810
  msgid "generating key failed\n"
  msgstr "鍵の生成に失敗しました\n"
  
- #: scd/app-openpgp.c:3804
++#: scd/app-openpgp.c:3816
  #, c-format
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
  msgstr[0] "鍵の生成が完了しました (%d秒)\n"
  
- #: scd/app-openpgp.c:3838
++#: scd/app-openpgp.c:3850
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "OpenPGPカードに無効な構造 (データ・オブジェクト 0x93)\n"
  
- #: scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:3900
  msgid "fingerprint on card does not match requested one\n"
  msgstr "カードのフィンガープリントが要求されたものと一致しません\n"
  
- #: scd/app-openpgp.c:4004
++#: scd/app-openpgp.c:4016
  #, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "カードはダイジェスト・アルゴリズム %s をサポートしていません\n"
  
- #: scd/app-openpgp.c:4089
++#: scd/app-openpgp.c:4101
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "これまでに作成された署名: %lu\n"
  
- #: scd/app-openpgp.c:4551
++#: scd/app-openpgp.c:4570
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr "管理者PINの確認はこのコマンドでは今のところ禁止されています\n"
  
- #: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
++#: scd/app-openpgp.c:4871 scd/app-openpgp.c:4882
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "%sにアクセスできません - 無効なOpenPGPカード?\n"
@@@ -7626,7 -5945,6 +7570,7 @@@ msgstr "|N|初期の新しいPIN
  msgid "run in multi server mode (foreground)"
  msgstr "マルチ・サーバ・モード(フォアグラウンド)で実行"
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|LEVEL|デバッグ・レベルをLEVELとします"
  
@@@ -7666,11 -5975,9 +7610,11 @@@ msgstr "管理カード・コマンド�
  msgid "use variable length input for pinpad"
  msgstr "ピンパッドの可変長入力を使う"
  
- #: scd/scdaemon.c:287
++#: scd/scdaemon.c:286
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "使い方: @SCDAEMON@ [オプション] (ヘルプは -h)"
  
- #: scd/scdaemon.c:289
++#: scd/scdaemon.c:288
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
@@@ -7678,18 -5985,15 +7622,18 @@@ msgstr "
  "形式: scdaemon [オプション] [コマンド [引数]]\n"
  "@GNUPG@のSmartcardデーモン\n"
  
- #: scd/scdaemon.c:786
++#: scd/scdaemon.c:784
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  "'--daemon'オプションを使って、プログラムをバックグラウンドで実行してくださ"
  "い\n"
  
- #: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1904
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "fd %dのハンドラが開始されました\n"
  
- #: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
++#: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1909
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "fd %dのハンドラが終了しました\n"
@@@ -7765,9 -6053,6 +7709,9 @@@ msgstr "マッチする証明書の数
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "dirmngrのキャッシュだけの鍵探索に失敗しました: %s\n"
  
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
 +#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  msgid "failed to allocate keyDB handle\n"
  msgstr "keyDBハンドルの確保に失敗しました\n"
  
@@@ -8240,11 -6423,9 +8184,11 @@@ msgstr "準備ができました。今�
  msgid "resource problem: out of core\n"
  msgstr "リソースの問題: メモリがありません\n"
  
- #: sm/decrypt.c:330
++#: sm/decrypt.c:332
  msgid "(this is the RC2 algorithm)\n"
  msgstr "(RC2アルゴリズムです)\n"
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:334
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr "(暗号化されたメッセージではないようです)\n"
  
@@@ -8285,115 -6458,87 +8229,115 @@@ msgstr "外部鍵を一覧する
  msgid "list certificate chain"
  msgstr "証明書のチェインを表示する"
  
- #: sm/gpgsm.c:218
++#: sm/gpgsm.c:219
  msgid "import certificates"
  msgstr "証明書をインポートする"
  
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
  msgid "export certificates"
  msgstr "証明書をエクスポートする"
  
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:228
  msgid "register a smartcard"
  msgstr "スマートカードを登録する"
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:231
  msgid "pass a command to the dirmngr"
  msgstr "dirmngrにコマンドを渡す"
  
- #: sm/gpgsm.c:232
++#: sm/gpgsm.c:233
  msgid "invoke gpg-protect-tool"
  msgstr "gpg-protect-toolを起動する"
  
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:250
  msgid "create base-64 encoded output"
  msgstr "base-64形式の出力を作成"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in PEM format"
  msgstr "PEMフォーマットの入力を仮定する"
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in base-64 format"
  msgstr "base-64フォーマットの入力を仮定する"
  
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:262
  msgid "assume input is in binary format"
  msgstr "バイナリ・フォーマットの入力を仮定する"
  
- #: sm/gpgsm.c:267
++#: sm/gpgsm.c:269
  msgid "never consult a CRL"
  msgstr "決してCRLを調べない"
  
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:279
  msgid "check validity using OCSP"
  msgstr "OCSPを用いて有効性を確認する"
  
- #: sm/gpgsm.c:282
++#: sm/gpgsm.c:284
  msgid "|N|number of certificates to include"
  msgstr "|N|インクルードする証明書の数"
  
- #: sm/gpgsm.c:285
++#: sm/gpgsm.c:287
  msgid "|FILE|take policy information from FILE"
  msgstr "|FILE|ポリシー情報をFILEから取得する"
  
- #: sm/gpgsm.c:288
++#: sm/gpgsm.c:290
  msgid "do not check certificate policies"
  msgstr "証明書ポリシーをチェックしない"
  
- #: sm/gpgsm.c:292
++#: sm/gpgsm.c:294
  msgid "fetch missing issuer certificates"
  msgstr "紛失している発行者証明書を取得する"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "don't use the terminal at all"
  msgstr "端末をまったく使わない"
  
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:307
  msgid "|FILE|write a server mode log to FILE"
  msgstr "|FILE|サーバ・モードのログをFILEに書き出す"
  
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:312
  msgid "|FILE|write an audit log to FILE"
  msgstr "|FILE|監査ログをFILEに書き出す"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "batch mode: never ask"
  msgstr "バッチ・モード: なにもユーザに問い合わせない"
  
- #: sm/gpgsm.c:314
++#: sm/gpgsm.c:316
  msgid "assume yes on most questions"
  msgstr "ほとんどの設問にyesを仮定する"
  
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:317
  msgid "assume no on most questions"
  msgstr "ほとんどの設問にnoを仮定する"
  
- #: sm/gpgsm.c:318
++#: sm/gpgsm.c:320
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "|FILE|鍵リングを鍵リングのリストに追加"
  
- #: sm/gpgsm.c:321
++#: sm/gpgsm.c:323
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|USER-ID|USER-IDをデフォルトの秘密鍵として使う"
  
- #: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|SPEC|このキーサーバを鍵の検索に使う"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|NAME|暗号アルゴリズムにNAMEを使用"
  
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:352
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|NAME|ダイジェスト・アルゴリズムにNAMEを使用"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:559
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
  msgstr "使い方: @GPGSM@ [オプション] [ファイル] (ヘルプは -h)"
  
- #: sm/gpgsm.c:570
++#: sm/gpgsm.c:562
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
  "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@@ -8403,46 -6548,37 +8347,46 @@@ msgstr "
  "S/MIMEプロトコルを用いて、署名、検査、暗号化や復号を行います\n"
  "デフォルトの操作は、入力データに依存します\n"
  
- #: sm/gpgsm.c:774
++#: sm/gpgsm.c:766
  #, c-format
  msgid "Note: won't be able to encrypt to '%s': %s\n"
  msgstr "*注意*:'%s'に対して暗号化できません: %s\n"
  
- #: sm/gpgsm.c:785
++#: sm/gpgsm.c:777
  #, c-format
  msgid "unknown validation model '%s'\n"
  msgstr "不明の検証モデル '%s'\n"
  
- #: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
  #, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "%s:%u: ホスト名が指定されていません\n"
  
- #: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr "%s:%u: ユーザなしに与えられたパスワード\n"
  
- #: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
  #, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr "%s:%u: この行はスキップ\n"
  
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1427
  msgid "could not parse keyserver\n"
  msgstr "鍵サーバのURLを解析不能\n"
  
- #: sm/gpgsm.c:1636
++#: sm/gpgsm.c:1630
  #, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "共通証明書のインポート・エラー: %s\n"
  
- #: sm/gpgsm.c:1677
++#: sm/gpgsm.c:1671
  #, c-format
  msgid "can't sign using '%s': %s\n"
  msgstr "'%s'を用いて署名できません: %s\n"
  
- #: sm/gpgsm.c:2033
++#: sm/gpgsm.c:2028
  msgid "invalid command (there is no implicit command)\n"
  msgstr "無効なコマンド (暗黙のコマンドはありません)\n"
  
@@@ -9196,8 -7181,6 +9140,8 @@@ msgstr "\"http\" を \"https\" の代�
  msgid "CRL access not possible due to disabled %s\n"
  msgstr "CRLアクセスは停止された%sのため不可能です\n"
  
 +#: dirmngr/crlfetch.c:223 dirmngr/ldap-wrapper-ce.c:488
- #: dirmngr/ldap-wrapper.c:742 dirmngr/misc.c:563
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:563
  #, c-format
  msgid "error initializing reader object: %s\n"
  msgstr "リーダ・オブジェクトの初期化エラー: %s\n"
@@@ -9367,112 -7314,84 +9311,112 @@@ msgstr "絶対ファイル名がきま�
  msgid "looking up '%s'\n"
  msgstr "'%s'を検索します\n"
  
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:160
  msgid "list the contents of the CRL cache"
  msgstr "CRLキャッシュの内容をリストします"
  
- #: dirmngr/dirmngr.c:158
++#: dirmngr/dirmngr.c:161
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|FILE|FILEからCRLをキャッシュにロードする"
  
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:162
  msgid "|URL|fetch a CRL from URL"
  msgstr "|URL|URLからCRLを取得します"
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:163
  msgid "shutdown the dirmngr"
  msgstr "dirmngrをシャットダウンする"
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:164
  msgid "flush the cache"
  msgstr "キャッシュをフラッシュします"
  
- #: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
- #: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
++#: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|FILE|FILEにサーバ・モードのログを書き出す"
  
- #: dirmngr/dirmngr.c:177
++#: dirmngr/dirmngr.c:180
  msgid "run without asking a user"
  msgstr "ユーザに問い合わせせずに実行"
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:181
  msgid "force loading of outdated CRLs"
  msgstr "期日の過ぎたCRLのロードを強制する"
  
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:182
  msgid "allow sending OCSP requests"
  msgstr "OCSP要求の送信を認める"
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:184
  msgid "allow online software version check"
- msgstr ""
+ msgstr "オンラインのソフトウェア・バージョン・チェックを許す"
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:185
  msgid "inhibit the use of HTTP"
  msgstr "HTTPの使用を禁止する"
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:186
  msgid "inhibit the use of LDAP"
  msgstr "LDAPの使用を禁止する"
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:188
  msgid "ignore HTTP CRL distribution points"
  msgstr "HTTP CRL配布ポイントを無視する"
  
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
  msgid "ignore LDAP CRL distribution points"
  msgstr "LDAP CRL配布ポイントを無視する"
  
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:192
  msgid "ignore certificate contained OCSP service URLs"
  msgstr "OCSPサービスURLに入っている証明書を無視する"
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr "|URL|すべてのHTTPリクエストをURLにリダイレクトする"
  
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
  msgid "|HOST|use HOST for LDAP queries"
  msgstr "|HOST|LDAPの問い合わせにHOSTを使う"
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr "--ldap-proxy にフォールバック・ホストを使わない"
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:202
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FILE|FILEからLDAPサーバリストを読み込みます"
  
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr "CRL配布ポイントに発見された新しいサーバを serverlist に追加する"
  
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr "|N|LDAPのタイムアウトをN秒とする"
  
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:210
  msgid "|URL|use OCSP responder at URL"
  msgstr "|URL|OCSP応答としてURLを使用"
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:212
  msgid "|FPR|OCSP response signed by FPR"
  msgstr "|FPR|FPRで署名されたOCSPレスポンス"
  
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:218
  msgid "|N|do not return more than N items in one query"
  msgstr "|N|一つのクエリでNを越えるのアイテムを返さない"
  
- #: dirmngr/dirmngr.c:220
++#: dirmngr/dirmngr.c:223
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr "|FILE|FILEにあるCA証明書をTLSでのHKPに使う"
  
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:225
  msgid "route all network traffic via Tor"
  msgstr "ネットワーク・トラフィックをすべてTor経由にする"
  
- #: dirmngr/dirmngr.c:240
++#: dirmngr/dirmngr.c:246
  msgid ""
  "@\n"
  "(See the \"info\" manual for a complete listing of all commands and "
@@@ -9481,11 -7400,9 +9425,11 @@@ msgstr "
  "@\n"
  "(コマンドとオプション全部の一覧は、\"info\" マニュアルをご覧ください)\n"
  
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:361
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "使い方: @DIRMNGR@ [オプション] (ヘルプは -h)"
  
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:363
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9493,77 -7410,60 +9437,77 @@@ msgstr "
  "形式: @DIRMNGR@ [オプション] [コマンド [引数]]\n"
  "@GnuPG@の鍵サーバ、CRLとOCSPアクセス\n"
  
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:443
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr "有効なdebugレベルは: %s\n"
  
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
- #: tools/gpgconf.c:648
++#: dirmngr/dirmngr.c:496 tools/gpgconf.c:550 tools/gpgconf.c:585
++#: tools/gpgconf.c:656
  #, c-format
  msgid "usage: %s [options] "
  msgstr "使い方: %s [オプション] "
  
- #: dirmngr/dirmngr.c:1062
++#: dirmngr/dirmngr.c:1074
  msgid "colons are not allowed in the socket name\n"
  msgstr "コロンはソケット名に許されません\n"
  
- #: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
++#: dirmngr/dirmngr.c:1300 dirmngr/server.c:1585
  #, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "'%s'からCRLの取得の失敗: %s\n"
  
- #: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
++#: dirmngr/dirmngr.c:1306 dirmngr/server.c:1591
  #, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "'%s'からCRLの処理に失敗: %s\n"
  
- #: dirmngr/dirmngr.c:1484
++#: dirmngr/dirmngr.c:1487
  #, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "%s:%u: 行が長すぎます - スキップされました\n"
  
- #: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
++#: dirmngr/dirmngr.c:1542 dirmngr/dirmngr.c:1626
  #, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "%s:%u: 無効なフィンガープリントが検出されました\n"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
++#: dirmngr/dirmngr.c:1578 dirmngr/dirmngr.c:1604 tools/gpgconf-comp.c:4032
  #, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "%s:%u: 読み込みエラー: %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1633
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr "%s:%u: 行末のゴミを無視\n"
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1700
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr "SIGHUPを受け取り - 設定を読み直し、キャッシュをフラッシュ\n"
  
- #: dirmngr/dirmngr.c:1734
++#: dirmngr/dirmngr.c:1738
  msgid "SIGUSR2 received - no action defined\n"
  msgstr "SIGUSR2を受け取り - 動作は定義されない\n"
  
- #: dirmngr/dirmngr.c:1739
++#: dirmngr/dirmngr.c:1743
  msgid "SIGTERM received - shutting down ...\n"
  msgstr "SIGTERMを受け取り - シャットダウン...\n"
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1745
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr "SIGTERMを受け取り - %d本のアクティブな接続がまだあります\n"
  
- #: dirmngr/dirmngr.c:1746
++#: dirmngr/dirmngr.c:1750
  msgid "shutdown forced\n"
  msgstr "強制的にシャットダウンする\n"
  
- #: dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1758
  msgid "SIGINT received - immediate shutdown\n"
  msgstr "SIGINTを受け取り - すぐにシャットダウン\n"
  
- #: dirmngr/dirmngr.c:1761
++#: dirmngr/dirmngr.c:1765
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr "シグナル%dを受け取り - アクションは定義されない\n"
@@@ -10026,32 -7827,26 +9970,32 @@@ msgstr "fetch_next_cert が失敗しま
  msgid "max_replies %d exceeded\n"
  msgstr "max_replies %d を越えました\n"
  
- #: dirmngr/server.c:2463
++#: dirmngr/server.c:2469
  #, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "制御構造を確保できません: %s\n"
  
- #: dirmngr/server.c:2474
++#: dirmngr/server.c:2480
  #, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "assuanコンテクストの確保に失敗しました: %s\n"
  
- #: dirmngr/server.c:2495
++#: dirmngr/server.c:2501
  #, c-format
  msgid "failed to initialize the server: %s\n"
  msgstr "サーバの初期化に失敗しました: %s\n"
  
- #: dirmngr/server.c:2503
++#: dirmngr/server.c:2509
  #, c-format
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "Assuanで登録コマンドに失敗しました: %s\n"
  
- #: dirmngr/server.c:2534
++#: dirmngr/server.c:2540
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr "Assuan accept の問題: %s\n"
  
- #: dirmngr/server.c:2553
++#: dirmngr/server.c:2559
  #, c-format
  msgid "Assuan processing failed: %s\n"
  msgstr "Assuanの処理が失敗しました: %s\n"
@@@ -10093,7 -7879,6 +10037,7 @@@ msgstr "DSAは160ビットののハッ�
  msgid "certificate should not have been used for CRL signing\n"
  msgstr "証明書はCRL署名のために使われるべきではありませんでした\n"
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:167
  msgid "quiet"
  msgstr "おとなしく"
  
@@@ -10184,22 -7949,15 +10128,22 @@@ msgstr "行の送信に失敗しまし�
  msgid "error sending standard options: %s\n"
  msgstr "標準オプションを送信エラー: %s\n"
  
 +#: tools/gpgconf-comp.c:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
- #: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
++#: tools/gpgconf-comp.c:766 tools/gpgconf-comp.c:865
  msgid "Options controlling the diagnostic output"
  msgstr "診断出力を制御するオプション"
  
 +#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
- #: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
++#: tools/gpgconf-comp.c:779 tools/gpgconf-comp.c:888
  msgid "Options controlling the configuration"
  msgstr "コンフィグレーションを制御するオプション"
  
- #: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
- #: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
++#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:723
++#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:901
  msgid "Options useful for debugging"
  msgstr "デバッグのために有用なオプション"
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
  msgid "Options controlling the security"
  msgstr "セキュリティを制御するオプション"
  
@@@ -10248,11 -7995,9 +10192,11 @@@ msgstr "古いパスフレーズを再�
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr "|N|PinentryのタイムアウトをN秒とする"
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
++#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
  msgid "|NAME|use NAME as default secret key"
  msgstr "|NAME|デフォルトの秘密鍵としてNAMEを用いる"
  
- #: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
++#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:784
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NAME|ユーザID NAMEにも暗号化する"
  
@@@ -10260,178 -8004,138 +10204,182 @@@
  msgid "|SPEC|set up email aliases"
  msgstr "|SPEC|電子メールエイリアスを設定する"
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
++#: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
  msgid "Configuration for Keyservers"
  msgstr "キーサーバのコンフィグレーション"
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
++#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
  msgid "|URL|use keyserver at URL"
  msgstr "|URL|鍵サーバとしてURLを使用"
  
- #: tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:741
  msgid "allow PKA lookups (DNS requests)"
  msgstr "PKA検索(DNS要求)を認める"
  
- #: tools/gpgconf-comp.c:738
++#: tools/gpgconf-comp.c:744
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr "|MECHANISMS|メールアドレスによって鍵を特定する際、MECHANISMSを使用する"
  
- #: tools/gpgconf-comp.c:787
++#: tools/gpgconf-comp.c:793
  msgid "disable all access to the dirmngr"
  msgstr "dirmngrへのすべてのアクセスを無効とする"
  
- #: tools/gpgconf-comp.c:790
++#: tools/gpgconf-comp.c:796
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
  msgstr "|NAME|PKCS#12のパスフレーズにNAMEのエンコーディングを使う"
  
- #: tools/gpgconf-comp.c:820
++#: tools/gpgconf-comp.c:829
  msgid "do not check CRLs for root certificates"
  msgstr "ルート証明書のCRLをチェックしない"
  
- #: tools/gpgconf-comp.c:869
++#: tools/gpgconf-comp.c:878
  msgid "Options controlling the format of the output"
  msgstr "出力フォーマットを制御するオプション"
  
- #: tools/gpgconf-comp.c:905
++#: tools/gpgconf-comp.c:920
  msgid "Options controlling the interactivity and enforcement"
  msgstr "インタラクティビティと強制を制御するオプション"
  
- #: tools/gpgconf-comp.c:918
++#: tools/gpgconf-comp.c:933
  msgid "Options controlling the use of Tor"
  msgstr "Torの使用を制御するオプション"
  
- #: tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:947
  msgid "Configuration for HTTP servers"
  msgstr "HTTPサーバのコンフィグレーション"
  
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:958
  msgid "use system's HTTP proxy setting"
  msgstr "システムのHTTPプロキシ設定を用います"
  
- #: tools/gpgconf-comp.c:948
++#: tools/gpgconf-comp.c:963
  msgid "Configuration of LDAP servers to use"
  msgstr "使用するLDAPサーバのコンフィグレーション"
  
- #: tools/gpgconf-comp.c:977
++#: tools/gpgconf-comp.c:992
  msgid "LDAP server list"
  msgstr "LDAPサーバ・リスト"
  
- #: tools/gpgconf-comp.c:985
++#: tools/gpgconf-comp.c:1000
  msgid "Configuration for OCSP"
  msgstr "OCSPのコンフィグレーション"
  
- #: tools/gpgconf-comp.c:1066
- #, fuzzy
- #| msgid "GPG for OpenPGP"
++#: tools/gpgconf-comp.c:1081
  msgid "OpenPGP"
- msgstr "OpenPGPのためのGPG"
+ msgstr "OpenPGP"
  
- #: tools/gpgconf-comp.c:1067
++#: tools/gpgconf-comp.c:1082
  msgid "Private Keys"
- msgstr ""
+ msgstr "プライベート鍵"
  
- #: tools/gpgconf-comp.c:1068
- #, fuzzy
- #| msgid "Smartcard Daemon"
++#: tools/gpgconf-comp.c:1083
  msgid "Smartcards"
- msgstr "スマートカード・デーモン"
+ msgstr "スマートカード"
  
- #: tools/gpgconf-comp.c:1069
- #, fuzzy
- #| msgid "GPG for S/MIME"
++#: tools/gpgconf-comp.c:1084
  msgid "S/MIME"
- msgstr "S/MIME のためのGPG"
+ msgstr "S/MIME"
  
- #: tools/gpgconf-comp.c:1070
++#: tools/gpgconf-comp.c:1085
  msgid "Network"
- msgstr ""
+ msgstr "ネットワーク"
  
- #: tools/gpgconf-comp.c:1071
- #, fuzzy
- #| msgid "PIN and Passphrase Entry"
++#: tools/gpgconf-comp.c:1086
  msgid "Passphrase Entry"
- msgstr "PINとパスフレーズの入力"
+ msgstr "パスフレーズ入力"
  
- #: tools/gpgconf-comp.c:1225
++#: tools/gpgconf-comp.c:1240
  msgid "Component not suitable for launching"
  msgstr "コンポーネントが起動するために適切ではありません"
  
- #: tools/gpgconf-comp.c:3283
++#: tools/gpgconf-comp.c:3311
  #, c-format
  msgid "External verification of component %s failed"
  msgstr "コンポーネント%sの外部の検証が失敗しました"
  
- #: tools/gpgconf-comp.c:3434
++#: tools/gpgconf-comp.c:3462
  msgid "Note that group specifications are ignored\n"
  msgstr "グループ仕様は無視されていることに注意してください\n"
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf-comp.c:4036
+ #, c-format
+ msgid "error closing '%s'\n"
+ msgstr "'%s'でクローズのエラー\n"
+ 
++#: tools/gpgconf-comp.c:4038
+ #, c-format
+ msgid "error parsing '%s'\n"
+ msgstr "'%s'でパーズのエラー\n"
+ 
++#: tools/gpgconf.c:73
  msgid "list all components"
  msgstr "すべてのコンポーネントをリストする"
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "check all programs"
  msgstr "すべてのプログラムをチェックする"
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|list options"
  msgstr "|COMPONENT|オプションをリストする"
  
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
  msgid "|COMPONENT|change options"
  msgstr "|COMPONENT|オプションを変更する"
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "|COMPONENT|check options"
  msgstr "|COMPONENT|オプションをチェックする"
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "apply global default values"
  msgstr "グローバル・デフォルト値を適用する"
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
+ msgid "|FILE|update configuration files using FILE"
+ msgstr "|FILE|FILEを使ってコンフィグレーション・ファイルを更新する"
+ 
++#: tools/gpgconf.c:83
  msgid "get the configuration directories for @GPGCONF@"
  msgstr "@GPGCONF@のためにコンフィグレーション・ディレクトリを取得する"
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:85
  msgid "list global configuration file"
  msgstr "グローバルのコンフィグレーション・ファイルをリストする"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  msgid "check global configuration file"
  msgstr "グローバルのコンフィグレーション・ファイルをチェックする"
  
- #: tools/gpgconf.c:85
- #, fuzzy
- #| msgid "update the trust database"
++#: tools/gpgconf.c:89
  msgid "query the software version database"
- msgstr "信用データベースを更新"
+ msgstr "ソフトウェア・バージョン・データベースに問い合わせる"
  
- #: tools/gpgconf.c:86
++#: tools/gpgconf.c:90
  msgid "reload all or a given component"
  msgstr "すべて、あるいは指定されたコンポーネントをリロードする"
  
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:91
  msgid "launch a given component"
  msgstr "指定されたコンポーネントを起動する"
  
- #: tools/gpgconf.c:88
++#: tools/gpgconf.c:92
  msgid "kill a given component"
  msgstr "指定されたコンポーネントをkillする"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "use as output file"
  msgstr "出力ファイルとして使用"
  
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:102
  msgid "activate changes at runtime, if possible"
  msgstr "可能な場合、実行時に変更を有効とする"
  
- #: tools/gpgconf.c:122
++#: tools/gpgconf.c:127
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "使い方: @GPGCONF@ [オプション] (ヘルプは -h)"
  
- #: tools/gpgconf.c:125
++#: tools/gpgconf.c:130
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10439,15 -8143,12 +10387,15 @@@ msgstr "
  "形式: @GPGCONF@ [オプション]\n"
  "@GNUPG@システムのツールに対しコンフィグレーション・オプションを管理する\n"
  
- #: tools/gpgconf.c:545 tools/gpgconf.c:579
++#: tools/gpgconf.c:552 tools/gpgconf.c:587
  msgid "Need one component argument"
  msgstr "一つコンポーネント引数が必要です"
  
- #: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
++#: tools/gpgconf.c:561 tools/gpgconf.c:599 tools/gpgconf.c:632
  msgid "Component not found"
  msgstr "コンポーネントが見つかりません"
  
- #: tools/gpgconf.c:650
++#: tools/gpgconf.c:658
  msgid "No argument allowed"
  msgstr "引数は許可されていません"
  
diff --cc po/nb.po
index 7fe3da5,ba27c10..eaa8d37
--- a/po/nb.po
+++ b/po/nb.po
@@@ -11,7 -11,6 +11,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: GNU gnupg 2.1.14\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-11-18 16:54+0100\n"
++"POT-Creation-Date: 2016-12-20 11:28+0100\n"
  "PO-Revision-Date: 2016-07-15 10:27+0100\n"
  "Last-Translator: Åka Sikrom <a4 æt hush dåt com>\n"
  "Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@@ -158,24 -129,10 +158,24 @@@ msgstr "Ugyldig passordfrase
  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:838 common/dotlock.c:839 g10/card-util.c:839
- #: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1306 g10/keygen.c:4577
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
++#: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
  #, c-format
  msgid "can't create '%s': %s\n"
  msgstr "klarte ikke å lage «%s»: %s\n"
  
 +#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
- #: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1307
++#: g10/import.c:305 g10/import.c:448 g10/import.c:621 g10/keygen.c:3681
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
- #: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
- #: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:825 g10/sign.c:1025
++#: g10/sign.c:1130 g10/sign.c:1275 g10/tdbdump.c:143 g10/tdbdump.c:151
++#: g10/tdbio.c:720 g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161
++#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
++#: dirmngr/certcache.c:368 dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1564
  #, c-format
  msgid "can't open '%s': %s\n"
  msgstr "klarte ikke å åpne «%s»: %s\n"
@@@ -240,11 -186,9 +240,11 @@@ msgstr "
  msgid "failed to create stream from socket: %s\n"
  msgstr "klarte ikke å lage strøm av sokkel: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1100
++#: agent/divert-scd.c:92 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr "Sett inn kort med serienummer"
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1101
++#: agent/divert-scd.c:93 g10/call-agent.c:1102
  msgid "Please remove the current card and insert the one with serial number"
  msgstr "Fjern gjeldende kort og sett inn kort med serienummer"
  
@@@ -376,47 -294,32 +376,47 @@@ msgstr "
  "@Valg:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
  msgid "run in daemon mode (background)"
  msgstr "kjør som bakgrunnsprosess («daemon»)"
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
  msgid "run in server mode (foreground)"
  msgstr "kjør i tjenermodus (forgrunn)"
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
  #, fuzzy
  #| msgid "run in server mode"
  msgid "run in supervised mode"
  msgstr "kjør i tjenermodus"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:170 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "detaljert utskrift"
  
 +#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "være noenlunde stille"
  
- #: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
  msgid "sh-style command output"
  msgstr "sh-utdata for kommandoer"
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
  msgid "csh-style command output"
  msgstr "csh-utdata for kommandoer"
  
- #: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
- #: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
++#: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
  msgid "|FILE|read options from FILE"
  msgstr "|FIL|les valg fra valgt FIL"
  
- #: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:177
  msgid "do not detach from the console"
  msgstr "ikke løsne fra konsoll"
  
@@@ -491,19 -377,12 +491,19 @@@ msgstr "slå på støtte for putty
  #. 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:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:481 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1025 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:358
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:124 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr "Rapporter programfeil til <@EMAIL@>.\n"
  
- #: agent/gpg-agent.c:491
++#: agent/gpg-agent.c:490
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "Bruk: @GPG_AGENT@ [valg] («-h» for hjelp)"
  
- #: agent/gpg-agent.c:493
++#: agent/gpg-agent.c:492
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
@@@ -511,135 -390,100 +511,135 @@@ msgstr "
  "Syntaks: @GPG_AGENT@ [valg] [kommando [arg]]\n"
  "Håndtering av hemmelige nøkler for @GNUPG@\n"
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:537 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:442
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr "«%s» er et ugyldig feilsøkingsnivå\n"
  
- #: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:793
++#: agent/gpg-agent.c:1082 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:812
  #, c-format
  msgid "Note: no default option file '%s'\n"
  msgstr "Merk: standardvalg-fil «%s» finnes ikke\n"
  
- #: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
- #: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1093 agent/gpg-agent.c:1935 g10/gpg.c:2510
++#: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:817
++#: dirmngr/dirmngr.c:1670 tools/symcryptrun.c:932
  #, c-format
  msgid "option file '%s': %s\n"
  msgstr "valgfil «%s»: %s\n"
  
- #: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:806
++#: agent/gpg-agent.c:1101 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:825
  #, c-format
  msgid "reading options from '%s'\n"
  msgstr "leser valg fra «%s»\n"
  
- #: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
- #: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
++#: agent/gpg-agent.c:1223 g10/gpg.c:3643 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:936 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:527
  #, c-format
  msgid "Note: '%s' is not considered an option\n"
  msgstr "Merk: «%s» regnes ikke som et valg\n"
  
- #: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
++#: agent/gpg-agent.c:2080 scd/scdaemon.c:1073 dirmngr/dirmngr.c:1081
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "klarte ikke å lage sokkel: %s\n"
  
- #: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
++#: agent/gpg-agent.c:2097 scd/scdaemon.c:1086 dirmngr/dirmngr.c:1094
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr "sokkelnavnet «%s» er for langt\n"
  
- #: agent/gpg-agent.c:2134
++#: agent/gpg-agent.c:2135
  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:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
++#: agent/gpg-agent.c:2145 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1126
  msgid "error getting nonce for the socket\n"
  msgstr "feil under henting av sokkel-anledning\n"
  
- #: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
++#: agent/gpg-agent.c:2150 scd/scdaemon.c:1113 dirmngr/dirmngr.c:1129
  #, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "feil under knytning av sokkel til «%s»: %s\n"
  
- #: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
- #: dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2160 agent/gpg-agent.c:2197 scd/scdaemon.c:1121
++#: dirmngr/dirmngr.c:1138
  #, c-format
  msgid "can't set permissions of '%s': %s\n"
  msgstr "klarte ikke å endre tillatelser til «%s»: %s\n"
  
- #: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:2165 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1143
  #, c-format
  msgid "listen() failed: %s\n"
  msgstr "listen() mislyktes: %s\n"
  
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
++#: agent/gpg-agent.c:2172 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1149
  #, c-format
  msgid "listening on socket '%s'\n"
  msgstr "lytter på sokkel «%s»\n"
  
- #: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: agent/gpg-agent.c:2191 agent/gpg-agent.c:2234 g10/exec.c:199
 +#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, c-format
  msgid "can't create directory '%s': %s\n"
  msgstr "klarte ikke å lage mappa «%s»: %s\n"
  
- #: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: agent/gpg-agent.c:2194 agent/gpg-agent.c:2239 g10/openfile.c:491
 +#: g10/openfile.c:520 sm/keydb.c:103
  #, c-format
  msgid "directory '%s' created\n"
  msgstr "mappa «%s» er opprettet\n"
  
- #: agent/gpg-agent.c:2244
++#: agent/gpg-agent.c:2245
  #, c-format
  msgid "stat() failed for '%s': %s\n"
  msgstr "stat() mislyktes for «%s»: %s\n"
  
- #: agent/gpg-agent.c:2248
++#: agent/gpg-agent.c:2249
  #, c-format
  msgid "can't use '%s' as home directory\n"
  msgstr "«%s» kan ikke brukes som hjemmemappe\n"
  
- #: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
++#: agent/gpg-agent.c:2392 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1871
  #, 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:2598
++#: agent/gpg-agent.c:2599
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr "startet behandler 0x%lx for fd %d\n"
  
- #: agent/gpg-agent.c:2603
++#: agent/gpg-agent.c:2604
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr "avsluttet behandler 0x%lx for fd %d\n"
  
- #: agent/gpg-agent.c:2678
++#: agent/gpg-agent.c:2679
  #, 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:2683
++#: agent/gpg-agent.c:2684
  #, 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:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
++#: agent/gpg-agent.c:2881 scd/scdaemon.c:1272 dirmngr/dirmngr.c:2075
  #, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "npth_pselect mislyktes: %s - venter 1s\n"
  
- #: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2954 scd/scdaemon.c:1321
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s stoppet\n"
  
- #: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
++#: agent/gpg-agent.c:3092 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  msgid "no gpg-agent running in this session\n"
  msgstr "ingen gpg-agent kjører i gjeldende økt\n"
  
@@@ -655,8 -497,6 +655,8 @@@ msgstr "
  "Syntaks: gpg-preset-passphrase [valg] KEYGRIP\n"
  "Vedlikehold av hurtiglager for passord\n"
  
- #: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
++#: agent/protect-tool.c:106 g10/gpg.c:424 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:153 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -664,9 -504,6 +664,9 @@@ msgstr "
  "@Kommandoer:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
- #: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:92 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:168 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -720,8 -549,6 +720,8 @@@ 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:362 dirmngr/dirmngr.c:1469
- #: tools/gpgconf.c:323
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1472
++#: tools/gpgconf.c:328
  #, c-format
  msgid "error opening '%s': %s\n"
  msgstr "feil under åpning av «%s»: %s\n"
@@@ -894,9 -692,6 +894,9 @@@ msgstr "beskyttelsesalgoritme %d (%s) s
  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:438
 +#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
- #: dirmngr/ldap-wrapper.c:710
++#: dirmngr/ldap-wrapper.c:711
  #, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "feil under opprettelse av datarør: %s\n"
@@@ -908,8 -700,6 +908,8 @@@
  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:848 dirmngr/dirmngr.c:1155
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1167
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "feil under kopiering av prosess: %s\n"
@@@ -955,28 -736,23 +955,28 @@@ msgstr "klarte ikke å koble til «%s»
  msgid "problem setting the gpg-agent options\n"
  msgstr "klarte ikke å sette opp valg for gpg-agent\n"
  
- #: common/sysutils.c:144
++#: common/sysutils.c:148
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "klarte ikke å slå av kjernedump: %s\n"
  
- #: common/sysutils.c:239
++#: common/sysutils.c:250
  #, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "Advarsel: utrygt eierskap til %s «%s»\n"
  
- #: common/sysutils.c:271
++#: common/sysutils.c:282
  #, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "Advarsel: utrygge tillatelser til %s «%s»\n"
  
- #: common/sysutils.c:659
++#: common/sysutils.c:693
  #, fuzzy, c-format
  #| msgid "waiting for the agent to come up ... (%ds)\n"
  msgid "waiting for file '%s' to become accessible ...\n"
  msgstr "venter på at agent skal dukke opp … (%ds)\n"
  
- #: common/sysutils.c:685
++#: common/sysutils.c:719
  #, fuzzy, c-format
  #| msgid "error renaming '%s' to '%s': %s\n"
  msgid "renaming '%s' to '%s' failed: %s\n"
@@@ -1052,7 -813,6 +1052,7 @@@ msgstr "%s:%u: valget «%s» er utgått
  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:554
++#: common/miscellaneous.c:556
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr "unknown debug flag '%s' ignored\n"
@@@ -1156,8 -893,6 +1156,8 @@@ msgstr "Øktnøkkel opprettet
  msgid "algorithm: %s"
  msgstr "algoritme: %s"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3098
++#: scd/app-openpgp.c:3111
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "ustøttet algoritme: %s"
@@@ -1343,7 -1036,6 +1343,7 @@@ msgstr "valget «%.50s» er flertydig\n
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr "kommandoen «%.50s» er flertydig\n"
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1173
++#: common/argparse.c:401 dirmngr/dirmngr.c:1185
  msgid "out of core\n"
  msgstr "kjernen er full\n"
  
@@@ -1401,8 -1082,6 +1401,8 @@@ msgstr "lås «%s» ikke opprettet: %s\
  msgid "waiting for lock %s...\n"
  msgstr "venter på lås %s …\n"
  
- #: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
- #: dirmngr/dirmngr.c:715
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:725
++#: dirmngr/dirmngr.c:734
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr "%s er for gammel (krever %s, har %s)\n"
@@@ -1440,7 -1111,6 +1440,7 @@@ msgstr "uforventet armering: 
  msgid "invalid dash escaped line: "
  msgstr "ugyldig bindestrekbeskyttet linje: "
  
- #: g10/armor.c:873 g10/armor.c:1490
++#: g10/armor.c:873 g10/armor.c:1493
  #, c-format
  msgid "invalid radix64 character %02X skipped\n"
  msgstr "hoppet over ugyldig radix64-tegn %02x\n"
@@@ -1457,7 -1124,6 +1457,7 @@@ msgstr "for tidlig eof (i CRC)\n
  msgid "malformed CRC\n"
  msgstr "feilformatert CRC\n"
  
- #: g10/armor.c:962 g10/armor.c:1527
++#: g10/armor.c:962 g10/armor.c:1530
  #, c-format
  msgid "CRC error; %06lX - %06lX\n"
  msgstr "CRC-feil; %06lX - %06lX\n"
@@@ -1470,16 -1134,13 +1470,16 @@@ msgstr "for tidlig eof (på sluttlinje)
  msgid "error in trailer line\n"
  msgstr "feil på etterfølgende linje\n"
  
- #: g10/armor.c:1303
++#: g10/armor.c:1306
  msgid "no valid OpenPGP data found.\n"
  msgstr "fant ingen gyldig OpenPGP-data.\n"
  
- #: g10/armor.c:1308
++#: g10/armor.c:1311
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
  msgstr "ugyldig armor: linje lengre enn %d tegn\n"
  
- #: g10/armor.c:1312
++#: g10/armor.c:1315
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr ""
@@@ -1557,8 -1203,6 +1557,8 @@@ msgstr "OpenPGP-kort er ikke tilgjengel
  msgid "OpenPGP card no. %s detected\n"
  msgstr "Oppdaget OpenPGP-kortnummer %s\n"
  
- #: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
- #: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2030
++#: g10/keygen.c:4087 g10/revoke.c:215 g10/revoke.c:618
  msgid "can't do this in batch mode\n"
  msgstr "du kan ikke gjøres dette i buntmodus\n"
  
@@@ -1566,14 -1209,9 +1566,14 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "Denne kommandoen er bare tilgjengelig for kort av versjon 2\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2454
++#: g10/card-util.c:109 scd/app-openpgp.c:2467
  msgid "Reset Code not or not anymore available\n"
  msgstr "Tilbakestillingskode er ikke tilgjengelig\n"
  
 +#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
- #: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
- #: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1768
++#: g10/keygen.c:1945 g10/keygen.c:2313 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "Ditt valg? "
  
@@@ -1635,10 -1259,6 +1635,10 @@@ msgstr "Adresse for henting av offentli
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr "Feil: Adressen er for lang (grensa er %d tegn).\n"
  
- #: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
- #: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:334
++#: g10/import.c:592 g10/import.c:640 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
++#: dirmngr/dirmngr.c:1510 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, c-format
  msgid "error reading '%s': %s\n"
  msgstr "feil under lesing av «%s»: %s\n"
@@@ -1704,7 -1309,6 +1704,7 @@@ msgstr "klarte ikke å utføre nøkkelh
  msgid "not an OpenPGP card"
  msgstr "ikke et OpenPGP-kort"
  
- #: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
++#: g10/card-util.c:1173 g10/keygen.c:4106 g10/keygen.c:5092
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr "feil under henting av nøkkelinfo: %s\n"
@@@ -1738,13 -1337,10 +1738,13 @@@ msgstr "Hvor stor skal krypteringsnøkk
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "Hvor stor skal autentiseringsnøkkelen være? (%u) "
  
- #: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
++#: g10/card-util.c:1316 g10/keygen.c:2122 g10/keygen.c:2154
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "rundet opp til %u bit\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2207 sm/certreqgen-ui.c:188
  #, 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"
@@@ -1798,9 -1384,6 +1798,9 @@@ msgstr "   (2) Krypteringsnøkkel\n
  msgid "   (3) Authentication key\n"
  msgstr "   (3) Autentiseringsnøkkel\n"
  
- #: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
- #: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
- #: g10/keygen.c:2314 g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1508
++#: g10/keygen.c:1794 g10/keygen.c:1822 g10/keygen.c:1952 g10/keygen.c:2060
++#: g10/keygen.c:2336 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Ugyldig valg.\n"
  
@@@ -1829,7 -1406,6 +1829,7 @@@ msgstr "Vil du fortsette? (j/N) 
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr "Er du sikker på at du vil gjenopprette fabrikkoppsett? (skriv «ja») "
  
- #: g10/card-util.c:1816 g10/keyedit.c:1867
++#: g10/card-util.c:1816 g10/keyedit.c:1868
  msgid "quit this menu"
  msgstr "gå ut av denne menyen"
  
@@@ -1837,7 -1412,6 +1837,7 @@@
  msgid "show admin commands"
  msgstr "vis admin-kommandoer"
  
- #: g10/card-util.c:1819 g10/keyedit.c:1870
++#: g10/card-util.c:1819 g10/keyedit.c:1871
  msgid "show this help"
  msgstr "vis denne hjelpeteksten"
  
@@@ -1913,30 -1469,20 +1913,30 @@@ msgstr "Admin-kommandoer er tillatt\n
  msgid "Admin commands are not allowed\n"
  msgstr "Admin-kommandoer er ikke tillatt\n"
  
- #: g10/card-util.c:2127 g10/keyedit.c:2816
++#: g10/card-util.c:2127 g10/keyedit.c:2817
  msgid "Invalid command  (try \"help\")\n"
  msgstr "Ugyldig kommando  (prøv «help»)\n"
  
- #: g10/decrypt.c:191 g10/encrypt.c:955
++#: g10/decrypt.c:190 g10/encrypt.c:955
  msgid "--output doesn't work for this command\n"
  msgstr "«--output» virker ikke med denne kommandoen\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4904 g10/keyring.c:398 g10/keyring.c:771
  #, c-format
  msgid "can't open '%s'\n"
  msgstr "klarte ikke å åpne «%s»\n"
  
 +#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
- #: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
- #: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4858 g10/keyedit.c:2051
++#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2163
  #, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "fant ikke nøkkelen «%s»: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
- #: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
- #: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4866 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:645 g10/tofu.c:2171
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "feil under lesing av nøkkelblokk: %s\n"
@@@ -1994,7 -1528,6 +1994,7 @@@ msgstr "det finnes en hemmelig nøkkel 
  msgid "use option \"--delete-secret-keys\" to delete it first.\n"
  msgstr "bruk valget «--delete-secret-keys» for å slette den først.\n"
  
- #: g10/encrypt.c:232 g10/sign.c:1292
++#: g10/encrypt.c:232 g10/sign.c:1294
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "feil under opprettelse av passordfrase: %s\n"
@@@ -2013,7 -1543,6 +2013,7 @@@ msgstr "bruker krypteringsmetode %s\n
  msgid "'%s' already compressed\n"
  msgstr "«%s» er allerede komprimert\n"
  
- #: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:610
  #, c-format
  msgid "WARNING: '%s' is an empty file\n"
  msgstr "ADVARSEL: «%s» er en tom fil\n"
@@@ -2031,7 -1558,6 +2031,7 @@@ msgstr "
  "ADVARSEL: tvungen bruk av symmetrisk krypt.metode %s (%d) bryter med "
  "mottakers oppsett\n"
  
- #: g10/encrypt.c:707 g10/sign.c:984
++#: g10/encrypt.c:707 g10/sign.c:986
  #, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2065,7 -1586,6 +2065,7 @@@ msgstr "%s krypterte data\n
  msgid "encrypted with unknown algorithm %d\n"
  msgstr "kryptert med en ukjent algoritme %d\n"
  
- #: g10/decrypt-data.c:164 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:129
  msgid ""
  "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
  msgstr ""
@@@ -2154,8 -1656,6 +2154,8 @@@ msgstr "fjern så mye som mulig fra nø
  msgid " - skipped"
  msgstr ". Hoppet over"
  
- #: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:845 g10/sign.c:1148
++#: g10/export.c:1251 g10/import.c:1543 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:847 g10/sign.c:1150
  #, c-format
  msgid "writing to '%s'\n"
  msgstr "skriver til «%s»\n"
@@@ -2178,8 -1674,6 +2178,8 @@@ msgstr "nøkkel %s: PGP 2.x-aktig nøkk
  msgid "WARNING: nothing exported\n"
  msgstr "ADVARSEL: ingenting eksportert\n"
  
- #: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
- #: g10/plaintext.c:151 g10/plaintext.c:174
++#: g10/export.c:2283 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/plaintext.c:167 g10/plaintext.c:190
  #, c-format
  msgid "error creating '%s': %s\n"
  msgstr "feil under oppretting av «%s»: %s\n"
@@@ -2223,8 -1708,6 +2223,8 @@@ msgstr "feil under henting av «%s» vi
  msgid "No fingerprint"
  msgstr "Ingen fingeravtrykk"
  
- #: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
- #: g10/revoke.c:701
++#: g10/getkey.c:1873 g10/keyedit.c:2929 g10/keyedit.c:3016 g10/revoke.c:637
++#: g10/revoke.c:702
  #, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "fant ikke hemmelig nøkkel «%s»: %s\n"
@@@ -2254,199 -1732,155 +2254,205 @@@ msgstr "Ugyldig nøkkel %s gjort gyldi
  msgid "using subkey %s instead of primary key %s\n"
  msgstr "bruker undernøkkel %s i stedet for primærnøkkel %s\n"
  
- #: g10/gpg.c:424 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:200
  msgid "make a signature"
  msgstr "lag signatur"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:427
  msgid "make a clear text signature"
  msgstr "lag klartekst-signatur"
  
- #: g10/gpg.c:426 sm/gpgsm.c:202
++#: g10/gpg.c:429 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "lag adskilt signatur"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:430 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "krypter data"
  
- #: g10/gpg.c:429
++#: g10/gpg.c:432
  msgid "encryption only with symmetric cipher"
  msgstr "krypter data (symmetrisk)"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:434 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "dekrypter data (forvalgt)"
  
- #: g10/gpg.c:433 sm/gpgsm.c:206
++#: g10/gpg.c:436 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "bekreft signatur"
  
- #: g10/gpg.c:435 sm/gpgsm.c:207
++#: g10/gpg.c:438 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "vis nøkler"
  
- #: g10/gpg.c:437
++#: g10/gpg.c:440
  msgid "list keys and signatures"
  msgstr "vis nøkler og signaturer"
  
- #: g10/gpg.c:438
++#: g10/gpg.c:443
  msgid "list and check key signatures"
  msgstr "vis og kontroller nøkkelsignaturer"
  
- #: g10/gpg.c:439 sm/gpgsm.c:212
++#: g10/gpg.c:445 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "vis nøkler og fingeravtrykk"
  
- #: g10/gpg.c:440 sm/gpgsm.c:210
++#: g10/gpg.c:446 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "vis hemmelige nøkler"
  
- #: g10/gpg.c:442 sm/gpgsm.c:213
++#: g10/gpg.c:448 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "lag nytt nøkkelpar"
  
- #: g10/gpg.c:444
++#: g10/gpg.c:451
  msgid "quickly generate a new key pair"
  msgstr "lag nytt nøkkelpar raskt"
  
- #: g10/gpg.c:446
++#: g10/gpg.c:454
  msgid "quickly add a new user-id"
  msgstr "legg til en ny bruker-ID raskt"
  
- #: g10/gpg.c:449
++#: g10/gpg.c:459
  msgid "quickly revoke a user-id"
  msgstr "opphev bruker-ID raskt"
  
- #: g10/gpg.c:451
++#: g10/gpg.c:462
+ #, fuzzy
+ #| msgid "quickly generate a new key pair"
+ msgid "quickly set a new expiration date"
+ msgstr "lag nytt nøkkelpar raskt"
+ 
++#: g10/gpg.c:464
  msgid "full featured key pair generation"
  msgstr "fullverdig generering av nøkkelpar"
  
- #: g10/gpg.c:452
++#: g10/gpg.c:467
  msgid "generate a revocation certificate"
  msgstr "lag opphevelsessertifikat"
  
- #: g10/gpg.c:454 sm/gpgsm.c:215
++#: g10/gpg.c:470 sm/gpgsm.c:216
  msgid "remove keys from the public keyring"
  msgstr "fjern nøkler fra offentlig nøkkelknippe"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:472
  msgid "remove keys from the secret keyring"
  msgstr "fjern nøkler fra hemmelig nøkkelknippe"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:474
  msgid "quickly sign a key"
  msgstr "hurtigsigner nøkkel"
  
- #: g10/gpg.c:460
++#: g10/gpg.c:476
  msgid "quickly sign a key locally"
  msgstr "hurtigsigner nøkkel lokalt"
  
- #: g10/gpg.c:461
++#: g10/gpg.c:477
  msgid "sign a key"
  msgstr "signer nøkkel"
  
- #: g10/gpg.c:462
++#: g10/gpg.c:478
  msgid "sign a key locally"
  msgstr "signer nøkkel lokalt"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:479
  msgid "sign or edit a key"
  msgstr "signer eller rediger nøkkel"
  
- #: g10/gpg.c:465 sm/gpgsm.c:233
++#: g10/gpg.c:481 sm/gpgsm.c:234
  msgid "change a passphrase"
  msgstr "endre passordfrase"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:485
  msgid "export keys"
  msgstr "eksporter nøkler"
  
- #: g10/gpg.c:468
++#: g10/gpg.c:486
  msgid "export keys to a keyserver"
  msgstr "eksporter nøkler til nøkkeltjener"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:487
  msgid "import keys from a keyserver"
  msgstr "importer nøkler fra nøkkeltjener"
  
- #: g10/gpg.c:471
++#: g10/gpg.c:490
  msgid "search for keys on a keyserver"
  msgstr "søk etter nøkler på nøkkeltjener"
  
- #: g10/gpg.c:473
++#: g10/gpg.c:492
  msgid "update all keys from a keyserver"
  msgstr "oppdater alle nøkler fra nøkkeltjener"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:498
  msgid "import/merge keys"
  msgstr "importer/slå sammen nøkler"
  
- #: g10/gpg.c:482
++#: g10/gpg.c:501
  msgid "print the card status"
  msgstr "vis kortstatus"
  
- #: g10/gpg.c:483
++#: g10/gpg.c:502
  msgid "change data on a card"
  msgstr "endre data på kort"
  
- #: g10/gpg.c:484
++#: g10/gpg.c:504
  msgid "change a card's PIN"
  msgstr "endre PIN på kort"
  
- #: g10/gpg.c:496
++#: g10/gpg.c:516
  msgid "update the trust database"
  msgstr "oppdater tillitsdatabase"
  
- #: g10/gpg.c:505
++#: g10/gpg.c:525
  msgid "print message digests"
  msgstr "skriv ut kontrollsum av melding"
  
- #: g10/gpg.c:508 sm/gpgsm.c:228
++#: g10/gpg.c:528 sm/gpgsm.c:229
  msgid "run in server mode"
  msgstr "kjør i tjenermodus"
  
- #: g10/gpg.c:510
++#: g10/gpg.c:530
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr "|VERDI|endre TOFU-regler for nøkkel"
  
- #: g10/gpg.c:514 sm/gpgsm.c:246
++#: g10/gpg.c:534 sm/gpgsm.c:248
  msgid "create ascii armored output"
  msgstr "lag ASCII-beskyttet utdata"
  
- #: g10/gpg.c:517 sm/gpgsm.c:262
++#: g10/gpg.c:537 sm/gpgsm.c:264
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|BRUKER-ID|krypter for valgt BRUKER-ID"
  
- #: g10/gpg.c:533 sm/gpgsm.c:298
++#: g10/gpg.c:553 sm/gpgsm.c:300
  msgid "|USER-ID|use USER-ID to sign or decrypt"
  msgstr "|BRUKER-ID|bruk valgt BRUKER-ID til å signere eller dekryptere"
  
- #: g10/gpg.c:539
++#: g10/gpg.c:559
  msgid "|N|set compress level to N (0 disables)"
  msgstr "|N|endre komprimeringsnivå til N (0 for å slå av)"
  
- #: g10/gpg.c:546
++#: g10/gpg.c:566
  msgid "use canonical text mode"
  msgstr "bruk kanonisk tekstmodus"
  
- #: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
++#: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
  msgid "|FILE|write output to FILE"
  msgstr "|FILE|skriv utdata til valgt FIL"
  
- #: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
++#: g10/gpg.c:598 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
  msgid "do not make any changes"
  msgstr "ikke utfør valgte endringer"
  
- #: g10/gpg.c:579
++#: g10/gpg.c:599
  msgid "prompt before overwriting"
  msgstr "spør før overskriving"
  
- #: g10/gpg.c:628
++#: g10/gpg.c:648
  msgid "use strict OpenPGP behavior"
  msgstr "bruk streng OpenPGP-oppførsel"
  
- #: g10/gpg.c:654 sm/gpgsm.c:355
++#: g10/gpg.c:674 sm/gpgsm.c:357
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2454,7 -1888,16 +2460,17 @@@ msgstr "
  "@\n"
  "(Se bruksanvisning for en fullstendig liste over alle kommandoer og valg)\n"
  
- #: g10/gpg.c:657 sm/gpgsm.c:358
++#: g10/gpg.c:677
+ #, fuzzy
+ #| msgid ""
+ #| "@\n"
+ #| "Examples:\n"
+ #| "\n"
+ #| " -se -r Bob [file]          sign and encrypt for user Bob\n"
+ #| " --clear-sign [file]         make a clear text signature\n"
+ #| " --detach-sign [file]       make a detached signature\n"
+ #| " --list-keys [names]        show keys\n"
+ #| " --fingerprint [names]      show fingerprints\n"
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2474,11 -1917,9 +2490,11 @@@ msgstr "
  " --list-keys [navn]         vis nøkler\n"
  " --fingerprint [navn]       vis fingeravtrykk\n"
  
- #: g10/gpg.c:1026
++#: g10/gpg.c:1047
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
  msgstr "Bruk: @GPG@ [valg] [filer] (-h for hjelp)"
  
- #: g10/gpg.c:1029
++#: g10/gpg.c:1050
  msgid ""
  "Syntax: @GPG@ [options] [files]\n"
  "Sign, check, encrypt or decrypt\n"
@@@ -2488,7 -1929,6 +2504,7 @@@ msgstr "
  "Signer, kontroller, krypter eller dekrypter.\n"
  "Forvalgt handling avhenger av inndata.\n"
  
- #: g10/gpg.c:1040 sm/gpgsm.c:588
++#: g10/gpg.c:1061 sm/gpgsm.c:580
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2496,586 -1936,411 +2512,526 @@@ msgstr "
  "\n"
  "Støttede algoritmer:\n"
  
- #: g10/gpg.c:1043
++#: g10/gpg.c:1064
  msgid "Pubkey: "
  msgstr "Off. nøkkel: "
  
- #: g10/gpg.c:1050 g10/keyedit.c:3402
++#: g10/gpg.c:1071 g10/keyedit.c:3483
  msgid "Cipher: "
  msgstr "Kryptering: "
  
- #: g10/gpg.c:1057
++#: g10/gpg.c:1078
  msgid "Hash: "
  msgstr "Hash: "
  
- #: g10/gpg.c:1064 g10/keyedit.c:3451
++#: g10/gpg.c:1085 g10/keyedit.c:3532
  msgid "Compression: "
  msgstr "Komprimering: "
  
- #: g10/gpg.c:1133 sm/gpgsm.c:662
++#: g10/gpg.c:1154 sm/gpgsm.c:654
  #, c-format
  msgid "usage: %s [options] %s\n"
  msgstr "bruk: %s [valg] %s\n"
  
- #: g10/gpg.c:1321 sm/gpgsm.c:751
++#: g10/gpg.c:1342 sm/gpgsm.c:743
  msgid "conflicting commands\n"
  msgstr "motstridende kommandoer\n"
  
- #: g10/gpg.c:1339
++#: g10/gpg.c:1360
  #, c-format
  msgid "no = sign found in group definition '%s'\n"
  msgstr "fant ingen «=»-tegn i gruppedefinisjon «%s»\n"
  
- #: g10/gpg.c:1537
++#: g10/gpg.c:1558
  #, c-format
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr "ADVARSEL: utrygt eierskap til hjemmemappe «%s»\n"
  
- #: g10/gpg.c:1540
++#: g10/gpg.c:1561
  #, c-format
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
  msgstr "ADVARSEL: utrygt eierskap til oppsettsfil «%s»\n"
  
- #: g10/gpg.c:1543
++#: g10/gpg.c:1564
  #, c-format
  msgid "WARNING: unsafe ownership on extension '%s'\n"
  msgstr "ADVARSEL: utrygt eierskap til utvidelse «%s»\n"
  
- #: g10/gpg.c:1549
++#: g10/gpg.c:1570
  #, c-format
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
  msgstr "ADVARSEL: utrygge tillatelser til hjemmemappe «%s»\n"
  
- #: g10/gpg.c:1552
++#: g10/gpg.c:1573
  #, c-format
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
  msgstr "ADVARSEL: utrygge tillatelser til oppsettsfil «%s»\n"
  
- #: g10/gpg.c:1555
++#: g10/gpg.c:1576
  #, c-format
  msgid "WARNING: unsafe permissions on extension '%s'\n"
  msgstr "ADVARSEL: utrygge tillatelser til utvidelse «%s»\n"
  
- #: g10/gpg.c:1561
++#: g10/gpg.c:1582
  #, 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:1564
++#: g10/gpg.c:1585
  #, 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:1567
++#: g10/gpg.c:1588
  #, 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:1573
++#: g10/gpg.c:1594
  #, 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:1576
++#: g10/gpg.c:1597
  #, 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:1579
++#: g10/gpg.c:1600
  #, 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:1786
++#: g10/gpg.c:1816
  #, c-format
  msgid "unknown configuration item '%s'\n"
  msgstr "oppsettselementet «%s» er ukjent\n"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1925
  msgid "display photo IDs during key listings"
  msgstr "vis foto-id-er i nøkkelvisning"
  
- #: g10/gpg.c:1895
++#: g10/gpg.c:1927
  msgid "show key usage information during key listings"
  msgstr "vis informasjon om nøkkelbruk i nøkkelvisning"
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1929
  msgid "show policy URLs during signature listings"
  msgstr "vis regeladresser i signaturvisning"
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1931
  msgid "show all notations during signature listings"
  msgstr "vis alle notater i signaturvisning"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1933
  msgid "show IETF standard notations during signature listings"
  msgstr "vis IETF-standardnotater under signaturvisning"
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1937
  msgid "show user-supplied notations during signature listings"
  msgstr "vis brukervalgte notater under signaturvisning"
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1939
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "vis foretrukne nøkkeltjener-adresser under signaturvisning"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1941
  msgid "show user ID validity during key listings"
  msgstr "vis gyldighet for bruker-ID under nøkkelvisning"
  
- #: g10/gpg.c:1911
++#: g10/gpg.c:1943
  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:1913
++#: g10/gpg.c:1945
  msgid "show revoked and expired subkeys in key listings"
  msgstr "vis opphevede og utgåtte undernøkler i nøkkelvisning"
  
- #: g10/gpg.c:1915
++#: g10/gpg.c:1947
  msgid "show the keyring name in key listings"
  msgstr "vis nøkkelknippe-navn i nøkkelvisning"
  
- #: g10/gpg.c:1917
++#: g10/gpg.c:1949
  msgid "show expiration dates during signature listings"
  msgstr "vis utløpsdatoer i nøkkelvisning"
  
- #: g10/gpg.c:2019 g10/gpg.c:2056
++#: g10/gpg.c:2051 g10/gpg.c:2088
  #, fuzzy, c-format
  #| msgid "invalid argument for option \"%.50s\"\n"
  msgid "valid values for option '%s':\n"
  msgstr "ugyldig argument for valget «%.50s»\n"
  
- #: g10/gpg.c:2030
++#: g10/gpg.c:2062
  #, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "«%s» er et ukjent TOFU-regelverk\n"
  
- #: g10/gpg.c:2032 g10/gpg.c:2068
++#: g10/gpg.c:2064 g10/gpg.c:2100
  msgid "(use \"help\" to list choices)\n"
  msgstr "(bruk «help» for å vise valg)\n"
  
- #: g10/gpg.c:2066
++#: g10/gpg.c:2098 g10/keygen.c:167
  #, fuzzy, c-format
  #| msgid "invalid argument for option \"%.50s\"\n"
  msgid "invalid value for option '%s'\n"
  msgstr "ugyldig argument for valget «%.50s»\n"
  
- #: g10/gpg.c:2203
++#: g10/gpg.c:2235
  #, c-format
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "Merk: gammel standardvalgfil «%s» ble ignorert\n"
  
- #: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
++#: g10/gpg.c:2839 g10/gpg.c:3610 g10/gpg.c:3622
  #, c-format
  msgid "Note: %s is not for normal use!\n"
  msgstr "Merk: %s er ikke ment for vanlig bruk.\n"
  
- #: g10/gpg.c:2978 g10/gpg.c:2990
++#: g10/gpg.c:3011 g10/gpg.c:3023
  #, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "«%s» er en ugyldig signatur-utløpstid\n"
  
- #: g10/gpg.c:3012
++#: g10/gpg.c:3045
  #, fuzzy, c-format
  #| msgid "line %d: not a valid email address\n"
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "linje %d: ugyldig e-postadresse\n"
  
- #: g10/gpg.c:3044 sm/gpgsm.c:1166
++#: g10/gpg.c:3077 sm/gpgsm.c:1158
  #, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "PIN-inntastingsmodus «%s» er ugyldig\n"
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3130
  #, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "«%s» er ikke et gyldig tegnsett\n"
  
- #: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
++#: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
  msgid "could not parse keyserver URL\n"
  msgstr "klarte ikke å tolke nøkkeltjener-adresse\n"
  
- #: g10/gpg.c:3137
++#: g10/gpg.c:3170
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: ugyldige nøkkeltjener-valg\n"
  
- #: g10/gpg.c:3140
++#: g10/gpg.c:3173
  msgid "invalid keyserver options\n"
  msgstr "ugyldige nøkkeltjener-valg\n"
  
- #: g10/gpg.c:3147
++#: g10/gpg.c:3180
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: ugyldige importeringsvalg\n"
  
- #: g10/gpg.c:3150
++#: g10/gpg.c:3183
  msgid "invalid import options\n"
  msgstr "ugyldige importeringsvalg\n"
  
- #: g10/gpg.c:3156 g10/gpg.c:3171
++#: g10/gpg.c:3189 g10/gpg.c:3204
  #, c-format
  msgid "invalid filter option: %s\n"
  msgstr "filtervalget %s er ugyldig\n"
  
- #: g10/gpg.c:3162
++#: g10/gpg.c:3195
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: ugyldige eksporteringsvalg\n"
  
- #: g10/gpg.c:3165
++#: g10/gpg.c:3198
  msgid "invalid export options\n"
  msgstr "ugyldige eksporteringsvalg\n"
  
- #: g10/gpg.c:3177
++#: g10/gpg.c:3210
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: ugyldige listevalg\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3213
  msgid "invalid list options\n"
  msgstr "ugyldige listevalg\n"
  
- #: g10/gpg.c:3188
++#: g10/gpg.c:3221
  msgid "display photo IDs during signature verification"
  msgstr "vis bruker-ID under signaturbekreftelse"
  
- #: g10/gpg.c:3190
++#: g10/gpg.c:3223
  msgid "show policy URLs during signature verification"
  msgstr "vis adresser til retningslinjer under signaturbekreftelse"
  
- #: g10/gpg.c:3192
++#: g10/gpg.c:3225
  msgid "show all notations during signature verification"
  msgstr "vis alle merknader under signaturbekreftelse"
  
- #: g10/gpg.c:3194
++#: g10/gpg.c:3227
  msgid "show IETF standard notations during signature verification"
  msgstr "vis IETF-standardnotater under signaturbekreftelse"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3231
  msgid "show user-supplied notations during signature verification"
  msgstr "vis selvvalgte merknader under signaturbekreftelse"
  
- #: g10/gpg.c:3200
++#: g10/gpg.c:3233
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "vis adresser til foretrukne nøkkeltjenere under signaturbekreftelse"
  
- #: g10/gpg.c:3202
++#: g10/gpg.c:3235
  msgid "show user ID validity during signature verification"
  msgstr "vis gyldighet for bruker-ID under signaturbekreftelse"
  
- #: g10/gpg.c:3204
++#: g10/gpg.c:3237
  msgid "show revoked and expired user IDs in signature verification"
  msgstr "vis opphevede og utgåtte bruker-id-er under signaturbekreftelse"
  
- #: g10/gpg.c:3206
++#: g10/gpg.c:3239
  msgid "show only the primary user ID in signature verification"
  msgstr "bare vis primærbrukerens ID under signaturbekreftelse"
  
- #: g10/gpg.c:3208
++#: g10/gpg.c:3241
  msgid "validate signatures with PKA data"
  msgstr "kontroller signaturer som har PKA-data"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3243
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr "øk tillitsnivå for signaturer med gyldige PKA-data"
  
- #: g10/gpg.c:3217
++#: g10/gpg.c:3250
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: ugyldige kontrollvalg\n"
  
- #: g10/gpg.c:3220
++#: g10/gpg.c:3253
  msgid "invalid verify options\n"
  msgstr "ugyldige kontrollvalg\n"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3260
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "klarte ikke å endre «exec»-sti til %s\n"
  
- #: g10/gpg.c:3417
++#: g10/gpg.c:3452
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: ugyldig «auto-key-locate»-liste\n"
  
- #: g10/gpg.c:3420
++#: g10/gpg.c:3455
  msgid "invalid auto-key-locate list\n"
  msgstr "ugyldig «auto-key-locate»-liste\n"
  
- #: g10/gpg.c:3553 sm/gpgsm.c:1507
++#: g10/gpg.c:3592 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
  msgstr "ADVARSEL: programmet kan lage en kjernefil.\n"
  
- #: g10/gpg.c:3564
++#: g10/gpg.c:3603
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "ADVARSEL: %s overstyrere %s\n"
  
- #: g10/gpg.c:3573
++#: g10/gpg.c:3612
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "du kan ikke bruke %s med %s.\n"
  
- #: g10/gpg.c:3576
++#: g10/gpg.c:3615
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s gir ikke mening med %s.\n"
  
- #: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
++#: g10/gpg.c:3630 sm/gpgsm.c:1518 dirmngr/dirmngr.c:951
  msgid "WARNING: running with faked system time: "
  msgstr "ADVARSEL: kjører med falsk systemtid: "
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3651
  #, 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:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
++#: g10/gpg.c:3686 g10/gpg.c:3710 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "valgt krypteringsalgoritme er ugyldig\n"
  
- #: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
++#: g10/gpg.c:3692 g10/gpg.c:3716 sm/gpgsm.c:1591 sm/gpgsm.c:1597
  msgid "selected digest algorithm is invalid\n"
  msgstr "valg kontrollsum-algoritme er ugyldig\n"
  
- #: g10/gpg.c:3659
++#: g10/gpg.c:3698
  msgid "selected compression algorithm is invalid\n"
  msgstr "valgt komprimeringsalgoritme er ugyldig\n"
  
- #: g10/gpg.c:3665
++#: g10/gpg.c:3704
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "valgt kontrollsum-algoritme for sertifisering er ugyldig\n"
  
- #: g10/gpg.c:3680
++#: g10/gpg.c:3719
  msgid "completes-needed must be greater than 0\n"
  msgstr "«completes-needed» må være større enn 0\n"
  
- #: g10/gpg.c:3682
++#: g10/gpg.c:3721
  msgid "marginals-needed must be greater than 1\n"
  msgstr "«marginals-needed» må være større enn 1\n"
  
- #: g10/gpg.c:3684
++#: g10/gpg.c:3723
  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:3686
++#: g10/gpg.c:3725
  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:3688
++#: g10/gpg.c:3727
  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:3691
++#: g10/gpg.c:3730
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
  msgstr "Merk: enkel S2K-modus (0) er sterkt frarådet\n"
  
- #: g10/gpg.c:3695
++#: g10/gpg.c:3734
  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:3702
++#: g10/gpg.c:3741
  msgid "invalid default preferences\n"
  msgstr "ugyldig standardoppsett\n"
  
- #: g10/gpg.c:3706
++#: g10/gpg.c:3745
  msgid "invalid personal cipher preferences\n"
  msgstr "ugyldig personlig oppsett av krypteringsmetode\n"
  
- #: g10/gpg.c:3710
++#: g10/gpg.c:3749
  msgid "invalid personal digest preferences\n"
  msgstr "ugyldig personlig oppsett av kontrollsummetode\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3753
  msgid "invalid personal compress preferences\n"
  msgstr "ugyldig personlig oppsett av komprimeringsmetode\n"
  
- #: g10/gpg.c:3750
++#: g10/gpg.c:3789
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s virker ikke enda med %s\n"
  
- #: g10/gpg.c:3797
++#: g10/gpg.c:3836
  #, c-format
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr "du kan ikke bruke krypteringsalgoritme «%s» i %s-modus\n"
  
- #: g10/gpg.c:3802
++#: g10/gpg.c:3841
  #, c-format
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr "du kan ikke bruke summeringsalgoritme «%s» i %s-modus\n"
  
- #: g10/gpg.c:3807
++#: g10/gpg.c:3846
  #, c-format
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr "du kan ikke bruke komprimeringsalgoritme «%s» i «%s»-modus\n"
  
- #: g10/gpg.c:3906
++#: g10/gpg.c:3945
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "klarte ikke å starte tillitsdatabase (TrustDB): %s\n"
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:3957
  msgid "WARNING: recipients (-r) given without using public key encryption\n"
  msgstr "ADVARSEL: mottakere (-r) valgt uten offentlig nøkkelkryptering\n"
  
- #: g10/gpg.c:3975
- msgid "--store [filename]"
- msgstr "--store [filnavn]"
- 
- #: g10/gpg.c:3985
- msgid "--symmetric [filename]"
- msgstr "--symmetric [filnavn]"
- 
- #: g10/gpg.c:3989
++#: g10/gpg.c:4028
  #, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "symmetrisk kryptering av «%s» mislyktes: %s\n"
  
- #: g10/gpg.c:4000
- msgid "--encrypt [filename]"
- msgstr "--encrypt [filnavn]"
- 
- #: g10/gpg.c:4016
- msgid "--symmetric --encrypt [filename]"
- msgstr "--symmetric --encrypt [filnavn]"
- 
- #: g10/gpg.c:4018
++#: g10/gpg.c:4057
  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:4021
++#: g10/gpg.c:4060
  #, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr "du kan ikke velge «--symmtric» og «--encrypt» i «%s»-modus\n"
  
- #: g10/gpg.c:4042
- msgid "--sign [filename]"
- msgstr "--sign [filnavn]"
- 
- #: g10/gpg.c:4058
- msgid "--sign --encrypt [filename]"
- msgstr "--sign --encrypt [filnavn]"
- 
- #: g10/gpg.c:4076
- msgid "--symmetric --sign --encrypt [filename]"
- msgstr "--symmetric --sign --encrypt [filnavn]"
- 
- #: g10/gpg.c:4078
++#: g10/gpg.c:4117
  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:4081
++#: g10/gpg.c:4120
  #, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr "du kan ikke velge «--symmtric», «--sign» og «--encrypt» i «%s»-modus\n"
  
- #: g10/gpg.c:4105
- msgid "--sign --symmetric [filename]"
- msgstr "--sign --symmetric [filnavn]"
- 
- #: g10/gpg.c:4117
- msgid "--clearsign [filename]"
- msgstr "--clearsign [filnavn]"
- 
- #: g10/gpg.c:4147
- msgid "--decrypt [filename]"
- msgstr "--decrypt [filnavn]"
- 
- #: g10/gpg.c:4174
- msgid "--sign-key user-id"
- msgstr "--sign-key bruker-ID"
- 
- #: g10/gpg.c:4178
- msgid "--lsign-key user-id"
- msgstr "--lsign-key bruker-ID"
- 
- #: g10/gpg.c:4199
- msgid "--edit-key user-id [commands]"
- msgstr "--edit-key bruker-ID [kommandoer]"
- 
- #: g10/gpg.c:4215
- msgid "--passwd <user-id>"
- msgstr "--passwd <bruker-id>"
- 
- #: g10/gpg.c:4411 g10/keyserver.c:1837
++#: g10/gpg.c:4462 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "sending til nøkkeltjener mislyktes: %s\n"
  
- #: g10/gpg.c:4416
++#: g10/gpg.c:4467
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "mottak fra nøkkeltjener mislyktes: %s\n"
  
- #: g10/gpg.c:4422
++#: g10/gpg.c:4473
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "nøkkeleksport mislyktes: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4486
  #, c-format
  msgid "export as ssh key failed: %s\n"
  msgstr "eksportering som ssh-nøkkel mislyktes: %s\n"
  
- #: g10/gpg.c:4447
++#: g10/gpg.c:4498
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "søk på nøkkeltjener mislyktes: %s\n"
  
- #: g10/gpg.c:4460
++#: g10/gpg.c:4511
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "oppdatering av nøkkeltjener mislyktes: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4578
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "dearmoring failed: %s\n"
  
- #: g10/gpg.c:4538
++#: g10/gpg.c:4589
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "enarmoring failed: %s\n"
  
- #: g10/gpg.c:4630
++#: g10/gpg.c:4681
  #, c-format
  msgid "invalid hash algorithm '%s'\n"
  msgstr "«%s» er en ugyldig summeringsalgoritme\n"
  
- #: g10/gpg.c:4776 g10/tofu.c:2002
++#: g10/gpg.c:4827 g10/tofu.c:2151
  #, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "feil under tolking av nøkkelspesifikasjon «%s»: %s\n"
  
- #: g10/gpg.c:4788
++#: g10/gpg.c:4839
  #, 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:4835
- msgid "[filename]"
- msgstr "[filnavn]"
- 
- #: g10/gpg.c:4841
++#: g10/gpg.c:4894
  msgid "Go ahead and type your message ...\n"
  msgstr "Skriv inn melding …\n"
  
- #: g10/gpg.c:5179
++#: g10/gpg.c:5232
  msgid "the given certification policy URL is invalid\n"
  msgstr "valgt adresse for sertifikasjonsregler er ugyldig\n"
  
- #: g10/gpg.c:5181
++#: g10/gpg.c:5234
  msgid "the given signature policy URL is invalid\n"
  msgstr "valgt adresse for signaturregler er ugyldig\n"
  
- #: g10/gpg.c:5214
++#: g10/gpg.c:5267
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "valgt adresse for foretrukket nøkkeltjener er ugyldig\n"
  
@@@ -3087,7 -2350,6 +3043,7 @@@ msgstr "|FIL|hent nøkler fra valgt nø
  msgid "make timestamp conflicts only a warning"
  msgstr "la konflikter mellom tidsstempler bare være en advarsel"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:345
++#: g10/gpgv.c:82 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|skrive statusinfo til denne FD"
  
@@@ -3116,133 -2373,105 +3072,133 @@@ msgstr "Ingen hjelp tilgjengelig
  msgid "No help available for '%s'"
  msgstr "Ingen hjelp tilgjengelig for «%s»"
  
- #: g10/import.c:151
++#: g10/import.c:152
  msgid "import signatures that are marked as local-only"
  msgstr "importer signaturer som er merket som kun lokale"
  
- #: g10/import.c:154
++#: g10/import.c:155
  msgid "repair damage from the pks keyserver during import"
  msgstr "reparer skader fra pks-nøkkeltjener under importering"
  
- #: g10/import.c:157
++#: g10/import.c:158
  msgid "do not clear the ownertrust values during import"
  msgstr "ikke tøm «ownertrust»-verdier under importering"
  
- #: g10/import.c:160
++#: g10/import.c:161
  msgid "do not update the trustdb after import"
  msgstr "ikke oppdater tillitsdatabase etter importering"
  
- #: g10/import.c:163
++#: g10/import.c:164
  msgid "show key during import"
  msgstr "vis nøkkel under importering"
  
- #: g10/import.c:166
++#: g10/import.c:167
  msgid "only accept updates to existing keys"
  msgstr "bare godta oppdateringer av nøkler som finnes allerede"
  
- #: g10/import.c:169
++#: g10/import.c:170
  msgid "remove unusable parts from key after import"
  msgstr "fjern ubrukelige deler av nøkkel etter importering"
  
- #: g10/import.c:172
++#: g10/import.c:173
  msgid "remove as much as possible from key after import"
  msgstr "fjern så mye som mulig fra nøkkel etter importering"
  
- #: g10/import.c:175
++#: g10/import.c:176
  msgid "run import filters and export key immediately"
  msgstr "kjør importeringsfiltre og eksporter nøkkel umiddelbart"
  
- #: g10/import.c:326 g10/import.c:568
++#: g10/import.c:327 g10/import.c:569
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "hopper over blokk av typen %d\n"
  
- #: g10/import.c:585
++#: g10/import.c:586
  #, c-format
  msgid "%lu keys processed so far\n"
  msgstr "%lu nøkler behandlet hittil\n"
  
- #: g10/import.c:655
++#: g10/import.c:656
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "Totalt antall behandlet: %lu\n"
  
- #: g10/import.c:658
++#: g10/import.c:659
  #, c-format
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "    hopper over PGP 2-nøkler: %lu\n"
  
- #: g10/import.c:660
++#: g10/import.c:661
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "      nye nøkler som ble hoppet over: %lu\n"
  
- #: g10/import.c:663
++#: g10/import.c:664
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "          uten bruker-id-er: %lu\n"
  
- #: g10/import.c:666 sm/import.c:130
++#: g10/import.c:667 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "              importert: %lu"
  
- #: g10/import.c:670 sm/import.c:134
++#: g10/import.c:671 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "             uendret: %lu\n"
  
- #: g10/import.c:672
++#: g10/import.c:673
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "          nye bruker-id-er: %lu\n"
  
- #: g10/import.c:674
++#: g10/import.c:675
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "           nye undernøkler: %lu\n"
  
- #: g10/import.c:676
++#: g10/import.c:677
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "        nye signaturer: %lu\n"
  
- #: g10/import.c:678
++#: g10/import.c:679
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "   nye nøkkelopphevinger: %lu\n"
  
- #: g10/import.c:680 sm/import.c:136
++#: g10/import.c:681 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "      leste hemmelige nøkler: %lu\n"
  
- #: g10/import.c:682 sm/import.c:138
++#: g10/import.c:683 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "  importerte hemmelige nøkler: %lu\n"
  
- #: g10/import.c:684 sm/import.c:140
++#: g10/import.c:685 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr " uforandrede hemmelige nøkler: %lu\n"
  
- #: g10/import.c:686 sm/import.c:142
++#: g10/import.c:687 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "          ikke importert: %lu\n"
  
- #: g10/import.c:688
++#: g10/import.c:689
  #, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "    oppryddete signaturer: %lu\n"
  
- #: g10/import.c:690
++#: g10/import.c:691
  #, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "      tømte bruker-id-er: %lu\n"
  
- #: g10/import.c:1034
++#: g10/import.c:1035
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
@@@ -3251,190 -2480,152 +3207,190 @@@ msgstr "
  "ADVARSEL: nøkkelen %s inneholder innstillinger for\n"
  "utilgjengelige algoritmer på følgende bruker-id-er:\n"
  
- #: g10/import.c:1076
++#: g10/import.c:1077
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr "         «%s»: innstilling for krypteringsalgoritme %s\n"
  
- #: g10/import.c:1091
++#: g10/import.c:1092
  #, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "         «%s»: oppsett for kontrollsum-algoritme %s\n"
  
- #: g10/import.c:1103
++#: g10/import.c:1104
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr "         «%s»: oppsett av komprimeringsalgoritme %s\n"
  
- #: g10/import.c:1116
++#: g10/import.c:1117
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr "du anbefales på det sterkeste å endre oppsett og\n"
  
- #: g10/import.c:1118
++#: g10/import.c:1119
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  "dele ut denne nøkkelen på nytt for å unngå potensielle problemer med "
  "algoritme-samsvar\n"
  
- #: g10/import.c:1143
++#: g10/import.c:1144
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  "oppdater oppsettet med følgende kommando: gpg --edit-key %s updpref save\n"
  
- #: g10/import.c:1379 g10/import.c:2167
++#: g10/import.c:1380 g10/import.c:2168
  #, c-format
  msgid "key %s: no user ID\n"
  msgstr "nøkkel %s: ingen bruker-ID\n"
  
- #: g10/import.c:1385
++#: g10/import.c:1386
  #, c-format
  msgid "key %s: %s\n"
  msgstr "nøkkel %s: %s\n"
  
- #: g10/import.c:1386 g10/import.c:2141
++#: g10/import.c:1387 g10/import.c:2142
  msgid "rejected by import screener"
  msgstr "avvist av importeringskontrollør"
  
- #: g10/import.c:1416
++#: g10/import.c:1417
  #, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "nøkkel %s: PKS-undernøkkel reparert\n"
  
- #: g10/import.c:1434
++#: g10/import.c:1435
  #, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "nøkkel %s: akseptert ikke-selvsignert bruker-ID «%s»\n"
  
- #: g10/import.c:1444 g10/import.c:1475
++#: g10/import.c:1445 g10/import.c:1476
  #, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "nøkkel %s: ingen gyldig bruker-id-er\n"
  
- #: g10/import.c:1446
++#: g10/import.c:1447
  msgid "this may be caused by a missing self-signature\n"
  msgstr "dette kan skyldes manglende selvsignatur\n"
  
- #: g10/import.c:1516 g10/import.c:2318
++#: g10/import.c:1517 g10/import.c:2319
  #, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "nøkkel %s: fant ikke offentlig nøkkel: %s\n"
  
- #: g10/import.c:1522
++#: g10/import.c:1523
  #, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "nøkkel %s: ny nøkkel. Hoppet over\n"
  
- #: g10/import.c:1537
++#: g10/import.c:1538
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "fant ikke skrivbart nøkkelknippe: %s\n"
  
- #: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
++#: g10/import.c:1547 g10/import.c:1648 g10/import.c:2385
  #, c-format
  msgid "error writing keyring '%s': %s\n"
  msgstr "feil under skriving av nøkkelknippe «%s»: %s\n"
  
- #: g10/import.c:1566
++#: g10/import.c:1567
  #, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "nøkkel %s: offentlig nøkkel «%s» importert\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1591
  #, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "nøkkel %s: stemmer ikke med vår kopi\n"
  
- #: g10/import.c:1606 g10/import.c:2342
++#: g10/import.c:1607 g10/import.c:2343
  #, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "nøkkel %s: finner ikke original nøkkelblokk: %s\n"
  
- #: g10/import.c:1614 g10/import.c:2349
++#: g10/import.c:1615 g10/import.c:2350
  #, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "nøkkel %s: klarte ikke å lese opprinnelig nøkkelblokk: %s\n"
  
- #: g10/import.c:1657
++#: g10/import.c:1658
  #, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "nøkkel %s: «%s» 1 ny bruker-ID\n"
  
- #: g10/import.c:1660
++#: g10/import.c:1661
  #, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "nøkkel %s: «%s» %d nye bruker-id-er\n"
  
- #: g10/import.c:1663
++#: g10/import.c:1664
  #, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "nøkkel %s: «%s» 1 ny signatur\n"
  
- #: g10/import.c:1666
++#: g10/import.c:1667
  #, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "nøkkel: %s: «%s» %d nye signaturer\n"
  
- #: g10/import.c:1669
++#: g10/import.c:1670
  #, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "nøkkel %s: «%s» 1 ny undernøkkel\n"
  
- #: g10/import.c:1672
++#: g10/import.c:1673
  #, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "nøkkel %s: «%s» %d nye undernøkler\n"
  
- #: g10/import.c:1675
++#: g10/import.c:1676
  #, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "nøkkel: %s: «%s» %d nye signaturer\n"
  
- #: g10/import.c:1678
++#: g10/import.c:1679
  #, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "nøkkel: %s: «%s» %d nye signaturer\n"
  
- #: g10/import.c:1681
++#: g10/import.c:1682
  #, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "nøkkel %s: «%s» %d nye bruker-id-er\n"
  
- #: g10/import.c:1684
++#: g10/import.c:1685
  #, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "nøkkel %s: «%s» %d nye bruker-id-er\n"
  
- #: g10/import.c:1707
++#: g10/import.c:1708
  #, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "nøkkel %s: «%s» ikke endret\n"
  
- #: g10/import.c:2019 g10/import.c:2264
++#: g10/import.c:2020 g10/import.c:2265
  #, c-format
  msgid "key %s: secret key imported\n"
  msgstr "nøkkel %s: hemmelig nøkkel importert\n"
  
- #: g10/import.c:2027
++#: g10/import.c:2028
  #, c-format
  msgid "key %s: secret key already exists\n"
  msgstr "nøkkel %s: hemmelig nøkkel finnes allerede\n"
  
- #: g10/import.c:2035
++#: g10/import.c:2036
  #, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "nøkkel %s: feil under sending til agent: %s\n"
  
- #: g10/import.c:2140
++#: g10/import.c:2141
  #, c-format
  msgid "secret key %s: %s\n"
  msgstr "hemmelig nøkkel %s: %s\n"
  
- #: g10/import.c:2160 g10/import.c:2195
++#: g10/import.c:2161 g10/import.c:2196
  msgid "importing secret keys not allowed\n"
  msgstr "importering av hemmelig nøkkel er ikke tillatt\n"
  
- #: g10/import.c:2184
++#: g10/import.c:2185
  #, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr ""
@@@ -3450,141 -2641,114 +3406,141 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2256
++#: g10/import.c:2257
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr "Kjør følgende kommando for å flytte «%s»: %s\n"
  
- #: g10/import.c:2311
++#: g10/import.c:2312
  #, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
  "nøkkel %s: offentlig nøkkel mangler. Klarte ikke å bruke "
  "opphevelsessertifikat\n"
  
- #: g10/import.c:2360
++#: g10/import.c:2361
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "nøkkel %s: ugyldig opphevingssertifikat: %s - avvist\n"
  
- #: g10/import.c:2393
++#: g10/import.c:2394
  #, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "nøkkel %s: «%s» opphevingssertifikat importert\n"
  
- #: g10/import.c:2469
++#: g10/import.c:2470
  #, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "nøkkel %s: ingen bruker-ID for signatur\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2487
  #, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr ""
  "nøkkel %s: offentlig nøkkelalgoritme for bruker-ID («%s») støttes ikke\n"
  
- #: g10/import.c:2488
++#: g10/import.c:2489
  #, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "nøkkel %s: ugyldig selvsignatur for bruker-ID «%s»\n"
  
- #: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
++#: g10/import.c:2506 g10/import.c:2532 g10/import.c:2583
  #, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "nøkkel %s: ustøttet offentlig nøkkelalgoritme\n"
  
- #: g10/import.c:2506
++#: g10/import.c:2507
  #, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "nøkkel %s: ugyldig direkte nøkkelsignatur\n"
  
- #: g10/import.c:2520
++#: g10/import.c:2521
  #, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "nøkkel %s: ingen undernøkkel for nøkkelbinding\n"
  
- #: g10/import.c:2533
++#: g10/import.c:2534
  #, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "nøkkel %s: ugyldig undernøkkelbinding\n"
  
- #: g10/import.c:2549
++#: g10/import.c:2550
  #, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "nøkkel %s: fjernet flere undernøkkelbindinger\n"
  
- #: g10/import.c:2571
++#: g10/import.c:2572
  #, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "nøkkel %s: ingen undernøkkel for nøkkeloppheving\n"
  
- #: g10/import.c:2584
++#: g10/import.c:2585
  #, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "nøkkel %s: ugyldig undernøkkeloppheving\n"
  
- #: g10/import.c:2599
++#: g10/import.c:2600
  #, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "nøkkel %s: fjernet flere undernøkkelopphevinger\n"
  
- #: g10/import.c:2641
++#: g10/import.c:2642
  #, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "nøkkel %s: hoppet over bruker-ID «%s»\n"
  
- #: g10/import.c:2665
++#: g10/import.c:2666
  #, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "nøkkel %s: hoppet over undernøkkel\n"
  
- #: g10/import.c:2694
++#: g10/import.c:2695
  #, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "nøkkel %s: ikke-eksporterbar signatur (klasse 0x%02X) - hoppet over\n"
  
- #: g10/import.c:2705
++#: g10/import.c:2706
  #, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "nøkkel %s: opphevingssertifikat på feil plass - hoppet over\n"
  
- #: g10/import.c:2723
++#: g10/import.c:2724
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "nøkkel %s: ugyldig opphevingssertifikat: %s - hoppet over\n"
  
- #: g10/import.c:2737
++#: g10/import.c:2738
  #, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "nøkkel %s: undernøkkelsignatur på feil plass - hoppet over\n"
  
- #: g10/import.c:2745
++#: g10/import.c:2746
  #, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "nøkkel %s: uforventet signaturklasse (0x%02X) - hoppet over\n"
  
- #: g10/import.c:2887
++#: g10/import.c:2888
  #, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "nøkkel %s: oppdaget duplisert bruker-ID. Slått sammen\n"
  
- #: g10/import.c:2951
++#: g10/import.c:2952
  #, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr "ADVARSEL: nøkkel %s kan være opphevet: henter opphevingsnøkkel %s\n"
  
- #: g10/import.c:2967
++#: g10/import.c:2968
  #, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr ""
  "ADVARSEL: nøkkel %s kan være opphevet: opphevingsnøkkel %s ikke tilstede.\n"
  
- #: g10/import.c:3031
++#: g10/import.c:3032
  #, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "nøkkel %s: «%s» opphevingssertifikat lagt til\n"
  
- #: g10/import.c:3069
++#: g10/import.c:3070
  #, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "nøkkel %s: direkte nøkkelsignatur lagt til\n"
@@@ -3619,33 -2777,26 +3575,33 @@@ msgstr "nøkkelblokkressurs «%s»: %s\
  msgid "error opening key DB: %s\n"
  msgstr "feil under åpning av nøkkeldatabase: %s\n"
  
- #: g10/keydb.c:1782
++#: g10/keydb.c:1786
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "klarte ikke å bygge hurtiglager for nøkkelknippe på nytt: %s\n"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[revocation]"
  msgstr "[oppheving]"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[self-signature]"
  msgstr "[selvsignatur]"
  
- #: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
++#: g10/keyedit.c:433 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: dirmngr/ldap-wrapper.c:694
  #, c-format
  msgid "error allocating memory: %s\n"
  msgstr "feil under minnetildeling: %s\n"
  
- #: g10/keyedit.c:629
++#: g10/keyedit.c:630
  #, c-format
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr ""
  "klarte ikke å kontrollere signatur på grunn av ustøttet algoritme for "
  "offentlig nøkkel (%d): %s.\n"
  
- #: g10/keyedit.c:638
++#: g10/keyedit.c:639
  #, c-format
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
@@@ -3653,44 -2804,37 +3609,44 @@@ msgstr "
  "klarte ikke å kontrollere signatur på grunn av ustøttet algoritme for "
  "meldingssum (%d): %s.\n"
  
- #: g10/keyedit.c:800
++#: g10/keyedit.c:801
  msgid " (reordered signatures follow)"
  msgstr " (omsorterte signaturer følger)"
  
- #: g10/keyedit.c:913
++#: g10/keyedit.c:914
  #, c-format
  msgid "key %s:\n"
  msgstr "nøkkel %s:\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:917
  #, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
  msgstr[0] "%d duplikatsignatur fjernet\n"
  msgstr[1] "%d duplikatsignaturer fjernet\n"
  
- #: g10/keyedit.c:919 g10/keylist.c:480
++#: g10/keyedit.c:920 g10/keylist.c:480
  #, c-format
  msgid "%d signature not checked due to a missing key\n"
  msgid_plural "%d signatures not checked due to missing keys\n"
  msgstr[0] "%d signatur ble ikke kontrollert på grunn av manglende nøkkel\n"
  msgstr[1] "%d signaturer ble ikke kontrollert på grunn av manglende nøkkel\n"
  
- #: g10/keyedit.c:923 g10/keylist.c:476
++#: g10/keyedit.c:924 g10/keylist.c:476
  #, c-format
  msgid "%d bad signature\n"
  msgid_plural "%d bad signatures\n"
  msgstr[0] "%d ubrukelig signatur\n"
  msgstr[1] "%d ubrukelige signaturer\n"
  
- #: g10/keyedit.c:927
++#: g10/keyedit.c:928
  #, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
  msgstr[0] "%d signatur omsortert\n"
  msgstr[1] "%d signaturer omsortert\n"
  
- #: g10/keyedit.c:932
++#: g10/keyedit.c:933
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
@@@ -3699,7 -2843,6 +3655,7 @@@ msgstr "
  "Advarsel: fant feil og kontrollerte bare selvsignaturer. Kjør «%s» for å "
  "kontrollere alle signaturer.\n"
  
- #: g10/keyedit.c:992 g10/pkclist.c:274
++#: g10/keyedit.c:993 g10/pkclist.c:274
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
  "keys\n"
@@@ -3710,17 -2853,14 +3666,17 @@@ msgstr "
  "andre brukeres nøkler (ved å se på pass, sjekke fingeravtrykk fra\n"
  "forskjellige kilder, osv.)\n"
  
- #: g10/keyedit.c:996 g10/pkclist.c:286
++#: g10/keyedit.c:997 g10/pkclist.c:286
  #, c-format
  msgid "  %d = I trust marginally\n"
  msgstr "  %d = Jeg stoler marginalt\n"
  
- #: g10/keyedit.c:997 g10/pkclist.c:288
++#: g10/keyedit.c:998 g10/pkclist.c:288
  #, c-format
  msgid "  %d = I trust fully\n"
  msgstr "  %d = Jeg stoler fullt\n"
  
- #: g10/keyedit.c:1015
++#: g10/keyedit.c:1016
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
@@@ -3730,52 -2870,40 +3686,52 @@@ msgstr "
  "En dybde på over 1 tillater at nøkkelen du signerer\n"
  "lager tillitssignaturer på dine vegne.\n"
  
- #: g10/keyedit.c:1032
++#: g10/keyedit.c:1033
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  "Skriv inn et domene som denne signaturen skal begrenses til, eller trykk "
  "enter hvis ingen.\n"
  
- #: g10/keyedit.c:1160
++#: g10/keyedit.c:1161
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr "Hopper over bruker-ID «%s», som ikke er en tekst-iD.\n"
  
- #: g10/keyedit.c:1168
++#: g10/keyedit.c:1169
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "Bruker-ID «%s» er opphevet."
  
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
- #: g10/keyedit.c:2246
++#: g10/keyedit.c:1178 g10/keyedit.c:1206 g10/keyedit.c:1233 g10/keyedit.c:1417
++#: g10/keyedit.c:2247
  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:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
- #: g10/keyedit.c:2251 g10/keyedit.c:3177
++#: g10/keyedit.c:1192 g10/keyedit.c:1220 g10/keyedit.c:1247 g10/keyedit.c:1423
++#: g10/keyedit.c:2252 g10/keyedit.c:3178
  msgid "  Unable to sign.\n"
  msgstr "  Klarte ikke å signere.\n"
  
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1197
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "Bruker-ID «%s» er utgått."
  
- #: g10/keyedit.c:1224
++#: g10/keyedit.c:1225
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "Bruker-ID «%s» er ikke selvsignert."
  
- #: g10/keyedit.c:1253
++#: g10/keyedit.c:1254
  #, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "Bruker-ID «%s» er signerbar.  "
  
- #: g10/keyedit.c:1255
++#: g10/keyedit.c:1256
  msgid "Sign it? (y/N) "
  msgstr "Signere den? (j/N) "
  
- #: g10/keyedit.c:1282
++#: g10/keyedit.c:1283
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -3784,11 -2912,9 +3740,11 @@@ msgstr "
  "Selvsignaturen på «%s»\n"
  "er en PGP 2.x-aktig signatur.\n"
  
- #: g10/keyedit.c:1291
++#: g10/keyedit.c:1292
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr "Vil du forfremme den til en OpenPGP-selvsignatur? (j/N) "
  
- #: g10/keyedit.c:1304
++#: g10/keyedit.c:1305
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3797,11 -2923,9 +3753,11 @@@ msgstr "
  "Gjeldende signatur på «%s»\n"
  "er utgått.\n"
  
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:1310
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr "Vil du utstede en ny signatur for å erstatte den som er utgått? (j/N) "
  
- #: g10/keyedit.c:1330
++#: g10/keyedit.c:1331
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3810,43 -2934,34 +3766,43 @@@ msgstr "
  "Din nåværede signatur på «%s»\n"
  "er en lokal signatur.\n"
  
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:1336
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr "Vil du forfremme den til en fullt eksporterbar signatur? (j/N) "
  
- #: g10/keyedit.c:1355
++#: g10/keyedit.c:1356
  #, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "«%s» var allerede lokalt signert med nøkkelen %s\n"
  
- #: g10/keyedit.c:1359
++#: g10/keyedit.c:1360
  #, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "«%s» var allerede signert med nøkkelen %s\n"
  
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:1365
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "Vil du signere den på nytt likevel? (j/N) "
  
- #: g10/keyedit.c:1386
++#: g10/keyedit.c:1387
  #, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "Ingenting å signere med nøkkelen %s\n"
  
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1411
  msgid "This key has expired!"
  msgstr "Denne nøkkelen er utgått."
  
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1429
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "Denne nøkkelen utgår %s.\n"
  
- #: g10/keyedit.c:1434
++#: g10/keyedit.c:1435
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr "Vil du at signaturen skal utgå på samme tidspunkt? (J/n) "
  
- #: g10/keyedit.c:1475
++#: g10/keyedit.c:1476
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -3856,31 -2971,25 +3812,31 @@@ msgstr "
  "tilhører den overnevnte personen? Skriv «0» hvis du ikke vet\n"
  "svaret.\n"
  
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1481
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) Jeg vil ikke svare.%s\n"
  
- #: g10/keyedit.c:1482
++#: g10/keyedit.c:1483
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) Jeg har ikke sjekket i det hele tatt.%s\n"
  
- #: g10/keyedit.c:1484
++#: g10/keyedit.c:1485
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) Jeg har gjort en vanlig sjekk.%s\n"
  
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:1488
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) Jeg har sjekket veldig nøye.%s\n"
  
- #: g10/keyedit.c:1494
++#: g10/keyedit.c:1495
  msgid "Your selection? (enter '?' for more information): "
  msgstr "Hva velger du? (skriv «?» for mer informasjon): "
  
- #: g10/keyedit.c:1521
++#: g10/keyedit.c:1522
  #, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -3889,224 -2998,170 +3845,224 @@@ msgstr "
  "Er du sikker på at du vil signerere denne nøkkelen med\n"
  "nøkkelen «%s» (%s)\n"
  
- #: g10/keyedit.c:1529
++#: g10/keyedit.c:1530
  msgid "This will be a self-signature.\n"
  msgstr "Dette skal være en selvsignatur.\n"
  
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:1535
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr "ADVARSEL: signaturen blir ikke markert som ikke-eksporterbar.\n"
  
- #: g10/keyedit.c:1541
++#: g10/keyedit.c:1542
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr "ADVARSEL: signaturen blir ikke markert som ikke-opphevbar.\n"
  
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1552
  msgid "The signature will be marked as non-exportable.\n"
  msgstr "Signaturen blir markert som ikke-eksporterbar.\n"
  
- #: g10/keyedit.c:1558
++#: g10/keyedit.c:1559
  msgid "The signature will be marked as non-revocable.\n"
  msgstr "Signaturen blir markert som ikke-opphevbar.\n"
  
- #: g10/keyedit.c:1565
++#: g10/keyedit.c:1566
  msgid "I have not checked this key at all.\n"
  msgstr "Jeg har ikke sjekket denne nøkkelen i det hele tatt.\n"
  
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:1571
  msgid "I have checked this key casually.\n"
  msgstr "Jeg har sjekket denne nøkkelen på vanlig måte.\n"
  
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:1576
  msgid "I have checked this key very carefully.\n"
  msgstr "Jeg har sjekket denne nøkkelen veldig nøye.\n"
  
- #: g10/keyedit.c:1587
++#: g10/keyedit.c:1588
  msgid "Really sign? (y/N) "
  msgstr "Er du sikker på at du vil signere? (j/N) "
  
- #: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
- #: g10/keyedit.c:6463 g10/sign.c:323
++#: g10/keyedit.c:1639 g10/keyedit.c:6308 g10/keyedit.c:6391 g10/keyedit.c:6500
++#: g10/keyedit.c:6562 g10/sign.c:325
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "signering mislyktes: %s\n"
  
- #: g10/keyedit.c:1725
++#: g10/keyedit.c:1726
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  "Nøkkelen har bare stubbe- eller kortnøkkel-elementer. Ingen passordfrase å "
  "endre.\n"
  
- #: g10/keyedit.c:1755
++#: g10/keyedit.c:1756
  #, c-format
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "nøkkel %s: feil under endring av passordfrase: %s\n"
  
- #: g10/keyedit.c:1869
++#: g10/keyedit.c:1870
  msgid "save and quit"
  msgstr "lagre og avslutte"
  
- #: g10/keyedit.c:1872
++#: g10/keyedit.c:1873
  msgid "show key fingerprint"
  msgstr "vise nøkkelens fingeravtrykk"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1874
  msgid "show the keygrip"
  msgstr "vis nøkkelgrep"
  
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1875
  msgid "list key and user IDs"
  msgstr "vis nøkler og bruker-id-er"
  
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1877
  msgid "select user ID N"
  msgstr "velger bruker-ID N"
  
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1878
  msgid "select subkey N"
  msgstr "velger bruker-ID N"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1879
  msgid "check signatures"
  msgstr "sjekke signaturer"
  
- #: g10/keyedit.c:1884
++#: g10/keyedit.c:1885
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr "signer valgte bruker-id-er [* se nedenfor for relevante kommandoer]"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1890
  msgid "sign selected user IDs locally"
  msgstr "signerer valgte bruker-id-er lokalt"
  
- #: g10/keyedit.c:1890
++#: g10/keyedit.c:1891
  msgid "sign selected user IDs with a trust signature"
  msgstr "signer valgte bruker-id-er med tillitssignatur"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1893
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr ""
  "signer valgte bruker-id-er med en signatur som ikke kan trekkes tilbake"
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1895
  msgid "add a user ID"
  msgstr "legg til bruker-ID"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1897
  msgid "add a photo ID"
  msgstr "legg til foto-ID"
  
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1898
  msgid "delete selected user IDs"
  msgstr "slett valgte bruker-id-er"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1901
  msgid "add a subkey"
  msgstr "legg til undernøkkel"
  
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1904
  msgid "add a key to a smartcard"
  msgstr "legg til nøkkel på et smartkort"
  
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1906
  msgid "move a key to a smartcard"
  msgstr "flytt nøkkel til et smartkort"
  
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1908
  msgid "move a backup key to a smartcard"
  msgstr "flytt en sikkerhetskopi-nøkkel til et smartkort"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1910
  msgid "delete selected subkeys"
  msgstr "slett valgte undernøkler"
  
- #: g10/keyedit.c:1911
++#: g10/keyedit.c:1912
  msgid "add a revocation key"
  msgstr "legg til opphevingsnøkkel"
  
- #: g10/keyedit.c:1913
++#: g10/keyedit.c:1914
  msgid "delete signatures from the selected user IDs"
  msgstr "slett signaturer fra valgte bruker-id-er"
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1916
  msgid "change the expiration date for the key or selected subkeys"
  msgstr "endre utløpsdato for nøkkelen eller valgte undernøkler"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1918
  msgid "flag the selected user ID as primary"
  msgstr "marker valgt bruker-ID som primær"
  
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1921
  msgid "list preferences (expert)"
  msgstr "vis innstillinger (avansert)"
  
- #: g10/keyedit.c:1921
++#: g10/keyedit.c:1922
  msgid "list preferences (verbose)"
  msgstr "vis innstillinger (detaljert)"
  
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:1924
  msgid "set preference list for the selected user IDs"
  msgstr "velg oppsettsliste for valgte bruker-id-er"
  
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1927
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr "endre adresse til foretrukket nøkkeltjener for valgte bruker-id-er"
  
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1929
  msgid "set a notation for the selected user IDs"
  msgstr "endre notat for valgte bruker-id-er"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1931
  msgid "change the passphrase"
  msgstr "endre passordfrase"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1934
  msgid "change the ownertrust"
  msgstr "endre eiertillit"
  
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1937
  msgid "revoke signatures on the selected user IDs"
  msgstr "opphev signaturer på valgte bruker-id-er"
  
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1939
  msgid "revoke selected user IDs"
  msgstr "opphev valgte bruker-id-er"
  
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1942
  msgid "revoke key or selected subkeys"
  msgstr "opphev nøkkel eller valgte undernøkler"
  
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1944
  msgid "enable key"
  msgstr "ta nøkkel i bruk"
  
- #: g10/keyedit.c:1944
++#: g10/keyedit.c:1945
  msgid "disable key"
  msgstr "ta nøkkel ut av bruk"
  
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1947
  msgid "show selected photo IDs"
  msgstr "vis valgte foto-id-er"
  
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1949
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  "pakkk sammen ubrukelige bruker-id-er og fjern ubrukelige signaturer fra "
  "nøkkel"
  
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:1951
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  "pakkk sammen ubrukelige bruker-id-er og fjern alle signaturer fra nøkkel"
  
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2063
  msgid "Secret key is available.\n"
  msgstr "Hemmelig nøkkel er tilgjengelig.\n"
  
- #: g10/keyedit.c:2162
++#: g10/keyedit.c:2163
  msgid "Need the secret key to do this.\n"
  msgstr "Du trenger tilhørende hemmelig nøkkel for å gjøre dette.\n"
  
- #: g10/keyedit.c:2183
++#: g10/keyedit.c:2184
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4120,256 -3175,202 +4076,262 @@@ msgstr "
  "  (nrsign), eller hvilken som helst kombinasjon av disse (ltsign, tnrsign, "
  "osv.).\n"
  
- #: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
++#: g10/keyedit.c:2240 g10/keyedit.c:3178 g10/keyedit.c:3317 g10/keyedit.c:3379
  msgid "Key is revoked."
  msgstr "Nøkkelen er opphevet."
  
- #: g10/keyedit.c:2262
++#: g10/keyedit.c:2263
  msgid "Really sign all user IDs? (y/N) "
  msgstr "Er du sikekr på at du vil signerere alle bruker-id-er? (j/N) "
  
- #: g10/keyedit.c:2266
++#: g10/keyedit.c:2267
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "Er du sikker på at du vil signerere alle bruker-id-er? (j/N) "
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2275
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Tips: Velg bruker-id-en(e) du vil signere\n"
  
- #: g10/keyedit.c:2285
++#: g10/keyedit.c:2286
  #, c-format
  msgid "Unknown signature type '%s'\n"
  msgstr "«%s» er en ukjent signaturtype\n"
  
- #: g10/keyedit.c:2309
++#: g10/keyedit.c:2310
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
  msgstr "Denne kommandoen er ikke tillatt i %s-modus.\n"
  
- #: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
++#: g10/keyedit.c:2332 g10/keyedit.c:2356 g10/keyedit.c:2550
  msgid "You must select at least one user ID.\n"
  msgstr "Du må velge minst én bruker-ID.\n"
  
- #: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
++#: g10/keyedit.c:2334 g10/keyedit.c:2358 g10/keyedit.c:2512 g10/keyedit.c:2552
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr "(Bruk kommandoen «%s».)\n"
  
- #: g10/keyedit.c:2336
++#: g10/keyedit.c:2337
  msgid "You can't delete the last user ID!\n"
  msgstr "Du kan ikke slette siste bruker-ID.\n"
  
- #: g10/keyedit.c:2339
++#: g10/keyedit.c:2340
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "Er du sikker på at du vil fjerne alle valgte bruker-id-er? (j/N) "
  
- #: g10/keyedit.c:2340
++#: g10/keyedit.c:2341
  msgid "Really remove this user ID? (y/N) "
  msgstr "Er du sikker på at du vil fjerne valgt bruker-ID? (j/N) "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2397
++#: g10/keyedit.c:2398
  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:2409 g10/keyedit.c:4866
++#: g10/keyedit.c:2410 g10/keyedit.c:4964
  msgid "You must select exactly one key.\n"
  msgstr "Du må velge minst én nøkkel.\n"
  
- #: g10/keyedit.c:2436
++#: g10/keyedit.c:2437
  msgid "Command expects a filename argument\n"
  msgstr "Kommandoen forventer et filnavn-argument\n"
  
- #: g10/keyedit.c:2457
++#: g10/keyedit.c:2458
  #, c-format
  msgid "Can't open '%s': %s\n"
  msgstr "Klarte ikke å åpne «%s»: %s\n"
  
- #: g10/keyedit.c:2474
++#: g10/keyedit.c:2475
  #, c-format
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "Feil under lesing av sikkerhetskopi-nøkkel fra «%s»: %s\n"
  
- #: g10/keyedit.c:2509
++#: g10/keyedit.c:2510
  msgid "You must select at least one key.\n"
  msgstr "Du må velge minst én nøkkel.\n"
  
- #: g10/keyedit.c:2515
++#: g10/keyedit.c:2516
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "Er du sikker på at du vil slette valgt nøkkel? (j/N) "
  
- #: g10/keyedit.c:2517
++#: g10/keyedit.c:2518
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "Er du sikker på at du vil slette denne nøkkelen? (j/N) "
  
- #: g10/keyedit.c:2555
++#: g10/keyedit.c:2556
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr "Er du sikker på at du vil oppheve alle valgte bruker-id-er? (j/N) "
  
- #: g10/keyedit.c:2556
++#: g10/keyedit.c:2557
  msgid "Really revoke this user ID? (y/N) "
  msgstr "Er du sikker på at du vil oppheve denne bruker-id-en? (j/N) "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2575
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "Er du sikker på at du vil oppheve hele nøkkelen? (j/N) "
  
- #: g10/keyedit.c:2585
++#: g10/keyedit.c:2586
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "Er du sikker på at du vil oppheve valgte undernøkler? (j/N) "
  
- #: g10/keyedit.c:2587
++#: g10/keyedit.c:2588
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "Er du sikker på at du vil oppheve denne undernøkkelen? (j/N) "
  
- #: g10/keyedit.c:2645
++#: g10/keyedit.c:2646
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  "Du kan ikke justere eiertillit når du bruker selvvalgt tillitsdatabase\n"
  
- #: g10/keyedit.c:2690
++#: g10/keyedit.c:2691
  msgid "Set preference list to:\n"
  msgstr "Bytt oppsettsliste til:\n"
  
- #: g10/keyedit.c:2697
++#: g10/keyedit.c:2698
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr ""
  "Er du sikker på at du vil oppdatere oppsett for valgte bruker-id-er? (j/N) "
  
- #: g10/keyedit.c:2699
++#: g10/keyedit.c:2700
  msgid "Really update the preferences? (y/N) "
  msgstr "Er du sikker på at du vil oppdatere oppsett? (j/N) "
  
- #: g10/keyedit.c:2773
++#: g10/keyedit.c:2774
  msgid "Save changes? (y/N) "
  msgstr "Vil du lagre endringer? (j/N) "
  
- #: g10/keyedit.c:2777
++#: g10/keyedit.c:2778
  msgid "Quit without saving? (y/N) "
  msgstr "Vil du avslutte uten å lagre? (j/N) "
  
- #: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
- #: g10/keyedit.c:3267 g10/keyedit.c:3332
++#: g10/keyedit.c:2789 g10/keyedit.c:2799 g10/keyedit.c:2943 g10/keyedit.c:3046
++#: g10/keyedit.c:3268 g10/keyedit.c:3333 g10/keyedit.c:3409
  #, c-format
  msgid "update failed: %s\n"
  msgstr "oppdatering mislyktes: %s\n"
  
- #: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
++#: g10/keyedit.c:2805 g10/keyedit.c:3273 g10/keyedit.c:3338 g10/keyedit.c:3416
  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:3038
++#: g10/keyedit.c:3039
  #, c-format
  msgid "User ID revocation failed: %s\n"
  msgstr "oppheving av bruker-ID mislyktes: %s\n"
  
- #: g10/keyedit.c:3083
++#: g10/keyedit.c:3084
  #, c-format
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "«%s» er ikke et fingeravtrykk\n"
  
- #: g10/keyedit.c:3112
++#: g10/keyedit.c:3113
  #, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "«%s» er ikke primært fingeravtrykk\n"
  
- #: g10/keyedit.c:3248 g10/keyedit.c:3251
++#: g10/keyedit.c:3249 g10/keyedit.c:3252
  #, c-format
  msgid "Invalid user ID '%s': %s\n"
  msgstr "Bruker-ID «%s» er ugyldig: %s\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  msgid "No matching user IDs."
  msgstr "Ingen treff på bruker-id-er."
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  msgid "Nothing to sign.\n"
  msgstr "Ingenting å signere.\n"
  
- #: g10/keyedit.c:3427
++#: g10/keyedit.c:3388
+ #, fuzzy, c-format
+ #| msgid "'%s' is not a valid signature expiration\n"
+ msgid "'%s' is not a valid expiration time\n"
+ msgstr "«%s» er en ugyldig signatur-utløpstid\n"
+ 
++#: g10/keyedit.c:3508
  msgid "Digest: "
  msgstr "Kontrollsum: "
  
- #: g10/keyedit.c:3484
++#: g10/keyedit.c:3565
  msgid "Features: "
  msgstr "Funksjoner: "
  
- #: g10/keyedit.c:3495
++#: g10/keyedit.c:3576
  msgid "Keyserver no-modify"
  msgstr "Nøkkeltjener no-modify"
  
- #: g10/keyedit.c:3510 g10/keylist.c:377
++#: g10/keyedit.c:3591 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr "Foretrukket nøkkeltjener: "
  
- #: g10/keyedit.c:3518 g10/keyedit.c:3519
++#: g10/keyedit.c:3599 g10/keyedit.c:3600
  msgid "Notations: "
  msgstr "Notasjoner: "
  
- #: g10/keyedit.c:3764
++#: g10/keyedit.c:3845
  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:3836
++#: g10/keyedit.c:3917
  #, 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:3860
++#: g10/keyedit.c:3941
  #, 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:3866
++#: g10/keyedit.c:3947
  msgid "(sensitive)"
  msgstr "(sensitiv)"
  
- #: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3989 g10/keyedit.c:4131 g10/keylist.c:262 g10/keyserver.c:538
  #, c-format
  msgid "created: %s"
  msgstr "opprettet: %s"
  
- #: g10/keyedit.c:3911 g10/keylist.c:1852
++#: g10/keyedit.c:3992 g10/keylist.c:1852
  #, c-format
  msgid "revoked: %s"
  msgstr "opphevet: %s"
  
- #: g10/keyedit.c:3913 g10/keylist.c:1858
++#: g10/keyedit.c:3994 g10/keylist.c:1858
  #, c-format
  msgid "expired: %s"
  msgstr "utgikk: %s"
  
- #: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyedit.c:3996 g10/keyedit.c:4133 g10/keylist.c:264 g10/keylist.c:1864
 +#: g10/keyserver.c:544
  #, c-format
  msgid "expires: %s"
  msgstr "utgår: %s"
  
- #: g10/keyedit.c:3917
++#: g10/keyedit.c:3998
  #, c-format
  msgid "usage: %s"
  msgstr "bruk: %s"
  
- #: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
++#: g10/keyedit.c:4006 g10/keyedit.c:4026 g10/keylist.c:267
  msgid "card-no: "
  msgstr "kortnr.: "
  
- #: g10/keyedit.c:3984
++#: g10/keyedit.c:4065
  #, c-format
  msgid "trust: %s"
  msgstr "tillit: %s"
  
- #: g10/keyedit.c:3988
++#: g10/keyedit.c:4069
  #, c-format
  msgid "validity: %s"
  msgstr "gyldighet: %s"
  
- #: g10/keyedit.c:3995
++#: g10/keyedit.c:4076
  msgid "This key has been disabled"
  msgstr "Denne nøkkelen er ikke i bruk"
  
- #: g10/keyedit.c:4013
++#: g10/keyedit.c:4094
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4377,18 -3378,12 +4339,18 @@@ 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:4069 g10/keyedit.c:4500 g10/keyserver.c:548
- #: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: g10/keyedit.c:4150 g10/keyedit.c:4581 g10/keyserver.c:548
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:712
 +#: dirmngr/ocsp.c:703
  msgid "revoked"
  msgstr "opphevet"
  
- #: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
- #: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4152 g10/keyedit.c:4583 g10/keyserver.c:552
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:714
  msgid "expired"
  msgstr "utgått"
  
- #: g10/keyedit.c:4188
++#: g10/keyedit.c:4269
  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"
@@@ -4396,15 -3391,12 +4358,15 @@@ 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:4240
++#: g10/keyedit.c:4321
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr "ADVARSEL: Undernøkkel for kryptering utløper snart.\n"
  
- #: g10/keyedit.c:4241
++#: g10/keyedit.c:4322
  msgid "You may want to change its expiration date too.\n"
  msgstr "Du bør vurdere å endre utløpsdato samtidig.\n"
  
- #: g10/keyedit.c:4300
++#: g10/keyedit.c:4381
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4414,72 -3406,57 +4376,72 @@@ msgstr "
  "føre til at\n"
  "         enkelte PGP-versjoner avviser nøkkelen.\n"
  
- #: g10/keyedit.c:4305 g10/keyedit.c:4595
++#: g10/keyedit.c:4386 g10/keyedit.c:4676
  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:4311
++#: g10/keyedit.c:4392
  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:4326 g10/keygen.c:2697
++#: g10/keyedit.c:4407 g10/keygen.c:2719
  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:4428
++#: g10/keyedit.c:4509
  msgid "Delete this good signature? (y/N/q)"
  msgstr "Slette denne gode signaturen? (j/N/a)"
  
- #: g10/keyedit.c:4438
++#: g10/keyedit.c:4519
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "Vil du slette denne ugyldige signaturen? (j/N/q)"
  
- #: g10/keyedit.c:4442
++#: g10/keyedit.c:4523
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "Vil du slette denne ukjente signaturen? (j/N/q)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4530
  msgid "Really delete this self-signature? (y/N)"
  msgstr "Er du sikker på at du vil slette denne selvsignaturen? (j/N)"
  
- #: g10/keyedit.c:4465
++#: g10/keyedit.c:4546
  #, 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:4469
++#: g10/keyedit.c:4550
  msgid "Nothing deleted.\n"
  msgstr "Ingen ble slettet.\n"
  
- #: g10/keyedit.c:4504 g10/trust.c:693
++#: g10/keyedit.c:4585 g10/trust.c:716
  msgid "invalid"
  msgstr "ugyldig"
  
- #: g10/keyedit.c:4506
++#: g10/keyedit.c:4587
  #, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "Bruker-ID «%s» pakket sammen: %s\n"
  
- #: g10/keyedit.c:4512
++#: g10/keyedit.c:4593
  #, 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:4520
++#: g10/keyedit.c:4601
  #, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "Bruker-ID «%s»: allerede minimert\n"
  
- #: g10/keyedit.c:4521
++#: g10/keyedit.c:4602
  #, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "Bruker-ID «%s»: allerede renset\n"
  
- #: g10/keyedit.c:4590
++#: g10/keyedit.c:4671
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4489,267 -3466,208 +4451,267 @@@ msgstr "
  "         kan dette føre til at enkelte PGP-versjoner ikke vil kunne bruke "
  "nøkkelen.\n"
  
- #: g10/keyedit.c:4601
++#: g10/keyedit.c:4682
  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:4618
++#: g10/keyedit.c:4699
  msgid "Enter the user ID of the designated revoker: "
  msgstr "Skriv inn oppheverens bruker-ID: "
  
- #: g10/keyedit.c:4643
++#: g10/keyedit.c:4724
  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:4658
++#: g10/keyedit.c:4739
  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:4680
++#: g10/keyedit.c:4761
  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:4698
++#: g10/keyedit.c:4779
  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:4704
++#: g10/keyedit.c:4785
  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:4755
++#: g10/keyedit.c:4848
  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:4760
++#: g10/keyedit.c:4853
  msgid "Changing expiration time for a subkey.\n"
  msgstr "Endrer utløpstid for undernøkkel.\n"
  
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:4856
  msgid "Changing expiration time for the primary key.\n"
  msgstr "Endrer utløpstid for primærnøkkel.\n"
  
- #: g10/keyedit.c:4814
++#: g10/keyedit.c:4910
  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:4987
++#: g10/keyedit.c:5085
  #, c-format
  msgid "signing subkey %s is already cross-certified\n"
  msgstr "signerings-undernøkkel %s er allerede kryssertifisert\n"
  
- #: g10/keyedit.c:4993
++#: g10/keyedit.c:5091
  #, 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:5108
++#: g10/keyedit.c:5206
  msgid "Please select exactly one user ID.\n"
  msgstr "Velg én bruker-ID.\n"
  
- #: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
++#: g10/keyedit.c:5247 g10/keyedit.c:5361 g10/keyedit.c:5474 g10/keyedit.c:5611
  #, 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:5320
++#: g10/keyedit.c:5418
  msgid "Enter your preferred keyserver URL: "
  msgstr "Skriv inn adresse til foretrukket nøkkeltjener: "
  
- #: g10/keyedit.c:5399
++#: g10/keyedit.c:5497
  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:5400
++#: g10/keyedit.c:5498
  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:5459
++#: g10/keyedit.c:5557
  msgid "Enter the notation: "
  msgstr "Skriv inn notat: "
  
- #: g10/keyedit.c:5606
++#: g10/keyedit.c:5704
  msgid "Proceed? (y/N) "
  msgstr "Vil du fortsette? (j/N) "
  
- #: g10/keyedit.c:5676
++#: g10/keyedit.c:5774
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "Ingen bruker-ID med indeks %d\n"
  
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5836
  #, c-format
  msgid "No user ID with hash %s\n"
  msgstr "Ingen bruker-ID med kontrollsum %s\n"
  
- #: g10/keyedit.c:5839
++#: g10/keyedit.c:5937
  #, c-format
  msgid "No subkey with key ID '%s'.\n"
  msgstr "Ingen undernøkkel med ID «%s».\n"
  
- #: g10/keyedit.c:5861
++#: g10/keyedit.c:5959
  #, c-format
  msgid "No subkey with index %d\n"
  msgstr "Ingen undernøkkel med indeks %d\n"
  
- #: g10/keyedit.c:6002
++#: g10/keyedit.c:6100
  #, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "bruker-ID: «%s»\n"
  
- #: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
++#: g10/keyedit.c:6103 g10/keyedit.c:6205 g10/keyedit.c:6253
  #, 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:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
++#: g10/keyedit.c:6105 g10/keyedit.c:6207 g10/keyedit.c:6255
  msgid " (non-exportable)"
  msgstr " (ikke-eksporterbar)"
  
- #: g10/keyedit.c:6011
++#: g10/keyedit.c:6109
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "Denne signaturen utgikk %s.\n"
  
- #: g10/keyedit.c:6016
++#: g10/keyedit.c:6114
  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:6021
++#: g10/keyedit.c:6119
  msgid "Create a revocation certificate for this signature? (y/N) "
  msgstr "Vil du lage et opphevelsessertifikat for denne signaturen? (j/N) "
  
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6173
  msgid "Not signed by you.\n"
  msgstr "Ikke signert av deg.\n"
  
- #: g10/keyedit.c:6081
++#: g10/keyedit.c:6179
  #, 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:6110
++#: g10/keyedit.c:6208
  msgid " (non-revocable)"
  msgstr " (kan ikke oppheves)"
  
- #: g10/keyedit.c:6117
++#: g10/keyedit.c:6215
  #, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "opphevet med nøkkelen %s %s\n"
  
- #: g10/keyedit.c:6142
++#: g10/keyedit.c:6240
  msgid "You are about to revoke these signatures:\n"
  msgstr "Du er i ferd med å oppheve følgende signaturer:\n"
  
- #: g10/keyedit.c:6165
++#: g10/keyedit.c:6263
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "Er du sikker på at du vil lage opphevelsessertifikatene? (j/N) "
  
- #: g10/keyedit.c:6198
++#: g10/keyedit.c:6296
  msgid "no secret key\n"
  msgstr "ingen hemmelig nøkkel\n"
  
- #: g10/keyedit.c:6246
++#: g10/keyedit.c:6344
  #, 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:6256
++#: g10/keyedit.c:6354
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "bruker-ID «%s» er allerede opphevet\n"
  
- #: g10/keyedit.c:6273
++#: g10/keyedit.c:6371
  #, 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 fremtiden\n"
  
- #: g10/keyedit.c:6386
++#: g10/keyedit.c:6485
  #, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "Nøkkelen %s er allerede opphevet.\n"
  
- #: g10/keyedit.c:6448
++#: g10/keyedit.c:6547
  #, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "Undernøkkel %s er allerede opphevet.\n"
  
- #: g10/keyedit.c:6545
++#: g10/keyedit.c:6644
  #, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr "Viser %s foto-ID av størrelsen %ld for nøkkel %s (uid %d)\n"
  
- #: g10/keygen.c:305
++#: g10/keygen.c:316
  #, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "innstilling «%s» er duplisert\n"
  
- #: g10/keygen.c:312
++#: g10/keygen.c:323
  msgid "too many cipher preferences\n"
  msgstr "for mange krypteringsinnstillinger\n"
  
- #: g10/keygen.c:314
++#: g10/keygen.c:325
  msgid "too many digest preferences\n"
  msgstr "for mange kontrollsum-innstillinger\n"
  
- #: g10/keygen.c:316
++#: g10/keygen.c:327
  msgid "too many compression preferences\n"
  msgstr "for mange komprimeringsinnstillinger\n"
  
- #: g10/keygen.c:457
++#: g10/keygen.c:468
  #, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "«%s» er et ugyldig oppsettsvalg\n"
  
- #: g10/keygen.c:936
++#: g10/keygen.c:947
  msgid "writing direct signature\n"
  msgstr "skriver direkte signatur\n"
  
- #: g10/keygen.c:982
++#: g10/keygen.c:993
  msgid "writing self signature\n"
  msgstr "skriver selvsignatur\n"
  
- #: g10/keygen.c:1038
++#: g10/keygen.c:1049
  msgid "writing key binding signature\n"
  msgstr "skriver nøkkelbindende signatur\n"
  
- #: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
- #: g10/keygen.c:1610 g10/keygen.c:1615
++#: g10/keygen.c:1413 g10/keygen.c:1418 g10/keygen.c:1470 g10/keygen.c:1475
++#: g10/keygen.c:1622 g10/keygen.c:1627
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "ugyldig nøkkelstørrelse. Bruker %u bit\n"
  
- #: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
++#: g10/keygen.c:1424 g10/keygen.c:1481 g10/keygen.c:1489 g10/keygen.c:1633
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "nøkkelstørrelse rundet opp til %u bit\n"
  
- #: g10/keygen.c:1503
++#: g10/keygen.c:1515
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  "ADVARSEL: noen OpenPGP-programmer klarer ikke å behandle DSA-nøkler med "
  "denne kontrollsum-størrelsen\n"
  
- #: g10/keygen.c:1677
++#: g10/keygen.c:1689
  msgid "Sign"
  msgstr "Signere"
  
- #: g10/keygen.c:1680
++#: g10/keygen.c:1692
  msgid "Certify"
  msgstr "Bekrefte"
  
- #: g10/keygen.c:1683
++#: g10/keygen.c:1695
  msgid "Encrypt"
  msgstr "Kryptere data"
  
- #: g10/keygen.c:1686
++#: g10/keygen.c:1698
  msgid "Authenticate"
  msgstr "Autentisere"
  
@@@ -4767,150 -3685,119 +4729,150 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1705
++#: g10/keygen.c:1717
  msgid "SsEeAaQq"
  msgstr "SsKkAaQq"
  
- #: g10/keygen.c:1732
++#: g10/keygen.c:1744
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "Mulige handlinger med en %s-nøkkel: "
  
- #: g10/keygen.c:1738
++#: g10/keygen.c:1750
  msgid "Current allowed actions: "
  msgstr "Tillatte handlinger: "
  
- #: g10/keygen.c:1743
++#: g10/keygen.c:1755
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) Slå av/på signeringsfunksjon\n"
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) Slå av/på krypteringsfunksjon\n"
  
- #: g10/keygen.c:1749
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) Slå av/på autentiseringsfunksjon\n"
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) Ferdig\n"
  
- #: g10/keygen.c:1881 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1893 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Velg hvilken type nøkkel du vil ha:\n"
  
- #: g10/keygen.c:1885
++#: g10/keygen.c:1897
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) RSA og RSA (standard)\n"
  
- #: g10/keygen.c:1889
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA og Elgamal\n"
  
- #: g10/keygen.c:1892
++#: g10/keygen.c:1904
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (bare signering)\n"
  
- #: g10/keygen.c:1894
++#: g10/keygen.c:1906
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (bare signering)\n"
  
- #: g10/keygen.c:1900
++#: g10/keygen.c:1912
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) ElGamal (bare kryptering)\n"
  
- #: g10/keygen.c:1902
++#: g10/keygen.c:1914
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (bare kryptering)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1920
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (sette dine egne muligheter)\n"
  
- #: g10/keygen.c:1910
++#: g10/keygen.c:1922
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (sette dine egne muligheter)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1928
  #, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) ECC og ECC\n"
  
- #: g10/keygen.c:1918
++#: g10/keygen.c:1930
  #, c-format
  msgid "  (%d) ECC (sign only)\n"
  msgstr "  (%d) ECC (kun signering)\n"
  
- #: g10/keygen.c:1920
++#: g10/keygen.c:1932
  #, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "  (%d) ECC (velg funksjoner selv)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1934
  #, c-format
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "  (%d) ECC (kun kryptering)\n"
  
- #: g10/keygen.c:1926
++#: g10/keygen.c:1938
  #, c-format
  msgid "  (%d) Existing key\n"
  msgstr "  (%d) Nøkkel\n"
  
- #: g10/keygen.c:2022 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:206
  msgid "Enter the keygrip: "
  msgstr "Skriv inn nøkkelgrep: "
  
- #: g10/keygen.c:2035 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2047 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr "Ugyldig nøkkelgrep (forventer 40 heks-sifre)\n"
  
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2049 sm/certreqgen-ui.c:216
  msgid "No key with this keygrip\n"
  msgstr "Ingen nøkkel med dette nøkkelgrepet\n"
  
- #: g10/keygen.c:2111 g10/keygen.c:2125
++#: g10/keygen.c:2133 g10/keygen.c:2147
  #, c-format
  msgid "rounded to %u bits\n"
  msgstr "rundet av til %u bit\n"
  
- #: g10/keygen.c:2166
++#: g10/keygen.c:2188
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr "%s-nøkler må være mellom %u og %u bit lange.\n"
  
- #: g10/keygen.c:2174
++#: g10/keygen.c:2196
  #, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Hvor stor vil du at undernøkkelen skal være? (%u) "
  
- #: g10/keygen.c:2177 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2199 sm/certreqgen-ui.c:183
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Hvor stor skal nøkkelen være? (%u) "
  
- #: g10/keygen.c:2191 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2213 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Forespurt nøkkelstørrelse er %u bit\n"
  
- #: g10/keygen.c:2237
++#: g10/keygen.c:2259
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Velg elliptisk kurve:\n"
  
- #: g10/keygen.c:2409
++#: g10/keygen.c:2431
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -4926,7 -3813,6 +4888,7 @@@ msgstr "
  "      <n>m = nøkkelen utgår om n months\n"
  "      <n>y = nøkkelen utgår om n years\n"
  
- #: g10/keygen.c:2420
++#: g10/keygen.c:2442
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -4942,38 -3828,30 +4904,38 @@@ msgstr "
  "      <n>m = signaturen utgår om n months\n"
  "      <n>y = signaturen utgår om n years\n"
  
- #: g10/keygen.c:2443
++#: g10/keygen.c:2465
  msgid "Key is valid for? (0) "
  msgstr "Nøkkelen er gyldig for? (0) "
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2470
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Signaturen er gyldig for? (%s) "
  
- #: g10/keygen.c:2461 g10/keygen.c:2486
++#: g10/keygen.c:2483 g10/keygen.c:2508
  msgid "invalid value\n"
  msgstr "ugyldig verdi\n"
  
- #: g10/keygen.c:2468
++#: g10/keygen.c:2490
  msgid "Key does not expire at all\n"
  msgstr "Nøkkel utgår ikke i det hele tatt\n"
  
- #: g10/keygen.c:2469
++#: g10/keygen.c:2491
  msgid "Signature does not expire at all\n"
  msgstr "Signaturen utgår ikke i det hele tatt\n"
  
- #: g10/keygen.c:2474
++#: g10/keygen.c:2496
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "Nøkkel utgår %s\n"
  
- #: g10/keygen.c:2475
++#: g10/keygen.c:2497
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "Signaturen utgår %s\n"
  
- #: g10/keygen.c:2479
++#: g10/keygen.c:2501
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -4981,11 -3859,9 +4943,11 @@@ msgstr "
  "Systemet ditt klarer ikke å håndtere datoer etter 2038.\n"
  "Likevel håndteres det korrekt frem til 2106.\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2514
  msgid "Is this correct? (y/N) "
  msgstr "Er dette korrekt (j/N)? "
  
- #: g10/keygen.c:2560
++#: g10/keygen.c:2582
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -4999,7 -3875,6 +4961,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2575
++#: g10/keygen.c:2597
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -5015,49 -3890,38 +4977,49 @@@ msgstr "
  "    «Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>»\n"
  "\n"
  
- #: g10/keygen.c:2594
++#: g10/keygen.c:2616
  msgid "Real name: "
  msgstr "Fullt navn: "
  
- #: g10/keygen.c:2603
++#: g10/keygen.c:2625
  msgid "Invalid character in name\n"
  msgstr "Ugyldig tegn i navn\n"
  
- #: g10/keygen.c:2604
++#: g10/keygen.c:2626
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr "Tegnene «%s» og «%s» kan ikke brukes i navn\n"
  
- #: g10/keygen.c:2608
++#: g10/keygen.c:2630
  msgid "Name may not start with a digit\n"
  msgstr "Navn kan ikke begynne med siffer\n"
  
- #: g10/keygen.c:2611
++#: g10/keygen.c:2633
  msgid "Name must be at least 5 characters long\n"
  msgstr "Navnet må bestå av minst 5 tegn\n"
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2643
  msgid "Email address: "
  msgstr "E-postadresse: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2649
  msgid "Not a valid email address\n"
  msgstr "Ugyldig e-postadresse\n"
  
- #: g10/keygen.c:2636
++#: g10/keygen.c:2658
  msgid "Comment: "
  msgstr "Kommentar: "
  
- #: g10/keygen.c:2642
++#: g10/keygen.c:2664
  msgid "Invalid character in comment\n"
  msgstr "Ugyldig tegn i kommentar\n"
  
- #: g10/keygen.c:2678
++#: g10/keygen.c:2700
  #, c-format
  msgid "You are using the '%s' character set.\n"
  msgstr "Du bruker tegnsettet «%s».\n"
  
- #: g10/keygen.c:2684
++#: g10/keygen.c:2706
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5068,7 -3932,6 +5030,7 @@@ msgstr "
  "    «%s»\n"
  "\n"
  
- #: g10/keygen.c:2689
++#: g10/keygen.c:2711
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr "Ikk bruk e-postadresse som navn eller kommentar\n"
  
@@@ -5083,31 -3946,24 +5045,31 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2714
++#: g10/keygen.c:2736
  msgid "NnCcEeOoQq"
  msgstr "NnKeEeRrAa"
  
- #: g10/keygen.c:2724
++#: g10/keygen.c:2746
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (A)vslutt? "
  
- #: g10/keygen.c:2725
++#: g10/keygen.c:2747
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (R)iktig/(A)vslutt? "
  
- #: g10/keygen.c:2730
++#: g10/keygen.c:2752
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "Endre (N)avn, (E)postadresse eller (A)vslutt? "
  
- #: g10/keygen.c:2731
++#: g10/keygen.c:2753
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "Endre (N)avn, (E)postadresse eller (R)iktig/(A)vslutt? "
  
- #: g10/keygen.c:2750
++#: g10/keygen.c:2772
  msgid "Please correct the error first\n"
  msgstr "Rett opp feilen først\n"
  
- #: g10/keygen.c:2796
++#: g10/keygen.c:2818
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5119,13 -3975,10 +5081,13 @@@ msgstr "
  "diskene jobbe) mens dette pågår. Da får\n"
  "tallgeneratoren bedre muligheter til å samle inn vilkårlighetsdata.\n"
  
- #: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
- #: g10/keygen.c:4777 g10/keygen.c:4882
++#: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
++#: g10/keygen.c:4330 g10/keygen.c:4803 g10/keygen.c:5064 g10/keygen.c:5169
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Nøkkelgenerering mislyktes: %s\n"
  
- #: g10/keygen.c:3598
++#: g10/keygen.c:3922
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5136,63 -3989,50 +5098,63 @@@ msgstr "
  "    «%s»\n"
  "\n"
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3924
  msgid "Continue? (Y/n) "
  msgstr "Vil du fortsette? (J/n) "
  
- #: g10/keygen.c:3621
++#: g10/keygen.c:3945
  #, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "Det finnes allerede en nøkkel for «%s»\n"
  
- #: g10/keygen.c:3626
++#: g10/keygen.c:3950
  msgid "Create anyway? (y/N) "
  msgstr "Vil du lage nøkkel likevel? (j/N) "
  
- #: g10/keygen.c:3632
++#: g10/keygen.c:3956
  msgid "creating anyway\n"
  msgstr "lager likevel\n"
  
- #: g10/keygen.c:3981
++#: g10/keygen.c:4315
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  "Merk: Bruk «%s %s» for å se et fullverdig dialogvindu for nøkkelgenerering.\n"
  
- #: g10/keygen.c:4013
++#: g10/keygen.c:4358
  msgid "Key generation canceled.\n"
  msgstr "Nøkkelgenerering ble avbrutt.\n"
  
- #: g10/keygen.c:4073
++#: g10/keygen.c:4418
  #, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "klarte ikke å lage sikkerhetskopifila «%s»: %s\n"
  
- #: g10/keygen.c:4093
++#: g10/keygen.c:4438
  #, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "Merk: sikkerhetskopi av kortnøkkel lagret på «%s»\n"
  
- #: g10/keygen.c:4244 g10/keygen.c:4393
++#: g10/keygen.c:4589 g10/keygen.c:4738
  #, c-format
  msgid "writing public key to '%s'\n"
  msgstr "skriver offentlig nøkkel til «%s»\n"
  
- #: g10/keygen.c:4387
++#: g10/keygen.c:4732
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "fant ikke skrivbart offentlig nøkkelknippe: %s\n"
  
- #: g10/keygen.c:4401
++#: g10/keygen.c:4746
  #, c-format
  msgid "error writing public keyring '%s': %s\n"
  msgstr "feil under skriving av offentlig nøkkelknippe «%s»: %s\n"
  
- #: g10/keygen.c:4433
++#: g10/keygen.c:4778
  msgid "public and secret key created and signed.\n"
  msgstr "offentlig og hemmelig nøkkel opprettet og signert.\n"
  
- #: g10/keygen.c:4445
++#: g10/keygen.c:4790
  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"
@@@ -5201,7 -4041,6 +5163,7 @@@ msgstr "
  "vurdere å bruke kommandoen «--edit-key» for å lage en\n"
  "undernøkkel til dette formålet.\n"
  
- #: g10/keygen.c:4649 g10/keygen.c:4833
++#: g10/keygen.c:4936 g10/keygen.c:5120
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5209,7 -4048,6 +5171,7 @@@ msgstr "
  "nøkkel har blitt opprettet %lu sekund i fremtiden (time warp- eller "
  "klokkeproblem)\n"
  
- #: g10/keygen.c:4651 g10/keygen.c:4835
++#: g10/keygen.c:4938 g10/keygen.c:5122
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5217,20 -4055,16 +5179,20 @@@ msgstr "
  "nøkkel har blitt opprettet %lu sekunder i fremtiden (time warp- eller "
  "klokkeproblem)\n"
  
- #: g10/keygen.c:4662 g10/keygen.c:4846
++#: g10/keygen.c:4949 g10/keygen.c:5133
  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:4674 g10/keygen.c:4676
++#: g10/keygen.c:4961 g10/keygen.c:4963
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Hemmelige deler av primærnøkkelen er ikke tilgjengelig.\n"
  
- #: g10/keygen.c:4683 g10/keygen.c:4685
++#: g10/keygen.c:4970 g10/keygen.c:4972
  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:4704 g10/keygen.c:4860
++#: g10/keygen.c:4991 g10/keygen.c:5147
  msgid "Really create? (y/N) "
  msgstr "Er du sikker på at du vil fortsette? (j/N) "
  
@@@ -5544,123 -4313,97 +5506,123 @@@ msgstr "ADVARSEL: fant flere elementer 
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
  msgstr "selvstendig opphevelse - bruk «gpg --import» for å ta i bruk\n"
  
- #: g10/mainproc.c:1233 g10/mainproc.c:1276
++#: g10/mainproc.c:1238 g10/mainproc.c:1281
  msgid "no signature found\n"
  msgstr "fant ikke signatur\n"
  
- #: g10/mainproc.c:1607
++#: g10/mainproc.c:1612
  #, c-format
  msgid "BAD signature from \"%s\""
  msgstr "DÅRLIG signatur fra «%s»"
  
- #: g10/mainproc.c:1609
++#: g10/mainproc.c:1614
  #, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Utgått signatur fra «%s»"
  
- #: g10/mainproc.c:1611
++#: g10/mainproc.c:1616
  #, c-format
  msgid "Good signature from \"%s\""
  msgstr "God signatur fra «%s»"
  
- #: g10/mainproc.c:1630
++#: g10/mainproc.c:1635
  msgid "signature verification suppressed\n"
  msgstr "signaturbekreftelse ble hindret\n"
  
- #: g10/mainproc.c:1739
++#: g10/mainproc.c:1744
  msgid "can't handle this ambiguous signature data\n"
  msgstr "disse flertydige signaturdataene kan ikke behandles\n"
  
- #: g10/mainproc.c:1753 g10/mainproc.c:1761
++#: g10/mainproc.c:1758 g10/mainproc.c:1766
  #, c-format
  msgid "Signature made %s\n"
  msgstr "Signatur opprettet %s\n"
  
- #: g10/mainproc.c:1754 g10/mainproc.c:1762
++#: g10/mainproc.c:1759 g10/mainproc.c:1767
  #, c-format
  msgid "               using %s key %s\n"
  msgstr "               bruker %s nøkkel %s\n"
  
- #: g10/mainproc.c:1766
++#: g10/mainproc.c:1771
  #, 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:1772
++#: g10/mainproc.c:1777
  #, fuzzy, c-format
  #| msgid "                aka \"%s\""
  msgid "               issuer \"%s\"\n"
  msgstr "                aka «%s»"
  
- #: g10/mainproc.c:1789
++#: g10/mainproc.c:1794
  msgid "Key available at: "
  msgstr "Nøkkel tilgjengelig ved: "
  
- #: g10/mainproc.c:2024
++#: g10/mainproc.c:2029
  msgid "[uncertain]"
  msgstr "[usikker]"
  
- #: g10/mainproc.c:2062
++#: g10/mainproc.c:2067
  #, c-format
  msgid "                aka \"%s\""
  msgstr "                aka «%s»"
  
- #: g10/mainproc.c:2145
++#: g10/mainproc.c:2150
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "Signatur utgått %s\n"
  
- #: g10/mainproc.c:2149
++#: g10/mainproc.c:2154
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "Signatur utgår %s\n"
  
- #: g10/mainproc.c:2160
++#: g10/mainproc.c:2165
  #, c-format
  msgid "%s signature, digest algorithm %s%s%s\n"
  msgstr "%s-signatur, kontrollsum-algoritme %s%s%s\n"
  
- #: g10/mainproc.c:2161
++#: g10/mainproc.c:2166
  msgid "binary"
  msgstr "binær"
  
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2167
  msgid "textmode"
  msgstr "tekstmodus"
  
- #: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "ukjent"
  
- #: g10/mainproc.c:2164
++#: g10/mainproc.c:2169
  msgid ", key algorithm "
  msgstr ", nøkkelalgoritme"
  
- #: g10/mainproc.c:2199
++#: g10/mainproc.c:2204
  #, 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:2229
++#: g10/mainproc.c:2234
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "Klarte ikke å kontrollere signatur: %s\n"
  
- #: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
++#: g10/mainproc.c:2327 g10/mainproc.c:2346 g10/mainproc.c:2470
  msgid "not a detached signature\n"
  msgstr "ikke en separat signatur\n"
  
- #: g10/mainproc.c:2375
++#: g10/mainproc.c:2380
  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:2384
++#: g10/mainproc.c:2389
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "separat signatur av klasse 0x%02x\n"
  
- #: g10/mainproc.c:2469
++#: g10/mainproc.c:2474
  msgid "old style (PGP 2.x) signature\n"
  msgstr "gammeldags (PGP 2.x) signatur\n"
  
@@@ -5936,23 -4625,18 +5898,23 @@@ msgstr "Er dette bildet riktig (j/N/q)
  msgid "unable to display photo ID!\n"
  msgstr "klarte ikke å vise foto-ID.\n"
  
- #: g10/pkclist.c:72 g10/revoke.c:757
++#: g10/pkclist.c:72 g10/revoke.c:758
  msgid "No reason specified"
  msgstr "Ingen grunn oppgitt"
  
- #: g10/pkclist.c:74 g10/revoke.c:759
++#: g10/pkclist.c:74 g10/revoke.c:760
  msgid "Key is superseded"
  msgstr "Nøkkelen er overgått"
  
- #: g10/pkclist.c:76 g10/revoke.c:758
++#: g10/pkclist.c:76 g10/revoke.c:759
  msgid "Key has been compromised"
  msgstr "Nøkkelen har blitt kompromittert"
  
- #: g10/pkclist.c:78 g10/revoke.c:760
++#: g10/pkclist.c:78 g10/revoke.c:761
  msgid "Key is no longer used"
  msgstr "Nøkkelen er ikke lengre i bruk"
  
- #: g10/pkclist.c:80 g10/revoke.c:761
++#: g10/pkclist.c:80 g10/revoke.c:762
  msgid "User ID is no longer valid"
  msgstr "Bruker-ID er ikke lenger gyldig"
  
@@@ -6029,7 -4700,6 +5991,7 @@@ msgstr "
  "Laveste tillitsnivå for denne nøkkelen er: %s\n"
  "\n"
  
- #: g10/pkclist.c:310 g10/revoke.c:786
++#: g10/pkclist.c:310 g10/revoke.c:787
  msgid "Your decision? "
  msgstr "Hva velger du? "
  
@@@ -6228,33 -4860,26 +6190,33 @@@ msgstr "
  msgid "No such user ID.\n"
  msgstr "Bruker-id-en finnes ikke.\n"
  
- #: g10/pkclist.c:1197 g10/pkclist.c:1273
++#: g10/pkclist.c:1197 g10/pkclist.c:1274
  msgid "skipped: public key already set as default recipient\n"
  msgstr "hoppet over: offentlig nøkkel allerede valgt som standardmottaker\n"
  
- #: g10/pkclist.c:1218
++#: g10/pkclist.c:1219
  msgid "Public key is disabled.\n"
  msgstr "Offentlig nøkkel er ikke i bruk.\n"
  
- #: g10/pkclist.c:1228
++#: g10/pkclist.c:1229
  msgid "skipped: public key already set\n"
  msgstr "hoppet over: offentlig nøkkel er allerede valgt\n"
  
- #: g10/pkclist.c:1263
++#: g10/pkclist.c:1264
  #, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "«%s» er en ukjent standardmottaker\n"
  
- #: g10/pkclist.c:1312
++#: g10/pkclist.c:1313
  msgid "no valid addressees\n"
  msgstr "ingen gyldige mottakere\n"
  
- #: g10/pkclist.c:1665
++#: g10/pkclist.c:1666
  #, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "Merk: nøkkel %s har ingen %s-funksjon\n"
  
- #: g10/pkclist.c:1690
++#: g10/pkclist.c:1691
  #, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "Merk: nøkkel %s har ingen innstilling for %s\n"
@@@ -6263,28 -4887,22 +6225,28 @@@
  msgid "data not saved; use option \"--output\" to save it\n"
  msgstr "data ble ikke lagret. Bruk valget «--output» for å lagre\n"
  
- #: g10/plaintext.c:598
++#: g10/plaintext.c:614
  msgid "Detached signature.\n"
  msgstr "Adskilt signatur.\n"
  
- #: g10/plaintext.c:606
++#: g10/plaintext.c:622
  msgid "Please enter name of data file: "
  msgstr "Skriv inn navn på datafil: "
  
- #: g10/plaintext.c:643
++#: g10/plaintext.c:659
  msgid "reading stdin ...\n"
  msgstr "leser std.innkanal …\n"
  
- #: g10/plaintext.c:688
++#: g10/plaintext.c:704
  msgid "no signed data\n"
  msgstr "ingen signerte data\n"
  
- #: g10/plaintext.c:706
++#: g10/plaintext.c:722
  #, c-format
  msgid "can't open signed data '%s'\n"
  msgstr "klarte ikke å åpne signert data «%s»\n"
  
- #: g10/plaintext.c:741
++#: g10/plaintext.c:757
  #, c-format
  msgid "can't open signed data fd=%d: %s\n"
  msgstr "klarte ikke å åpne signert data fd=%d: «%s»\n"
@@@ -6348,7 -4952,6 +6310,7 @@@ msgstr "Hemmelig nøkkel er ikke tilgje
  msgid "Create a designated revocation certificate for this key? (y/N) "
  msgstr "Vil du lage et utpekt opphevelsessertifikat for denne nøkkelen? (j/N) "
  
- #: g10/revoke.c:336 g10/revoke.c:727
++#: g10/revoke.c:336 g10/revoke.c:728
  msgid "ASCII armored output forced.\n"
  msgstr "Tvunget ASCII-armert utdata.\n"
  
@@@ -6392,10 -4989,9 +6354,10 @@@ msgstr "
  "eller hvis du mister den hemmelige nøkkelen. Hvis du fremdeles har\n"
  "tilgang til den hemmelige nøkkelen, er det lurt å heller lage et nytt\n"
  "opphevelsessertifikat og oppgi en grunn til opphevelsen.\n"
- "Se beskrivelse av kommandoen «--gen-revoke» i GnuPG-\n"
+ "Se beskrivelse av kommandoen «--generate-revocation» i GnuPG-\n"
  "bruksanvisninga for detaljer."
  
- #: g10/revoke.c:575
++#: g10/revoke.c:576
  msgid ""
  "To avoid an accidental use of this file, a colon has been inserted\n"
  "before the 5 dashes below.  Remove this colon with a text editor\n"
@@@ -6405,12 -5001,10 +6367,12 @@@ msgstr "
  "Fjern dette kolonet med en tekstbehandler før du importerer og\n"
  "publiserer opphevelsessertifikatet."
  
- #: g10/revoke.c:590
++#: g10/revoke.c:591
  #, c-format
  msgid "revocation certificate stored as '%s.rev'\n"
  msgstr "opphevelsessertifikat lagret som «%s.rev»\n"
  
- #: g10/revoke.c:634
++#: g10/revoke.c:635
  #, c-format
  msgid "secret key \"%s\" not found\n"
  msgstr "fant ikke hemmelig nøkkel «%s»\n"
@@@ -6418,21 -5012,17 +6380,21 @@@
  #. TRANSLATORS: The %s prints a key specification which
  #. for example has been given at the command line.  Several lines
  #. lines with secret key infos are printed after this message.
- #: g10/revoke.c:661
++#: g10/revoke.c:662
  #, c-format
  msgid "'%s' matches multiple secret keys:\n"
  msgstr "«%s» samsvarer med flere hemmelige nøkler:\n"
  
- #: g10/revoke.c:688
++#: g10/revoke.c:689
  #, c-format
  msgid "error searching the keyring: %s\n"
  msgstr "feil under søk på nøkkelknippe: %s\n"
  
- #: g10/revoke.c:711
++#: g10/revoke.c:712
  msgid "Create a revocation certificate for this key? (y/N) "
  msgstr "Vil du lage et opphevelsessertifikat for denne nøkkelen? (j/N) "
  
- #: g10/revoke.c:735
++#: g10/revoke.c:736
  msgid ""
  "Revocation certificate created.\n"
  "\n"
@@@ -6454,33 -5044,26 +6416,33 @@@ msgstr "
  "utskriftssystem kan være satt opp til å lagre utskriftsdata og dermed gjøre\n"
  "det mulig for andre å lese sertifikatet.\n"
  
- #: g10/revoke.c:769
++#: g10/revoke.c:770
  msgid "Please select the reason for the revocation:\n"
  msgstr "Velg grunn for opphevelse:\n"
  
- #: g10/revoke.c:779
++#: g10/revoke.c:780
  msgid "Cancel"
  msgstr "Avbryt"
  
- #: g10/revoke.c:781
++#: g10/revoke.c:782
  #, c-format
  msgid "(Probably you want to select %d here)\n"
  msgstr "(Normalt bør du velge %d her)\n"
  
- #: g10/revoke.c:822
++#: g10/revoke.c:823
  msgid "Enter an optional description; end it with an empty line:\n"
  msgstr "Skriv inn en beskrivelse hvis du vil, og avslutt med tom linje:\n"
  
- #: g10/revoke.c:850
++#: g10/revoke.c:851
  #, c-format
  msgid "Reason for revocation: %s\n"
  msgstr "Grunnlag for opphevelse: %s\n"
  
- #: g10/revoke.c:852
++#: g10/revoke.c:853
  msgid "(No description given)\n"
  msgstr "(Ingen beskrivelse oppgitt)\n"
  
- #: g10/revoke.c:857
++#: g10/revoke.c:858
  msgid "Is this okay? (y/N) "
  msgstr "Er dette i orden? (j/N) "
  
@@@ -6611,22 -5174,18 +6573,22 @@@ msgstr "
  "ADVARSEL: klarte ikke å %%-utvide foretrukket nøkkeltjener-adresse (for "
  "lang).\n"
  
- #: g10/sign.c:329
++#: g10/sign.c:331
  #, c-format
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s/%s-signatur fra: «%s»\n"
  
- #: g10/sign.c:878
++#: g10/sign.c:880
  #, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
  msgstr "ADVARSEL: tvungen bruk av %s (%d) bryter med mottakerens oppsett\n"
  
- #: g10/sign.c:1009
++#: g10/sign.c:1011
  msgid "signing:"
  msgstr "signerer:"
  
- #: g10/sign.c:1286
++#: g10/sign.c:1288
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "bruker %s-kryptering\n"
@@@ -6649,7 -5204,6 +6611,7 @@@ msgid "this is a PGP generated Elgamal 
  msgstr ""
  "dette er en PGP-generelt Elgamal-nøkkel, og egner seg ikke til signering."
  
- #: g10/tdbdump.c:57 g10/trustdb.c:362
++#: g10/tdbdump.c:57 g10/trustdb.c:369
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "tillitsoppføring %lu, type %d: skriving mislyktes: %s\n"
@@@ -6694,7 -5240,6 +6656,7 @@@ msgstr "feil under søk etter tillitspo
  msgid "read error in '%s': %s\n"
  msgstr "lesefeil i «%s»: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "trustdb: synk mislyktes: %s\n"
@@@ -6837,54 -5353,59 +6799,76 @@@ msgstr "tekstlinjer som er lengre enn %
  msgid "input line longer than %d characters\n"
  msgstr "inndata-linje er lengre enn %d tegn\n"
  
- #: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
++#: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
  #, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "feil under transaksjonsstart i TOFU-database: %s\n"
  
- #: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
++#: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr "feil under ferdigstillelse av transaksjon i TOFU-database: %s\n"
  
- #: g10/tofu.c:357 g10/tofu.c:699
++#: g10/tofu.c:355 g10/tofu.c:888
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr "feil under reversering av transaksjon i TOFU-database: %s\n"
  
- #: g10/tofu.c:501
++#: g10/tofu.c:505
  #, c-format
  msgid "unsupported TOFU database version: %s\n"
  msgstr "TOFU-databaseversjon støttes ikke: %s\n"
  
- #: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
- #: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
- #: g10/tofu.c:3056
++#: g10/tofu.c:538
+ #, fuzzy, c-format
+ #| msgid "error creating temporary file: %s\n"
+ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
+ msgstr "feil under oppretting av midlertidig fil: %s\n"
+ 
++#: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
+ msgid "TOFU DB error"
+ msgstr ""
+ 
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2340 g10/tofu.c:2359
++#: g10/tofu.c:2372 g10/tofu.c:2384 g10/tofu.c:2399 g10/tofu.c:2411
++#: g10/tofu.c:2980 g10/tofu.c:2997 g10/tofu.c:3033 g10/tofu.c:3050
++#: g10/tofu.c:3353
  #, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "feil under lesing av TOFU-database: %s\n"
  
- #: g10/tofu.c:566 g10/tofu.c:574
++#: g10/tofu.c:716 g10/tofu.c:724
  #, c-format
  msgid "error determining TOFU database's version: %s\n"
  msgstr "klarte ikke å kontrollere versjon av TOFU-database: %s\n"
  
- #: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
++#: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
  #, c-format
  msgid "error initializing TOFU database: %s\n"
  msgstr "feil under oppstart av TOFU-database: %s\n"
  
- #: g10/tofu.c:765
++#: g10/tofu.c:844
+ #, fuzzy, c-format
+ #| msgid "error reading TOFU database: %s\n"
+ msgid "error creating 'encryptions' TOFU table: %s\n"
+ msgstr "feil under lesing av TOFU-database: %s\n"
+ 
++#: g10/tofu.c:874
+ #, c-format
+ msgid "adding column effective_policy to bindings DB: %s\n"
+ msgstr ""
+ 
++#: g10/tofu.c:956
  #, c-format
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "feil under åpning av TOFU-database «%s»: %s\n"
  
- #: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
++#: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
  #, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "feil under oppdatering av TOFU-database: %s\n"
  
- #: g10/tofu.c:1239
++#: g10/tofu.c:1328
  #, fuzzy, c-format
  #| msgid "The email address \"%s\" is associated with %d key:\n"
  #| msgid_plural "The email address \"%s\" is associated with %d keys:\n"
@@@ -6892,14 -5413,14 +6876,16 @@@ msgid "
  "This is the first time the email address \"%s\" is being used with key %s."
  msgstr "E-postadressen «%s» er tilknyttet %d nøkkel:\n"
  
- #: g10/tofu.c:1247
++#: g10/tofu.c:1337
  #, fuzzy, c-format
  #| msgid "The email address \"%s\" is associated with %d key:\n"
  #| msgid_plural "The email address \"%s\" is associated with %d keys:\n"
- msgid "The email address \"%s\" is associated with %d keys!"
- msgstr "E-postadressen «%s» er tilknyttet %d nøkkel:\n"
+ msgid "The email address \"%s\" is associated with %d key!"
+ msgid_plural "The email address \"%s\" is associated with %d keys!"
+ msgstr[0] "E-postadressen «%s» er tilknyttet %d nøkkel:\n"
+ msgstr[1] "E-postadressen «%s» er tilknyttet %d nøkkel:\n"
  
- #: g10/tofu.c:1251
++#: g10/tofu.c:1343
  #, fuzzy
  #| msgid ""
  #| "The key with fingerprint %s raised a conflict with the binding %s.  Since "
@@@ -6909,70 -5430,75 +6895,89 @@@ msgstr "
  "Nøkkel med fingeravtrykk %s forårsaket konflikt med tilknytning %s. Siden "
  "regelen var «auto» er den nå endret til «ask» (spør)."
  
- #: g10/tofu.c:1257
++#: g10/tofu.c:1349
  #, c-format
  msgid ""
  "Please indicate whether this email address should be associated with key %s "
  "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1513
++#: g10/tofu.c:1605
  #, c-format
  msgid "error gathering other user IDs: %s\n"
  msgstr "feil under henting av andre bruker-id-er: %s\n"
  
- #: g10/tofu.c:1523
++#: g10/tofu.c:1615
  #, fuzzy
  #| msgid "list key and user IDs"
  msgid "This key's user IDs:\n"
  msgstr "vis nøkler og bruker-id-er"
  
- #: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
++#: g10/tofu.c:1631 g10/tofu.c:1796
  #, c-format
  msgid "policy: %s"
  msgstr "regelverk: %s"
  
- #: g10/tofu.c:1630
++#: g10/tofu.c:1722
  #, c-format
  msgid "error gathering signature stats: %s\n"
  msgstr "feil under henting av signaturstatistikk: %s\n"
  
- #: g10/tofu.c:1634
++#: g10/tofu.c:1726
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] "E-postadressen «%s» er tilknyttet %d nøkkel:\n"
  msgstr[1] "E-postadressen «%s» er tilknyttet %d nøkler:\n"
  
- #: g10/tofu.c:1651
++#: g10/tofu.c:1744
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr "Statistikk for nøkler med e-postadresse «%s»:\n"
  
- #: g10/tofu.c:1684 g10/tofu.c:1689
++#: g10/tofu.c:1785 g10/tofu.c:1790
  msgid ", "
  msgstr ""
  
- #: g10/tofu.c:1693
++#: g10/tofu.c:1794
  msgid "this key"
  msgstr "denne nøkkelen"
  
- #: g10/tofu.c:1715
++#: g10/tofu.c:1820
  #, fuzzy, c-format
  #| msgid "Verified %ld messages signed by \"%s\"."
- msgid "Verified %d message"
- msgid_plural "Verified %d messages"
+ msgid "Verified %d message."
+ msgid_plural "Verified %d messages."
  msgstr[0] "Bekreftet %ld meldinger signert av «%s»."
  msgstr[1] "Bekreftet %ld meldinger signert av «%s»."
  
- #: g10/tofu.c:1719
- #, c-format
- msgid "Encrypted %d message"
- msgid_plural "Encrypted %d messages"
- msgstr[0] ""
- msgstr[1] ""
++#: g10/tofu.c:1824
+ #, fuzzy, c-format
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid "Encrypted %d message."
+ msgid_plural "Encrypted %d messages."
+ msgstr[0] "kryptert med %lu passordfraser\n"
+ msgstr[1] "kryptert med %lu passordfraser\n"
  
- #: g10/tofu.c:1734
++#: g10/tofu.c:1831
+ #, fuzzy, c-format
+ #| msgid "%ld message signed in the future."
+ #| msgid_plural "%ld messages signed in the future."
+ msgid "Verified %d message in the future."
+ msgid_plural "Verified %d messages in the future."
+ msgstr[0] "%ld melding signert i fremtid."
+ msgstr[1] "%ld meldinger signert i fremtid."
+ 
++#: g10/tofu.c:1835
+ #, fuzzy, c-format
+ #| msgid "%ld message signed in the future."
+ #| msgid_plural "%ld messages signed in the future."
+ msgid "Encrypted %d message in the future."
+ msgid_plural "Encrypted %d messages in the future."
+ msgstr[0] "%ld melding signert i fremtid."
+ msgstr[1] "%ld meldinger signert i fremtid."
+ 
++#: g10/tofu.c:1849
  #, fuzzy, c-format
  #| msgid " over the past %ld day."
  #| msgid_plural " over the past %ld days."
@@@ -6981,7 -5507,22 +6986,25 @@@ msgid_plural "Messages verified over th
  msgstr[0] " i løpet av gårsdagen (%ld)."
  msgstr[1] " i løpet av de %ld siste dagene."
  
- #: g10/tofu.c:1740
++#: g10/tofu.c:1855
+ #, fuzzy, c-format
+ #| msgid " over the past %ld day."
+ #| msgid_plural " over the past %ld days."
+ msgid "Messages encrypted over the past %d day: %d."
+ msgid_plural "Messages encrypted over the past %d days: %d."
+ msgstr[0] " i løpet av gårsdagen (%ld)."
+ msgstr[1] " i løpet av de %ld siste dagene."
+ 
++#: g10/tofu.c:1865
+ #, fuzzy, c-format
+ #| msgid " over the past %ld month."
+ #| msgid_plural " over the past %ld months."
+ msgid "Messages verified over the past %d month: %d."
+ msgid_plural "Messages verified over the past %d months: %d."
+ msgstr[0] " i løpet av den siste måneden (%ld)."
+ msgstr[1] " i løpet av de siste %ld månedene."
+ 
++#: g10/tofu.c:1871
  #, fuzzy, c-format
  #| msgid " over the past %ld month."
  #| msgid_plural " over the past %ld months."
@@@ -6990,7 -5531,6 +7013,7 @@@ msgid_plural "Messages encrypted over t
  msgstr[0] " i løpet av den siste måneden (%ld)."
  msgstr[1] " i løpet av de siste %ld månedene."
  
- #: g10/tofu.c:1746
++#: g10/tofu.c:1881
  #, fuzzy, c-format
  #| msgid " over the past %ld day."
  #| msgid_plural " over the past %ld days."
@@@ -6999,112 -5539,132 +7022,153 @@@ msgid_plural "Messages verified over th
  msgstr[0] " i løpet av gårsdagen (%ld)."
  msgstr[1] " i løpet av de %ld siste dagene."
  
- #: g10/tofu.c:1752
- #, fuzzy
++#: g10/tofu.c:1887
+ #, fuzzy, c-format
+ #| msgid " over the past %ld day."
+ #| msgid_plural " over the past %ld days."
+ msgid "Messages encrypted over the past %d year: %d."
+ msgid_plural "Messages encrypted over the past %d years: %d."
+ msgstr[0] " i løpet av gårsdagen (%ld)."
+ msgstr[1] " i løpet av de %ld siste dagene."
+ 
++#: g10/tofu.c:1895
+ #, fuzzy, c-format
  #| msgid " over the past %ld day."
  #| msgid_plural " over the past %ld days."
- msgid " in the past."
+ msgid "Messages verified in the past: %d."
  msgstr " i løpet av gårsdagen (%ld)."
  
++#: g10/tofu.c:1899
+ #, fuzzy, c-format
+ #| msgid ""
+ #| "Verified %ld message signed by \"%s\"\n"
+ #| "in the past %s."
+ #| msgid_plural ""
+ #| "Verified %ld messages signed by \"%s\"\n"
+ #| "in the past %s."
+ msgid "Messages encrypted in the past: %d."
+ msgstr ""
+ "Bekreftet %ld melding signert av «%s»\n"
+ "siste %s."
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1767
++#: g10/tofu.c:1916
  msgid "TOFU detected a binding conflict"
  msgstr "TOFU oppdaget en tilknytningskonflikt"
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1809
++#: g10/tofu.c:1958
  msgid "gGaAuUrRbB"
  msgstr "gGaAuUnNdD"
  
- #: g10/tofu.c:1815
++#: g10/tofu.c:1964
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr "(G)od, (A)ksepter én gang, (U)kjent, (N)ekt én gang, (D)årlig? "
  
- #: g10/tofu.c:1823
++#: g10/tofu.c:1972
  msgid "Defaulting to unknown."
  msgstr ""
  
- #: g10/tofu.c:1938 g10/tofu.c:2074
++#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
- #: g10/tofu.c:1994
++#: g10/tofu.c:2143
  #, fuzzy, c-format
  #| msgid "error writing key: %s\n"
  msgid "resetting keydb: %s\n"
  msgstr "feil under skriving av nøkkel: %s\n"
  
- #: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
- #: g10/tofu.c:2425
- #, c-format
- msgid "error setting TOFU binding's trust level to %s\n"
++#: g10/tofu.c:2601
+ #, fuzzy, c-format
+ #| msgid "error setting TOFU binding's trust level to %s\n"
+ msgid "error setting TOFU binding's policy to %s\n"
  msgstr "feil under endring av tillitsnivå for TOFU-tilknytning til %s\n"
  
- #: g10/tofu.c:2473
++#: g10/tofu.c:2794
  #, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "feil under endring av TOFU-regler: %s\n"
  
- #. TRANSLATORS: The tilde ('~') is used here to indicate a
- #. * non-breakable space
- #: g10/tofu.c:2574
- #, c-format
- msgid "%d~year"
- msgid_plural "%d~years"
++#: g10/tofu.c:2839
+ #, fuzzy, c-format
+ #| msgid "%d~year"
+ #| msgid_plural "%d~years"
+ msgid "%lld~year"
+ msgid_plural "%lld~years"
  msgstr[0] "%d~år"
  msgstr[1] "%d~år"
  
- #: g10/tofu.c:2583
- #, c-format
- msgid "%d~month"
- msgid_plural "%d~months"
++#: g10/tofu.c:2844
+ #, fuzzy, c-format
+ #| msgid "%d~month"
+ #| msgid_plural "%d~months"
+ msgid "%lld~month"
+ msgid_plural "%lld~months"
  msgstr[0] "%d~måned"
  msgstr[1] "%d~måneder"
  
- #: g10/tofu.c:2592
++#: g10/tofu.c:2849
  #, c-format
- msgid "%d~day"
- msgid_plural "%d~days"
+ msgid "%lld~week"
+ msgid_plural "%lld~weeks"
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:2854
+ #, fuzzy, c-format
+ #| msgid "%d~day"
+ #| msgid_plural "%d~days"
+ msgid "%lld~day"
+ msgid_plural "%lld~days"
  msgstr[0] "%d~dag"
  msgstr[1] "%d~dager"
  
- #: g10/tofu.c:2601
- #, c-format
- msgid "%d~hour"
- msgid_plural "%d~hours"
++#: g10/tofu.c:2859
+ #, fuzzy, c-format
+ #| msgid "%d~hour"
+ #| msgid_plural "%d~hours"
+ msgid "%lld~hour"
+ msgid_plural "%lld~hours"
  msgstr[0] "%d~time"
  msgstr[1] "%d~timer"
  
- #: g10/tofu.c:2610
- #, c-format
- msgid "%d~minute"
- msgid_plural "%d~minutes"
++#: g10/tofu.c:2864
+ #, fuzzy, c-format
+ #| msgid "%d~minute"
+ #| msgid_plural "%d~minutes"
+ msgid "%lld~minute"
+ msgid_plural "%lld~minutes"
  msgstr[0] "%d~minutt"
  msgstr[1] "%d~minutter"
  
- #: g10/tofu.c:2619
- #, c-format
- msgid "%d~second"
- msgid_plural "%d~seconds"
++#: g10/tofu.c:2866
+ #, fuzzy, c-format
+ #| msgid "%d~second"
+ #| msgid_plural "%d~seconds"
+ msgid "%lld~second"
+ msgid_plural "%lld~seconds"
  msgstr[0] "%d~sekund"
  msgstr[1] "%d~sekunder"
  
- #: g10/tofu.c:2802
- #, c-format
- msgid "%s: "
- msgstr ""
++#: g10/tofu.c:3103
+ #, fuzzy, c-format
+ #| msgid "TOFU: few signatures %d message %s"
+ #| msgid_plural "TOFU: few signatures %d messages %s"
+ msgid "%s: Verified 0~signatures and encrypted 0~messages."
+ msgstr "TOFU: få signaturer %d melding %s"
  
- #: g10/tofu.c:2806
++#: g10/tofu.c:3109
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
- msgid "Verified %ld signatures"
+ msgid "%s: Verified 0 signatures."
  msgstr "Slettet %d signaturer.\n"
  
- #: g10/tofu.c:2816
++#: g10/tofu.c:3117
  #, fuzzy, c-format
  #| msgid ""
  #| "Verified %ld message signed by \"%s\"\n"
@@@ -7121,13 -5681,11 +7185,13 @@@ msgstr[1] "
  "Bekreftet %ld meldinger signert av «%s»\n"
  "siste %s."
  
- #: g10/tofu.c:2826
- #, fuzzy, c-format
++#: g10/tofu.c:3127
+ #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
- msgid ", and encrypted %ld messages"
+ msgid "Encrypted 0 messages."
  msgstr "kryptert med %lu passordfraser\n"
  
- #: g10/tofu.c:2835
++#: g10/tofu.c:3135
  #, fuzzy, c-format
  #| msgid ""
  #| "Verified %ld message signed by \"%s\"\n"
@@@ -7144,7 -5702,11 +7208,13 @@@ msgstr[1] "
  "Bekreftet %ld meldinger signert av «%s»\n"
  "siste %s."
  
- #: g10/tofu.c:2880
++#: g10/tofu.c:3146
+ #, fuzzy, c-format
+ #| msgid "policy: %s"
+ msgid "(policy: %s)"
+ msgstr "regelverk: %s"
+ 
++#: g10/tofu.c:3177
  #, fuzzy
  #| msgid "Warning: we've have yet to see a message signed by this key!\n"
  msgid ""
@@@ -7153,7 -5715,6 +7223,7 @@@ msgstr "
  "Advarsel: vi har enda ikke sett en melding som er signert av denne "
  "nøkkelen.\n"
  
- #: g10/tofu.c:2883
++#: g10/tofu.c:3180
  #, fuzzy
  #| msgid "Warning: we've only seen a single message signed by this key!\n"
  msgid ""
@@@ -7161,7 -5722,6 +7231,7 @@@
  msgstr ""
  "Advarsel: vi har bare sett én melding som er signert av denne nøkkelen.\n"
  
- #: g10/tofu.c:2887
++#: g10/tofu.c:3184
  #, fuzzy
  #| msgid "Warning: we've have yet to see a message signed by this key!\n"
  msgid "Warning: you have yet to encrypt a message to this key!\n"
@@@ -7169,14 -5729,12 +7239,14 @@@ msgstr "
  "Advarsel: vi har enda ikke sett en melding som er signert av denne "
  "nøkkelen.\n"
  
- #: g10/tofu.c:2890
++#: g10/tofu.c:3187
  #, fuzzy
  #| msgid "Warning: we've only seen a single message signed by this key!\n"
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  "Advarsel: vi har bare sett én melding som er signert av denne nøkkelen.\n"
  
- #: g10/tofu.c:2919
++#: g10/tofu.c:3216
  #, fuzzy, c-format
  #| msgid ""
  #| "Warning: if you think you've seen more than %ld message signed by this "
@@@ -7215,18 -5773,14 +7285,18 @@@ msgstr[1] "
  "Bruk %s \n"
  "for å markere nøkkelen som ugyldig hvis den virker mistenkelig.\n"
  
- #: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
- #: g10/tofu.c:3480 g10/tofu.c:3572
++#: g10/tofu.c:3298 g10/tofu.c:3449 g10/tofu.c:3627 g10/tofu.c:3670
++#: g10/tofu.c:3784 g10/tofu.c:3859 g10/tofu.c:3894
  #, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "feil under åpning av TOFU-database: %s\n"
  
- #: g10/tofu.c:3185
++#: g10/tofu.c:3482
  #, c-format
- msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
  msgstr ""
  
- #: g10/tofu.c:3515
++#: g10/tofu.c:3819
  #, fuzzy, c-format
  #| msgid "error writing public keyring '%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7257,99 -5806,80 +7327,99 @@@ msgstr "nøkkel %s: ingen offentlig nø
  msgid "key %s marked as ultimately trusted\n"
  msgstr "nøkkel %s markert som endelig betrodd.\n"
  
- #: g10/trustdb.c:341
++#: g10/trustdb.c:348
  #, 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:347
++#: g10/trustdb.c:354
  #, 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:422
++#: g10/trustdb.c:429
  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:431
++#: g10/trustdb.c:438
  msgid "If that does not work, please consult the manual\n"
  msgstr "Se bruksanvisning hvis dette ikke hjelper\n"
  
- #: g10/trustdb.c:468
++#: g10/trustdb.c:475
  #, 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:474
++#: g10/trustdb.c:481
  #, c-format
  msgid "using %s trust model\n"
  msgstr "bruker tillitsmodell %s\n"
  
- #: g10/trustdb.c:511
++#: g10/trustdb.c:518
  msgid "no need for a trustdb check\n"
  msgstr "kontroll av trustdb er ikke nødvendig\n"
  
- #: g10/trustdb.c:517 g10/trustdb.c:2160
++#: g10/trustdb.c:524 g10/trustdb.c:2187
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "neste kontroll av trustdb planlagt %s\n"
  
- #: g10/trustdb.c:526
++#: g10/trustdb.c:533
  #, 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:542
++#: g10/trustdb.c:549
  #, 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:749 g10/trustdb.c:1313
++#: g10/trustdb.c:756 g10/trustdb.c:1340
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "fant ikke offentlig nøkkel %s: %s\n"
  
- #: g10/trustdb.c:966
++#: g10/trustdb.c:973
  msgid "please do a --check-trustdb\n"
  msgstr "kjør «--check-trustdb»\n"
  
- #: g10/trustdb.c:971
++#: g10/trustdb.c:978
  msgid "checking the trustdb\n"
  msgstr "kontrollerer trustdb\n"
  
- #: g10/trustdb.c:1883
++#: g10/trustdb.c:1910
  #, 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:1886
++#: g10/trustdb.c:1913
  #, 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:1956
++#: g10/trustdb.c:1983
  msgid "no ultimately trusted keys found\n"
  msgstr "fant ingen nøkler med absolutt («ultimat») pålitelighet\n"
  
- #: g10/trustdb.c:1970
++#: g10/trustdb.c:1997
  #, 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:2087
++#: g10/trustdb.c:2114
  #, 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:2167
++#: g10/trustdb.c:2194
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr ""
@@@ -7459,19 -5968,14 +7529,19 @@@ msgstr "
  "Syntaks: kbxutil [valg] [filer]\n"
  "Vis, eksporter eller importer Keybox-data\n"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3208
++#: scd/app-nks.c:718 scd/app-openpgp.c:3221
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr "RSA-modulus mangler eller er av annen størrelse enn %d bit\n"
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3220
++#: scd/app-nks.c:726 scd/app-openpgp.c:3233
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr "offentlig RSA-eksponent mangler eller er større enn %d bit\n"
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
- #: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
- #: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1965 scd/app-openpgp.c:1984
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2166 scd/app-openpgp.c:2430
++#: scd/app-openpgp.c:2477 scd/app-openpgp.c:2582 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "PIN-callback returnerte en feil: %s\n"
@@@ -7517,85 -6012,67 +7587,85 @@@ msgid "
  "qualified signatures."
  msgstr "|P|Skriv inn PUK-kode for å la nøkkelen lage kvalifiserte signaturer."
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2511 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "feil under henting av ny PIN: %s\n"
  
- #: scd/app-openpgp.c:806
++#: scd/app-openpgp.c:801
  #, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "klarte ikke å lagre fingeravtrykk: %s\n"
  
- #: scd/app-openpgp.c:819
++#: scd/app-openpgp.c:814
  #, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "klarte ikke å lagre opprettelsesdato: %s\n"
  
- #: scd/app-openpgp.c:1236
++#: scd/app-openpgp.c:1247
  msgid "response does not contain the RSA modulus\n"
  msgstr "svar inneholder ikke RSA-modulus\n"
  
- #: scd/app-openpgp.c:1243
++#: scd/app-openpgp.c:1254
  msgid "response does not contain the RSA public exponent\n"
  msgstr "svar inneholder ikke offentlig RSA-eksponent\n"
  
- #: scd/app-openpgp.c:1353
++#: scd/app-openpgp.c:1364
  #, fuzzy
  #| msgid "response does not contain the EC public point\n"
  msgid "response does not contain the EC public key\n"
  msgstr "svar inneholder ikke offentlig EC-punkt\n"
  
- #: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:1464 scd/app-openpgp.c:3825
  msgid "response does not contain the public key data\n"
  msgstr "svar inneholder ikke offentlig nøkkeldata\n"
  
- #: scd/app-openpgp.c:1551
++#: scd/app-openpgp.c:1564
  #, c-format
  msgid "reading public key failed: %s\n"
  msgstr "lesing av offentlig nøkkel mislyktes: %s\n"
  
- #: scd/app-openpgp.c:1903
++#: scd/app-openpgp.c:1916
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr "bruker forvalgt PIN som %s\n"
  
- #: scd/app-openpgp.c:1910
++#: scd/app-openpgp.c:1923
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  "klarte ikke å bruke forvalgt PIN som %s: %s. Lar være å bruke forvalgt PIN "
  "senere\n"
  
- #: scd/app-openpgp.c:1925
++#: scd/app-openpgp.c:1938
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr "||Skriv inn PIN%%0A[signaturer utført: %lu]"
  
- #: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
++#: scd/app-openpgp.c:1949 scd/app-openpgp.c:2424
  msgid "||Please enter the PIN"
  msgstr "||Skriv inn PIN-kode"
  
- #: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2173 scd/app-openpgp.c:2437
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr "PIN for CHV%d er for kort; minum lengde er %d\n"
  
- #: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
- #: scd/app-openpgp.c:4114
++#: scd/app-openpgp.c:2004 scd/app-openpgp.c:2043 scd/app-openpgp.c:2185
++#: scd/app-openpgp.c:4126
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "bekreftelse av CHV%d mislyktes: %s\n"
  
- #: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
++#: scd/app-openpgp.c:2072 scd/app-openpgp.c:2458 scd/app-openpgp.c:4556
  msgid "error retrieving CHV status from card\n"
  msgstr "feil under henting av CHV-status fra kort\n"
  
- #: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
++#: scd/app-openpgp.c:2078 scd/app-openpgp.c:4565
  msgid "card is permanently locked!\n"
  msgstr "kortet er låst for godt.\n"
  
- #: scd/app-openpgp.c:2072
++#: scd/app-openpgp.c:2085
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7605,24 -6082,19 +7675,24 @@@ msgstr[1] "%d Admin-PIN-forsøk gjenst�
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:2082
++#: scd/app-openpgp.c:2095
  #, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "|A|Skriv inn admin-PIN%%0A[gjenstående forsøk: %d]"
  
- #: scd/app-openpgp.c:2086
++#: scd/app-openpgp.c:2099
  msgid "|A|Please enter the Admin PIN"
  msgstr "|A|Skriv inn admin-PIN"
  
- #: scd/app-openpgp.c:2107
++#: scd/app-openpgp.c:2120
  msgid "access to admin commands is not configured\n"
  msgstr "tilgang til admin-kommandoer er ikke konfigurert\n"
  
- #: scd/app-openpgp.c:2460
++#: scd/app-openpgp.c:2473
  msgid "||Please enter the Reset Code for the card"
  msgstr "||Skriv inn tilbakestillingskode for kortet"
  
- #: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
++#: scd/app-openpgp.c:2483 scd/app-openpgp.c:2537
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr "Tilbakestillingskoden er for kort. Minimumslengde er %d\n"
@@@ -7630,107 -6102,83 +7700,107 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2493
++#: scd/app-openpgp.c:2506
  msgid "|RN|New Reset Code"
  msgstr "|RN|Ny tilbakestillingskode"
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|AN|New Admin PIN"
  msgstr "|AN|Ny Admin PIN"
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|N|New PIN"
  msgstr "|N|Ny PIN"
  
- #: scd/app-openpgp.c:2565
++#: scd/app-openpgp.c:2578
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "||Skriv inn admin-PIN og ny admin-PIN"
  
- #: scd/app-openpgp.c:2566
++#: scd/app-openpgp.c:2579
  msgid "||Please enter the PIN and New PIN"
  msgstr "||Skriv inn PIN-kode og ny PIN-kode"
  
- #: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
++#: scd/app-openpgp.c:2635 scd/app-openpgp.c:3885
  msgid "error reading application data\n"
  msgstr "feil under lesing av programdata\n"
  
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
++#: scd/app-openpgp.c:2641 scd/app-openpgp.c:3892
  msgid "error reading fingerprint DO\n"
  msgstr "feil under lesing av fingeravtrykk DO\n"
  
- #: scd/app-openpgp.c:2638
++#: scd/app-openpgp.c:2651
  msgid "key already exists\n"
  msgstr "nøkkelen finnes allerede\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2655
  msgid "existing key will be replaced\n"
  msgstr "gjeldende nøkkel blir erstattet\n"
  
- #: scd/app-openpgp.c:2644
++#: scd/app-openpgp.c:2657
  msgid "generating new key\n"
  msgstr "lager ny nøkkel\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2659
  msgid "writing new key\n"
  msgstr "skriver ny nøkkel\n"
  
- #: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
++#: scd/app-openpgp.c:3201 scd/app-openpgp.c:3553
  msgid "creation timestamp missing\n"
  msgstr "tidsstempel for opprettelse mangler\n"
  
- #: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
++#: scd/app-openpgp.c:3243 scd/app-openpgp.c:3251
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr "RSA-primtall %s mangler eller er av annen størrelse enn %d bit\n"
  
- #: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
++#: scd/app-openpgp.c:3384 scd/app-openpgp.c:3647
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "klarte ikke å lagre nøkkel: %s\n"
  
- #: scd/app-openpgp.c:3534
++#: scd/app-openpgp.c:3547
  msgid "unsupported curve\n"
  msgstr "ustøttet kurve\n"
  
- #: scd/app-openpgp.c:3790
++#: scd/app-openpgp.c:3802
  msgid "please wait while key is being generated ...\n"
  msgstr "vent mens nøkkel blir generert …\n"
  
- #: scd/app-openpgp.c:3798
++#: scd/app-openpgp.c:3810
  msgid "generating key failed\n"
  msgstr "nøkkelgenerering mislyktes\n"
  
- #: scd/app-openpgp.c:3804
++#: scd/app-openpgp.c:3816
  #, c-format
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
  msgstr[0] "nøkkelgenerering fullført (%d sekund)\n"
  msgstr[1] "nøkkelgenerering fullført (%d sekunder)\n"
  
- #: scd/app-openpgp.c:3838
++#: scd/app-openpgp.c:3850
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "ugyldig struktur i OpenPGP-kort (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:3900
  msgid "fingerprint on card does not match requested one\n"
  msgstr "fingeravtrykk på kort samsvarer ikke med forespurt avtrykk\n"
  
- #: scd/app-openpgp.c:4004
++#: scd/app-openpgp.c:4016
  #, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "kortet støtter ikke kontrollsum-algoritme %s\n"
  
- #: scd/app-openpgp.c:4089
++#: scd/app-openpgp.c:4101
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "signaturer opprettet så langt: %lu\n"
  
- #: scd/app-openpgp.c:4551
++#: scd/app-openpgp.c:4570
  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:4854 scd/app-openpgp.c:4865
++#: scd/app-openpgp.c:4871 scd/app-openpgp.c:4882
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "fikk ikke tilgang til %s. Bruker du et ugyldig OpenPGP-kort?\n"
@@@ -7750,7 -6195,6 +7820,7 @@@ msgstr "|N|Ny PIN
  msgid "run in multi server mode (foreground)"
  msgstr "kjør i multi-tjenermodus (forgrunn)"
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|NIVÅ|endre feilsøkingsnivå til valgt NIVÅ"
  
@@@ -7790,11 -6225,9 +7860,11 @@@ msgstr "avvis bruk av admin-kortkommand
  msgid "use variable length input for pinpad"
  msgstr "bruk inndata av vairabel lengde for kodetastatur"
  
- #: scd/scdaemon.c:287
++#: scd/scdaemon.c:286
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Bruk: @SCDAEMON@ [valg] (-h for hjelp)"
  
- #: scd/scdaemon.c:289
++#: scd/scdaemon.c:288
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
@@@ -7802,16 -6235,13 +7872,16 @@@ msgstr "
  "Syntaks: scdaemon [valg] [kommando [arg]]\n"
  "Smartcard-bakgrunnsprogram for @GNUPG@\n"
  
- #: scd/scdaemon.c:786
++#: scd/scdaemon.c:784
  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:1160 dirmngr/dirmngr.c:1900
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1904
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "startet håndteringsprogram for fd %d\n"
  
- #: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
++#: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1909
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "avsluttet håndteringsprogram for fd %d\n"
@@@ -7887,9 -6301,6 +7957,9 @@@ msgstr "antall treff på sertifikater: 
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "nøkkeloppslag i dirmngr-hurtiglager mislyktes: %s\n"
  
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
 +#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  msgid "failed to allocate keyDB handle\n"
  msgstr "klarte ikke å tildele nøkkeldatabase-verdi\n"
  
@@@ -8363,11 -6672,9 +8433,11 @@@ msgstr "
  msgid "resource problem: out of core\n"
  msgstr "ressursproblem: oppbrukt kjerne\n"
  
- #: sm/decrypt.c:330
++#: sm/decrypt.c:332
  msgid "(this is the RC2 algorithm)\n"
  msgstr "(dette er algoritme RC2)\n"
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:334
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr "(dette ser ikke ut som en kryptert melding)\n"
  
@@@ -8408,115 -6707,87 +8478,115 @@@ msgstr "vis eksterne nøkler
  msgid "list certificate chain"
  msgstr "vis sertifikatkjede "
  
- #: sm/gpgsm.c:218
++#: sm/gpgsm.c:219
  msgid "import certificates"
  msgstr "importer sertifikater"
  
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
  msgid "export certificates"
  msgstr "eksporter sertifikater"
  
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:228
  msgid "register a smartcard"
  msgstr "registrer smartkort"
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:231
  msgid "pass a command to the dirmngr"
  msgstr "send en kommando til dirmngr"
  
- #: sm/gpgsm.c:232
++#: sm/gpgsm.c:233
  msgid "invoke gpg-protect-tool"
  msgstr "kall gpg-protect-tool"
  
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:250
  msgid "create base-64 encoded output"
  msgstr "lag base64-kodet utdata"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in PEM format"
  msgstr "forvent inndata i «PEM»-format"
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in base-64 format"
  msgstr "forvent inndata i «base-64»-format"
  
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:262
  msgid "assume input is in binary format"
  msgstr "forvent inndata i binærformat"
  
- #: sm/gpgsm.c:267
++#: sm/gpgsm.c:269
  msgid "never consult a CRL"
  msgstr "aldri spør CRL"
  
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:279
  msgid "check validity using OCSP"
  msgstr "kontroller gyldighet med OCSP"
  
- #: sm/gpgsm.c:282
++#: sm/gpgsm.c:284
  msgid "|N|number of certificates to include"
  msgstr "|N|antall sertifikater som skal være med"
  
- #: sm/gpgsm.c:285
++#: sm/gpgsm.c:287
  msgid "|FILE|take policy information from FILE"
  msgstr "|FIL|hent regler fra valgt FIL"
  
- #: sm/gpgsm.c:288
++#: sm/gpgsm.c:290
  msgid "do not check certificate policies"
  msgstr "ikke kontroller sertifikatregler"
  
- #: sm/gpgsm.c:292
++#: sm/gpgsm.c:294
  msgid "fetch missing issuer certificates"
  msgstr "hent manglende utstedersertifikat"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "don't use the terminal at all"
  msgstr "ikke bruk terminal i det hele tatt"
  
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:307
  msgid "|FILE|write a server mode log to FILE"
  msgstr "|FIL|lagre en tjenermodus-logg i valgt FIL"
  
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:312
  msgid "|FILE|write an audit log to FILE"
  msgstr "|FIL|lagre en revisjonslogg i valgt FIL"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "batch mode: never ask"
  msgstr "buntmodus: aldri spør"
  
- #: sm/gpgsm.c:314
++#: sm/gpgsm.c:316
  msgid "assume yes on most questions"
  msgstr "svar automatisk ja på de fleste spørsmål"
  
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:317
  msgid "assume no on most questions"
  msgstr "svar automatisk nei på de fleste spørsmål"
  
- #: sm/gpgsm.c:318
++#: sm/gpgsm.c:320
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "|FIL|legg til nøkkelknippe i liste over nøkkelknipper"
  
- #: sm/gpgsm.c:321
++#: sm/gpgsm.c:323
  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:331 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|SPEC|bruk valgt nøkkeltjener til å slå opp nøkler"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|NAVN|bruk valgt krypteringsalgoritme-NAVN"
  
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:352
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|NAVN|bruk valgt summeringsalgoritme-NAVN for melding"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:559
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
  msgstr "Bruk: @GPGSM@ [valg] [filer] (-h for hjelp)"
  
- #: sm/gpgsm.c:570
++#: sm/gpgsm.c:562
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
  "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@@ -8526,46 -6797,37 +8596,46 @@@ msgstr "
  "Signer, kontroller, krypter eller dekrypter.\n"
  "Forvalgt handling avhenger av inndata.\n"
  
- #: sm/gpgsm.c:774
++#: sm/gpgsm.c:766
  #, 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:785
++#: sm/gpgsm.c:777
  #, c-format
  msgid "unknown validation model '%s'\n"
  msgstr "«%s» er en ukjent kontrollmodell\n"
  
- #: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
  #, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "%s:%u: vertsnavn mangler\n"
  
- #: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr "%s:%u: passord skrevet inn uten brukernavn\n"
  
- #: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
  #, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr "%s:%u: hopper over denne linja\n"
  
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1427
  msgid "could not parse keyserver\n"
  msgstr "klarte ikke å tolke nøkkeltjener\n"
  
- #: sm/gpgsm.c:1636
++#: sm/gpgsm.c:1630
  #, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "importerer sertifikat «%s»\n"
  
- #: sm/gpgsm.c:1677
++#: sm/gpgsm.c:1671
  #, c-format
  msgid "can't sign using '%s': %s\n"
  msgstr "klarte ikke å signere med «%s»: %s\n"
  
- #: sm/gpgsm.c:2033
++#: sm/gpgsm.c:2028
  msgid "invalid command (there is no implicit command)\n"
  msgstr "ugyldig kommando (implisitt kommando finnes ikke)\n"
  
@@@ -9321,8 -7432,6 +9391,8 @@@ msgstr "bruker «http» i stedet for «
  msgid "CRL access not possible due to disabled %s\n"
  msgstr "Ingen CRL-tilgang fordi %s er slått av\n"
  
 +#: dirmngr/crlfetch.c:223 dirmngr/ldap-wrapper-ce.c:488
- #: dirmngr/ldap-wrapper.c:742 dirmngr/misc.c:563
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:563
  #, c-format
  msgid "error initializing reader object: %s\n"
  msgstr "feil under innlasting av leserobjekt: %s\n"
@@@ -9491,113 -7564,85 +9561,113 @@@ msgstr "forventet fullstendig filsti\n
  msgid "looking up '%s'\n"
  msgstr "slår opp «%s»\n"
  
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:160
  msgid "list the contents of the CRL cache"
  msgstr "vis innhold i CRL-hurtiglager"
  
- #: dirmngr/dirmngr.c:158
++#: dirmngr/dirmngr.c:161
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|FIL|last inn CRL fra valgt FIL i hurtiglager"
  
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:162
  msgid "|URL|fetch a CRL from URL"
  msgstr "|ADR|hent CRL fra valgt nettADResse"
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:163
  msgid "shutdown the dirmngr"
  msgstr "slå av dirmngr"
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:164
  msgid "flush the cache"
  msgstr "tøm hurtiglager"
  
- #: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
- #: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
++#: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|FIL|skriv tjenermodus-logger til valgt FIL"
  
- #: dirmngr/dirmngr.c:177
++#: dirmngr/dirmngr.c:180
  msgid "run without asking a user"
  msgstr "kjør uten å spørre bruker"
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:181
  msgid "force loading of outdated CRLs"
  msgstr "tving innlasting av utdatert CRL"
  
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:182
  msgid "allow sending OCSP requests"
  msgstr "tillat sending av OCSP-forespørsler"
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:184
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:185
  msgid "inhibit the use of HTTP"
  msgstr "hindre bruk av HTTP"
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:186
  msgid "inhibit the use of LDAP"
  msgstr "hindre bruk av LDAP"
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:188
  msgid "ignore HTTP CRL distribution points"
  msgstr "ignorer HTTP CRL-distribusjonspunkter"
  
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
  msgid "ignore LDAP CRL distribution points"
  msgstr "ignorer LDAP CRL-distribusjonspunkter"
  
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:192
  msgid "ignore certificate contained OCSP service URLs"
  msgstr "ignorer OSCP-tjenesteadresser som følger sertifikater"
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr "|ADR|videresend alle HTTP-forespørsler til valgt nettADResse"
  
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
  msgid "|HOST|use HOST for LDAP queries"
  msgstr "|VERT|bruk valgt VERT til LDAP-oppslag"
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr "ikke bruk tilbakefallsverter ved bruk av valget «--ldap-proxy»"
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:202
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FIL|les LDAP-tjenerliste fra valgt FIL"
  
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
  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:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr "|N|endre LDAP-tidsavbrudd til N antall sekunder"
  
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:210
  msgid "|URL|use OCSP responder at URL"
  msgstr "|ADR|bruk OCSP-svartjeneste ved valgt nettADResse"
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:212
  msgid "|FPR|OCSP response signed by FPR"
  msgstr "|FPR|OCSP-svartjeneste signert av FPR"
  
- #: dirmngr/dirmngr.c:215
++#: 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:220
++#: dirmngr/dirmngr.c:223
  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:222
++#: dirmngr/dirmngr.c:225
  msgid "route all network traffic via Tor"
  msgstr "kjør all nettverkstrafikk gjennom Tor"
  
- #: dirmngr/dirmngr.c:240
++#: dirmngr/dirmngr.c:246
  msgid ""
  "@\n"
  "(See the \"info\" manual for a complete listing of all commands and "
@@@ -9606,11 -7651,9 +9676,11 @@@ msgstr "
  "@\n"
  "Se «info»-bruksanvisning for fullstendig liste over alle kommandoer og valg\n"
  
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:361
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Bruk: @DIRMNGR@ [valg] (-h for hjelp)"
  
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:363
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9618,77 -7661,60 +9688,77 @@@ msgstr "
  "Syntaks: @DIRMNGR@ [valg] [kommando [arg]]\n"
  "Tilgang til nøkkeltjener, CRL og OCSP for @GNUPG@\n"
  
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:443
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr "følgende feilsøkingsnivåer er gyldige: %s\n"
  
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
- #: tools/gpgconf.c:648
++#: dirmngr/dirmngr.c:496 tools/gpgconf.c:550 tools/gpgconf.c:585
++#: tools/gpgconf.c:656
  #, c-format
  msgid "usage: %s [options] "
  msgstr "bruk: %s [valg] "
  
- #: dirmngr/dirmngr.c:1062
++#: dirmngr/dirmngr.c:1074
  msgid "colons are not allowed in the socket name\n"
  msgstr "kolon tillates ikke i sokkelnavn\n"
  
- #: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
++#: dirmngr/dirmngr.c:1300 dirmngr/server.c:1585
  #, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "henting av CRL fra «%s» mislyktes: %s\n"
  
- #: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
++#: dirmngr/dirmngr.c:1306 dirmngr/server.c:1591
  #, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "behandling av CRL fra «%s» mislyktes: %s\n"
  
- #: dirmngr/dirmngr.c:1484
++#: dirmngr/dirmngr.c:1487
  #, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "%s:%u: for lang linje. Hoppet over\n"
  
- #: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
++#: dirmngr/dirmngr.c:1542 dirmngr/dirmngr.c:1626
  #, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "%s:%u: oppdaget ugyldig fingeravtrykk\n"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
++#: dirmngr/dirmngr.c:1578 dirmngr/dirmngr.c:1604 tools/gpgconf-comp.c:4032
  #, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "%s:%u: lesefeil: %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1633
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr "%s:%u: ignorerer ugyldige data ved linjeslutt\n"
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1700
  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:1734
++#: dirmngr/dirmngr.c:1738
  msgid "SIGUSR2 received - no action defined\n"
  msgstr "SIGUSR2 mottatt. Ingen handling definert\n"
  
- #: dirmngr/dirmngr.c:1739
++#: dirmngr/dirmngr.c:1743
  msgid "SIGTERM received - shutting down ...\n"
  msgstr "SIGTERM mottatt. Slår av …\n"
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1745
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr "SIGTERM mottatt. %d tilkoblinger er fremdeles aktive\n"
  
- #: dirmngr/dirmngr.c:1746
++#: dirmngr/dirmngr.c:1750
  msgid "shutdown forced\n"
  msgstr "slår av under tvang\n"
  
- #: dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1758
  msgid "SIGINT received - immediate shutdown\n"
  msgstr "SIGINT mottatt. Slår av umiddelbart\n"
  
- #: dirmngr/dirmngr.c:1761
++#: dirmngr/dirmngr.c:1765
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr "signal %d mottatt. Ingen handling definert\n"
@@@ -10151,32 -8078,26 +10221,32 @@@ msgstr "«fetch_next_cert» mislyktes: 
  msgid "max_replies %d exceeded\n"
  msgstr "max_replies %d overskredet\n"
  
- #: dirmngr/server.c:2463
++#: dirmngr/server.c:2469
  #, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "klarte ikke å tildele kontrollstruktur: %s\n"
  
- #: dirmngr/server.c:2474
++#: dirmngr/server.c:2480
  #, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "klarte ikke å tildele assuan-kontekst: %s\n"
  
- #: dirmngr/server.c:2495
++#: dirmngr/server.c:2501
  #, c-format
  msgid "failed to initialize the server: %s\n"
  msgstr "klarte ikke å starte opp tjener: %s\n"
  
- #: dirmngr/server.c:2503
++#: dirmngr/server.c:2509
  #, c-format
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "klarte ikke å registrere kommandoer i Assuan: %s\n"
  
- #: dirmngr/server.c:2534
++#: dirmngr/server.c:2540
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr "Assuan-godkjenningsproblem: %s\n"
  
- #: dirmngr/server.c:2553
++#: dirmngr/server.c:2559
  #, c-format
  msgid "Assuan processing failed: %s\n"
  msgstr "Assuan-behandling mislyktes: %s\n"
@@@ -10218,7 -8130,6 +10288,7 @@@ msgstr "DSA krever kontrollsum på 160 
  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:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:167
  msgid "quiet"
  msgstr "stille"
  
@@@ -10309,22 -8200,15 +10379,22 @@@ msgstr "sending av linje mislyktes: %s\
  msgid "error sending standard options: %s\n"
  msgstr "feil under sending av standardvalg: %s\n"
  
 +#: tools/gpgconf-comp.c:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
- #: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
++#: tools/gpgconf-comp.c:766 tools/gpgconf-comp.c:865
  msgid "Options controlling the diagnostic output"
  msgstr "Styring av diagnostikk-utdata"
  
 +#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
- #: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
++#: tools/gpgconf-comp.c:779 tools/gpgconf-comp.c:888
  msgid "Options controlling the configuration"
  msgstr "Oppsettsvalg"
  
- #: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
- #: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
++#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:723
++#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:901
  msgid "Options useful for debugging"
  msgstr "Nyttige feilsøkingsvalg"
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
  msgid "Options controlling the security"
  msgstr "Sikkerhetsvalg"
  
@@@ -10375,11 -8248,9 +10445,11 @@@ msgstr "ikke tillat gjenbruk av gamle p
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr "|N|endre tidsavbrudd for PIN-inntasting til N antall sekunder"
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
++#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
  msgid "|NAME|use NAME as default secret key"
  msgstr "|NAVN|bruk valgt NAVN som forvalgt hemmelig nøkkel"
  
- #: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
++#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:784
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NAVN|krypter også til valgt bruker-id-NAVN"
  
@@@ -10387,180 -8257,154 +10457,198 @@@
  msgid "|SPEC|set up email aliases"
  msgstr "|SPES|sett opp e-post-alias"
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
++#: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
  msgid "Configuration for Keyservers"
  msgstr "Oppsett for nøkkeltjenere"
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
++#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
  msgid "|URL|use keyserver at URL"
  msgstr "|ADR|bruk nøkkeltjener på valgt nettADResse"
  
- #: tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:741
  msgid "allow PKA lookups (DNS requests)"
  msgstr "tillat PKA-oppslag (DNS-forespørsler)"
  
- #: tools/gpgconf-comp.c:738
++#: tools/gpgconf-comp.c:744
  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:787
++#: tools/gpgconf-comp.c:793
  msgid "disable all access to the dirmngr"
  msgstr "slå av all tilgang til dirmngr"
  
- #: tools/gpgconf-comp.c:790
++#: tools/gpgconf-comp.c:796
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
  msgstr "|NAVN|bruk valgt kodeNAVN til PKCS#12-passordfraser"
  
- #: tools/gpgconf-comp.c:820
++#: tools/gpgconf-comp.c:829
  msgid "do not check CRLs for root certificates"
  msgstr "ikke se etter rotsertifikater i CRL"
  
- #: tools/gpgconf-comp.c:869
++#: tools/gpgconf-comp.c:878
  msgid "Options controlling the format of the output"
  msgstr "Valg som styrer utdata-format"
  
- #: tools/gpgconf-comp.c:905
++#: tools/gpgconf-comp.c:920
  msgid "Options controlling the interactivity and enforcement"
  msgstr "Valg som styrer grensesnitt og håndheving av regler"
  
- #: tools/gpgconf-comp.c:918
++#: tools/gpgconf-comp.c:933
  msgid "Options controlling the use of Tor"
  msgstr "Valg som styrer bruk av Tor"
  
- #: tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:947
  msgid "Configuration for HTTP servers"
  msgstr "Oppsett for HTTP-tjenere"
  
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:958
  msgid "use system's HTTP proxy setting"
  msgstr "bruk systemets innstilling for HTTP-mellomtjener"
  
- #: tools/gpgconf-comp.c:948
++#: tools/gpgconf-comp.c:963
  msgid "Configuration of LDAP servers to use"
  msgstr "Oppsett for bruk av LDAP-tjenere"
  
- #: tools/gpgconf-comp.c:977
++#: tools/gpgconf-comp.c:992
  msgid "LDAP server list"
  msgstr "LDAP-tjenerliste"
  
- #: tools/gpgconf-comp.c:985
++#: tools/gpgconf-comp.c:1000
  msgid "Configuration for OCSP"
  msgstr "Oppsett for OCSP"
  
- #: tools/gpgconf-comp.c:1066
++#: tools/gpgconf-comp.c:1081
  #, fuzzy
  #| msgid "GPG for OpenPGP"
  msgid "OpenPGP"
  msgstr "GPG for OpenPGP"
  
- #: tools/gpgconf-comp.c:1067
++#: tools/gpgconf-comp.c:1082
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1083
  #, fuzzy
  #| msgid "Smartcard Daemon"
  msgid "Smartcards"
  msgstr "Smartcard-bakgrunnsprosess"
  
- #: tools/gpgconf-comp.c:1069
++#: tools/gpgconf-comp.c:1084
  #, fuzzy
  #| msgid "GPG for S/MIME"
  msgid "S/MIME"
  msgstr "GPG for S/MIME"
  
- #: tools/gpgconf-comp.c:1070
++#: tools/gpgconf-comp.c:1085
  #, fuzzy
  #| msgid "network error"
  msgid "Network"
  msgstr "nettverksfeil"
  
- #: tools/gpgconf-comp.c:1071
++#: tools/gpgconf-comp.c:1086
  #, fuzzy
  #| msgid "PIN and Passphrase Entry"
  msgid "Passphrase Entry"
  msgstr "Skriving av PIN og passordfrase"
  
- #: tools/gpgconf-comp.c:1225
++#: tools/gpgconf-comp.c:1240
  msgid "Component not suitable for launching"
  msgstr "Komponent egner seg ikke for oppstart"
  
- #: tools/gpgconf-comp.c:3283
++#: tools/gpgconf-comp.c:3311
  #, c-format
  msgid "External verification of component %s failed"
  msgstr "Ekstern bekreftelse av komponent %s mislyktes"
  
- #: tools/gpgconf-comp.c:3434
++#: tools/gpgconf-comp.c:3462
  msgid "Note that group specifications are ignored\n"
  msgstr "Merk at gruppespesifikasjoner blir ignorert\n"
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf-comp.c:4036
+ #, fuzzy, c-format
+ #| msgid "error closing '%s': %s\n"
+ msgid "error closing '%s'\n"
+ msgstr "feil under lukking av «%s»: %s\n"
+ 
++#: tools/gpgconf-comp.c:4038
+ #, fuzzy, c-format
+ #| msgid "error hashing '%s': %s\n"
+ msgid "error parsing '%s'\n"
+ msgstr "feil under summering av «%s»: %s\n"
+ 
++#: tools/gpgconf.c:73
  msgid "list all components"
  msgstr "vis alle komponenter"
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "check all programs"
  msgstr "kontroller alle programmer"
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|list options"
  msgstr "|KOMPONENT|vis valg"
  
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
  msgid "|COMPONENT|change options"
  msgstr "|KOMPONENT|endre valg"
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "|COMPONENT|check options"
  msgstr "|KOMPONENT|kontroller valg"
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "apply global default values"
  msgstr "bruk globale standardverdier"
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
+ #, fuzzy
+ #| msgid "|FILE|take policy information from FILE"
+ msgid "|FILE|update configuration files using FILE"
+ msgstr "|FIL|hent regler fra valgt FIL"
+ 
++#: tools/gpgconf.c:83
  msgid "get the configuration directories for @GPGCONF@"
  msgstr "hent oppsettsmapper for @GPGCONF@"
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:85
  msgid "list global configuration file"
  msgstr "vis global oppsettsfil"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  msgid "check global configuration file"
  msgstr "kontroller global oppsettsfil"
  
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:89
  #, fuzzy
  #| msgid "update the trust database"
  msgid "query the software version database"
  msgstr "oppdater tillitsdatabase"
  
- #: tools/gpgconf.c:86
++#: tools/gpgconf.c:90
  msgid "reload all or a given component"
  msgstr "last inn én eller alle komponenter på nytt"
  
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:91
  msgid "launch a given component"
  msgstr "last inn valgt komponent"
  
- #: tools/gpgconf.c:88
++#: tools/gpgconf.c:92
  msgid "kill a given component"
  msgstr "drep valgt komponent"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "use as output file"
  msgstr "bruk som utdatafil"
  
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:102
  msgid "activate changes at runtime, if possible"
  msgstr "ta i bruk endringer under kjøring, hvis mulig"
  
- #: tools/gpgconf.c:122
++#: tools/gpgconf.c:127
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "Bruk: @GPGCONF@ [valg] (-h for hjelp)"
  
- #: tools/gpgconf.c:125
++#: tools/gpgconf.c:130
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10568,15 -8412,12 +10656,15 @@@ msgstr "
  "Syntaks: @GPGCONF@ [valg]\n"
  "Behandle oppsettsvalg for verktøy i @GNUPG at -systemet\n"
  
- #: tools/gpgconf.c:545 tools/gpgconf.c:579
++#: tools/gpgconf.c:552 tools/gpgconf.c:587
  msgid "Need one component argument"
  msgstr "Komponent-argument mangler"
  
- #: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
++#: tools/gpgconf.c:561 tools/gpgconf.c:599 tools/gpgconf.c:632
  msgid "Component not found"
  msgstr "Fant ikke komponent"
  
- #: tools/gpgconf.c:650
++#: tools/gpgconf.c:658
  msgid "No argument allowed"
  msgstr "Ingen argumenter tillatt"
  
diff --cc po/pl.po
index 8f8ae12,8b750f3..03c0493
--- a/po/pl.po
+++ b/po/pl.po
@@@ -8,7 -8,6 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg-2.0.20\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-11-18 16:54+0100\n"
++"POT-Creation-Date: 2016-12-20 11:28+0100\n"
  "PO-Revision-Date: 2013-05-12 17:25+0200\n"
  "Last-Translator: Jakub Bogusz <qboosh at pld-linux.org>\n"
  "Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
@@@ -162,25 -133,11 +162,25 @@@ msgstr "Niepoprawne hasło
  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:838 common/dotlock.c:839 g10/card-util.c:839
- #: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1306 g10/keygen.c:4577
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
++#: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't create '%s': %s\n"
  msgstr "nie można utworzyć ,,%s'': %s\n"
  
 +#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
- #: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1307
++#: g10/import.c:305 g10/import.c:448 g10/import.c:621 g10/keygen.c:3681
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
- #: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
- #: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:825 g10/sign.c:1025
++#: g10/sign.c:1130 g10/sign.c:1275 g10/tdbdump.c:143 g10/tdbdump.c:151
++#: g10/tdbio.c:720 g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161
++#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
++#: dirmngr/certcache.c:368 dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1564
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
@@@ -246,11 -192,9 +246,11 @@@ msgstr "
  msgid "failed to create stream from socket: %s\n"
  msgstr "nie udało się utworzyć strumienia z gniazda: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1100
++#: agent/divert-scd.c:92 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr "Proszę włożyć kartę z numerem seryjnym"
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1101
++#: agent/divert-scd.c:93 g10/call-agent.c:1102
  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"
  
@@@ -410,47 -328,32 +410,47 @@@ msgstr "
  "@Opcje:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
  msgid "run in daemon mode (background)"
  msgstr "uruchomienie w trybie demona (w tle)"
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
  msgid "run in server mode (foreground)"
  msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
  #, fuzzy
  #| msgid "run in server mode"
  msgid "run in supervised mode"
  msgstr "uruchomienie w trybie serwera"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:170 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "z dodatkowymi informacjami"
  
 +#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "mniej komunikatów"
  
- #: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
  msgid "sh-style command output"
  msgstr "wyjście poleceń w stylu sh"
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
  msgid "csh-style command output"
  msgstr "wyjście poleceń w stylu csh"
  
- #: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
- #: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
++#: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
  msgid "|FILE|read options from FILE"
  msgstr "|PLIK|odczyt opcji z PLIKU"
  
- #: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:177
  msgid "do not detach from the console"
  msgstr "nie odczepianie od konsoli"
  
@@@ -531,21 -417,14 +531,21 @@@ msgstr "
  #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
  #. reporting address.  This is so that we can change the
  #. reporting address without breaking the translations.
- #: agent/gpg-agent.c:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:481 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1025 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:358
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:124 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr "Błędy prosimy zgłaszać na adres <@EMAIL@>.\n"
  
- #: agent/gpg-agent.c:491
++#: agent/gpg-agent.c:490
  #, fuzzy
  #| msgid "Usage: gpgconf [options] (-h for help)"
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "Wywołanie: gpgconf [opcje] (-h podaje pomoc)"
  
- #: agent/gpg-agent.c:493
++#: agent/gpg-agent.c:492
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -557,149 -436,114 +557,149 @@@ msgstr "
  "Składnia: gpg-agent [opcje] [polecenie [argumenty]]\n"
  "Zarządzanie kluczem tajnym dla GnuPG\n"
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:537 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:442
  #, fuzzy, c-format
  #| msgid "invalid debug-level `%s' given\n"
  msgid "invalid debug-level '%s' given\n"
  msgstr "podano błędny poziom diagnostyki ,,%s''\n"
  
- #: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:793
++#: agent/gpg-agent.c:1082 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:812
  #, fuzzy, c-format
  #| msgid "NOTE: no default option file `%s'\n"
  msgid "Note: no default option file '%s'\n"
  msgstr "UWAGA: brak domyślnego pliku opcji ,,%s''\n"
  
- #: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
- #: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1093 agent/gpg-agent.c:1935 g10/gpg.c:2510
++#: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:817
++#: dirmngr/dirmngr.c:1670 tools/symcryptrun.c:932
  #, fuzzy, c-format
  #| msgid "option file `%s': %s\n"
  msgid "option file '%s': %s\n"
  msgstr "plik opcji ,,%s'': %s\n"
  
- #: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:806
++#: agent/gpg-agent.c:1101 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:825
  #, fuzzy, c-format
  #| msgid "reading options from `%s'\n"
  msgid "reading options from '%s'\n"
  msgstr "odczyt opcji z ,,%s''\n"
  
- #: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
- #: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
++#: agent/gpg-agent.c:1223 g10/gpg.c:3643 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:936 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:527
  #, fuzzy, c-format
  #| msgid "WARNING: \"%s\" is a deprecated option\n"
  msgid "Note: '%s' is not considered an option\n"
  msgstr "OSTRZEŻENIE: ,,%s'' jest przestarzałą opcją.\n"
  
- #: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
++#: agent/gpg-agent.c:2080 scd/scdaemon.c:1073 dirmngr/dirmngr.c:1081
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "nie można utworzyć gniazda: %s\n"
  
- #: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
++#: agent/gpg-agent.c:2097 scd/scdaemon.c:1086 dirmngr/dirmngr.c:1094
  #, fuzzy, c-format
  #| msgid "socket name `%s' is too long\n"
  msgid "socket name '%s' is too long\n"
  msgstr "nazwa gniazda `%s' zbyt długa\n"
  
- #: agent/gpg-agent.c:2134
++#: agent/gpg-agent.c:2135
  msgid "a gpg-agent is already running - not starting a new one\n"
  msgstr "gpg-agent już działa - nie uruchamianie nowego\n"
  
- #: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
++#: agent/gpg-agent.c:2145 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1126
  msgid "error getting nonce for the socket\n"
  msgstr "błąd podczas pobierania nonce z gniazda\n"
  
- #: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
++#: agent/gpg-agent.c:2150 scd/scdaemon.c:1113 dirmngr/dirmngr.c:1129
  #, fuzzy, c-format
  #| msgid "error binding socket to `%s': %s\n"
  msgid "error binding socket to '%s': %s\n"
  msgstr "błąd podczas przypisywania gniazda do ,,%s'': %s\n"
  
- #: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
- #: dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2160 agent/gpg-agent.c:2197 scd/scdaemon.c:1121
++#: dirmngr/dirmngr.c:1138
  #, fuzzy, c-format
  #| msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgid "can't set permissions of '%s': %s\n"
  msgstr "Ostrzeżenie: niebezpieczne prawa dostępu do %s ,,%s''\n"
  
- #: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:2165 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1143
  #, c-format
  msgid "listen() failed: %s\n"
  msgstr "listen() nie powiodło się: %s\n"
  
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
++#: agent/gpg-agent.c:2172 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1149
  #, fuzzy, c-format
  #| msgid "listening on socket `%s'\n"
  msgid "listening on socket '%s'\n"
  msgstr "nasłuchiwanie na gnieździe ,,%s''\n"
  
- #: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: agent/gpg-agent.c:2191 agent/gpg-agent.c:2234 g10/exec.c:199
 +#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, fuzzy, c-format
  #| msgid "can't create directory `%s': %s\n"
  msgid "can't create directory '%s': %s\n"
  msgstr "nie można utworzyć katalogu ,,%s'': %s\n"
  
- #: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: agent/gpg-agent.c:2194 agent/gpg-agent.c:2239 g10/openfile.c:491
 +#: g10/openfile.c:520 sm/keydb.c:103
  #, fuzzy, c-format
  #| msgid "directory `%s' created\n"
  msgid "directory '%s' created\n"
  msgstr "katalog ,,%s'' utworzony\n"
  
- #: agent/gpg-agent.c:2244
++#: agent/gpg-agent.c:2245
  #, fuzzy, c-format
  #| msgid "stat() failed for `%s': %s\n"
  msgid "stat() failed for '%s': %s\n"
  msgstr "stat() nie powiodło się dla ,,%s'': %s\n"
  
- #: agent/gpg-agent.c:2248
++#: agent/gpg-agent.c:2249
  #, fuzzy, c-format
  #| msgid "can't use `%s' as home directory\n"
  msgid "can't use '%s' as home directory\n"
  msgstr "nie można użyć ,,%s'' jako katalogu domowego\n"
  
- #: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
++#: agent/gpg-agent.c:2392 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1871
  #, 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:2598
++#: agent/gpg-agent.c:2599
  #, 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:2603
++#: agent/gpg-agent.c:2604
  #, 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:2678
++#: agent/gpg-agent.c:2679
  #, 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:2683
++#: agent/gpg-agent.c:2684
  #, 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:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
++#: agent/gpg-agent.c:2881 scd/scdaemon.c:1272 dirmngr/dirmngr.c:2075
  #, fuzzy, c-format
  #| msgid "pth_select failed: %s - waiting 1s\n"
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "pth_select nie powiodło się: %s - czekanie 1s\n"
  
- #: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2954 scd/scdaemon.c:1321
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s zatrzymany\n"
  
- #: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
++#: agent/gpg-agent.c:3092 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  msgid "no gpg-agent running in this session\n"
  msgstr "brak działającego gpg-agenta w tej sesji\n"
  
@@@ -716,8 -558,6 +716,8 @@@ msgstr "
  "Składnia: gpg-preset-passphrase [opcje] UCHWYT_KLUCZA\n"
  "Utrzymuwanie pamięci haseł\n"
  
- #: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
++#: agent/protect-tool.c:106 g10/gpg.c:424 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:153 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -725,9 -565,6 +725,9 @@@ msgstr "
  "@Polecenia:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
- #: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:92 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:168 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -781,8 -610,6 +781,8 @@@ 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:362 dirmngr/dirmngr.c:1469
- #: tools/gpgconf.c:323
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1472
++#: tools/gpgconf.c:328
  #, fuzzy, c-format
  #| msgid "error opening `%s': %s\n"
  msgid "error opening '%s': %s\n"
@@@ -965,9 -763,6 +965,9 @@@ msgstr "algorytm ochrony %d%s nie jest 
  msgid "protection hash algorithm %d (%s) is not supported\n"
  msgstr "algorytm ochrony %d%s nie jest obsługiwany\n"
  
 +#: common/exechelp-posix.c:359 common/exechelp-w32.c:438
 +#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
- #: dirmngr/ldap-wrapper.c:710
++#: dirmngr/ldap-wrapper.c:711
  #, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "błąd tworzenia potoku: %s\n"
@@@ -980,8 -772,6 +980,8 @@@
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "błąd tworzenia potoku: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1155
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1167
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "błąd podczas tworzenia procesu: %s\n"
@@@ -1031,28 -812,23 +1031,28 @@@ msgstr "nie można się połączyć z ,
  msgid "problem setting the gpg-agent options\n"
  msgstr "problem z ustawieniem opcji gpg-agenta\n"
  
- #: common/sysutils.c:144
++#: common/sysutils.c:148
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "nie można wyłączyć zrzutów pamięci: %s\n"
  
- #: common/sysutils.c:239
++#: common/sysutils.c:250
  #, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "Ostrzeżenie: niebezpieczne prawa własności do %s ,,%s''\n"
  
- #: common/sysutils.c:271
++#: common/sysutils.c:282
  #, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "Ostrzeżenie: niebezpieczne prawa dostępu do %s ,,%s''\n"
  
- #: common/sysutils.c:659
++#: common/sysutils.c:693
  #, fuzzy, c-format
  #| msgid "waiting %d seconds for the agent to come up\n"
  msgid "waiting for file '%s' to become accessible ...\n"
  msgstr "oczekiwanie (%d s) na uruchomienie agenta\n"
  
- #: common/sysutils.c:685
++#: common/sysutils.c:719
  #, fuzzy, c-format
  #| msgid "renaming `%s' to `%s' failed: %s\n"
  msgid "renaming '%s' to '%s' failed: %s\n"
@@@ -1129,7 -890,6 +1129,7 @@@ msgstr "%s:%u: przestarzała opcja ,,%s
  msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
  msgstr "OSTRZEŻENIE: ,,%s'' jest przestarzałą opcją - nie ma efektu\n"
  
- #: common/miscellaneous.c:554
++#: common/miscellaneous.c:556
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
@@@ -1241,8 -978,6 +1241,8 @@@ msgstr "Klucz sesji utworzony
  msgid "algorithm: %s"
  msgstr "algorytm: %s"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3098
++#: scd/app-openpgp.c:3111
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "nieobsługiwany algorytm: %s"
@@@ -1432,7 -1125,6 +1432,7 @@@ msgstr "opcja ,,%.50s'' jest niejednozn
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr "polecenie ,,%.50s'' jest niejednoznaczne\n"
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1173
++#: common/argparse.c:401 dirmngr/dirmngr.c:1185
  msgid "out of core\n"
  msgstr "brak pamięci\n"
  
@@@ -1495,8 -1176,6 +1495,8 @@@ msgstr "blokada ,,%s'' nie założona: 
  msgid "waiting for lock %s...\n"
  msgstr "oczekiwanie na blokadę %s...\n"
  
- #: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
- #: dirmngr/dirmngr.c:715
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:725
++#: dirmngr/dirmngr.c:734
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr "biblioteka %s jest zbyt stara (potrzebna %s, zainstalowana %s)\n"
@@@ -1534,7 -1205,6 +1534,7 @@@ msgstr "nieoczekiwane opakowanie: 
  msgid "invalid dash escaped line: "
  msgstr "niepoprawne oznaczenie linii minusami: "
  
- #: g10/armor.c:873 g10/armor.c:1490
++#: g10/armor.c:873 g10/armor.c:1493
  #, c-format
  msgid "invalid radix64 character %02X skipped\n"
  msgstr "niewłaściwy znak formatu radix64 ,,%02X'' został pominięty\n"
@@@ -1551,7 -1218,6 +1551,7 @@@ msgstr "przedwczesny koniec pliku (w CR
  msgid "malformed CRC\n"
  msgstr "błąd formatu CRC\n"
  
- #: g10/armor.c:962 g10/armor.c:1527
++#: g10/armor.c:962 g10/armor.c:1530
  #, c-format
  msgid "CRC error; %06lX - %06lX\n"
  msgstr "Błąd sumy CRC; %06lX - %06lX\n"
@@@ -1564,16 -1228,13 +1564,16 @@@ msgstr "przedwczesny koniec pliku (w li
  msgid "error in trailer line\n"
  msgstr "błąd w linii kończącej\n"
  
- #: g10/armor.c:1303
++#: g10/armor.c:1306
  msgid "no valid OpenPGP data found.\n"
  msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
  
- #: g10/armor.c:1308
++#: g10/armor.c:1311
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
  msgstr "błąd opakowania: linia dłuższa niż %d znaków\n"
  
- #: g10/armor.c:1312
++#: g10/armor.c:1315
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr ""
@@@ -1664,8 -1310,6 +1664,8 @@@ msgstr "Karta OpenPGP niedostępna: %s\
  msgid "OpenPGP card no. %s detected\n"
  msgstr "Wykryto kartę OpenPGP nr %s\n"
  
- #: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
- #: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2030
++#: g10/keygen.c:4087 g10/revoke.c:215 g10/revoke.c:618
  msgid "can't do this in batch mode\n"
  msgstr "nie działa w trybie wsadowym\n"
  
@@@ -1673,14 -1316,9 +1673,14 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "To polecenie jest dostępne tylko dla kart w wersji 2\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2454
++#: g10/card-util.c:109 scd/app-openpgp.c:2467
  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:142 g10/card-util.c:1471 g10/card-util.c:1587
- #: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
- #: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1768
++#: g10/keygen.c:1945 g10/keygen.c:2313 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "Twój wybór? "
  
@@@ -1742,10 -1366,6 +1742,10 @@@ msgstr "URL do odczytania klucza public
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr "Błąd: URL zbyt długi (limit to %d znaków).\n"
  
- #: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
- #: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:334
++#: g10/import.c:592 g10/import.c:640 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
++#: dirmngr/dirmngr.c:1510 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
@@@ -1813,7 -1418,6 +1813,7 @@@ msgstr "operacja na kluczu niewykonalna
  msgid "not an OpenPGP card"
  msgstr "to nie jest karta OpenPGP"
  
- #: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
++#: g10/card-util.c:1173 g10/keygen.c:4106 g10/keygen.c:5092
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr "błąd podczas odczytu aktualnych informacji o kluczu: %s\n"
@@@ -1852,13 -1451,10 +1852,13 @@@ msgstr "Jakiej długości klucz do szyf
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "Jakiej długości klucz do uwierzytelniania wygenerować? (%u) "
  
- #: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
++#: g10/card-util.c:1316 g10/keygen.c:2122 g10/keygen.c:2154
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "zaokrąglono do %u bitów\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2207 sm/certreqgen-ui.c:188
  #, 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"
@@@ -1918,9 -1504,6 +1918,9 @@@ msgstr "   (2) Klucz do szyfrowania\n
  msgid "   (3) Authentication key\n"
  msgstr "   (3) Klucz do uwierzytelniania\n"
  
- #: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
- #: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
- #: g10/keygen.c:2314 g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1508
++#: g10/keygen.c:1794 g10/keygen.c:1822 g10/keygen.c:1952 g10/keygen.c:2060
++#: g10/keygen.c:2336 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Niewłaściwy wybór.\n"
  
@@@ -1956,7 -1533,6 +1956,7 @@@ msgstr "Podpisać go? (t/N) 
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1816 g10/keyedit.c:1867
++#: g10/card-util.c:1816 g10/keyedit.c:1868
  msgid "quit this menu"
  msgstr "wyjście z tego menu"
  
@@@ -1964,7 -1539,6 +1964,7 @@@
  msgid "show admin commands"
  msgstr "pokazanie poleceń administratora"
  
- #: g10/card-util.c:1819 g10/keyedit.c:1870
++#: g10/card-util.c:1819 g10/keyedit.c:1871
  msgid "show this help"
  msgstr "ten tekst pomocy"
  
@@@ -2040,31 -1596,21 +2040,31 @@@ msgstr "Polecenia dla administratora s�
  msgid "Admin commands are not allowed\n"
  msgstr "Polecenia dla administratora nie są dozwolone\n"
  
- #: g10/card-util.c:2127 g10/keyedit.c:2816
++#: g10/card-util.c:2127 g10/keyedit.c:2817
  msgid "Invalid command  (try \"help\")\n"
  msgstr "Niepoprawne polecenie  (spróbuj ,,help'')\n"
  
- #: g10/decrypt.c:191 g10/encrypt.c:955
++#: g10/decrypt.c:190 g10/encrypt.c:955
  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:4851 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4904 g10/keyring.c:398 g10/keyring.c:771
  #, fuzzy, c-format
  #| msgid "can't open `%s'\n"
  msgid "can't open '%s'\n"
  msgstr "nie można otworzyć ,,%s''\n"
  
 +#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
- #: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
- #: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4858 g10/keyedit.c:2051
++#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2163
  #, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "klucz ,,%s'' nie został odnaleziony: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
- #: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
- #: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4866 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:645 g10/tofu.c:2171
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "błąd odczytu bloku kluczy: %s\n"
@@@ -2125,7 -1659,6 +2125,7 @@@ msgstr "dla klucza publicznego ,,%s'' i
  msgid "use option \"--delete-secret-keys\" to delete it first.\n"
  msgstr "aby go usunąć należy najpierw użyć opcji \"--delete-secret-key\".\n"
  
- #: g10/encrypt.c:232 g10/sign.c:1292
++#: g10/encrypt.c:232 g10/sign.c:1294
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "błąd podczas tworzenia hasła: %s\n"
@@@ -2146,7 -1676,6 +2146,7 @@@ msgstr "szyfrem %s\n
  msgid "'%s' already compressed\n"
  msgstr ",,%s'' już jest skompresowany\n"
  
- #: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:610
  #, fuzzy, c-format
  #| msgid "WARNING: `%s' is an empty file\n"
  msgid "WARNING: '%s' is an empty file\n"
@@@ -2166,7 -1693,6 +2166,7 @@@ msgstr "
  "OSTRZEŻENIE: wymuszone użycie szyfru %s (%d) kłóci się z ustawieniami "
  "adresata\n"
  
- #: g10/encrypt.c:707 g10/sign.c:984
++#: g10/encrypt.c:707 g10/sign.c:986
  #, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2200,7 -1721,6 +2200,7 @@@ msgstr "dane zaszyfrowano za pomocą %s
  msgid "encrypted with unknown algorithm %d\n"
  msgstr "dane zaszyfrowano nieznanym algorytmem numer %d\n"
  
- #: g10/decrypt-data.c:164 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:129
  msgid ""
  "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
  msgstr ""
@@@ -2294,8 -1796,6 +2294,8 @@@ msgstr "usunięcie jak największej cz�
  msgid " - skipped"
  msgstr "%s: pominięty: %s\n"
  
- #: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:845 g10/sign.c:1148
++#: g10/export.c:1251 g10/import.c:1543 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:847 g10/sign.c:1150
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
@@@ -2319,8 -1815,6 +2319,8 @@@ msgstr "klucz %s: klucz PGP 2.x - pomin
  msgid "WARNING: nothing exported\n"
  msgstr "OSTRZEŻENIE: nic nie zostało wyeksportowane!\n"
  
- #: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
- #: g10/plaintext.c:151 g10/plaintext.c:174
++#: g10/export.c:2283 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/plaintext.c:167 g10/plaintext.c:190
  #, fuzzy, c-format
  #| msgid "error creating `%s': %s\n"
  msgid "error creating '%s': %s\n"
@@@ -2370,8 -1855,6 +2370,8 @@@ msgstr "błąd odtwarzania ,,%s'' poprz
  msgid "No fingerprint"
  msgstr "Brak odcisku"
  
- #: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
- #: g10/revoke.c:701
++#: g10/getkey.c:1873 g10/keyedit.c:2929 g10/keyedit.c:3016 g10/revoke.c:637
++#: g10/revoke.c:702
  #, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "klucz prywatny ,,%s'' nie został odnaleziony: %s\n"
@@@ -2404,211 -1882,167 +2404,217 @@@ msgstr "
  msgid "using subkey %s instead of primary key %s\n"
  msgstr "używany jest podklucz %s zamiast klucza głównego %s\n"
  
- #: g10/gpg.c:424 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:200
  msgid "make a signature"
  msgstr "złożenie podpisu"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:427
  msgid "make a clear text signature"
  msgstr "złożenie podpisu pod dokumentem"
  
- #: g10/gpg.c:426 sm/gpgsm.c:202
++#: g10/gpg.c:429 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "złożenie podpisu oddzielonego od dokumentu"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:430 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "szyfrowanie danych"
  
- #: g10/gpg.c:429
++#: g10/gpg.c:432
  msgid "encryption only with symmetric cipher"
  msgstr "szyfrowanie tylko szyfrem symetrycznym"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:434 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "odszyfrowywanie danych (domyślne)"
  
- #: g10/gpg.c:433 sm/gpgsm.c:206
++#: g10/gpg.c:436 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "sprawdzenie podpisu"
  
- #: g10/gpg.c:435 sm/gpgsm.c:207
++#: g10/gpg.c:438 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "lista kluczy"
  
- #: g10/gpg.c:437
++#: g10/gpg.c:440
  msgid "list keys and signatures"
  msgstr "lista kluczy i podpisów"
  
- #: g10/gpg.c:438
++#: g10/gpg.c:443
  msgid "list and check key signatures"
  msgstr "wypisanie i sprawdzenie podpisów kluczy"
  
- #: g10/gpg.c:439 sm/gpgsm.c:212
++#: g10/gpg.c:445 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "lista kluczy i ich odcisków"
  
- #: g10/gpg.c:440 sm/gpgsm.c:210
++#: g10/gpg.c:446 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "lista kluczy prywatnych"
  
- #: g10/gpg.c:442 sm/gpgsm.c:213
++#: g10/gpg.c:448 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "generacja nowej pary kluczy"
  
- #: g10/gpg.c:444
++#: g10/gpg.c:451
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly generate a new key pair"
  msgstr "generacja nowej pary kluczy"
  
- #: g10/gpg.c:446
++#: g10/gpg.c:454
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly add a new user-id"
  msgstr "generacja nowej pary kluczy"
  
- #: g10/gpg.c:449
++#: g10/gpg.c:459
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly revoke a user-id"
  msgstr "generacja nowej pary kluczy"
  
- #: g10/gpg.c:451
++#: g10/gpg.c:462
+ #, fuzzy
+ #| msgid "generate a new key pair"
+ msgid "quickly set a new expiration date"
+ msgstr "generacja nowej pary kluczy"
+ 
++#: g10/gpg.c:464
  msgid "full featured key pair generation"
  msgstr ""
  
- #: g10/gpg.c:452
++#: g10/gpg.c:467
  msgid "generate a revocation certificate"
  msgstr "tworzenie certyfikatu unieważnienia klucza"
  
- #: g10/gpg.c:454 sm/gpgsm.c:215
++#: g10/gpg.c:470 sm/gpgsm.c:216
  msgid "remove keys from the public keyring"
  msgstr "usunięcie klucza ze zbioru kluczy publicznych"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:472
  msgid "remove keys from the secret keyring"
  msgstr "usunięcie klucza ze zbioru kluczy prywatnych"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:474
  #, fuzzy
  #| msgid "sign a key"
  msgid "quickly sign a key"
  msgstr "złożenie podpisu na kluczu"
  
- #: g10/gpg.c:460
++#: g10/gpg.c:476
  #, fuzzy
  #| msgid "sign a key locally"
  msgid "quickly sign a key locally"
  msgstr "złożenie prywatnego podpisu na kluczu"
  
- #: g10/gpg.c:461
++#: g10/gpg.c:477
  msgid "sign a key"
  msgstr "złożenie podpisu na kluczu"
  
- #: g10/gpg.c:462
++#: g10/gpg.c:478
  msgid "sign a key locally"
  msgstr "złożenie prywatnego podpisu na kluczu"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:479
  msgid "sign or edit a key"
  msgstr "podpisanie lub modyfikacja klucza"
  
- #: g10/gpg.c:465 sm/gpgsm.c:233
++#: g10/gpg.c:481 sm/gpgsm.c:234
  msgid "change a passphrase"
  msgstr "zmiana hasła"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:485
  msgid "export keys"
  msgstr "eksport kluczy do pliku"
  
- #: g10/gpg.c:468
++#: g10/gpg.c:486
  msgid "export keys to a keyserver"
  msgstr "eksport kluczy do serwera kluczy"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:487
  msgid "import keys from a keyserver"
  msgstr "import kluczy z serwera kluczy"
  
- #: g10/gpg.c:471
++#: g10/gpg.c:490
  msgid "search for keys on a keyserver"
  msgstr "szukanie kluczy na serwerze"
  
- #: g10/gpg.c:473
++#: g10/gpg.c:492
  msgid "update all keys from a keyserver"
  msgstr "odświeżenie wszystkich kluczy z serwera"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:498
  msgid "import/merge keys"
  msgstr "import/dołączenie kluczy"
  
- #: g10/gpg.c:482
++#: g10/gpg.c:501
  msgid "print the card status"
  msgstr "wyświetlenie stanu karty"
  
- #: g10/gpg.c:483
++#: g10/gpg.c:502
  msgid "change data on a card"
  msgstr "zmiana danych na karcie"
  
- #: g10/gpg.c:484
++#: g10/gpg.c:504
  msgid "change a card's PIN"
  msgstr "zmiana PIN-u karty"
  
- #: g10/gpg.c:496
++#: g10/gpg.c:516
  msgid "update the trust database"
  msgstr "uaktualnienie bazy zaufania"
  
- #: g10/gpg.c:505
++#: g10/gpg.c:525
  msgid "print message digests"
  msgstr "wypisanie skrótów wiadomości"
  
- #: g10/gpg.c:508 sm/gpgsm.c:228
++#: g10/gpg.c:528 sm/gpgsm.c:229
  msgid "run in server mode"
  msgstr "uruchomienie w trybie serwera"
  
- #: g10/gpg.c:510
++#: g10/gpg.c:530
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:514 sm/gpgsm.c:246
++#: g10/gpg.c:534 sm/gpgsm.c:248
  msgid "create ascii armored output"
  msgstr "opakowanie ASCII pliku wynikowego"
  
- #: g10/gpg.c:517 sm/gpgsm.c:262
++#: g10/gpg.c:537 sm/gpgsm.c:264
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|UŻYTKOWNIK|szyfrowanie dla odbiorcy o tym identyfikatorze"
  
- #: g10/gpg.c:533 sm/gpgsm.c:298
++#: g10/gpg.c:553 sm/gpgsm.c:300
  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:539
++#: g10/gpg.c:559
  msgid "|N|set compress level to N (0 disables)"
  msgstr "|N|ustawienie poziomu kompresji N (0 - bez)"
  
- #: g10/gpg.c:546
++#: g10/gpg.c:566
  msgid "use canonical text mode"
  msgstr "kanoniczny format tekstowy"
  
- #: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
++#: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
  msgid "|FILE|write output to FILE"
  msgstr "|PLIK|zapis wyjścia do PLIKU"
  
- #: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
++#: g10/gpg.c:598 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
  msgid "do not make any changes"
  msgstr "pozostawienie bez zmian"
  
- #: g10/gpg.c:579
++#: g10/gpg.c:599
  msgid "prompt before overwriting"
  msgstr "pytanie przed nadpisaniem plików"
  
- #: g10/gpg.c:628
++#: g10/gpg.c:648
  msgid "use strict OpenPGP behavior"
  msgstr "ścisłe zachowanie OpenPGP"
  
- #: g10/gpg.c:654 sm/gpgsm.c:355
++#: g10/gpg.c:674 sm/gpgsm.c:357
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2616,7 -2050,16 +2622,17 @@@ msgstr "
  "@\n"
  "(Pełną listę poleceń i opcji można znaleźć w podręczniku systemowym.)\n"
  
- #: g10/gpg.c:657 sm/gpgsm.c:358
++#: g10/gpg.c:677
+ #, fuzzy
+ #| msgid ""
+ #| "@\n"
+ #| "Examples:\n"
+ #| "\n"
+ #| " -se -r Bob [file]          sign and encrypt for user Bob\n"
+ #| " --clear-sign [file]         make a clear text signature\n"
+ #| " --detach-sign [file]       make a detached signature\n"
+ #| " --list-keys [names]        show keys\n"
+ #| " --fingerprint [names]      show fingerprints\n"
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2638,13 -2081,11 +2654,13 @@@ msgstr "
  " --list-keys [nazwy]        pokazanie klucze\n"
  " --fingerprint [nazwy]      pokazanie odcisków kluczy\n"
  
- #: g10/gpg.c:1026
++#: g10/gpg.c:1047
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
  msgstr "Wywołanie: gpg [opcje] [pliki] (-h podaje pomoc)"
  
- #: g10/gpg.c:1029
++#: g10/gpg.c:1050
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg [options] [files]\n"
@@@ -2659,7 -2100,6 +2675,7 @@@ msgstr "
  "Podpisywanie, sprawdzanie podpisów, szyfrowanie, rozszyfrowywanie\n"
  "Domyślnie wykonywana operacja zależy od danych wejściowych\n"
  
- #: g10/gpg.c:1040 sm/gpgsm.c:588
++#: g10/gpg.c:1061 sm/gpgsm.c:580
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2667,78 -2107,64 +2683,78 @@@ msgstr "
  "\n"
  "Obsługiwane algorytmy:\n"
  
- #: g10/gpg.c:1043
++#: g10/gpg.c:1064
  msgid "Pubkey: "
  msgstr "Asymetryczne: "
  
- #: g10/gpg.c:1050 g10/keyedit.c:3402
++#: g10/gpg.c:1071 g10/keyedit.c:3483
  msgid "Cipher: "
  msgstr "Symetryczne: "
  
- #: g10/gpg.c:1057
++#: g10/gpg.c:1078
  msgid "Hash: "
  msgstr "Skrótów: "
  
- #: g10/gpg.c:1064 g10/keyedit.c:3451
++#: g10/gpg.c:1085 g10/keyedit.c:3532
  msgid "Compression: "
  msgstr "Kompresji: "
  
- #: g10/gpg.c:1133 sm/gpgsm.c:662
++#: g10/gpg.c:1154 sm/gpgsm.c:654
  #, fuzzy, c-format
  #| msgid "usage: gpgsm [options] "
  msgid "usage: %s [options] %s\n"
  msgstr "wywołanie: gpgsm [opcje]"
  
- #: g10/gpg.c:1321 sm/gpgsm.c:751
++#: g10/gpg.c:1342 sm/gpgsm.c:743
  msgid "conflicting commands\n"
  msgstr "sprzeczne polecenia\n"
  
- #: g10/gpg.c:1339
++#: g10/gpg.c:1360
  #, fuzzy, c-format
  #| msgid "no = sign found in group definition `%s'\n"
  msgid "no = sign found in group definition '%s'\n"
  msgstr "w definicji grupy ,,%s'' brak znaku ,,=''\n"
  
- #: g10/gpg.c:1537
++#: g10/gpg.c:1558
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe ownership on homedir `%s'\n"
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr ""
  "OSTRZEŻENIE: niebezpieczne prawa własności do katalogu domowego ,,%s''\n"
  
- #: g10/gpg.c:1540
++#: g10/gpg.c:1561
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe ownership on configuration file `%s'\n"
  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:1543
++#: g10/gpg.c:1564
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe ownership on extension `%s'\n"
  msgid "WARNING: unsafe ownership on extension '%s'\n"
  msgstr "OSTRZEŻENIE: niebezpieczne prawa własności do rozszerzenia ,,%s''\n"
  
- #: g10/gpg.c:1549
++#: g10/gpg.c:1570
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe permissions on homedir `%s'\n"
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
  msgstr "OSTRZEŻENIE: niebezpieczne prawa dostępu do katalogu domowego ,,%s''\n"
  
- #: g10/gpg.c:1552
++#: g10/gpg.c:1573
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe permissions on configuration file `%s'\n"
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
  msgstr ""
  "OSTRZEŻENIE: niebezpieczne prawa dostępu do pliku konfiguracyjnego ,,%s''\n"
  
- #: g10/gpg.c:1555
++#: g10/gpg.c:1576
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe permissions on extension `%s'\n"
  msgid "WARNING: unsafe permissions on extension '%s'\n"
  msgstr "OSTRZEŻENIE: niebezpieczne prawa dostępu do rozszerzenia ,,%s''\n"
  
- #: g10/gpg.c:1561
++#: g10/gpg.c:1582
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
  msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
@@@ -2746,7 -2172,6 +2762,7 @@@ msgstr "
  "OSTRZEŻENIE: niebezpieczne prawa własności do katalogu zawierającego katalog "
  "domowy ,,%s''\n"
  
- #: g10/gpg.c:1564
++#: g10/gpg.c:1585
  #, fuzzy, c-format
  #| msgid ""
  #| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2756,7 -2181,6 +2772,7 @@@ msgstr "
  "OSTRZEŻENIE: niebezpieczne prawa własności do katalogu zawierającego plik "
  "konfiguracyjny ,,%s''\n"
  
- #: g10/gpg.c:1567
++#: g10/gpg.c:1588
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
  msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
@@@ -2764,7 -2188,6 +2780,7 @@@ msgstr "
  "OSTRZEŻENIE: niebezpieczne prawa własności do katalogu zawierającego "
  "rozszerzenie ,,%s''\n"
  
- #: g10/gpg.c:1573
++#: g10/gpg.c:1594
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
  msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
@@@ -2772,7 -2195,6 +2788,7 @@@ msgstr "
  "OSTRZEŻENIE: niebezpieczne prawa dostępu do katalogu zawierającego katalog "
  "domowy ,,%s''\n"
  
- #: g10/gpg.c:1576
++#: g10/gpg.c:1597
  #, fuzzy, c-format
  #| msgid ""
  #| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2783,7 -2205,6 +2799,7 @@@ msgstr "
  "OSTRZEŻENIE: niebezpieczne prawa dostępu do katalogu zawierającego plik "
  "konfiguracyjny ,,%s''\n"
  
- #: g10/gpg.c:1579
++#: g10/gpg.c:1600
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
  msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
@@@ -2791,517 -2212,361 +2807,457 @@@ msgstr "
  "OSTRZEŻENIE: niebezpieczne prawa dostępu do katalogu zawierającego "
  "rozszerzenie ,,%s''\n"
  
- #: g10/gpg.c:1786
++#: g10/gpg.c:1816
  #, fuzzy, c-format
  #| msgid "unknown configuration item `%s'\n"
  msgid "unknown configuration item '%s'\n"
  msgstr "nieznana opcja konfiguracyjna ,,%s''\n"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1925
  msgid "display photo IDs during key listings"
  msgstr "wyświetlenie ID zdjęć przy wypisywaniu kluczy"
  
- #: g10/gpg.c:1895
++#: g10/gpg.c:1927
  #, fuzzy
  #| msgid "show user ID validity during key listings"
  msgid "show key usage information during key listings"
  msgstr "pokazywanie poprawności ID użytkownika przy wypisywaniu kluczy"
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1929
  msgid "show policy URLs during signature listings"
  msgstr "pokazywanie URL-i polityk przy wypisywaniu podpisów"
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1931
  msgid "show all notations during signature listings"
  msgstr "pokazywanie wszystkich adnotacji przy wypisywaniu podpisów"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1933
  msgid "show IETF standard notations during signature listings"
  msgstr "pokazywanie standardowych adnotacji IETF przy wypisywaniu podpisów"
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1937
  msgid "show user-supplied notations during signature listings"
  msgstr "pokazywanie adnotacji użytkownika przy wypisywaniu podpisów"
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1939
  msgid "show preferred keyserver URLs during signature listings"
  msgstr ""
  "pokazywanie URL-i preferowanych serwerów kluczy przy wypisywaniu podpisów"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1941
  msgid "show user ID validity during key listings"
  msgstr "pokazywanie poprawności ID użytkownika przy wypisywaniu kluczy"
  
- #: g10/gpg.c:1911
++#: g10/gpg.c:1943
  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:1913
++#: g10/gpg.c:1945
  msgid "show revoked and expired subkeys in key listings"
  msgstr "pokazywanie unieważnionych i wygasłych podkluczy na listach kluczy"
  
- #: g10/gpg.c:1915
++#: g10/gpg.c:1947
  msgid "show the keyring name in key listings"
  msgstr "pokazywanie nazwy zbioru kluczy na listach kluczy"
  
- #: g10/gpg.c:1917
++#: g10/gpg.c:1949
  msgid "show expiration dates during signature listings"
  msgstr "pokazywanie dat wygaśnięcia przy wypisywaniu podpisów"
  
- #: g10/gpg.c:2019 g10/gpg.c:2056
++#: g10/gpg.c:2051 g10/gpg.c:2088
  #, fuzzy, c-format
  #| msgid "missing argument for option \"%.50s\"\n"
  msgid "valid values for option '%s':\n"
  msgstr "brak argumentu dla opcji ,,%.50s''\n"
  
- #: g10/gpg.c:2030
++#: g10/gpg.c:2062
  #, fuzzy, c-format
  #| msgid "unknown option `%s'\n"
  msgid "unknown TOFU policy '%s'\n"
  msgstr "nieznana opcja ,,%s''\n"
  
- #: g10/gpg.c:2032 g10/gpg.c:2068
++#: g10/gpg.c:2064 g10/gpg.c:2100
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2066
++#: g10/gpg.c:2098 g10/keygen.c:167
  #, fuzzy, c-format
  #| msgid "missing argument for option \"%.50s\"\n"
  msgid "invalid value for option '%s'\n"
  msgstr "brak argumentu dla opcji ,,%.50s''\n"
  
- #: g10/gpg.c:2203
++#: g10/gpg.c:2235
  #, fuzzy, c-format
  #| msgid "NOTE: old default options file `%s' ignored\n"
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "UWAGA: stary domyślny plik opcji ,,%s'' został zignorowany\n"
  
- #: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
++#: g10/gpg.c:2839 g10/gpg.c:3610 g10/gpg.c:3622
  #, fuzzy, c-format
  #| msgid "NOTE: %s is not for normal use!\n"
  msgid "Note: %s is not for normal use!\n"
  msgstr "UWAGA: %s nie jest do normalnego użytku!\n"
  
- #: g10/gpg.c:2978 g10/gpg.c:2990
++#: g10/gpg.c:3011 g10/gpg.c:3023
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid signature expiration\n"
  msgid "'%s' is not a valid signature expiration\n"
  msgstr ",,%s'' nie jest poprawnym czasem wygaśnięcia podpisu\n"
  
- #: g10/gpg.c:3012
++#: g10/gpg.c:3045
  #, fuzzy, c-format
  #| msgid "line %d: not a valid email address\n"
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "linia %d: niepoprawny adres e-mail\n"
  
- #: g10/gpg.c:3044 sm/gpgsm.c:1166
++#: g10/gpg.c:3077 sm/gpgsm.c:1158
  #, fuzzy, c-format
  #| msgid "invalid country code in `%s', line %d\n"
  msgid "invalid pinentry mode '%s'\n"
  msgstr "niewłaściwy kod kraju w ,,%s'', w linii %d\n"
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3130
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid character set\n"
  msgid "'%s' is not a valid character set\n"
  msgstr ",,%s'' nie jest poprawną nazwą zestawu znaków\n"
  
- #: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
++#: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
  msgid "could not parse keyserver URL\n"
  msgstr "niezrozumiały URL serwera kluczy\n"
  
- #: g10/gpg.c:3137
++#: g10/gpg.c:3170
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: niepoprawne opcje serwera kluczy\n"
  
- #: g10/gpg.c:3140
++#: g10/gpg.c:3173
  msgid "invalid keyserver options\n"
  msgstr "niepoprawne opcje serwera kluczy\n"
  
- #: g10/gpg.c:3147
++#: g10/gpg.c:3180
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
  
- #: g10/gpg.c:3150
++#: g10/gpg.c:3183
  msgid "invalid import options\n"
  msgstr "niepoprawne opcje wczytania kluczy\n"
  
- #: g10/gpg.c:3156 g10/gpg.c:3171
++#: g10/gpg.c:3189 g10/gpg.c:3204
  #, fuzzy, c-format
  #| msgid "invalid list options\n"
  msgid "invalid filter option: %s\n"
  msgstr "niepoprawne opcje wypisywania\n"
  
- #: g10/gpg.c:3162
++#: g10/gpg.c:3195
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
  
- #: g10/gpg.c:3165
++#: g10/gpg.c:3198
  msgid "invalid export options\n"
  msgstr "niepoprawne opcje eksportu kluczy\n"
  
- #: g10/gpg.c:3177
++#: g10/gpg.c:3210
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: niepoprawne opcje wypisywania\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3213
  msgid "invalid list options\n"
  msgstr "niepoprawne opcje wypisywania\n"
  
- #: g10/gpg.c:3188
++#: g10/gpg.c:3221
  msgid "display photo IDs during signature verification"
  msgstr "wyświetlanie ID zdjęć przy sprawdzaniu podpisów"
  
- #: g10/gpg.c:3190
++#: g10/gpg.c:3223
  msgid "show policy URLs during signature verification"
  msgstr "pokazywanie URL-i polityk przy sprawdzaniu podpisów"
  
- #: g10/gpg.c:3192
++#: g10/gpg.c:3225
  msgid "show all notations during signature verification"
  msgstr "pokazywanie wszystkich adnotacji przy sprawdzaniu podpisów"
  
- #: g10/gpg.c:3194
++#: g10/gpg.c:3227
  msgid "show IETF standard notations during signature verification"
  msgstr "pokazywanie standardowych adnotacji IETF przy sprawdzaniu podpisów"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3231
  msgid "show user-supplied notations during signature verification"
  msgstr "pokazywanie adnotacji użytkownika przy sprawdzaniu podpisów"
  
- #: g10/gpg.c:3200
++#: g10/gpg.c:3233
  msgid "show preferred keyserver URLs during signature verification"
  msgstr ""
  "pokazywanie URL-i preferowanych serwerów kluczy przy sprawdzaniu podpisów"
  
- #: g10/gpg.c:3202
++#: g10/gpg.c:3235
  msgid "show user ID validity during signature verification"
  msgstr "pokazywanie poprawności ID użytkownika przy sprawdzaniu podpisów"
  
- #: g10/gpg.c:3204
++#: g10/gpg.c:3237
  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:3206
++#: g10/gpg.c:3239
  msgid "show only the primary user ID in signature verification"
  msgstr "pokazywanie tylko głównego ID użytkownika przy sprawdzaniu podpisu"
  
- #: g10/gpg.c:3208
++#: g10/gpg.c:3241
  msgid "validate signatures with PKA data"
  msgstr "sprawdzanie podpisów z danymi PKA"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3243
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr "zwiększenie zaufania podpisów z poprawnymi danymi PKA"
  
- #: g10/gpg.c:3217
++#: g10/gpg.c:3250
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: niepoprawne opcje sprawdzania\n"
  
- #: g10/gpg.c:3220
++#: g10/gpg.c:3253
  msgid "invalid verify options\n"
  msgstr "niepoprawne opcje sprawdzania\n"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3260
  #, 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:3417
++#: g10/gpg.c:3452
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: niepoprawna lista auto-key-locate\n"
  
- #: g10/gpg.c:3420
++#: g10/gpg.c:3455
  msgid "invalid auto-key-locate list\n"
  msgstr "Niepoprawna lista auto-key-locate\n"
  
- #: g10/gpg.c:3553 sm/gpgsm.c:1507
++#: g10/gpg.c:3592 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
  msgstr "OSTRZEŻENIE: program może stworzyć plik zrzutu pamięci!\n"
  
- #: g10/gpg.c:3564
++#: g10/gpg.c:3603
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "OSTRZEŻENIE: %s powoduje obejście %s\n"
  
- #: g10/gpg.c:3573
++#: g10/gpg.c:3612
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "Nie wolno używać %s z %s!\n"
  
- #: g10/gpg.c:3576
++#: g10/gpg.c:3615
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s nie ma sensu w połączeniu z %s!\n"
  
- #: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
++#: g10/gpg.c:3630 sm/gpgsm.c:1518 dirmngr/dirmngr.c:951
  msgid "WARNING: running with faked system time: "
  msgstr "OSTRZEŻENIE: działanie z fałszywym czasem systemowym: "
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3651
  #, 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:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
++#: g10/gpg.c:3686 g10/gpg.c:3710 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "wybrany algorytm szyfrujący jest niepoprawny\n"
  
- #: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
++#: g10/gpg.c:3692 g10/gpg.c:3716 sm/gpgsm.c:1591 sm/gpgsm.c:1597
  msgid "selected digest algorithm is invalid\n"
  msgstr "wybrany algorytm skrótów wiadomości jest niepoprawny\n"
  
- #: g10/gpg.c:3659
++#: g10/gpg.c:3698
  msgid "selected compression algorithm is invalid\n"
  msgstr "wybrany algorytm kompresji jest niepoprawny\n"
  
- #: g10/gpg.c:3665
++#: g10/gpg.c:3704
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "wybrany algorytm skrótów poświadczeń jest niepoprawny\n"
  
- #: g10/gpg.c:3680
++#: g10/gpg.c:3719
  msgid "completes-needed must be greater than 0\n"
  msgstr "wartość completes-needed musi być większa od 0\n"
  
- #: g10/gpg.c:3682
++#: g10/gpg.c:3721
  msgid "marginals-needed must be greater than 1\n"
  msgstr "wartość marginals-needed musi być większa od 1\n"
  
- #: g10/gpg.c:3684
++#: g10/gpg.c:3723
  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:3686
++#: g10/gpg.c:3725
  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:3688
++#: g10/gpg.c:3727
  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:3691
++#: g10/gpg.c:3730
  #, fuzzy
  #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
  msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
  
- #: g10/gpg.c:3695
++#: g10/gpg.c:3734
  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:3702
++#: g10/gpg.c:3741
  msgid "invalid default preferences\n"
  msgstr "niewłaściwe domyślne ustawienia\n"
  
- #: g10/gpg.c:3706
++#: g10/gpg.c:3745
  msgid "invalid personal cipher preferences\n"
  msgstr "niewłaściwe ustawienia szyfrów\n"
  
- #: g10/gpg.c:3710
++#: g10/gpg.c:3749
  msgid "invalid personal digest preferences\n"
  msgstr "niewłaściwe ustawienia skrótów\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3753
  msgid "invalid personal compress preferences\n"
  msgstr "niewłaściwe ustawienia algorytmów kompresji\n"
  
- #: g10/gpg.c:3750
++#: g10/gpg.c:3789
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s jeszcze nie działa z %s!\n"
  
- #: g10/gpg.c:3797
++#: g10/gpg.c:3836
  #, fuzzy, c-format
  #| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr "szyfr ,,%s'' nie jest dostępny w trybie %s\n"
  
- #: g10/gpg.c:3802
++#: g10/gpg.c:3841
  #, fuzzy, c-format
  #| msgid "you may not use digest algorithm `%s' while in %s mode\n"
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr "skrót ,,%s'' nie jest dostępny w trybie %s\n"
  
- #: g10/gpg.c:3807
++#: g10/gpg.c:3846
  #, fuzzy, c-format
  #| msgid "you may not use compression algorithm `%s' while in %s mode\n"
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr "kompresja ,,%s'' nie jest dostępna w trybie %s\n"
  
- #: g10/gpg.c:3906
++#: g10/gpg.c:3945
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "inicjowanie Bazy Zaufania nie powiodło się: %s\n"
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:3957
  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:3975
- msgid "--store [filename]"
- msgstr "--store [plik]"
- 
- #: g10/gpg.c:3985
- msgid "--symmetric [filename]"
- msgstr "--symmetric [plik]"
- 
- #: g10/gpg.c:3989
++#: g10/gpg.c:4028
  #, fuzzy, c-format
  #| msgid "symmetric encryption of `%s' failed: %s\n"
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "szyfrowanie symetryczne ,,%s'' nie powiodło się: %s\n"
  
- #: g10/gpg.c:4000
- msgid "--encrypt [filename]"
- msgstr "--encrypt [plik]"
- 
- #: g10/gpg.c:4016
- msgid "--symmetric --encrypt [filename]"
- msgstr "--symmetric --encrypt [plik]"
- 
- #: g10/gpg.c:4018
++#: g10/gpg.c:4057
  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:4021
++#: g10/gpg.c:4060
  #, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr "nie można użyć --symmetric --encrypt w trybie %s\n"
  
- #: g10/gpg.c:4042
- msgid "--sign [filename]"
- msgstr "--sign [plik]"
- 
- #: g10/gpg.c:4058
- msgid "--sign --encrypt [filename]"
- msgstr "--sign --encrypt [plik]"
- 
- #: g10/gpg.c:4076
- msgid "--symmetric --sign --encrypt [filename]"
- msgstr "--symmetric --sign --encrypt [plik]"
- 
- #: g10/gpg.c:4078
++#: g10/gpg.c:4117
  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:4081
++#: g10/gpg.c:4120
  #, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr "nie można użyć --symmetric --sign --encrypt w trybie %s\n"
  
- #: g10/gpg.c:4105
- msgid "--sign --symmetric [filename]"
- msgstr "--sign --symmetric [plik]"
- 
- #: g10/gpg.c:4117
- msgid "--clearsign [filename]"
- msgstr "--clearsign [plik]"
- 
- #: g10/gpg.c:4147
- msgid "--decrypt [filename]"
- msgstr "--decrypt [plik]"
- 
- #: g10/gpg.c:4174
- msgid "--sign-key user-id"
- msgstr "--sign-key nazwa użytkownika"
- 
- #: g10/gpg.c:4178
- msgid "--lsign-key user-id"
- msgstr "--lsign-key nazwa użytkownika"
- 
- #: g10/gpg.c:4199
- msgid "--edit-key user-id [commands]"
- msgstr "--edit-key nazwa użytkownika [polecenia]"
- 
- #: g10/gpg.c:4215
- msgid "--passwd <user-id>"
- msgstr "--passwd <id-użytkownika>"
- 
- #: g10/gpg.c:4411 g10/keyserver.c:1837
++#: g10/gpg.c:4462 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "wysyłka do serwera kluczy nie powiodła się: %s\n"
  
- #: g10/gpg.c:4416
++#: g10/gpg.c:4467
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "odbiór z serwera kluczy nie powiódł się: %s\n"
  
- #: g10/gpg.c:4422
++#: g10/gpg.c:4473
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "eksport kluczy nie powiódł się: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4486
  #, fuzzy, c-format
  #| msgid "key export failed: %s\n"
  msgid "export as ssh key failed: %s\n"
  msgstr "eksport kluczy nie powiódł się: %s\n"
  
- #: g10/gpg.c:4447
++#: g10/gpg.c:4498
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "szukanie w serwerze kluczy nie powiodło się: %s\n"
  
- #: g10/gpg.c:4460
++#: g10/gpg.c:4511
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "odświeżenie kluczy z serwera nie powiodło się: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4578
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "zdjęcie opakowania ASCII nie powiodło się: %s\n"
  
- #: g10/gpg.c:4538
++#: g10/gpg.c:4589
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "opakowywanie ASCII nie powiodło się: %s\n"
  
- #: g10/gpg.c:4630
++#: g10/gpg.c:4681
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
  msgstr "niewłaściwy algorytm skrótu ,,%s''\n"
  
- #: g10/gpg.c:4776 g10/tofu.c:2002
++#: g10/gpg.c:4827 g10/tofu.c:2151
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error parsing key specification '%s': %s\n"
  msgstr "błąd zapisywania certyfikatu: %s\n"
  
- #: g10/gpg.c:4788
++#: g10/gpg.c:4839
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4835
- msgid "[filename]"
- msgstr "[nazwa pliku]"
- 
- #: g10/gpg.c:4841
++#: g10/gpg.c:4894
  msgid "Go ahead and type your message ...\n"
  msgstr "Wpisz tutaj swoją wiadomość ...\n"
  
- #: g10/gpg.c:5179
++#: g10/gpg.c:5232
  msgid "the given certification policy URL is invalid\n"
  msgstr "podany URL regulaminu poświadczania jest niepoprawny\n"
  
- #: g10/gpg.c:5181
++#: g10/gpg.c:5234
  msgid "the given signature policy URL is invalid\n"
  msgstr "podany URL regulaminu podpisów jest niepoprawny\n"
  
- #: g10/gpg.c:5214
++#: g10/gpg.c:5267
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "podany preferowany URL serwera kluczy jest niepoprawny\n"
  
@@@ -3313,7 -2576,6 +3269,7 @@@ msgstr "|PLIK|pobieranie kluczy ze zbio
  msgid "make timestamp conflicts only a warning"
  msgstr "nie traktować konfliktu datowników jako błędu"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:345
++#: g10/gpgv.c:82 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|pisanie opisu stanu do deskryptora FD"
  
@@@ -3343,138 -2600,110 +3299,138 @@@ msgstr "Pomoc niedostępna
  msgid "No help available for '%s'"
  msgstr "Brak pomocy o ,,%s''"
  
- #: g10/import.c:151
++#: g10/import.c:152
  msgid "import signatures that are marked as local-only"
  msgstr "import podpisów oznaczonych jako tylko lokalne"
  
- #: g10/import.c:154
++#: g10/import.c:155
  msgid "repair damage from the pks keyserver during import"
  msgstr "naprawienie uszkodzeń z serwera pks przy imporcie"
  
- #: g10/import.c:157
++#: g10/import.c:158
  #, fuzzy
  #| msgid "do not update the trustdb after import"
  msgid "do not clear the ownertrust values during import"
  msgstr "nie uaktualnianie bazy zaufania po imporcie"
  
- #: g10/import.c:160
++#: g10/import.c:161
  msgid "do not update the trustdb after import"
  msgstr "nie uaktualnianie bazy zaufania po imporcie"
  
- #: g10/import.c:163
++#: g10/import.c:164
  #, fuzzy
  #| msgid "show key fingerprint"
  msgid "show key during import"
  msgstr "okazanie odcisku klucza"
  
- #: g10/import.c:166
++#: g10/import.c:167
  msgid "only accept updates to existing keys"
  msgstr "przyjmowanie tylko uaktualnień istniejących kluczy"
  
- #: g10/import.c:169
++#: g10/import.c:170
  msgid "remove unusable parts from key after import"
  msgstr "usuwanie bezużytecznych części kluczy po imporcie"
  
- #: g10/import.c:172
++#: g10/import.c:173
  msgid "remove as much as possible from key after import"
  msgstr "usuwanie jak największej części kluczy po imporcie"
  
- #: g10/import.c:175
++#: g10/import.c:176
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:326 g10/import.c:568
++#: g10/import.c:327 g10/import.c:569
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "blok typu %d zostaje pominięty\n"
  
- #: g10/import.c:585
++#: g10/import.c:586
  #, c-format
  msgid "%lu keys processed so far\n"
  msgstr "%lu kluczy przetworzonych do tej chwili\n"
  
- #: g10/import.c:655
++#: g10/import.c:656
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "Ogółem przetworzonych kluczy: %lu\n"
  
- #: g10/import.c:658
++#: g10/import.c:659
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "   pominiętych nowych kluczy: %lu\n"
  
- #: g10/import.c:660
++#: g10/import.c:661
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "   pominiętych nowych kluczy: %lu\n"
  
- #: g10/import.c:663
++#: g10/import.c:664
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "          bez identyfikatora: %lu\n"
  
- #: g10/import.c:666 sm/import.c:130
++#: g10/import.c:667 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "         dołączono do zbioru: %lu"
  
- #: g10/import.c:670 sm/import.c:134
++#: g10/import.c:671 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "                   bez zmian: %lu\n"
  
- #: g10/import.c:672
++#: g10/import.c:673
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "      nowych identyfikatorów: %lu\n"
  
- #: g10/import.c:674
++#: g10/import.c:675
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "            nowych podkluczy: %lu\n"
  
- #: g10/import.c:676
++#: g10/import.c:677
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "             nowych podpisów: %lu\n"
  
- #: g10/import.c:678
++#: g10/import.c:679
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "   nowych unieważnień kluczy: %lu\n"
  
- #: g10/import.c:680 sm/import.c:136
++#: g10/import.c:681 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "   tajnych kluczy wczytanych: %lu\n"
  
- #: g10/import.c:682 sm/import.c:138
++#: g10/import.c:683 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "     tajnych kluczy dodanych: %lu\n"
  
- #: g10/import.c:684 sm/import.c:140
++#: g10/import.c:685 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr "    tajnych kluczy bez zmian: %lu\n"
  
- #: g10/import.c:686 sm/import.c:142
++#: g10/import.c:687 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "      nie włączono do zbioru: %lu\n"
  
- #: g10/import.c:688
++#: g10/import.c:689
  #, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "     podpisów wyczyszczonych: %lu\n"
  
- #: g10/import.c:690
++#: g10/import.c:691
  #, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "ID użytkownika wyczyszczonych: %lu\n"
  
- #: g10/import.c:1034
++#: g10/import.c:1035
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
@@@ -3483,193 -2712,155 +3439,193 @@@ msgstr "
  "OSTRZEŻENIE: klucz %s zawiera preferencje dla niedostępnych\n"
  "algorytmów dla tych ID użytkownika:\n"
  
- #: g10/import.c:1076
++#: g10/import.c:1077
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr "         ,,%s'': preferowany szyfr %s\n"
  
- #: g10/import.c:1091
++#: g10/import.c:1092
  #, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "         ,,%s'': preferowany algorytm skrótu %s\n"
  
- #: g10/import.c:1103
++#: g10/import.c:1104
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr "         ,,%s'': preferowany algorytm kompresji %s\n"
  
- #: g10/import.c:1116
++#: g10/import.c:1117
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr "zdecydowanie sugerowane jest uaktualnienie ustawień i ponowne\n"
  
- #: g10/import.c:1118
++#: g10/import.c:1119
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr "rozesłanie tego klucza w celu uniknięcia niezgodności algorytmów\n"
  
- #: g10/import.c:1143
++#: g10/import.c:1144
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  "można uaktualnić swoje ustawienia poprzez: gpg --edit-key %s updpref save\n"
  
- #: g10/import.c:1379 g10/import.c:2167
++#: g10/import.c:1380 g10/import.c:2168
  #, c-format
  msgid "key %s: no user ID\n"
  msgstr "klucz %s: brak identyfikatora użytkownika\n"
  
- #: g10/import.c:1385
++#: g10/import.c:1386
  #, fuzzy, c-format
  #| msgid "skipped \"%s\": %s\n"
  msgid "key %s: %s\n"
  msgstr "pominięty ,,%s'': %s\n"
  
- #: g10/import.c:1386 g10/import.c:2141
++#: g10/import.c:1387 g10/import.c:2142
  msgid "rejected by import screener"
  msgstr ""
  
- #: g10/import.c:1416
++#: g10/import.c:1417
  #, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "klucz %s: podklucz uszkodzony przez serwer został naprawiony\n"
  
- #: g10/import.c:1434
++#: g10/import.c:1435
  #, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "klucz %s: przyjęto identyfikator nie podpisany nim samym ,,%s''\n"
  
- #: g10/import.c:1444 g10/import.c:1475
++#: g10/import.c:1445 g10/import.c:1476
  #, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "klucz %s: brak poprawnych identyfikatorów użytkownika\n"
  
- #: g10/import.c:1446
++#: g10/import.c:1447
  msgid "this may be caused by a missing self-signature\n"
  msgstr "to może być spowodowane brakiem podpisu klucza nim samym\n"
  
- #: g10/import.c:1516 g10/import.c:2318
++#: g10/import.c:1517 g10/import.c:2319
  #, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "klucz %s: brak klucza publicznego: %s\n"
  
- #: g10/import.c:1522
++#: g10/import.c:1523
  #, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "klucz %s: nowy klucz - pominięty\n"
  
- #: g10/import.c:1537
++#: g10/import.c:1538
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "brak zapisywalnego zbioru kluczy: %s\n"
  
- #: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
++#: g10/import.c:1547 g10/import.c:1648 g10/import.c:2385
  #, fuzzy, c-format
  #| msgid "error writing keyring `%s': %s\n"
  msgid "error writing keyring '%s': %s\n"
  msgstr "błąd zapisu zbioru kluczy ,,%s'': %s\n"
  
- #: g10/import.c:1566
++#: g10/import.c:1567
  #, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "klucz %s: klucz publiczny ,,%s'' wczytano do zbioru\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1591
  #, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "klucz %s: nie zgadza się z lokalną kopią\n"
  
- #: g10/import.c:1606 g10/import.c:2342
++#: g10/import.c:1607 g10/import.c:2343
  #, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "klucz %s: brak oryginalnego bloku klucza; %s\n"
  
- #: g10/import.c:1614 g10/import.c:2349
++#: g10/import.c:1615 g10/import.c:2350
  #, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "klucz %s: nie można odczytać oryginalnego bloku klucza: %s\n"
  
- #: g10/import.c:1657
++#: g10/import.c:1658
  #, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "klucz %s: ,,%s'' 1 nowy identyfikator użytkownika\n"
  
- #: g10/import.c:1660
++#: g10/import.c:1661
  #, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "klucz %s: ,,%s'' %d nowych identyfikatorów użytkownika\n"
  
- #: g10/import.c:1663
++#: g10/import.c:1664
  #, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "klucz %s: ,,%s'' 1 nowy podpis\n"
  
- #: g10/import.c:1666
++#: g10/import.c:1667
  #, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "klucz %s: ,,%s'' %d nowych podpisów\n"
  
- #: g10/import.c:1669
++#: g10/import.c:1670
  #, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "klucz %s: ,,%s'' 1 nowy podklucz\n"
  
- #: g10/import.c:1672
++#: g10/import.c:1673
  #, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "klucz %s: ,,%s'' %d nowych podkluczy\n"
  
- #: g10/import.c:1675
++#: g10/import.c:1676
  #, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "klucz %s: ,,%s'' %d podpis wyczyszczony\n"
  
- #: g10/import.c:1678
++#: g10/import.c:1679
  #, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "klucz %s: ,,%s'' %d podpisów wyczyszczonych\n"
  
- #: g10/import.c:1681
++#: g10/import.c:1682
  #, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "klucz %s: ,,%s'' %d identyfikator użytkownika wyczyszczony\n"
  
- #: g10/import.c:1684
++#: g10/import.c:1685
  #, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "klucz %s: ,,%s'' %d identyfikatorów użytkownika wyczyszczonych\n"
  
- #: g10/import.c:1707
++#: g10/import.c:1708
  #, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "klucz %s: ,,%s'' bez zmian\n"
  
- #: g10/import.c:2019 g10/import.c:2264
++#: g10/import.c:2020 g10/import.c:2265
  #, c-format
  msgid "key %s: secret key imported\n"
  msgstr "klucz %s: klucz tajny wczytany do zbioru\n"
  
- #: g10/import.c:2027
++#: g10/import.c:2028
  #, fuzzy, c-format
  #| msgid "skipped: secret key already present\n"
  msgid "key %s: secret key already exists\n"
  msgstr "pominięty: klucz prywatny jest już wpisany\n"
  
- #: g10/import.c:2035
++#: g10/import.c:2036
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "key %s: error sending to agent: %s\n"
  msgstr "błąd wysyłania polecenia %s: %s\n"
  
- #: g10/import.c:2140
++#: g10/import.c:2141
  #, fuzzy, c-format
  #| msgid "secret key \"%s\" not found: %s\n"
  msgid "secret key %s: %s\n"
  msgstr "klucz prywatny ,,%s'' nie został odnaleziony: %s\n"
  
- #: g10/import.c:2160 g10/import.c:2195
++#: g10/import.c:2161 g10/import.c:2196
  msgid "importing secret keys not allowed\n"
  msgstr "wczytywanie kluczy tajnych nie jest dozwolone\n"
  
- #: g10/import.c:2184
++#: g10/import.c:2185
  #, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr "klucz %s: klucz tajny z błędnym szyfrem %d - pominięty\n"
@@@ -3684,145 -2875,118 +3640,145 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2256
++#: g10/import.c:2257
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2311
++#: g10/import.c:2312
  #, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
  "klucz %s: brak klucza publicznego którego dotyczy wczytany certyfikat\n"
  "              unieważnienia\n"
  
- #: g10/import.c:2360
++#: g10/import.c:2361
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "klucz %s: niepoprawny certyfikat unieważnienia: %s - odrzucony\n"
  
- #: g10/import.c:2393
++#: g10/import.c:2394
  #, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "klucz %s: ,,%s'' certyfikat unieważnienia został już wczytany\n"
  
- #: g10/import.c:2469
++#: g10/import.c:2470
  #, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "klucz %s: brak identyfikatora użytkownika do podpisu\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2487
  #, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr "klucz %s: algorytm asymetryczny dla id ,,%s'' nie jest obsługiwany\n"
  
- #: g10/import.c:2488
++#: g10/import.c:2489
  #, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "klucz %s: niepoprawny podpis na identyfikatorze ,,%s''\n"
  
- #: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
++#: g10/import.c:2506 g10/import.c:2532 g10/import.c:2583
  #, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "klucz %s: nieobsługiwany algorytm asymetryczny\n"
  
- #: g10/import.c:2506
++#: g10/import.c:2507
  #, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "klucz %s: nieprawidłowy bezpośredni podpis\n"
  
- #: g10/import.c:2520
++#: g10/import.c:2521
  #, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "klucz %s: brak podklucza do dowiązania\n"
  
- #: g10/import.c:2533
++#: g10/import.c:2534
  #, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "klucz %s: niepoprawne dowiązanie podklucza\n"
  
- #: g10/import.c:2549
++#: g10/import.c:2550
  #, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "klucz %s: usunięto wielokrotne dowiązanie podklucza\n"
  
- #: g10/import.c:2571
++#: g10/import.c:2572
  #, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "klucz %s: brak podklucza, którego dotyczy unieważnienie\n"
  
- #: g10/import.c:2584
++#: g10/import.c:2585
  #, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "klucz %s: niepoprawne unieważnienie podklucza\n"
  
- #: g10/import.c:2599
++#: g10/import.c:2600
  #, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "klucz %s: usunięto wielokrotne unieważnienie podklucza\n"
  
- #: g10/import.c:2641
++#: g10/import.c:2642
  #, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "klucz %s: pominięto identyfikator użytkownika ,,%s''\n"
  
- #: g10/import.c:2665
++#: g10/import.c:2666
  #, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "klucz %s: podklucz pominięty\n"
  
- #: g10/import.c:2694
++#: g10/import.c:2695
  #, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "klucz %s: podpis nieeksportowalny (klasy 0x%02X) - pominięty\n"
  
- #: g10/import.c:2705
++#: g10/import.c:2706
  #, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr ""
  "klucz %s: pominięto certyfikat unieważnienia umieszczony\n"
  "              w niewłaściwym miejscu\n"
  
- #: g10/import.c:2723
++#: g10/import.c:2724
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "klucz %s: pominięto -  niepoprawny certyfikat unieważnienia: %s\n"
  
- #: g10/import.c:2737
++#: g10/import.c:2738
  #, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "klucz %s: pominięto - podpis na podkluczu w niewłaściwym miejscu\n"
  
- #: g10/import.c:2745
++#: g10/import.c:2746
  #, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "klucz %s: pominięto - nieoczekiwana klasa podpisu (0x%02X)\n"
  
- #: g10/import.c:2887
++#: g10/import.c:2888
  #, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "key %s: dołączono powtórzony identyfikator użytkownika\n"
  
- #: g10/import.c:2951
++#: g10/import.c:2952
  #, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr ""
  "OSTRZEŻENIE: klucz %s mógł zostać unieważniony:\n"
  "             zapytanie o unieważniający klucz %s w serwerze kluczy\n"
  
- #: g10/import.c:2967
++#: g10/import.c:2968
  #, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr ""
  "OSTRZEŻENIE: klucz %s mógł zostać unieważniony:\n"
  "             brak unieważniającego klucza %s.\n"
  
- #: g10/import.c:3031
++#: g10/import.c:3032
  #, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "klucz %s: ,,%s'' dodany certyfikat unieważnienia\n"
  
- #: g10/import.c:3069
++#: g10/import.c:3070
  #, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "klucz %s: dodano bezpośredni podpis\n"
@@@ -3863,52 -3021,42 +3819,52 @@@ msgstr "zasób bloku klucza `%s': %s\n
  msgid "error opening key DB: %s\n"
  msgstr "błąd podczas otwierania ,,%s'': %s\n"
  
- #: g10/keydb.c:1782
++#: g10/keydb.c:1786
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "nie powiodła się odbudowa bufora bazy: %s\n"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[revocation]"
  msgstr "[unieważnienie]"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[self-signature]"
  msgstr "[podpis klucza nim samym]"
  
- #: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
++#: g10/keyedit.c:433 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: dirmngr/ldap-wrapper.c:694
  #, fuzzy, c-format
  #| msgid "error allocating enough memory: %s\n"
  msgid "error allocating memory: %s\n"
  msgstr "błąd przydzielania wystarczającej ilości pamięci: %s\n"
  
- #: g10/keyedit.c:629
++#: g10/keyedit.c:630
  #, fuzzy, c-format
  #| msgid "key %s: unsupported public key algorithm\n"
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr "klucz %s: nieobsługiwany algorytm asymetryczny\n"
  
- #: g10/keyedit.c:638
++#: g10/keyedit.c:639
  #, fuzzy, c-format
  #| msgid "card does not support digest algorithm %s\n"
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "karta nie obsługuje algorytmu skrótu %s\n"
  
- #: g10/keyedit.c:800
++#: g10/keyedit.c:801
  #, fuzzy
  #| msgid "Good signature from"
  msgid " (reordered signatures follow)"
  msgstr "Poprawny podpis złożony przez"
  
- #: g10/keyedit.c:913
++#: g10/keyedit.c:914
  #, fuzzy, c-format
  #| msgid "skipped \"%s\": %s\n"
  msgid "key %s:\n"
  msgstr "pominięty ,,%s'': %s\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:917
  #, fuzzy, c-format
  #| msgid "User ID \"%s\": %d signature removed\n"
  msgid "%d duplicate signature removed\n"
@@@ -3917,7 -3065,6 +3873,7 @@@ msgstr[0] "Identyfikator użytkownika ,
  msgstr[1] "Identyfikator użytkownika ,,%s'': %d podpis wyczyszczony\n"
  msgstr[2] "Identyfikator użytkownika ,,%s'': %d podpis wyczyszczony\n"
  
- #: g10/keyedit.c:919 g10/keylist.c:480
++#: g10/keyedit.c:920 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
@@@ -3926,7 -3073,6 +3882,7 @@@ msgstr[0] "1 podpis nie został sprawdz
  msgstr[1] "1 podpis nie został sprawdzony z powodu braku klucza\n"
  msgstr[2] "1 podpis nie został sprawdzony z powodu braku klucza\n"
  
- #: g10/keyedit.c:923 g10/keylist.c:476
++#: g10/keyedit.c:924 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
@@@ -3935,7 -3081,6 +3891,7 @@@ msgstr[0] "%d niepoprawnych podpisów\n
  msgstr[1] "%d niepoprawnych podpisów\n"
  msgstr[2] "%d niepoprawnych podpisów\n"
  
- #: g10/keyedit.c:927
++#: g10/keyedit.c:928
  #, fuzzy, c-format
  #| msgid "Good signature from"
  msgid "%d signature reordered\n"
@@@ -3944,14 -3089,12 +3900,14 @@@ msgstr[0] "Poprawny podpis złożony pr
  msgstr[1] "Poprawny podpis złożony przez"
  msgstr[2] "Poprawny podpis złożony przez"
  
- #: g10/keyedit.c:932
++#: g10/keyedit.c:933
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:992 g10/pkclist.c:274
++#: g10/keyedit.c:993 g10/pkclist.c:274
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
  "keys\n"
@@@ -3962,17 -3105,14 +3918,17 @@@ msgstr "
  "tożsamości innych użytkowników (czy sprawdzi on odciski kluczy pobrane\n"
  "z różnych źródeł, dokumenty potwierdzające tożsamość, itd.).\n"
  
- #: g10/keyedit.c:996 g10/pkclist.c:286
++#: g10/keyedit.c:997 g10/pkclist.c:286
  #, c-format
  msgid "  %d = I trust marginally\n"
  msgstr "  %d = mam ograniczone zaufanie\n"
  
- #: g10/keyedit.c:997 g10/pkclist.c:288
++#: g10/keyedit.c:998 g10/pkclist.c:288
  #, c-format
  msgid "  %d = I trust fully\n"
  msgstr "  %d = mam pełne zaufanie\n"
  
- #: g10/keyedit.c:1015
++#: g10/keyedit.c:1016
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
@@@ -3982,50 -3122,38 +3938,50 @@@ msgstr "
  "Poziom wyższy niż 1 umożliwia używanie podpisywanego właśnie klucza\n"
  "do wykonywania zaufanych podpisów w twoim imieniu.\n"
  
- #: g10/keyedit.c:1032
++#: g10/keyedit.c:1033
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr "Proszę wpisać domenę ograniczającą ten podpis lub Enter dla żadnej.\n"
  
- #: g10/keyedit.c:1160
++#: g10/keyedit.c:1161
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1168
++#: g10/keyedit.c:1169
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "Identyfikator użytkownika ,,%s'' został unieważniony."
  
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
- #: g10/keyedit.c:2246
++#: g10/keyedit.c:1178 g10/keyedit.c:1206 g10/keyedit.c:1233 g10/keyedit.c:1417
++#: g10/keyedit.c:2247
  msgid "Are you sure you still want to sign it? (y/N) "
  msgstr "Czy na pewno chcesz podpisać? (t/N) "
  
- #: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
- #: g10/keyedit.c:2251 g10/keyedit.c:3177
++#: g10/keyedit.c:1192 g10/keyedit.c:1220 g10/keyedit.c:1247 g10/keyedit.c:1423
++#: g10/keyedit.c:2252 g10/keyedit.c:3178
  msgid "  Unable to sign.\n"
  msgstr " Nie da się złożyć podpisu.\n"
  
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1197
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "Identyfikator użytkownika ,,%s'' przekroczył swój termin ważności."
  
- #: g10/keyedit.c:1224
++#: g10/keyedit.c:1225
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "Identyfikator ,,%s'' nie jest podpisany swoim kluczem."
  
- #: g10/keyedit.c:1253
++#: g10/keyedit.c:1254
  #, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "Identyfikator użytkownika ,,%s'' jest podpisywalny. "
  
- #: g10/keyedit.c:1255
++#: g10/keyedit.c:1256
  msgid "Sign it? (y/N) "
  msgstr "Podpisać go? (t/N) "
  
- #: g10/keyedit.c:1282
++#: g10/keyedit.c:1283
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -4034,11 -3162,9 +3990,11 @@@ msgstr "
  "Podpis klucza nim samym na ,,%s''\n"
  "jest podpisem złożonym przez PGP 2.x.\n"
  
- #: g10/keyedit.c:1291
++#: g10/keyedit.c:1292
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr "Czy chcesz zamienić go na podpis OpenPGP? (t/N) "
  
- #: g10/keyedit.c:1304
++#: g10/keyedit.c:1305
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -4047,11 -3173,9 +4003,11 @@@ msgstr "
  "Twój podpis na ,,%s''\n"
  "przekroczył datę ważności.\n"
  
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:1310
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr "Czy chcesz zastąpić przeterminowany podpis nowym? (t/N) "
  
- #: g10/keyedit.c:1330
++#: g10/keyedit.c:1331
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -4060,45 -3184,36 +4016,45 @@@ msgstr "
  "Twój podpis na ,,%s''\n"
  "jest podpisem prywatnym (lokalnym).\n"
  
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:1336
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr ""
  "Czy chcesz zamienić go na pełny, publiczny, eksportowalny podpis? (t/N) "
  
- #: g10/keyedit.c:1355
++#: g10/keyedit.c:1356
  #, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr ",,%s'' jest już lokalnie podpisany kluczem %s\n"
  
- #: g10/keyedit.c:1359
++#: g10/keyedit.c:1360
  #, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr ",,%s'' jest już podpisany kluczem %s\n"
  
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:1365
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "Czy na pewno chcesz to podpisać jeszcze raz? (t/N) "
  
- #: g10/keyedit.c:1386
++#: g10/keyedit.c:1387
  #, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "Nie ma nic do podpisania kluczem %s\n"
  
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1411
  msgid "This key has expired!"
  msgstr "Data ważności tego klucza upłynęła!"
  
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1429
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "Ważność tego klucza wygasa %s.\n"
  
- #: g10/keyedit.c:1434
++#: g10/keyedit.c:1435
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr ""
  "Czy chcesz żeby ważność Twojego podpisu wygasała w tej samej chwili? (T/n) "
  
- #: g10/keyedit.c:1475
++#: g10/keyedit.c:1476
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -4107,33 -3222,27 +4063,33 @@@ msgstr "
  "Jak dokładnie została przez Ciebie sprawdzona tożsamość tej osoby?\n"
  "Jeśli nie wiesz co odpowiedzieć, podaj ,,0''.\n"
  
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1481
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) Nie odpowiem na to pytanie. %s\n"
  
- #: g10/keyedit.c:1482
++#: g10/keyedit.c:1483
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) W ogóle nie.%s\n"
  
- #: g10/keyedit.c:1484
++#: g10/keyedit.c:1485
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) Pobieżnie.%s\n"
  
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:1488
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) Bardzo dokładnie.%s\n"
  
- #: g10/keyedit.c:1494
++#: g10/keyedit.c:1495
  #, fuzzy
  #| msgid "Your selection? (enter `?' for more information): "
  msgid "Your selection? (enter '?' for more information): "
  msgstr "Twój wybór (,,?'' podaje więcej informacji): "
  
- #: g10/keyedit.c:1521
++#: g10/keyedit.c:1522
  #, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -4142,238 -3251,184 +4098,238 @@@ msgstr "
  "Czy jesteś naprawdę pewien, że chcesz podpisać ten klucz\n"
  "swoim kluczem ,,%s'' (%s)\n"
  
- #: g10/keyedit.c:1529
++#: g10/keyedit.c:1530
  msgid "This will be a self-signature.\n"
  msgstr "To będzie podpis klucza nim samym.\n"
  
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:1535
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr ""
  "OSTRZEŻENIE: podpis nie zostanie oznaczony jako prywatny "
  "(nieeksportowalny).\n"
  
- #: g10/keyedit.c:1541
++#: g10/keyedit.c:1542
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr ""
  "OSTRZEŻENIE: podpis nie zostanie oznaczony jako nie podlegający "
  "unieważnieniu.\n"
  
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1552
  msgid "The signature will be marked as non-exportable.\n"
  msgstr "Podpis zostanie oznaczony jako prywatny (nieeksportowalny).\n"
  
- #: g10/keyedit.c:1558
++#: g10/keyedit.c:1559
  msgid "The signature will be marked as non-revocable.\n"
  msgstr "Podpis zostanie oznaczony jako nie podlegający unieważnieniu.\n"
  
- #: g10/keyedit.c:1565
++#: g10/keyedit.c:1566
  msgid "I have not checked this key at all.\n"
  msgstr "Tożsamość użytkownika nie została w ogóle sprawdzona.\n"
  
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:1571
  msgid "I have checked this key casually.\n"
  msgstr "Tożsamość użytkownika została sprawdzona pobieżnie.\n"
  
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:1576
  msgid "I have checked this key very carefully.\n"
  msgstr "Tożsamość użytkownika została dokładnie sprawdzona.\n"
  
- #: g10/keyedit.c:1587
++#: g10/keyedit.c:1588
  msgid "Really sign? (y/N) "
  msgstr "Czy na pewno podpisać? (t/N) "
  
- #: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
- #: g10/keyedit.c:6463 g10/sign.c:323
++#: g10/keyedit.c:1639 g10/keyedit.c:6308 g10/keyedit.c:6391 g10/keyedit.c:6500
++#: g10/keyedit.c:6562 g10/sign.c:325
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "złożenie podpisu nie powiodło się: %s\n"
  
- #: g10/keyedit.c:1725
++#: g10/keyedit.c:1726
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  "Klucz ma tylko zaślepkę albo elementy na karcie - nie ma hasła do zmiany.\n"
  
- #: g10/keyedit.c:1755
++#: g10/keyedit.c:1756
  #, fuzzy, c-format
  #| msgid "error creating passphrase: %s\n"
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "błąd podczas tworzenia hasła: %s\n"
  
- #: g10/keyedit.c:1869
++#: g10/keyedit.c:1870
  msgid "save and quit"
  msgstr "zapis zmian i wyjście"
  
- #: g10/keyedit.c:1872
++#: g10/keyedit.c:1873
  msgid "show key fingerprint"
  msgstr "okazanie odcisku klucza"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1874
  #, fuzzy
  #| msgid "Enter the keygrip: "
  msgid "show the keygrip"
  msgstr "Uchwyt klucza: "
  
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1875
  msgid "list key and user IDs"
  msgstr "lista kluczy i identyfikatorów użytkownika"
  
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1877
  msgid "select user ID N"
  msgstr "wybór identyfikatora użytkownika N"
  
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1878
  msgid "select subkey N"
  msgstr "wybór podklucza N"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1879
  msgid "check signatures"
  msgstr "sprawdzenie podpisów"
  
- #: g10/keyedit.c:1884
++#: g10/keyedit.c:1885
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr ""
  "złożenie podpisu na wybranych identyfikatorach użytkownika [* poniżej "
  "powiązane polecenia]"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1890
  msgid "sign selected user IDs locally"
  msgstr ""
  "złożenie prywatnego (lokalnego) podpisu na wybranych identyfikatorach "
  "użytkownika"
  
- #: g10/keyedit.c:1890
++#: g10/keyedit.c:1891
  msgid "sign selected user IDs with a trust signature"
  msgstr "podpisanie wybranych identyfikatorów użytkownika sygnaturą zaufania"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1893
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr ""
  "podpisanie wybranych identyfikatorów użytkownika sygnaturą nie podlegającą "
  "unieważnieniu"
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1895
  msgid "add a user ID"
  msgstr "dodanie nowego identyfikatora użytkownika do klucza"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1897
  msgid "add a photo ID"
  msgstr "dodanie zdjęcia użytkownika do klucza"
  
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1898
  msgid "delete selected user IDs"
  msgstr "usunięcie wybranych identyfikatorów użytkownika z klucza"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1901
  msgid "add a subkey"
  msgstr "dodanie podklucza"
  
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1904
  msgid "add a key to a smartcard"
  msgstr "dodanie klucza do karty procesorowej"
  
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1906
  msgid "move a key to a smartcard"
  msgstr "przeniesienie klucza na kartę procesorową"
  
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1908
  msgid "move a backup key to a smartcard"
  msgstr "przeniesienie klucza zapasowego na kartę procesorową"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1910
  msgid "delete selected subkeys"
  msgstr "usunięcie wybranych podkluczy"
  
- #: g10/keyedit.c:1911
++#: g10/keyedit.c:1912
  msgid "add a revocation key"
  msgstr "dodanie klucza unieważniającego"
  
- #: g10/keyedit.c:1913
++#: g10/keyedit.c:1914
  msgid "delete signatures from the selected user IDs"
  msgstr "usunięcie podpisów z wybranych identyfikatorów użytkownika"
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1916
  msgid "change the expiration date for the key or selected subkeys"
  msgstr "zmiana daty wygaśnięcia dla klucza lub wybranych podkluczy"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1918
  msgid "flag the selected user ID as primary"
  msgstr "oznaczenie wybranego identyfikatora użytkownika jako głównego"
  
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1921
  msgid "list preferences (expert)"
  msgstr "ustawienia (zaawansowane)"
  
- #: g10/keyedit.c:1921
++#: g10/keyedit.c:1922
  msgid "list preferences (verbose)"
  msgstr "rozbudowana lista ustawień"
  
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:1924
  msgid "set preference list for the selected user IDs"
  msgstr "ustawienie listy preferencji dla wybranych identyfikatorów użytkownika"
  
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1927
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr ""
  "ustawienie URL-a preferowanego serwera kluczy dla wybranych identyfikatorów "
  "użytkownika"
  
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1929
  msgid "set a notation for the selected user IDs"
  msgstr "ustawienie adnotacji dla wybranych identyfikatorów użytkownika"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1931
  msgid "change the passphrase"
  msgstr "zmiana hasła klucza"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1934
  msgid "change the ownertrust"
  msgstr "zmiana zaufania właściciela"
  
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1937
  msgid "revoke signatures on the selected user IDs"
  msgstr "unieważnienie podpisów na wybranych identyfikatorach użytkownika"
  
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1939
  msgid "revoke selected user IDs"
  msgstr "unieważnienie wybranych identyfikatorów użytkownika"
  
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1942
  msgid "revoke key or selected subkeys"
  msgstr "unieważnienie klucza lub wybranych podkluczy"
  
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1944
  msgid "enable key"
  msgstr "włączenie klucza do użycia"
  
- #: g10/keyedit.c:1944
++#: g10/keyedit.c:1945
  msgid "disable key"
  msgstr "wyłączenie klucza z użycia"
  
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1947
  msgid "show selected photo IDs"
  msgstr "okazanie wybranych identyfikatorów - zdjęć"
  
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1949
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  "zagęszczanie bezużytecznych ID użytkowników i usuwanie bezużytecznych "
  "podpisów z kluczy"
  
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:1951
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  "zagęszczanie bezużytecznych ID użytkowników i usuwanie wszystkich podpisów z "
  "kluczy"
  
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2063
  msgid "Secret key is available.\n"
  msgstr "Dostępny jest klucz tajny.\n"
  
- #: g10/keyedit.c:2162
++#: g10/keyedit.c:2163
  msgid "Need the secret key to do this.\n"
  msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
  
- #: g10/keyedit.c:2183
++#: g10/keyedit.c:2184
  #, fuzzy
  #| msgid ""
  #| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4393,272 -3448,218 +4349,278 @@@ msgstr "
  "(ltsign,\n"
  "  tnrsign itd.).\n"
  
- #: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
++#: g10/keyedit.c:2240 g10/keyedit.c:3178 g10/keyedit.c:3317 g10/keyedit.c:3379
  msgid "Key is revoked."
  msgstr "Klucz unieważniony."
  
- #: g10/keyedit.c:2262
++#: g10/keyedit.c:2263
  msgid "Really sign all user IDs? (y/N) "
  msgstr "Czy na pewno podpisać wszystkie identyfikatory użytkownika? (t/N) "
  
- #: g10/keyedit.c:2266
++#: g10/keyedit.c:2267
  #, fuzzy
  #| msgid "Really sign all user IDs? (y/N) "
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "Czy na pewno podpisać wszystkie identyfikatory użytkownika? (t/N) "
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2275
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Podpowiedź: wybierz identyfikatory użytkownika do podpisania.\n"
  
- #: g10/keyedit.c:2285
++#: g10/keyedit.c:2286
  #, fuzzy, c-format
  #| msgid "Unknown signature type `%s'\n"
  msgid "Unknown signature type '%s'\n"
  msgstr "Nieznany rodzaj podpisu ,,%s''\n"
  
- #: g10/keyedit.c:2309
++#: g10/keyedit.c:2310
  #, 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/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
++#: g10/keyedit.c:2332 g10/keyedit.c:2356 g10/keyedit.c:2550
  msgid "You must select at least one user ID.\n"
  msgstr "Musisz wybrać co najmniej jeden identyfikator użytkownika.\n"
  
- #: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
++#: g10/keyedit.c:2334 g10/keyedit.c:2358 g10/keyedit.c:2512 g10/keyedit.c:2552
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2336
++#: g10/keyedit.c:2337
  msgid "You can't delete the last user ID!\n"
  msgstr "Nie możesz usunąć ostatniego identyfikatora użytkownika!\n"
  
- #: g10/keyedit.c:2339
++#: g10/keyedit.c:2340
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr ""
  "Czy na pewno usunąć wszystkie wybrane identyfikatory użytkownika? (t/N) "
  
- #: g10/keyedit.c:2340
++#: g10/keyedit.c:2341
  msgid "Really remove this user ID? (y/N) "
  msgstr "Czy na pewno usunąć ten identyfikator użytkownika? (t/N) "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2397
++#: g10/keyedit.c:2398
  msgid "Really move the primary key? (y/N) "
  msgstr "Czy na pewno przenieść główny klucz (t/N) "
  
- #: g10/keyedit.c:2409 g10/keyedit.c:4866
++#: g10/keyedit.c:2410 g10/keyedit.c:4964
  msgid "You must select exactly one key.\n"
  msgstr "Musisz wybrać dokładnie jeden klucz.\n"
  
- #: g10/keyedit.c:2436
++#: g10/keyedit.c:2437
  msgid "Command expects a filename argument\n"
  msgstr "Polecenie oczekuje argumentu będącego nazwą pliku\n"
  
- #: g10/keyedit.c:2457
++#: g10/keyedit.c:2458
  #, fuzzy, c-format
  #| msgid "Can't open `%s': %s\n"
  msgid "Can't open '%s': %s\n"
  msgstr "Nie można otworzyć ,,%s'': %s\n"
  
- #: g10/keyedit.c:2474
++#: g10/keyedit.c:2475
  #, fuzzy, c-format
  #| msgid "Error reading backup key from `%s': %s\n"
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "Błąd podczas odczytu klucza zapasowego z `%s': %s\n"
  
- #: g10/keyedit.c:2509
++#: g10/keyedit.c:2510
  msgid "You must select at least one key.\n"
  msgstr "Musisz wybrać co najmniej jeden klucz.\n"
  
- #: g10/keyedit.c:2515
++#: g10/keyedit.c:2516
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "Czy na pewno chcesz usunąć wybrane klucze? (t/N) "
  
- #: g10/keyedit.c:2517
++#: g10/keyedit.c:2518
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "Czy na pewno chcesz usunąć ten klucz? (t/N) "
  
- #: g10/keyedit.c:2555
++#: g10/keyedit.c:2556
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr ""
  "Czy na pewno unieważnić wszystkie wybrane identyfikatory użytkownika? (t/N) "
  
- #: g10/keyedit.c:2556
++#: g10/keyedit.c:2557
  msgid "Really revoke this user ID? (y/N) "
  msgstr "Czy na pewno unieważnić ten identyfikator użytkownika? (t/N) "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2575
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "Czy na pewno chcesz unieważnić cały klucz? (t/N) "
  
- #: g10/keyedit.c:2585
++#: g10/keyedit.c:2586
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "Czy na pewno chcesz unieważnić wybrane podklucze? (t/N) "
  
- #: g10/keyedit.c:2587
++#: g10/keyedit.c:2588
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "Czy na pewno chcesz unieważnić ten podklucz? (t/N) "
  
- #: g10/keyedit.c:2645
++#: g10/keyedit.c:2646
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  "Zaufanie użytkownika nie może być ustawione podczas używania bazy zaufania\n"
  "dostarczonej przez użytkownika\n"
  
- #: g10/keyedit.c:2690
++#: g10/keyedit.c:2691
  msgid "Set preference list to:\n"
  msgstr "Ustawienie listy ustawień na:\n"
  
- #: g10/keyedit.c:2697
++#: g10/keyedit.c:2698
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr ""
  "Czy na pewno uaktualnić ustawienia dla wybranych identyfikatorów? (t/N) "
  
- #: g10/keyedit.c:2699
++#: g10/keyedit.c:2700
  msgid "Really update the preferences? (y/N) "
  msgstr "Czy na pewno uaktualnić ustawienia? (t/N) "
  
- #: g10/keyedit.c:2773
++#: g10/keyedit.c:2774
  msgid "Save changes? (y/N) "
  msgstr "Zapisać zmiany? (t/N) "
  
- #: g10/keyedit.c:2777
++#: g10/keyedit.c:2778
  msgid "Quit without saving? (y/N) "
  msgstr "Wyjść bez zapisania zmian? (t/N) "
  
- #: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
- #: g10/keyedit.c:3267 g10/keyedit.c:3332
++#: g10/keyedit.c:2789 g10/keyedit.c:2799 g10/keyedit.c:2943 g10/keyedit.c:3046
++#: g10/keyedit.c:3268 g10/keyedit.c:3333 g10/keyedit.c:3409
  #, c-format
  msgid "update failed: %s\n"
  msgstr "zapis zmian nie powiódł się: %s\n"
  
- #: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
++#: g10/keyedit.c:2805 g10/keyedit.c:3273 g10/keyedit.c:3338 g10/keyedit.c:3416
  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:3038
++#: g10/keyedit.c:3039
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
  msgstr "Generacja klucza nie powiodła się: %s\n"
  
- #: g10/keyedit.c:3083
++#: g10/keyedit.c:3084
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "niewłaściwy odcisk"
  
- #: g10/keyedit.c:3112
++#: g10/keyedit.c:3113
  #, fuzzy, c-format
  #| msgid "failed to get the fingerprint\n"
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "nie udało się pobrać odcisku\n"
  
- #: g10/keyedit.c:3248 g10/keyedit.c:3251
++#: g10/keyedit.c:3249 g10/keyedit.c:3252
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
  msgstr "niepoprawna wartość\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  #, fuzzy
  #| msgid "No such user ID.\n"
  msgid "No matching user IDs."
  msgstr "Brak takiego identyfikatora użytkownika.\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  #, fuzzy
  #| msgid "Nothing to sign with key %s\n"
  msgid "Nothing to sign.\n"
  msgstr "Nie ma nic do podpisania kluczem %s\n"
  
- #: g10/keyedit.c:3427
++#: g10/keyedit.c:3388
+ #, fuzzy, c-format
+ #| msgid "`%s' is not a valid signature expiration\n"
+ msgid "'%s' is not a valid expiration time\n"
+ msgstr ",,%s'' nie jest poprawnym czasem wygaśnięcia podpisu\n"
+ 
++#: g10/keyedit.c:3508
  msgid "Digest: "
  msgstr "Skrót: "
  
- #: g10/keyedit.c:3484
++#: g10/keyedit.c:3565
  msgid "Features: "
  msgstr "Ustawienia: "
  
- #: g10/keyedit.c:3495
++#: g10/keyedit.c:3576
  msgid "Keyserver no-modify"
  msgstr "no-modify dla serwera kluczy"
  
- #: g10/keyedit.c:3510 g10/keylist.c:377
++#: g10/keyedit.c:3591 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr "Preferowany serwer kluczy: "
  
- #: g10/keyedit.c:3518 g10/keyedit.c:3519
++#: g10/keyedit.c:3599 g10/keyedit.c:3600
  msgid "Notations: "
  msgstr "Adnotacje: "
  
- #: g10/keyedit.c:3764
++#: g10/keyedit.c:3845
  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:3836
++#: g10/keyedit.c:3917
  #, 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:3860
++#: g10/keyedit.c:3941
  #, 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:3866
++#: g10/keyedit.c:3947
  msgid "(sensitive)"
  msgstr "(poufne)"
  
- #: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3989 g10/keyedit.c:4131 g10/keylist.c:262 g10/keyserver.c:538
  #, c-format
  msgid "created: %s"
  msgstr "utworzono: %s"
  
- #: g10/keyedit.c:3911 g10/keylist.c:1852
++#: g10/keyedit.c:3992 g10/keylist.c:1852
  #, c-format
  msgid "revoked: %s"
  msgstr "unieważniono: %s"
  
- #: g10/keyedit.c:3913 g10/keylist.c:1858
++#: g10/keyedit.c:3994 g10/keylist.c:1858
  #, c-format
  msgid "expired: %s"
  msgstr "wygasł: %s"
  
- #: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyedit.c:3996 g10/keyedit.c:4133 g10/keylist.c:264 g10/keylist.c:1864
 +#: g10/keyserver.c:544
  #, c-format
  msgid "expires: %s"
  msgstr "wygasa: %s"
  
- #: g10/keyedit.c:3917
++#: g10/keyedit.c:3998
  #, c-format
  msgid "usage: %s"
  msgstr "użycie: %s"
  
- #: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
++#: g10/keyedit.c:4006 g10/keyedit.c:4026 g10/keylist.c:267
  msgid "card-no: "
  msgstr "nr-karty: "
  
- #: g10/keyedit.c:3984
++#: g10/keyedit.c:4065
  #, c-format
  msgid "trust: %s"
  msgstr "zaufanie: %s"
  
- #: g10/keyedit.c:3988
++#: g10/keyedit.c:4069
  #, c-format
  msgid "validity: %s"
  msgstr "poprawność: %s"
  
- #: g10/keyedit.c:3995
++#: g10/keyedit.c:4076
  msgid "This key has been disabled"
  msgstr "Ten klucz został wyłączony z użytku"
  
- #: g10/keyedit.c:4013
++#: g10/keyedit.c:4094
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4666,18 -3667,12 +4628,18 @@@ msgstr "
  "Pokazana wartość wiarygodności klucza może być niepoprawna,\n"
  "dopóki program nie zostanie uruchomiony ponownie.\n"
  
- #: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
- #: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: g10/keyedit.c:4150 g10/keyedit.c:4581 g10/keyserver.c:548
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:712
 +#: dirmngr/ocsp.c:703
  msgid "revoked"
  msgstr "unieważniony"
  
- #: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
- #: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4152 g10/keyedit.c:4583 g10/keyserver.c:552
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:714
  msgid "expired"
  msgstr "wygasł"
  
- #: g10/keyedit.c:4188
++#: g10/keyedit.c:4269
  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"
@@@ -4686,17 -3681,14 +4648,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:4240
++#: g10/keyedit.c:4321
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr ""
  
- #: g10/keyedit.c:4241
++#: g10/keyedit.c:4322
  #, fuzzy
  #| 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 "Nie można zmienić daty ważności klucza w wersji 3.\n"
  
- #: g10/keyedit.c:4300
++#: g10/keyedit.c:4381
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4705,35 -3697,27 +4667,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:4305 g10/keyedit.c:4595
++#: g10/keyedit.c:4386 g10/keyedit.c:4676
  msgid "Are you sure you still want to add it? (y/N) "
  msgstr "Czy dalej chcesz je dodać? (t/N) "
  
- #: g10/keyedit.c:4311
++#: g10/keyedit.c:4392
  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:4326 g10/keygen.c:2697
++#: g10/keyedit.c:4407 g10/keygen.c:2719
  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:4428
++#: g10/keyedit.c:4509
  msgid "Delete this good signature? (y/N/q)"
  msgstr "Usunąć ten poprawny podpis? (t/N/w) "
  
- #: g10/keyedit.c:4438
++#: g10/keyedit.c:4519
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "Usunąć ten niepoprawny podpis? (t/N/w) "
  
- #: g10/keyedit.c:4442
++#: g10/keyedit.c:4523
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "Usunąć ten nieznany podpis? (t/N/w) "
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4530
  msgid "Really delete this self-signature? (y/N)"
  msgstr "Na pewno usunąć ten podpis klucza nim samym? (t/N) "
  
- #: g10/keyedit.c:4465
++#: g10/keyedit.c:4546
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
@@@ -4742,20 -3726,16 +4704,20 @@@ msgstr[0] "%d podpis usunięty.\n
  msgstr[1] "%d podpis usunięty.\n"
  msgstr[2] "%d podpis usunięty.\n"
  
- #: g10/keyedit.c:4469
++#: g10/keyedit.c:4550
  msgid "Nothing deleted.\n"
  msgstr "Nic nie zostało usunięte.\n"
  
- #: g10/keyedit.c:4504 g10/trust.c:693
++#: g10/keyedit.c:4585 g10/trust.c:716
  msgid "invalid"
  msgstr "niepoprawny"
  
- #: g10/keyedit.c:4506
++#: g10/keyedit.c:4587
  #, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "Identyfikator użytkownika ,,%s'' upakowany: %s\n"
  
- #: g10/keyedit.c:4512
++#: g10/keyedit.c:4593
  #, fuzzy, c-format
  #| msgid "User ID \"%s\": %d signature removed\n"
  msgid "User ID \"%s\": %d signature removed\n"
@@@ -4764,17 -3744,14 +4726,17 @@@ msgstr[0] "Identyfikator użytkownika ,
  msgstr[1] "Identyfikator użytkownika ,,%s'': %d podpis wyczyszczony\n"
  msgstr[2] "Identyfikator użytkownika ,,%s'': %d podpis wyczyszczony\n"
  
- #: g10/keyedit.c:4520
++#: g10/keyedit.c:4601
  #, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "Identyfikator użytkownika ,,%s'': już zmniejszony.\n"
  
- #: g10/keyedit.c:4521
++#: g10/keyedit.c:4602
  #, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "Identyfikator użytkownika ,,%s'': już czysty.\n"
  
- #: g10/keyedit.c:4590
++#: g10/keyedit.c:4671
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4784,37 -3761,29 +4746,37 @@@ msgstr "
  "             unieważniającego spowoduje, że niektóre wersje PGP przestaną\n"
  "             go rozumieć.\n"
  
- #: g10/keyedit.c:4601
++#: g10/keyedit.c:4682
  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:4618
++#: g10/keyedit.c:4699
  msgid "Enter the user ID of the designated revoker: "
  msgstr "Podaj identyfikator klucza unieważniającego: "
  
- #: g10/keyedit.c:4643
++#: g10/keyedit.c:4724
  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:4658
++#: g10/keyedit.c:4739
  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:4680
++#: g10/keyedit.c:4761
  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:4698
++#: g10/keyedit.c:4779
  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:4704
++#: g10/keyedit.c:4785
  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:4755
++#: g10/keyedit.c:4848
  #, fuzzy
  #| msgid ""
  #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4823,237 -3792,186 +4785,237 @@@ msgid "
  "N) "
  msgstr "Czy na pewno chcesz wyznaczyć ten klucz jako unieważniający? (t/N) "
  
- #: g10/keyedit.c:4760
++#: g10/keyedit.c:4853
  msgid "Changing expiration time for a subkey.\n"
  msgstr "Zmiana daty ważności podklucza.\n"
  
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:4856
  msgid "Changing expiration time for the primary key.\n"
  msgstr "Zmiana daty ważności głównego klucza.\n"
  
- #: g10/keyedit.c:4814
++#: g10/keyedit.c:4910
  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:4987
++#: g10/keyedit.c:5085
  #, 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:4993
++#: g10/keyedit.c:5091
  #, 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:5108
++#: g10/keyedit.c:5206
  msgid "Please select exactly one user ID.\n"
  msgstr "Proszę wybrać dokładnie jeden identyfikator użytkownika.\n"
  
- #: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
++#: g10/keyedit.c:5247 g10/keyedit.c:5361 g10/keyedit.c:5474 g10/keyedit.c:5611
  #, 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:5320
++#: g10/keyedit.c:5418
  msgid "Enter your preferred keyserver URL: "
  msgstr "Podaj preferowany URL serwera kluczy: "
  
- #: g10/keyedit.c:5399
++#: g10/keyedit.c:5497
  msgid "Are you sure you want to replace it? (y/N) "
  msgstr "Czy na pewno chcesz go zastąpić? (t/N) "
  
- #: g10/keyedit.c:5400
++#: g10/keyedit.c:5498
  msgid "Are you sure you want to delete it? (y/N) "
  msgstr "Czy na pewno chcesz go usunąć? (t/N) "
  
- #: g10/keyedit.c:5459
++#: g10/keyedit.c:5557
  msgid "Enter the notation: "
  msgstr "Adnotacje: "
  
- #: g10/keyedit.c:5606
++#: g10/keyedit.c:5704
  msgid "Proceed? (y/N) "
  msgstr "Kontynuować? (t/N) "
  
- #: g10/keyedit.c:5676
++#: g10/keyedit.c:5774
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "Brak identyfikatora użytkownika o numerze %d.\n"
  
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5836
  #, c-format
  msgid "No user ID with hash %s\n"
  msgstr "Brak identyfikatora użytkownika o skrócie %s\n"
  
- #: g10/keyedit.c:5839
++#: g10/keyedit.c:5937
  #, fuzzy, c-format
  #| msgid "No subkey with index %d\n"
  msgid "No subkey with key ID '%s'.\n"
  msgstr "Brak podklucza o numerze %d.\n"
  
- #: g10/keyedit.c:5861
++#: g10/keyedit.c:5959
  #, c-format
  msgid "No subkey with index %d\n"
  msgstr "Brak podklucza o numerze %d.\n"
  
- #: g10/keyedit.c:6002
++#: g10/keyedit.c:6100
  #, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "identyfikator użytkownika: ,,%s''\n"
  
- #: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
++#: g10/keyedit.c:6103 g10/keyedit.c:6205 g10/keyedit.c:6253
  #, 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:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
++#: g10/keyedit.c:6105 g10/keyedit.c:6207 g10/keyedit.c:6255
  msgid " (non-exportable)"
  msgstr " (podpis nieeksportowalny) "
  
- #: g10/keyedit.c:6011
++#: g10/keyedit.c:6109
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "Ważność tego klucza wygasła %s.\n"
  
- #: g10/keyedit.c:6016
++#: g10/keyedit.c:6114
  msgid "Are you sure you still want to revoke it? (y/N) "
  msgstr "Czy dalej chcesz go unieważnić? (t/N) "
  
- #: g10/keyedit.c:6021
++#: g10/keyedit.c:6119
  msgid "Create a revocation certificate for this signature? (y/N) "
  msgstr "Stworzyć certyfikat unieważnienia tego podpisu? (t/N) "
  
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6173
  msgid "Not signed by you.\n"
  msgstr "Nie podpisane przez ciebie.\n"
  
- #: g10/keyedit.c:6081
++#: g10/keyedit.c:6179
  #, 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:6110
++#: g10/keyedit.c:6208
  msgid " (non-revocable)"
  msgstr " (podpis nieunieważnialny) "
  
- #: g10/keyedit.c:6117
++#: g10/keyedit.c:6215
  #, 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:6142
++#: g10/keyedit.c:6240
  msgid "You are about to revoke these signatures:\n"
  msgstr "Czy na pewno chcesz unieważnić te podpisy:\n"
  
- #: g10/keyedit.c:6165
++#: g10/keyedit.c:6263
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "Na pewno utworzyć certyfikaty unieważnienia ? (t/N) "
  
- #: g10/keyedit.c:6198
++#: g10/keyedit.c:6296
  msgid "no secret key\n"
  msgstr "brak klucza tajnego\n"
  
- #: g10/keyedit.c:6246
++#: g10/keyedit.c:6344
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6256
++#: g10/keyedit.c:6354
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "identyfikator użytkownika ,,%s'' został już unieważniony\n"
  
- #: g10/keyedit.c:6273
++#: g10/keyedit.c:6371
  #, 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:6386
++#: g10/keyedit.c:6485
  #, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "Klucz %s jest już unieważniony.\n"
  
- #: g10/keyedit.c:6448
++#: g10/keyedit.c:6547
  #, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "Podklucz %s jest już unieważniony.\n"
  
- #: g10/keyedit.c:6545
++#: g10/keyedit.c:6644
  #, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr ""
  "Wyświetlanie zdjęcia w formacie %s o rozmiarze %ld bajtów dla klucza %s (id "
  "%d).\n"
  
- #: g10/keygen.c:305
++#: g10/keygen.c:316
  #, fuzzy, c-format
  #| msgid "preference `%s' duplicated\n"
  msgid "preference '%s' duplicated\n"
  msgstr "ustawienie ,,%s'' powtarza się\n"
  
- #: g10/keygen.c:312
++#: g10/keygen.c:323
  msgid "too many cipher preferences\n"
  msgstr "zbyt wiele ustawień szyfru\n"
  
- #: g10/keygen.c:314
++#: g10/keygen.c:325
  msgid "too many digest preferences\n"
  msgstr "zbyt wiele ustawień funkcji skrótu\n"
  
- #: g10/keygen.c:316
++#: g10/keygen.c:327
  msgid "too many compression preferences\n"
  msgstr "zbyt wiele ustawień kompresji\n"
  
- #: g10/keygen.c:457
++#: g10/keygen.c:468
  #, fuzzy, c-format
  #| msgid "invalid item `%s' in preference string\n"
  msgid "invalid item '%s' in preference string\n"
  msgstr "niewłaściwy element `%s' w tekście ustawień\n"
  
- #: g10/keygen.c:936
++#: g10/keygen.c:947
  msgid "writing direct signature\n"
  msgstr "zapis podpisu bezpośredniego\n"
  
- #: g10/keygen.c:982
++#: g10/keygen.c:993
  msgid "writing self signature\n"
  msgstr "zapis podpisu klucza nim samym\n"
  
- #: g10/keygen.c:1038
++#: g10/keygen.c:1049
  msgid "writing key binding signature\n"
  msgstr "zapis podpisu wiążącego klucz\n"
  
- #: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
- #: g10/keygen.c:1610 g10/keygen.c:1615
++#: g10/keygen.c:1413 g10/keygen.c:1418 g10/keygen.c:1470 g10/keygen.c:1475
++#: g10/keygen.c:1622 g10/keygen.c:1627
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "niewłaściwa długość klucza; wykorzystano %u bitów\n"
  
- #: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
++#: g10/keygen.c:1424 g10/keygen.c:1481 g10/keygen.c:1489 g10/keygen.c:1633
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "rozmiar klucza zaokrąglony w górę do %u bitów\n"
  
- #: g10/keygen.c:1503
++#: g10/keygen.c:1515
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  "OSTRZEŻENIE: niektóre programy OpenPGP nie potrafią obsłużyć klucza RSA o "
  "tej długości skrótu\n"
  
- #: g10/keygen.c:1677
++#: g10/keygen.c:1689
  msgid "Sign"
  msgstr "Podpisywanie"
  
- #: g10/keygen.c:1680
++#: g10/keygen.c:1692
  msgid "Certify"
  msgstr "Certyfikowanie"
  
- #: g10/keygen.c:1683
++#: g10/keygen.c:1695
  msgid "Encrypt"
  msgstr "Szyfrowanie"
  
- #: g10/keygen.c:1686
++#: g10/keygen.c:1698
  msgid "Authenticate"
  msgstr "Uwierzytelnianie"
  
@@@ -5067,158 -3985,127 +5029,158 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1705
++#: g10/keygen.c:1717
  msgid "SsEeAaQq"
  msgstr "PpSsUuZz"
  
- #: g10/keygen.c:1732
++#: g10/keygen.c:1744
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "Możliwe akcje dla klucza %s: "
  
- #: g10/keygen.c:1738
++#: g10/keygen.c:1750
  msgid "Current allowed actions: "
  msgstr "Aktualnie dopuszczalne akcje: "
  
- #: g10/keygen.c:1743
++#: g10/keygen.c:1755
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) Przełączenie możliwości podpisywania\n"
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) Przełączenie możliwości szyfrowania\n"
  
- #: g10/keygen.c:1749
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) Przełączenie możliwości uwierzytelniania\n"
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) Zakończenie\n"
  
- #: g10/keygen.c:1881 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1893 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Proszę wybrać rodzaj klucza:\n"
  
- #: g10/keygen.c:1885
++#: g10/keygen.c:1897
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) RSA i RSA (domyślne)\n"
  
- #: g10/keygen.c:1889
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA i Elgamala\n"
  
- #: g10/keygen.c:1892
++#: g10/keygen.c:1904
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (tylko do podpisywania)\n"
  
- #: g10/keygen.c:1894
++#: g10/keygen.c:1906
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (tylko do podpisywania)\n"
  
- #: g10/keygen.c:1900
++#: g10/keygen.c:1912
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) Elgamala (tylko do szyfrowania)\n"
  
- #: g10/keygen.c:1902
++#: g10/keygen.c:1914
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (tylko do szyfrowania)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1920
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (możliwości do ustawienia)\n"
  
- #: g10/keygen.c:1910
++#: g10/keygen.c:1922
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (możliwości do ustawienia)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1928
  #, fuzzy, c-format
  #| msgid "   (%d) DSA and Elgamal\n"
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA i Elgamala\n"
  
- #: g10/keygen.c:1918
++#: g10/keygen.c:1930
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (tylko do podpisywania)\n"
  
- #: g10/keygen.c:1920
++#: g10/keygen.c:1932
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (set your own capabilities)\n"
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) DSA (możliwości do ustawienia)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1934
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) RSA (tylko do szyfrowania)\n"
  
- #: g10/keygen.c:1926
++#: g10/keygen.c:1938
  #, fuzzy, c-format
  #| msgid "   (%d) Existing key\n"
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) Istniejący klucz\n"
  
- #: g10/keygen.c:2022 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:206
  msgid "Enter the keygrip: "
  msgstr "Uchwyt klucza: "
  
- #: g10/keygen.c:2035 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2047 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr "Nieprawidłowy uchwyt klucza (oczekiwano 40 cyfr szesnastkowych)\n"
  
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2049 sm/certreqgen-ui.c:216
  msgid "No key with this keygrip\n"
  msgstr "Brak klucza o tym uchwycie\n"
  
- #: g10/keygen.c:2111 g10/keygen.c:2125
++#: g10/keygen.c:2133 g10/keygen.c:2147
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
  msgstr "zaokrąglono do %u bitów\n"
  
- #: g10/keygen.c:2166
++#: g10/keygen.c:2188
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr "Klucze %s będą miały od %u do %u bitów długości.\n"
  
- #: g10/keygen.c:2174
++#: g10/keygen.c:2196
  #, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Jakiej długości podklucz wygenerować? (%u) "
  
- #: g10/keygen.c:2177 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2199 sm/certreqgen-ui.c:183
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Jakiej długości klucz wygenerować? (%u) "
  
- #: g10/keygen.c:2191 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2213 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Żądana długość klucza to %u bitów.\n"
  
- #: g10/keygen.c:2237
++#: g10/keygen.c:2259
  #, fuzzy
  #| msgid "Please select what kind of key you want:\n"
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Proszę wybrać rodzaj klucza:\n"
  
- #: g10/keygen.c:2409
++#: g10/keygen.c:2431
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5234,7 -4121,6 +5196,7 @@@ msgstr "
  "      <n>m = termin ważności klucza upływa za n miesięcy\n"
  "      <n>y = termin ważności klucza upływa za n lat\n"
  
- #: g10/keygen.c:2420
++#: g10/keygen.c:2442
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5250,38 -4136,30 +5212,38 @@@ msgstr "
  "      <n>m = termin ważności podpisu upływa za n miesięcy\n"
  "      <n>y = termin ważności podpisu upływa za n lat\n"
  
- #: g10/keygen.c:2443
++#: g10/keygen.c:2465
  msgid "Key is valid for? (0) "
  msgstr "Okres ważności klucza? (0) "
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2470
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Okres ważności podpisu? (%s) "
  
- #: g10/keygen.c:2461 g10/keygen.c:2486
++#: g10/keygen.c:2483 g10/keygen.c:2508
  msgid "invalid value\n"
  msgstr "niepoprawna wartość\n"
  
- #: g10/keygen.c:2468
++#: g10/keygen.c:2490
  msgid "Key does not expire at all\n"
  msgstr "Klucz nie wygaśnie w ogóle\n"
  
- #: g10/keygen.c:2469
++#: g10/keygen.c:2491
  msgid "Signature does not expire at all\n"
  msgstr "Podpis nie wygaśnie w ogóle\n"
  
- #: g10/keygen.c:2474
++#: g10/keygen.c:2496
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "Klucz traci ważność %s\n"
  
- #: g10/keygen.c:2475
++#: g10/keygen.c:2497
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "Ważność podpisu wygasa %s\n"
  
- #: g10/keygen.c:2479
++#: g10/keygen.c:2501
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5289,11 -4167,9 +5251,11 @@@ msgstr "
  "Twój system nie potrafi pokazać daty po roku 2038.\n"
  "Niemniej daty do roku 2106 będą poprawnie obsługiwane.\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2514
  msgid "Is this correct? (y/N) "
  msgstr "Czy wszystko się zgadza (t/N)? "
  
- #: g10/keygen.c:2560
++#: g10/keygen.c:2582
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5307,7 -4183,6 +5269,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2575
++#: g10/keygen.c:2597
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -5323,50 -4198,39 +5285,50 @@@ msgstr "
  "    \"Tadeusz Żeleński (Boy) <tzb at ziemianska.pl>\"\n"
  "\n"
  
- #: g10/keygen.c:2594
++#: g10/keygen.c:2616
  msgid "Real name: "
  msgstr "Imię i nazwisko: "
  
- #: g10/keygen.c:2603
++#: g10/keygen.c:2625
  msgid "Invalid character in name\n"
  msgstr "Niewłaściwy znak w imieniu lub nazwisku\n"
  
- #: g10/keygen.c:2604
++#: g10/keygen.c:2626
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2608
++#: g10/keygen.c:2630
  msgid "Name may not start with a digit\n"
  msgstr "Imię lub nazwisko nie może zaczynać się od cyfry\n"
  
- #: g10/keygen.c:2611
++#: g10/keygen.c:2633
  msgid "Name must be at least 5 characters long\n"
  msgstr "Imię i nazwisko muszą mieć co najmniej 5 znaków długości.\n"
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2643
  msgid "Email address: "
  msgstr "Adres poczty elektronicznej: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2649
  msgid "Not a valid email address\n"
  msgstr "To nie jest poprawny adres poczty elektronicznej\n"
  
- #: g10/keygen.c:2636
++#: g10/keygen.c:2658
  msgid "Comment: "
  msgstr "Komentarz: "
  
- #: g10/keygen.c:2642
++#: g10/keygen.c:2664
  msgid "Invalid character in comment\n"
  msgstr "Niewłaściwy znak w komentarzu\n"
  
- #: g10/keygen.c:2678
++#: g10/keygen.c:2700
  #, fuzzy, c-format
  #| msgid "You are using the `%s' character set.\n"
  msgid "You are using the '%s' character set.\n"
  msgstr "Używasz zestawu znaków %s.\n"
  
- #: g10/keygen.c:2684
++#: g10/keygen.c:2706
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5377,7 -4241,6 +5339,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2689
++#: g10/keygen.c:2711
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr ""
  "Nie należy umieszczać adresu poczty elektronicznej w polu nazwiska czy\n"
@@@ -5394,27 -4257,22 +5356,27 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2714
++#: g10/keygen.c:2736
  msgid "NnCcEeOoQq"
  msgstr "IiKkEeDdWw"
  
- #: g10/keygen.c:2724
++#: g10/keygen.c:2746
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "Zmienić (I)mię/nazwisko, (K)omentarz, adres (E)mail, czy (W)yjść? "
  
- #: g10/keygen.c:2725
++#: g10/keygen.c:2747
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr ""
  "Zmienić (I)mię/nazwisko, (K)omentarz, adres (E)mail, przejść (D)alej,\n"
  "czy (W)yjść z programu? "
  
- #: g10/keygen.c:2730
++#: g10/keygen.c:2752
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "Zmienić (I)mię/nazwisko, (K)omentarz, adres (E)mail, czy (W)yjść? "
  
- #: g10/keygen.c:2731
++#: g10/keygen.c:2753
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
@@@ -5422,11 -4280,9 +5384,11 @@@ msgstr "
  "Zmienić (I)mię/nazwisko, (K)omentarz, adres (E)mail, przejść (D)alej,\n"
  "czy (W)yjść z programu? "
  
- #: g10/keygen.c:2750
++#: g10/keygen.c:2772
  msgid "Please correct the error first\n"
  msgstr "Najpierw trzeba poprawić ten błąd\n"
  
- #: g10/keygen.c:2796
++#: g10/keygen.c:2818
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5442,13 -4298,10 +5404,13 @@@ msgstr "
  "ilości\n"
  "entropii.\n"
  
- #: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
- #: g10/keygen.c:4777 g10/keygen.c:4882
++#: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
++#: g10/keygen.c:4330 g10/keygen.c:4803 g10/keygen.c:5064 g10/keygen.c:5169
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Generacja klucza nie powiodła się: %s\n"
  
- #: g10/keygen.c:3598
++#: g10/keygen.c:3922
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5456,71 -4309,58 +5418,71 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3924
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3621
++#: g10/keygen.c:3945
  #, fuzzy, c-format
  #| msgid "key already exists\n"
  msgid "A key for \"%s\" already exists\n"
  msgstr "klucz już istnieje\n"
  
- #: g10/keygen.c:3626
++#: g10/keygen.c:3950
  #, fuzzy
  #| msgid "Use this key anyway? (y/N) "
  msgid "Create anyway? (y/N) "
  msgstr "Użyć tego klucza pomimo to? (t/N) "
  
- #: g10/keygen.c:3632
++#: g10/keygen.c:3956
  #, fuzzy
  #| msgid "generating new key\n"
  msgid "creating anyway\n"
  msgstr "generowanie nowego klucza\n"
  
- #: g10/keygen.c:3981
++#: g10/keygen.c:4315
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:4013
++#: g10/keygen.c:4358
  msgid "Key generation canceled.\n"
  msgstr "Procedura generacji klucza została anulowana.\n"
  
- #: g10/keygen.c:4073
++#: g10/keygen.c:4418
  #, fuzzy, c-format
  #| msgid "can't create backup file `%s': %s\n"
  msgid "can't create backup file '%s': %s\n"
  msgstr "nie można utworzyć pliku kopii zapasowej ,,%s'': %s\n"
  
- #: g10/keygen.c:4093
++#: g10/keygen.c:4438
  #, fuzzy, c-format
  #| msgid "NOTE: backup of card key saved to `%s'\n"
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "UWAGA: kopia zapasowa klucza karty zapisana do ,,%s''\n"
  
- #: g10/keygen.c:4244 g10/keygen.c:4393
++#: g10/keygen.c:4589 g10/keygen.c:4738
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
  msgstr "zapisuję klucz publiczny w ,,%s''\n"
  
- #: g10/keygen.c:4387
++#: g10/keygen.c:4732
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n"
  
- #: g10/keygen.c:4401
++#: g10/keygen.c:4746
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error writing public keyring '%s': %s\n"
  msgstr "błąd podczas zapisu zbioru kluczy publicznych ,,%s'': %s\n"
  
- #: g10/keygen.c:4433
++#: g10/keygen.c:4778
  msgid "public and secret key created and signed.\n"
  msgstr "klucz publiczny i prywatny (tajny) zostały utworzone i podpisane.\n"
  
- #: g10/keygen.c:4445
++#: g10/keygen.c:4790
  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"
@@@ -5528,7 -4368,6 +5490,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:4649 g10/keygen.c:4833
++#: g10/keygen.c:4936 g10/keygen.c:5120
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5536,7 -4375,6 +5498,7 @@@ msgstr "
  "klucz został stworzony %lu sekundę w przyszłości (zaburzenia\n"
  "czasoprzestrzeni, lub źle ustawiony zegar systemowy)\n"
  
- #: g10/keygen.c:4651 g10/keygen.c:4835
++#: g10/keygen.c:4938 g10/keygen.c:5122
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5544,22 -4382,18 +5506,22 @@@ msgstr "
  "klucz został stworzony %lu sekund w przyszłości (zaburzenia\n"
  "czasoprzestrzeni, lub źle ustawiony zegar systemowy)\n"
  
- #: g10/keygen.c:4662 g10/keygen.c:4846
++#: g10/keygen.c:4949 g10/keygen.c:5133
  #, fuzzy
  #| 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 ""
  "UWAGA: tworzenie podkluczy dla kluczy wersji 3 jest niezgodne z OpenPGP.\n"
  
- #: g10/keygen.c:4674 g10/keygen.c:4676
++#: g10/keygen.c:4961 g10/keygen.c:4963
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Część tajna głównego klucza jest niedostępna.\n"
  
- #: g10/keygen.c:4683 g10/keygen.c:4685
++#: g10/keygen.c:4970 g10/keygen.c:4972
  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:4704 g10/keygen.c:4860
++#: g10/keygen.c:4991 g10/keygen.c:5147
  msgid "Really create? (y/N) "
  msgstr "Czy na pewno utworzyć? (t/N) "
  
@@@ -5891,127 -4660,101 +5853,127 @@@ msgid "standalone revocation - use \"gp
  msgstr ""
  "osobny certyfikat unieważnienia - użyj ,,gpg --import'' aby go wczytać\n"
  
- #: g10/mainproc.c:1233 g10/mainproc.c:1276
++#: g10/mainproc.c:1238 g10/mainproc.c:1281
  msgid "no signature found\n"
  msgstr "nie znaleziono podpisu\n"
  
- #: g10/mainproc.c:1607
++#: g10/mainproc.c:1612
  #, c-format
  msgid "BAD signature from \"%s\""
  msgstr "NIEPOPRAWNY podpis złożony przez ,,%s''"
  
- #: g10/mainproc.c:1609
++#: g10/mainproc.c:1614
  #, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Przeterminowany podpis złożony przez ,,%s''"
  
- #: g10/mainproc.c:1611
++#: g10/mainproc.c:1616
  #, c-format
  msgid "Good signature from \"%s\""
  msgstr "Poprawny podpis złożony przez ,,%s''"
  
- #: g10/mainproc.c:1630
++#: g10/mainproc.c:1635
  msgid "signature verification suppressed\n"
  msgstr "wymuszono pominięcie sprawdzenia podpisu\n"
  
- #: g10/mainproc.c:1739
++#: g10/mainproc.c:1744
  msgid "can't handle this ambiguous signature data\n"
  msgstr "nie można obsłużyć tych wieloznacznych danych podpisu\n"
  
- #: g10/mainproc.c:1753 g10/mainproc.c:1761
++#: g10/mainproc.c:1758 g10/mainproc.c:1766
  #, c-format
  msgid "Signature made %s\n"
  msgstr "Podpisano w %s\n"
  
- #: g10/mainproc.c:1754 g10/mainproc.c:1762
++#: g10/mainproc.c:1759 g10/mainproc.c:1767
  #, c-format
  msgid "               using %s key %s\n"
  msgstr "               przy użyciu klucza %s %s\n"
  
- #: g10/mainproc.c:1766
++#: g10/mainproc.c:1771
  #, 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:1772
++#: g10/mainproc.c:1777
  #, fuzzy, c-format
  #| msgid "                aka \"%s\""
  msgid "               issuer \"%s\"\n"
  msgstr "                        alias ,,%s''"
  
- #: g10/mainproc.c:1789
++#: g10/mainproc.c:1794
  msgid "Key available at: "
  msgstr "Klucz dostępny w: "
  
- #: g10/mainproc.c:2024
++#: g10/mainproc.c:2029
  msgid "[uncertain]"
  msgstr "[niepewne]"
  
- #: g10/mainproc.c:2062
++#: g10/mainproc.c:2067
  #, c-format
  msgid "                aka \"%s\""
  msgstr "                        alias ,,%s''"
  
- #: g10/mainproc.c:2145
++#: g10/mainproc.c:2150
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "Ważność podpisu wygasła %s.\n"
  
- #: g10/mainproc.c:2149
++#: g10/mainproc.c:2154
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "Ważność podpisu wygasa %s.\n"
  
- #: g10/mainproc.c:2160
++#: g10/mainproc.c:2165
  #, fuzzy, c-format
  #| msgid "%s signature, digest algorithm %s\n"
  msgid "%s signature, digest algorithm %s%s%s\n"
  msgstr "podpis %s, skrót %s\n"
  
- #: g10/mainproc.c:2161
++#: g10/mainproc.c:2166
  msgid "binary"
  msgstr "binarny"
  
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2167
  msgid "textmode"
  msgstr "tekstowy"
  
- #: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "nieznany"
  
- #: g10/mainproc.c:2164
++#: g10/mainproc.c:2169
  #, fuzzy
  #| msgid "algorithm: %s"
  msgid ", key algorithm "
  msgstr "algorytm: %s"
  
- #: g10/mainproc.c:2199
++#: g10/mainproc.c:2204
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2229
++#: g10/mainproc.c:2234
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "Nie można sprawdzić podpisu: %s\n"
  
- #: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
++#: g10/mainproc.c:2327 g10/mainproc.c:2346 g10/mainproc.c:2470
  msgid "not a detached signature\n"
  msgstr "nie jest oddzielonym podpisem.\n"
  
- #: g10/mainproc.c:2375
++#: g10/mainproc.c:2380
  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:2384
++#: g10/mainproc.c:2389
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "oddzielony podpis klasy 0x%02x.\n"
  
- #: g10/mainproc.c:2469
++#: g10/mainproc.c:2474
  msgid "old style (PGP 2.x) signature\n"
  msgstr "podpis starego typu (PGP 2.x).\n"
  
@@@ -6315,23 -5004,18 +6277,23 @@@ msgstr "Czy zdjęcie jest w porządku? 
  msgid "unable to display photo ID!\n"
  msgstr "nie można wyświetlić zdjęcia!\n"
  
- #: g10/pkclist.c:72 g10/revoke.c:757
++#: g10/pkclist.c:72 g10/revoke.c:758
  msgid "No reason specified"
  msgstr "nie podano przyczyny"
  
- #: g10/pkclist.c:74 g10/revoke.c:759
++#: g10/pkclist.c:74 g10/revoke.c:760
  msgid "Key is superseded"
  msgstr "klucz został zastąpiony"
  
- #: g10/pkclist.c:76 g10/revoke.c:758
++#: g10/pkclist.c:76 g10/revoke.c:759
  msgid "Key has been compromised"
  msgstr "klucz został skompromitowany"
  
- #: g10/pkclist.c:78 g10/revoke.c:760
++#: g10/pkclist.c:78 g10/revoke.c:761
  msgid "Key is no longer used"
  msgstr "klucz nie jest już używany"
  
- #: g10/pkclist.c:80 g10/revoke.c:761
++#: g10/pkclist.c:80 g10/revoke.c:762
  msgid "User ID is no longer valid"
  msgstr "identyfikator użytkownika przestał być poprawny"
  
@@@ -6407,7 -5078,6 +6369,7 @@@ msgstr "
  "Minimalny poziom zaufania dla tego klucza to: %s\n"
  "\n"
  
- #: g10/pkclist.c:310 g10/revoke.c:786
++#: g10/pkclist.c:310 g10/revoke.c:787
  msgid "Your decision? "
  msgstr "Twoja decyzja? "
  
@@@ -6611,33 -5243,26 +6573,33 @@@ msgstr "
  msgid "No such user ID.\n"
  msgstr "Brak takiego identyfikatora użytkownika.\n"
  
- #: g10/pkclist.c:1197 g10/pkclist.c:1273
++#: g10/pkclist.c:1197 g10/pkclist.c:1274
  msgid "skipped: public key already set as default recipient\n"
  msgstr "pominięty: klucz publiczny już jest domyślnym adresatem\n"
  
- #: g10/pkclist.c:1218
++#: g10/pkclist.c:1219
  msgid "Public key is disabled.\n"
  msgstr "Klucz publiczny wyłączony z użycia.\n"
  
- #: g10/pkclist.c:1228
++#: g10/pkclist.c:1229
  msgid "skipped: public key already set\n"
  msgstr "pominięty: został już wybrany w innej opcji\n"
  
- #: g10/pkclist.c:1263
++#: g10/pkclist.c:1264
  #, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "nieznany domyślny adresat ,,%s''\n"
  
- #: g10/pkclist.c:1312
++#: g10/pkclist.c:1313
  msgid "no valid addressees\n"
  msgstr "brak poprawnych adresatów\n"
  
- #: g10/pkclist.c:1665
++#: g10/pkclist.c:1666
  #, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "Uwaga: klucz %s nie ma cechy %s\n"
  
- #: g10/pkclist.c:1690
++#: g10/pkclist.c:1691
  #, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "Uwaga: klucz %s nie ma preferencji dla %s\n"
@@@ -6647,29 -5271,23 +6609,29 @@@ msgid "data not saved; use option \"--o
  msgstr ""
  "dane nie zostały zapisane; aby to zrobić, należy użyć opcji \"--output\"\n"
  
- #: g10/plaintext.c:598
++#: g10/plaintext.c:614
  msgid "Detached signature.\n"
  msgstr "Podpis oddzielony od danych.\n"
  
- #: g10/plaintext.c:606
++#: g10/plaintext.c:622
  msgid "Please enter name of data file: "
  msgstr "Nazwa pliku danych: "
  
- #: g10/plaintext.c:643
++#: g10/plaintext.c:659
  msgid "reading stdin ...\n"
  msgstr "czytam strumień standardowego wejścia\n"
  
- #: g10/plaintext.c:688
++#: g10/plaintext.c:704
  msgid "no signed data\n"
  msgstr "brak podpisanych danych\n"
  
- #: g10/plaintext.c:706
++#: g10/plaintext.c:722
  #, fuzzy, c-format
  #| msgid "can't open signed data `%s'\n"
  msgid "can't open signed data '%s'\n"
  msgstr "nie można otworzyć podpisanego pliku ,,%s''\n"
  
- #: g10/plaintext.c:741
++#: g10/plaintext.c:757
  #, c-format
  msgid "can't open signed data fd=%d: %s\n"
  msgstr "nie można otworzyć podpisanych danych z fd=%d: %s\n"
@@@ -6738,7 -5342,6 +6700,7 @@@ msgstr "Dostępny jest klucz tajny.\n
  msgid "Create a designated revocation certificate for this key? (y/N) "
  msgstr "Stworzyć certyfikat unieważnienia tego klucza? (t/N) "
  
- #: g10/revoke.c:336 g10/revoke.c:727
++#: g10/revoke.c:336 g10/revoke.c:728
  msgid "ASCII armored output forced.\n"
  msgstr "wymuszono opakowanie ASCII wyniku.\n"
  
@@@ -6775,23 -5372,20 +6737,23 @@@ msgid "
  "the secret key.  However, if the secret key is still accessible,\n"
  "it is better to generate a new revocation certificate and give\n"
  "a reason for the revocation.  For details see the description of\n"
- "of the gpg command \"--gen-revoke\" in the GnuPG manual."
+ "of the gpg command \"--generate-revocation\" in the GnuPG manual."
  msgstr ""
  
- #: g10/revoke.c:575
++#: g10/revoke.c:576
  msgid ""
  "To avoid an accidental use of this file, a colon has been inserted\n"
  "before the 5 dashes below.  Remove this colon with a text editor\n"
  "before importing and publishing this revocation certificate."
  msgstr ""
  
- #: g10/revoke.c:590
++#: g10/revoke.c:591
  #, fuzzy, c-format
  #| msgid "Revocation certificate created.\n"
  msgid "revocation certificate stored as '%s.rev'\n"
  msgstr "Certyfikat unieważnienia został utworzony.\n"
  
- #: g10/revoke.c:634
++#: g10/revoke.c:635
  #, fuzzy, c-format
  #| msgid "secret key \"%s\" not found: %s\n"
  msgid "secret key \"%s\" not found\n"
@@@ -6800,22 -5394,18 +6762,22 @@@ msgstr "klucz prywatny ,,%s'' nie zosta
  #. TRANSLATORS: The %s prints a key specification which
  #. for example has been given at the command line.  Several lines
  #. lines with secret key infos are printed after this message.
- #: g10/revoke.c:661
++#: g10/revoke.c:662
  #, c-format
  msgid "'%s' matches multiple secret keys:\n"
  msgstr ""
  
- #: g10/revoke.c:688
++#: g10/revoke.c:689
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error searching the keyring: %s\n"
  msgstr "błąd tworzenia zbioru kluczy `%s': %s\n"
  
- #: g10/revoke.c:711
++#: g10/revoke.c:712
  msgid "Create a revocation certificate for this key? (y/N) "
  msgstr "Stworzyć certyfikat unieważnienia tego klucza? (t/N) "
  
- #: g10/revoke.c:735
++#: g10/revoke.c:736
  msgid ""
  "Revocation certificate created.\n"
  "\n"
@@@ -6839,33 -5429,26 +6801,33 @@@ msgstr "
  "komputerów mogą zachować treść wydruku i udostępnić ją osobom "
  "nieupoważnionym.\n"
  
- #: g10/revoke.c:769
++#: g10/revoke.c:770
  msgid "Please select the reason for the revocation:\n"
  msgstr "Proszę wybrać powód unieważnienia:\n"
  
- #: g10/revoke.c:779
++#: g10/revoke.c:780
  msgid "Cancel"
  msgstr "Anuluj"
  
- #: g10/revoke.c:781
++#: g10/revoke.c:782
  #, c-format
  msgid "(Probably you want to select %d here)\n"
  msgstr "(Prawdopodobnie chcesz tu wybrać %d)\n"
  
- #: g10/revoke.c:822
++#: g10/revoke.c:823
  msgid "Enter an optional description; end it with an empty line:\n"
  msgstr "Wprowadź opis (nieobowiązkowy) i zakończ go pustą linią:\n"
  
- #: g10/revoke.c:850
++#: g10/revoke.c:851
  #, c-format
  msgid "Reason for revocation: %s\n"
  msgstr "Powód unieważnienia: %s\n"
  
- #: g10/revoke.c:852
++#: g10/revoke.c:853
  msgid "(No description given)\n"
  msgstr "(nie podano)\n"
  
- #: g10/revoke.c:857
++#: g10/revoke.c:858
  msgid "Is this okay? (y/N) "
  msgstr "Informacje poprawne? (t/N) "
  
@@@ -7018,12 -5581,10 +6980,12 @@@ msgstr "
  "OSTRZEŻENIE: nie można rozwinąć znaczników %% w URL-u preferowanego\n"
  "           serwera kluczy (jest zbyt długi). Użyty zostanie nie rozwinięty.\n"
  
- #: g10/sign.c:329
++#: g10/sign.c:331
  #, c-format
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "podpis %s/%s złożony przez: ,,%s''\n"
  
- #: g10/sign.c:878
++#: g10/sign.c:880
  #, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -7031,11 -5592,9 +6993,11 @@@ msgstr "
  "OSTRZEŻENIE: wymuszone użycie skrótu %s (%d) kłóci się z ustawieniami "
  "adresata\n"
  
- #: g10/sign.c:1009
++#: g10/sign.c:1011
  msgid "signing:"
  msgstr "podpis:"
  
- #: g10/sign.c:1286
++#: g10/sign.c:1288
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "zostanie użyty szyfr %s\n"
@@@ -7061,7 -5616,6 +7023,7 @@@ msgstr "
  "klucz algorytmu Elgamala wygenerowany przez PGP nie zapewniający "
  "bezpiecznych podpisów!"
  
- #: g10/tdbdump.c:57 g10/trustdb.c:362
++#: g10/tdbdump.c:57 g10/trustdb.c:369
  #, 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"
@@@ -7109,7 -5655,6 +7071,7 @@@ msgstr "błąd podczas szukania zapisu 
  msgid "read error in '%s': %s\n"
  msgstr "błąd odczytu w ,,%s'': %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "baza zaufania: synchronizacja nie powiodła się %s\n"
@@@ -7257,107 -5773,107 +7219,132 @@@ msgstr "nie można obsłużyć linii te
  msgid "input line longer than %d characters\n"
  msgstr "linia dłuższa niż %d znaków\n"
  
- #: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
++#: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
  #, fuzzy, c-format
  #| msgid "error sending standard options: %s\n"
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "błąd wysyłania standardowych opcji: %s\n"
  
- #: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
++#: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:357 g10/tofu.c:699
++#: g10/tofu.c:355 g10/tofu.c:888
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:501
++#: g10/tofu.c:505
  #, fuzzy, c-format
  #| msgid "unsupported algorithm: %s"
  msgid "unsupported TOFU database version: %s\n"
  msgstr "nieobsługiwany algorytm: %s"
  
- #: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
- #: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
- #: g10/tofu.c:3056
++#: g10/tofu.c:538
+ #, fuzzy, c-format
+ #| msgid "error creating temporary file: %s\n"
+ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
+ msgstr "błąd tworzenia pliku tymczasowego: %s\n"
+ 
++#: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
+ msgid "TOFU DB error"
+ msgstr ""
+ 
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2340 g10/tofu.c:2359
++#: g10/tofu.c:2372 g10/tofu.c:2384 g10/tofu.c:2399 g10/tofu.c:2411
++#: g10/tofu.c:2980 g10/tofu.c:2997 g10/tofu.c:3033 g10/tofu.c:3050
++#: g10/tofu.c:3353
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error reading TOFU database: %s\n"
  msgstr "błąd wysyłania polecenia %s: %s\n"
  
- #: g10/tofu.c:566 g10/tofu.c:574
++#: g10/tofu.c:716 g10/tofu.c:724
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error determining TOFU database's version: %s\n"
  msgstr "błąd podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
  
- #: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
++#: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing TOFU database: %s\n"
  msgstr "%s: błąd zapisu wpisu katalogowego: %s\n"
  
- #: g10/tofu.c:765
++#: g10/tofu.c:844
+ #, fuzzy, c-format
+ #| msgid "error sending %s command: %s\n"
+ msgid "error creating 'encryptions' TOFU table: %s\n"
+ msgstr "błąd wysyłania polecenia %s: %s\n"
+ 
++#: g10/tofu.c:874
+ #, c-format
+ msgid "adding column effective_policy to bindings DB: %s\n"
+ msgstr ""
+ 
++#: g10/tofu.c:956
  #, fuzzy, c-format
  #| msgid "error opening `%s': %s\n"
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "błąd podczas otwierania ,,%s'': %s\n"
  
- #: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
++#: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error updating TOFU database: %s\n"
  msgstr "błąd wysyłania polecenia %s: %s\n"
  
- #: g10/tofu.c:1239
++#: g10/tofu.c:1328
  #, c-format
  msgid ""
  "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1247
++#: g10/tofu.c:1337
  #, c-format
- msgid "The email address \"%s\" is associated with %d keys!"
- msgstr ""
+ msgid "The email address \"%s\" is associated with %d key!"
+ msgid_plural "The email address \"%s\" is associated with %d keys!"
+ msgstr[0] ""
+ msgstr[1] ""
+ msgstr[2] ""
  
- #: g10/tofu.c:1251
++#: g10/tofu.c:1343
  msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  
- #: g10/tofu.c:1257
++#: g10/tofu.c:1349
  #, c-format
  msgid ""
  "Please indicate whether this email address should be associated with key %s "
  "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1513
++#: g10/tofu.c:1605
  #, fuzzy, c-format
  #| msgid "error getting new PIN: %s\n"
  msgid "error gathering other user IDs: %s\n"
  msgstr "błąd podczas odczytu nowego PIN-u: %s\n"
  
- #: g10/tofu.c:1523
++#: g10/tofu.c:1615
  #, fuzzy
  #| msgid "list key and user IDs"
  msgid "This key's user IDs:\n"
  msgstr "lista kluczy i identyfikatorów użytkownika"
  
- #: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
++#: g10/tofu.c:1631 g10/tofu.c:1796
  #, fuzzy, c-format
  #| msgid "validity: %s"
  msgid "policy: %s"
  msgstr "poprawność: %s"
  
- #: g10/tofu.c:1630
++#: g10/tofu.c:1722
  #, fuzzy, c-format
  #| msgid "error getting stored flags: %s\n"
  msgid "error gathering signature stats: %s\n"
  msgstr "błąd pobierania zapisanych flag: %s\n"
  
- #: g10/tofu.c:1634
++#: g10/tofu.c:1726
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
@@@ -7365,215 -5881,235 +7352,276 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:1651
++#: g10/tofu.c:1744
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1684 g10/tofu.c:1689
++#: g10/tofu.c:1785 g10/tofu.c:1790
  msgid ", "
  msgstr ""
  
- #: g10/tofu.c:1693
++#: g10/tofu.c:1794
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
  msgstr "lista kluczy"
  
- #: g10/tofu.c:1715
++#: g10/tofu.c:1820
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid "Verified %d message."
+ msgid_plural "Verified %d messages."
+ msgstr[0] "wypisanie skrótów wiadomości"
+ msgstr[1] "wypisanie skrótów wiadomości"
+ msgstr[2] "wypisanie skrótów wiadomości"
+ 
++#: g10/tofu.c:1824
+ #, fuzzy, c-format
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid "Encrypted %d message."
+ msgid_plural "Encrypted %d messages."
+ msgstr[0] "zaszyfrowane za pomocą %lu haseł\n"
+ msgstr[1] "zaszyfrowane za pomocą %lu haseł\n"
+ msgstr[2] "zaszyfrowane za pomocą %lu haseł\n"
+ 
++#: g10/tofu.c:1831
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid "Verified %d message in the future."
+ msgid_plural "Verified %d messages in the future."
+ msgstr[0] "wypisanie skrótów wiadomości"
+ msgstr[1] "wypisanie skrótów wiadomości"
+ msgstr[2] "wypisanie skrótów wiadomości"
+ 
++#: g10/tofu.c:1835
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid "Verified %d message"
- msgid_plural "Verified %d messages"
+ msgid "Encrypted %d message in the future."
+ msgid_plural "Encrypted %d messages in the future."
  msgstr[0] "wypisanie skrótów wiadomości"
  msgstr[1] "wypisanie skrótów wiadomości"
  msgstr[2] "wypisanie skrótów wiadomości"
  
- #: g10/tofu.c:1719
++#: g10/tofu.c:1849
+ #, c-format
+ msgid "Messages verified over the past %d day: %d."
+ msgid_plural "Messages verified over the past %d days: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ msgstr[2] ""
+ 
++#: g10/tofu.c:1855
+ #, c-format
+ msgid "Messages encrypted over the past %d day: %d."
+ msgid_plural "Messages encrypted over the past %d days: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ msgstr[2] ""
+ 
++#: g10/tofu.c:1865
  #, c-format
- msgid "Encrypted %d message"
- msgid_plural "Encrypted %d messages"
+ msgid "Messages verified over the past %d month: %d."
+ msgid_plural "Messages verified over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:1734
++#: g10/tofu.c:1871
  #, c-format
- msgid " over the past day."
- msgid_plural " over the past %d days."
+ msgid "Messages encrypted over the past %d month: %d."
+ msgid_plural "Messages encrypted over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:1740
++#: g10/tofu.c:1881
  #, c-format
- msgid " over the past month."
- msgid_plural " over the past %d months."
+ msgid "Messages verified over the past %d year: %d."
+ msgid_plural "Messages verified over the past %d years: %d."
  msgstr[0] ""
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:1746
++#: g10/tofu.c:1887
  #, c-format
- msgid " over the past year."
- msgid_plural " over the past %d years."
+ msgid "Messages encrypted over the past %d year: %d."
+ msgid_plural "Messages encrypted over the past %d years: %d."
  msgstr[0] ""
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:1752
- msgid " in the past."
++#: g10/tofu.c:1895
+ #, c-format
+ msgid "Messages verified in the past: %d."
  msgstr ""
  
++#: g10/tofu.c:1899
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid "Messages encrypted in the past: %d."
+ msgstr "wypisanie skrótów wiadomości"
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1767
++#: g10/tofu.c:1916
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1809
++#: g10/tofu.c:1958
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1815
++#: g10/tofu.c:1964
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1823
++#: g10/tofu.c:1972
  msgid "Defaulting to unknown."
  msgstr ""
  
- #: g10/tofu.c:1938 g10/tofu.c:2074
++#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
- #: g10/tofu.c:1994
++#: g10/tofu.c:2143
  #, fuzzy, c-format
  #| msgid "error writing key: %s\n"
  msgid "resetting keydb: %s\n"
  msgstr "błąd zapisu klucza: %s\n"
  
- #: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
- #: g10/tofu.c:2425
++#: g10/tofu.c:2601
  #, fuzzy, c-format
  #| msgid "error storing flags: %s\n"
- msgid "error setting TOFU binding's trust level to %s\n"
+ msgid "error setting TOFU binding's policy to %s\n"
  msgstr "błąd zapisywania flag: %s\n"
  
- #: g10/tofu.c:2473
++#: g10/tofu.c:2794
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "error changing TOFU policy: %s\n"
  msgstr "błąd tworzenia potoku: %s\n"
  
- #. TRANSLATORS: The tilde ('~') is used here to indicate a
- #. * non-breakable space
- #: g10/tofu.c:2574
++#: g10/tofu.c:2839
  #, c-format
- msgid "%d~year"
- msgid_plural "%d~years"
+ msgid "%lld~year"
+ msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:2583
++#: g10/tofu.c:2844
  #, c-format
- msgid "%d~month"
- msgid_plural "%d~months"
+ msgid "%lld~month"
+ msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:2592
++#: g10/tofu.c:2849
  #, c-format
- msgid "%d~day"
- msgid_plural "%d~days"
+ msgid "%lld~week"
+ msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2854
  #, c-format
- msgid "%d~hour"
- msgid_plural "%d~hours"
+ msgid "%lld~day"
+ msgid_plural "%lld~days"
  msgstr[0] ""
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:2610
++#: g10/tofu.c:2859
  #, c-format
- msgid "%d~minute"
- msgid_plural "%d~minutes"
+ msgid "%lld~hour"
+ msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:2619
++#: g10/tofu.c:2864
  #, c-format
- msgid "%d~second"
- msgid_plural "%d~seconds"
+ msgid "%lld~minute"
+ msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:2802
++#: g10/tofu.c:2866
  #, c-format
- msgid "%s: "
+ msgid "%lld~second"
+ msgid_plural "%lld~seconds"
+ msgstr[0] ""
+ msgstr[1] ""
+ msgstr[2] ""
+ 
++#: g10/tofu.c:3103
+ #, c-format
+ msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:2806
++#: g10/tofu.c:3109
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
- msgid "Verified %ld signatures"
+ msgid "%s: Verified 0 signatures."
  msgstr "%d podpisów usuniętych.\n"
  
- #: g10/tofu.c:2816
++#: g10/tofu.c:3117
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid "Verified %ld signature in the past %s"
- msgid_plural "Verified %ld signatures in the past %s"
+ msgid "%s: Verified %ld~signature in the past %s."
+ msgid_plural "%s: Verified %ld~signatures in the past %s."
  msgstr[0] "wypisanie skrótów wiadomości"
  msgstr[1] "wypisanie skrótów wiadomości"
  msgstr[2] "wypisanie skrótów wiadomości"
  
- #: g10/tofu.c:2826
- #, fuzzy, c-format
++#: g10/tofu.c:3127
+ #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
- msgid ", and encrypted %ld messages"
+ msgid "Encrypted 0 messages."
  msgstr "zaszyfrowane za pomocą %lu haseł\n"
  
- #: g10/tofu.c:2835
++#: g10/tofu.c:3135
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid ", and encrypted %ld message in the past %s"
- msgid_plural ", and encrypted %ld messages in the past %s"
+ msgid "Encrypted %ld~message in the past %s."
+ msgid_plural "Encrypted %ld~messages in the past %s."
  msgstr[0] "wypisanie skrótów wiadomości"
  msgstr[1] "wypisanie skrótów wiadomości"
  msgstr[2] "wypisanie skrótów wiadomości"
  
- #: g10/tofu.c:2880
++#: g10/tofu.c:3146
+ #, fuzzy, c-format
+ #| msgid "validity: %s"
+ msgid "(policy: %s)"
+ msgstr "poprawność: %s"
+ 
++#: g10/tofu.c:3177
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2883
++#: g10/tofu.c:3180
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2887
++#: g10/tofu.c:3184
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2890
++#: g10/tofu.c:3187
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2919
++#: g10/tofu.c:3216
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7591,19 -6127,15 +7639,19 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
- #: g10/tofu.c:3480 g10/tofu.c:3572
++#: g10/tofu.c:3298 g10/tofu.c:3449 g10/tofu.c:3627 g10/tofu.c:3670
++#: g10/tofu.c:3784 g10/tofu.c:3859 g10/tofu.c:3894
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error opening TOFU database: %s\n"
  msgstr "błąd wysyłania polecenia %s: %s\n"
  
- #: g10/tofu.c:3185
++#: g10/tofu.c:3482
  #, c-format
- msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
  msgstr ""
  
- #: g10/tofu.c:3515
++#: g10/tofu.c:3819
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7635,70 -6162,56 +7683,70 @@@ msgstr "klucz %s: brak klucza publiczne
  msgid "key %s marked as ultimately trusted\n"
  msgstr "klucz %s został oznaczony jako obdarzony absolutnym zaufaniem.\n"
  
- #: g10/trustdb.c:341
++#: g10/trustdb.c:348
  #, 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:347
++#: g10/trustdb.c:354
  #, 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:422
++#: g10/trustdb.c:429
  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:431
++#: g10/trustdb.c:438
  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:468
++#: g10/trustdb.c:475
  #, 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:474
++#: g10/trustdb.c:481
  #, c-format
  msgid "using %s trust model\n"
  msgstr "użycie modelu zaufania %s\n"
  
- #: g10/trustdb.c:511
++#: g10/trustdb.c:518
  msgid "no need for a trustdb check\n"
  msgstr "sprawdzanie bazy jest niepotrzebne\n"
  
- #: g10/trustdb.c:517 g10/trustdb.c:2160
++#: g10/trustdb.c:524 g10/trustdb.c:2187
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "następne sprawdzanie bazy odbędzie się %s\n"
  
- #: g10/trustdb.c:526
++#: g10/trustdb.c:533
  #, 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 "sprawdzanie bazy jest niepotrzebne przy modelu zaufania ,,%s''\n"
  
- #: g10/trustdb.c:542
++#: g10/trustdb.c:549
  #, 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 "aktualizacja bazy jest niepotrzebna przy modelu zaufania ,,%s''\n"
  
- #: g10/trustdb.c:749 g10/trustdb.c:1313
++#: g10/trustdb.c:756 g10/trustdb.c:1340
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "klucz publiczny %s nie odnaleziony: %s\n"
  
- #: g10/trustdb.c:966
++#: g10/trustdb.c:973
  msgid "please do a --check-trustdb\n"
  msgstr "należy uruchomić gpg z opcją ,,--check-trustdb''\n"
  
- #: g10/trustdb.c:971
++#: g10/trustdb.c:978
  msgid "checking the trustdb\n"
  msgstr "sprawdzanie bazy zaufania\n"
  
- #: g10/trustdb.c:1883
++#: g10/trustdb.c:1910
  #, fuzzy, c-format
  #| msgid "%lu keys processed so far\n"
  msgid "%d key processed"
@@@ -7707,7 -6220,6 +7755,7 @@@ msgstr[0] "%lu kluczy przetworzonych d
  msgstr[1] "%lu kluczy przetworzonych do tej chwili\n"
  msgstr[2] "%lu kluczy przetworzonych do tej chwili\n"
  
- #: g10/trustdb.c:1886
++#: g10/trustdb.c:1913
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7716,16 -6228,13 +7764,16 @@@ msgstr[0] "przetworzono %d kluczy (rozw
  msgstr[1] "przetworzono %d kluczy (rozwiązano %d przeliczeń zaufania)\n"
  msgstr[2] "przetworzono %d kluczy (rozwiązano %d przeliczeń zaufania)\n"
  
- #: g10/trustdb.c:1956
++#: g10/trustdb.c:1983
  msgid "no ultimately trusted keys found\n"
  msgstr "brak absolutnie zaufanych kluczy\n"
  
- #: g10/trustdb.c:1970
++#: g10/trustdb.c:1997
  #, 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:2087
++#: g10/trustdb.c:2114
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7733,7 -6242,6 +7781,7 @@@ msgstr "
  "poziom: %d poprawnych: %3d podpisanych: %3d zaufanie: %d-,%dq,%dn,%dm,%df,"
  "%du\n"
  
- #: g10/trustdb.c:2167
++#: g10/trustdb.c:2194
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr ""
@@@ -7848,19 -6335,14 +7896,19 @@@ msgstr "
  "Składnia: kbxutil [opcje] [pliki]\n"
  "Wypisywanie, eksport, import danych Keybox\n"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3208
++#: scd/app-nks.c:718 scd/app-openpgp.c:3221
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr "reszta RSA brakująca lub o rozmiarze innym niż %d bity\n"
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3220
++#: scd/app-nks.c:726 scd/app-openpgp.c:3233
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr "publiczny wykładnik RSA brakujący lub większy niż %d bity\n"
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
- #: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
- #: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1965 scd/app-openpgp.c:1984
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2166 scd/app-openpgp.c:2430
++#: scd/app-openpgp.c:2477 scd/app-openpgp.c:2582 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "Zapytanie zwrotne o PIN zwróciło błąd: %s\n"
@@@ -7913,85 -6386,67 +7961,85 @@@ msgstr "
  "|P|Proszę wprowadzić kod odblokowujący PIN (PUK) dla klucza do tworzenia "
  "podpisów kwalifikowanych."
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2511 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "błąd podczas odczytu nowego PIN-u: %s\n"
  
- #: scd/app-openpgp.c:806
++#: scd/app-openpgp.c:801
  #, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "nie powiódł się zapis odcisku: %s\n"
  
- #: scd/app-openpgp.c:819
++#: scd/app-openpgp.c:814
  #, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "nie powiódł się zapis daty utworzenia: %s\n"
  
- #: scd/app-openpgp.c:1236
++#: scd/app-openpgp.c:1247
  msgid "response does not contain the RSA modulus\n"
  msgstr "odpowiedź nie zawiera współczynnika RSA\n"
  
- #: scd/app-openpgp.c:1243
++#: scd/app-openpgp.c:1254
  msgid "response does not contain the RSA public exponent\n"
  msgstr "odpowiedź nie zawiera publicznego wykładnika RSA\n"
  
- #: scd/app-openpgp.c:1353
++#: scd/app-openpgp.c:1364
  #, fuzzy
  #| msgid "response does not contain the RSA public exponent\n"
  msgid "response does not contain the EC public key\n"
  msgstr "odpowiedź nie zawiera publicznego wykładnika RSA\n"
  
- #: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:1464 scd/app-openpgp.c:3825
  msgid "response does not contain the public key data\n"
  msgstr "odpowiedź nie zawiera danych klucza publicznego\n"
  
- #: scd/app-openpgp.c:1551
++#: scd/app-openpgp.c:1564
  #, c-format
  msgid "reading public key failed: %s\n"
  msgstr "odczyt klucza publicznego nie powiódł się: %s\n"
  
- #: scd/app-openpgp.c:1903
++#: scd/app-openpgp.c:1916
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr "użycie domyślnego PIN-u jako %s\n"
  
- #: scd/app-openpgp.c:1910
++#: scd/app-openpgp.c:1923
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  "nie udało się użyć domyślnego PIN-u jako %s: %s - wyłączenie dalszego "
  "domyślnego użycia\n"
  
- #: scd/app-openpgp.c:1925
++#: scd/app-openpgp.c:1938
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr "||Proszę wpisać PIN%%0A[podpisów wykonanych: %lu]"
  
- #: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
++#: scd/app-openpgp.c:1949 scd/app-openpgp.c:2424
  msgid "||Please enter the PIN"
  msgstr "||Proszę wpisać PIN"
  
- #: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2173 scd/app-openpgp.c:2437
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr "PIN dla CHV%d jest zbyt krótki; minimalna długość to %d\n"
  
- #: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
- #: scd/app-openpgp.c:4114
++#: scd/app-openpgp.c:2004 scd/app-openpgp.c:2043 scd/app-openpgp.c:2185
++#: scd/app-openpgp.c:4126
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "weryfikacja CHV%d nie powiodła się: %s\n"
  
- #: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
++#: scd/app-openpgp.c:2072 scd/app-openpgp.c:2458 scd/app-openpgp.c:4556
  msgid "error retrieving CHV status from card\n"
  msgstr "błąd podczas odczytu stanu CHV z karty\n"
  
- #: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
++#: scd/app-openpgp.c:2078 scd/app-openpgp.c:4565
  msgid "card is permanently locked!\n"
  msgstr "karta została trwale zablokowana!\n"
  
- #: scd/app-openpgp.c:2072
++#: scd/app-openpgp.c:2085
  #, fuzzy, c-format
  #| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@@ -8006,24 -6461,19 +8054,24 @@@ msgstr[2] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:2082
++#: scd/app-openpgp.c:2095
  #, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "|A|Proszę wprowadzić PIN administracyjny%%0A[pozostało prób: %d]"
  
- #: scd/app-openpgp.c:2086
++#: scd/app-openpgp.c:2099
  msgid "|A|Please enter the Admin PIN"
  msgstr "|A|Proszę wprowadzić PIN administracyjny"
  
- #: scd/app-openpgp.c:2107
++#: scd/app-openpgp.c:2120
  msgid "access to admin commands is not configured\n"
  msgstr "dostęp do poleceń administratora nie został skonfigurowany\n"
  
- #: scd/app-openpgp.c:2460
++#: scd/app-openpgp.c:2473
  msgid "||Please enter the Reset Code for the card"
  msgstr "||Proszę wprowadzić kod resetujący dla karty"
  
- #: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
++#: scd/app-openpgp.c:2483 scd/app-openpgp.c:2537
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr "Kod resetujący zbyt krótki; minimalna długość to %d\n"
@@@ -8031,79 -6481,61 +8079,79 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2493
++#: scd/app-openpgp.c:2506
  msgid "|RN|New Reset Code"
  msgstr "|RN|Nowy kod resetujący"
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|AN|New Admin PIN"
  msgstr "|AN|Nowy PIN administracyjny"
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|N|New PIN"
  msgstr "|N|Nowy PIN"
  
- #: scd/app-openpgp.c:2565
++#: scd/app-openpgp.c:2578
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "||Proszę wprowadzić PIN administracyjny i nowy PIN administracyjny"
  
- #: scd/app-openpgp.c:2566
++#: scd/app-openpgp.c:2579
  msgid "||Please enter the PIN and New PIN"
  msgstr "||Proszę wprowadzić PIN i nowy PIN"
  
- #: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
++#: scd/app-openpgp.c:2635 scd/app-openpgp.c:3885
  msgid "error reading application data\n"
  msgstr "błąd podczas odczytu danych aplikacji\n"
  
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
++#: scd/app-openpgp.c:2641 scd/app-openpgp.c:3892
  msgid "error reading fingerprint DO\n"
  msgstr "błąd podczas odczytu odcisku DO\n"
  
- #: scd/app-openpgp.c:2638
++#: scd/app-openpgp.c:2651
  msgid "key already exists\n"
  msgstr "klucz już istnieje\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2655
  msgid "existing key will be replaced\n"
  msgstr "istniejący klucz zostanie zastąpiony\n"
  
- #: scd/app-openpgp.c:2644
++#: scd/app-openpgp.c:2657
  msgid "generating new key\n"
  msgstr "generowanie nowego klucza\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2659
  msgid "writing new key\n"
  msgstr "zapisywanie nowego klucza\n"
  
- #: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
++#: scd/app-openpgp.c:3201 scd/app-openpgp.c:3553
  msgid "creation timestamp missing\n"
  msgstr "brak datownika utworzenia\n"
  
- #: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
++#: scd/app-openpgp.c:3243 scd/app-openpgp.c:3251
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr "liczba pierwsza %s RSA brakująca lub o rozmiarze innym niż %d bitów\n"
  
- #: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
++#: scd/app-openpgp.c:3384 scd/app-openpgp.c:3647
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "nie powiódł się zapis klucza: %s\n"
  
- #: scd/app-openpgp.c:3534
++#: scd/app-openpgp.c:3547
  #, fuzzy
  #| msgid "unsupported algorithm: %s"
  msgid "unsupported curve\n"
  msgstr "nieobsługiwany algorytm: %s"
  
- #: scd/app-openpgp.c:3790
++#: scd/app-openpgp.c:3802
  msgid "please wait while key is being generated ...\n"
  msgstr "proszę czekać na wygenerowanie klucza...\n"
  
- #: scd/app-openpgp.c:3798
++#: scd/app-openpgp.c:3810
  msgid "generating key failed\n"
  msgstr "generowanie klucza nie powiodło się\n"
  
- #: scd/app-openpgp.c:3804
++#: scd/app-openpgp.c:3816
  #, fuzzy, c-format
  #| msgid "key generation completed (%d seconds)\n"
  msgid "key generation completed (%d second)\n"
@@@ -8112,32 -6544,26 +8160,32 @@@ msgstr[0] "generowanie klucza zakończo
  msgstr[1] "generowanie klucza zakończone (%d sekund)\n"
  msgstr[2] "generowanie klucza zakończone (%d sekund)\n"
  
- #: scd/app-openpgp.c:3838
++#: scd/app-openpgp.c:3850
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "niepoprawna struktura karty OpenPGP (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:3900
  msgid "fingerprint on card does not match requested one\n"
  msgstr "odcisk na karcie nie zgadza się z żądanym\n"
  
- #: scd/app-openpgp.c:4004
++#: scd/app-openpgp.c:4016
  #, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "karta nie obsługuje algorytmu skrótu %s\n"
  
- #: scd/app-openpgp.c:4089
++#: scd/app-openpgp.c:4101
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "dotychczas stworzono podpisów: %lu\n"
  
- #: scd/app-openpgp.c:4551
++#: scd/app-openpgp.c:4570
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  "weryfikacja PIN-u administracyjnego tym poleceniem jest aktualnie "
  "zabroniona\n"
  
- #: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
++#: scd/app-openpgp.c:4871 scd/app-openpgp.c:4882
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "nie można dostać się do %s - niepoprawna karta OpenPGP?\n"
@@@ -8157,7 -6580,6 +8205,7 @@@ msgstr "|N|Początkowy nowy PIN
  msgid "run in multi server mode (foreground)"
  msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|POZIOM|ustawienie POZIOMU diagnostyki"
  
@@@ -8197,13 -6610,11 +8245,13 @@@ msgstr "zabronienie używania poleceń 
  msgid "use variable length input for pinpad"
  msgstr "użycie wejścia z klawiatury czytnika o zmiennej długości"
  
- #: scd/scdaemon.c:287
++#: scd/scdaemon.c:286
  #, fuzzy
  #| msgid "Usage: gpgconf [options] (-h for help)"
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Wywołanie: gpgconf [opcje] (-h podaje pomoc)"
  
- #: scd/scdaemon.c:289
++#: scd/scdaemon.c:288
  #, fuzzy
  #| msgid ""
  #| "Syntax: scdaemon [options] [command [args]]\n"
@@@ -8215,19 -6626,16 +8263,19 @@@ msgstr "
  "Składnia: scdaemon [opcje] [polecenie [argumenty]]\n"
  "Demon kart procesorowych dla GnuPG\n"
  
- #: scd/scdaemon.c:786
++#: scd/scdaemon.c:784
  #, fuzzy
  #| 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 "proszę użyć opcji ,,--daemon'' do uruchomienia programu w tle\n"
  
- #: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1904
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "obsługa fd %d uruchomiona\n"
  
- #: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
++#: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1909
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "obsługa fd %d zakończona\n"
@@@ -8309,9 -6701,6 +8357,9 @@@ msgid "dirmngr cache-only key lookup fa
  msgstr ""
  "wyszukiwanie klucza tylko w pamięci podręcznej dirmngr nie powiodło się: %s\n"
  
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
 +#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  msgid "failed to allocate keyDB handle\n"
  msgstr "nie udało się przydzielić uchwytu keyDB\n"
  
@@@ -8803,11 -7090,9 +8851,11 @@@ msgstr "
  msgid "resource problem: out of core\n"
  msgstr "problem z zasobami: brak pamięci\n"
  
- #: sm/decrypt.c:330
++#: sm/decrypt.c:332
  msgid "(this is the RC2 algorithm)\n"
  msgstr "(to jest algorytm RC2)\n"
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:334
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr "(to nie wygląda na zaszyfrowaną wiadomość)\n"
  
@@@ -8851,117 -7128,89 +8899,117 @@@ msgstr "wypisanie kluczy zewnętrznych
  msgid "list certificate chain"
  msgstr "wypisanie łańcucha certyfikatów"
  
- #: sm/gpgsm.c:218
++#: sm/gpgsm.c:219
  msgid "import certificates"
  msgstr "import certyfikatów"
  
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
  msgid "export certificates"
  msgstr "eksport certyfikatów"
  
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:228
  msgid "register a smartcard"
  msgstr "zarejestrowanie karty procesorowej"
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:231
  msgid "pass a command to the dirmngr"
  msgstr "przekazanie polecenia do dirmngr"
  
- #: sm/gpgsm.c:232
++#: sm/gpgsm.c:233
  msgid "invoke gpg-protect-tool"
  msgstr "wywołanie gpg-protect-tool"
  
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:250
  msgid "create base-64 encoded output"
  msgstr "tworzenie wyjścia zakodowanego base-64"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in PEM format"
  msgstr "przyjęcie wejścia w formacie PEM"
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in base-64 format"
  msgstr "przyjęcie wejścia w formacie base-64"
  
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:262
  msgid "assume input is in binary format"
  msgstr "przyjęcie wejścia w formacie binarnym"
  
- #: sm/gpgsm.c:267
++#: sm/gpgsm.c:269
  msgid "never consult a CRL"
  msgstr "pominięcie CRL"
  
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:279
  msgid "check validity using OCSP"
  msgstr "sprawdzenie poprawności przy użyciu OCSP"
  
- #: sm/gpgsm.c:282
++#: sm/gpgsm.c:284
  msgid "|N|number of certificates to include"
  msgstr "|N|liczba certyfikatów do dołączenia"
  
- #: sm/gpgsm.c:285
++#: sm/gpgsm.c:287
  msgid "|FILE|take policy information from FILE"
  msgstr "|PLIK|pobranie informacji o polityce z PLIKU"
  
- #: sm/gpgsm.c:288
++#: sm/gpgsm.c:290
  msgid "do not check certificate policies"
  msgstr "nie sprawdzanie polityk certyfikatów"
  
- #: sm/gpgsm.c:292
++#: sm/gpgsm.c:294
  msgid "fetch missing issuer certificates"
  msgstr "pobranie brakujących certyfikatów wystawców"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "don't use the terminal at all"
  msgstr "nie używanie w ogóle terminala"
  
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:307
  msgid "|FILE|write a server mode log to FILE"
  msgstr "|PLIK|zapisanie logów trybu serwerowego do PLIKU"
  
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:312
  msgid "|FILE|write an audit log to FILE"
  msgstr "|PLIK|zapisanie logów audytowych do PLIKU"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "batch mode: never ask"
  msgstr "tryb wsadowy: bez żadnych pytań"
  
- #: sm/gpgsm.c:314
++#: sm/gpgsm.c:316
  msgid "assume yes on most questions"
  msgstr "przyjęcie odpowiedzi ,,tak'' na większość pytań"
  
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:317
  msgid "assume no on most questions"
  msgstr "przyjęcie odpowiedzi ,,nie'' na większość pytań"
  
- #: sm/gpgsm.c:318
++#: sm/gpgsm.c:320
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "|PLIK|dodanie tego zbioru kluczy do listy zbiorów kluczy"
  
- #: sm/gpgsm.c:321
++#: sm/gpgsm.c:323
  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:331 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|SPEC|użycie tego serwera do wyszukiwania kluczy"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|NAZWA|użycie tego algorytmu szyfrowania NAZWA"
  
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:352
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|NAZWA|użycie tego algorytmu skrótu wiadomości"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:559
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
  msgstr "Wywołanie: gpg [opcje] [pliki] (-h podaje pomoc)"
  
- #: sm/gpgsm.c:570
++#: sm/gpgsm.c:562
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpgsm [options] [files]\n"
@@@ -8977,50 -7226,41 +9025,50 @@@ msgstr "
  "S/MIME\n"
  "Domyślnie wykonywana operacja zależy od danych wejściowych\n"
  
- #: sm/gpgsm.c:774
++#: sm/gpgsm.c:766
  #, 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 "UWAGA: nie można zaszyfrować do ,,%s'': %s\n"
  
- #: sm/gpgsm.c:785
++#: sm/gpgsm.c:777
  #, fuzzy, c-format
  #| msgid "unknown validation model `%s'\n"
  msgid "unknown validation model '%s'\n"
  msgstr "nieznany model poprawności ,,%s''\n"
  
- #: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
  #, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "%s:%u: nie podano nazwy hosta\n"
  
- #: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr "%s:%u: podano hasło bez użytkownika\n"
  
- #: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
  #, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr "%s:%u: linia pominięta\n"
  
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1427
  msgid "could not parse keyserver\n"
  msgstr "niezrozumiały adres serwera kluczy\n"
  
- #: sm/gpgsm.c:1636
++#: sm/gpgsm.c:1630
  #, fuzzy, c-format
  #| msgid "importing common certificates `%s'\n"
  msgid "importing common certificates '%s'\n"
  msgstr "import wspólnych certyfikatów ,,%s''\n"
  
- #: sm/gpgsm.c:1677
++#: sm/gpgsm.c:1671
  #, fuzzy, c-format
  #| msgid "can't sign using `%s': %s\n"
  msgid "can't sign using '%s': %s\n"
  msgstr "nie można podpisać z użyciem ,,%s'': %s\n"
  
- #: sm/gpgsm.c:2033
++#: sm/gpgsm.c:2028
  msgid "invalid command (there is no implicit command)\n"
  msgstr "błędne polecenie (nie ma polecenia domyślnego)\n"
  
@@@ -9852,8 -7941,6 +9900,8 @@@ msgstr "
  msgid "CRL access not possible due to disabled %s\n"
  msgstr ""
  
 +#: dirmngr/crlfetch.c:223 dirmngr/ldap-wrapper-ce.c:488
- #: dirmngr/ldap-wrapper.c:742 dirmngr/misc.c:563
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:563
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
@@@ -10055,127 -8106,99 +10103,127 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:160
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:158
++#: dirmngr/dirmngr.c:161
  #, fuzzy
  #| msgid "|FILE|run commands from FILE on startup"
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|PLIK|uruchomienie poleceń z PLIKU przy starcie"
  
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:162
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:163
  #, fuzzy
  #| msgid "pass a command to the dirmngr"
  msgid "shutdown the dirmngr"
  msgstr "przekazanie polecenia do dirmngr"
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:164
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
- #: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
++#: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|PLIK|zapisanie logów trybu serwerowego do PLIKu"
  
- #: dirmngr/dirmngr.c:177
++#: dirmngr/dirmngr.c:180
  #, fuzzy
  #| msgid "Quit without saving? (y/N) "
  msgid "run without asking a user"
  msgstr "Wyjść bez zapisania zmian? (t/N) "
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:181
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:182
  #, fuzzy
  #| msgid "allow PKA lookups (DNS requests)"
  msgid "allow sending OCSP requests"
  msgstr "zezwolenie na wyszukiwania PKA (żądania DNS)"
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:184
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:185
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:186
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:188
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:192
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:202
  #, fuzzy
  #| msgid "|FILE|read options from FILE"
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|PLIK|odczyt opcji z PLIKU"
  
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
  #, fuzzy
  #| msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  "|N|ustawienie maksymalnego czasu życia pamięci podręcznej PIN-ów na N sekund"
  
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:210
  #, fuzzy
  #| msgid "|URL|use keyserver at URL"
  msgid "|URL|use OCSP responder at URL"
  msgstr "|URL|używaj serwera kluczy URL"
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:212
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:218
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:220
++#: dirmngr/dirmngr.c:223
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:225
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:240
++#: dirmngr/dirmngr.c:246
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -10188,13 -8211,11 +10236,13 @@@ msgstr "
  "@\n"
  "(Pełną listę poleceń i opcji można znaleźć w podręczniku systemowym.)\n"
  
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:361
  #, fuzzy
  #| msgid "Usage: gpgconf [options] (-h for help)"
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Wywołanie: gpgconf [opcje] (-h podaje pomoc)"
  
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:363
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -10206,88 -8227,71 +10254,88 @@@ msgstr "
  "Składnia: gpg-agent [opcje] [polecenie [argumenty]]\n"
  "Zarządzanie kluczem tajnym dla GnuPG\n"
  
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:443
  #, fuzzy, c-format
  #| msgid "invalid debug-level `%s' given\n"
  msgid "valid debug levels are: %s\n"
  msgstr "podano błędny poziom diagnostyki ,,%s''\n"
  
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
- #: tools/gpgconf.c:648
++#: dirmngr/dirmngr.c:496 tools/gpgconf.c:550 tools/gpgconf.c:585
++#: tools/gpgconf.c:656
  #, fuzzy, c-format
  #| msgid "usage: gpgsm [options] "
  msgid "usage: %s [options] "
  msgstr "wywołanie: gpgsm [opcje]"
  
- #: dirmngr/dirmngr.c:1062
++#: dirmngr/dirmngr.c:1074
  #, fuzzy
  #| msgid "%s not allowed with %s!\n"
  msgid "colons are not allowed in the socket name\n"
  msgstr "Nie wolno używać %s z %s!\n"
  
- #: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
++#: dirmngr/dirmngr.c:1300 dirmngr/server.c:1585
  #, fuzzy, c-format
  #| msgid "renaming `%s' to `%s' failed: %s\n"
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "zmiana nazwy ,,%s'' na ,,%s'' nie powiodła się: %s\n"
  
- #: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
++#: dirmngr/dirmngr.c:1306 dirmngr/server.c:1591
  #, fuzzy, c-format
  #| msgid "conversion from `%s' to `%s' failed: %s\n"
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "konwersja z ,,%s'' do ,,%s'' nie powiodła się: %s\n"
  
- #: dirmngr/dirmngr.c:1484
++#: dirmngr/dirmngr.c:1487
  #, fuzzy, c-format
  #| msgid "line too long - skipped\n"
  msgid "%s:%u: line too long - skipped\n"
  msgstr "linia zbyt długa - pominięta\n"
  
- #: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
++#: dirmngr/dirmngr.c:1542 dirmngr/dirmngr.c:1626
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "niewłaściwy odcisk"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
++#: dirmngr/dirmngr.c:1578 dirmngr/dirmngr.c:1604 tools/gpgconf-comp.c:4032
  #, fuzzy, c-format
  #| msgid "read error in `%s': %s\n"
  msgid "%s:%u: read error: %s\n"
  msgstr "błąd odczytu w ,,%s'': %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1633
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1700
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1734
++#: dirmngr/dirmngr.c:1738
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1739
++#: dirmngr/dirmngr.c:1743
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1745
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1746
++#: dirmngr/dirmngr.c:1750
  #, fuzzy
  #| msgid "not forced"
  msgid "shutdown forced\n"
  msgstr "nie wymuszono"
  
- #: dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1758
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1761
++#: dirmngr/dirmngr.c:1765
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10815,36 -8720,30 +10863,36 @@@ msgstr "select nie powiodło się: %s\n
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2463
++#: dirmngr/server.c:2469
  #, fuzzy, c-format
  #| msgid "cannot allocate outfile string: %s\n"
  msgid "can't allocate control structure: %s\n"
  msgstr "nie można przydzielić łańcucha pliku wyjściowego: %s\n"
  
- #: dirmngr/server.c:2474
++#: dirmngr/server.c:2480
  #, fuzzy, c-format
  #| msgid "failed to create stream from socket: %s\n"
  msgid "failed to allocate assuan context: %s\n"
  msgstr "nie udało się utworzyć strumienia z gniazda: %s\n"
  
- #: dirmngr/server.c:2495
++#: dirmngr/server.c:2501
  #, fuzzy, c-format
  #| msgid "failed to initialize the TrustDB: %s\n"
  msgid "failed to initialize the server: %s\n"
  msgstr "inicjowanie Bazy Zaufania nie powiodło się: %s\n"
  
- #: dirmngr/server.c:2503
++#: dirmngr/server.c:2509
  #, fuzzy, c-format
  #| msgid "failed to store the creation date: %s\n"
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "nie powiódł się zapis daty utworzenia: %s\n"
  
- #: dirmngr/server.c:2534
++#: dirmngr/server.c:2540
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2553
++#: dirmngr/server.c:2559
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
@@@ -10900,7 -8790,6 +10948,7 @@@ msgstr "
  msgid "certificate should not have been used for CRL signing\n"
  msgstr "certyfikat nie powinien być używany do podpisywania\n"
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:167
  msgid "quiet"
  msgstr "cicho"
  
@@@ -11002,22 -8871,15 +11050,22 @@@ msgstr "wysyłanie linii nie powiodło 
  msgid "error sending standard options: %s\n"
  msgstr "błąd wysyłania standardowych opcji: %s\n"
  
 +#: tools/gpgconf-comp.c:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
- #: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
++#: tools/gpgconf-comp.c:766 tools/gpgconf-comp.c:865
  msgid "Options controlling the diagnostic output"
  msgstr "Opcje sterujące wyjściem diagnostycznym"
  
 +#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
- #: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
++#: tools/gpgconf-comp.c:779 tools/gpgconf-comp.c:888
  msgid "Options controlling the configuration"
  msgstr "Opcje sterujące konfiguracją"
  
- #: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
- #: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
++#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:723
++#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:901
  msgid "Options useful for debugging"
  msgstr "Opcje przydatne do diagnostyki"
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
  msgid "Options controlling the security"
  msgstr "Opcje sterujące bezpieczeństwem"
  
@@@ -11069,11 -8920,9 +11117,11 @@@ msgid "|N|set the Pinentry timeout to 
  msgstr ""
  "|N|ustawienie maksymalnego czasu życia pamięci podręcznej PIN-ów na N sekund"
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
++#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
  msgid "|NAME|use NAME as default secret key"
  msgstr "|NAZWA|użycie NAZWY jako domyślnego klucza tajnego"
  
- #: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
++#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:784
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NAZWA|szyfrowanie także dla odbiorcy NAZWA"
  
@@@ -11081,188 -8929,162 +11129,206 @@@
  msgid "|SPEC|set up email aliases"
  msgstr "|SPEC|określ adres email"
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
++#: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
  msgid "Configuration for Keyservers"
  msgstr "Konfiguracja dla serwerów kluczy"
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
++#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
  msgid "|URL|use keyserver at URL"
  msgstr "|URL|używaj serwera kluczy URL"
  
- #: tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:741
  msgid "allow PKA lookups (DNS requests)"
  msgstr "zezwolenie na wyszukiwania PKA (żądania DNS)"
  
- #: tools/gpgconf-comp.c:738
++#: tools/gpgconf-comp.c:744
  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:787
++#: tools/gpgconf-comp.c:793
  msgid "disable all access to the dirmngr"
  msgstr "zablokuj dostęp do dirmngr"
  
- #: tools/gpgconf-comp.c:790
++#: tools/gpgconf-comp.c:796
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
  msgstr "|NAZWA|użycie kodowania NAZWA dla haseł PKCS#12"
  
- #: tools/gpgconf-comp.c:820
++#: tools/gpgconf-comp.c:829
  msgid "do not check CRLs for root certificates"
  msgstr "nie sprawdzanie CRL dla głównych certyfikatów"
  
- #: tools/gpgconf-comp.c:869
++#: tools/gpgconf-comp.c:878
  msgid "Options controlling the format of the output"
  msgstr "Opcje sterujące formatem wyjścia"
  
- #: tools/gpgconf-comp.c:905
++#: tools/gpgconf-comp.c:920
  msgid "Options controlling the interactivity and enforcement"
  msgstr "Opcje sterujące interaktywnością i wymuszaniem"
  
- #: tools/gpgconf-comp.c:918
++#: tools/gpgconf-comp.c:933
  #, fuzzy
  #| msgid "Options controlling the security"
  msgid "Options controlling the use of Tor"
  msgstr "Opcje sterujące bezpieczeństwem"
  
- #: tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:947
  msgid "Configuration for HTTP servers"
  msgstr "Konfiguracja dla serwerów HTTP"
  
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:958
  msgid "use system's HTTP proxy setting"
  msgstr "użycie systemowego ustawienia proxy HTTP"
  
- #: tools/gpgconf-comp.c:948
++#: tools/gpgconf-comp.c:963
  msgid "Configuration of LDAP servers to use"
  msgstr "Konfiguracja używanych serwerów LDAP"
  
- #: tools/gpgconf-comp.c:977
++#: tools/gpgconf-comp.c:992
  msgid "LDAP server list"
  msgstr "lista serwerów LDAP"
  
- #: tools/gpgconf-comp.c:985
++#: tools/gpgconf-comp.c:1000
  msgid "Configuration for OCSP"
  msgstr "Konfiguracja dla OCSP"
  
- #: tools/gpgconf-comp.c:1066
++#: tools/gpgconf-comp.c:1081
  msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1067
++#: tools/gpgconf-comp.c:1082
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1083
  msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1069
++#: tools/gpgconf-comp.c:1084
  msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1070
++#: tools/gpgconf-comp.c:1085
  msgid "Network"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1071
++#: tools/gpgconf-comp.c:1086
  #, fuzzy
  #| msgid "Bad Passphrase"
  msgid "Passphrase Entry"
  msgstr "Niepoprawne hasło"
  
- #: tools/gpgconf-comp.c:1225
++#: tools/gpgconf-comp.c:1240
  #, fuzzy
  #| msgid "Component not found"
  msgid "Component not suitable for launching"
  msgstr "Nie znaleziono komponentu"
  
- #: tools/gpgconf-comp.c:3283
++#: tools/gpgconf-comp.c:3311
  #, c-format
  msgid "External verification of component %s failed"
  msgstr "Zewnętrzna weryfikacja komponentu %s nie powiodła się"
  
- #: tools/gpgconf-comp.c:3434
++#: tools/gpgconf-comp.c:3462
  msgid "Note that group specifications are ignored\n"
  msgstr "Uwaga, określenia grup są ignorowane\n"
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf-comp.c:4036
+ #, fuzzy, c-format
+ #| msgid "error closing %s: %s\n"
+ msgid "error closing '%s'\n"
+ msgstr "błąd zamykania %s: %s\n"
+ 
++#: tools/gpgconf-comp.c:4038
+ #, fuzzy, c-format
+ #| msgid "error in `%s': %s\n"
+ msgid "error parsing '%s'\n"
+ msgstr "błąd w ,,%s'': %s\n"
+ 
++#: tools/gpgconf.c:73
  msgid "list all components"
  msgstr "lista wszystkich komponentów"
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "check all programs"
  msgstr "sprawdzenie wszystkich programów"
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|list options"
  msgstr "|KOMPONENT|wypisanie opcji"
  
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
  msgid "|COMPONENT|change options"
  msgstr "|KOMPONENT|zmiana opcji"
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "|COMPONENT|check options"
  msgstr "|KOMPONENT|zaznaczenie opcji"
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "apply global default values"
  msgstr "zastosowanie globalnych wartości domyślnych"
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
+ #, fuzzy
+ #| msgid "|FILE|take policy information from FILE"
+ msgid "|FILE|update configuration files using FILE"
+ msgstr "|PLIK|pobranie informacji o polityce z PLIKU"
+ 
++#: tools/gpgconf.c:83
  #, fuzzy
  #| msgid "get the configuration directories for gpgconf"
  msgid "get the configuration directories for @GPGCONF@"
  msgstr "katalogi konfiguracyjne programu gpgconf"
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:85
  msgid "list global configuration file"
  msgstr "wyświetl globalny plik konfiguracyjny"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  msgid "check global configuration file"
  msgstr "sprawdzenie globalnego pliku konfiguracyjnego"
  
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:89
  #, fuzzy
  #| msgid "update the trust database"
  msgid "query the software version database"
  msgstr "uaktualnienie bazy zaufania"
  
- #: tools/gpgconf.c:86
++#: tools/gpgconf.c:90
  #, fuzzy
  #| msgid "list all components"
  msgid "reload all or a given component"
  msgstr "lista wszystkich komponentów"
  
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:91
  #, fuzzy
  #| msgid "list all components"
  msgid "launch a given component"
  msgstr "lista wszystkich komponentów"
  
- #: tools/gpgconf.c:88
++#: tools/gpgconf.c:92
  #, fuzzy
  #| msgid "list all components"
  msgid "kill a given component"
  msgstr "lista wszystkich komponentów"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "use as output file"
  msgstr "plik wyjściowy"
  
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:102
  msgid "activate changes at runtime, if possible"
  msgstr "uaktywnienie zmian w czasie działania o ile to możliwe"
  
- #: tools/gpgconf.c:122
++#: tools/gpgconf.c:127
  #, fuzzy
  #| msgid "Usage: gpgconf [options] (-h for help)"
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "Wywołanie: gpgconf [opcje] (-h podaje pomoc)"
  
- #: tools/gpgconf.c:125
++#: tools/gpgconf.c:130
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpgconf [options]\n"
@@@ -11274,15 -9096,12 +11340,15 @@@ msgstr "
  "Składnia: gpgconf [opcje]\n"
  "Zarządzanie opcjami konfiguracji dla narzędzi z systemu GnuPG\n"
  
- #: tools/gpgconf.c:545 tools/gpgconf.c:579
++#: tools/gpgconf.c:552 tools/gpgconf.c:587
  msgid "Need one component argument"
  msgstr "Wymagany jest jeden argument komponentu"
  
- #: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
++#: tools/gpgconf.c:561 tools/gpgconf.c:599 tools/gpgconf.c:632
  msgid "Component not found"
  msgstr "Nie znaleziono komponentu"
  
- #: tools/gpgconf.c:650
++#: tools/gpgconf.c:658
  msgid "No argument allowed"
  msgstr "Argument nie jest dozwolony"
  
diff --cc po/pt.po
index ea2da07,733f8bf..d3b09d1
--- a/po/pt.po
+++ b/po/pt.po
@@@ -9,7 -9,6 +9,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-11-18 16:54+0100\n"
++"POT-Creation-Date: 2016-12-20 11:28+0100\n"
  "PO-Revision-Date: 2015-02-11 19:17+0100\n"
  "Last-Translator: Pedro Morais <morais at kde.org>\n"
  "Language-Team: pt <morais at kde.org>\n"
@@@ -158,25 -129,11 +158,25 @@@ msgstr "frase secreta incorrecta
  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:838 common/dotlock.c:839 g10/card-util.c:839
- #: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1306 g10/keygen.c:4577
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
++#: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't create '%s': %s\n"
  msgstr "impossível criar `%s': %s\n"
  
 +#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
- #: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1307
++#: g10/import.c:305 g10/import.c:448 g10/import.c:621 g10/keygen.c:3681
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
- #: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
- #: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:825 g10/sign.c:1025
++#: g10/sign.c:1130 g10/sign.c:1275 g10/tdbdump.c:143 g10/tdbdump.c:151
++#: g10/tdbio.c:720 g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161
++#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
++#: dirmngr/certcache.c:368 dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1564
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
@@@ -239,11 -185,9 +239,11 @@@ msgstr "Por favor digite a frase secret
  msgid "failed to create stream from socket: %s\n"
  msgstr "%s: falha ao criar tabela de dispersão: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1100
++#: agent/divert-scd.c:92 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1101
++#: agent/divert-scd.c:93 g10/call-agent.c:1102
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  
@@@ -386,48 -304,33 +386,48 @@@ msgstr "
  "Opções:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
  #, fuzzy
  #| msgid "Key is superseded"
  msgid "run in supervised mode"
  msgstr "A chave foi substituída"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:170 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "detalhado"
  
 +#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "ser mais silencioso"
  
- #: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
  msgid "csh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
- #: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
++#: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
  #, fuzzy
  msgid "|FILE|read options from FILE"
  msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
  
- #: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:177
  msgid "do not detach from the console"
  msgstr ""
  
@@@ -514,161 -400,119 +514,161 @@@ msgstr "não suportado
  #. 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:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:481 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1025 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:358
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:124 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  #, fuzzy
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr "Por favor comunique bugs para <gnupg-bugs at gnu.org>.\n"
  
- #: agent/gpg-agent.c:491
++#: agent/gpg-agent.c:490
  #, fuzzy
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
  
- #: agent/gpg-agent.c:493
++#: agent/gpg-agent.c:492
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:537 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:442
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:793
++#: agent/gpg-agent.c:1082 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:812
  #, 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"
  
- #: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
- #: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1093 agent/gpg-agent.c:1935 g10/gpg.c:2510
++#: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:817
++#: dirmngr/dirmngr.c:1670 tools/symcryptrun.c:932
  #, fuzzy, c-format
  #| msgid "option file `%s': %s\n"
  msgid "option file '%s': %s\n"
  msgstr "ficheiro de opções `%s': %s\n"
  
- #: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:806
++#: agent/gpg-agent.c:1101 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:825
  #, 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:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
- #: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
++#: agent/gpg-agent.c:1223 g10/gpg.c:3643 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:936 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:527
  #, 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:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
++#: agent/gpg-agent.c:2080 scd/scdaemon.c:1073 dirmngr/dirmngr.c:1081
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
  msgstr "impossível criar %s: %s\n"
  
- #: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
++#: agent/gpg-agent.c:2097 scd/scdaemon.c:1086 dirmngr/dirmngr.c:1094
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2134
++#: agent/gpg-agent.c:2135
  #, fuzzy
  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:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
++#: agent/gpg-agent.c:2145 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1126
  #, fuzzy
  msgid "error getting nonce for the socket\n"
  msgstr "erro na criação da frase secreta: %s\n"
  
- #: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
++#: agent/gpg-agent.c:2150 scd/scdaemon.c:1113 dirmngr/dirmngr.c:1129
  #, fuzzy, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "erro ao enviar para `%s': %s\n"
  
- #: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
- #: dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2160 agent/gpg-agent.c:2197 scd/scdaemon.c:1121
++#: dirmngr/dirmngr.c:1138
  #, 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:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:2165 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1143
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
  msgstr "actualização falhou: %s\n"
  
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
++#: agent/gpg-agent.c:2172 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1149
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
  msgstr "a escrever chave privada para `%s'\n"
  
- #: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: agent/gpg-agent.c:2191 agent/gpg-agent.c:2234 g10/exec.c:199
 +#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, fuzzy, c-format
  msgid "can't create directory '%s': %s\n"
  msgstr "%s: impossível criar directoria: %s\n"
  
- #: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: agent/gpg-agent.c:2194 agent/gpg-agent.c:2239 g10/openfile.c:491
 +#: g10/openfile.c:520 sm/keydb.c:103
  #, fuzzy, c-format
  msgid "directory '%s' created\n"
  msgstr "%s: directoria criada\n"
  
- #: agent/gpg-agent.c:2244
++#: agent/gpg-agent.c:2245
  #, 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:2248
++#: agent/gpg-agent.c:2249
  #, fuzzy, c-format
  msgid "can't use '%s' as home directory\n"
  msgstr "%s: impossível criar directoria: %s\n"
  
- #: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
++#: agent/gpg-agent.c:2392 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1871
  #, fuzzy, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "erro na leitura de `%s': %s\n"
  
- #: agent/gpg-agent.c:2598
++#: agent/gpg-agent.c:2599
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2603
++#: agent/gpg-agent.c:2604
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2678
++#: agent/gpg-agent.c:2679
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2683
++#: agent/gpg-agent.c:2684
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
++#: agent/gpg-agent.c:2881 scd/scdaemon.c:1272 dirmngr/dirmngr.c:2075
  #, fuzzy, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "actualização da chave secreta falhou: %s\n"
  
- #: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2954 scd/scdaemon.c:1321
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
  msgstr "%s: ignorado: %s\n"
  
- #: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
++#: agent/gpg-agent.c:3092 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  #, fuzzy
  msgid "no gpg-agent running in this session\n"
  msgstr "o gpg-agent não está disponível nesta sessão\n"
@@@ -684,8 -526,6 +684,8 @@@ msgid "
  "Password cache maintenance\n"
  msgstr ""
  
- #: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
++#: agent/protect-tool.c:106 g10/gpg.c:424 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:153 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -693,9 -533,6 +693,9 @@@ msgstr "
  "@Comandos:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
- #: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:92 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:168 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -749,8 -578,6 +749,8 @@@ 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:362 dirmngr/dirmngr.c:1469
- #: tools/gpgconf.c:323
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1472
++#: tools/gpgconf.c:328
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
  msgstr "erro na leitura de `%s': %s\n"
@@@ -920,9 -718,6 +920,9 @@@ msgstr "algoritmo de protecção %d%s 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:438
 +#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
- #: dirmngr/ldap-wrapper.c:710
++#: dirmngr/ldap-wrapper.c:711
  #, fuzzy, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "erro na criação da frase secreta: %s\n"
@@@ -934,8 -726,6 +934,8 @@@
  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:848 dirmngr/dirmngr.c:1155
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1167
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
  msgstr "erro na leitura de `%s': %s\n"
@@@ -982,27 -763,22 +982,27 @@@ msgstr "impossível ligar a `%s': %s\n
  msgid "problem setting the gpg-agent options\n"
  msgstr "problema com o agente: o agente returnou 0x%lx\n"
  
- #: common/sysutils.c:144
++#: common/sysutils.c:148
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "impossível desactivar core dumps: %s\n"
  
- #: common/sysutils.c:239
++#: common/sysutils.c:250
  #, fuzzy, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
  
- #: common/sysutils.c:271
++#: common/sysutils.c:282
  #, fuzzy, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
  
- #: common/sysutils.c:659
++#: common/sysutils.c:693
  #, fuzzy, c-format
  msgid "waiting for file '%s' to become accessible ...\n"
  msgstr "actualização falhou: %s\n"
  
- #: common/sysutils.c:685
++#: common/sysutils.c:719
  #, fuzzy, c-format
  msgid "renaming '%s' to '%s' failed: %s\n"
  msgstr "criação de armadura falhou: %s\n"
@@@ -1079,7 -840,6 +1079,7 @@@ msgstr "
  msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
  msgstr "AVISO: \"%s\" é uma opção depreciada\n"
  
- #: common/miscellaneous.c:554
++#: common/miscellaneous.c:556
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
@@@ -1194,8 -931,6 +1194,8 @@@ msgstr "%s: porta-chaves criado\n
  msgid "algorithm: %s"
  msgstr "armadura: %s\n"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3098
++#: scd/app-openpgp.c:3111
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
@@@ -1407,7 -1100,6 +1407,7 @@@ msgstr "
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr ""
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1173
++#: common/argparse.c:401 dirmngr/dirmngr.c:1185
  #, fuzzy
  msgid "out of core\n"
  msgstr "não processado"
@@@ -1466,8 -1147,6 +1466,8 @@@ msgstr "chave pública %08lX não encon
  msgid "waiting for lock %s...\n"
  msgstr "a escrever chave privada para `%s'\n"
  
- #: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
- #: dirmngr/dirmngr.c:715
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:725
++#: dirmngr/dirmngr.c:734
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
@@@ -1507,7 -1178,6 +1507,7 @@@ msgstr "armadura inesperada:
  msgid "invalid dash escaped line: "
  msgstr "linha com hífen inválida: "
  
- #: g10/armor.c:873 g10/armor.c:1490
++#: g10/armor.c:873 g10/armor.c:1493
  #, fuzzy, c-format
  msgid "invalid radix64 character %02X skipped\n"
  msgstr "caracter radix64 inválido %02x ignorado\n"
@@@ -1524,7 -1191,6 +1524,7 @@@ msgstr "fim de ficheiro prematuro (no C
  msgid "malformed CRC\n"
  msgstr "CRC malformado\n"
  
- #: g10/armor.c:962 g10/armor.c:1527
++#: g10/armor.c:962 g10/armor.c:1530
  #, fuzzy, c-format
  msgid "CRC error; %06lX - %06lX\n"
  msgstr "erro de CRC; %06lx - %06lx\n"
@@@ -1538,16 -1202,13 +1538,16 @@@ msgstr "fim de ficheiro prematuro (no \
  msgid "error in trailer line\n"
  msgstr "erro na última linha\n"
  
- #: g10/armor.c:1303
++#: g10/armor.c:1306
  msgid "no valid OpenPGP data found.\n"
  msgstr "nenhum dado OpenPGP válido encontrado.\n"
  
- #: g10/armor.c:1308
++#: g10/armor.c:1311
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
  msgstr "armadura inválida: linha maior que %d caracteres\n"
  
- #: g10/armor.c:1312
++#: g10/armor.c:1315
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr ""
@@@ -1636,8 -1282,6 +1636,8 @@@ msgstr "chave secreta não disponível
  msgid "OpenPGP card no. %s detected\n"
  msgstr ""
  
- #: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
- #: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2030
++#: g10/keygen.c:4087 g10/revoke.c:215 g10/revoke.c:618
  #, fuzzy
  msgid "can't do this in batch mode\n"
  msgstr "impossível fazer isso em modo não-interativo\n"
@@@ -1647,15 -1290,10 +1647,15 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "Este comando não é permitido no modo %s.\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2454
++#: g10/card-util.c:109 scd/app-openpgp.c:2467
  #, fuzzy
  msgid "Reset Code not or not anymore available\n"
  msgstr "partes da chave secreta não disponíveis\n"
  
 +#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
- #: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
- #: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1768
++#: g10/keygen.c:1945 g10/keygen.c:2313 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "Opção? "
  
@@@ -1722,10 -1346,6 +1722,10 @@@ msgstr "a escrever chave pública para 
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
- #: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:334
++#: g10/import.c:592 g10/import.c:640 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
++#: dirmngr/dirmngr.c:1510 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
@@@ -1799,7 -1404,6 +1799,7 @@@ msgstr "A geração de chaves falhou: %
  msgid "not an OpenPGP card"
  msgstr "nenhum dado OpenPGP válido encontrado.\n"
  
- #: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
++#: g10/card-util.c:1173 g10/keygen.c:4106 g10/keygen.c:5092
  #, fuzzy, c-format
  msgid "error getting current key info: %s\n"
  msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
@@@ -1830,13 -1429,10 +1830,13 @@@ msgstr "Qual o tamanho de chave desejad
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "Qual o tamanho de chave desejado? (1024) "
  
- #: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
++#: g10/card-util.c:1316 g10/keygen.c:2122 g10/keygen.c:2154
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "arredondado para %u bits\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2207 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr ""
@@@ -1891,9 -1477,6 +1891,9 @@@ msgstr "   (%d) RSA (apenas cifragem)\n
  msgid "   (3) Authentication key\n"
  msgstr ""
  
- #: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
- #: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
- #: g10/keygen.c:2314 g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1508
++#: g10/keygen.c:1794 g10/keygen.c:1822 g10/keygen.c:1952 g10/keygen.c:2060
++#: g10/keygen.c:2336 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Opção inválida.\n"
  
@@@ -1927,7 -1504,6 +1927,7 @@@ msgstr "Realmente assinar? 
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1816 g10/keyedit.c:1867
++#: g10/card-util.c:1816 g10/keyedit.c:1868
  msgid "quit this menu"
  msgstr "sair deste menu"
  
@@@ -1936,7 -1511,6 +1936,7 @@@
  msgid "show admin commands"
  msgstr "comandos em conflito\n"
  
- #: g10/card-util.c:1819 g10/keyedit.c:1870
++#: g10/card-util.c:1819 g10/keyedit.c:1871
  msgid "show this help"
  msgstr "mostra esta ajuda"
  
@@@ -2020,31 -1576,21 +2020,31 @@@ msgstr "comandos em conflito\n
  msgid "Admin commands are not allowed\n"
  msgstr "a escrever chave privada para `%s'\n"
  
- #: g10/card-util.c:2127 g10/keyedit.c:2816
++#: g10/card-util.c:2127 g10/keyedit.c:2817
  msgid "Invalid command  (try \"help\")\n"
  msgstr "Comando inválido (tente \"help\")\n"
  
- #: g10/decrypt.c:191 g10/encrypt.c:955
++#: g10/decrypt.c:190 g10/encrypt.c:955
  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:4851 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4904 g10/keyring.c:398 g10/keyring.c:771
  #, fuzzy, c-format
  #| msgid "can't open `%s'\n"
  msgid "can't open '%s'\n"
  msgstr "impossível abrir `%s'\n"
  
 +#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
- #: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
- #: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4858 g10/keyedit.c:2051
++#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2163
  #, fuzzy, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "chave `%s' não encontrada: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
- #: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
- #: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4866 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:645 g10/tofu.c:2171
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "erro na leitura do bloco de chave: %s\n"
@@@ -2106,7 -1640,6 +2106,7 @@@ msgstr "há uma chave secreta para a ch
  msgid "use option \"--delete-secret-keys\" to delete it first.\n"
  msgstr "utilize a opção \"--delete-secret-keys\" para a apagar primeiro.\n"
  
- #: g10/encrypt.c:232 g10/sign.c:1292
++#: g10/encrypt.c:232 g10/sign.c:1294
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "erro na criação da frase secreta: %s\n"
@@@ -2126,7 -1656,6 +2126,7 @@@ msgstr "assinatura falhou: %s\n
  msgid "'%s' already compressed\n"
  msgstr "%s' já comprimido\n"
  
- #: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:610
  #, fuzzy, c-format
  #| msgid "WARNING: `%s' is an empty file\n"
  msgid "WARNING: '%s' is an empty file\n"
@@@ -2145,7 -1672,6 +2145,7 @@@ msgid "
  msgstr ""
  "ao forçar a cifra simétrica %s (%d) viola as preferências do destinatário\n"
  
- #: g10/encrypt.c:707 g10/sign.c:984
++#: g10/encrypt.c:707 g10/sign.c:986
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2180,7 -1701,6 +2180,7 @@@ msgstr "dados cifrados com %s\n
  msgid "encrypted with unknown algorithm %d\n"
  msgstr "cifrado com algoritmo desconhecido %d\n"
  
- #: g10/decrypt-data.c:164 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:129
  msgid ""
  "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
  msgstr ""
@@@ -2273,8 -1775,6 +2273,8 @@@ msgstr "
  msgid " - skipped"
  msgstr "%s: ignorado: %s\n"
  
- #: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:845 g10/sign.c:1148
++#: g10/export.c:1251 g10/import.c:1543 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:847 g10/sign.c:1150
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
@@@ -2299,8 -1795,6 +2299,8 @@@ msgstr "chave %08lX: tipo PGP 2.x - ign
  msgid "WARNING: nothing exported\n"
  msgstr "AVISO: nada exportado\n"
  
- #: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
- #: g10/plaintext.c:151 g10/plaintext.c:174
++#: g10/export.c:2283 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/plaintext.c:167 g10/plaintext.c:190
  #, fuzzy, c-format
  #| msgid "error creating `%s': %s\n"
  msgid "error creating '%s': %s\n"
@@@ -2348,8 -1833,6 +2348,8 @@@ msgstr "erro ao criar `%s': %s\n
  msgid "No fingerprint"
  msgstr "mostra impressão digital"
  
- #: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
- #: g10/revoke.c:701
++#: g10/getkey.c:1873 g10/keyedit.c:2929 g10/keyedit.c:3016 g10/revoke.c:637
++#: g10/revoke.c:702
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "chave `%s' não encontrada: %s\n"
@@@ -2381,222 -1859,178 +2381,228 @@@ msgstr "Chave inválida %08lX tornada v
  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/gpg.c:424 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:200
  #, fuzzy
  msgid "make a signature"
  msgstr "fazer uma assinatura separada"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:427
  #, fuzzy
  msgid "make a clear text signature"
  msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
  
- #: g10/gpg.c:426 sm/gpgsm.c:202
++#: g10/gpg.c:429 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "fazer uma assinatura separada"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:430 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "cifrar dados"
  
- #: g10/gpg.c:429
++#: g10/gpg.c:432
  msgid "encryption only with symmetric cipher"
  msgstr "cifrar apenas com cifra simétrica"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:434 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "decifrar dados (acção por omissão)"
  
- #: g10/gpg.c:433 sm/gpgsm.c:206
++#: g10/gpg.c:436 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "verificar uma assinatura"
  
- #: g10/gpg.c:435 sm/gpgsm.c:207
++#: g10/gpg.c:438 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "listar as chaves"
  
- #: g10/gpg.c:437
++#: g10/gpg.c:440
  msgid "list keys and signatures"
  msgstr "listar as chaves e as assinaturas"
  
- #: g10/gpg.c:438
++#: g10/gpg.c:443
  #, fuzzy
  msgid "list and check key signatures"
  msgstr "verificar as assinaturas das chaves"
  
- #: g10/gpg.c:439 sm/gpgsm.c:212
++#: g10/gpg.c:445 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "listar as chaves e as impressões digitais"
  
- #: g10/gpg.c:440 sm/gpgsm.c:210
++#: g10/gpg.c:446 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "listar as chaves secretas"
  
- #: g10/gpg.c:442 sm/gpgsm.c:213
++#: g10/gpg.c:448 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "gerar um novo par de chaves"
  
- #: g10/gpg.c:444
++#: g10/gpg.c:451
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly generate a new key pair"
  msgstr "gerar um novo par de chaves"
  
- #: g10/gpg.c:446
++#: g10/gpg.c:454
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly add a new user-id"
  msgstr "gerar um novo par de chaves"
  
- #: g10/gpg.c:449
++#: g10/gpg.c:459
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly revoke a user-id"
  msgstr "gerar um novo par de chaves"
  
- #: g10/gpg.c:451
++#: g10/gpg.c:462
+ #, fuzzy
+ #| msgid "generate a new key pair"
+ msgid "quickly set a new expiration date"
+ msgstr "gerar um novo par de chaves"
+ 
++#: g10/gpg.c:464
  msgid "full featured key pair generation"
  msgstr ""
  
- #: g10/gpg.c:452
++#: g10/gpg.c:467
  msgid "generate a revocation certificate"
  msgstr "gerar um certificado de revogação"
  
- #: g10/gpg.c:454 sm/gpgsm.c:215
++#: g10/gpg.c:470 sm/gpgsm.c:216
  msgid "remove keys from the public keyring"
  msgstr "remover chaves do porta-chaves público"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:472
  msgid "remove keys from the secret keyring"
  msgstr "remover chaves do porta-chaves secreto"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:474
  #, fuzzy
  #| msgid "sign a key"
  msgid "quickly sign a key"
  msgstr "assinar uma chave"
  
- #: g10/gpg.c:460
++#: g10/gpg.c:476
  #, fuzzy
  #| msgid "sign a key locally"
  msgid "quickly sign a key locally"
  msgstr "assinar uma chave localmente"
  
- #: g10/gpg.c:461
++#: g10/gpg.c:477
  msgid "sign a key"
  msgstr "assinar uma chave"
  
- #: g10/gpg.c:462
++#: g10/gpg.c:478
  msgid "sign a key locally"
  msgstr "assinar uma chave localmente"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:479
  msgid "sign or edit a key"
  msgstr "assinar ou editar uma chave"
  
- #: g10/gpg.c:465 sm/gpgsm.c:233
++#: g10/gpg.c:481 sm/gpgsm.c:234
  #, fuzzy
  msgid "change a passphrase"
  msgstr "muda a frase secreta"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:485
  msgid "export keys"
  msgstr "exportar chaves"
  
- #: g10/gpg.c:468
++#: g10/gpg.c:486
  msgid "export keys to a keyserver"
  msgstr "exportar chaves para um servidor de chaves"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:487
  msgid "import keys from a keyserver"
  msgstr "importar chaves de um servidor de chaves"
  
- #: g10/gpg.c:471
++#: g10/gpg.c:490
  msgid "search for keys on a keyserver"
  msgstr "procurar chaves num servidor de chaves"
  
- #: g10/gpg.c:473
++#: g10/gpg.c:492
  msgid "update all keys from a keyserver"
  msgstr "actualizar todas as chaves a partir de um servidor de chaves"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:498
  msgid "import/merge keys"
  msgstr "importar/fundir chaves"
  
- #: g10/gpg.c:482
++#: g10/gpg.c:501
  msgid "print the card status"
  msgstr ""
  
- #: g10/gpg.c:483
++#: g10/gpg.c:502
  msgid "change data on a card"
  msgstr ""
  
- #: g10/gpg.c:484
++#: g10/gpg.c:504
  msgid "change a card's PIN"
  msgstr ""
  
- #: g10/gpg.c:496
++#: g10/gpg.c:516
  msgid "update the trust database"
  msgstr "actualizar a base de dados de confiança"
  
- #: g10/gpg.c:505
++#: g10/gpg.c:525
  #, fuzzy
  msgid "print message digests"
  msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
  
- #: g10/gpg.c:508 sm/gpgsm.c:228
++#: g10/gpg.c:528 sm/gpgsm.c:229
  msgid "run in server mode"
  msgstr ""
  
- #: g10/gpg.c:510
++#: g10/gpg.c:530
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:514 sm/gpgsm.c:246
++#: g10/gpg.c:534 sm/gpgsm.c:248
  msgid "create ascii armored output"
  msgstr "criar saída com armadura ascii"
  
- #: g10/gpg.c:517 sm/gpgsm.c:262
++#: g10/gpg.c:537 sm/gpgsm.c:264
  #, fuzzy
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|NOME|cifrar para NOME"
  
- #: g10/gpg.c:533 sm/gpgsm.c:298
++#: g10/gpg.c:553 sm/gpgsm.c:300
  #, 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:539
++#: g10/gpg.c:559
  #, 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:546
++#: g10/gpg.c:566
  msgid "use canonical text mode"
  msgstr "usar modo de texto canônico"
  
- #: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
++#: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
  #, fuzzy
  msgid "|FILE|write output to FILE"
  msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
  
- #: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
++#: g10/gpg.c:598 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
  msgid "do not make any changes"
  msgstr "não fazer alterações"
  
- #: g10/gpg.c:579
++#: g10/gpg.c:599
  msgid "prompt before overwriting"
  msgstr "perguntar antes de sobrepôr"
  
- #: g10/gpg.c:628
++#: g10/gpg.c:648
  msgid "use strict OpenPGP behavior"
  msgstr ""
  
- #: g10/gpg.c:654 sm/gpgsm.c:355
++#: g10/gpg.c:674 sm/gpgsm.c:357
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2604,7 -2038,16 +2610,17 @@@ msgstr "
  "@\n"
  "(Veja a página man para uma lista completa de comandos e opções)\n"
  
- #: g10/gpg.c:657 sm/gpgsm.c:358
++#: g10/gpg.c:677
+ #, fuzzy
+ #| msgid ""
+ #| "@\n"
+ #| "Examples:\n"
+ #| "\n"
+ #| " -se -r Bob [file]          sign and encrypt for user Bob\n"
+ #| " --clear-sign [file]         make a clear text signature\n"
+ #| " --detach-sign [file]       make a detached signature\n"
+ #| " --list-keys [names]        show keys\n"
+ #| " --fingerprint [names]      show fingerprints\n"
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2624,13 -2067,11 +2640,13 @@@ msgstr "
  " --list-keys [nomes]        mostrar chaves\n"
  " --fingerprint [nomes]      mostrar impressões digitais\n"
  
- #: g10/gpg.c:1026
++#: g10/gpg.c:1047
  #, 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:1029
++#: g10/gpg.c:1050
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg [options] [files]\n"
@@@ -2645,7 -2086,6 +2661,7 @@@ msgstr "
  "assina, verifica, cifra ou decifra\n"
  "a operação por omissão depende dos dados de entrada\n"
  
- #: g10/gpg.c:1040 sm/gpgsm.c:588
++#: g10/gpg.c:1061 sm/gpgsm.c:580
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2653,606 -2093,428 +2669,543 @@@ msgstr "
  "\n"
  "Algoritmos suportados:\n"
  
- #: g10/gpg.c:1043
++#: g10/gpg.c:1064
  msgid "Pubkey: "
  msgstr "Chave pública: "
  
- #: g10/gpg.c:1050 g10/keyedit.c:3402
++#: g10/gpg.c:1071 g10/keyedit.c:3483
  msgid "Cipher: "
  msgstr "Cifra: "
  
- #: g10/gpg.c:1057
++#: g10/gpg.c:1078
  msgid "Hash: "
  msgstr "Dispersão: "
  
- #: g10/gpg.c:1064 g10/keyedit.c:3451
++#: g10/gpg.c:1085 g10/keyedit.c:3532
  msgid "Compression: "
  msgstr "Compressão: "
  
- #: g10/gpg.c:1133 sm/gpgsm.c:662
++#: g10/gpg.c:1154 sm/gpgsm.c:654
  #, fuzzy, c-format
  msgid "usage: %s [options] %s\n"
  msgstr "uso: gpg [opções] "
  
- #: g10/gpg.c:1321 sm/gpgsm.c:751
++#: g10/gpg.c:1342 sm/gpgsm.c:743
  msgid "conflicting commands\n"
  msgstr "comandos em conflito\n"
  
- #: g10/gpg.c:1339
++#: g10/gpg.c:1360
  #, 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:1537
++#: g10/gpg.c:1558
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
  
- #: g10/gpg.c:1540
++#: g10/gpg.c:1561
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
  msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
  
- #: g10/gpg.c:1543
++#: g10/gpg.c:1564
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on extension '%s'\n"
  msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
  
- #: g10/gpg.c:1549
++#: g10/gpg.c:1570
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
  msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
  
- #: g10/gpg.c:1552
++#: g10/gpg.c:1573
  #, 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:1555
++#: g10/gpg.c:1576
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on extension '%s'\n"
  msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
  
- #: g10/gpg.c:1561
++#: g10/gpg.c:1582
  #, 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:1564
++#: g10/gpg.c:1585
  #, 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:1567
++#: g10/gpg.c:1588
  #, 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:1573
++#: g10/gpg.c:1594
  #, 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:1576
++#: g10/gpg.c:1597
  #, 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:1579
++#: g10/gpg.c:1600
  #, 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:1786
++#: g10/gpg.c:1816
  #, fuzzy, c-format
  msgid "unknown configuration item '%s'\n"
  msgstr "criado um novo ficheiro de configuração `%s'\n"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1925
  msgid "display photo IDs during key listings"
  msgstr ""
  
- #: g10/gpg.c:1895
++#: g10/gpg.c:1927
  #, fuzzy
  msgid "show key usage information during key listings"
  msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1929
  msgid "show policy URLs during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1931
  #, fuzzy
  msgid "show all notations during signature listings"
  msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1933
  msgid "show IETF standard notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1937
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1939
  #, fuzzy
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "a URL de política de assinatura dada é inválida\n"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1941
  msgid "show user ID validity during key listings"
  msgstr ""
  
- #: g10/gpg.c:1911
++#: g10/gpg.c:1943
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  
- #: g10/gpg.c:1913
++#: g10/gpg.c:1945
  msgid "show revoked and expired subkeys in key listings"
  msgstr ""
  
- #: g10/gpg.c:1915
++#: g10/gpg.c:1947
  #, fuzzy
  msgid "show the keyring name in key listings"
  msgstr "mostrar em que porta-chave a chave está"
  
- #: g10/gpg.c:1917
++#: g10/gpg.c:1949
  #, fuzzy
  msgid "show expiration dates during signature listings"
  msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
  
- #: g10/gpg.c:2019 g10/gpg.c:2056
++#: g10/gpg.c:2051 g10/gpg.c:2088
  #, fuzzy, c-format
  msgid "valid values for option '%s':\n"
  msgstr "opções de importação inválidas\n"
  
- #: g10/gpg.c:2030
++#: g10/gpg.c:2062
  #, fuzzy, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "destinatário por omissão desconhecido `%s'\n"
  
- #: g10/gpg.c:2032 g10/gpg.c:2068
++#: g10/gpg.c:2064 g10/gpg.c:2100
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2066
++#: g10/gpg.c:2098 g10/keygen.c:167
  #, fuzzy, c-format
  msgid "invalid value for option '%s'\n"
  msgstr "opções de importação inválidas\n"
  
- #: g10/gpg.c:2203
++#: g10/gpg.c:2235
  #, fuzzy, c-format
  #| msgid "NOTE: old default options file `%s' ignored\n"
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "NOTA: o ficheiro antigo de opções por omissão `%s' foi ignorado\n"
  
- #: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
++#: g10/gpg.c:2839 g10/gpg.c:3610 g10/gpg.c:3622
  #, 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:2978 g10/gpg.c:2990
++#: g10/gpg.c:3011 g10/gpg.c:3023
  #, 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:3012
++#: g10/gpg.c:3045
  #, fuzzy, c-format
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "Endereço eletrónico inválido\n"
  
- #: g10/gpg.c:3044 sm/gpgsm.c:1166
++#: g10/gpg.c:3077 sm/gpgsm.c:1158
  #, fuzzy, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "algoritmo de dispersão inválido `%s'\n"
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3130
  #, 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:3119 g10/gpg.c:3322 g10/keyedit.c:5338
++#: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
  #, fuzzy
  msgid "could not parse keyserver URL\n"
  msgstr "não consegui processar a URI do servidor de chaves\n"
  
- #: g10/gpg.c:3137
++#: g10/gpg.c:3170
  #, fuzzy, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: opções de exportação inválidas\n"
  
- #: g10/gpg.c:3140
++#: g10/gpg.c:3173
  #, fuzzy
  msgid "invalid keyserver options\n"
  msgstr "opções de exportação inválidas\n"
  
- #: g10/gpg.c:3147
++#: g10/gpg.c:3180
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: opções de importação inválidas\n"
  
- #: g10/gpg.c:3150
++#: g10/gpg.c:3183
  msgid "invalid import options\n"
  msgstr "opções de importação inválidas\n"
  
- #: g10/gpg.c:3156 g10/gpg.c:3171
++#: g10/gpg.c:3189 g10/gpg.c:3204
  #, fuzzy, c-format
  msgid "invalid filter option: %s\n"
  msgstr "opções de importação inválidas\n"
  
- #: g10/gpg.c:3162
++#: g10/gpg.c:3195
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: opções de exportação inválidas\n"
  
- #: g10/gpg.c:3165
++#: g10/gpg.c:3198
  msgid "invalid export options\n"
  msgstr "opções de exportação inválidas\n"
  
- #: g10/gpg.c:3177
++#: g10/gpg.c:3210
  #, fuzzy, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: opções de importação inválidas\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3213
  #, fuzzy
  msgid "invalid list options\n"
  msgstr "opções de importação inválidas\n"
  
- #: g10/gpg.c:3188
++#: g10/gpg.c:3221
  msgid "display photo IDs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3190
++#: g10/gpg.c:3223
  msgid "show policy URLs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3192
++#: g10/gpg.c:3225
  #, fuzzy
  msgid "show all notations during signature verification"
  msgstr "%s não é um conjunto de caracteres válido\n"
  
- #: g10/gpg.c:3194
++#: g10/gpg.c:3227
  msgid "show IETF standard notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3231
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3200
++#: g10/gpg.c:3233
  #, fuzzy
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "a URL de política de assinatura dada é inválida\n"
  
- #: g10/gpg.c:3202
++#: g10/gpg.c:3235
  #, fuzzy
  msgid "show user ID validity during signature verification"
  msgstr "%s não é um conjunto de caracteres válido\n"
  
- #: g10/gpg.c:3204
++#: g10/gpg.c:3237
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  
- #: g10/gpg.c:3206
++#: g10/gpg.c:3239
  #, 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:3208
++#: g10/gpg.c:3241
  msgid "validate signatures with PKA data"
  msgstr ""
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3243
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr ""
  
- #: g10/gpg.c:3217
++#: g10/gpg.c:3250
  #, fuzzy, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: opções de exportação inválidas\n"
  
- #: g10/gpg.c:3220
++#: g10/gpg.c:3253
  #, fuzzy
  msgid "invalid verify options\n"
  msgstr "opções de exportação inválidas\n"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3260
  #, 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:3417
++#: g10/gpg.c:3452
  #, 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:3420
++#: g10/gpg.c:3455
  msgid "invalid auto-key-locate list\n"
  msgstr ""
  
- #: g10/gpg.c:3553 sm/gpgsm.c:1507
++#: g10/gpg.c:3592 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
  msgstr "AVISO: O programa pode criar um ficheiro core!\n"
  
- #: g10/gpg.c:3564
++#: g10/gpg.c:3603
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "AVISO: %s sobrepõe %s\n"
  
- #: g10/gpg.c:3573
++#: g10/gpg.c:3612
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s não é permitido com %s!\n"
  
- #: g10/gpg.c:3576
++#: g10/gpg.c:3615
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s não faz sentido com %s!\n"
  
- #: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
++#: g10/gpg.c:3630 sm/gpgsm.c:1518 dirmngr/dirmngr.c:951
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3651
  #, 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:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
++#: g10/gpg.c:3686 g10/gpg.c:3710 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "o algoritmo de cifragem selecionado é inválido\n"
  
- #: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
++#: g10/gpg.c:3692 g10/gpg.c:3716 sm/gpgsm.c:1591 sm/gpgsm.c:1597
  msgid "selected digest algorithm is invalid\n"
  msgstr "o algoritmo de \"digest\" selecionado é inválido\n"
  
- #: g10/gpg.c:3659
++#: g10/gpg.c:3698
  #, fuzzy
  msgid "selected compression algorithm is invalid\n"
  msgstr "o algoritmo de cifragem selecionado é inválido\n"
  
- #: g10/gpg.c:3665
++#: g10/gpg.c:3704
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "o algoritmo de \"digest\" de certificação selecionado é inválido\n"
  
- #: g10/gpg.c:3680
++#: g10/gpg.c:3719
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed deve ser maior que 0\n"
  
- #: g10/gpg.c:3682
++#: g10/gpg.c:3721
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed deve ser maior que 1\n"
  
- #: g10/gpg.c:3684
++#: g10/gpg.c:3723
  #, fuzzy
  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:3686
++#: g10/gpg.c:3725
  #, fuzzy
  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:3688
++#: g10/gpg.c:3727
  #, fuzzy
  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:3691
++#: g10/gpg.c:3730
  #, fuzzy
  #| 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:3695
++#: g10/gpg.c:3734
  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:3702
++#: g10/gpg.c:3741
  msgid "invalid default preferences\n"
  msgstr "preferências por omissão inválidas\n"
  
- #: g10/gpg.c:3706
++#: g10/gpg.c:3745
  msgid "invalid personal cipher preferences\n"
  msgstr "preferências pessoais de cifra inválidas\n"
  
- #: g10/gpg.c:3710
++#: g10/gpg.c:3749
  msgid "invalid personal digest preferences\n"
  msgstr "preferências pessoais de 'digest' inválidas\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3753
  msgid "invalid personal compress preferences\n"
  msgstr "preferências pessoais de compressão inválidas\n"
  
- #: g10/gpg.c:3750
++#: g10/gpg.c:3789
  #, fuzzy, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s não faz sentido com %s!\n"
  
- #: g10/gpg.c:3797
++#: g10/gpg.c:3836
  #, fuzzy, c-format
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
  
- #: g10/gpg.c:3802
++#: g10/gpg.c:3841
  #, fuzzy, c-format
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
  
- #: g10/gpg.c:3807
++#: g10/gpg.c:3846
  #, fuzzy, c-format
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
  
- #: g10/gpg.c:3906
++#: g10/gpg.c:3945
  #, 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:3918
++#: g10/gpg.c:3957
  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:3975
- msgid "--store [filename]"
- msgstr "--store [nome_do_ficheiro]"
- 
- #: g10/gpg.c:3985
- msgid "--symmetric [filename]"
- msgstr "--symmetric [nome_do_ficheiro]"
- 
- #: g10/gpg.c:3989
++#: g10/gpg.c:4028
  #, fuzzy, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "decifragem falhou: %s\n"
  
- #: g10/gpg.c:4000
- msgid "--encrypt [filename]"
- msgstr "--encrypt [nome_do_ficheiro]"
- 
- #: g10/gpg.c:4016
- #, fuzzy
- msgid "--symmetric --encrypt [filename]"
- msgstr "--sign --encrypt [nome_do_ficheiro]"
- 
- #: g10/gpg.c:4018
++#: g10/gpg.c:4057
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4021
++#: g10/gpg.c:4060
  #, fuzzy, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
  
- #: g10/gpg.c:4042
- msgid "--sign [filename]"
- msgstr "--sign [nome_do_ficheiro]"
- 
- #: g10/gpg.c:4058
- msgid "--sign --encrypt [filename]"
- msgstr "--sign --encrypt [nome_do_ficheiro]"
- 
- #: g10/gpg.c:4076
- #, fuzzy
- msgid "--symmetric --sign --encrypt [filename]"
- msgstr "--sign --encrypt [nome_do_ficheiro]"
- 
- #: g10/gpg.c:4078
++#: g10/gpg.c:4117
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4081
++#: g10/gpg.c:4120
  #, fuzzy, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
  
- #: g10/gpg.c:4105
- msgid "--sign --symmetric [filename]"
- msgstr "--sign --symmetric [nome_do_ficheiro]"
- 
- #: g10/gpg.c:4117
- msgid "--clearsign [filename]"
- msgstr "--clearsign [nome_do_ficheiro]"
- 
- #: g10/gpg.c:4147
- msgid "--decrypt [filename]"
- msgstr "--decrypt [nome_do_ficheiro]"
- 
- #: g10/gpg.c:4174
- msgid "--sign-key user-id"
- msgstr "--sign-key id-utilizador"
- 
- #: g10/gpg.c:4178
- msgid "--lsign-key user-id"
- msgstr "--lsign-key id-utilizador"
- 
- #: g10/gpg.c:4199
- msgid "--edit-key user-id [commands]"
- msgstr "--edit-key id-utilizador [comandos]"
- 
- #: g10/gpg.c:4215
- #, fuzzy
- msgid "--passwd <user-id>"
- msgstr "--sign-key id-utilizador"
- 
- #: g10/gpg.c:4411 g10/keyserver.c:1837
++#: g10/gpg.c:4462 g10/keyserver.c:1837
  #, fuzzy, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "A geração de chaves falhou: %s\n"
  
- #: g10/gpg.c:4416
++#: g10/gpg.c:4467
  #, fuzzy, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "A geração de chaves falhou: %s\n"
  
- #: g10/gpg.c:4422
++#: g10/gpg.c:4473
  #, fuzzy, c-format
  msgid "key export failed: %s\n"
  msgstr "A geração de chaves falhou: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4486
  #, fuzzy, c-format
  msgid "export as ssh key failed: %s\n"
  msgstr "A geração de chaves falhou: %s\n"
  
- #: g10/gpg.c:4447
++#: g10/gpg.c:4498
  #, fuzzy, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "A geração de chaves falhou: %s\n"
  
- #: g10/gpg.c:4460
++#: g10/gpg.c:4511
  #, fuzzy, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "actualização da chave secreta falhou: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4578
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "retirada de armadura falhou: %s\n"
  
- #: g10/gpg.c:4538
++#: g10/gpg.c:4589
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "criação de armadura falhou: %s\n"
  
- #: g10/gpg.c:4630
++#: g10/gpg.c:4681
  #, 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:4776 g10/tofu.c:2002
++#: g10/gpg.c:4827 g10/tofu.c:2151
  #, fuzzy, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "erro na criação da frase secreta: %s\n"
  
- #: g10/gpg.c:4788
++#: g10/gpg.c:4839
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4835
- msgid "[filename]"
- msgstr "[nome_do_ficheiro]"
- 
- #: g10/gpg.c:4841
++#: g10/gpg.c:4894
  msgid "Go ahead and type your message ...\n"
  msgstr "Digite a sua mensagem ...\n"
  
- #: g10/gpg.c:5179
++#: g10/gpg.c:5232
  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:5181
++#: g10/gpg.c:5234
  msgid "the given signature policy URL is invalid\n"
  msgstr "a URL de política de assinatura dada é inválida\n"
  
- #: g10/gpg.c:5214
++#: g10/gpg.c:5267
  #, fuzzy
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "a URL de política de assinatura dada é inválida\n"
@@@ -3267,7 -2527,6 +3220,7 @@@ msgstr "Remover esta chave do porta-cha
  msgid "make timestamp conflicts only a warning"
  msgstr "conflito de \"timestamp\""
  
- #: g10/gpgv.c:82 sm/gpgsm.c:345
++#: g10/gpgv.c:82 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr ""
  "|DF|escrever informações de estado para o\n"
@@@ -3298,328 -2552,262 +3251,328 @@@ msgstr "Nenhuma ajuda disponível
  msgid "No help available for '%s'"
  msgstr "Nenhuma ajuda disponível para `%s'"
  
- #: g10/import.c:151
++#: g10/import.c:152
  msgid "import signatures that are marked as local-only"
  msgstr ""
  
- #: g10/import.c:154
++#: g10/import.c:155
  msgid "repair damage from the pks keyserver during import"
  msgstr ""
  
- #: g10/import.c:157
++#: g10/import.c:158
  #, fuzzy
  msgid "do not clear the ownertrust values during import"
  msgstr "actualizar a base de dados de confiança"
  
- #: g10/import.c:160
++#: g10/import.c:161
  #, fuzzy
  msgid "do not update the trustdb after import"
  msgstr "actualizar a base de dados de confiança"
  
- #: g10/import.c:163
++#: g10/import.c:164
  #, fuzzy
  msgid "show key during import"
  msgstr "mostra impressão digital"
  
- #: g10/import.c:166
++#: g10/import.c:167
  msgid "only accept updates to existing keys"
  msgstr ""
  
- #: g10/import.c:169
++#: g10/import.c:170
  #, fuzzy
  msgid "remove unusable parts from key after import"
  msgstr "chave secreta não utilizável"
  
- #: g10/import.c:172
++#: g10/import.c:173
  msgid "remove as much as possible from key after import"
  msgstr ""
  
- #: g10/import.c:175
++#: g10/import.c:176
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:326 g10/import.c:568
++#: g10/import.c:327 g10/import.c:569
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "ignorando bloco do tipo %d\n"
  
- #: g10/import.c:585
++#: g10/import.c:586
  #, fuzzy, c-format
  msgid "%lu keys processed so far\n"
  msgstr "%lu chaves processadas até agora\n"
  
- #: g10/import.c:655
++#: g10/import.c:656
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "Número total processado: %lu\n"
  
- #: g10/import.c:658
++#: g10/import.c:659
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "      ignorei novas chaves: %lu\n"
  
- #: g10/import.c:660
++#: g10/import.c:661
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "      ignorei novas chaves: %lu\n"
  
- #: g10/import.c:663
++#: g10/import.c:664
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "          sem IDs de utilizadores: %lu\n"
  
- #: g10/import.c:666 sm/import.c:130
++#: g10/import.c:667 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "              importados: %lu"
  
- #: g10/import.c:670 sm/import.c:134
++#: g10/import.c:671 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "             não modificados: %lu\n"
  
- #: g10/import.c:672
++#: g10/import.c:673
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "          novos IDs de utilizadores: %lu\n"
  
- #: g10/import.c:674
++#: g10/import.c:675
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "           novas subchaves: %lu\n"
  
- #: g10/import.c:676
++#: g10/import.c:677
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "        novas assinaturas: %lu\n"
  
- #: g10/import.c:678
++#: g10/import.c:679
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "   novas revogações de chaves: %lu\n"
  
- #: g10/import.c:680 sm/import.c:136
++#: g10/import.c:681 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "      chaves secretas lidas: %lu\n"
  
- #: g10/import.c:682 sm/import.c:138
++#: g10/import.c:683 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "  chaves secretas importadas: %lu\n"
  
- #: g10/import.c:684 sm/import.c:140
++#: g10/import.c:685 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr " chaves secretas não modificadas: %lu\n"
  
- #: g10/import.c:686 sm/import.c:142
++#: g10/import.c:687 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "        não importadas: %lu\n"
  
- #: g10/import.c:688
++#: g10/import.c:689
  #, fuzzy, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "        novas assinaturas: %lu\n"
  
- #: g10/import.c:690
++#: g10/import.c:691
  #, fuzzy, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "      chaves secretas lidas: %lu\n"
  
- #: g10/import.c:1034
++#: g10/import.c:1035
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
  "algorithms on these user IDs:\n"
  msgstr ""
  
- #: g10/import.c:1076
++#: g10/import.c:1077
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1091
++#: g10/import.c:1092
  #, fuzzy, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "assinatura %s de: \"%s\"\n"
  
- #: g10/import.c:1103
++#: g10/import.c:1104
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1116
++#: g10/import.c:1117
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr ""
  
- #: g10/import.c:1118
++#: g10/import.c:1119
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  
- #: g10/import.c:1143
++#: g10/import.c:1144
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  
- #: g10/import.c:1379 g10/import.c:2167
++#: g10/import.c:1380 g10/import.c:2168
  #, fuzzy, c-format
  msgid "key %s: no user ID\n"
  msgstr "chave %08lX: sem ID de utilizador\n"
  
- #: g10/import.c:1385
++#: g10/import.c:1386
  #, fuzzy, c-format
  msgid "key %s: %s\n"
  msgstr "ignorado `%s': %s\n"
  
- #: g10/import.c:1386 g10/import.c:2141
++#: g10/import.c:1387 g10/import.c:2142
  msgid "rejected by import screener"
  msgstr ""
  
- #: g10/import.c:1416
++#: g10/import.c:1417
  #, fuzzy, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "chave %08lX: subchave HKP corrompida foi reparada\n"
  
- #: g10/import.c:1434
++#: g10/import.c:1435
  #, fuzzy, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "chave %08lX: aceite ID de utilizador sem auto-assinatura '%s'\n"
  
- #: g10/import.c:1444 g10/import.c:1475
++#: g10/import.c:1445 g10/import.c:1476
  #, fuzzy, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "chave %08lX: sem IDs de utilizadores válidos\n"
  
- #: g10/import.c:1446
++#: g10/import.c:1447
  msgid "this may be caused by a missing self-signature\n"
  msgstr "isto pode ser causado por falta de auto-assinatura\n"
  
- #: g10/import.c:1516 g10/import.c:2318
++#: g10/import.c:1517 g10/import.c:2319
  #, fuzzy, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "chave %08lX: chave pública não encontrada: %s\n"
  
- #: g10/import.c:1522
++#: g10/import.c:1523
  #, fuzzy, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "chave %08lX: chave nova - ignorada\n"
  
- #: g10/import.c:1537
++#: g10/import.c:1538
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "não foi encontrada nenhum porta-chaves onde escrever: %s\n"
  
- #: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
++#: g10/import.c:1547 g10/import.c:1648 g10/import.c:2385
  #, fuzzy, c-format
  #| msgid "error writing keyring `%s': %s\n"
  msgid "error writing keyring '%s': %s\n"
  msgstr "erro na escrita do porta-chaves `%s': %s\n"
  
- #: g10/import.c:1566
++#: g10/import.c:1567
  #, fuzzy, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "chave %08lX: chave pública \"%s\" importada\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1591
  #, fuzzy, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "chave %08lX: não corresponde à nossa cópia\n"
  
- #: g10/import.c:1606 g10/import.c:2342
++#: g10/import.c:1607 g10/import.c:2343
  #, fuzzy, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "chave %08lX: impossível localizar bloco de chaves original: %s\n"
  
- #: g10/import.c:1614 g10/import.c:2349
++#: g10/import.c:1615 g10/import.c:2350
  #, fuzzy, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "chave %08lX: impossível ler bloco de chaves original: %s\n"
  
- #: g10/import.c:1657
++#: g10/import.c:1658
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "chave %8lX: \"%s\" 1 novo ID de utilizador\n"
  
- #: g10/import.c:1660
++#: g10/import.c:1661
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
  
- #: g10/import.c:1663
++#: g10/import.c:1664
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "chave %08lX: \"%s\" 1 nova assinatura\n"
  
- #: g10/import.c:1666
++#: g10/import.c:1667
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
  
- #: g10/import.c:1669
++#: g10/import.c:1670
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "chave %08lX: \"%s\" 1 nova subchave\n"
  
- #: g10/import.c:1672
++#: g10/import.c:1673
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "chave %08lX: \"%s\" %d novas subchaves\n"
  
- #: g10/import.c:1675
++#: g10/import.c:1676
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
  
- #: g10/import.c:1678
++#: g10/import.c:1679
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
  
- #: g10/import.c:1681
++#: g10/import.c:1682
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
  
- #: g10/import.c:1684
++#: g10/import.c:1685
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
  
- #: g10/import.c:1707
++#: g10/import.c:1708
  #, fuzzy, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "chave %08lX: \"%s\" não modificada\n"
  
- #: g10/import.c:2019 g10/import.c:2264
++#: g10/import.c:2020 g10/import.c:2265
  #, fuzzy, c-format
  msgid "key %s: secret key imported\n"
  msgstr "chave %08lX: chave secreta importada\n"
  
- #: g10/import.c:2027
++#: g10/import.c:2028
  #, fuzzy, c-format
  #| msgid "skipped: secret key already present\n"
  msgid "key %s: secret key already exists\n"
  msgstr "ignorado: a chave secreta já está presente\n"
  
- #: g10/import.c:2035
++#: g10/import.c:2036
  #, fuzzy, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "erro ao enviar para `%s': %s\n"
  
- #: g10/import.c:2140
++#: g10/import.c:2141
  #, fuzzy, c-format
  msgid "secret key %s: %s\n"
  msgstr "chave `%s' não encontrada: %s\n"
  
- #: g10/import.c:2160 g10/import.c:2195
++#: g10/import.c:2161 g10/import.c:2196
  #, fuzzy
  msgid "importing secret keys not allowed\n"
  msgstr "a escrever chave privada para `%s'\n"
  
- #: g10/import.c:2184
++#: g10/import.c:2185
  #, fuzzy, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr "chave %08lX: chave secreta com cifra inválida %d - ignorada\n"
@@@ -3634,144 -2822,117 +3587,144 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2256
++#: g10/import.c:2257
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2311
++#: g10/import.c:2312
  #, fuzzy, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
  "chave %08lX: sem chave pública - impossível aplicar certificado\n"
  "de revogação\n"
  
- #: g10/import.c:2360
++#: g10/import.c:2361
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "chave %08lX: certificado de revogação inválido: %s - rejeitado\n"
  
- #: g10/import.c:2393
++#: g10/import.c:2394
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "chave %08lX: \"%s\" certificado de revogação importado\n"
  
- #: g10/import.c:2469
++#: g10/import.c:2470
  #, fuzzy, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "chave %08lX: nenhum ID de utilizador para assinatura\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2487
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr ""
  "chave %08lX: algoritmo de chave pública não suportado no utilizador \"%s\"\n"
  
- #: g10/import.c:2488
++#: g10/import.c:2489
  #, fuzzy, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "chave %08lX: auto-assinatura inválida do utilizador \"%s\"\n"
  
- #: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
++#: g10/import.c:2506 g10/import.c:2532 g10/import.c:2583
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "chave %08lX: algoritmo de chave pública não suportado\n"
  
- #: g10/import.c:2506
++#: g10/import.c:2507
  #, fuzzy, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "chave %08lX: assinatura directa de chave adicionada\n"
  
- #: g10/import.c:2520
++#: g10/import.c:2521
  #, fuzzy, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "chave %08lX: sem subchave para ligação de chaves\n"
  
- #: g10/import.c:2533
++#: g10/import.c:2534
  #, fuzzy, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "chave %08lX: ligação de subchave inválida\n"
  
- #: g10/import.c:2549
++#: g10/import.c:2550
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "chave %08lX: apagada ligação múltipla de subchave \n"
  
- #: g10/import.c:2571
++#: g10/import.c:2572
  #, fuzzy, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "chave %08lX: sem subchave para revocação de chave\n"
  
- #: g10/import.c:2584
++#: g10/import.c:2585
  #, fuzzy, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "chave %08lX: revocação de subchave inválida\n"
  
- #: g10/import.c:2599
++#: g10/import.c:2600
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "chave %08lX: removida revogação múltiplace de subchaves\n"
  
- #: g10/import.c:2641
++#: g10/import.c:2642
  #, fuzzy, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "chave %08lX: ignorado ID de utilizador '"
  
- #: g10/import.c:2665
++#: g10/import.c:2666
  #, fuzzy, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "chave %08lX: subchave ignorada\n"
  
- #: g10/import.c:2694
++#: g10/import.c:2695
  #, fuzzy, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "chave %08lX: assinatura não exportável (classe %02x) - ignorada\n"
  
- #: g10/import.c:2705
++#: g10/import.c:2706
  #, fuzzy, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "chave %08lX: certificado de revogação no local errado - ignorado\n"
  
- #: g10/import.c:2723
++#: g10/import.c:2724
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "chave %08lX: certificado de revogação inválido: %s - ignorado\n"
  
- #: g10/import.c:2737
++#: g10/import.c:2738
  #, fuzzy, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "chave %08lX: assintura da subchave no local errado - ignorado\n"
  
- #: g10/import.c:2745
++#: g10/import.c:2746
  #, fuzzy, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "chave %08lX: classe de assinatura inesperada (%02x) - ignorada\n"
  
- #: g10/import.c:2887
++#: g10/import.c:2888
  #, fuzzy, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "chave %08lX: detectado ID de utilizador duplicado - fundido\n"
  
- #: g10/import.c:2951
++#: g10/import.c:2952
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr ""
  "AVISO: a chave %08lX pode estar revocada: a transferir a chave de revocação "
  "%08lX\n"
  
- #: g10/import.c:2967
++#: g10/import.c:2968
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr ""
  "AVISO: a chave %08lX pode estar revocada: chave de revocação %08lX não "
  "presente.\n"
  
- #: g10/import.c:3031
++#: g10/import.c:3032
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
  
- #: g10/import.c:3069
++#: g10/import.c:3070
  #, fuzzy, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "chave %08lX: assinatura directa de chave adicionada\n"
@@@ -3808,54 -2963,43 +3761,54 @@@ msgstr "erro ao criar `%s': %s\n
  msgid "error opening key DB: %s\n"
  msgstr "erro na leitura de `%s': %s\n"
  
- #: g10/keydb.c:1782
++#: g10/keydb.c:1786
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[revocation]"
  msgstr "[revogação]"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[self-signature]"
  msgstr "[auto-assinatura]"
  
- #: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
++#: g10/keyedit.c:433 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: dirmngr/ldap-wrapper.c:694
  #, fuzzy, c-format
  msgid "error allocating memory: %s\n"
  msgstr "erro ao criar porta-chaves `%s': %s\n"
  
- #: g10/keyedit.c:629
++#: g10/keyedit.c:630
  #, fuzzy, c-format
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr "chave %08lX: algoritmo de chave pública não suportado\n"
  
- #: g10/keyedit.c:638
++#: g10/keyedit.c:639
  #, fuzzy, c-format
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "assinatura %s de: \"%s\"\n"
  
- #: g10/keyedit.c:800
++#: g10/keyedit.c:801
  #, fuzzy
  msgid " (reordered signatures follow)"
  msgstr "Assinatura correcta de \""
  
- #: g10/keyedit.c:913
++#: g10/keyedit.c:914
  #, fuzzy, c-format
  msgid "key %s:\n"
  msgstr "ignorado `%s': %s\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:917
  #, fuzzy, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
  msgstr[0] "Utilizador \"%s\" está revocado."
  msgstr[1] "Utilizador \"%s\" está revocado."
  
- #: g10/keyedit.c:919 g10/keylist.c:480
++#: g10/keyedit.c:920 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
@@@ -3863,7 -3007,6 +3816,7 @@@ msgid_plural "%d signatures not checke
  msgstr[0] "1 assinatura não verificada por falta de chave\n"
  msgstr[1] "1 assinatura não verificada por falta de chave\n"
  
- #: g10/keyedit.c:923 g10/keylist.c:476
++#: g10/keyedit.c:924 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
@@@ -3871,21 -3014,18 +3824,21 @@@ msgid_plural "%d bad signatures\n
  msgstr[0] "%d assinaturas incorrectas\n"
  msgstr[1] "%d assinaturas incorrectas\n"
  
- #: g10/keyedit.c:927
++#: g10/keyedit.c:928
  #, fuzzy, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
  msgstr[0] "Assinatura correcta de \""
  msgstr[1] "Assinatura correcta de \""
  
- #: g10/keyedit.c:932
++#: g10/keyedit.c:933
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:992 g10/pkclist.c:274
++#: g10/keyedit.c:993 g10/pkclist.c:274
  #, fuzzy
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
@@@ -3898,68 -3038,53 +3851,68 @@@ msgstr "
  "(vendo passaportes, verificando impressões digitais...)?\n"
  "\n"
  
- #: g10/keyedit.c:996 g10/pkclist.c:286
++#: g10/keyedit.c:997 g10/pkclist.c:286
  #, fuzzy, c-format
  msgid "  %d = I trust marginally\n"
  msgstr " %d = Confio moderadamente\n"
  
- #: g10/keyedit.c:997 g10/pkclist.c:288
++#: g10/keyedit.c:998 g10/pkclist.c:288
  #, fuzzy, c-format
  msgid "  %d = I trust fully\n"
  msgstr " %d = Confio plenamente\n"
  
- #: g10/keyedit.c:1015
++#: g10/keyedit.c:1016
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
  "trust signatures on your behalf.\n"
  msgstr ""
  
- #: g10/keyedit.c:1032
++#: g10/keyedit.c:1033
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  
- #: g10/keyedit.c:1160
++#: g10/keyedit.c:1161
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1168
++#: g10/keyedit.c:1169
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "Utilizador \"%s\" está revocado."
  
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
- #: g10/keyedit.c:2246
++#: g10/keyedit.c:1178 g10/keyedit.c:1206 g10/keyedit.c:1233 g10/keyedit.c:1417
++#: g10/keyedit.c:2247
  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:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
- #: g10/keyedit.c:2251 g10/keyedit.c:3177
++#: g10/keyedit.c:1192 g10/keyedit.c:1220 g10/keyedit.c:1247 g10/keyedit.c:1423
++#: g10/keyedit.c:2252 g10/keyedit.c:3178
  msgid "  Unable to sign.\n"
  msgstr "  Não foi possível assinar.\n"
  
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1197
  #, fuzzy, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "Utilizador \"%s\" está revocado."
  
- #: g10/keyedit.c:1224
++#: g10/keyedit.c:1225
  #, fuzzy, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "AVISO: o ID do utilizador \"%s\" não é auto-assinado.\n"
  
- #: g10/keyedit.c:1253
++#: g10/keyedit.c:1254
  #, fuzzy, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "AVISO: o ID do utilizador \"%s\" não é auto-assinado.\n"
  
- #: g10/keyedit.c:1255
++#: g10/keyedit.c:1256
  #, fuzzy
  msgid "Sign it? (y/N) "
  msgstr "Realmente assinar? "
  
- #: g10/keyedit.c:1282
++#: g10/keyedit.c:1283
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -3968,11 -3093,9 +3921,11 @@@ msgstr "
  "A sua auto-assinatura em \"%s\"\n"
  "é uma assinatura do tipo PGP 2.x.\n"
  
- #: g10/keyedit.c:1291
++#: g10/keyedit.c:1292
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr "Quer promovê-la a uma auto-assinatura OpenPGP? (s/N) "
  
- #: g10/keyedit.c:1304
++#: g10/keyedit.c:1305
  #, fuzzy, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3981,12 -3104,10 +3934,12 @@@ msgstr "
  "A sua assinatura actual em \"%s\"\n"
  "é uma assinatura local.\n"
  
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:1310
  #, fuzzy
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr "Quer que a sua assinatura expire na mesma altura? (S/n) "
  
- #: g10/keyedit.c:1330
++#: g10/keyedit.c:1331
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3995,44 -3116,35 +3948,44 @@@ msgstr "
  "A sua assinatura actual em \"%s\"\n"
  "é uma assinatura local.\n"
  
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:1336
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr "Quer promovê-la a uma assinatura exportável? (s/N)"
  
- #: g10/keyedit.c:1355
++#: g10/keyedit.c:1356
  #, fuzzy, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "\"%s\" já foi assinado localmente pela chave %08lX\n"
  
- #: g10/keyedit.c:1359
++#: g10/keyedit.c:1360
  #, fuzzy, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "\"%s\" já foi assinado pela chave %08lX\n"
  
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:1365
  #, fuzzy
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "Você tem certeza de que quer adicioná-la de qualquer forma? (s/N) "
  
- #: g10/keyedit.c:1386
++#: g10/keyedit.c:1387
  #, fuzzy, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "Nada para assinar com a chave %08lX\n"
  
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1411
  msgid "This key has expired!"
  msgstr "Esta chave expirou!"
  
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1429
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "Esta chave vai expirar em %s.\n"
  
- #: g10/keyedit.c:1434
++#: g10/keyedit.c:1435
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr "Quer que a sua assinatura expire na mesma altura? (S/n) "
  
- #: g10/keyedit.c:1475
++#: g10/keyedit.c:1476
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -4042,32 -3154,26 +3995,32 @@@ msgstr "
  "pertence\n"
  "à pessoa correcta? Se não sabe o que responder, escolha \"0\".\n"
  
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1481
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) Não vou responder.%s\n"
  
- #: g10/keyedit.c:1482
++#: g10/keyedit.c:1483
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) Não verifiquei.%s\n"
  
- #: g10/keyedit.c:1484
++#: g10/keyedit.c:1485
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) Verifiquei por alto.%s\n"
  
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:1488
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) Verifiquei com bastante cuidado.%s\n"
  
- #: g10/keyedit.c:1494
++#: g10/keyedit.c:1495
  #, fuzzy
  msgid "Your selection? (enter '?' for more information): "
  msgstr " i = mostrar mais informações\n"
  
- #: g10/keyedit.c:1521
++#: g10/keyedit.c:1522
  #, fuzzy, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -4076,268 -3182,214 +4029,268 @@@ msgstr "
  "Você tem certeza de que quer assinar esta chave com\n"
  "a sua chave: \""
  
- #: g10/keyedit.c:1529
++#: g10/keyedit.c:1530
  #, fuzzy
  msgid "This will be a self-signature.\n"
  msgstr ""
  "\n"
  "Isto será uma auto-assinatura.\n"
  
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:1535
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr ""
  "\n"
  "AVISO: a assinatura não será marcada como não-exportável.\n"
  
- #: g10/keyedit.c:1541
++#: g10/keyedit.c:1542
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr ""
  "\n"
  "AVISO: a assinatura não será marcada como não-revocável.\n"
  
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1552
  #, fuzzy
  msgid "The signature will be marked as non-exportable.\n"
  msgstr ""
  "\n"
  "A assinatura será marcada como não-exportável.\n"
  
- #: g10/keyedit.c:1558
++#: g10/keyedit.c:1559
  #, fuzzy
  msgid "The signature will be marked as non-revocable.\n"
  msgstr ""
  "\n"
  "A assinatura será marcada como não-revocável.\n"
  
- #: g10/keyedit.c:1565
++#: g10/keyedit.c:1566
  #, fuzzy
  msgid "I have not checked this key at all.\n"
  msgstr ""
  "\n"
  "Não verifiquei esta chave.\n"
  
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:1571
  #, fuzzy
  msgid "I have checked this key casually.\n"
  msgstr ""
  "\n"
  "Verifiquei por alto esta chave.\n"
  
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:1576
  #, fuzzy
  msgid "I have checked this key very carefully.\n"
  msgstr ""
  "\n"
  "Verifiquei esta chave com muito cuidado.\n"
  
- #: g10/keyedit.c:1587
++#: g10/keyedit.c:1588
  #, fuzzy
  msgid "Really sign? (y/N) "
  msgstr "Realmente assinar? "
  
- #: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
- #: g10/keyedit.c:6463 g10/sign.c:323
++#: g10/keyedit.c:1639 g10/keyedit.c:6308 g10/keyedit.c:6391 g10/keyedit.c:6500
++#: g10/keyedit.c:6562 g10/sign.c:325
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "assinatura falhou: %s\n"
  
- #: g10/keyedit.c:1725
++#: g10/keyedit.c:1726
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  
- #: g10/keyedit.c:1755
++#: g10/keyedit.c:1756
  #, fuzzy, c-format
  #| msgid "error creating passphrase: %s\n"
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "erro na criação da frase secreta: %s\n"
  
- #: g10/keyedit.c:1869
++#: g10/keyedit.c:1870
  msgid "save and quit"
  msgstr "gravar e sair"
  
- #: g10/keyedit.c:1872
++#: g10/keyedit.c:1873
  #, fuzzy
  msgid "show key fingerprint"
  msgstr "mostra impressão digital"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1874
  #, fuzzy
  msgid "show the keygrip"
  msgstr "Notação de assinatura: "
  
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1875
  msgid "list key and user IDs"
  msgstr "lista chave e identificadores de utilizadores"
  
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1877
  msgid "select user ID N"
  msgstr "seleciona ID de utilizador N"
  
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1878
  #, fuzzy
  msgid "select subkey N"
  msgstr "seleciona ID de utilizador N"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1879
  #, fuzzy
  msgid "check signatures"
  msgstr "revoga assinaturas"
  
- #: g10/keyedit.c:1884
++#: g10/keyedit.c:1885
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr ""
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1890
  #, fuzzy
  msgid "sign selected user IDs locally"
  msgstr "assina a chave localmente"
  
- #: g10/keyedit.c:1890
++#: g10/keyedit.c:1891
  #, fuzzy
  msgid "sign selected user IDs with a trust signature"
  msgstr "Sugestão: Selecione os IDs de utilizador para assinar\n"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1893
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr ""
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1895
  msgid "add a user ID"
  msgstr "adiciona um novo ID de utilizador"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1897
  msgid "add a photo ID"
  msgstr "adiciona um identificador fotográfico"
  
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1898
  #, fuzzy
  msgid "delete selected user IDs"
  msgstr "remove ID de utilizador"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1901
  #, fuzzy
  msgid "add a subkey"
  msgstr "addkey"
  
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1904
  msgid "add a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1906
  msgid "move a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1908
  msgid "move a backup key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1910
  #, fuzzy
  msgid "delete selected subkeys"
  msgstr "remove uma chave secundária"
  
- #: g10/keyedit.c:1911
++#: g10/keyedit.c:1912
  msgid "add a revocation key"
  msgstr "adiciona uma chave de revocação"
  
- #: g10/keyedit.c:1913
++#: g10/keyedit.c:1914
  #, fuzzy
  msgid "delete signatures from the selected user IDs"
  msgstr ""
  "Realmente actualizar as preferências para os utilizadores seleccionados?"
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1916
  #, fuzzy
  msgid "change the expiration date for the key or selected subkeys"
  msgstr "Você não pode modificar a data de validade de uma chave v3\n"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1918
  #, fuzzy
  msgid "flag the selected user ID as primary"
  msgstr "seleccionar o identificador do utilizador como primário"
  
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1921
  msgid "list preferences (expert)"
  msgstr "lista preferências (perito)"
  
- #: g10/keyedit.c:1921
++#: g10/keyedit.c:1922
  msgid "list preferences (verbose)"
  msgstr "lista preferências (detalhadamente)"
  
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:1924
  #, fuzzy
  msgid "set preference list for the selected user IDs"
  msgstr ""
  "Realmente actualizar as preferências para os utilizadores seleccionados?"
  
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1927
  #, fuzzy
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr "não consegui processar a URI do servidor de chaves\n"
  
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1929
  #, fuzzy
  msgid "set a notation for the selected user IDs"
  msgstr ""
  "Realmente actualizar as preferências para os utilizadores seleccionados?"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1931
  msgid "change the passphrase"
  msgstr "muda a frase secreta"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1934
  msgid "change the ownertrust"
  msgstr "muda os valores de confiança"
  
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1937
  #, fuzzy
  msgid "revoke signatures on the selected user IDs"
  msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
  
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1939
  #, fuzzy
  msgid "revoke selected user IDs"
  msgstr "revocar um ID de utilizador"
  
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1942
  #, fuzzy
  msgid "revoke key or selected subkeys"
  msgstr "revoga uma chave secundária"
  
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1944
  #, fuzzy
  msgid "enable key"
  msgstr "activa uma chave"
  
- #: g10/keyedit.c:1944
++#: g10/keyedit.c:1945
  #, fuzzy
  msgid "disable key"
  msgstr "desactiva uma chave"
  
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1947
  #, fuzzy
  msgid "show selected photo IDs"
  msgstr "mostrar identificador fotográfico"
  
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1949
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:1951
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2063
  msgid "Secret key is available.\n"
  msgstr "Chave secreta disponível.\n"
  
- #: g10/keyedit.c:2162
++#: g10/keyedit.c:2163
  msgid "Need the secret key to do this.\n"
  msgstr "A chave secreta é necessária para fazer isto.\n"
  
- #: g10/keyedit.c:2183
++#: g10/keyedit.c:2184
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4345,280 -3397,225 +4298,285 @@@
  "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
  msgstr ""
  
- #: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
++#: g10/keyedit.c:2240 g10/keyedit.c:3178 g10/keyedit.c:3317 g10/keyedit.c:3379
  msgid "Key is revoked."
  msgstr "A chave está revogada."
  
- #: g10/keyedit.c:2262
++#: g10/keyedit.c:2263
  #, fuzzy
  msgid "Really sign all user IDs? (y/N) "
  msgstr "Realmente assinar todos os IDs de utilizador? "
  
- #: g10/keyedit.c:2266
++#: g10/keyedit.c:2267
  #, fuzzy
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "Realmente assinar todos os IDs de utilizador? "
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2275
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Sugestão: Selecione os IDs de utilizador para assinar\n"
  
- #: g10/keyedit.c:2285
++#: g10/keyedit.c:2286
  #, fuzzy, c-format
  msgid "Unknown signature type '%s'\n"
  msgstr "classe de assinatura desconhecida"
  
- #: g10/keyedit.c:2309
++#: g10/keyedit.c:2310
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
  msgstr "Este comando não é permitido no modo %s.\n"
  
- #: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
++#: g10/keyedit.c:2332 g10/keyedit.c:2356 g10/keyedit.c:2550
  msgid "You must select at least one user ID.\n"
  msgstr "Você precisa selecionar pelo menos um ID de utilizador.\n"
  
- #: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
++#: g10/keyedit.c:2334 g10/keyedit.c:2358 g10/keyedit.c:2512 g10/keyedit.c:2552
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2336
++#: g10/keyedit.c:2337
  msgid "You can't delete the last user ID!\n"
  msgstr "Você não pode remover o último ID de utilizador!\n"
  
- #: g10/keyedit.c:2339
++#: g10/keyedit.c:2340
  #, fuzzy
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "Realmente remover todos os IDs de utilizador seleccionados? "
  
- #: g10/keyedit.c:2340
++#: g10/keyedit.c:2341
  #, fuzzy
  msgid "Really remove this user ID? (y/N) "
  msgstr "Realmente remover este ID de utilizador? "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2397
++#: g10/keyedit.c:2398
  #, fuzzy
  msgid "Really move the primary key? (y/N) "
  msgstr "Realmente remover este ID de utilizador? "
  
- #: g10/keyedit.c:2409 g10/keyedit.c:4866
++#: g10/keyedit.c:2410 g10/keyedit.c:4964
  #, fuzzy
  msgid "You must select exactly one key.\n"
  msgstr "Você deve selecionar pelo menos uma chave.\n"
  
- #: g10/keyedit.c:2436
++#: g10/keyedit.c:2437
  msgid "Command expects a filename argument\n"
  msgstr ""
  
- #: g10/keyedit.c:2457
++#: g10/keyedit.c:2458
  #, fuzzy, c-format
  msgid "Can't open '%s': %s\n"
  msgstr "impossível abrir `%s': %s\n"
  
- #: g10/keyedit.c:2474
++#: g10/keyedit.c:2475
  #, fuzzy, c-format
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "erro ao criar porta-chaves `%s': %s\n"
  
- #: g10/keyedit.c:2509
++#: g10/keyedit.c:2510
  msgid "You must select at least one key.\n"
  msgstr "Você deve selecionar pelo menos uma chave.\n"
  
- #: g10/keyedit.c:2515
++#: g10/keyedit.c:2516
  #, fuzzy
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "Você quer realmente remover as chaves selecionadas? "
  
- #: g10/keyedit.c:2517
++#: g10/keyedit.c:2518
  #, fuzzy
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "Você quer realmente remover esta chave? "
  
- #: g10/keyedit.c:2555
++#: g10/keyedit.c:2556
  #, fuzzy
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
  
- #: g10/keyedit.c:2556
++#: g10/keyedit.c:2557
  #, fuzzy
  msgid "Really revoke this user ID? (y/N) "
  msgstr "Realmente revocar este ID de utilizador? "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2575
  #, fuzzy
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "Você quer realmente revogar esta chave? "
  
- #: g10/keyedit.c:2585
++#: g10/keyedit.c:2586
  #, fuzzy
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "Você quer realmente revogar as chaves selecionadas? "
  
- #: g10/keyedit.c:2587
++#: g10/keyedit.c:2588
  #, fuzzy
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "Você quer realmente revogar esta chave? "
  
- #: g10/keyedit.c:2645
++#: g10/keyedit.c:2646
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  
- #: g10/keyedit.c:2690
++#: g10/keyedit.c:2691
  #, fuzzy
  msgid "Set preference list to:\n"
  msgstr "configurar lista de preferências"
  
- #: g10/keyedit.c:2697
++#: g10/keyedit.c:2698
  #, fuzzy
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr ""
  "Realmente actualizar as preferências para os utilizadores seleccionados?"
  
- #: g10/keyedit.c:2699
++#: g10/keyedit.c:2700
  #, fuzzy
  msgid "Really update the preferences? (y/N) "
  msgstr "Realmente actualizar as preferências?"
  
- #: g10/keyedit.c:2773
++#: g10/keyedit.c:2774
  #, fuzzy
  msgid "Save changes? (y/N) "
  msgstr "Gravar alterações? "
  
- #: g10/keyedit.c:2777
++#: g10/keyedit.c:2778
  #, fuzzy
  msgid "Quit without saving? (y/N) "
  msgstr "Sair sem gravar? "
  
- #: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
- #: g10/keyedit.c:3267 g10/keyedit.c:3332
++#: g10/keyedit.c:2789 g10/keyedit.c:2799 g10/keyedit.c:2943 g10/keyedit.c:3046
++#: g10/keyedit.c:3268 g10/keyedit.c:3333 g10/keyedit.c:3409
  #, c-format
  msgid "update failed: %s\n"
  msgstr "actualização falhou: %s\n"
  
- #: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
++#: g10/keyedit.c:2805 g10/keyedit.c:3273 g10/keyedit.c:3338 g10/keyedit.c:3416
  msgid "Key not changed so no update needed.\n"
  msgstr "Chave não alterada, nenhuma actualização é necessária.\n"
  
- #: g10/keyedit.c:3038
++#: g10/keyedit.c:3039
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
  msgstr "A geração de chaves falhou: %s\n"
  
- #: g10/keyedit.c:3083
++#: g10/keyedit.c:3084
  #, fuzzy, c-format
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "%s: versão de ficheiro inválida %d\n"
  
- #: g10/keyedit.c:3112
++#: g10/keyedit.c:3113
  #, 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:3248 g10/keyedit.c:3251
++#: g10/keyedit.c:3249 g10/keyedit.c:3252
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
  msgstr "valor inválido\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  #, fuzzy
  #| msgid "No such user ID.\n"
  msgid "No matching user IDs."
  msgstr "Identificador de utilizador inexistente.\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  #, fuzzy
  msgid "Nothing to sign.\n"
  msgstr "Nada para assinar com a chave %08lX\n"
  
- #: g10/keyedit.c:3427
++#: g10/keyedit.c:3388
+ #, 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:3508
  msgid "Digest: "
  msgstr "'Digest': "
  
- #: g10/keyedit.c:3484
++#: g10/keyedit.c:3565
  msgid "Features: "
  msgstr "Características: "
  
- #: g10/keyedit.c:3495
++#: g10/keyedit.c:3576
  msgid "Keyserver no-modify"
  msgstr ""
  
- #: g10/keyedit.c:3510 g10/keylist.c:377
++#: g10/keyedit.c:3591 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr ""
  
- #: g10/keyedit.c:3518 g10/keyedit.c:3519
++#: g10/keyedit.c:3599 g10/keyedit.c:3600
  #, fuzzy
  msgid "Notations: "
  msgstr "Notação: "
  
- #: g10/keyedit.c:3764
++#: g10/keyedit.c:3845
  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:3836
++#: g10/keyedit.c:3917
  #, 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:3860
++#: g10/keyedit.c:3941
  #, 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:3866
++#: g10/keyedit.c:3947
  #, fuzzy
  msgid "(sensitive)"
  msgstr " (sensível)"
  
- #: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3989 g10/keyedit.c:4131 g10/keylist.c:262 g10/keyserver.c:538
  #, fuzzy, c-format
  msgid "created: %s"
  msgstr "impossível criar %s: %s\n"
  
- #: g10/keyedit.c:3911 g10/keylist.c:1852
++#: g10/keyedit.c:3992 g10/keylist.c:1852
  #, fuzzy, c-format
  msgid "revoked: %s"
  msgstr "revkey"
  
- #: g10/keyedit.c:3913 g10/keylist.c:1858
++#: g10/keyedit.c:3994 g10/keylist.c:1858
  #, fuzzy, c-format
  msgid "expired: %s"
  msgstr "[expira: %s]"
  
- #: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyedit.c:3996 g10/keyedit.c:4133 g10/keylist.c:264 g10/keylist.c:1864
 +#: g10/keyserver.c:544
  #, fuzzy, c-format
  msgid "expires: %s"
  msgstr "[expira: %s]"
  
- #: g10/keyedit.c:3917
++#: g10/keyedit.c:3998
  #, fuzzy, c-format
  msgid "usage: %s"
  msgstr " confiança: %c/%c"
  
- #: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
++#: g10/keyedit.c:4006 g10/keyedit.c:4026 g10/keylist.c:267
  msgid "card-no: "
  msgstr ""
  
- #: g10/keyedit.c:3984
++#: g10/keyedit.c:4065
  #, fuzzy, c-format
  msgid "trust: %s"
  msgstr " confiança: %c/%c"
  
- #: g10/keyedit.c:3988
++#: g10/keyedit.c:4069
  #, c-format
  msgid "validity: %s"
  msgstr ""
  
- #: g10/keyedit.c:3995
++#: g10/keyedit.c:4076
  msgid "This key has been disabled"
  msgstr "Esta chave foi desactivada"
  
- #: g10/keyedit.c:4013
++#: g10/keyedit.c:4094
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4626,36 -3623,27 +4584,36 @@@ 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:4069 g10/keyedit.c:4500 g10/keyserver.c:548
- #: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: g10/keyedit.c:4150 g10/keyedit.c:4581 g10/keyserver.c:548
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:712
 +#: dirmngr/ocsp.c:703
  #, fuzzy
  msgid "revoked"
  msgstr "revkey"
  
- #: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
- #: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4152 g10/keyedit.c:4583 g10/keyserver.c:552
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:714
  #, fuzzy
  msgid "expired"
  msgstr "expire"
  
- #: g10/keyedit.c:4188
++#: g10/keyedit.c:4269
  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:4240
++#: g10/keyedit.c:4321
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr ""
  
- #: g10/keyedit.c:4241
++#: g10/keyedit.c:4322
  #, fuzzy
  #| 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:4300
++#: g10/keyedit.c:4381
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4664,36 -3652,28 +4622,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:4305 g10/keyedit.c:4595
++#: g10/keyedit.c:4386 g10/keyedit.c:4676
  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:4311
++#: g10/keyedit.c:4392
  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:4326 g10/keygen.c:2697
++#: g10/keyedit.c:4407 g10/keygen.c:2719
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4509
  msgid "Delete this good signature? (y/N/q)"
  msgstr "Apagar esta assinatura válida? (s/N/q)"
  
- #: g10/keyedit.c:4438
++#: g10/keyedit.c:4519
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "Apagar esta assinatura inválida? (s/N/q)"
  
- #: g10/keyedit.c:4442
++#: g10/keyedit.c:4523
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4530
  msgid "Really delete this self-signature? (y/N)"
  msgstr "Realmente remover esta auto-assinatura? (s/N)"
  
- #: g10/keyedit.c:4465
++#: g10/keyedit.c:4546
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
@@@ -4701,38 -3681,31 +4659,38 @@@ msgid_plural "Deleted %d signatures.\n
  msgstr[0] "%d assinatura removida.\n"
  msgstr[1] "%d assinatura removida.\n"
  
- #: g10/keyedit.c:4469
++#: g10/keyedit.c:4550
  msgid "Nothing deleted.\n"
  msgstr "Nada removido.\n"
  
- #: g10/keyedit.c:4504 g10/trust.c:693
++#: g10/keyedit.c:4585 g10/trust.c:716
  #, fuzzy
  msgid "invalid"
  msgstr "armadura inválida"
  
- #: g10/keyedit.c:4506
++#: g10/keyedit.c:4587
  #, fuzzy, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "Utilizador \"%s\" está revocado."
  
- #: g10/keyedit.c:4512
++#: g10/keyedit.c:4593
  #, 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:4520
++#: g10/keyedit.c:4601
  #, fuzzy, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "o utilizador com o id \"%s\" já está revocado\n"
  
- #: g10/keyedit.c:4521
++#: g10/keyedit.c:4602
  #, fuzzy, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "o utilizador com o id \"%s\" já está revocado\n"
  
- #: g10/keyedit.c:4590
++#: g10/keyedit.c:4671
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4741,280 -3714,221 +4699,280 @@@ 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:4601
++#: g10/keyedit.c:4682
  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:4618
++#: g10/keyedit.c:4699
  msgid "Enter the user ID of the designated revoker: "
  msgstr "Insira o ID de utilizador do revogador escolhido: "
  
- #: g10/keyedit.c:4643
++#: g10/keyedit.c:4724
  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:4658
++#: g10/keyedit.c:4739
  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:4680
++#: g10/keyedit.c:4761
  #, fuzzy
  msgid "this key has already been designated as a revoker\n"
  msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
  
- #: g10/keyedit.c:4698
++#: g10/keyedit.c:4779
  #, 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:4704
++#: g10/keyedit.c:4785
  #, 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:4755
++#: g10/keyedit.c:4848
  #, 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:4760
++#: g10/keyedit.c:4853
  #, 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:4763
++#: g10/keyedit.c:4856
  msgid "Changing expiration time for the primary key.\n"
  msgstr "Modificar a data de validade para uma chave primária.\n"
  
- #: g10/keyedit.c:4814
++#: g10/keyedit.c:4910
  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:4987
++#: g10/keyedit.c:5085
  #, 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:4993
++#: g10/keyedit.c:5091
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr ""
  
- #: g10/keyedit.c:5108
++#: g10/keyedit.c:5206
  msgid "Please select exactly one user ID.\n"
  msgstr "Seleccione exactamente um identificador de utilizador.\n"
  
- #: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
++#: g10/keyedit.c:5247 g10/keyedit.c:5361 g10/keyedit.c:5474 g10/keyedit.c:5611
  #, 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:5320
++#: g10/keyedit.c:5418
  msgid "Enter your preferred keyserver URL: "
  msgstr ""
  
- #: g10/keyedit.c:5399
++#: g10/keyedit.c:5497
  #, 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:5400
++#: g10/keyedit.c:5498
  #, 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:5459
++#: g10/keyedit.c:5557
  #, fuzzy
  msgid "Enter the notation: "
  msgstr "Notação de assinatura: "
  
- #: g10/keyedit.c:5606
++#: g10/keyedit.c:5704
  #, fuzzy
  msgid "Proceed? (y/N) "
  msgstr "Escrever por cima (s/N)? "
  
- #: g10/keyedit.c:5676
++#: g10/keyedit.c:5774
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "Nenhum ID de utilizador com índice %d\n"
  
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5836
  #, fuzzy, c-format
  msgid "No user ID with hash %s\n"
  msgstr "Nenhum ID de utilizador com índice %d\n"
  
- #: g10/keyedit.c:5839
++#: g10/keyedit.c:5937
  #, fuzzy, c-format
  msgid "No subkey with key ID '%s'.\n"
  msgstr "Nenhum ID de utilizador com índice %d\n"
  
- #: g10/keyedit.c:5861
++#: g10/keyedit.c:5959
  #, fuzzy, c-format
  msgid "No subkey with index %d\n"
  msgstr "Nenhum ID de utilizador com índice %d\n"
  
- #: g10/keyedit.c:6002
++#: g10/keyedit.c:6100
  #, fuzzy, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "ID de utilizador: \""
  
- #: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
++#: g10/keyedit.c:6103 g10/keyedit.c:6205 g10/keyedit.c:6253
  #, 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:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
++#: g10/keyedit.c:6105 g10/keyedit.c:6207 g10/keyedit.c:6255
  msgid " (non-exportable)"
  msgstr "  (não-exportável)"
  
- #: g10/keyedit.c:6011
++#: g10/keyedit.c:6109
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "Esta assinatura expirou em %s.\n"
  
- #: g10/keyedit.c:6016
++#: g10/keyedit.c:6114
  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:6021
++#: g10/keyedit.c:6119
  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:6075
++#: g10/keyedit.c:6173
  #, fuzzy
  msgid "Not signed by you.\n"
  msgstr "   assinado por %08lX em %s%s\n"
  
- #: g10/keyedit.c:6081
++#: g10/keyedit.c:6179
  #, fuzzy, c-format
  msgid "You have signed these user IDs on key %s:\n"
  msgstr "Assinou estes identificadores de utilizadores:\n"
  
- #: g10/keyedit.c:6110
++#: g10/keyedit.c:6208
  #, fuzzy
  msgid " (non-revocable)"
  msgstr "  (não-exportável)"
  
- #: g10/keyedit.c:6117
++#: g10/keyedit.c:6215
  #, fuzzy, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "   revogado por %08lX em %s\n"
  
- #: g10/keyedit.c:6142
++#: g10/keyedit.c:6240
  msgid "You are about to revoke these signatures:\n"
  msgstr "Está prestes a revogar estas assinaturas:\n"
  
- #: g10/keyedit.c:6165
++#: g10/keyedit.c:6263
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "Realmente criar os certificados de revogação? (s/N) "
  
- #: g10/keyedit.c:6198
++#: g10/keyedit.c:6296
  msgid "no secret key\n"
  msgstr "nenhuma chave secreta\n"
  
- #: g10/keyedit.c:6246
++#: g10/keyedit.c:6344
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6256
++#: g10/keyedit.c:6354
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "o utilizador com o id \"%s\" já está revocado\n"
  
- #: g10/keyedit.c:6273
++#: g10/keyedit.c:6371
  #, 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:6386
++#: g10/keyedit.c:6485
  #, fuzzy, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "o utilizador com o id \"%s\" já está revocado\n"
  
- #: g10/keyedit.c:6448
++#: g10/keyedit.c:6547
  #, fuzzy, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "o utilizador com o id \"%s\" já está revocado\n"
  
- #: g10/keyedit.c:6545
++#: g10/keyedit.c:6644
  #, fuzzy, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr ""
  "A mostrar a fotografia %s com o tamanho %ld da chave 0x%08lX (uid %d)\n"
  
- #: g10/keygen.c:305
++#: g10/keygen.c:316
  #, fuzzy, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "preferência %c%lu duplicada\n"
  
- #: g10/keygen.c:312
++#: g10/keygen.c:323
  #, fuzzy
  msgid "too many cipher preferences\n"
  msgstr "demasiadas preferências `%c'\n"
  
- #: g10/keygen.c:314
++#: g10/keygen.c:325
  #, fuzzy
  msgid "too many digest preferences\n"
  msgstr "demasiadas preferências `%c'\n"
  
- #: g10/keygen.c:316
++#: g10/keygen.c:327
  #, fuzzy
  msgid "too many compression preferences\n"
  msgstr "demasiadas preferências `%c'\n"
  
- #: g10/keygen.c:457
++#: g10/keygen.c:468
  #, fuzzy, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "caracter inválido na cadeia de caractéres da preferência\n"
  
- #: g10/keygen.c:936
++#: g10/keygen.c:947
  msgid "writing direct signature\n"
  msgstr "a escrever a assinatura directa\n"
  
- #: g10/keygen.c:982
++#: g10/keygen.c:993
  msgid "writing self signature\n"
  msgstr "a escrever a auto-assinatura\n"
  
- #: g10/keygen.c:1038
++#: g10/keygen.c:1049
  msgid "writing key binding signature\n"
  msgstr "a escrever a assinatura ligada a uma chave\n"
  
- #: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
- #: g10/keygen.c:1610 g10/keygen.c:1615
++#: g10/keygen.c:1413 g10/keygen.c:1418 g10/keygen.c:1470 g10/keygen.c:1475
++#: g10/keygen.c:1622 g10/keygen.c:1627
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "tamanho de chave inválido; a utilizar %u bits\n"
  
- #: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
++#: g10/keygen.c:1424 g10/keygen.c:1481 g10/keygen.c:1489 g10/keygen.c:1633
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "tamanho da chave arredondado para %u bits\n"
  
- #: g10/keygen.c:1503
++#: g10/keygen.c:1515
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1677
++#: g10/keygen.c:1689
  #, fuzzy
  msgid "Sign"
  msgstr "sign"
  
- #: g10/keygen.c:1680
++#: g10/keygen.c:1692
  msgid "Certify"
  msgstr ""
  
- #: g10/keygen.c:1683
++#: g10/keygen.c:1695
  #, fuzzy
  msgid "Encrypt"
  msgstr "cifrar dados"
  
- #: g10/keygen.c:1686
++#: g10/keygen.c:1698
  msgid "Authenticate"
  msgstr ""
  
@@@ -5028,157 -3942,126 +4986,157 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1705
++#: g10/keygen.c:1717
  msgid "SsEeAaQq"
  msgstr ""
  
- #: g10/keygen.c:1732
++#: g10/keygen.c:1744
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr ""
  
- #: g10/keygen.c:1738
++#: g10/keygen.c:1750
  msgid "Current allowed actions: "
  msgstr ""
  
- #: g10/keygen.c:1743
++#: g10/keygen.c:1755
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr ""
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1758
  #, fuzzy, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%d) ElGamal (apenas cifragem)\n"
  
- #: g10/keygen.c:1749
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr ""
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr ""
  
- #: g10/keygen.c:1881 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1893 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Por favor selecione o tipo de chave desejado:\n"
  
- #: g10/keygen.c:1885
++#: g10/keygen.c:1897
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) DSA e ElGamal (por omissão)\n"
  
- #: g10/keygen.c:1889
++#: g10/keygen.c:1901
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA e ElGamal (por omissão)\n"
  
- #: g10/keygen.c:1892
++#: g10/keygen.c:1904
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (apenas assinatura)\n"
  
- #: g10/keygen.c:1894
++#: g10/keygen.c:1906
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (apenas assinatura)\n"
  
- #: g10/keygen.c:1900
++#: g10/keygen.c:1912
  #, fuzzy, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) ElGamal (apenas cifragem)\n"
  
- #: g10/keygen.c:1902
++#: g10/keygen.c:1914
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (apenas cifragem)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1920
  #, fuzzy, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (apenas cifragem)\n"
  
- #: g10/keygen.c:1910
++#: g10/keygen.c:1922
  #, fuzzy, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (apenas cifragem)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1928
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA e ElGamal (por omissão)\n"
  
- #: g10/keygen.c:1918
++#: g10/keygen.c:1930
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (apenas assinatura)\n"
  
- #: g10/keygen.c:1920
++#: g10/keygen.c:1932
  #, fuzzy, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) RSA (apenas cifragem)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1934
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) RSA (apenas cifragem)\n"
  
- #: g10/keygen.c:1926
++#: g10/keygen.c:1938
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) RSA (apenas cifragem)\n"
  
- #: g10/keygen.c:2022 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:206
  #, fuzzy
  msgid "Enter the keygrip: "
  msgstr "Notação de assinatura: "
  
- #: g10/keygen.c:2035 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2047 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2049 sm/certreqgen-ui.c:216
  #, fuzzy
  msgid "No key with this keygrip\n"
  msgstr "Nenhum ID de utilizador com índice %d\n"
  
- #: g10/keygen.c:2111 g10/keygen.c:2125
++#: g10/keygen.c:2133 g10/keygen.c:2147
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
  msgstr "arredondado para %u bits\n"
  
- #: g10/keygen.c:2166
++#: g10/keygen.c:2188
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr ""
  
- #: g10/keygen.c:2174
++#: g10/keygen.c:2196
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Qual o tamanho de chave desejado? (1024) "
  
- #: g10/keygen.c:2177 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2199 sm/certreqgen-ui.c:183
  #, fuzzy, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Qual o tamanho de chave desejado? (1024) "
  
- #: g10/keygen.c:2191 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2213 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "O tamanho de chave pedido é %u bits\n"
  
- #: g10/keygen.c:2237
++#: g10/keygen.c:2259
  #, fuzzy
  #| msgid "Please select what kind of key you want:\n"
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Por favor selecione o tipo de chave desejado:\n"
  
- #: g10/keygen.c:2409
++#: g10/keygen.c:2431
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5194,7 -4077,6 +5152,7 @@@ msgstr "
  "      <n>m = chave expira em n meses\n"
  "      <n>y = chave expira em n anos\n"
  
- #: g10/keygen.c:2420
++#: g10/keygen.c:2442
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5210,40 -4092,32 +5168,40 @@@ msgstr "
  "      <n>m = assinatura expira em n meses\n"
  "      <n>y = assinatura expira em n anos\n"
  
- #: g10/keygen.c:2443
++#: g10/keygen.c:2465
  msgid "Key is valid for? (0) "
  msgstr "A chave é valida por? (0) "
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2470
  #, fuzzy, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "A assinatura é valida por? (0) "
  
- #: g10/keygen.c:2461 g10/keygen.c:2486
++#: g10/keygen.c:2483 g10/keygen.c:2508
  msgid "invalid value\n"
  msgstr "valor inválido\n"
  
- #: g10/keygen.c:2468
++#: g10/keygen.c:2490
  #, fuzzy
  msgid "Key does not expire at all\n"
  msgstr "A %s não expira nunca\n"
  
- #: g10/keygen.c:2469
++#: g10/keygen.c:2491
  #, fuzzy
  msgid "Signature does not expire at all\n"
  msgstr "A %s não expira nunca\n"
  
- #: g10/keygen.c:2474
++#: g10/keygen.c:2496
  #, fuzzy, c-format
  msgid "Key expires at %s\n"
  msgstr "%s expira em %s\n"
  
- #: g10/keygen.c:2475
++#: g10/keygen.c:2497
  #, fuzzy, c-format
  msgid "Signature expires at %s\n"
  msgstr "Esta assinatura expirou em %s.\n"
  
- #: g10/keygen.c:2479
++#: g10/keygen.c:2501
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5251,12 -4125,10 +5209,12 @@@ msgstr "
  "O seu sistema não consegue mostrar datas para além de 2038.\n"
  "No entanto, estas vão ser tratadas correctamente até 2106.\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2514
  #, fuzzy
  msgid "Is this correct? (y/N) "
  msgstr "Está correto (s/n)? "
  
- #: g10/keygen.c:2560
++#: g10/keygen.c:2582
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5267,7 -4139,6 +5225,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2575
++#: g10/keygen.c:2597
  #, fuzzy
  msgid ""
  "\n"
@@@ -5285,50 -4156,39 +5243,50 @@@ msgstr "
  "    \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
  "\n"
  
- #: g10/keygen.c:2594
++#: g10/keygen.c:2616
  msgid "Real name: "
  msgstr "Nome completo: "
  
- #: g10/keygen.c:2603
++#: g10/keygen.c:2625
  msgid "Invalid character in name\n"
  msgstr "Caracter inválido no nome\n"
  
- #: g10/keygen.c:2604
++#: g10/keygen.c:2626
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2608
++#: g10/keygen.c:2630
  msgid "Name may not start with a digit\n"
  msgstr "O nome não pode começar com um dígito\n"
  
- #: g10/keygen.c:2611
++#: g10/keygen.c:2633
  msgid "Name must be at least 5 characters long\n"
  msgstr "O nome deve ter pelo menos 5 caracteres\n"
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2643
  msgid "Email address: "
  msgstr "Endereço de correio eletrónico: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2649
  msgid "Not a valid email address\n"
  msgstr "Endereço eletrónico inválido\n"
  
- #: g10/keygen.c:2636
++#: g10/keygen.c:2658
  msgid "Comment: "
  msgstr "Comentário: "
  
- #: g10/keygen.c:2642
++#: g10/keygen.c:2664
  msgid "Invalid character in comment\n"
  msgstr "Caracter inválido no comentário\n"
  
- #: g10/keygen.c:2678
++#: g10/keygen.c:2700
  #, fuzzy, c-format
  #| msgid "You are using the `%s' character set.\n"
  msgid "You are using the '%s' character set.\n"
  msgstr "Você está usando o conjunto de caracteres `%s'.\n"
  
- #: g10/keygen.c:2684
++#: g10/keygen.c:2706
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5339,7 -4199,6 +5297,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2689
++#: g10/keygen.c:2711
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr ""
  "Por favor não coloque o endereço de email no nome verdadeiro ou no "
@@@ -5356,35 -4215,28 +5314,35 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2714
++#: g10/keygen.c:2736
  msgid "NnCcEeOoQq"
  msgstr "NnCcEeOoSs"
  
- #: g10/keygen.c:2724
++#: g10/keygen.c:2746
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "Mudar (N)ome, (C)omentário, (E)mail ou (S)air? "
  
- #: g10/keygen.c:2725
++#: g10/keygen.c:2747
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr "Mudar (N)ome, (C)omentário, (E)ndereço ou (O)k/(S)air? "
  
- #: g10/keygen.c:2730
++#: g10/keygen.c:2752
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "Mudar (N)ome, (C)omentário, (E)mail ou (S)air? "
  
- #: g10/keygen.c:2731
++#: g10/keygen.c:2753
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "Mudar (N)ome, (C)omentário, (E)ndereço ou (O)k/(S)air? "
  
- #: g10/keygen.c:2750
++#: g10/keygen.c:2772
  msgid "Please correct the error first\n"
  msgstr "Por favor corrija primeiro o erro\n"
  
- #: g10/keygen.c:2796
++#: g10/keygen.c:2818
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5396,13 -4248,10 +5354,13 @@@ msgstr "
  "geração dos números primos; isso dá ao gerador de números aleatórios\n"
  "uma hipótese maior de ganhar entropia suficiente.\n"
  
- #: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
- #: g10/keygen.c:4777 g10/keygen.c:4882
++#: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
++#: g10/keygen.c:4330 g10/keygen.c:4803 g10/keygen.c:5064 g10/keygen.c:5169
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "A geração de chaves falhou: %s\n"
  
- #: g10/keygen.c:3598
++#: g10/keygen.c:3922
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5410,68 -4259,55 +5368,68 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3924
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3621
++#: g10/keygen.c:3945
  #, fuzzy, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "%s' já comprimido\n"
  
- #: g10/keygen.c:3626
++#: g10/keygen.c:3950
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "Create anyway? (y/N) "
  msgstr "Criar mesmo assim?"
  
- #: g10/keygen.c:3632
++#: g10/keygen.c:3956
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "creating anyway\n"
  msgstr "Criar mesmo assim?"
  
- #: g10/keygen.c:3981
++#: g10/keygen.c:4315
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:4013
++#: g10/keygen.c:4358
  msgid "Key generation canceled.\n"
  msgstr "Geração de chave cancelada.\n"
  
- #: g10/keygen.c:4073
++#: g10/keygen.c:4418
  #, fuzzy, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "impossível criar `%s': %s\n"
  
- #: g10/keygen.c:4093
++#: g10/keygen.c:4438
  #, fuzzy, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "NOTA: chave secreta %08lX expirou em %s\n"
  
- #: g10/keygen.c:4244 g10/keygen.c:4393
++#: g10/keygen.c:4589 g10/keygen.c:4738
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
  msgstr "a escrever chave pública para `%s'\n"
  
- #: g10/keygen.c:4387
++#: g10/keygen.c:4732
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "nenhum porta-chaves público com permissões de escrita encontrado: %s\n"
  
- #: g10/keygen.c:4401
++#: g10/keygen.c:4746
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error writing public keyring '%s': %s\n"
  msgstr "erro ao escrever no porta-chaves público `%s': %s\n"
  
- #: g10/keygen.c:4433
++#: g10/keygen.c:4778
  msgid "public and secret key created and signed.\n"
  msgstr "chaves pública e privada criadas e assinadas.\n"
  
- #: g10/keygen.c:4445
++#: g10/keygen.c:4790
  #, fuzzy
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
@@@ -5480,7 -4316,6 +5438,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:4649 g10/keygen.c:4833
++#: g10/keygen.c:4936 g10/keygen.c:5120
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5488,7 -4323,6 +5446,7 @@@ msgstr "
  "a chave foi criada %lu segundo no futuro\n"
  "(viagem no tempo ou problema no relógio)\n"
  
- #: g10/keygen.c:4651 g10/keygen.c:4835
++#: g10/keygen.c:4938 g10/keygen.c:5122
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5496,22 -4330,18 +5454,22 @@@ msgstr "
  "a chave foi criada %lu segundos no futuro\n"
  "(viagem no tempo ou problema no relógio)\n"
  
- #: g10/keygen.c:4662 g10/keygen.c:4846
++#: g10/keygen.c:4949 g10/keygen.c:5133
  #, fuzzy
  #| 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:4674 g10/keygen.c:4676
++#: g10/keygen.c:4961 g10/keygen.c:4963
  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:4683 g10/keygen.c:4685
++#: g10/keygen.c:4970 g10/keygen.c:4972
  #, fuzzy
  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:4704 g10/keygen.c:4860
++#: g10/keygen.c:4991 g10/keygen.c:5147
  #, fuzzy
  msgid "Really create? (y/N) "
  msgstr "Realmente criar? "
@@@ -5837,130 -4602,104 +5795,130 @@@ msgstr "
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
  msgstr "revocação solitária - utilize \"gpg --import\" para aplicar\n"
  
- #: g10/mainproc.c:1233 g10/mainproc.c:1276
++#: g10/mainproc.c:1238 g10/mainproc.c:1281
  #, fuzzy
  msgid "no signature found\n"
  msgstr "Assinatura correcta de \""
  
- #: g10/mainproc.c:1607
++#: g10/mainproc.c:1612
  #, fuzzy, c-format
  msgid "BAD signature from \"%s\""
  msgstr "Assinatura INCORRECTA de \""
  
- #: g10/mainproc.c:1609
++#: g10/mainproc.c:1614
  #, fuzzy, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Assinatura expirada de \""
  
- #: g10/mainproc.c:1611
++#: g10/mainproc.c:1616
  #, fuzzy, c-format
  msgid "Good signature from \"%s\""
  msgstr "Assinatura correcta de \""
  
- #: g10/mainproc.c:1630
++#: g10/mainproc.c:1635
  msgid "signature verification suppressed\n"
  msgstr "verificação de assinatura suprimida\n"
  
- #: g10/mainproc.c:1739
++#: g10/mainproc.c:1744
  #, fuzzy
  msgid "can't handle this ambiguous signature data\n"
  msgstr "não consigo tratar estas assinaturas múltiplas\n"
  
- #: g10/mainproc.c:1753 g10/mainproc.c:1761
++#: g10/mainproc.c:1758 g10/mainproc.c:1766
  #, fuzzy, c-format
  msgid "Signature made %s\n"
  msgstr "Esta assinatura expirou em %s.\n"
  
- #: g10/mainproc.c:1754 g10/mainproc.c:1762
++#: g10/mainproc.c:1759 g10/mainproc.c:1767
  #, fuzzy, c-format
  msgid "               using %s key %s\n"
  msgstr "                   ou \""
  
- #: g10/mainproc.c:1766
++#: g10/mainproc.c:1771
  #, 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:1772
++#: g10/mainproc.c:1777
  #, fuzzy, c-format
  msgid "               issuer \"%s\"\n"
  msgstr "                   ou \""
  
- #: g10/mainproc.c:1789
++#: g10/mainproc.c:1794
  #, fuzzy
  msgid "Key available at: "
  msgstr "Nenhuma ajuda disponível"
  
- #: g10/mainproc.c:2024
++#: g10/mainproc.c:2029
  msgid "[uncertain]"
  msgstr "[incerto]"
  
- #: g10/mainproc.c:2062
++#: g10/mainproc.c:2067
  #, fuzzy, c-format
  msgid "                aka \"%s\""
  msgstr "                   ou \""
  
- #: g10/mainproc.c:2145
++#: g10/mainproc.c:2150
  #, fuzzy, c-format
  msgid "Signature expired %s\n"
  msgstr "Esta assinatura expirou em %s.\n"
  
- #: g10/mainproc.c:2149
++#: g10/mainproc.c:2154
  #, fuzzy, c-format
  msgid "Signature expires %s\n"
  msgstr "Esta assinatura expirou em %s.\n"
  
- #: g10/mainproc.c:2160
++#: g10/mainproc.c:2165
  #, fuzzy, c-format
  msgid "%s signature, digest algorithm %s%s%s\n"
  msgstr "assinatura %s de: \"%s\"\n"
  
- #: g10/mainproc.c:2161
++#: g10/mainproc.c:2166
  #, fuzzy
  msgid "binary"
  msgstr "primary"
  
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2167
  msgid "textmode"
  msgstr ""
  
- #: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
  #, fuzzy
  msgid "unknown"
  msgstr "versão desconhecida"
  
- #: g10/mainproc.c:2164
++#: g10/mainproc.c:2169
  #, fuzzy
  #| msgid "unknown pubkey algorithm"
  msgid ", key algorithm "
  msgstr "algoritmo de chave pública desconhecido"
  
- #: g10/mainproc.c:2199
++#: g10/mainproc.c:2204
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2229
++#: g10/mainproc.c:2234
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "Impossível verificar assinatura: %s\n"
  
- #: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
++#: g10/mainproc.c:2327 g10/mainproc.c:2346 g10/mainproc.c:2470
  msgid "not a detached signature\n"
  msgstr "não é uma assinatura separada\n"
  
- #: g10/mainproc.c:2375
++#: g10/mainproc.c:2380
  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:2384
++#: g10/mainproc.c:2389
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "assinatura de classe 0x%02x\n"
  
- #: g10/mainproc.c:2469
++#: g10/mainproc.c:2474
  msgid "old style (PGP 2.x) signature\n"
  msgstr "formato de assinatura antigo (PGP2.x)\n"
  
@@@ -6245,23 -4930,18 +6203,23 @@@ msgstr "Está correto (s/n)? 
  msgid "unable to display photo ID!\n"
  msgstr "não foi possível alterar o exec-path para %s\n"
  
- #: g10/pkclist.c:72 g10/revoke.c:757
++#: g10/pkclist.c:72 g10/revoke.c:758
  msgid "No reason specified"
  msgstr "Nenhum motivo especificado"
  
- #: g10/pkclist.c:74 g10/revoke.c:759
++#: g10/pkclist.c:74 g10/revoke.c:760
  msgid "Key is superseded"
  msgstr "A chave foi substituída"
  
- #: g10/pkclist.c:76 g10/revoke.c:758
++#: g10/pkclist.c:76 g10/revoke.c:759
  msgid "Key has been compromised"
  msgstr "A chave foi comprometida"
  
- #: g10/pkclist.c:78 g10/revoke.c:760
++#: g10/pkclist.c:78 g10/revoke.c:761
  msgid "Key is no longer used"
  msgstr "A chave já não é utilizada"
  
- #: g10/pkclist.c:80 g10/revoke.c:761
++#: g10/pkclist.c:80 g10/revoke.c:762
  msgid "User ID is no longer valid"
  msgstr "O identificador do utilizador já não é válido"
  
@@@ -6342,7 -5009,6 +6300,7 @@@ msgid "
  "\n"
  msgstr ""
  
- #: g10/pkclist.c:310 g10/revoke.c:786
++#: g10/pkclist.c:310 g10/revoke.c:787
  msgid "Your decision? "
  msgstr "Decisão? "
  
@@@ -6381,10 -5040,9 +6339,10 @@@ msgstr "Esta chave pertence-nos\n
  msgid "%s: This key is bad!  It has been marked as untrusted!\n"
  msgstr ""
  
 +#: g10/pkclist.c:484
  #, fuzzy
  msgid ""
- "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "This key is bad!  It has been marked as untrusted!  If you\n"
  "*really* know what you are doing, you may answer the next\n"
  "question with yes.\n"
  msgstr ""
@@@ -6544,33 -5172,26 +6502,33 @@@ msgstr "
  msgid "No such user ID.\n"
  msgstr "Identificador de utilizador inexistente.\n"
  
- #: g10/pkclist.c:1197 g10/pkclist.c:1273
++#: g10/pkclist.c:1197 g10/pkclist.c:1274
  msgid "skipped: public key already set as default recipient\n"
  msgstr "ignorado: chave pública já colocada como destinatário por omissão\n"
  
- #: g10/pkclist.c:1218
++#: g10/pkclist.c:1219
  msgid "Public key is disabled.\n"
  msgstr "A chave pública está desativada.\n"
  
- #: g10/pkclist.c:1228
++#: g10/pkclist.c:1229
  msgid "skipped: public key already set\n"
  msgstr "ignorado: a chave pública já está presente\n"
  
- #: g10/pkclist.c:1263
++#: g10/pkclist.c:1264
  #, fuzzy, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "destinatário por omissão desconhecido `%s'\n"
  
- #: g10/pkclist.c:1312
++#: g10/pkclist.c:1313
  msgid "no valid addressees\n"
  msgstr "nenhum endereço válido\n"
  
- #: g10/pkclist.c:1665
++#: g10/pkclist.c:1666
  #, fuzzy, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "chave %08lX: sem ID de utilizador\n"
  
- #: g10/pkclist.c:1690
++#: g10/pkclist.c:1691
  #, fuzzy, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "chave %08lX: sem ID de utilizador\n"
@@@ -6579,29 -5199,23 +6537,29 @@@
  msgid "data not saved; use option \"--output\" to save it\n"
  msgstr "dados não gravados; use a opção \"--output\" para gravá-los\n"
  
- #: g10/plaintext.c:598
++#: g10/plaintext.c:614
  msgid "Detached signature.\n"
  msgstr "Assinatura separada.\n"
  
- #: g10/plaintext.c:606
++#: g10/plaintext.c:622
  msgid "Please enter name of data file: "
  msgstr "Por favor digite o nome do ficheiro de dados: "
  
- #: g10/plaintext.c:643
++#: g10/plaintext.c:659
  msgid "reading stdin ...\n"
  msgstr "lendo do \"stdin\" ...\n"
  
- #: g10/plaintext.c:688
++#: g10/plaintext.c:704
  msgid "no signed data\n"
  msgstr "não há dados assinados\n"
  
- #: g10/plaintext.c:706
++#: g10/plaintext.c:722
  #, fuzzy, c-format
  #| msgid "can't open signed data `%s'\n"
  msgid "can't open signed data '%s'\n"
  msgstr "impossível abrir dados assinados `%s'\n"
  
- #: g10/plaintext.c:741
++#: g10/plaintext.c:757
  #, fuzzy, c-format
  msgid "can't open signed data fd=%d: %s\n"
  msgstr "impossível abrir dados assinados `%s'\n"
@@@ -6670,7 -5270,6 +6628,7 @@@ msgstr "Chave secreta disponível.\n
  msgid "Create a designated revocation certificate for this key? (y/N) "
  msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)"
  
- #: g10/revoke.c:336 g10/revoke.c:727
++#: g10/revoke.c:336 g10/revoke.c:728
  msgid "ASCII armored output forced.\n"
  msgstr ""
  
@@@ -6707,22 -5300,19 +6665,22 @@@ msgid "
  "the secret key.  However, if the secret key is still accessible,\n"
  "it is better to generate a new revocation certificate and give\n"
  "a reason for the revocation.  For details see the description of\n"
- "of the gpg command \"--gen-revoke\" in the GnuPG manual."
+ "of the gpg command \"--generate-revocation\" in the GnuPG manual."
  msgstr ""
  
- #: g10/revoke.c:575
++#: g10/revoke.c:576
  msgid ""
  "To avoid an accidental use of this file, a colon has been inserted\n"
  "before the 5 dashes below.  Remove this colon with a text editor\n"
  "before importing and publishing this revocation certificate."
  msgstr ""
  
- #: g10/revoke.c:590
++#: g10/revoke.c:591
  #, fuzzy, c-format
  msgid "revocation certificate stored as '%s.rev'\n"
  msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
  
- #: g10/revoke.c:634
++#: g10/revoke.c:635
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found\n"
  msgstr "chave `%s' não encontrada: %s\n"
@@@ -6730,23 -5320,19 +6688,23 @@@
  #. TRANSLATORS: The %s prints a key specification which
  #. for example has been given at the command line.  Several lines
  #. lines with secret key infos are printed after this message.
- #: g10/revoke.c:661
++#: g10/revoke.c:662
  #, c-format
  msgid "'%s' matches multiple secret keys:\n"
  msgstr ""
  
- #: g10/revoke.c:688
++#: g10/revoke.c:689
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error searching the keyring: %s\n"
  msgstr "erro ao criar porta-chaves `%s': %s\n"
  
- #: g10/revoke.c:711
++#: g10/revoke.c:712
  #, fuzzy
  msgid "Create a revocation certificate for this key? (y/N) "
  msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)"
  
- #: g10/revoke.c:735
++#: g10/revoke.c:736
  msgid ""
  "Revocation certificate created.\n"
  "\n"
@@@ -6757,37 -5343,30 +6715,37 @@@
  "your machine might store the data and make it available to others!\n"
  msgstr ""
  
- #: g10/revoke.c:769
++#: g10/revoke.c:770
  #, fuzzy
  msgid "Please select the reason for the revocation:\n"
  msgstr "motivo da revocação: "
  
- #: g10/revoke.c:779
++#: g10/revoke.c:780
  msgid "Cancel"
  msgstr ""
  
- #: g10/revoke.c:781
++#: g10/revoke.c:782
  #, c-format
  msgid "(Probably you want to select %d here)\n"
  msgstr ""
  
- #: g10/revoke.c:822
++#: g10/revoke.c:823
  #, fuzzy
  msgid "Enter an optional description; end it with an empty line:\n"
  msgstr ""
  "\n"
  "Insira o identificador do utilizador. Termine com uma linha vazia: "
  
- #: g10/revoke.c:850
++#: g10/revoke.c:851
  #, fuzzy, c-format
  msgid "Reason for revocation: %s\n"
  msgstr "motivo da revocação: "
  
- #: g10/revoke.c:852
++#: g10/revoke.c:853
  msgid "(No description given)\n"
  msgstr ""
  
- #: g10/revoke.c:857
++#: g10/revoke.c:858
  #, fuzzy
  msgid "Is this okay? (y/N) "
  msgstr "Usar esta chave de qualquer modo? "
@@@ -6922,12 -5481,10 +6880,12 @@@ msgstr "
  "AVISO: impossível expandir-%% a url de política (demasiado grande).\n"
  "A utilizar não expandida.\n"
  
- #: g10/sign.c:329
++#: g10/sign.c:331
  #, fuzzy, c-format
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "assinatura %s de: \"%s\"\n"
  
- #: g10/sign.c:878
++#: g10/sign.c:880
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6935,11 -5492,9 +6893,11 @@@ msgstr "
  "forçar o algoritmo de 'digest' %s (%d) viola as preferências do "
  "destinatário\n"
  
- #: g10/sign.c:1009
++#: g10/sign.c:1011
  msgid "signing:"
  msgstr "a assinar:"
  
- #: g10/sign.c:1286
++#: g10/sign.c:1288
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "será utilizada a cifragem %s\n"
@@@ -6965,7 -5516,6 +6923,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:362
++#: g10/tdbdump.c:57 g10/trustdb.c:369
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "registo de confiança %lu, tipo %d: escrita falhou: %s\n"
@@@ -7011,7 -5553,6 +6969,7 @@@ msgstr "%s: erro ao escrever registo d
  msgid "read error in '%s': %s\n"
  msgstr "armadura: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "base de dados de confiança: sincronização falhou: %s\n"
@@@ -7157,297 -5669,304 +7115,370 @@@ msgstr "impossível manipular linhas d
  msgid "input line longer than %d characters\n"
  msgstr "linha de entrada maior que %d caracteres\n"
  
- #: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
++#: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
  #, fuzzy, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "erro ao enviar para `%s': %s\n"
  
- #: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
++#: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:357 g10/tofu.c:699
++#: g10/tofu.c:355 g10/tofu.c:888
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:501
++#: g10/tofu.c:505
  #, fuzzy, c-format
  msgid "unsupported TOFU database version: %s\n"
  msgstr ""
  "\n"
  "Algoritmos suportados:\n"
  
- #: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
- #: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
- #: g10/tofu.c:3056
++#: g10/tofu.c:538
+ #, fuzzy, c-format
+ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
+ 
++#: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
+ msgid "TOFU DB error"
+ msgstr ""
+ 
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2340 g10/tofu.c:2359
++#: g10/tofu.c:2372 g10/tofu.c:2384 g10/tofu.c:2399 g10/tofu.c:2411
++#: g10/tofu.c:2980 g10/tofu.c:2997 g10/tofu.c:3033 g10/tofu.c:3050
++#: g10/tofu.c:3353
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "erro ao enviar para `%s': %s\n"
  
- #: g10/tofu.c:566 g10/tofu.c:574
++#: g10/tofu.c:716 g10/tofu.c:724
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error determining TOFU database's version: %s\n"
  msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
  
- #: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
++#: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing TOFU database: %s\n"
  msgstr "%s: erro ao escrever registo de diretório: %s\n"
  
- #: g10/tofu.c:765
++#: g10/tofu.c:844
+ #, fuzzy, c-format
+ msgid "error creating 'encryptions' TOFU table: %s\n"
+ msgstr "erro ao enviar para `%s': %s\n"
+ 
++#: g10/tofu.c:874
+ #, c-format
+ msgid "adding column effective_policy to bindings DB: %s\n"
+ msgstr ""
+ 
++#: g10/tofu.c:956
  #, fuzzy, c-format
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "erro na leitura de `%s': %s\n"
  
- #: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
++#: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "erro ao enviar para `%s': %s\n"
  
- #: g10/tofu.c:1239
++#: g10/tofu.c:1328
  #, c-format
  msgid ""
  "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1247
++#: g10/tofu.c:1337
  #, c-format
- msgid "The email address \"%s\" is associated with %d keys!"
- msgstr ""
+ msgid "The email address \"%s\" is associated with %d key!"
+ msgid_plural "The email address \"%s\" is associated with %d keys!"
+ msgstr[0] ""
+ msgstr[1] ""
  
- #: g10/tofu.c:1251
++#: g10/tofu.c:1343
  msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  
- #: g10/tofu.c:1257
++#: g10/tofu.c:1349
  #, c-format
  msgid ""
  "Please indicate whether this email address should be associated with key %s "
  "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1513
++#: g10/tofu.c:1605
  #, fuzzy, c-format
  msgid "error gathering other user IDs: %s\n"
  msgstr "erro na criação da frase secreta: %s\n"
  
- #: g10/tofu.c:1523
++#: g10/tofu.c:1615
  #, fuzzy
  #| msgid "list key and user IDs"
  msgid "This key's user IDs:\n"
  msgstr "lista chave e identificadores de utilizadores"
  
- #: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
++#: g10/tofu.c:1631 g10/tofu.c:1796
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "policy: %s"
  msgstr "Política: "
  
- #: g10/tofu.c:1630
++#: g10/tofu.c:1722
  #, fuzzy, c-format
  msgid "error gathering signature stats: %s\n"
  msgstr "erro na criação da frase secreta: %s\n"
  
- #: g10/tofu.c:1634
++#: g10/tofu.c:1726
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1651
++#: g10/tofu.c:1744
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1684 g10/tofu.c:1689
++#: g10/tofu.c:1785 g10/tofu.c:1790
  msgid ", "
  msgstr ""
  
- #: g10/tofu.c:1693
++#: g10/tofu.c:1794
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
  msgstr "listar as chaves"
  
- #: g10/tofu.c:1715
++#: g10/tofu.c:1820
  #, fuzzy, c-format
- msgid "Verified %d message"
- msgid_plural "Verified %d messages"
+ msgid "Verified %d message."
+ msgid_plural "Verified %d messages."
  msgstr[0] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
  msgstr[1] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
  
- #: g10/tofu.c:1719
++#: g10/tofu.c:1824
+ #, fuzzy, c-format
+ msgid "Encrypted %d message."
+ msgid_plural "Encrypted %d messages."
+ msgstr[0] "Repita a frase secreta\n"
+ msgstr[1] "Repita a frase secreta\n"
+ 
++#: g10/tofu.c:1831
+ #, fuzzy, c-format
+ msgid "Verified %d message in the future."
+ msgid_plural "Verified %d messages in the future."
+ msgstr[0] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
+ msgstr[1] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
+ 
++#: g10/tofu.c:1835
+ #, fuzzy, c-format
+ msgid "Encrypted %d message in the future."
+ msgid_plural "Encrypted %d messages in the future."
+ msgstr[0] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
+ msgstr[1] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
+ 
++#: g10/tofu.c:1849
+ #, c-format
+ msgid "Messages verified over the past %d day: %d."
+ msgid_plural "Messages verified over the past %d days: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1855
+ #, c-format
+ msgid "Messages encrypted over the past %d day: %d."
+ msgid_plural "Messages encrypted over the past %d days: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1865
  #, c-format
- msgid "Encrypted %d message"
- msgid_plural "Encrypted %d messages"
+ msgid "Messages verified over the past %d month: %d."
+ msgid_plural "Messages verified over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1734
++#: g10/tofu.c:1871
  #, c-format
- msgid " over the past day."
- msgid_plural " over the past %d days."
+ msgid "Messages encrypted over the past %d month: %d."
+ msgid_plural "Messages encrypted over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1740
++#: g10/tofu.c:1881
  #, c-format
- msgid " over the past month."
- msgid_plural " over the past %d months."
+ msgid "Messages verified over the past %d year: %d."
+ msgid_plural "Messages verified over the past %d years: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1746
++#: g10/tofu.c:1887
  #, c-format
- msgid " over the past year."
- msgid_plural " over the past %d years."
+ msgid "Messages encrypted over the past %d year: %d."
+ msgid_plural "Messages encrypted over the past %d years: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1752
- msgid " in the past."
++#: g10/tofu.c:1895
+ #, c-format
+ msgid "Messages verified in the past: %d."
  msgstr ""
  
++#: g10/tofu.c:1899
+ #, fuzzy, c-format
+ msgid "Messages encrypted in the past: %d."
+ msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1767
++#: g10/tofu.c:1916
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1809
++#: g10/tofu.c:1958
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1815
++#: g10/tofu.c:1964
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1823
++#: g10/tofu.c:1972
  msgid "Defaulting to unknown."
  msgstr ""
  
- #: g10/tofu.c:1938 g10/tofu.c:2074
++#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
- #: g10/tofu.c:1994
++#: g10/tofu.c:2143
  #, fuzzy, c-format
  msgid "resetting keydb: %s\n"
  msgstr "erro na escrita do porta-chaves `%s': %s\n"
  
- #: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
- #: g10/tofu.c:2425
++#: g10/tofu.c:2601
  #, fuzzy, c-format
- msgid "error setting TOFU binding's trust level to %s\n"
+ msgid "error setting TOFU binding's policy to %s\n"
  msgstr "erro na leitura de `%s': %s\n"
  
- #: g10/tofu.c:2473
++#: g10/tofu.c:2794
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "erro na criação da frase secreta: %s\n"
  
- #. TRANSLATORS: The tilde ('~') is used here to indicate a
- #. * non-breakable space
- #: g10/tofu.c:2574
++#: g10/tofu.c:2839
  #, c-format
- msgid "%d~year"
- msgid_plural "%d~years"
+ msgid "%lld~year"
+ msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2583
++#: g10/tofu.c:2844
  #, c-format
- msgid "%d~month"
- msgid_plural "%d~months"
+ msgid "%lld~month"
+ msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2592
++#: g10/tofu.c:2849
  #, c-format
- msgid "%d~day"
- msgid_plural "%d~days"
+ msgid "%lld~week"
+ msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2854
  #, c-format
- msgid "%d~hour"
- msgid_plural "%d~hours"
+ msgid "%lld~day"
+ msgid_plural "%lld~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2610
++#: g10/tofu.c:2859
  #, c-format
- msgid "%d~minute"
- msgid_plural "%d~minutes"
+ msgid "%lld~hour"
+ msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2619
++#: g10/tofu.c:2864
  #, c-format
- msgid "%d~second"
- msgid_plural "%d~seconds"
+ msgid "%lld~minute"
+ msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2802
++#: g10/tofu.c:2866
  #, c-format
- msgid "%s: "
+ msgid "%lld~second"
+ msgid_plural "%lld~seconds"
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:3103
+ #, c-format
+ msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:2806
++#: g10/tofu.c:3109
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
- msgid "Verified %ld signatures"
+ msgid "%s: Verified 0 signatures."
  msgstr "%d assinaturas removidas.\n"
  
- #: g10/tofu.c:2816
++#: g10/tofu.c:3117
  #, fuzzy, c-format
- msgid "Verified %ld signature in the past %s"
- msgid_plural "Verified %ld signatures in the past %s"
+ msgid "%s: Verified %ld~signature in the past %s."
+ msgid_plural "%s: Verified %ld~signatures in the past %s."
  msgstr[0] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
  msgstr[1] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
  
- #: g10/tofu.c:2826
- #, fuzzy, c-format
- msgid ", and encrypted %ld messages"
++#: g10/tofu.c:3127
+ #, fuzzy
+ msgid "Encrypted 0 messages."
  msgstr "Repita a frase secreta\n"
  
- #: g10/tofu.c:2835
++#: g10/tofu.c:3135
  #, fuzzy, c-format
- msgid ", and encrypted %ld message in the past %s"
- msgid_plural ", and encrypted %ld messages in the past %s"
+ msgid "Encrypted %ld~message in the past %s."
+ msgid_plural "Encrypted %ld~messages in the past %s."
  msgstr[0] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
  msgstr[1] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
  
- #: g10/tofu.c:2880
++#: g10/tofu.c:3146
+ #, fuzzy, c-format
+ #| msgid "Policy: "
+ msgid "(policy: %s)"
+ msgstr "Política: "
+ 
++#: g10/tofu.c:3177
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2883
++#: g10/tofu.c:3180
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2887
++#: g10/tofu.c:3184
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2890
++#: g10/tofu.c:3187
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2919
++#: g10/tofu.c:3216
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7464,18 -5983,14 +7495,18 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
- #: g10/tofu.c:3480 g10/tofu.c:3572
++#: g10/tofu.c:3298 g10/tofu.c:3449 g10/tofu.c:3627 g10/tofu.c:3670
++#: g10/tofu.c:3784 g10/tofu.c:3859 g10/tofu.c:3894
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "erro ao enviar para `%s': %s\n"
  
- #: g10/tofu.c:3185
++#: g10/tofu.c:3482
  #, c-format
- msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
  msgstr ""
  
- #: g10/tofu.c:3515
++#: g10/tofu.c:3819
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7509,99 -6019,80 +7540,99 @@@ msgstr "
  msgid "key %s marked as ultimately trusted\n"
  msgstr "chave marcada como de confiança absoluta\n"
  
- #: g10/trustdb.c:341
++#: g10/trustdb.c:348
  #, 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:347
++#: g10/trustdb.c:354
  #, 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:422
++#: g10/trustdb.c:429
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr ""
  
- #: g10/trustdb.c:431
++#: g10/trustdb.c:438
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:468
++#: g10/trustdb.c:475
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:474
++#: g10/trustdb.c:481
  #, c-format
  msgid "using %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:511
++#: g10/trustdb.c:518
  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:517 g10/trustdb.c:2160
++#: g10/trustdb.c:524 g10/trustdb.c:2187
  #, 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:526
++#: g10/trustdb.c:533
  #, 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:542
++#: g10/trustdb.c:549
  #, 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:749 g10/trustdb.c:1313
++#: g10/trustdb.c:756 g10/trustdb.c:1340
  #, fuzzy, c-format
  msgid "public key %s not found: %s\n"
  msgstr "chave pública %08lX não encontrada: %s\n"
  
- #: g10/trustdb.c:966
++#: g10/trustdb.c:973
  msgid "please do a --check-trustdb\n"
  msgstr ""
  
- #: g10/trustdb.c:971
++#: g10/trustdb.c:978
  msgid "checking the trustdb\n"
  msgstr "a verificar a base de dados de confiança\n"
  
- #: g10/trustdb.c:1883
++#: g10/trustdb.c:1910
  #, 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:1886
++#: g10/trustdb.c:1913
  #, c-format
  msgid " (%d validity count cleared)\n"
  msgid_plural " (%d validity counts cleared)\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/trustdb.c:1956
++#: g10/trustdb.c:1983
  #, fuzzy
  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:1970
++#: g10/trustdb.c:1997
  #, 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:2087
++#: g10/trustdb.c:2114
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr ""
  
- #: g10/trustdb.c:2167
++#: g10/trustdb.c:2194
  #, 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"
@@@ -7713,19 -6183,14 +7744,19 @@@ msgid "
  "List, export, import Keybox data\n"
  msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3208
++#: scd/app-nks.c:718 scd/app-openpgp.c:3221
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3220
++#: scd/app-nks.c:726 scd/app-openpgp.c:3233
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
- #: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
- #: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1965 scd/app-openpgp.c:1984
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2166 scd/app-openpgp.c:2430
++#: scd/app-openpgp.c:2477 scd/app-openpgp.c:2582 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr ""
@@@ -7774,84 -6230,66 +7805,84 @@@ msgid "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2511 scd/app-dinsig.c:532
  #, fuzzy, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "erro na criação da frase secreta: %s\n"
  
- #: scd/app-openpgp.c:806
++#: scd/app-openpgp.c:801
  #, fuzzy, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "falha ao inicializar a base de dados de confiança: %s\n"
  
- #: scd/app-openpgp.c:819
++#: scd/app-openpgp.c:814
  #, fuzzy, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
  
- #: scd/app-openpgp.c:1236
++#: scd/app-openpgp.c:1247
  msgid "response does not contain the RSA modulus\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1243
++#: scd/app-openpgp.c:1254
  msgid "response does not contain the RSA public exponent\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1353
++#: scd/app-openpgp.c:1364
  #, fuzzy
  #| msgid "remove keys from the public keyring"
  msgid "response does not contain the EC public key\n"
  msgstr "remover chaves do porta-chaves público"
  
- #: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:1464 scd/app-openpgp.c:3825
  msgid "response does not contain the public key data\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1551
++#: scd/app-openpgp.c:1564
  #, fuzzy, c-format
  msgid "reading public key failed: %s\n"
  msgstr "remoção do bloco de chave falhou: %s\n"
  
- #: scd/app-openpgp.c:1903
++#: scd/app-openpgp.c:1916
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1910
++#: scd/app-openpgp.c:1923
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1925
++#: scd/app-openpgp.c:1938
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr ""
  
- #: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
++#: scd/app-openpgp.c:1949 scd/app-openpgp.c:2424
  #, fuzzy
  msgid "||Please enter the PIN"
  msgstr "muda a frase secreta"
  
- #: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2173 scd/app-openpgp.c:2437
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
- #: scd/app-openpgp.c:4114
++#: scd/app-openpgp.c:2004 scd/app-openpgp.c:2043 scd/app-openpgp.c:2185
++#: scd/app-openpgp.c:4126
  #, fuzzy, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "A geração de chaves falhou: %s\n"
  
- #: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
++#: scd/app-openpgp.c:2072 scd/app-openpgp.c:2458 scd/app-openpgp.c:4556
  msgid "error retrieving CHV status from card\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
++#: scd/app-openpgp.c:2078 scd/app-openpgp.c:4565
  msgid "card is permanently locked!\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2072
++#: scd/app-openpgp.c:2085
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7861,26 -6299,21 +7892,26 @@@ msgstr[1] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:2082
++#: scd/app-openpgp.c:2095
  #, fuzzy, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "muda a frase secreta"
  
- #: scd/app-openpgp.c:2086
++#: scd/app-openpgp.c:2099
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
  msgstr "muda a frase secreta"
  
- #: scd/app-openpgp.c:2107
++#: scd/app-openpgp.c:2120
  msgid "access to admin commands is not configured\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2460
++#: scd/app-openpgp.c:2473
  #, fuzzy
  msgid "||Please enter the Reset Code for the card"
  msgstr "motivo da revocação: "
  
- #: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
++#: scd/app-openpgp.c:2483 scd/app-openpgp.c:2537
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr ""
@@@ -7888,117 -6321,93 +7919,117 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2493
++#: scd/app-openpgp.c:2506
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|AN|New Admin PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|N|New PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2565
++#: scd/app-openpgp.c:2578
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "muda a frase secreta"
  
- #: scd/app-openpgp.c:2566
++#: scd/app-openpgp.c:2579
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
  msgstr "muda a frase secreta"
  
- #: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
++#: scd/app-openpgp.c:2635 scd/app-openpgp.c:3885
  #, fuzzy
  msgid "error reading application data\n"
  msgstr "erro na leitura do bloco de chave: %s\n"
  
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
++#: scd/app-openpgp.c:2641 scd/app-openpgp.c:3892
  #, fuzzy
  msgid "error reading fingerprint DO\n"
  msgstr "%s: erro ao ler registo livre: %s\n"
  
- #: scd/app-openpgp.c:2638
++#: scd/app-openpgp.c:2651
  #, fuzzy
  msgid "key already exists\n"
  msgstr "%s' já comprimido\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2655
  msgid "existing key will be replaced\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2644
++#: scd/app-openpgp.c:2657
  #, fuzzy
  msgid "generating new key\n"
  msgstr "gerar um novo par de chaves"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2659
  #, fuzzy
  msgid "writing new key\n"
  msgstr "gerar um novo par de chaves"
  
- #: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
++#: scd/app-openpgp.c:3201 scd/app-openpgp.c:3553
  msgid "creation timestamp missing\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
++#: scd/app-openpgp.c:3243 scd/app-openpgp.c:3251
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
++#: scd/app-openpgp.c:3384 scd/app-openpgp.c:3647
  #, fuzzy, c-format
  msgid "failed to store the key: %s\n"
  msgstr "falha ao inicializar a base de dados de confiança: %s\n"
  
- #: scd/app-openpgp.c:3534
++#: scd/app-openpgp.c:3547
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "URI não suportado"
  
- #: scd/app-openpgp.c:3790
++#: scd/app-openpgp.c:3802
  msgid "please wait while key is being generated ...\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3798
++#: scd/app-openpgp.c:3810
  #, fuzzy
  msgid "generating key failed\n"
  msgstr "remoção do bloco de chave falhou: %s\n"
  
- #: scd/app-openpgp.c:3804
++#: scd/app-openpgp.c:3816
  #, fuzzy, c-format
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
  msgstr[0] "A geração de chaves falhou: %s\n"
  msgstr[1] "A geração de chaves falhou: %s\n"
  
- #: scd/app-openpgp.c:3838
++#: scd/app-openpgp.c:3850
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:3900
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4004
++#: scd/app-openpgp.c:4016
  #, fuzzy, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "assinatura %s de: \"%s\"\n"
  
- #: scd/app-openpgp.c:4089
++#: scd/app-openpgp.c:4101
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4551
++#: scd/app-openpgp.c:4570
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
++#: scd/app-openpgp.c:4871 scd/app-openpgp.c:4882
  #, fuzzy, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "nenhum dado OpenPGP válido encontrado.\n"
@@@ -8019,7 -6425,6 +8050,7 @@@ msgstr "
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
@@@ -8064,27 -6460,22 +8095,27 @@@ msgstr "comandos em conflito\n
  msgid "use variable length input for pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:287
++#: scd/scdaemon.c:286
  #, fuzzy
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
  
- #: scd/scdaemon.c:289
++#: scd/scdaemon.c:288
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
  msgstr ""
  
- #: scd/scdaemon.c:786
++#: scd/scdaemon.c:784
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1904
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
++#: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1909
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
@@@ -8164,9 -6539,6 +8195,9 @@@ msgstr "erro na criação da frase secr
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "remoção do bloco de chave falhou: %s\n"
  
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
 +#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  #, fuzzy
  msgid "failed to allocate keyDB handle\n"
  msgstr "falha ao inicializar a base de dados de confiança: %s\n"
@@@ -8663,11 -6933,9 +8694,11 @@@ msgstr "
  msgid "resource problem: out of core\n"
  msgstr ""
  
- #: sm/decrypt.c:330
++#: sm/decrypt.c:332
  msgid "(this is the RC2 algorithm)\n"
  msgstr ""
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:334
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr ""
  
@@@ -8711,126 -6971,98 +8742,126 @@@ msgstr "listar as chaves secretas
  msgid "list certificate chain"
  msgstr "certificado incorrecto"
  
- #: sm/gpgsm.c:218
++#: sm/gpgsm.c:219
  #, fuzzy
  msgid "import certificates"
  msgstr "certificado incorrecto"
  
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
  #, fuzzy
  msgid "export certificates"
  msgstr "certificado incorrecto"
  
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:228
  msgid "register a smartcard"
  msgstr ""
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:231
  msgid "pass a command to the dirmngr"
  msgstr ""
  
- #: sm/gpgsm.c:232
++#: sm/gpgsm.c:233
  msgid "invoke gpg-protect-tool"
  msgstr ""
  
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:250
  #, fuzzy
  msgid "create base-64 encoded output"
  msgstr "criar saída com armadura ascii"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in PEM format"
  msgstr ""
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in base-64 format"
  msgstr ""
  
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:262
  msgid "assume input is in binary format"
  msgstr ""
  
- #: sm/gpgsm.c:267
++#: sm/gpgsm.c:269
  msgid "never consult a CRL"
  msgstr ""
  
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:279
  msgid "check validity using OCSP"
  msgstr ""
  
- #: sm/gpgsm.c:282
++#: sm/gpgsm.c:284
  msgid "|N|number of certificates to include"
  msgstr ""
  
- #: sm/gpgsm.c:285
++#: sm/gpgsm.c:287
  msgid "|FILE|take policy information from FILE"
  msgstr ""
  
- #: sm/gpgsm.c:288
++#: sm/gpgsm.c:290
  msgid "do not check certificate policies"
  msgstr ""
  
- #: sm/gpgsm.c:292
++#: sm/gpgsm.c:294
  msgid "fetch missing issuer certificates"
  msgstr ""
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "don't use the terminal at all"
  msgstr "nunca usar o terminal"
  
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:307
  msgid "|FILE|write a server mode log to FILE"
  msgstr ""
  
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:312
  #, fuzzy
  msgid "|FILE|write an audit log to FILE"
  msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "batch mode: never ask"
  msgstr "modo não-interactivo: nunca perguntar"
  
- #: sm/gpgsm.c:314
++#: sm/gpgsm.c:316
  msgid "assume yes on most questions"
  msgstr "assumir sim para a maioria das perguntas"
  
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:317
  msgid "assume no on most questions"
  msgstr "assumir não para a maioria das perguntas"
  
- #: sm/gpgsm.c:318
++#: sm/gpgsm.c:320
  #, fuzzy
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr ""
  "adicionar este porta-chaves\n"
  "à lista de porta-chaves"
  
- #: sm/gpgsm.c:321
++#: sm/gpgsm.c:323
  #, fuzzy
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|NOME|usar NOME como chave secreta por omissão"
  
- #: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
  #, fuzzy
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|ENDEREÇO|usar este servidor para buscar chaves"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|NOME|usar algoritmo de criptografia NOME"
  
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:352
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:559
  #, 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:570
++#: sm/gpgsm.c:562
  #, fuzzy
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
@@@ -8841,47 -7073,38 +8872,47 @@@ msgstr "
  "assina, verifica, cifra ou decifra\n"
  "a operação por omissão depende dos dados de entrada\n"
  
- #: sm/gpgsm.c:774
++#: sm/gpgsm.c:766
  #, 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:785
++#: sm/gpgsm.c:777
  #, fuzzy, c-format
  msgid "unknown validation model '%s'\n"
  msgstr "destinatário por omissão desconhecido `%s'\n"
  
- #: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
  #, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr ""
  
- #: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr ""
  
- #: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
  #, fuzzy, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr " s = saltar esta chave\n"
  
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1427
  #, fuzzy
  msgid "could not parse keyserver\n"
  msgstr "não consegui processar a URI do servidor de chaves\n"
  
- #: sm/gpgsm.c:1636
++#: sm/gpgsm.c:1630
  #, fuzzy, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "a escrever para `%s'\n"
  
- #: sm/gpgsm.c:1677
++#: sm/gpgsm.c:1671
  #, fuzzy, c-format
  msgid "can't sign using '%s': %s\n"
  msgstr "impossível fechar `%s': %s\n"
  
- #: sm/gpgsm.c:2033
++#: sm/gpgsm.c:2028
  msgid "invalid command (there is no implicit command)\n"
  msgstr ""
  
@@@ -9639,8 -7711,6 +9670,8 @@@ msgstr "
  msgid "CRL access not possible due to disabled %s\n"
  msgstr ""
  
 +#: dirmngr/crlfetch.c:223 dirmngr/ldap-wrapper-ce.c:488
- #: dirmngr/ldap-wrapper.c:742 dirmngr/misc.c:563
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:563
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
@@@ -9825,116 -7859,88 +9856,116 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:160
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:158
++#: dirmngr/dirmngr.c:161
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
  
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:162
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:163
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:164
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
- #: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
++#: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:177
++#: dirmngr/dirmngr.c:180
  #, fuzzy
  msgid "run without asking a user"
  msgstr "Sair sem gravar? "
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:181
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:182
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:184
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:185
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:186
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:188
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:192
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:202
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
  
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:210
  #, fuzzy
  msgid "|URL|use OCSP responder at URL"
  msgstr "não consegui processar a URI do servidor de chaves\n"
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:212
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:218
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:220
++#: dirmngr/dirmngr.c:223
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:225
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:240
++#: dirmngr/dirmngr.c:246
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -9947,91 -7953,72 +9978,91 @@@ msgstr "
  "@\n"
  "(Veja a página man para uma lista completa de comandos e opções)\n"
  
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:361
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
  
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:363
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:443
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
- #: tools/gpgconf.c:648
++#: dirmngr/dirmngr.c:496 tools/gpgconf.c:550 tools/gpgconf.c:585
++#: tools/gpgconf.c:656
  #, fuzzy, c-format
  msgid "usage: %s [options] "
  msgstr "uso: gpg [opções] "
  
- #: dirmngr/dirmngr.c:1062
++#: dirmngr/dirmngr.c:1074
  #, fuzzy
  #| 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:1301 dirmngr/server.c:1585
++#: dirmngr/dirmngr.c:1300 dirmngr/server.c:1585
  #, fuzzy, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "criação de armadura falhou: %s\n"
  
- #: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
++#: dirmngr/dirmngr.c:1306 dirmngr/server.c:1591
  #, fuzzy, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "criação de armadura falhou: %s\n"
  
- #: dirmngr/dirmngr.c:1484
++#: dirmngr/dirmngr.c:1487
  #, fuzzy, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "frase secreta demasiado longa\n"
  
- #: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
++#: dirmngr/dirmngr.c:1542 dirmngr/dirmngr.c:1626
  #, fuzzy, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "%s: versão de ficheiro inválida %d\n"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
++#: dirmngr/dirmngr.c:1578 dirmngr/dirmngr.c:1604 tools/gpgconf-comp.c:4032
  #, fuzzy, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "armadura: %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1633
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1700
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1734
++#: dirmngr/dirmngr.c:1738
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1739
++#: dirmngr/dirmngr.c:1743
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1745
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1746
++#: dirmngr/dirmngr.c:1750
  #, fuzzy
  msgid "shutdown forced\n"
  msgstr "não processado"
  
- #: dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1758
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1761
++#: dirmngr/dirmngr.c:1765
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10514,33 -8402,27 +10545,33 @@@ msgstr "remoção do bloco de chave fal
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2463
++#: dirmngr/server.c:2469
  #, fuzzy, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "impossível criar `%s': %s\n"
  
- #: dirmngr/server.c:2474
++#: dirmngr/server.c:2480
  #, 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:2495
++#: dirmngr/server.c:2501
  #, 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:2503
++#: dirmngr/server.c:2509
  #, 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:2534
++#: dirmngr/server.c:2540
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2553
++#: dirmngr/server.c:2559
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
@@@ -10588,7 -8461,6 +10619,7 @@@ msgstr "DSA necessita de utilização d
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:167
  #, fuzzy
  msgid "quiet"
  msgstr "sair"
@@@ -10681,22 -8533,15 +10712,22 @@@ msgstr "assinatura falhou: %s\n
  msgid "error sending standard options: %s\n"
  msgstr "erro ao enviar para `%s': %s\n"
  
 +#: tools/gpgconf-comp.c:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
- #: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
++#: tools/gpgconf-comp.c:766 tools/gpgconf-comp.c:865
  msgid "Options controlling the diagnostic output"
  msgstr ""
  
 +#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
- #: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
++#: tools/gpgconf-comp.c:779 tools/gpgconf-comp.c:888
  msgid "Options controlling the configuration"
  msgstr ""
  
- #: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
- #: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
++#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:723
++#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:901
  msgid "Options useful for debugging"
  msgstr ""
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
  msgid "Options controlling the security"
  msgstr ""
  
@@@ -10746,11 -8580,9 +10777,11 @@@ msgstr "erro na criação da frase secr
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
++#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
  msgid "|NAME|use NAME as default secret key"
  msgstr "|NOME|usar NOME como chave secreta por omissão"
  
- #: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
++#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:784
  #, fuzzy
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NOME|cifrar para NOME"
@@@ -10759,196 -8590,163 +10790,210 @@@
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
++#: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
  msgid "Configuration for Keyservers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
++#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
  #, fuzzy
  msgid "|URL|use keyserver at URL"
  msgstr "não consegui processar a URI do servidor de chaves\n"
  
- #: tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:741
  msgid "allow PKA lookups (DNS requests)"
  msgstr ""
  
- #: tools/gpgconf-comp.c:738
++#: tools/gpgconf-comp.c:744
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr ""
  
- #: tools/gpgconf-comp.c:787
++#: tools/gpgconf-comp.c:793
  msgid "disable all access to the dirmngr"
  msgstr ""
  
- #: tools/gpgconf-comp.c:790
++#: tools/gpgconf-comp.c:796
  #, 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:820
++#: tools/gpgconf-comp.c:829
  msgid "do not check CRLs for root certificates"
  msgstr ""
  
- #: tools/gpgconf-comp.c:869
++#: tools/gpgconf-comp.c:878
  msgid "Options controlling the format of the output"
  msgstr ""
  
- #: tools/gpgconf-comp.c:905
++#: tools/gpgconf-comp.c:920
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:918
++#: tools/gpgconf-comp.c:933
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:947
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:958
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:948
++#: tools/gpgconf-comp.c:963
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:977
++#: tools/gpgconf-comp.c:992
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:985
++#: tools/gpgconf-comp.c:1000
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1066
++#: tools/gpgconf-comp.c:1081
  msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1067
++#: tools/gpgconf-comp.c:1082
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1083
  msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1069
++#: tools/gpgconf-comp.c:1084
  msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1070
++#: tools/gpgconf-comp.c:1085
  #, fuzzy
  #| msgid "network error"
  msgid "Network"
  msgstr "erro na rede"
  
- #: tools/gpgconf-comp.c:1071
++#: tools/gpgconf-comp.c:1086
  #, fuzzy
  msgid "Passphrase Entry"
  msgstr "frase secreta incorrecta"
  
- #: tools/gpgconf-comp.c:1225
++#: tools/gpgconf-comp.c:1240
  #, fuzzy
  msgid "Component not suitable for launching"
  msgstr "chave pública não encontrada"
  
- #: tools/gpgconf-comp.c:3283
++#: tools/gpgconf-comp.c:3311
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3434
++#: tools/gpgconf-comp.c:3462
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf-comp.c:4036
+ #, fuzzy, c-format
+ msgid "error closing '%s'\n"
+ msgstr "erro na leitura de `%s': %s\n"
+ 
++#: tools/gpgconf-comp.c:4038
+ #, fuzzy, c-format
+ msgid "error parsing '%s'\n"
+ msgstr "erro na leitura de `%s': %s\n"
+ 
++#: tools/gpgconf.c:73
  msgid "list all components"
  msgstr ""
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "check all programs"
  msgstr ""
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|list options"
  msgstr ""
  
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
  msgid "|COMPONENT|change options"
  msgstr ""
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "|COMPONENT|check options"
  msgstr ""
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "apply global default values"
  msgstr ""
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
+ msgid "|FILE|update configuration files using FILE"
+ msgstr ""
+ 
++#: tools/gpgconf.c:83
  msgid "get the configuration directories for @GPGCONF@"
  msgstr ""
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:85
  #, fuzzy
  msgid "list global configuration file"
  msgstr "criado um novo ficheiro de configuração `%s'\n"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  #, fuzzy
  msgid "check global configuration file"
  msgstr "criado um novo ficheiro de configuração `%s'\n"
  
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:89
  #, fuzzy
  #| msgid "update the trust database"
  msgid "query the software version database"
  msgstr "actualizar a base de dados de confiança"
  
- #: tools/gpgconf.c:86
++#: tools/gpgconf.c:90
  msgid "reload all or a given component"
  msgstr ""
  
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:91
  msgid "launch a given component"
  msgstr ""
  
- #: tools/gpgconf.c:88
++#: tools/gpgconf.c:92
  msgid "kill a given component"
  msgstr ""
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "use as output file"
  msgstr "usar como ficheiro de saída"
  
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:102
  msgid "activate changes at runtime, if possible"
  msgstr ""
  
- #: tools/gpgconf.c:122
++#: tools/gpgconf.c:127
  #, fuzzy
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
  
- #: tools/gpgconf.c:125
++#: tools/gpgconf.c:130
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
  msgstr ""
  
- #: tools/gpgconf.c:545 tools/gpgconf.c:579
++#: tools/gpgconf.c:552 tools/gpgconf.c:587
  msgid "Need one component argument"
  msgstr ""
  
- #: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
++#: tools/gpgconf.c:561 tools/gpgconf.c:599 tools/gpgconf.c:632
  #, fuzzy
  msgid "Component not found"
  msgstr "chave pública não encontrada"
  
- #: tools/gpgconf.c:650
++#: tools/gpgconf.c:658
  #, fuzzy
  msgid "No argument allowed"
  msgstr "a escrever chave privada para `%s'\n"
diff --cc po/ro.po
index 74f0da9,054978a..ab3fc3b
--- a/po/ro.po
+++ b/po/ro.po
@@@ -9,7 -9,6 +9,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg 1.4.2rc1\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-11-18 16:54+0100\n"
++"POT-Creation-Date: 2016-12-20 11:28+0100\n"
  "PO-Revision-Date: 2005-05-31 22:00-0500\n"
  "Last-Translator: Laurentiu Buzdugan <lbuz at rolix.org>\n"
  "Language-Team: Romanian <translation-team-ro at lists.sourceforge.net>\n"
@@@ -162,25 -133,11 +162,25 @@@ msgstr "frază-parolă incorectă
  msgid "ssh keys greater than %d bits are not supported\n"
  msgstr "algoritm rezumat %d nu este suportat\n"
  
 +#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
- #: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1306 g10/keygen.c:4577
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
++#: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't create '%s': %s\n"
  msgstr "nu pot crea `%s': %s\n"
  
 +#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
- #: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1307
++#: g10/import.c:305 g10/import.c:448 g10/import.c:621 g10/keygen.c:3681
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
- #: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
- #: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:825 g10/sign.c:1025
++#: g10/sign.c:1130 g10/sign.c:1275 g10/tdbdump.c:143 g10/tdbdump.c:151
++#: g10/tdbio.c:720 g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161
++#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
++#: dirmngr/certcache.c:368 dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1564
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
@@@ -245,14 -191,12 +245,14 @@@ msgstr "
  msgid "failed to create stream from socket: %s\n"
  msgstr "%s: am eşuat să creez hashtable: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1100
++#: agent/divert-scd.c:92 g10/call-agent.c:1101
  #, 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:93 g10/call-agent.c:1101
++#: agent/divert-scd.c:93 g10/call-agent.c:1102
  #, fuzzy
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
@@@ -398,48 -316,33 +398,48 @@@ msgstr "
  "Opţiuni:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
  #, fuzzy
  #| msgid "Key is superseded"
  msgid "run in supervised mode"
  msgstr "Cheia este înlocuită"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:170 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "locvace"
  
 +#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "fii oarecum mai tăcut"
  
- #: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
  msgid "csh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
- #: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
++#: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
  #, fuzzy
  msgid "|FILE|read options from FILE"
  msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
  
- #: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:177
  msgid "do not detach from the console"
  msgstr ""
  
@@@ -524,163 -410,121 +524,163 @@@ msgstr "nu este suportat(ă)
  #. 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:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:481 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1025 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:358
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:124 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  #, fuzzy
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr "Raportaţi bug-uri la <gnupg-bugs at gnu.org>.\n"
  
- #: agent/gpg-agent.c:491
++#: agent/gpg-agent.c:490
  #, fuzzy
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
  
- #: agent/gpg-agent.c:493
++#: agent/gpg-agent.c:492
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:537 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:442
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:793
++#: agent/gpg-agent.c:1082 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:812
  #, 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"
  
- #: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
- #: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1093 agent/gpg-agent.c:1935 g10/gpg.c:2510
++#: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:817
++#: dirmngr/dirmngr.c:1670 tools/symcryptrun.c:932
  #, fuzzy, c-format
  #| msgid "option file `%s': %s\n"
  msgid "option file '%s': %s\n"
  msgstr "fişier opţiuni `%s': %s\n"
  
- #: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:806
++#: agent/gpg-agent.c:1101 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:825
  #, 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:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
- #: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
++#: agent/gpg-agent.c:1223 g10/gpg.c:3643 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:936 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:527
  #, 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:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
++#: agent/gpg-agent.c:2080 scd/scdaemon.c:1073 dirmngr/dirmngr.c:1081
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
  msgstr "nu pot crea `%s': %s\n"
  
- #: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
++#: agent/gpg-agent.c:2097 scd/scdaemon.c:1086 dirmngr/dirmngr.c:1094
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2134
++#: agent/gpg-agent.c:2135
  #, fuzzy
  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:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
++#: agent/gpg-agent.c:2145 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1126
  #, fuzzy
  msgid "error getting nonce for the socket\n"
  msgstr "eroare la obţinere noului PIN: %s\n"
  
- #: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
++#: agent/gpg-agent.c:2150 scd/scdaemon.c:1113 dirmngr/dirmngr.c:1129
  #, fuzzy, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "eroare trimitere la `%s': %s\n"
  
- #: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
- #: dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2160 agent/gpg-agent.c:2197 scd/scdaemon.c:1121
++#: dirmngr/dirmngr.c:1138
  #, 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:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:2165 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1143
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
  msgstr "actualizarea a eşuat: %s\n"
  
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
++#: agent/gpg-agent.c:2172 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1149
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
  msgstr "scriu cheia secretă în `%s'\n"
  
- #: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: agent/gpg-agent.c:2191 agent/gpg-agent.c:2234 g10/exec.c:199
 +#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, 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:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: agent/gpg-agent.c:2194 agent/gpg-agent.c:2239 g10/openfile.c:491
 +#: g10/openfile.c:520 sm/keydb.c:103
  #, fuzzy, c-format
  #| msgid "directory `%s' created\n"
  msgid "directory '%s' created\n"
  msgstr "director `%s' creat\n"
  
- #: agent/gpg-agent.c:2244
++#: agent/gpg-agent.c:2245
  #, fuzzy, c-format
  msgid "stat() failed for '%s': %s\n"
  msgstr "fstat(%d) a eşuat în %s: %s\n"
  
- #: agent/gpg-agent.c:2248
++#: agent/gpg-agent.c:2249
  #, fuzzy, c-format
  msgid "can't use '%s' as home directory\n"
  msgstr "%s: nu pot crea director: %s\n"
  
- #: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
++#: agent/gpg-agent.c:2392 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1871
  #, fuzzy, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "eroare la citire `%s': %s\n"
  
- #: agent/gpg-agent.c:2598
++#: agent/gpg-agent.c:2599
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2603
++#: agent/gpg-agent.c:2604
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2678
++#: agent/gpg-agent.c:2679
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2683
++#: agent/gpg-agent.c:2684
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
++#: agent/gpg-agent.c:2881 scd/scdaemon.c:1272 dirmngr/dirmngr.c:2075
  #, fuzzy, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "actualizarea secretului a eşuat: %s\n"
  
- #: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2954 scd/scdaemon.c:1321
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
  msgstr "%s: sărită: %s\n"
  
- #: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
++#: agent/gpg-agent.c:3092 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  #, fuzzy
  msgid "no gpg-agent running in this session\n"
  msgstr "gpg-agent nu este disponibil în această sesiune\n"
@@@ -696,8 -538,6 +696,8 @@@ msgid "
  "Password cache maintenance\n"
  msgstr ""
  
- #: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
++#: agent/protect-tool.c:106 g10/gpg.c:424 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:153 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -705,9 -545,6 +705,9 @@@ msgstr "
  "@Comenzi:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
- #: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:92 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:168 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -764,8 -593,6 +764,8 @@@ 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:362 dirmngr/dirmngr.c:1469
- #: tools/gpgconf.c:323
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1472
++#: tools/gpgconf.c:328
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
  msgstr "eroare în `%s': %s\n"
@@@ -937,9 -735,6 +937,9 @@@ msgstr "algoritm de protecţie %d%s nu 
  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:438
 +#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
- #: dirmngr/ldap-wrapper.c:710
++#: dirmngr/ldap-wrapper.c:711
  #, fuzzy, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "eroare la crearea frazei-parolă: %s\n"
@@@ -951,8 -743,6 +951,8 @@@
  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:848 dirmngr/dirmngr.c:1155
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1167
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
  msgstr "eroare la citire `%s': %s\n"
@@@ -999,27 -780,22 +999,27 @@@ msgstr "nu mă pot conecta la `%s': %s\
  msgid "problem setting the gpg-agent options\n"
  msgstr "problemă cu agentul: agentul returnează 0x%lx\n"
  
- #: common/sysutils.c:144
++#: common/sysutils.c:148
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "nu pot deactiva generarea fişierelor core: %s\n"
  
- #: common/sysutils.c:239
++#: common/sysutils.c:250
  #, fuzzy, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "AVERTISMENT: proprietate nesigură (unsafe) pentru extensia `%s'\n"
  
- #: common/sysutils.c:271
++#: common/sysutils.c:282
  #, fuzzy, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
  
- #: common/sysutils.c:659
++#: common/sysutils.c:693
  #, fuzzy, c-format
  msgid "waiting for file '%s' to become accessible ...\n"
  msgstr "actualizarea a eşuat: %s\n"
  
- #: common/sysutils.c:685
++#: common/sysutils.c:719
  #, fuzzy, c-format
  #| msgid "renaming `%s' to `%s' failed: %s\n"
  msgid "renaming '%s' to '%s' failed: %s\n"
@@@ -1095,7 -856,6 +1095,7 @@@ msgstr "
  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:554
++#: common/miscellaneous.c:556
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
@@@ -1211,8 -948,6 +1211,8 @@@ msgstr "%s: inelul de chei creat\n
  msgid "algorithm: %s"
  msgstr "validitate: %s"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3098
++#: scd/app-openpgp.c:3111
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
@@@ -1425,7 -1118,6 +1425,7 @@@ msgstr "
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr ""
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1173
++#: common/argparse.c:401 dirmngr/dirmngr.c:1185
  #, fuzzy
  msgid "out of core\n"
  msgstr "neforţat(ă)"
@@@ -1484,8 -1165,6 +1484,8 @@@ msgstr "cheia publică %s nu a fost gă
  msgid "waiting for lock %s...\n"
  msgstr "scriu cheia secretă în `%s'\n"
  
- #: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
- #: dirmngr/dirmngr.c:715
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:725
++#: dirmngr/dirmngr.c:734
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
@@@ -1524,7 -1195,6 +1524,7 @@@ msgstr "armură neaşteptată: 
  msgid "invalid dash escaped line: "
  msgstr "linie cu liniuţă escape invalidă: "
  
- #: g10/armor.c:873 g10/armor.c:1490
++#: g10/armor.c:873 g10/armor.c:1493
  #, c-format
  msgid "invalid radix64 character %02X skipped\n"
  msgstr "caracter radix64 invalid %02X sărit\n"
@@@ -1541,7 -1208,6 +1541,7 @@@ msgstr "eof prematur (în CRC)\n
  msgid "malformed CRC\n"
  msgstr "CRC anormal\n"
  
- #: g10/armor.c:962 g10/armor.c:1527
++#: g10/armor.c:962 g10/armor.c:1530
  #, c-format
  msgid "CRC error; %06lX - %06lX\n"
  msgstr "eroare CRC; %06lX - %06lX\n"
@@@ -1554,16 -1218,13 +1554,16 @@@ msgstr "eof prematur (în trailer)\n
  msgid "error in trailer line\n"
  msgstr "eroare linia de trailer\n"
  
- #: g10/armor.c:1303
++#: g10/armor.c:1306
  msgid "no valid OpenPGP data found.\n"
  msgstr "nici o dată OpenPGP validă găsită.\n"
  
- #: g10/armor.c:1308
++#: g10/armor.c:1311
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
  msgstr "armură invalidă: linie mai lungă de %d caractere\n"
  
- #: g10/armor.c:1312
++#: g10/armor.c:1315
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr ""
@@@ -1653,8 -1299,6 +1653,8 @@@ msgstr "cardul OpenPGP nu e disponibil
  msgid "OpenPGP card no. %s detected\n"
  msgstr "cardul OpenPGP nr. %s detectat\n"
  
- #: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
- #: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2030
++#: g10/keygen.c:4087 g10/revoke.c:215 g10/revoke.c:618
  msgid "can't do this in batch mode\n"
  msgstr "nu pot face acest lucru în modul batch\n"
  
@@@ -1663,15 -1306,10 +1663,15 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "Această comandă nu este permisă în modul %s.\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2454
++#: g10/card-util.c:109 scd/app-openpgp.c:2467
  #, fuzzy
  msgid "Reset Code not or not anymore available\n"
  msgstr "părţi ale cheii secrete nu sunt disponibile\n"
  
 +#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
- #: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
- #: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1768
++#: g10/keygen.c:1945 g10/keygen.c:2313 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "Selecţia d-voastră? "
  
@@@ -1733,10 -1357,6 +1733,10 @@@ msgstr "URL pentru a aduce cheia public
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr "Eroare: URL prea lung (limita este de %d caractere).\n"
  
- #: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
- #: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:334
++#: g10/import.c:592 g10/import.c:640 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
++#: dirmngr/dirmngr.c:1510 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
@@@ -1803,7 -1408,6 +1803,7 @@@ msgstr "operaţia pe cheie nu e posibil
  msgid "not an OpenPGP card"
  msgstr "nu este un card OpenPGP"
  
- #: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
++#: g10/card-util.c:1173 g10/keygen.c:4106 g10/keygen.c:5092
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr "eroare la obţinerea informaţiei pentru cheia curentă: %s\n"
@@@ -1834,13 -1433,10 +1834,13 @@@ msgstr "Ce lungime de cheie doriţi? (%
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "Ce lungime de cheie doriţi? (%u) "
  
- #: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
++#: g10/card-util.c:1316 g10/keygen.c:2122 g10/keygen.c:2154
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "rotunjită prin adaos la %u biţi\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2207 sm/certreqgen-ui.c:188
  #, 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"
@@@ -1899,9 -1485,6 +1899,9 @@@ msgstr "   (2) Cheie de cifrare\n
  msgid "   (3) Authentication key\n"
  msgstr "   (3) Cheie de autentificare\n"
  
- #: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
- #: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
- #: g10/keygen.c:2314 g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1508
++#: g10/keygen.c:1794 g10/keygen.c:1822 g10/keygen.c:1952 g10/keygen.c:2060
++#: g10/keygen.c:2336 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Selecţie invalidă.\n"
  
@@@ -1935,7 -1512,6 +1935,7 @@@ msgstr "Doriţi să-l semnaţi? (d/N) 
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1816 g10/keyedit.c:1867
++#: g10/card-util.c:1816 g10/keyedit.c:1868
  msgid "quit this menu"
  msgstr "ieşi din acest meniu"
  
@@@ -1943,7 -1518,6 +1943,7 @@@
  msgid "show admin commands"
  msgstr "arată comenzi administrare"
  
- #: g10/card-util.c:1819 g10/keyedit.c:1870
++#: g10/card-util.c:1819 g10/keyedit.c:1871
  msgid "show this help"
  msgstr "afişează acest mesaj"
  
@@@ -2019,31 -1575,21 +2019,31 @@@ msgstr "Sunt permise comenzi administra
  msgid "Admin commands are not allowed\n"
  msgstr "Nu sunt permise comenzi administrare\n"
  
- #: g10/card-util.c:2127 g10/keyedit.c:2816
++#: g10/card-util.c:2127 g10/keyedit.c:2817
  msgid "Invalid command  (try \"help\")\n"
  msgstr "Comandă invalidă  (încercaţi \"ajutor\")\n"
  
- #: g10/decrypt.c:191 g10/encrypt.c:955
++#: g10/decrypt.c:190 g10/encrypt.c:955
  msgid "--output doesn't work for this command\n"
  msgstr "--output nu merge pentru această comandă\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4904 g10/keyring.c:398 g10/keyring.c:771
  #, fuzzy, c-format
  #| msgid "can't open `%s'\n"
  msgid "can't open '%s'\n"
  msgstr "nu pot deschide `%s'\n"
  
 +#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
- #: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
- #: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4858 g10/keyedit.c:2051
++#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2163
  #, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "cheia \"%s\" nu a fost găsită: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
- #: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
- #: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4866 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:645 g10/tofu.c:2171
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "eroare la citire keyblock: %s\n"
@@@ -2105,7 -1639,6 +2105,7 @@@ msgstr "
  "folosiţi opţiunea \"--delete-secret-keys\" pentru a o şterge pe aceasta mai "
  "întâi.\n"
  
- #: g10/encrypt.c:232 g10/sign.c:1292
++#: g10/encrypt.c:232 g10/sign.c:1294
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "eroare la crearea frazei-parolă: %s\n"
@@@ -2125,7 -1655,6 +2125,7 @@@ msgstr "folosesc cifrul %s\n
  msgid "'%s' already compressed\n"
  msgstr "`%s' deja compresat\n"
  
- #: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:610
  #, fuzzy, c-format
  #| msgid "WARNING: `%s' is an empty file\n"
  msgid "WARNING: '%s' is an empty file\n"
@@@ -2145,7 -1672,6 +2145,7 @@@ msgstr "
  "AVERTISMENT: forţând cifrul simetric %s (%d) violaţi preferinţele "
  "destinatarului\n"
  
- #: g10/encrypt.c:707 g10/sign.c:984
++#: g10/encrypt.c:707 g10/sign.c:986
  #, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2179,7 -1700,6 +2179,7 @@@ msgstr "%s date cifrate\n
  msgid "encrypted with unknown algorithm %d\n"
  msgstr "cifrat cu un algoritm necunoscut %d\n"
  
- #: g10/decrypt-data.c:164 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:129
  msgid ""
  "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
  msgstr ""
@@@ -2277,8 -1779,6 +2277,8 @@@ msgstr "
  msgid " - skipped"
  msgstr "%s: sărită: %s\n"
  
- #: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:845 g10/sign.c:1148
++#: g10/export.c:1251 g10/import.c:1543 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:847 g10/sign.c:1150
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
@@@ -2302,8 -1798,6 +2302,8 @@@ msgstr "cheia %s: cheie stil PGP 2.x - 
  msgid "WARNING: nothing exported\n"
  msgstr "AVERTISMENT: nimic exportat\n"
  
- #: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
- #: g10/plaintext.c:151 g10/plaintext.c:174
++#: g10/export.c:2283 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/plaintext.c:167 g10/plaintext.c:190
  #, fuzzy, c-format
  #| msgid "error creating `%s': %s\n"
  msgid "error creating '%s': %s\n"
@@@ -2350,8 -1835,6 +2350,8 @@@ msgstr "eroare la creearea `%s': %s\n
  msgid "No fingerprint"
  msgstr "Amprenta CA: "
  
- #: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
- #: g10/revoke.c:701
++#: g10/getkey.c:1873 g10/keyedit.c:2929 g10/keyedit.c:3016 g10/revoke.c:637
++#: g10/revoke.c:702
  #, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "cheia secretă \"%s\" nu a fost găsită: %s\n"
@@@ -2383,217 -1861,173 +2383,223 @@@ msgstr "Cheia invalidă %s făcută val
  msgid "using subkey %s instead of primary key %s\n"
  msgstr "folosim subcheia %s în loc de cheia primară %s\n"
  
- #: g10/gpg.c:424 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:200
  #, fuzzy
  msgid "make a signature"
  msgstr "|[fişier]|crează o semnătură"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:427
  #, fuzzy
  msgid "make a clear text signature"
  msgstr "|[fişier]|crează o semnătură text în clar"
  
- #: g10/gpg.c:426 sm/gpgsm.c:202
++#: g10/gpg.c:429 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "crează o semnătură detaşată"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:430 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "cifrează datele"
  
- #: g10/gpg.c:429
++#: g10/gpg.c:432
  msgid "encryption only with symmetric cipher"
  msgstr "cifrează numai cu cifru simetric"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:434 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "decriptează datele (implicit)"
  
- #: g10/gpg.c:433 sm/gpgsm.c:206
++#: g10/gpg.c:436 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "verifică o semnătură"
  
- #: g10/gpg.c:435 sm/gpgsm.c:207
++#: g10/gpg.c:438 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "enumeră chei"
  
- #: g10/gpg.c:437
++#: g10/gpg.c:440
  msgid "list keys and signatures"
  msgstr "enumeră chei şi semnături"
  
- #: g10/gpg.c:438
++#: g10/gpg.c:443
  msgid "list and check key signatures"
  msgstr "enumeră şi verifică semnăturile cheii"
  
- #: g10/gpg.c:439 sm/gpgsm.c:212
++#: g10/gpg.c:445 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "enumeră chei şi amprente"
  
- #: g10/gpg.c:440 sm/gpgsm.c:210
++#: g10/gpg.c:446 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "enumeră chei secrete"
  
- #: g10/gpg.c:442 sm/gpgsm.c:213
++#: g10/gpg.c:448 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "generează o nouă perechi de chei"
  
- #: g10/gpg.c:444
++#: g10/gpg.c:451
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly generate a new key pair"
  msgstr "generează o nouă perechi de chei"
  
- #: g10/gpg.c:446
++#: g10/gpg.c:454
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly add a new user-id"
  msgstr "generează o nouă perechi de chei"
  
- #: g10/gpg.c:449
++#: g10/gpg.c:459
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly revoke a user-id"
  msgstr "generează o nouă perechi de chei"
  
- #: g10/gpg.c:451
++#: g10/gpg.c:462
+ #, fuzzy
+ #| msgid "generate a new key pair"
+ msgid "quickly set a new expiration date"
+ msgstr "generează o nouă perechi de chei"
+ 
++#: g10/gpg.c:464
  msgid "full featured key pair generation"
  msgstr ""
  
- #: g10/gpg.c:452
++#: g10/gpg.c:467
  msgid "generate a revocation certificate"
  msgstr "generează un certificat de revocare"
  
- #: g10/gpg.c:454 sm/gpgsm.c:215
++#: g10/gpg.c:470 sm/gpgsm.c:216
  msgid "remove keys from the public keyring"
  msgstr "şterge chei de pe inelul de chei public"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:472
  msgid "remove keys from the secret keyring"
  msgstr "şterge chei de pe inelul de chei secret"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:474
  #, fuzzy
  #| msgid "sign a key"
  msgid "quickly sign a key"
  msgstr "semnează o cheie"
  
- #: g10/gpg.c:460
++#: g10/gpg.c:476
  #, fuzzy
  #| msgid "sign a key locally"
  msgid "quickly sign a key locally"
  msgstr "semnează o cheie local"
  
- #: g10/gpg.c:461
++#: g10/gpg.c:477
  msgid "sign a key"
  msgstr "semnează o cheie"
  
- #: g10/gpg.c:462
++#: g10/gpg.c:478
  msgid "sign a key locally"
  msgstr "semnează o cheie local"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:479
  msgid "sign or edit a key"
  msgstr "semnează sau editează o cheie"
  
- #: g10/gpg.c:465 sm/gpgsm.c:233
++#: g10/gpg.c:481 sm/gpgsm.c:234
  #, fuzzy
  msgid "change a passphrase"
  msgstr "schimbă fraza-parolă"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:485
  msgid "export keys"
  msgstr "exportă chei"
  
- #: g10/gpg.c:468
++#: g10/gpg.c:486
  msgid "export keys to a keyserver"
  msgstr "exportă chei pentru un server de chei"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:487
  msgid "import keys from a keyserver"
  msgstr "importă chei de la un server de chei"
  
- #: g10/gpg.c:471
++#: g10/gpg.c:490
  msgid "search for keys on a keyserver"
  msgstr "caută pentru chei pe un server de chei"
  
- #: g10/gpg.c:473
++#: g10/gpg.c:492
  msgid "update all keys from a keyserver"
  msgstr "actualizează toate cheile de la un server de chei"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:498
  msgid "import/merge keys"
  msgstr "importă/combină chei"
  
- #: g10/gpg.c:482
++#: g10/gpg.c:501
  msgid "print the card status"
  msgstr "afişează starea cardului"
  
- #: g10/gpg.c:483
++#: g10/gpg.c:502
  msgid "change data on a card"
  msgstr "schimbă data de pe card"
  
- #: g10/gpg.c:484
++#: g10/gpg.c:504
  msgid "change a card's PIN"
  msgstr "schimbă PIN-ul unui card"
  
- #: g10/gpg.c:496
++#: g10/gpg.c:516
  msgid "update the trust database"
  msgstr "actualizează baza de date de încredere"
  
- #: g10/gpg.c:505
++#: g10/gpg.c:525
  #, fuzzy
  msgid "print message digests"
  msgstr "|algo [fişiere]|afişează rezumate mesaje"
  
- #: g10/gpg.c:508 sm/gpgsm.c:228
++#: g10/gpg.c:528 sm/gpgsm.c:229
  msgid "run in server mode"
  msgstr ""
  
- #: g10/gpg.c:510
++#: g10/gpg.c:530
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:514 sm/gpgsm.c:246
++#: g10/gpg.c:534 sm/gpgsm.c:248
  msgid "create ascii armored output"
  msgstr "crează ieşire în armură ascii"
  
- #: g10/gpg.c:517 sm/gpgsm.c:262
++#: g10/gpg.c:537 sm/gpgsm.c:264
  #, fuzzy
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|NUME|cifrare pentru NUME"
  
- #: g10/gpg.c:533 sm/gpgsm.c:298
++#: g10/gpg.c:553 sm/gpgsm.c:300
  #, 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:539
++#: g10/gpg.c:559
  #, fuzzy
  msgid "|N|set compress level to N (0 disables)"
  msgstr "|N|setează nivel de compresie N (0 deactivează)"
  
- #: g10/gpg.c:546
++#: g10/gpg.c:566
  msgid "use canonical text mode"
  msgstr "foloseşte modul text canonic"
  
- #: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
++#: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
  #, fuzzy
  msgid "|FILE|write output to FILE"
  msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
  
- #: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
++#: g10/gpg.c:598 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
  msgid "do not make any changes"
  msgstr "nu face nici o schimbare"
  
- #: g10/gpg.c:579
++#: g10/gpg.c:599
  msgid "prompt before overwriting"
  msgstr "întreabă înainte de a suprascrie"
  
- #: g10/gpg.c:628
++#: g10/gpg.c:648
  msgid "use strict OpenPGP behavior"
  msgstr "foloseşte comportament strict OpenPGP"
  
- #: g10/gpg.c:654 sm/gpgsm.c:355
++#: g10/gpg.c:674 sm/gpgsm.c:357
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2601,7 -2035,16 +2607,17 @@@ msgstr "
  "@\n"
  "(Arată pagina man pentru o listă completă a comenzilor şi opţiunilor)\n"
  
- #: g10/gpg.c:657 sm/gpgsm.c:358
++#: g10/gpg.c:677
+ #, fuzzy
+ #| msgid ""
+ #| "@\n"
+ #| "Examples:\n"
+ #| "\n"
+ #| " -se -r Bob [file]          sign and encrypt for user Bob\n"
+ #| " --clear-sign [file]         make a clear text signature\n"
+ #| " --detach-sign [file]       make a detached signature\n"
+ #| " --list-keys [names]        show keys\n"
+ #| " --fingerprint [names]      show fingerprints\n"
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2621,13 -2064,11 +2637,13 @@@ msgstr "
  " --list-keys [nume]         arată chei\n"
  " --fingerprint [nume]       arată amprente\n"
  
- #: g10/gpg.c:1026
++#: g10/gpg.c:1047
  #, 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:1029
++#: g10/gpg.c:1050
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg [options] [files]\n"
@@@ -2642,7 -2083,6 +2658,7 @@@ msgstr "
  "sign, check, encrypt sau decrypt\n"
  "operaţiunea implicită depinde de datele de intrare\n"
  
- #: g10/gpg.c:1040 sm/gpgsm.c:588
++#: g10/gpg.c:1061 sm/gpgsm.c:580
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2650,78 -2090,64 +2666,78 @@@ msgstr "
  "\n"
  "Algoritmuri suportate:\n"
  
- #: g10/gpg.c:1043
++#: g10/gpg.c:1064
  msgid "Pubkey: "
  msgstr "Pubkey: "
  
- #: g10/gpg.c:1050 g10/keyedit.c:3402
++#: g10/gpg.c:1071 g10/keyedit.c:3483
  msgid "Cipher: "
  msgstr "Cifru: "
  
- #: g10/gpg.c:1057
++#: g10/gpg.c:1078
  msgid "Hash: "
  msgstr "Hash: "
  
- #: g10/gpg.c:1064 g10/keyedit.c:3451
++#: g10/gpg.c:1085 g10/keyedit.c:3532
  msgid "Compression: "
  msgstr "Compresie: "
  
- #: g10/gpg.c:1133 sm/gpgsm.c:662
++#: g10/gpg.c:1154 sm/gpgsm.c:654
  #, fuzzy, c-format
  msgid "usage: %s [options] %s\n"
  msgstr "folosire: gpg [opţiuni] "
  
- #: g10/gpg.c:1321 sm/gpgsm.c:751
++#: g10/gpg.c:1342 sm/gpgsm.c:743
  msgid "conflicting commands\n"
  msgstr "comenzi în conflict\n"
  
- #: g10/gpg.c:1339
++#: g10/gpg.c:1360
  #, 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:1537
++#: g10/gpg.c:1558
  #, 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:1540
++#: g10/gpg.c:1561
  #, 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:1543
++#: g10/gpg.c:1564
  #, 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:1549
++#: g10/gpg.c:1570
  #, 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:1552
++#: g10/gpg.c:1573
  #, 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:1555
++#: g10/gpg.c:1576
  #, 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:1561
++#: g10/gpg.c:1582
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
  msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
@@@ -2729,7 -2155,6 +2745,7 @@@ msgstr "
  "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
  "directorul home `%s'\n"
  
- #: g10/gpg.c:1564
++#: g10/gpg.c:1585
  #, fuzzy, c-format
  #| msgid ""
  #| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2739,7 -2164,6 +2755,7 @@@ msgstr "
  "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru fişier "
  "configurare `%s'\n"
  
- #: g10/gpg.c:1567
++#: g10/gpg.c:1588
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
  msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
@@@ -2747,7 -2171,6 +2763,7 @@@ msgstr "
  "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
  "extensia `%s'\n"
  
- #: g10/gpg.c:1573
++#: g10/gpg.c:1594
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
  msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
@@@ -2755,7 -2178,6 +2771,7 @@@ msgstr "
  "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
  "directorul home `%s'\n"
  
- #: g10/gpg.c:1576
++#: g10/gpg.c:1597
  #, fuzzy, c-format
  #| msgid ""
  #| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2766,7 -2188,6 +2782,7 @@@ msgstr "
  "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru fişier "
  "configurare `%s'\n"
  
- #: g10/gpg.c:1579
++#: g10/gpg.c:1600
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
  msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
@@@ -2774,516 -2195,359 +2790,455 @@@ msgstr "
  "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
  "extensia `%s'\n"
  
- #: g10/gpg.c:1786
++#: g10/gpg.c:1816
  #, fuzzy, c-format
  #| msgid "unknown configuration item `%s'\n"
  msgid "unknown configuration item '%s'\n"
  msgstr "articol configurare necunoscut `%s'\n"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1925
  msgid "display photo IDs during key listings"
  msgstr ""
  
- #: g10/gpg.c:1895
++#: g10/gpg.c:1927
  #, fuzzy
  msgid "show key usage information during key listings"
  msgstr "Nici o semnătură corespunzătoare în inelul secret\n"
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1929
  msgid "show policy URLs during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1931
  #, fuzzy
  msgid "show all notations during signature listings"
  msgstr "Nici o semnătură corespunzătoare în inelul secret\n"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1933
  msgid "show IETF standard notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1937
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1939
  #, fuzzy
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1941
  msgid "show user ID validity during key listings"
  msgstr ""
  
- #: g10/gpg.c:1911
++#: g10/gpg.c:1943
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  
- #: g10/gpg.c:1913
++#: g10/gpg.c:1945
  msgid "show revoked and expired subkeys in key listings"
  msgstr ""
  
- #: g10/gpg.c:1915
++#: g10/gpg.c:1947
  #, 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:1917
++#: g10/gpg.c:1949
  #, fuzzy
  msgid "show expiration dates during signature listings"
  msgstr "Nici o semnătură corespunzătoare în inelul secret\n"
  
- #: g10/gpg.c:2019 g10/gpg.c:2056
++#: g10/gpg.c:2051 g10/gpg.c:2088
  #, fuzzy, c-format
  msgid "valid values for option '%s':\n"
  msgstr "opţiuni enumerare invalide\n"
  
- #: g10/gpg.c:2030
++#: g10/gpg.c:2062
  #, fuzzy, c-format
  #| msgid "unknown option `%s'\n"
  msgid "unknown TOFU policy '%s'\n"
  msgstr "opţiune necunoscută `%s'\n"
  
- #: g10/gpg.c:2032 g10/gpg.c:2068
++#: g10/gpg.c:2064 g10/gpg.c:2100
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2066
++#: g10/gpg.c:2098 g10/keygen.c:167
  #, fuzzy, c-format
  msgid "invalid value for option '%s'\n"
  msgstr "opţiuni enumerare invalide\n"
  
- #: g10/gpg.c:2203
++#: g10/gpg.c:2235
  #, fuzzy, c-format
  #| msgid "NOTE: old default options file `%s' ignored\n"
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "NOTĂ: fisier opţiuni implicite vechi `%s' ignorat\n"
  
- #: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
++#: g10/gpg.c:2839 g10/gpg.c:3610 g10/gpg.c:3622
  #, 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:2978 g10/gpg.c:2990
++#: g10/gpg.c:3011 g10/gpg.c:3023
  #, 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:3012
++#: g10/gpg.c:3045
  #, fuzzy, c-format
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "Nu este o adresă de email validă\n"
  
- #: g10/gpg.c:3044 sm/gpgsm.c:1166
++#: g10/gpg.c:3077 sm/gpgsm.c:1158
  #, fuzzy, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "algoritm hash invalid `%s'\n"
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3130
  #, 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:3119 g10/gpg.c:3322 g10/keyedit.c:5338
++#: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
  msgid "could not parse keyserver URL\n"
  msgstr "nu am putut interpreta URL-ul serverului de chei\n"
  
- #: g10/gpg.c:3137
++#: g10/gpg.c:3170
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: opţiuni server de chei invalide\n"
  
- #: g10/gpg.c:3140
++#: g10/gpg.c:3173
  msgid "invalid keyserver options\n"
  msgstr "opţiuni server de chei invalide\n"
  
- #: g10/gpg.c:3147
++#: g10/gpg.c:3180
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: opţiuni import invalide\n"
  
- #: g10/gpg.c:3150
++#: g10/gpg.c:3183
  msgid "invalid import options\n"
  msgstr "opţiuni import invalide\n"
  
- #: g10/gpg.c:3156 g10/gpg.c:3171
++#: g10/gpg.c:3189 g10/gpg.c:3204
  #, fuzzy, c-format
  #| msgid "invalid list options\n"
  msgid "invalid filter option: %s\n"
  msgstr "opţiuni enumerare invalide\n"
  
- #: g10/gpg.c:3162
++#: g10/gpg.c:3195
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: opţiuni export invalide\n"
  
- #: g10/gpg.c:3165
++#: g10/gpg.c:3198
  msgid "invalid export options\n"
  msgstr "opţiuni export invalide\n"
  
- #: g10/gpg.c:3177
++#: g10/gpg.c:3210
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: opţiuni enumerare invalide\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3213
  msgid "invalid list options\n"
  msgstr "opţiuni enumerare invalide\n"
  
- #: g10/gpg.c:3188
++#: g10/gpg.c:3221
  msgid "display photo IDs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3190
++#: g10/gpg.c:3223
  msgid "show policy URLs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3192
++#: g10/gpg.c:3225
  #, fuzzy
  msgid "show all notations during signature verification"
  msgstr "`%s' nu este expirare de semnătură validă\n"
  
- #: g10/gpg.c:3194
++#: g10/gpg.c:3227
  msgid "show IETF standard notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3231
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3200
++#: g10/gpg.c:3233
  #, fuzzy
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
  
- #: g10/gpg.c:3202
++#: g10/gpg.c:3235
  #, fuzzy
  msgid "show user ID validity during signature verification"
  msgstr "`%s' nu este expirare de semnătură validă\n"
  
- #: g10/gpg.c:3204
++#: g10/gpg.c:3237
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  
- #: g10/gpg.c:3206
++#: g10/gpg.c:3239
  #, fuzzy
  msgid "show only the primary user ID in signature verification"
  msgstr "`%s' nu este expirare de semnătură validă\n"
  
- #: g10/gpg.c:3208
++#: g10/gpg.c:3241
  msgid "validate signatures with PKA data"
  msgstr ""
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3243
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr ""
  
- #: g10/gpg.c:3217
++#: g10/gpg.c:3250
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: opţiuni verificare invalide\n"
  
- #: g10/gpg.c:3220
++#: g10/gpg.c:3253
  msgid "invalid verify options\n"
  msgstr "opţiuni verificare invalide\n"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3260
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "nu pot seta cale-execuţie ca %s\n"
  
- #: g10/gpg.c:3417
++#: g10/gpg.c:3452
  #, fuzzy, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: opţiuni verificare invalide\n"
  
- #: g10/gpg.c:3420
++#: g10/gpg.c:3455
  msgid "invalid auto-key-locate list\n"
  msgstr ""
  
- #: g10/gpg.c:3553 sm/gpgsm.c:1507
++#: g10/gpg.c:3592 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
  msgstr "AVERTISMENT: programul ar putea crea un fişier core!\n"
  
- #: g10/gpg.c:3564
++#: g10/gpg.c:3603
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "AVERTISMENT: %s înlocuieşte %s\n"
  
- #: g10/gpg.c:3573
++#: g10/gpg.c:3612
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s nu este permis cu %s!\n"
  
- #: g10/gpg.c:3576
++#: g10/gpg.c:3615
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s nu are sens cu %s!\n"
  
- #: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
++#: g10/gpg.c:3630 sm/gpgsm.c:1518 dirmngr/dirmngr.c:951
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3651
  #, 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:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
++#: g10/gpg.c:3686 g10/gpg.c:3710 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "algoritm cifrare selectat este invalid\n"
  
- #: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
++#: g10/gpg.c:3692 g10/gpg.c:3716 sm/gpgsm.c:1591 sm/gpgsm.c:1597
  msgid "selected digest algorithm is invalid\n"
  msgstr "algoritm rezumat selectat este invalid\n"
  
- #: g10/gpg.c:3659
++#: g10/gpg.c:3698
  msgid "selected compression algorithm is invalid\n"
  msgstr "algoritm compresie selectat este invalid\n"
  
- #: g10/gpg.c:3665
++#: g10/gpg.c:3704
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "algoritm rezumat certificare selectat este invalid\n"
  
- #: g10/gpg.c:3680
++#: g10/gpg.c:3719
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed trebuie să fie mai mare decât 0\n"
  
- #: g10/gpg.c:3682
++#: g10/gpg.c:3721
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed trebuie să fie mai mare decât 1\n"
  
- #: g10/gpg.c:3684
++#: g10/gpg.c:3723
  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:3686
++#: g10/gpg.c:3725
  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:3688
++#: g10/gpg.c:3727
  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:3691
++#: g10/gpg.c:3730
  #, fuzzy
  #| 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:3695
++#: g10/gpg.c:3734
  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:3702
++#: g10/gpg.c:3741
  msgid "invalid default preferences\n"
  msgstr "preferinţe implicite invalide\n"
  
- #: g10/gpg.c:3706
++#: g10/gpg.c:3745
  msgid "invalid personal cipher preferences\n"
  msgstr "preferinţe cifrare personale invalide\n"
  
- #: g10/gpg.c:3710
++#: g10/gpg.c:3749
  msgid "invalid personal digest preferences\n"
  msgstr "preferinţe rezumat personale invalide\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3753
  msgid "invalid personal compress preferences\n"
  msgstr "preferinţe compresie personale invalide\n"
  
- #: g10/gpg.c:3750
++#: g10/gpg.c:3789
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s nu merge încă cu %s!\n"
  
- #: g10/gpg.c:3797
++#: g10/gpg.c:3836
  #, fuzzy, c-format
  #| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr "nu puteţi folosi algoritmul de cifrare `%s' câtă vreme în modul %s\n"
  
- #: g10/gpg.c:3802
++#: g10/gpg.c:3841
  #, fuzzy, c-format
  #| msgid "you may not use digest algorithm `%s' while in %s mode\n"
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr "nu puteţi folosi algorimul de rezumat `%s' câtă vreme în modul %s\n"
  
- #: g10/gpg.c:3807
++#: g10/gpg.c:3846
  #, fuzzy, c-format
  #| msgid "you may not use compression algorithm `%s' while in %s mode\n"
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr "nu puteţi folosi algoritmul de compresie `%s' câtă vreme în modul %s\n"
  
- #: g10/gpg.c:3906
++#: g10/gpg.c:3945
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "am eşuat să iniţializez TrustDB:%s\n"
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:3957
  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:3975
- msgid "--store [filename]"
- msgstr "--store [nume_fişier]"
- 
- #: g10/gpg.c:3985
- msgid "--symmetric [filename]"
- msgstr "--symmetric [nume_fişier]"
- 
- #: g10/gpg.c:3989
++#: g10/gpg.c:4028
  #, 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:4000
- msgid "--encrypt [filename]"
- msgstr "--encrypt [nume_fişier]"
- 
- #: g10/gpg.c:4016
- msgid "--symmetric --encrypt [filename]"
- msgstr "--symmetric --encrypt [nume_fişier]"
- 
- #: g10/gpg.c:4018
++#: g10/gpg.c:4057
  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:4021
++#: g10/gpg.c:4060
  #, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr "nu puteţi folosi --symmetric --encrypt câtă vreme în modul %s\n"
  
- #: g10/gpg.c:4042
- msgid "--sign [filename]"
- msgstr "--sign [nume_fişier]"
- 
- #: g10/gpg.c:4058
- msgid "--sign --encrypt [filename]"
- msgstr "--sign --encrypt [nume_fişier]"
- 
- #: g10/gpg.c:4076
- msgid "--symmetric --sign --encrypt [filename]"
- msgstr "--symmetric --sign --encrypt [nume_fişier]"
- 
- #: g10/gpg.c:4078
++#: g10/gpg.c:4117
  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:4081
++#: g10/gpg.c:4120
  #, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr "nu puteţi folosi --symmetric --sign --encrypt câtă vreme în modul %s\n"
  
- #: g10/gpg.c:4105
- msgid "--sign --symmetric [filename]"
- msgstr "--sign --symmetric [nume_fişier]"
- 
- #: g10/gpg.c:4117
- msgid "--clearsign [filename]"
- msgstr "--clearsign [nume_fişier]"
- 
- #: g10/gpg.c:4147
- msgid "--decrypt [filename]"
- msgstr "--decrypt [nume_fişier]"
- 
- #: g10/gpg.c:4174
- msgid "--sign-key user-id"
- msgstr "--sign-key id-utilizator"
- 
- #: g10/gpg.c:4178
- msgid "--lsign-key user-id"
- msgstr "--lsign-key id-utilizator"
- 
- #: g10/gpg.c:4199
- msgid "--edit-key user-id [commands]"
- msgstr "--edit-key id-utilizator [comenzi]"
- 
- #: g10/gpg.c:4215
- #, fuzzy
- msgid "--passwd <user-id>"
- msgstr "--sign-key id-utilizator"
- 
- #: g10/gpg.c:4411 g10/keyserver.c:1837
++#: g10/gpg.c:4462 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "trimitere server de chei eşuată: %s\n"
  
- #: g10/gpg.c:4416
++#: g10/gpg.c:4467
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "recepţie server de chei eşuată: %s\n"
  
- #: g10/gpg.c:4422
++#: g10/gpg.c:4473
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "export cheie eşuat: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4486
  #, 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:4447
++#: g10/gpg.c:4498
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "căutare server de chei eşuată: %s\n"
  
- #: g10/gpg.c:4460
++#: g10/gpg.c:4511
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "actualizare server de chei eşuată: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4578
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "eliminarea armurii a eşuat: %s\n"
  
- #: g10/gpg.c:4538
++#: g10/gpg.c:4589
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "punerea armurii a eşuat: %s\n"
  
- #: g10/gpg.c:4630
++#: g10/gpg.c:4681
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
  msgstr "algoritm hash invalid `%s'\n"
  
- #: g10/gpg.c:4776 g10/tofu.c:2002
++#: g10/gpg.c:4827 g10/tofu.c:2151
  #, fuzzy, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "eroare la obţinerea numărului serial: %s\n"
  
- #: g10/gpg.c:4788
++#: g10/gpg.c:4839
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4835
- msgid "[filename]"
- msgstr "[nume_fişier]"
- 
- #: g10/gpg.c:4841
++#: g10/gpg.c:4894
  msgid "Go ahead and type your message ...\n"
  msgstr "Daţi-i drumul şi scrieţi mesajul ...\n"
  
- #: g10/gpg.c:5179
++#: g10/gpg.c:5232
  msgid "the given certification policy URL is invalid\n"
  msgstr "URL-ul politicii de certificare furnizat este invalid\n"
  
- #: g10/gpg.c:5181
++#: g10/gpg.c:5234
  msgid "the given signature policy URL is invalid\n"
  msgstr "URL-ul politicii de semnături furnizat este invalid\n"
  
- #: g10/gpg.c:5214
++#: g10/gpg.c:5267
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
  
@@@ -3296,7 -2558,6 +3251,7 @@@ msgstr "ia cheile de pe acest inel de c
  msgid "make timestamp conflicts only a warning"
  msgstr "dă numai un avertisment la conflicte de timestamp"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:345
++#: g10/gpgv.c:82 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|scrie informaţii de stare în acest FD"
  
@@@ -3327,333 -2583,267 +3282,333 @@@ msgstr "Nici un ajutor disponibil
  msgid "No help available for '%s'"
  msgstr "Nici un disponibil disponibil pentru `%s'"
  
- #: g10/import.c:151
++#: g10/import.c:152
  msgid "import signatures that are marked as local-only"
  msgstr ""
  
- #: g10/import.c:154
++#: g10/import.c:155
  msgid "repair damage from the pks keyserver during import"
  msgstr ""
  
- #: g10/import.c:157
++#: g10/import.c:158
  #, fuzzy
  msgid "do not clear the ownertrust values during import"
  msgstr "actualizează baza de date de încredere"
  
- #: g10/import.c:160
++#: g10/import.c:161
  #, fuzzy
  msgid "do not update the trustdb after import"
  msgstr "actualizează baza de date de încredere"
  
- #: g10/import.c:163
++#: g10/import.c:164
  #, fuzzy
  #| msgid "show key fingerprint"
  msgid "show key during import"
  msgstr "afişează amprenta cheii"
  
- #: g10/import.c:166
++#: g10/import.c:167
  msgid "only accept updates to existing keys"
  msgstr ""
  
- #: g10/import.c:169
++#: g10/import.c:170
  #, fuzzy
  msgid "remove unusable parts from key after import"
  msgstr "cheie secretă de nefolosit"
  
- #: g10/import.c:172
++#: g10/import.c:173
  msgid "remove as much as possible from key after import"
  msgstr ""
  
- #: g10/import.c:175
++#: g10/import.c:176
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:326 g10/import.c:568
++#: g10/import.c:327 g10/import.c:569
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "bloc de tip %d sărit\n"
  
- #: g10/import.c:585
++#: g10/import.c:586
  #, c-format
  msgid "%lu keys processed so far\n"
  msgstr "%lu chei procesate până acum\n"
  
- #: g10/import.c:655
++#: g10/import.c:656
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "Număr total procesate: %lu\n"
  
- #: g10/import.c:658
++#: g10/import.c:659
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "      chei noi sărite: %lu\n"
  
- #: g10/import.c:660
++#: g10/import.c:661
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "      chei noi sărite: %lu\n"
  
- #: g10/import.c:663
++#: g10/import.c:664
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "  fără ID-uri utilizator: %lu\n"
  
- #: g10/import.c:666 sm/import.c:130
++#: g10/import.c:667 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "               importate: %lu"
  
- #: g10/import.c:670 sm/import.c:134
++#: g10/import.c:671 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "             neschimbate: %lu\n"
  
- #: g10/import.c:672
++#: g10/import.c:673
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "   noi ID-uri utilizator: %lu\n"
  
- #: g10/import.c:674
++#: g10/import.c:675
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "             noi subchei: %lu\n"
  
- #: g10/import.c:676
++#: g10/import.c:677
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "           noi semnături: %lu\n"
  
- #: g10/import.c:678
++#: g10/import.c:679
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "    noi revocări de chei: %lu\n"
  
- #: g10/import.c:680 sm/import.c:136
++#: g10/import.c:681 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "     chei secrete citite: %lu\n"
  
- #: g10/import.c:682 sm/import.c:138
++#: g10/import.c:683 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "  chei secrete importate: %lu\n"
  
- #: g10/import.c:684 sm/import.c:140
++#: g10/import.c:685 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr "chei secrete neschimbate: %lu\n"
  
- #: g10/import.c:686 sm/import.c:142
++#: g10/import.c:687 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "            ne importate: %lu\n"
  
- #: g10/import.c:688
++#: g10/import.c:689
  #, fuzzy, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "semnături create până acum: %lu\n"
  
- #: g10/import.c:690
++#: g10/import.c:691
  #, fuzzy, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "     chei secrete citite: %lu\n"
  
- #: g10/import.c:1034
++#: g10/import.c:1035
  #, fuzzy, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
  "algorithms on these user IDs:\n"
  msgstr "AVERTISMENT: cheia %s conţine preferinţe pentru indisponibil\n"
  
- #: g10/import.c:1076
++#: g10/import.c:1077
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr "         \"%s\": preferinţă pentru algoritm de cifrare %s\n"
  
- #: g10/import.c:1091
++#: g10/import.c:1092
  #, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "         \"%s\": preferinţă pentru algoritm rezumat %s\n"
  
- #: g10/import.c:1103
++#: g10/import.c:1104
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr "         \"%s\": preferinţă pentru algoritm compresie %s\n"
  
- #: g10/import.c:1116
++#: g10/import.c:1117
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr ""
  "este puternic sugerat să vă actualizaţi preferinţele şi re-distribuiţi\n"
  
- #: g10/import.c:1118
++#: g10/import.c:1119
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  "această cheie pentru a avita probleme potenţiale de ne-potrivire de "
  "algoritm\n"
  
- #: g10/import.c:1143
++#: g10/import.c:1144
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr "vă puteţi actualiza preferinţele cu: gpg --edit-key %s updpref save\n"
  
- #: g10/import.c:1379 g10/import.c:2167
++#: g10/import.c:1380 g10/import.c:2168
  #, c-format
  msgid "key %s: no user ID\n"
  msgstr "cheia %s: nici un ID utilizator\n"
  
- #: g10/import.c:1385
++#: g10/import.c:1386
  #, fuzzy, c-format
  #| msgid "skipped \"%s\": %s\n"
  msgid "key %s: %s\n"
  msgstr "sărită \"%s\": %s\n"
  
- #: g10/import.c:1386 g10/import.c:2141
++#: g10/import.c:1387 g10/import.c:2142
  msgid "rejected by import screener"
  msgstr ""
  
- #: g10/import.c:1416
++#: g10/import.c:1417
  #, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "cheia %s: subcheia HPK coruptă a fost reparată\n"
  
- #: g10/import.c:1434
++#: g10/import.c:1435
  #, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "cheia %s: am acceptat ID-ul utilizator ce nu e auto-semnat \"%s\"\n"
  
- #: g10/import.c:1444 g10/import.c:1475
++#: g10/import.c:1445 g10/import.c:1476
  #, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "cheia %s: nici un ID utilizator valid\n"
  
- #: g10/import.c:1446
++#: g10/import.c:1447
  msgid "this may be caused by a missing self-signature\n"
  msgstr "aceasta poate fi cauzată de o auto-semnătură ce lipseşte\n"
  
- #: g10/import.c:1516 g10/import.c:2318
++#: g10/import.c:1517 g10/import.c:2319
  #, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "cheia %s: cheia publică nu a fost găsită: %s\n"
  
- #: g10/import.c:1522
++#: g10/import.c:1523
  #, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "cheia %s: cheie nouă - sărită\n"
  
- #: g10/import.c:1537
++#: g10/import.c:1538
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "n-am găsit nici un inel de chei ce poate fi scris: %s\n"
  
- #: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
++#: g10/import.c:1547 g10/import.c:1648 g10/import.c:2385
  #, fuzzy, c-format
  #| msgid "error writing keyring `%s': %s\n"
  msgid "error writing keyring '%s': %s\n"
  msgstr "eroare la scrierea inelului de chei `%s': %s\n"
  
- #: g10/import.c:1566
++#: g10/import.c:1567
  #, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "cheia %s: cheia publică \"%s\" importată\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1591
  #, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "cheia %s: nu se potriveşte cu copia noastră\n"
  
- #: g10/import.c:1606 g10/import.c:2342
++#: g10/import.c:1607 g10/import.c:2343
  #, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "cheia %s: nu pot găsi keyblock-ul original: %s\n"
  
- #: g10/import.c:1614 g10/import.c:2349
++#: g10/import.c:1615 g10/import.c:2350
  #, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "cheia %s: nu pot citi keyblock-ul original: %s\n"
  
- #: g10/import.c:1657
++#: g10/import.c:1658
  #, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "cheia %s: \"%s\" 1 nou ID utilizator\n"
  
- #: g10/import.c:1660
++#: g10/import.c:1661
  #, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
  
- #: g10/import.c:1663
++#: g10/import.c:1664
  #, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "cheia %s: \"%s\" 1 nouă semnătură\n"
  
- #: g10/import.c:1666
++#: g10/import.c:1667
  #, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "cheia %s: \"%s\" %d noi semnături\n"
  
- #: g10/import.c:1669
++#: g10/import.c:1670
  #, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "cheia %s: \"%s\" 1 nouă subcheie\n"
  
- #: g10/import.c:1672
++#: g10/import.c:1673
  #, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "cheia %s: \"%s\" %d noi subchei\n"
  
- #: g10/import.c:1675
++#: g10/import.c:1676
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "cheia %s: \"%s\" %d noi semnături\n"
  
- #: g10/import.c:1678
++#: g10/import.c:1679
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "cheia %s: \"%s\" %d noi semnături\n"
  
- #: g10/import.c:1681
++#: g10/import.c:1682
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
  
- #: g10/import.c:1684
++#: g10/import.c:1685
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
  
- #: g10/import.c:1707
++#: g10/import.c:1708
  #, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "cheia %s: \"%s\" nu a fost schimbată\n"
  
- #: g10/import.c:2019 g10/import.c:2264
++#: g10/import.c:2020 g10/import.c:2265
  #, c-format
  msgid "key %s: secret key imported\n"
  msgstr "cheia %s: cheie secretă importată\n"
  
- #: g10/import.c:2027
++#: g10/import.c:2028
  #, fuzzy, c-format
  #| msgid "skipped: secret key already present\n"
  msgid "key %s: secret key already exists\n"
  msgstr "sărită: cheia secretă deja prezentă\n"
  
- #: g10/import.c:2035
++#: g10/import.c:2036
  #, fuzzy, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "eroare trimitere la `%s': %s\n"
  
- #: g10/import.c:2140
++#: g10/import.c:2141
  #, fuzzy, c-format
  #| msgid "secret key \"%s\" not found: %s\n"
  msgid "secret key %s: %s\n"
  msgstr "cheia secretă \"%s\" nu a fost găsită: %s\n"
  
- #: g10/import.c:2160 g10/import.c:2195
++#: g10/import.c:2161 g10/import.c:2196
  msgid "importing secret keys not allowed\n"
  msgstr "importul de chei secrete nu este permis\n"
  
- #: g10/import.c:2184
++#: g10/import.c:2185
  #, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr "cheia %s: cheie secretă cu cifru invalid %d - sărită\n"
@@@ -3668,142 -2858,115 +3623,142 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2256
++#: g10/import.c:2257
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2311
++#: g10/import.c:2312
  #, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
  "cheia %s: nici o cheie publică - nu pot aplica certificatul de revocare\n"
  
- #: g10/import.c:2360
++#: g10/import.c:2361
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "cheia %s: certificat de revocare invalid: %s - respins\n"
  
- #: g10/import.c:2393
++#: g10/import.c:2394
  #, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "cheia %s: certificatul de revocare \"%s\" importat\n"
  
- #: g10/import.c:2469
++#: g10/import.c:2470
  #, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "cheia %s: nici un ID utilizator pentru semnătură\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2487
  #, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr ""
  "cheia %s: algoritm cu cheie publică nesuportat pentru ID-ul utilizator \"%s"
  "\"\n"
  
- #: g10/import.c:2488
++#: g10/import.c:2489
  #, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "cheia %s: auto-semnătură invalidă pentru ID-ul utilizator \"%s\"\n"
  
- #: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
++#: g10/import.c:2506 g10/import.c:2532 g10/import.c:2583
  #, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "cheia %s: algoritm cu cheie publică nesuportat\n"
  
- #: g10/import.c:2506
++#: g10/import.c:2507
  #, fuzzy, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "cheia %s: am adăugat semnătura de cheie directă\n"
  
- #: g10/import.c:2520
++#: g10/import.c:2521
  #, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "cheia %s: nici o subcheie pentru legarea cheii\n"
  
- #: g10/import.c:2533
++#: g10/import.c:2534
  #, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "cheia %s: legare subcheie invalidă\n"
  
- #: g10/import.c:2549
++#: g10/import.c:2550
  #, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "cheia %s: am şters multiple legături de subchei\n"
  
- #: g10/import.c:2571
++#: g10/import.c:2572
  #, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "cheia %s: nici o subcheie pentru revocare de cheie\n"
  
- #: g10/import.c:2584
++#: g10/import.c:2585
  #, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "cheia %s: revocare de subcheie invalidă\n"
  
- #: g10/import.c:2599
++#: g10/import.c:2600
  #, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "cheia %s: am şters multiple revocări de subcheie\n"
  
- #: g10/import.c:2641
++#: g10/import.c:2642
  #, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "cheia %s: am sărit ID-ul utilizator \"%s\"\n"
  
- #: g10/import.c:2665
++#: g10/import.c:2666
  #, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "cheia %s: am sărit subcheia\n"
  
- #: g10/import.c:2694
++#: g10/import.c:2695
  #, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "cheia %s: semnătura nu poate fi exportată (clasa 0x%02X) - sărită\n"
  
- #: g10/import.c:2705
++#: g10/import.c:2706
  #, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "cheia %s: certificat de revocare într-un loc greşit - sărit\n"
  
- #: g10/import.c:2723
++#: g10/import.c:2724
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "cheia %s: certificat de revocare invalid: %s - sărit\n"
  
- #: g10/import.c:2737
++#: g10/import.c:2738
  #, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "cheia %s: semnătură subcheie într-un loc greşit - sărită\n"
  
- #: g10/import.c:2745
++#: g10/import.c:2746
  #, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "cheia %s: clasă de semnătură neaşteptată (0x%02X) - sărită\n"
  
- #: g10/import.c:2887
++#: g10/import.c:2888
  #, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "cheia %s: am detectat un ID utilizator duplicat - combinate\n"
  
- #: g10/import.c:2951
++#: g10/import.c:2952
  #, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr "AVERTISMENT: cheia %s poate fi revocată: aduc revocarea cheii %s\n"
  
- #: g10/import.c:2967
++#: g10/import.c:2968
  #, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr ""
  "AVERTISMENT: cheia %s poate fi revocată: cheia de revocare %s nu este "
  "prezentă.\n"
  
- #: g10/import.c:3031
++#: g10/import.c:3032
  #, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "cheia %s: am adăugat certificatul de revocare \"%s\"\n"
  
- #: g10/import.c:3069
++#: g10/import.c:3070
  #, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "cheia %s: am adăugat semnătura de cheie directă\n"
@@@ -3841,57 -2998,46 +3796,57 @@@ msgstr "resursă keyblock `%s': %s\n
  msgid "error opening key DB: %s\n"
  msgstr "eroare în `%s': %s\n"
  
- #: g10/keydb.c:1782
++#: g10/keydb.c:1786
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "am eşuat să reconstruiesc cache-ul inelului de chei: %s\n"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[revocation]"
  msgstr "[revocare]"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[self-signature]"
  msgstr "[auto-semnătură]"
  
- #: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
++#: g10/keyedit.c:433 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: dirmngr/ldap-wrapper.c:694
  #, fuzzy, c-format
  msgid "error allocating memory: %s\n"
  msgstr "eroare la crearea inelului de chei `%s': %s\n"
  
- #: g10/keyedit.c:629
++#: g10/keyedit.c:630
  #, fuzzy, c-format
  #| msgid "key %s: unsupported public key algorithm\n"
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr "cheia %s: algoritm cu cheie publică nesuportat\n"
  
- #: g10/keyedit.c:638
++#: g10/keyedit.c:639
  #, fuzzy, c-format
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "semnătură %s, algoritm rezumat %s\n"
  
- #: g10/keyedit.c:800
++#: g10/keyedit.c:801
  #, fuzzy
  #| msgid "revoke signatures"
  msgid " (reordered signatures follow)"
  msgstr "revocă semnături"
  
- #: g10/keyedit.c:913
++#: g10/keyedit.c:914
  #, fuzzy, c-format
  #| msgid "skipped \"%s\": %s\n"
  msgid "key %s:\n"
  msgstr "sărită \"%s\": %s\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:917
  #, fuzzy, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
  msgstr[0] "ID utilizator \"%s\" a fost revocat."
  msgstr[1] "ID utilizator \"%s\" a fost revocat."
  
- #: g10/keyedit.c:919 g10/keylist.c:480
++#: g10/keyedit.c:920 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
@@@ -3899,7 -3045,6 +3854,7 @@@ msgid_plural "%d signatures not checke
  msgstr[0] "1 semnătură nu a fost verificată din cauza unei chei lipsă\n"
  msgstr[1] "1 semnătură nu a fost verificată din cauza unei chei lipsă\n"
  
- #: g10/keyedit.c:923 g10/keylist.c:476
++#: g10/keyedit.c:924 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
@@@ -3907,21 -3052,18 +3862,21 @@@ msgid_plural "%d bad signatures\n
  msgstr[0] "%d semnături incorecte\n"
  msgstr[1] "%d semnături incorecte\n"
  
- #: g10/keyedit.c:927
++#: g10/keyedit.c:928
  #, fuzzy, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
  msgstr[0] "Semnătură bună din \"%s\""
  msgstr[1] "Semnătură bună din \"%s\""
  
- #: g10/keyedit.c:932
++#: g10/keyedit.c:933
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:992 g10/pkclist.c:274
++#: g10/keyedit.c:993 g10/pkclist.c:274
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
  "keys\n"
@@@ -3932,17 -3074,14 +3887,17 @@@ msgstr "
  "pentru a verifica cheile altor utilizatori (folosind paşapoarte,\n"
  "verificând amprentele din diferite surse, etc.)\n"
  
- #: g10/keyedit.c:996 g10/pkclist.c:286
++#: g10/keyedit.c:997 g10/pkclist.c:286
  #, c-format
  msgid "  %d = I trust marginally\n"
  msgstr "  %d = Am o încredere marginală\n"
  
- #: g10/keyedit.c:997 g10/pkclist.c:288
++#: g10/keyedit.c:998 g10/pkclist.c:288
  #, c-format
  msgid "  %d = I trust fully\n"
  msgstr "  %d = Am toată încrederea\n"
  
- #: g10/keyedit.c:1015
++#: g10/keyedit.c:1016
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
@@@ -3952,52 -3091,40 +3907,52 @@@ msgstr "
  "O adâncime mai mare de 1 permite ca cheia pe care o semnaţi să facă\n"
  "semnături de încredere în numele d-voastră.\n"
  
- #: g10/keyedit.c:1032
++#: g10/keyedit.c:1033
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  "Vă rugăm să introduceţi domeniul de restricţionare al acestei semnături, sau "
  "apăsaţi enter pentru niciunul.\n"
  
- #: g10/keyedit.c:1160
++#: g10/keyedit.c:1161
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1168
++#: g10/keyedit.c:1169
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "ID utilizator \"%s\" a fost revocat."
  
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
- #: g10/keyedit.c:2246
++#: g10/keyedit.c:1178 g10/keyedit.c:1206 g10/keyedit.c:1233 g10/keyedit.c:1417
++#: g10/keyedit.c:2247
  msgid "Are you sure you still want to sign it? (y/N) "
  msgstr "Sunteţi sigur(ă) că doriţi să ştergeţi permanent \"%s\"? (d/N)"
  
- #: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
- #: g10/keyedit.c:2251 g10/keyedit.c:3177
++#: g10/keyedit.c:1192 g10/keyedit.c:1220 g10/keyedit.c:1247 g10/keyedit.c:1423
++#: g10/keyedit.c:2252 g10/keyedit.c:3178
  msgid "  Unable to sign.\n"
  msgstr "  Nu pot semna.\n"
  
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1197
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "ID utilizator \"%s\" este expirat."
  
- #: g10/keyedit.c:1224
++#: g10/keyedit.c:1225
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "ID-ul utilizator \"%s\" nu este auto-semnat."
  
- #: g10/keyedit.c:1253
++#: g10/keyedit.c:1254
  #, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "ID-ul utilizator \"%s\" poate fi semnat.  "
  
- #: g10/keyedit.c:1255
++#: g10/keyedit.c:1256
  msgid "Sign it? (y/N) "
  msgstr "Doriţi să-l semnaţi? (d/N) "
  
- #: g10/keyedit.c:1282
++#: g10/keyedit.c:1283
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -4006,11 -3133,9 +3961,11 @@@ msgstr "
  "Auto-semnătura pe \"%s\"\n"
  "este o semnătură stil PGP 2.x.\n"
  
- #: g10/keyedit.c:1291
++#: g10/keyedit.c:1292
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr "Doriţi să o promovaţi la o auto-semnătură OpenPGP? (d/N) "
  
- #: g10/keyedit.c:1304
++#: g10/keyedit.c:1305
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -4019,12 -3144,10 +3974,12 @@@ msgstr "
  "Semnătura d-voastră curentă pe \"%s\"\n"
  "a expirat.\n"
  
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:1310
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr ""
  "Doriţi să creaţi o nouă semnătură pentru a o înlocui pe cea expirată? (d/N) "
  
- #: g10/keyedit.c:1330
++#: g10/keyedit.c:1331
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -4033,43 -3156,34 +3988,43 @@@ msgstr "
  "Semnătura d-voastră curentă pe \"%s\"\n"
  "semnătură locală.\n"
  
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:1336
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr "Doriţi să o promovaţi la o semnătură total exportabilă? (d/N) "
  
- #: g10/keyedit.c:1355
++#: g10/keyedit.c:1356
  #, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "\"%s\" a fost deja semnată local de cheia %s\n"
  
- #: g10/keyedit.c:1359
++#: g10/keyedit.c:1360
  #, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "\"%s\" a fost deja semnată de cheia %s\n"
  
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:1365
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "Doriţi să o semnaţi oricum din nou? (d/N) "
  
- #: g10/keyedit.c:1386
++#: g10/keyedit.c:1387
  #, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "Nimic de semnat cu cheia %s\n"
  
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1411
  msgid "This key has expired!"
  msgstr "Această cheie a expirat!"
  
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1429
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "Această cheie va expira pe %s.\n"
  
- #: g10/keyedit.c:1434
++#: g10/keyedit.c:1435
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr "Doriţi ca semnătura d-voastră să expire în acelaşi timp? (D/n) "
  
- #: g10/keyedit.c:1475
++#: g10/keyedit.c:1476
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -4080,33 -3194,27 +4035,33 @@@ msgstr "
  "într-adevăr persoanei numite deasupra?  Dacă nu ştiţi ce să răspundeţi,\n"
  "introduceţi \"0\".\n"
  
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1481
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) Nu voi răspunde.%s\n"
  
- #: g10/keyedit.c:1482
++#: g10/keyedit.c:1483
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) Nu am verificat deloc.%s\n"
  
- #: g10/keyedit.c:1484
++#: g10/keyedit.c:1485
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) Am făcut ceva verificări superficiale.%s\n"
  
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:1488
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) Am făcut verificări foarte atente.%s\n"
  
- #: g10/keyedit.c:1494
++#: g10/keyedit.c:1495
  #, fuzzy
  #| msgid "Your selection? (enter `?' for more information): "
  msgid "Your selection? (enter '?' for more information): "
  msgstr "Selecţia dvs.? (introduceţi `?' pentru informaţii suplimentare): "
  
- #: g10/keyedit.c:1521
++#: g10/keyedit.c:1522
  #, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -4115,228 -3223,174 +4070,228 @@@ msgstr "
  "Sunteţi într-adevăr sigur(ă) că doriţi să semnaţi\n"
  "această cheie cu cheia d-voastră \"%s\" (%s)\n"
  
- #: g10/keyedit.c:1529
++#: g10/keyedit.c:1530
  msgid "This will be a self-signature.\n"
  msgstr "Aceasta va fi o auto-semnătură.\n"
  
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:1535
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr "AVERTISMENT: semnătura nu va fi marcată ca non-exportabilă.\n"
  
- #: g10/keyedit.c:1541
++#: g10/keyedit.c:1542
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr "AVERTISMENT: semnătura nu va fi marcată ca non-revocabilă.\n"
  
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1552
  msgid "The signature will be marked as non-exportable.\n"
  msgstr "Semnătura va fi marcată ca non-exportabilă.\n"
  
- #: g10/keyedit.c:1558
++#: g10/keyedit.c:1559
  msgid "The signature will be marked as non-revocable.\n"
  msgstr "Semnătura va fi marcată ca non-revocabilă.\n"
  
- #: g10/keyedit.c:1565
++#: g10/keyedit.c:1566
  msgid "I have not checked this key at all.\n"
  msgstr "Nu am verificat această cheie deloc.\n"
  
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:1571
  msgid "I have checked this key casually.\n"
  msgstr "Am verificat această cheie superficial.\n"
  
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:1576
  msgid "I have checked this key very carefully.\n"
  msgstr "Am verificat această cheie foarte atent.\n"
  
- #: g10/keyedit.c:1587
++#: g10/keyedit.c:1588
  msgid "Really sign? (y/N) "
  msgstr "Doriţi cu adevărat să semnaţi? (d/N) "
  
- #: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
- #: g10/keyedit.c:6463 g10/sign.c:323
++#: g10/keyedit.c:1639 g10/keyedit.c:6308 g10/keyedit.c:6391 g10/keyedit.c:6500
++#: g10/keyedit.c:6562 g10/sign.c:325
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "semnarea a eşuat: %s\n"
  
- #: g10/keyedit.c:1725
++#: g10/keyedit.c:1726
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  "Cheia are numai articole de cheie sau talon (stub) pe card - nici o frază "
  "parolă de schimbat.\n"
  
- #: g10/keyedit.c:1755
++#: g10/keyedit.c:1756
  #, fuzzy, c-format
  #| msgid "error creating passphrase: %s\n"
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "eroare la crearea frazei-parolă: %s\n"
  
- #: g10/keyedit.c:1869
++#: g10/keyedit.c:1870
  msgid "save and quit"
  msgstr "salvează şi termină"
  
- #: g10/keyedit.c:1872
++#: g10/keyedit.c:1873
  msgid "show key fingerprint"
  msgstr "afişează amprenta cheii"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1874
  #, fuzzy
  msgid "show the keygrip"
  msgstr "Notare semnătură: "
  
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1875
  msgid "list key and user IDs"
  msgstr "enumeră chei şi ID-uri utilizator"
  
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1877
  msgid "select user ID N"
  msgstr "selectează ID utilizator N"
  
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1878
  msgid "select subkey N"
  msgstr "selectează subcheia N"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1879
  msgid "check signatures"
  msgstr "verifică semnături"
  
- #: g10/keyedit.c:1884
++#: g10/keyedit.c:1885
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr ""
  "semnează ID-urile utilizator selectate [* vezi mai jos pentru comenzi "
  "relevante]"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1890
  msgid "sign selected user IDs locally"
  msgstr "semnează ID-urile utilizatorilor selectaţi local"
  
- #: g10/keyedit.c:1890
++#: g10/keyedit.c:1891
  msgid "sign selected user IDs with a trust signature"
  msgstr "semnează ID-urile utilizatorilor selectaţi cu o semnătură de încredere"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1893
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr "semnează ID-urile utilizatorilor selectaţi cu o semnătură irevocabilă"
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1895
  msgid "add a user ID"
  msgstr "adaugă un ID utilizator"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1897
  msgid "add a photo ID"
  msgstr "adaugă o poză ID"
  
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1898
  msgid "delete selected user IDs"
  msgstr "şterge ID-urile utilizator selectate"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1901
  msgid "add a subkey"
  msgstr "adaugă o subcheie"
  
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1904
  msgid "add a key to a smartcard"
  msgstr "adaugă o cheie la un smartcard"
  
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1906
  msgid "move a key to a smartcard"
  msgstr "mută o cheie pe un smartcard"
  
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1908
  msgid "move a backup key to a smartcard"
  msgstr "mută o cheie de rezervă pe un smartcard"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1910
  msgid "delete selected subkeys"
  msgstr "şterge subcheile selectate"
  
- #: g10/keyedit.c:1911
++#: g10/keyedit.c:1912
  msgid "add a revocation key"
  msgstr "adaugă o cheie de revocare"
  
- #: g10/keyedit.c:1913
++#: g10/keyedit.c:1914
  msgid "delete signatures from the selected user IDs"
  msgstr "şterge semnăturile de pe ID-urile utilizator selectate"
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1916
  msgid "change the expiration date for the key or selected subkeys"
  msgstr "schimbă data de expirare pentru cheia sau subcheile selectate"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1918
  msgid "flag the selected user ID as primary"
  msgstr "marchează ID-ul utilizator selectat ca primar"
  
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1921
  msgid "list preferences (expert)"
  msgstr "enumeră preferinţele (expert)"
  
- #: g10/keyedit.c:1921
++#: g10/keyedit.c:1922
  msgid "list preferences (verbose)"
  msgstr "afişează preferinţele (detaliat)"
  
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:1924
  msgid "set preference list for the selected user IDs"
  msgstr "setează lista de preferinţe pentru ID-urile utilizator selectate"
  
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1927
  #, fuzzy
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr ""
  "setează URL-ul serverului de chei preferat pentru ID-urile utilizator "
  "selectate"
  
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1929
  #, fuzzy
  msgid "set a notation for the selected user IDs"
  msgstr "setează lista de preferinţe pentru ID-urile utilizator selectate"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1931
  msgid "change the passphrase"
  msgstr "schimbă fraza-parolă"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1934
  msgid "change the ownertrust"
  msgstr "schimbă încrederea pentru proprietar"
  
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1937
  msgid "revoke signatures on the selected user IDs"
  msgstr "revocă semnăturile pentru ID-urile utilizator selectate"
  
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1939
  msgid "revoke selected user IDs"
  msgstr "revocă ID-urile utilizator selectate"
  
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1942
  msgid "revoke key or selected subkeys"
  msgstr "revocă cheia sau subcheile selectate"
  
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1944
  msgid "enable key"
  msgstr "activează cheia"
  
- #: g10/keyedit.c:1944
++#: g10/keyedit.c:1945
  msgid "disable key"
  msgstr "deactivează cheia"
  
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1947
  msgid "show selected photo IDs"
  msgstr "arată pozele pentru ID-urile utilizator selectate"
  
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1949
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:1951
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2063
  msgid "Secret key is available.\n"
  msgstr "Cheia secretă este disponibilă.\n"
  
- #: g10/keyedit.c:2162
++#: g10/keyedit.c:2163
  msgid "Need the secret key to do this.\n"
  msgstr "Aveţi nevoie de cheia secretă pentru a face aceasta.\n"
  
- #: g10/keyedit.c:2183
++#: g10/keyedit.c:2184
  #, fuzzy
  #| msgid ""
  #| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4355,272 -3409,218 +4310,278 @@@ msgstr "
  "  pentru semnături irevocabile (nrsign), sau orice combinaţie a acestora\n"
  "  (ltsign, tnrsign, etc.).\n"
  
- #: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
++#: g10/keyedit.c:2240 g10/keyedit.c:3178 g10/keyedit.c:3317 g10/keyedit.c:3379
  msgid "Key is revoked."
  msgstr "Cheia este revocată."
  
- #: g10/keyedit.c:2262
++#: g10/keyedit.c:2263
  msgid "Really sign all user IDs? (y/N) "
  msgstr "Semnaţi într-adevăr toate ID-urile utilizator? (d/N) "
  
- #: g10/keyedit.c:2266
++#: g10/keyedit.c:2267
  #, fuzzy
  #| msgid "Really sign all user IDs? (y/N) "
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "Semnaţi într-adevăr toate ID-urile utilizator? (d/N) "
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2275
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Sugestie: Selectaţi ID-ul utilizator de semnat\n"
  
- #: g10/keyedit.c:2285
++#: g10/keyedit.c:2286
  #, fuzzy, c-format
  #| msgid "Unknown signature type `%s'\n"
  msgid "Unknown signature type '%s'\n"
  msgstr "Tip de semnătură necunoscut `%s'\n"
  
- #: g10/keyedit.c:2309
++#: g10/keyedit.c:2310
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
  msgstr "Această comandă nu este permisă în modul %s.\n"
  
- #: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
++#: g10/keyedit.c:2332 g10/keyedit.c:2356 g10/keyedit.c:2550
  msgid "You must select at least one user ID.\n"
  msgstr "Trebuie mai întâi să selectaţi cel puţin un ID utilizator.\n"
  
- #: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
++#: g10/keyedit.c:2334 g10/keyedit.c:2358 g10/keyedit.c:2512 g10/keyedit.c:2552
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2336
++#: g10/keyedit.c:2337
  msgid "You can't delete the last user ID!\n"
  msgstr "Nu puteţi şterge ultimul ID utilizator!\n"
  
- #: g10/keyedit.c:2339
++#: g10/keyedit.c:2340
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "Ştergeţi într-adevăr toate ID-urile utilizator selectate? (d/N) "
  
- #: g10/keyedit.c:2340
++#: g10/keyedit.c:2341
  msgid "Really remove this user ID? (y/N) "
  msgstr "Ştergeţi într-adevăr acest ID utilizator? (d/N) "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2397
++#: g10/keyedit.c:2398
  msgid "Really move the primary key? (y/N) "
  msgstr "Mutaţi într-adevăr cheia primară? (d/N) "
  
- #: g10/keyedit.c:2409 g10/keyedit.c:4866
++#: g10/keyedit.c:2410 g10/keyedit.c:4964
  msgid "You must select exactly one key.\n"
  msgstr "Trebuie să selectaţi exact o cheie.\n"
  
- #: g10/keyedit.c:2436
++#: g10/keyedit.c:2437
  msgid "Command expects a filename argument\n"
  msgstr "Comanda aşteaptă un nume de fişier ca argument\n"
  
- #: g10/keyedit.c:2457
++#: g10/keyedit.c:2458
  #, fuzzy, c-format
  #| msgid "Can't open `%s': %s\n"
  msgid "Can't open '%s': %s\n"
  msgstr "Nu pot deschide `%s': %s\n"
  
- #: g10/keyedit.c:2474
++#: g10/keyedit.c:2475
  #, fuzzy, c-format
  #| msgid "Error reading backup key from `%s': %s\n"
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "Eroare citind cheia de rezervă de pe `%s': %s\n"
  
- #: g10/keyedit.c:2509
++#: g10/keyedit.c:2510
  msgid "You must select at least one key.\n"
  msgstr "Trebuie să selectaţi cel puţin o cheie.\n"
  
- #: g10/keyedit.c:2515
++#: g10/keyedit.c:2516
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "Doriţi într-adevăr să ştergeţi cheile selectate? (d/N) "
  
- #: g10/keyedit.c:2517
++#: g10/keyedit.c:2518
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "Doriţi într-adevăr să ştergeţi această cheie? (d/N) "
  
- #: g10/keyedit.c:2555
++#: g10/keyedit.c:2556
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr ""
  "Doriţi într-adevăr să revocaţi toate ID-urile utilizator selectate? (d/N) "
  
- #: g10/keyedit.c:2556
++#: g10/keyedit.c:2557
  msgid "Really revoke this user ID? (y/N) "
  msgstr "Doriţi într-adevăr să revocaţi acest ID utilizator? (d/N) "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2575
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "Doriţi într-adevăr să revocaţi toată cheia? (d/N) "
  
- #: g10/keyedit.c:2585
++#: g10/keyedit.c:2586
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "Doriţi într-adevăr să revocaţi subcheile selectate? (d/N) "
  
- #: g10/keyedit.c:2587
++#: g10/keyedit.c:2588
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "Doriţi într-adevăr să revocaţi această subcheie? (d/N) "
  
- #: g10/keyedit.c:2645
++#: g10/keyedit.c:2646
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  "Încrederea proprietar nu poate fi setată când este folosită o bază de date "
  "de încredere furnizată de utilizator\n"
  
- #: g10/keyedit.c:2690
++#: g10/keyedit.c:2691
  msgid "Set preference list to:\n"
  msgstr "Setează lista de preferinţe ca:\n"
  
- #: g10/keyedit.c:2697
++#: g10/keyedit.c:2698
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr ""
  "Doriţi într-adevăr să actualizaţi preferinţele pentru ID-urile utilizator "
  "selectate? (d/N) "
  
- #: g10/keyedit.c:2699
++#: g10/keyedit.c:2700
  msgid "Really update the preferences? (y/N) "
  msgstr "Doriţi într-adevăr să actualizaţi preferinţele? (d/N) "
  
- #: g10/keyedit.c:2773
++#: g10/keyedit.c:2774
  msgid "Save changes? (y/N) "
  msgstr "Salvaţi schimbările?  (d/N) "
  
- #: g10/keyedit.c:2777
++#: g10/keyedit.c:2778
  msgid "Quit without saving? (y/N) "
  msgstr "Terminaţi fără a salva?  (d/N) "
  
- #: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
- #: g10/keyedit.c:3267 g10/keyedit.c:3332
++#: g10/keyedit.c:2789 g10/keyedit.c:2799 g10/keyedit.c:2943 g10/keyedit.c:3046
++#: g10/keyedit.c:3268 g10/keyedit.c:3333 g10/keyedit.c:3409
  #, c-format
  msgid "update failed: %s\n"
  msgstr "actualizarea a eşuat: %s\n"
  
- #: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
++#: g10/keyedit.c:2805 g10/keyedit.c:3273 g10/keyedit.c:3338 g10/keyedit.c:3416
  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:3038
++#: g10/keyedit.c:3039
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
  msgstr "Generarea cheii a eşuat: %s\n"
  
- #: g10/keyedit.c:3083
++#: g10/keyedit.c:3084
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "amprentă invalidă"
  
- #: g10/keyedit.c:3112
++#: g10/keyedit.c:3113
  #, fuzzy, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "am eşuat să stochez amprenta: %s\n"
  
- #: g10/keyedit.c:3248 g10/keyedit.c:3251
++#: g10/keyedit.c:3249 g10/keyedit.c:3252
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
  msgstr "valoare invalidă\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  #, fuzzy
  #| msgid "No such user ID.\n"
  msgid "No matching user IDs."
  msgstr "Nu există acest ID utilizator.\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  #, 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:3427
++#: g10/keyedit.c:3388
+ #, 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:3508
  msgid "Digest: "
  msgstr "Rezumat: "
  
- #: g10/keyedit.c:3484
++#: g10/keyedit.c:3565
  msgid "Features: "
  msgstr "Capabilităţi: "
  
- #: g10/keyedit.c:3495
++#: g10/keyedit.c:3576
  msgid "Keyserver no-modify"
  msgstr "Server de chei no-modify"
  
- #: g10/keyedit.c:3510 g10/keylist.c:377
++#: g10/keyedit.c:3591 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr "Server de chei preferat: "
  
- #: g10/keyedit.c:3518 g10/keyedit.c:3519
++#: g10/keyedit.c:3599 g10/keyedit.c:3600
  #, fuzzy
  msgid "Notations: "
  msgstr "Notaţie:"
  
- #: g10/keyedit.c:3764
++#: g10/keyedit.c:3845
  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:3836
++#: g10/keyedit.c:3917
  #, 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:3860
++#: g10/keyedit.c:3941
  #, 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:3866
++#: g10/keyedit.c:3947
  msgid "(sensitive)"
  msgstr " (senzitiv)"
  
- #: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3989 g10/keyedit.c:4131 g10/keylist.c:262 g10/keyserver.c:538
  #, c-format
  msgid "created: %s"
  msgstr "creată: %s"
  
- #: g10/keyedit.c:3911 g10/keylist.c:1852
++#: g10/keyedit.c:3992 g10/keylist.c:1852
  #, c-format
  msgid "revoked: %s"
  msgstr "revocată: %s"
  
- #: g10/keyedit.c:3913 g10/keylist.c:1858
++#: g10/keyedit.c:3994 g10/keylist.c:1858
  #, c-format
  msgid "expired: %s"
  msgstr "expirată: %s"
  
- #: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyedit.c:3996 g10/keyedit.c:4133 g10/keylist.c:264 g10/keylist.c:1864
 +#: g10/keyserver.c:544
  #, c-format
  msgid "expires: %s"
  msgstr "expiră: %s"
  
- #: g10/keyedit.c:3917
++#: g10/keyedit.c:3998
  #, c-format
  msgid "usage: %s"
  msgstr "folosire: %s"
  
- #: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
++#: g10/keyedit.c:4006 g10/keyedit.c:4026 g10/keylist.c:267
  msgid "card-no: "
  msgstr "nr-card: "
  
- #: g10/keyedit.c:3984
++#: g10/keyedit.c:4065
  #, c-format
  msgid "trust: %s"
  msgstr "încredere: %s"
  
- #: g10/keyedit.c:3988
++#: g10/keyedit.c:4069
  #, c-format
  msgid "validity: %s"
  msgstr "validitate: %s"
  
- #: g10/keyedit.c:3995
++#: g10/keyedit.c:4076
  msgid "This key has been disabled"
  msgstr "Această cheie a fost deactivată"
  
- #: g10/keyedit.c:4013
++#: g10/keyedit.c:4094
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4629,18 -3629,12 +4590,18 @@@ msgstr "
  "corectă dacă nu reporniţi programul.\n"
  
  #
- #: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
- #: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: g10/keyedit.c:4150 g10/keyedit.c:4581 g10/keyserver.c:548
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:712
 +#: dirmngr/ocsp.c:703
  msgid "revoked"
  msgstr "revocată"
  
- #: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
- #: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4152 g10/keyedit.c:4583 g10/keyserver.c:552
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:714
  msgid "expired"
  msgstr "expirată"
  
- #: g10/keyedit.c:4188
++#: g10/keyedit.c:4269
  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"
@@@ -4649,17 -3643,14 +4610,17 @@@ msgstr "
  "              Această comandă poate cauza ca un alt ID utilizator\n"
  "              să devină ID-ul utilizator primar presupus.\n"
  
- #: g10/keyedit.c:4240
++#: g10/keyedit.c:4321
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr ""
  
- #: g10/keyedit.c:4241
++#: g10/keyedit.c:4322
  #, fuzzy
  #| 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:4300
++#: g10/keyedit.c:4381
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4668,35 -3659,27 +4629,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:4305 g10/keyedit.c:4595
++#: g10/keyedit.c:4386 g10/keyedit.c:4676
  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:4311
++#: g10/keyedit.c:4392
  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:4326 g10/keygen.c:2697
++#: g10/keyedit.c:4407 g10/keygen.c:2719
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4509
  msgid "Delete this good signature? (y/N/q)"
  msgstr "Ştergeţi această semnătură bună? (d/N/t)"
  
- #: g10/keyedit.c:4438
++#: g10/keyedit.c:4519
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "Ştergeţi această semnătură invalidă? (d/N/t)"
  
- #: g10/keyedit.c:4442
++#: g10/keyedit.c:4523
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "Ştergeţi această semnătură necunoscută? (d/N/t)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4530
  msgid "Really delete this self-signature? (y/N)"
  msgstr "Ştergeţi într-adevăr această auto-semnătură? (d/N)"
  
- #: g10/keyedit.c:4465
++#: g10/keyedit.c:4546
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
@@@ -4704,37 -3687,30 +4665,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:4469
++#: g10/keyedit.c:4550
  msgid "Nothing deleted.\n"
  msgstr "Nu am şters nimic.\n"
  
- #: g10/keyedit.c:4504 g10/trust.c:693
++#: g10/keyedit.c:4585 g10/trust.c:716
  msgid "invalid"
  msgstr "invalid(ă)"
  
- #: g10/keyedit.c:4506
++#: g10/keyedit.c:4587
  #, fuzzy, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "ID utilizator \"%s\" a fost revocat."
  
- #: g10/keyedit.c:4512
++#: g10/keyedit.c:4593
  #, 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:4520
++#: g10/keyedit.c:4601
  #, fuzzy, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
  
- #: g10/keyedit.c:4521
++#: g10/keyedit.c:4602
  #, fuzzy, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
  
- #: g10/keyedit.c:4590
++#: g10/keyedit.c:4671
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4744,40 -3720,32 +4705,40 @@@ msgstr "
  "             desemnat poate face ca unele versiuni de PGP să respingă "
  "cheia.\n"
  
- #: g10/keyedit.c:4601
++#: g10/keyedit.c:4682
  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:4618
++#: g10/keyedit.c:4699
  msgid "Enter the user ID of the designated revoker: "
  msgstr "Introduceţi ID-ul utilizator al revocatorului desemnat: "
  
- #: g10/keyedit.c:4643
++#: g10/keyedit.c:4724
  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:4658
++#: g10/keyedit.c:4739
  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:4680
++#: g10/keyedit.c:4761
  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:4698
++#: g10/keyedit.c:4779
  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:4704
++#: g10/keyedit.c:4785
  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:4755
++#: g10/keyedit.c:4848
  #, fuzzy
  #| msgid ""
  #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4788,236 -3756,185 +4749,236 @@@ msgstr "
  "Sunteţi sigur(ă) că doriţi să desemnaţi această cheie ca şi un revocator "
  "desemnat? (d/N) "
  
- #: g10/keyedit.c:4760
++#: g10/keyedit.c:4853
  msgid "Changing expiration time for a subkey.\n"
  msgstr "Schimb timpul de expirare pentru o subcheie.\n"
  
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:4856
  msgid "Changing expiration time for the primary key.\n"
  msgstr "Schimb timpul de expirare pentru cheia primară.\n"
  
- #: g10/keyedit.c:4814
++#: g10/keyedit.c:4910
  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:4987
++#: g10/keyedit.c:5085
  #, 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:4993
++#: g10/keyedit.c:5091
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr ""
  
- #: g10/keyedit.c:5108
++#: g10/keyedit.c:5206
  msgid "Please select exactly one user ID.\n"
  msgstr "Vă rugăm selectaţi exact un ID utilizator.\n"
  
- #: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
++#: g10/keyedit.c:5247 g10/keyedit.c:5361 g10/keyedit.c:5474 g10/keyedit.c:5611
  #, 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:5320
++#: g10/keyedit.c:5418
  msgid "Enter your preferred keyserver URL: "
  msgstr "Introduceţi URL-ul serverului de chei preferat: "
  
- #: g10/keyedit.c:5399
++#: g10/keyedit.c:5497
  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:5400
++#: g10/keyedit.c:5498
  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:5459
++#: g10/keyedit.c:5557
  #, fuzzy
  msgid "Enter the notation: "
  msgstr "Notare semnătură: "
  
- #: g10/keyedit.c:5606
++#: g10/keyedit.c:5704
  #, fuzzy
  msgid "Proceed? (y/N) "
  msgstr "Suprascriu? (d/N) "
  
- #: g10/keyedit.c:5676
++#: g10/keyedit.c:5774
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "Nici un ID utilizator cu indicele %d\n"
  
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5836
  #, c-format
  msgid "No user ID with hash %s\n"
  msgstr "Nici un ID utilizator cu hash-ul %s\n"
  
- #: g10/keyedit.c:5839
++#: g10/keyedit.c:5937
  #, 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:5861
++#: g10/keyedit.c:5959
  #, c-format
  msgid "No subkey with index %d\n"
  msgstr "Nici o subcheie cu indicele %d\n"
  
- #: g10/keyedit.c:6002
++#: g10/keyedit.c:6100
  #, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "ID utilizator: \"%s\"\n"
  
- #: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
++#: g10/keyedit.c:6103 g10/keyedit.c:6205 g10/keyedit.c:6253
  #, 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:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
++#: g10/keyedit.c:6105 g10/keyedit.c:6207 g10/keyedit.c:6255
  msgid " (non-exportable)"
  msgstr " (non-exportabilă)"
  
- #: g10/keyedit.c:6011
++#: g10/keyedit.c:6109
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "Această semnătură a expirat pe %s.\n"
  
- #: g10/keyedit.c:6016
++#: g10/keyedit.c:6114
  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:6021
++#: g10/keyedit.c:6119
  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:6075
++#: g10/keyedit.c:6173
  msgid "Not signed by you.\n"
  msgstr ""
  
- #: g10/keyedit.c:6081
++#: g10/keyedit.c:6179
  #, 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:6110
++#: g10/keyedit.c:6208
  msgid " (non-revocable)"
  msgstr " (non-revocabilă)"
  
- #: g10/keyedit.c:6117
++#: g10/keyedit.c:6215
  #, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "revocată de cheia d-voastră %s pe %s\n"
  
- #: g10/keyedit.c:6142
++#: g10/keyedit.c:6240
  msgid "You are about to revoke these signatures:\n"
  msgstr "Sunteţi pe cale să revocaţi aceste semnături:\n"
  
- #: g10/keyedit.c:6165
++#: g10/keyedit.c:6263
  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:6198
++#: g10/keyedit.c:6296
  msgid "no secret key\n"
  msgstr "nici o cheie secretă\n"
  
- #: g10/keyedit.c:6246
++#: g10/keyedit.c:6344
  #, 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:6256
++#: g10/keyedit.c:6354
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
  
- #: g10/keyedit.c:6273
++#: g10/keyedit.c:6371
  #, 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:6386
++#: g10/keyedit.c:6485
  #, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "Cheia %s este deja revocată.\n"
  
- #: g10/keyedit.c:6448
++#: g10/keyedit.c:6547
  #, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "Subcheia %s este deja revocată.\n"
  
- #: g10/keyedit.c:6545
++#: g10/keyedit.c:6644
  #, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr "Afişez poza ID %s de dimensiune %ld pentru cheia %s (uid %d)\n"
  
- #: g10/keygen.c:305
++#: g10/keygen.c:316
  #, fuzzy, c-format
  #| msgid "preference `%s' duplicated\n"
  msgid "preference '%s' duplicated\n"
  msgstr "preferinţa `%s' duplicată\n"
  
- #: g10/keygen.c:312
++#: g10/keygen.c:323
  msgid "too many cipher preferences\n"
  msgstr "prea multe preferinţe de cifrare\n"
  
- #: g10/keygen.c:314
++#: g10/keygen.c:325
  msgid "too many digest preferences\n"
  msgstr "prea multe preferinţe de rezumat\n"
  
- #: g10/keygen.c:316
++#: g10/keygen.c:327
  msgid "too many compression preferences\n"
  msgstr "prea multe preferinţe de compresie\n"
  
- #: g10/keygen.c:457
++#: g10/keygen.c:468
  #, fuzzy, c-format
  #| msgid "invalid item `%s' in preference string\n"
  msgid "invalid item '%s' in preference string\n"
  msgstr "articol invalid `%s' în şirul de preferinţe\n"
  
- #: g10/keygen.c:936
++#: g10/keygen.c:947
  msgid "writing direct signature\n"
  msgstr "scriu semnătură directă\n"
  
- #: g10/keygen.c:982
++#: g10/keygen.c:993
  msgid "writing self signature\n"
  msgstr "scriu auto semnătură\n"
  
- #: g10/keygen.c:1038
++#: g10/keygen.c:1049
  msgid "writing key binding signature\n"
  msgstr "scriu semnătură legată de cheie\n"
  
- #: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
- #: g10/keygen.c:1610 g10/keygen.c:1615
++#: g10/keygen.c:1413 g10/keygen.c:1418 g10/keygen.c:1470 g10/keygen.c:1475
++#: g10/keygen.c:1622 g10/keygen.c:1627
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "lungime cheie invalidă; folosesc %u biţi\n"
  
- #: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
++#: g10/keygen.c:1424 g10/keygen.c:1481 g10/keygen.c:1489 g10/keygen.c:1633
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "lungime cheie rotunjită la %u biţi\n"
  
- #: g10/keygen.c:1503
++#: g10/keygen.c:1515
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1677
++#: g10/keygen.c:1689
  msgid "Sign"
  msgstr "Semnează"
  
- #: g10/keygen.c:1680
++#: g10/keygen.c:1692
  msgid "Certify"
  msgstr ""
  
- #: g10/keygen.c:1683
++#: g10/keygen.c:1695
  msgid "Encrypt"
  msgstr "Cifrează"
  
- #: g10/keygen.c:1686
++#: g10/keygen.c:1698
  msgid "Authenticate"
  msgstr "Autentifică"
  
@@@ -5031,158 -3948,127 +4992,158 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1705
++#: g10/keygen.c:1717
  msgid "SsEeAaQq"
  msgstr "SsCcAaTt"
  
- #: g10/keygen.c:1732
++#: g10/keygen.c:1744
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "Acţiuni posibile pentru o cheie %s: "
  
- #: g10/keygen.c:1738
++#: g10/keygen.c:1750
  msgid "Current allowed actions: "
  msgstr "Acţiuni permise curent: "
  
- #: g10/keygen.c:1743
++#: g10/keygen.c:1755
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) Comută capabilitatea de semnare\n"
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) Comută capabilitatea de cifrare\n"
  
- #: g10/keygen.c:1749
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) Comută capabilitatea de autentificare\n"
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) Terminat\n"
  
- #: g10/keygen.c:1881 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1893 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Selectaţi ce fel de cheie doriţi:\n"
  
- #: g10/keygen.c:1885
++#: g10/keygen.c:1897
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) DSA şi Elgamal (implicit)\n"
  
- #: g10/keygen.c:1889
++#: g10/keygen.c:1901
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA şi Elgamal (implicit)\n"
  
- #: g10/keygen.c:1892
++#: g10/keygen.c:1904
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (numai semnare)\n"
  
- #: g10/keygen.c:1894
++#: g10/keygen.c:1906
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (numai semnare)\n"
  
- #: g10/keygen.c:1900
++#: g10/keygen.c:1912
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) Elgamal (numai cifrare)\n"
  
- #: g10/keygen.c:1902
++#: g10/keygen.c:1914
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (numai cifrare)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1920
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (setează singur capabilităţile)\n"
  
- #: g10/keygen.c:1910
++#: g10/keygen.c:1922
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (setează singur capabilităţile)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1928
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA şi Elgamal (implicit)\n"
  
- #: g10/keygen.c:1918
++#: g10/keygen.c:1930
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (numai semnare)\n"
  
- #: g10/keygen.c:1920
++#: g10/keygen.c:1932
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (set your own capabilities)\n"
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) DSA (setează singur capabilităţile)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1934
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) RSA (numai cifrare)\n"
  
- #: g10/keygen.c:1926
++#: g10/keygen.c:1938
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
  msgstr "   (2) Cheie de cifrare\n"
  
- #: g10/keygen.c:2022 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:206
  #, fuzzy
  msgid "Enter the keygrip: "
  msgstr "Notare semnătură: "
  
- #: g10/keygen.c:2035 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2047 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2049 sm/certreqgen-ui.c:216
  #, fuzzy
  msgid "No key with this keygrip\n"
  msgstr "Nici o subcheie cu indicele %d\n"
  
- #: g10/keygen.c:2111 g10/keygen.c:2125
++#: g10/keygen.c:2133 g10/keygen.c:2147
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
  msgstr "rotunjită prin adaos la %u biţi\n"
  
- #: g10/keygen.c:2166
++#: g10/keygen.c:2188
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr "cheile %s pot avea lungimea între %u şi %u biţi.\n"
  
- #: g10/keygen.c:2174
++#: g10/keygen.c:2196
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Ce lungime de cheie doriţi? (%u) "
  
- #: g10/keygen.c:2177 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2199 sm/certreqgen-ui.c:183
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Ce lungime de cheie doriţi? (%u) "
  
- #: g10/keygen.c:2191 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2213 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Lungimea cheii necesară este %u biţi\n"
  
- #: g10/keygen.c:2237
++#: g10/keygen.c:2259
  #, fuzzy
  #| msgid "Please select what kind of key you want:\n"
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Selectaţi ce fel de cheie doriţi:\n"
  
- #: g10/keygen.c:2409
++#: g10/keygen.c:2431
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5198,7 -4084,6 +5159,7 @@@ msgstr "
  "      <n>m = cheia expiră în n luni\n"
  "      <n>y = cheia expiră în n ani\n"
  
- #: g10/keygen.c:2420
++#: g10/keygen.c:2442
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5214,38 -4099,30 +5175,38 @@@ msgstr "
  "      <n>m = semnătura expiră în n luni\n"
  "      <n>y = semnătura expiră în n ani\n"
  
- #: g10/keygen.c:2443
++#: g10/keygen.c:2465
  msgid "Key is valid for? (0) "
  msgstr "Cheia este validă pentru? (0) "
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2470
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Semnătura este validă pentru? (%s) "
  
- #: g10/keygen.c:2461 g10/keygen.c:2486
++#: g10/keygen.c:2483 g10/keygen.c:2508
  msgid "invalid value\n"
  msgstr "valoare invalidă\n"
  
- #: g10/keygen.c:2468
++#: g10/keygen.c:2490
  msgid "Key does not expire at all\n"
  msgstr "Cheia nu expiră deloc\n"
  
- #: g10/keygen.c:2469
++#: g10/keygen.c:2491
  msgid "Signature does not expire at all\n"
  msgstr "Semnătura nu expiră deloc\n"
  
- #: g10/keygen.c:2474
++#: g10/keygen.c:2496
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "Cheia expiră pe %s\n"
  
- #: g10/keygen.c:2475
++#: g10/keygen.c:2497
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "Semnătura expiră pe %s\n"
  
- #: g10/keygen.c:2479
++#: g10/keygen.c:2501
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5253,11 -4130,9 +5214,11 @@@ msgstr "
  "Sistemul d-voastră nu poate afişa date după 2038.\n"
  "Totuşi, acestea vor fi corect mânuite până în 2106.\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2514
  msgid "Is this correct? (y/N) "
  msgstr "Este aceasta corect? (d/N) "
  
- #: g10/keygen.c:2560
++#: g10/keygen.c:2582
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5268,7 -4143,6 +5229,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2575
++#: g10/keygen.c:2597
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -5285,50 -4159,39 +5246,50 @@@ msgstr "
  "    \"Popa Ioan (popică) <popa.ioan at compania.ro>\"\n"
  "\n"
  
- #: g10/keygen.c:2594
++#: g10/keygen.c:2616
  msgid "Real name: "
  msgstr "Nume real: "
  
- #: g10/keygen.c:2603
++#: g10/keygen.c:2625
  msgid "Invalid character in name\n"
  msgstr "Caracter invalid în nume\n"
  
- #: g10/keygen.c:2604
++#: g10/keygen.c:2626
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2608
++#: g10/keygen.c:2630
  msgid "Name may not start with a digit\n"
  msgstr "Numele nu poate începe cu o cifră\n"
  
- #: g10/keygen.c:2611
++#: g10/keygen.c:2633
  msgid "Name must be at least 5 characters long\n"
  msgstr "Numele trebuie să fie de cel puţin 5 caractere\n"
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2643
  msgid "Email address: "
  msgstr "Adresă de email: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2649
  msgid "Not a valid email address\n"
  msgstr "Nu este o adresă de email validă\n"
  
- #: g10/keygen.c:2636
++#: g10/keygen.c:2658
  msgid "Comment: "
  msgstr "Comentariu: "
  
- #: g10/keygen.c:2642
++#: g10/keygen.c:2664
  msgid "Invalid character in comment\n"
  msgstr "Caracter invalid în comentariu\n"
  
- #: g10/keygen.c:2678
++#: g10/keygen.c:2700
  #, fuzzy, c-format
  #| msgid "You are using the `%s' character set.\n"
  msgid "You are using the '%s' character set.\n"
  msgstr "Folosiţi setul de caractere `%s'\n"
  
- #: g10/keygen.c:2684
++#: g10/keygen.c:2706
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5339,7 -4202,6 +5300,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2689
++#: g10/keygen.c:2711
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr "Vă rugăm nu puneţi adresa de email în numele real sau comentariu\n"
  
@@@ -5354,35 -4216,28 +5315,35 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2714
++#: g10/keygen.c:2736
  msgid "NnCcEeOoQq"
  msgstr "NnCcEeOoTt"
  
- #: g10/keygen.c:2724
++#: g10/keygen.c:2746
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "Schimbă (N)ume, (C)omentariu, (E)mail sau (T)Termină? "
  
- #: g10/keygen.c:2725
++#: g10/keygen.c:2747
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr "Schimbă (N)ume, (C)omentariu, (E)mail sau (O)K/(T)Termină? "
  
- #: g10/keygen.c:2730
++#: g10/keygen.c:2752
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "Schimbă (N)ume, (C)omentariu, (E)mail sau (T)Termină? "
  
- #: g10/keygen.c:2731
++#: g10/keygen.c:2753
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "Schimbă (N)ume, (C)omentariu, (E)mail sau (O)K/(T)Termină? "
  
- #: g10/keygen.c:2750
++#: g10/keygen.c:2772
  msgid "Please correct the error first\n"
  msgstr "Vă rugăm corectaţi mai întâi eroarea\n"
  
- #: g10/keygen.c:2796
++#: g10/keygen.c:2818
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5394,13 -4249,10 +5355,13 @@@ msgstr "
  "în timpul generării numerelor prime; aceasta dă o şansă generatorului de\n"
  "numere aleatoare o şansă mai bună de a aduna destulă entropie.\n"
  
- #: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
- #: g10/keygen.c:4777 g10/keygen.c:4882
++#: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
++#: g10/keygen.c:4330 g10/keygen.c:4803 g10/keygen.c:5064 g10/keygen.c:5169
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Generarea cheii a eşuat: %s\n"
  
- #: g10/keygen.c:3598
++#: g10/keygen.c:3922
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5408,71 -4260,58 +5369,71 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3924
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3621
++#: g10/keygen.c:3945
  #, fuzzy, c-format
  #| msgid "key already exists\n"
  msgid "A key for \"%s\" already exists\n"
  msgstr "cheia există deja\n"
  
- #: g10/keygen.c:3626
++#: g10/keygen.c:3950
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "Create anyway? (y/N) "
  msgstr "Creaţi oricum? "
  
- #: g10/keygen.c:3632
++#: g10/keygen.c:3956
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "creating anyway\n"
  msgstr "Creaţi oricum? "
  
- #: g10/keygen.c:3981
++#: g10/keygen.c:4315
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:4013
++#: g10/keygen.c:4358
  msgid "Key generation canceled.\n"
  msgstr "Generarea cheii a fost anulată.\n"
  
- #: g10/keygen.c:4073
++#: g10/keygen.c:4418
  #, fuzzy, c-format
  #| msgid "can't create backup file `%s': %s\n"
  msgid "can't create backup file '%s': %s\n"
  msgstr "nu pot crea fişier de rezervă `%s': %s\n"
  
- #: g10/keygen.c:4093
++#: g10/keygen.c:4438
  #, fuzzy, c-format
  #| msgid "NOTE: backup of card key saved to `%s'\n"
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "NOTĂ: copia de siguranţa a cheii cardului salvată la `%s'\n"
  
- #: g10/keygen.c:4244 g10/keygen.c:4393
++#: g10/keygen.c:4589 g10/keygen.c:4738
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
  msgstr "scriu cheia publică în `%s'\n"
  
- #: g10/keygen.c:4387
++#: g10/keygen.c:4732
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "nu am găsit nici un inel de chei public de scris: %s\n"
  
- #: g10/keygen.c:4401
++#: g10/keygen.c:4746
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error writing public keyring '%s': %s\n"
  msgstr "eroare la scrierea inelului de chei public `%s': %s\n"
  
- #: g10/keygen.c:4433
++#: g10/keygen.c:4778
  msgid "public and secret key created and signed.\n"
  msgstr "cheile secretă şi publică au fost create şi semnate.\n"
  
- #: g10/keygen.c:4445
++#: g10/keygen.c:4790
  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"
@@@ -5482,7 -4321,6 +5443,7 @@@ msgstr "
  "să folosiţi comanda \"--edit-key\" pentru a genera o subcheie secundară\n"
  "pentru acest scop.\n"
  
- #: g10/keygen.c:4649 g10/keygen.c:4833
++#: g10/keygen.c:4936 g10/keygen.c:5120
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5490,7 -4328,6 +5451,7 @@@ msgstr "
  "cheia a fost creată %lu secundă în viitor (warp în timp sau probleme cu "
  "ceasul)\n"
  
- #: g10/keygen.c:4651 g10/keygen.c:4835
++#: g10/keygen.c:4938 g10/keygen.c:5122
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5498,21 -4335,17 +5459,21 @@@ msgstr "
  "cheia a fost creată %lu secunde în viitor (warp în timp sau probleme cu "
  "ceasul)\n"
  
- #: g10/keygen.c:4662 g10/keygen.c:4846
++#: g10/keygen.c:4949 g10/keygen.c:5133
  #, fuzzy
  #| 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:4674 g10/keygen.c:4676
++#: g10/keygen.c:4961 g10/keygen.c:4963
  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:4683 g10/keygen.c:4685
++#: g10/keygen.c:4970 g10/keygen.c:4972
  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:4704 g10/keygen.c:4860
++#: g10/keygen.c:4991 g10/keygen.c:5147
  msgid "Really create? (y/N) "
  msgstr "Creaţi într-adevăr? (d/N) "
  
@@@ -5836,129 -4604,103 +5797,129 @@@ msgstr "
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
  msgstr "revocare standalone - folosiţi \"gpg --import\" pentru a aplica\n"
  
- #: g10/mainproc.c:1233 g10/mainproc.c:1276
++#: g10/mainproc.c:1238 g10/mainproc.c:1281
  #, fuzzy
  msgid "no signature found\n"
  msgstr "Semnătură bună din \"%s\""
  
- #: g10/mainproc.c:1607
++#: g10/mainproc.c:1612
  #, c-format
  msgid "BAD signature from \"%s\""
  msgstr "Semnătură INCORECTĂ din \"%s\""
  
- #: g10/mainproc.c:1609
++#: g10/mainproc.c:1614
  #, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Semnătură expirată din \"%s\""
  
- #: g10/mainproc.c:1611
++#: g10/mainproc.c:1616
  #, c-format
  msgid "Good signature from \"%s\""
  msgstr "Semnătură bună din \"%s\""
  
- #: g10/mainproc.c:1630
++#: g10/mainproc.c:1635
  msgid "signature verification suppressed\n"
  msgstr "verificare semnătură eliminată\n"
  
- #: g10/mainproc.c:1739
++#: g10/mainproc.c:1744
  #, fuzzy
  msgid "can't handle this ambiguous signature data\n"
  msgstr "nu pot mânui aceste semnături multiple\n"
  
- #: g10/mainproc.c:1753 g10/mainproc.c:1761
++#: g10/mainproc.c:1758 g10/mainproc.c:1766
  #, c-format
  msgid "Signature made %s\n"
  msgstr "Semnătură făcută %s\n"
  
- #: g10/mainproc.c:1754 g10/mainproc.c:1762
++#: g10/mainproc.c:1759 g10/mainproc.c:1767
  #, c-format
  msgid "               using %s key %s\n"
  msgstr "               folosind cheia %s %s\n"
  
- #: g10/mainproc.c:1766
++#: g10/mainproc.c:1771
  #, 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:1772
++#: g10/mainproc.c:1777
  #, fuzzy, c-format
  #| msgid "                aka \"%s\""
  msgid "               issuer \"%s\"\n"
  msgstr "                aka \"%s\""
  
- #: g10/mainproc.c:1789
++#: g10/mainproc.c:1794
  msgid "Key available at: "
  msgstr "Cheie disponibilă la: "
  
- #: g10/mainproc.c:2024
++#: g10/mainproc.c:2029
  msgid "[uncertain]"
  msgstr "[nesigur]"
  
- #: g10/mainproc.c:2062
++#: g10/mainproc.c:2067
  #, c-format
  msgid "                aka \"%s\""
  msgstr "                aka \"%s\""
  
- #: g10/mainproc.c:2145
++#: g10/mainproc.c:2150
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "Semnătură expirată %s\n"
  
- #: g10/mainproc.c:2149
++#: g10/mainproc.c:2154
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "Semnătura expiră %s\n"
  
- #: g10/mainproc.c:2160
++#: g10/mainproc.c:2165
  #, 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:2161
++#: g10/mainproc.c:2166
  msgid "binary"
  msgstr "binar"
  
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2167
  msgid "textmode"
  msgstr "modtext"
  
- #: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "necunoscut"
  
- #: g10/mainproc.c:2164
++#: g10/mainproc.c:2169
  #, fuzzy
  #| msgid "unknown pubkey algorithm"
  msgid ", key algorithm "
  msgstr "algoritm pubkey necunoscut"
  
- #: g10/mainproc.c:2199
++#: g10/mainproc.c:2204
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2229
++#: g10/mainproc.c:2234
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "Nu pot verifica semnătura: %s\n"
  
- #: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
++#: g10/mainproc.c:2327 g10/mainproc.c:2346 g10/mainproc.c:2470
  msgid "not a detached signature\n"
  msgstr "nu o semnătură detaşată\n"
  
- #: g10/mainproc.c:2375
++#: g10/mainproc.c:2380
  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:2384
++#: g10/mainproc.c:2389
  #, 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:2469
++#: g10/mainproc.c:2474
  msgid "old style (PGP 2.x) signature\n"
  msgstr "semnătură de stil vechi (PGP 2.x)\n"
  
@@@ -6260,23 -4948,18 +6221,23 @@@ msgstr "Este această poză corectă (d
  msgid "unable to display photo ID!\n"
  msgstr "nu pot afişa poza ID!\n"
  
- #: g10/pkclist.c:72 g10/revoke.c:757
++#: g10/pkclist.c:72 g10/revoke.c:758
  msgid "No reason specified"
  msgstr "Nici un motiv specificat"
  
- #: g10/pkclist.c:74 g10/revoke.c:759
++#: g10/pkclist.c:74 g10/revoke.c:760
  msgid "Key is superseded"
  msgstr "Cheia este înlocuită"
  
- #: g10/pkclist.c:76 g10/revoke.c:758
++#: g10/pkclist.c:76 g10/revoke.c:759
  msgid "Key has been compromised"
  msgstr "Cheia a fost compromisă"
  
- #: g10/pkclist.c:78 g10/revoke.c:760
++#: g10/pkclist.c:78 g10/revoke.c:761
  msgid "Key is no longer used"
  msgstr "Cheia nu mai este folosită"
  
- #: g10/pkclist.c:80 g10/revoke.c:761
++#: g10/pkclist.c:80 g10/revoke.c:762
  msgid "User ID is no longer valid"
  msgstr "ID utilizator nu mai este valid"
  
@@@ -6354,7 -5024,6 +6315,7 @@@ msgstr "
  "Nivelul minim de încredere pentru această cheie este: %s\n"
  "\n"
  
- #: g10/pkclist.c:310 g10/revoke.c:786
++#: g10/pkclist.c:310 g10/revoke.c:787
  msgid "Your decision? "
  msgstr "Decizia d-voastră? "
  
@@@ -6556,33 -5187,26 +6517,33 @@@ msgstr "
  msgid "No such user ID.\n"
  msgstr "Nu există acest ID utilizator.\n"
  
- #: g10/pkclist.c:1197 g10/pkclist.c:1273
++#: g10/pkclist.c:1197 g10/pkclist.c:1274
  msgid "skipped: public key already set as default recipient\n"
  msgstr "sărită: cheia publică setată deja ca destinatar implicit\n"
  
- #: g10/pkclist.c:1218
++#: g10/pkclist.c:1219
  msgid "Public key is disabled.\n"
  msgstr "Cheia publică este deactivată.\n"
  
- #: g10/pkclist.c:1228
++#: g10/pkclist.c:1229
  msgid "skipped: public key already set\n"
  msgstr "sărită: cheia publică setată deja\n"
  
- #: g10/pkclist.c:1263
++#: g10/pkclist.c:1264
  #, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "destinatar implicit necunoscut \"%s\"\n"
  
- #: g10/pkclist.c:1312
++#: g10/pkclist.c:1313
  msgid "no valid addressees\n"
  msgstr "nici un destinatar valid\n"
  
- #: g10/pkclist.c:1665
++#: g10/pkclist.c:1666
  #, 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:1690
++#: g10/pkclist.c:1691
  #, fuzzy, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "cheia %s nu are nici un ID utilizator\n"
@@@ -6592,29 -5215,23 +6553,29 @@@ msgid "data not saved; use option \"--o
  msgstr ""
  "datele nu au fost salvate: folosiţi opţiunea \"--output\" pentru a le salva\n"
  
- #: g10/plaintext.c:598
++#: g10/plaintext.c:614
  msgid "Detached signature.\n"
  msgstr "Semnătură detaşată.\n"
  
- #: g10/plaintext.c:606
++#: g10/plaintext.c:622
  msgid "Please enter name of data file: "
  msgstr "Vă rugăm introduceţi numele fişierului de date: "
  
- #: g10/plaintext.c:643
++#: g10/plaintext.c:659
  msgid "reading stdin ...\n"
  msgstr "citesc stdin ...\n"
  
- #: g10/plaintext.c:688
++#: g10/plaintext.c:704
  msgid "no signed data\n"
  msgstr "nici o dată semnată\n"
  
- #: g10/plaintext.c:706
++#: g10/plaintext.c:722
  #, fuzzy, c-format
  #| msgid "can't open signed data `%s'\n"
  msgid "can't open signed data '%s'\n"
  msgstr "nu pot deschide date semnate `%s'\n"
  
- #: g10/plaintext.c:741
++#: g10/plaintext.c:757
  #, fuzzy, c-format
  msgid "can't open signed data fd=%d: %s\n"
  msgstr "nu pot deschide date semnate `%s'\n"
@@@ -6685,7 -5288,6 +6646,7 @@@ msgstr "Cheia secretă este disponibil�
  msgid "Create a designated revocation certificate for this key? (y/N) "
  msgstr "Creaţi un certificat de revocare desemnat pentru această cheie? (d/N) "
  
- #: g10/revoke.c:336 g10/revoke.c:727
++#: g10/revoke.c:336 g10/revoke.c:728
  msgid "ASCII armored output forced.\n"
  msgstr "Ieşire în armură ASCII forţată.\n"
  
@@@ -6722,23 -5318,20 +6683,23 @@@ msgid "
  "the secret key.  However, if the secret key is still accessible,\n"
  "it is better to generate a new revocation certificate and give\n"
  "a reason for the revocation.  For details see the description of\n"
- "of the gpg command \"--gen-revoke\" in the GnuPG manual."
+ "of the gpg command \"--generate-revocation\" in the GnuPG manual."
  msgstr ""
  
- #: g10/revoke.c:575
++#: g10/revoke.c:576
  msgid ""
  "To avoid an accidental use of this file, a colon has been inserted\n"
  "before the 5 dashes below.  Remove this colon with a text editor\n"
  "before importing and publishing this revocation certificate."
  msgstr ""
  
- #: g10/revoke.c:590
++#: g10/revoke.c:591
  #, fuzzy, c-format
  #| msgid "Revocation certificate created.\n"
  msgid "revocation certificate stored as '%s.rev'\n"
  msgstr "Certificat de revocare creat.\n"
  
- #: g10/revoke.c:634
++#: g10/revoke.c:635
  #, fuzzy, c-format
  #| msgid "secret key \"%s\" not found: %s\n"
  msgid "secret key \"%s\" not found\n"
@@@ -6747,22 -5340,18 +6708,22 @@@ msgstr "cheia secretă \"%s\" nu a fos
  #. TRANSLATORS: The %s prints a key specification which
  #. for example has been given at the command line.  Several lines
  #. lines with secret key infos are printed after this message.
- #: g10/revoke.c:661
++#: g10/revoke.c:662
  #, c-format
  msgid "'%s' matches multiple secret keys:\n"
  msgstr ""
  
- #: g10/revoke.c:688
++#: g10/revoke.c:689
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error searching the keyring: %s\n"
  msgstr "eroare la crearea inelului de chei `%s': %s\n"
  
- #: g10/revoke.c:711
++#: g10/revoke.c:712
  msgid "Create a revocation certificate for this key? (y/N) "
  msgstr "Creaţi un certificat de revocare pentru această cheie? (d/N) "
  
- #: g10/revoke.c:735
++#: g10/revoke.c:736
  msgid ""
  "Revocation certificate created.\n"
  "\n"
@@@ -6780,33 -5369,26 +6741,33 @@@ msgstr "
  "caz că mediumul este deteriorat.  Dar fiţi atent: sistemul de tipărire al\n"
  "maşinii d-voastră ar putea păstra datele şi să le facă accesibile altora!\n"
  
- #: g10/revoke.c:769
++#: g10/revoke.c:770
  msgid "Please select the reason for the revocation:\n"
  msgstr "Vă rugăm selectaţi motivul pentru revocare:\n"
  
- #: g10/revoke.c:779
++#: g10/revoke.c:780
  msgid "Cancel"
  msgstr "Renunţă"
  
- #: g10/revoke.c:781
++#: g10/revoke.c:782
  #, c-format
  msgid "(Probably you want to select %d here)\n"
  msgstr "(Probabil doriţi să selectaţi %d aici)\n"
  
- #: g10/revoke.c:822
++#: g10/revoke.c:823
  msgid "Enter an optional description; end it with an empty line:\n"
  msgstr "Introduceţi o descriere opţională; terminaţi cu o linie goală:\n"
  
- #: g10/revoke.c:850
++#: g10/revoke.c:851
  #, c-format
  msgid "Reason for revocation: %s\n"
  msgstr "Motiv pentru revocare: %s\n"
  
- #: g10/revoke.c:852
++#: g10/revoke.c:853
  msgid "(No description given)\n"
  msgstr "(Nici o descriere dată)\n"
  
- #: g10/revoke.c:857
++#: g10/revoke.c:858
  msgid "Is this okay? (y/N) "
  msgstr "Este aceasta OK? (d/N) "
  
@@@ -6948,12 -5510,10 +6909,12 @@@ msgstr "
  "AVERTISMENT: nu pot %%-expanda URL-ul serverului de chei (prea mare).  Îl "
  "folosesc neexpandat.\n"
  
- #: g10/sign.c:329
++#: g10/sign.c:331
  #, c-format
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s/%s semnătură de la: \"%s\"\n"
  
- #: g10/sign.c:878
++#: g10/sign.c:880
  #, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6961,11 -5521,9 +6922,11 @@@ msgstr "
  "AVERTISMENT: forţarea algoritmului rezumat %s (%d) violează preferinţele "
  "destinatarului\n"
  
- #: g10/sign.c:1009
++#: g10/sign.c:1011
  msgid "signing:"
  msgstr "semnare:"
  
- #: g10/sign.c:1286
++#: g10/sign.c:1288
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "va fi folosită cifrarea %s\n"
@@@ -6989,7 -5543,6 +6950,7 @@@ msgstr "
  "aceasta este o cheie ElGamal generată de PGP care nu e sigură pentru "
  "semnături!"
  
- #: g10/tdbdump.c:57 g10/trustdb.c:362
++#: g10/tdbdump.c:57 g10/trustdb.c:369
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "înregistrare încredere %lu, tip %d: scrierea a eşuat: %s\n"
@@@ -7037,7 -5582,6 +6998,7 @@@ msgstr "eroare găsire înregistrare î
  msgid "read error in '%s': %s\n"
  msgstr "eroare citire în `%s': %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "trustdb: sincronizarea a eşuat: %s\n"
@@@ -7186,299 -5701,307 +7147,373 @@@ msgstr "nu pot mânui linii de text ma
  msgid "input line longer than %d characters\n"
  msgstr "linii de intrare mai lungi de %d caractere\n"
  
- #: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
++#: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
  #, fuzzy, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "eroare trimitere la `%s': %s\n"
  
- #: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
++#: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:357 g10/tofu.c:699
++#: g10/tofu.c:355 g10/tofu.c:888
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:501
++#: g10/tofu.c:505
  #, fuzzy, c-format
  msgid "unsupported TOFU database version: %s\n"
  msgstr ""
  "\n"
  "Algoritmuri suportate:\n"
  
- #: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
- #: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
- #: g10/tofu.c:3056
++#: g10/tofu.c:538
+ #, fuzzy, c-format
+ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
+ msgstr "eroare la crearea frazei-parolă: %s\n"
+ 
++#: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
+ msgid "TOFU DB error"
+ msgstr ""
+ 
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2340 g10/tofu.c:2359
++#: g10/tofu.c:2372 g10/tofu.c:2384 g10/tofu.c:2399 g10/tofu.c:2411
++#: g10/tofu.c:2980 g10/tofu.c:2997 g10/tofu.c:3033 g10/tofu.c:3050
++#: g10/tofu.c:3353
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "eroare trimitere la `%s': %s\n"
  
- #: g10/tofu.c:566 g10/tofu.c:574
++#: g10/tofu.c:716 g10/tofu.c:724
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error determining TOFU database's version: %s\n"
  msgstr "eroare la scrierea inelului de chei secret `%s': %s\n"
  
- #: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
++#: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing TOFU database: %s\n"
  msgstr "%s: eroare scriere înregistrare dir: %s\n"
  
- #: g10/tofu.c:765
++#: g10/tofu.c:844
+ #, fuzzy, c-format
+ msgid "error creating 'encryptions' TOFU table: %s\n"
+ msgstr "eroare trimitere la `%s': %s\n"
+ 
++#: g10/tofu.c:874
+ #, c-format
+ msgid "adding column effective_policy to bindings DB: %s\n"
+ msgstr ""
+ 
++#: g10/tofu.c:956
  #, fuzzy, c-format
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "eroare în `%s': %s\n"
  
- #: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
++#: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "eroare trimitere la `%s': %s\n"
  
- #: g10/tofu.c:1239
++#: g10/tofu.c:1328
  #, c-format
  msgid ""
  "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1247
++#: g10/tofu.c:1337
  #, c-format
- msgid "The email address \"%s\" is associated with %d keys!"
- msgstr ""
+ msgid "The email address \"%s\" is associated with %d key!"
+ msgid_plural "The email address \"%s\" is associated with %d keys!"
+ msgstr[0] ""
+ msgstr[1] ""
  
- #: g10/tofu.c:1251
++#: g10/tofu.c:1343
  msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  
- #: g10/tofu.c:1257
++#: g10/tofu.c:1349
  #, c-format
  msgid ""
  "Please indicate whether this email address should be associated with key %s "
  "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1513
++#: g10/tofu.c:1605
  #, fuzzy, c-format
  #| msgid "error getting new PIN: %s\n"
  msgid "error gathering other user IDs: %s\n"
  msgstr "eroare la obţinere noului PIN: %s\n"
  
- #: g10/tofu.c:1523
++#: g10/tofu.c:1615
  #, fuzzy
  #| msgid "list key and user IDs"
  msgid "This key's user IDs:\n"
  msgstr "enumeră chei şi ID-uri utilizator"
  
- #: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
++#: g10/tofu.c:1631 g10/tofu.c:1796
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "policy: %s"
  msgstr "Politica: "
  
- #: g10/tofu.c:1630
++#: g10/tofu.c:1722
  #, fuzzy, c-format
  msgid "error gathering signature stats: %s\n"
  msgstr "eroare la obţinere noului PIN: %s\n"
  
- #: g10/tofu.c:1634
++#: g10/tofu.c:1726
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1651
++#: g10/tofu.c:1744
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1684 g10/tofu.c:1689
++#: g10/tofu.c:1785 g10/tofu.c:1790
  msgid ", "
  msgstr ""
  
- #: g10/tofu.c:1693
++#: g10/tofu.c:1794
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
  msgstr "enumeră chei"
  
- #: g10/tofu.c:1715
++#: g10/tofu.c:1820
+ #, fuzzy, c-format
+ msgid "Verified %d message."
+ msgid_plural "Verified %d messages."
+ msgstr[0] "|algo [fişiere]|afişează rezumate mesaje"
+ msgstr[1] "|algo [fişiere]|afişează rezumate mesaje"
+ 
++#: g10/tofu.c:1824
  #, fuzzy, c-format
- msgid "Verified %d message"
- msgid_plural "Verified %d messages"
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid "Encrypted %d message."
+ msgid_plural "Encrypted %d messages."
+ msgstr[0] "cifrată cu %lu fraze-parolă\n"
+ msgstr[1] "cifrată cu %lu fraze-parolă\n"
+ 
++#: g10/tofu.c:1831
+ #, fuzzy, c-format
+ msgid "Verified %d message in the future."
+ msgid_plural "Verified %d messages in the future."
+ msgstr[0] "|algo [fişiere]|afişează rezumate mesaje"
+ msgstr[1] "|algo [fişiere]|afişează rezumate mesaje"
+ 
++#: g10/tofu.c:1835
+ #, fuzzy, c-format
+ msgid "Encrypted %d message in the future."
+ msgid_plural "Encrypted %d messages in the future."
  msgstr[0] "|algo [fişiere]|afişează rezumate mesaje"
  msgstr[1] "|algo [fişiere]|afişează rezumate mesaje"
  
- #: g10/tofu.c:1719
++#: g10/tofu.c:1849
+ #, c-format
+ msgid "Messages verified over the past %d day: %d."
+ msgid_plural "Messages verified over the past %d days: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1855
+ #, c-format
+ msgid "Messages encrypted over the past %d day: %d."
+ msgid_plural "Messages encrypted over the past %d days: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1865
  #, c-format
- msgid "Encrypted %d message"
- msgid_plural "Encrypted %d messages"
+ msgid "Messages verified over the past %d month: %d."
+ msgid_plural "Messages verified over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1734
++#: g10/tofu.c:1871
  #, c-format
- msgid " over the past day."
- msgid_plural " over the past %d days."
+ msgid "Messages encrypted over the past %d month: %d."
+ msgid_plural "Messages encrypted over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1740
++#: g10/tofu.c:1881
  #, c-format
- msgid " over the past month."
- msgid_plural " over the past %d months."
+ msgid "Messages verified over the past %d year: %d."
+ msgid_plural "Messages verified over the past %d years: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1746
++#: g10/tofu.c:1887
  #, c-format
- msgid " over the past year."
- msgid_plural " over the past %d years."
+ msgid "Messages encrypted over the past %d year: %d."
+ msgid_plural "Messages encrypted over the past %d years: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1752
- msgid " in the past."
++#: g10/tofu.c:1895
+ #, c-format
+ msgid "Messages verified in the past: %d."
  msgstr ""
  
++#: g10/tofu.c:1899
+ #, fuzzy, c-format
+ msgid "Messages encrypted in the past: %d."
+ msgstr "|algo [fişiere]|afişează rezumate mesaje"
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1767
++#: g10/tofu.c:1916
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1809
++#: g10/tofu.c:1958
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1815
++#: g10/tofu.c:1964
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1823
++#: g10/tofu.c:1972
  msgid "Defaulting to unknown."
  msgstr ""
  
- #: g10/tofu.c:1938 g10/tofu.c:2074
++#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
- #: g10/tofu.c:1994
++#: g10/tofu.c:2143
  #, fuzzy, c-format
  msgid "resetting keydb: %s\n"
  msgstr "eroare la scrierea inelului de chei `%s': %s\n"
  
- #: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
- #: g10/tofu.c:2425
++#: g10/tofu.c:2601
  #, fuzzy, c-format
- msgid "error setting TOFU binding's trust level to %s\n"
+ msgid "error setting TOFU binding's policy to %s\n"
  msgstr "eroare la citire `%s': %s\n"
  
- #: g10/tofu.c:2473
++#: g10/tofu.c:2794
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "eroare la crearea frazei-parolă: %s\n"
  
- #. TRANSLATORS: The tilde ('~') is used here to indicate a
- #. * non-breakable space
- #: g10/tofu.c:2574
++#: g10/tofu.c:2839
  #, c-format
- msgid "%d~year"
- msgid_plural "%d~years"
+ msgid "%lld~year"
+ msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2583
++#: g10/tofu.c:2844
  #, c-format
- msgid "%d~month"
- msgid_plural "%d~months"
+ msgid "%lld~month"
+ msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2592
++#: g10/tofu.c:2849
  #, c-format
- msgid "%d~day"
- msgid_plural "%d~days"
+ msgid "%lld~week"
+ msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2854
+ #, c-format
+ msgid "%lld~day"
+ msgid_plural "%lld~days"
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:2859
  #, c-format
- msgid "%d~hour"
- msgid_plural "%d~hours"
+ msgid "%lld~hour"
+ msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2610
++#: g10/tofu.c:2864
  #, c-format
- msgid "%d~minute"
- msgid_plural "%d~minutes"
+ msgid "%lld~minute"
+ msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2619
++#: g10/tofu.c:2866
  #, c-format
- msgid "%d~second"
- msgid_plural "%d~seconds"
+ msgid "%lld~second"
+ msgid_plural "%lld~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2802
++#: g10/tofu.c:3103
  #, c-format
- msgid "%s: "
+ msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:2806
++#: g10/tofu.c:3109
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
- msgid "Verified %ld signatures"
+ msgid "%s: Verified 0 signatures."
  msgstr "Am şters %d semnături.\n"
  
- #: g10/tofu.c:2816
++#: g10/tofu.c:3117
  #, fuzzy, c-format
- msgid "Verified %ld signature in the past %s"
- msgid_plural "Verified %ld signatures in the past %s"
+ msgid "%s: Verified %ld~signature in the past %s."
+ msgid_plural "%s: Verified %ld~signatures in the past %s."
  msgstr[0] "|algo [fişiere]|afişează rezumate mesaje"
  msgstr[1] "|algo [fişiere]|afişează rezumate mesaje"
  
- #: g10/tofu.c:2826
- #, fuzzy, c-format
++#: g10/tofu.c:3127
+ #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
- msgid ", and encrypted %ld messages"
+ msgid "Encrypted 0 messages."
  msgstr "cifrată cu %lu fraze-parolă\n"
  
- #: g10/tofu.c:2835
++#: g10/tofu.c:3135
  #, fuzzy, c-format
- msgid ", and encrypted %ld message in the past %s"
- msgid_plural ", and encrypted %ld messages in the past %s"
+ msgid "Encrypted %ld~message in the past %s."
+ msgid_plural "Encrypted %ld~messages in the past %s."
  msgstr[0] "|algo [fişiere]|afişează rezumate mesaje"
  msgstr[1] "|algo [fişiere]|afişează rezumate mesaje"
  
- #: g10/tofu.c:2880
++#: g10/tofu.c:3146
+ #, fuzzy, c-format
+ #| msgid "Policy: "
+ msgid "(policy: %s)"
+ msgstr "Politica: "
+ 
++#: g10/tofu.c:3177
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2883
++#: g10/tofu.c:3180
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2887
++#: g10/tofu.c:3184
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2890
++#: g10/tofu.c:3187
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2919
++#: g10/tofu.c:3216
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7495,18 -6018,14 +7530,18 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
- #: g10/tofu.c:3480 g10/tofu.c:3572
++#: g10/tofu.c:3298 g10/tofu.c:3449 g10/tofu.c:3627 g10/tofu.c:3670
++#: g10/tofu.c:3784 g10/tofu.c:3859 g10/tofu.c:3894
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "eroare trimitere la `%s': %s\n"
  
- #: g10/tofu.c:3185
++#: g10/tofu.c:3482
  #, c-format
- msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
  msgstr ""
  
- #: g10/tofu.c:3515
++#: g10/tofu.c:3819
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7538,70 -6052,56 +7573,70 @@@ msgstr "cheia %s: nici o cheie public�
  msgid "key %s marked as ultimately trusted\n"
  msgstr "cheia %s marcată ca având încredere supremă\n"
  
- #: g10/trustdb.c:341
++#: g10/trustdb.c:348
  #, 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:347
++#: g10/trustdb.c:354
  #, 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:422
++#: g10/trustdb.c:429
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr ""
  
- #: g10/trustdb.c:431
++#: g10/trustdb.c:438
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:468
++#: g10/trustdb.c:475
  #, 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:474
++#: g10/trustdb.c:481
  #, c-format
  msgid "using %s trust model\n"
  msgstr "folosesc model de încredere %s\n"
  
- #: g10/trustdb.c:511
++#: g10/trustdb.c:518
  msgid "no need for a trustdb check\n"
  msgstr "nu e nevoie de o verificare trustdb\n"
  
- #: g10/trustdb.c:517 g10/trustdb.c:2160
++#: g10/trustdb.c:524 g10/trustdb.c:2187
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "următoarea verificare trustdb programată pe %s\n"
  
- #: g10/trustdb.c:526
++#: g10/trustdb.c:533
  #, 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:542
++#: g10/trustdb.c:549
  #, 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:749 g10/trustdb.c:1313
++#: g10/trustdb.c:756 g10/trustdb.c:1340
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "cheia publică %s nu a fost găsită: %s\n"
  
- #: g10/trustdb.c:966
++#: g10/trustdb.c:973
  msgid "please do a --check-trustdb\n"
  msgstr "vă rugăm faceţi un --check-trustdb\n"
  
- #: g10/trustdb.c:971
++#: g10/trustdb.c:978
  msgid "checking the trustdb\n"
  msgstr "verific trustdb\n"
  
- #: g10/trustdb.c:1883
++#: g10/trustdb.c:1910
  #, fuzzy, c-format
  #| msgid "%lu keys processed so far\n"
  msgid "%d key processed"
@@@ -7609,7 -6109,6 +7644,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:1886
++#: g10/trustdb.c:1913
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7617,23 -6116,19 +7652,23 @@@ msgid_plural " (%d validity counts clea
  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:1956
++#: g10/trustdb.c:1983
  msgid "no ultimately trusted keys found\n"
  msgstr "nu am găsit nici o cheie cu încredere supremă\n"
  
- #: g10/trustdb.c:1970
++#: g10/trustdb.c:1997
  #, 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:2087
++#: g10/trustdb.c:2114
  #, 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:2167
++#: g10/trustdb.c:2194
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr ""
@@@ -7747,19 -6221,14 +7782,19 @@@ msgid "
  "List, export, import Keybox data\n"
  msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3208
++#: scd/app-nks.c:718 scd/app-openpgp.c:3221
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr "modulus-ul RSA lipseşte sau nu are %d biţi\n"
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3220
++#: scd/app-nks.c:726 scd/app-openpgp.c:3233
  #, fuzzy, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr "exponentul public RSA lipseşte sau are mai mult de %d biţi\n"
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
- #: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
- #: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1965 scd/app-openpgp.c:1984
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2166 scd/app-openpgp.c:2430
++#: scd/app-openpgp.c:2477 scd/app-openpgp.c:2582 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "apelul PIN a returnat eroare: %s\n"
@@@ -7808,84 -6268,66 +7843,84 @@@ msgid "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2511 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "eroare la obţinere noului PIN: %s\n"
  
- #: scd/app-openpgp.c:806
++#: scd/app-openpgp.c:801
  #, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "am eşuat să stochez amprenta: %s\n"
  
- #: scd/app-openpgp.c:819
++#: scd/app-openpgp.c:814
  #, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "am eşuat să stochez data creării: %s\n"
  
- #: scd/app-openpgp.c:1236
++#: scd/app-openpgp.c:1247
  msgid "response does not contain the RSA modulus\n"
  msgstr "răspunsul nu conţine modulul RSA\n"
  
- #: scd/app-openpgp.c:1243
++#: scd/app-openpgp.c:1254
  msgid "response does not contain the RSA public exponent\n"
  msgstr "răspunsul nu conţine exponentul public RSA\n"
  
- #: scd/app-openpgp.c:1353
++#: scd/app-openpgp.c:1364
  #, fuzzy
  #| msgid "response does not contain the RSA public exponent\n"
  msgid "response does not contain the EC public key\n"
  msgstr "răspunsul nu conţine exponentul public RSA\n"
  
- #: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:1464 scd/app-openpgp.c:3825
  msgid "response does not contain the public key data\n"
  msgstr "răspunsul nu conţine datele cheii publice\n"
  
- #: scd/app-openpgp.c:1551
++#: scd/app-openpgp.c:1564
  #, c-format
  msgid "reading public key failed: %s\n"
  msgstr "citirea cheii publice a eşuat: %s\n"
  
- #: scd/app-openpgp.c:1903
++#: scd/app-openpgp.c:1916
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1910
++#: scd/app-openpgp.c:1923
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1925
++#: scd/app-openpgp.c:1938
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
  
- #: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
++#: scd/app-openpgp.c:1949 scd/app-openpgp.c:2424
  #, fuzzy
  msgid "||Please enter the PIN"
  msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
  
- #: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2173 scd/app-openpgp.c:2437
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr "PIN-ul pentru CHV%d este prea scurt; lungimea minimă este %d\n"
  
- #: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
- #: scd/app-openpgp.c:4114
++#: scd/app-openpgp.c:2004 scd/app-openpgp.c:2043 scd/app-openpgp.c:2185
++#: scd/app-openpgp.c:4126
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "verificarea CHV%d a eşuat: %s\n"
  
- #: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
++#: scd/app-openpgp.c:2072 scd/app-openpgp.c:2458 scd/app-openpgp.c:4556
  msgid "error retrieving CHV status from card\n"
  msgstr "eroare la recuperarea stării CHV de pe card\n"
  
- #: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
++#: scd/app-openpgp.c:2078 scd/app-openpgp.c:4565
  msgid "card is permanently locked!\n"
  msgstr "cardul este încuiat permanent!\n"
  
- #: scd/app-openpgp.c:2072
++#: scd/app-openpgp.c:2085
  #, fuzzy, c-format
  #| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@@ -7898,26 -6340,21 +7933,26 @@@ msgstr[1] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:2082
++#: scd/app-openpgp.c:2095
  #, fuzzy, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
  
- #: scd/app-openpgp.c:2086
++#: scd/app-openpgp.c:2099
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
  msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
  
- #: scd/app-openpgp.c:2107
++#: scd/app-openpgp.c:2120
  msgid "access to admin commands is not configured\n"
  msgstr "accesul la comenzile de administrare nu este configurată\n"
  
- #: scd/app-openpgp.c:2460
++#: scd/app-openpgp.c:2473
  #, fuzzy
  msgid "||Please enter the Reset Code for the card"
  msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
  
- #: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
++#: scd/app-openpgp.c:2483 scd/app-openpgp.c:2537
  #, fuzzy, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr "PIN-ul pentru CHV%d este prea scurt; lungimea minimă este %d\n"
@@@ -7925,82 -6362,64 +7960,82 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2493
++#: scd/app-openpgp.c:2506
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|AN|New Admin PIN"
  msgstr "|AN|PIN Admin Nou"
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|N|New PIN"
  msgstr "|N|PIN Nou"
  
- #: scd/app-openpgp.c:2565
++#: scd/app-openpgp.c:2578
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
  
- #: scd/app-openpgp.c:2566
++#: scd/app-openpgp.c:2579
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
  msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
  
- #: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
++#: scd/app-openpgp.c:2635 scd/app-openpgp.c:3885
  msgid "error reading application data\n"
  msgstr "eroare la citirea datelor aplicaţiei\n"
  
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
++#: scd/app-openpgp.c:2641 scd/app-openpgp.c:3892
  msgid "error reading fingerprint DO\n"
  msgstr "eroare la citirea amprentei DO\n"
  
- #: scd/app-openpgp.c:2638
++#: scd/app-openpgp.c:2651
  msgid "key already exists\n"
  msgstr "cheia există deja\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2655
  msgid "existing key will be replaced\n"
  msgstr "cheia existentă va fi înlocuită\n"
  
- #: scd/app-openpgp.c:2644
++#: scd/app-openpgp.c:2657
  msgid "generating new key\n"
  msgstr "generez o nouă cheie\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2659
  #, fuzzy
  msgid "writing new key\n"
  msgstr "generez o nouă cheie\n"
  
- #: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
++#: scd/app-openpgp.c:3201 scd/app-openpgp.c:3553
  msgid "creation timestamp missing\n"
  msgstr "timestamp-ul de creare lipseşte\n"
  
- #: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
++#: scd/app-openpgp.c:3243 scd/app-openpgp.c:3251
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr "prime-ul RSA %s lipseşte sau nu are %d biţi\n"
  
- #: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
++#: scd/app-openpgp.c:3384 scd/app-openpgp.c:3647
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "am eşuat să stochez cheia: %s\n"
  
- #: scd/app-openpgp.c:3534
++#: scd/app-openpgp.c:3547
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "URI nesuportat"
  
- #: scd/app-openpgp.c:3790
++#: scd/app-openpgp.c:3802
  msgid "please wait while key is being generated ...\n"
  msgstr "vă rugăm aşteptaţi câtă vreme este creată noua cheie ...\n"
  
- #: scd/app-openpgp.c:3798
++#: scd/app-openpgp.c:3810
  msgid "generating key failed\n"
  msgstr "generarea cheii a eşuat\n"
  
- #: scd/app-openpgp.c:3804
++#: scd/app-openpgp.c:3816
  #, fuzzy, c-format
  #| msgid "key generation completed (%d seconds)\n"
  msgid "key generation completed (%d second)\n"
@@@ -8008,31 -6427,25 +8043,31 @@@ msgid_plural "key generation completed 
  msgstr[0] "generarea cheii este completă (%d secunde)\n"
  msgstr[1] "generarea cheii este completă (%d secunde)\n"
  
- #: scd/app-openpgp.c:3838
++#: scd/app-openpgp.c:3850
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "structură invalidă a cardului OpenPGP (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:3900
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4004
++#: scd/app-openpgp.c:4016
  #, fuzzy, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "semnătură %s, algoritm rezumat %s\n"
  
- #: scd/app-openpgp.c:4089
++#: scd/app-openpgp.c:4101
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "semnături create până acum: %lu\n"
  
- #: scd/app-openpgp.c:4551
++#: scd/app-openpgp.c:4570
  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:4854 scd/app-openpgp.c:4865
++#: scd/app-openpgp.c:4871 scd/app-openpgp.c:4882
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "nu pot accesa %s - card OpenPGP invalid?\n"
@@@ -8054,7 -6464,6 +8089,7 @@@ msgstr "|N|PIN Nou
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
@@@ -8099,27 -6499,22 +8134,27 @@@ msgstr "arată comenzi administrare
  msgid "use variable length input for pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:287
++#: scd/scdaemon.c:286
  #, fuzzy
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
  
- #: scd/scdaemon.c:289
++#: scd/scdaemon.c:288
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
  msgstr ""
  
- #: scd/scdaemon.c:786
++#: scd/scdaemon.c:784
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1904
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
++#: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1909
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
@@@ -8199,9 -6578,6 +8234,9 @@@ msgstr "eroare la obţinerea numărulu
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "citirea cheii publice a eşuat: %s\n"
  
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
 +#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  #, fuzzy
  msgid "failed to allocate keyDB handle\n"
  msgstr "am eşuat să stochez cheia: %s\n"
@@@ -8701,11 -6975,9 +8736,11 @@@ msgstr "
  msgid "resource problem: out of core\n"
  msgstr ""
  
- #: sm/decrypt.c:330
++#: sm/decrypt.c:332
  msgid "(this is the RC2 algorithm)\n"
  msgstr ""
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:334
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr ""
  
@@@ -8749,125 -7013,97 +8784,125 @@@ msgstr "enumeră chei secrete
  msgid "list certificate chain"
  msgstr "certificat incorect"
  
- #: sm/gpgsm.c:218
++#: sm/gpgsm.c:219
  #, fuzzy
  msgid "import certificates"
  msgstr "certificat incorect"
  
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
  #, fuzzy
  msgid "export certificates"
  msgstr "certificat incorect"
  
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:228
  #, fuzzy
  msgid "register a smartcard"
  msgstr "adaugă o cheie la un smartcard"
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:231
  msgid "pass a command to the dirmngr"
  msgstr ""
  
- #: sm/gpgsm.c:232
++#: sm/gpgsm.c:233
  msgid "invoke gpg-protect-tool"
  msgstr ""
  
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:250
  #, fuzzy
  msgid "create base-64 encoded output"
  msgstr "crează ieşire în armură ascii"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in PEM format"
  msgstr ""
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in base-64 format"
  msgstr ""
  
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:262
  msgid "assume input is in binary format"
  msgstr ""
  
- #: sm/gpgsm.c:267
++#: sm/gpgsm.c:269
  msgid "never consult a CRL"
  msgstr ""
  
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:279
  msgid "check validity using OCSP"
  msgstr ""
  
- #: sm/gpgsm.c:282
++#: sm/gpgsm.c:284
  msgid "|N|number of certificates to include"
  msgstr ""
  
- #: sm/gpgsm.c:285
++#: sm/gpgsm.c:287
  msgid "|FILE|take policy information from FILE"
  msgstr ""
  
- #: sm/gpgsm.c:288
++#: sm/gpgsm.c:290
  msgid "do not check certificate policies"
  msgstr ""
  
- #: sm/gpgsm.c:292
++#: sm/gpgsm.c:294
  msgid "fetch missing issuer certificates"
  msgstr ""
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "don't use the terminal at all"
  msgstr "nu folosi deloc terminalul"
  
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:307
  msgid "|FILE|write a server mode log to FILE"
  msgstr ""
  
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:312
  #, fuzzy
  msgid "|FILE|write an audit log to FILE"
  msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "batch mode: never ask"
  msgstr "modul batch: nu întreba niciodată"
  
- #: sm/gpgsm.c:314
++#: sm/gpgsm.c:316
  msgid "assume yes on most questions"
  msgstr "presupune da la cele mai multe întrebări"
  
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:317
  msgid "assume no on most questions"
  msgstr "presupune nu la cele mai multe întrebări"
  
- #: sm/gpgsm.c:318
++#: sm/gpgsm.c:320
  #, fuzzy
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "adaugă acest inel de chei la lista inelelor de chei"
  
- #: sm/gpgsm.c:321
++#: sm/gpgsm.c:323
  #, fuzzy
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|NUME|foloseşte NUME ca cheie secretă implicită"
  
- #: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
  #, 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:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|NUME|foloseşte algoritm cifrare NUME"
  
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:352
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|NUME|foloseşte algoritm rezumat mesaj NUME"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:559
  #, 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:570
++#: sm/gpgsm.c:562
  #, fuzzy
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
@@@ -8878,48 -7114,39 +8913,48 @@@ msgstr "
  "sign, check, encrypt sau decrypt\n"
  "operaţiunea implicită depinde de datele de intrare\n"
  
- #: sm/gpgsm.c:774
++#: sm/gpgsm.c:766
  #, 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:785
++#: sm/gpgsm.c:777
  #, fuzzy, c-format
  msgid "unknown validation model '%s'\n"
  msgstr "opţiune necunoscută `%s'\n"
  
- #: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
  #, fuzzy, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "(Nici o descriere dată)\n"
  
- #: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr ""
  
- #: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
  #, fuzzy, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr "  s = sări peste cheia asta\n"
  
  #
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1427
  #, fuzzy
  msgid "could not parse keyserver\n"
  msgstr "nu am putut interpreta URL-ul serverului de chei\n"
  
- #: sm/gpgsm.c:1636
++#: sm/gpgsm.c:1630
  #, fuzzy, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "eroare la obţinerea numărului serial: %s\n"
  
- #: sm/gpgsm.c:1677
++#: sm/gpgsm.c:1671
  #, fuzzy, c-format
  msgid "can't sign using '%s': %s\n"
  msgstr "nu pot accesa `%s': %s\n"
  
- #: sm/gpgsm.c:2033
++#: sm/gpgsm.c:2028
  msgid "invalid command (there is no implicit command)\n"
  msgstr ""
  
@@@ -9687,8 -7763,6 +9722,8 @@@ msgstr "
  msgid "CRL access not possible due to disabled %s\n"
  msgstr ""
  
 +#: dirmngr/crlfetch.c:223 dirmngr/ldap-wrapper-ce.c:488
- #: dirmngr/ldap-wrapper.c:742 dirmngr/misc.c:563
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:563
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
@@@ -9875,118 -7913,90 +9910,118 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:160
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:158
++#: dirmngr/dirmngr.c:161
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
  
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:162
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:163
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:164
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
- #: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
++#: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:177
++#: dirmngr/dirmngr.c:180
  #, 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:178
++#: dirmngr/dirmngr.c:181
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:182
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:184
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:185
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:186
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:188
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:192
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:202
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
  
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
  #
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:210
  #, fuzzy
  msgid "|URL|use OCSP responder at URL"
  msgstr "nu am putut interpreta URL-ul serverului de chei\n"
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:212
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:218
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:220
++#: dirmngr/dirmngr.c:223
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:225
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:240
++#: dirmngr/dirmngr.c:246
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -9999,95 -8009,76 +10034,95 @@@ msgstr "
  "@\n"
  "(Arată pagina man pentru o listă completă a comenzilor şi opţiunilor)\n"
  
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:361
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
  
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:363
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:443
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
- #: tools/gpgconf.c:648
++#: dirmngr/dirmngr.c:496 tools/gpgconf.c:550 tools/gpgconf.c:585
++#: tools/gpgconf.c:656
  #, fuzzy, c-format
  msgid "usage: %s [options] "
  msgstr "folosire: gpg [opţiuni] "
  
- #: dirmngr/dirmngr.c:1062
++#: dirmngr/dirmngr.c:1074
  #, fuzzy
  #| 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:1301 dirmngr/server.c:1585
++#: dirmngr/dirmngr.c:1300 dirmngr/server.c:1585
  #, 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:1307 dirmngr/server.c:1591
++#: dirmngr/dirmngr.c:1306 dirmngr/server.c:1591
  #, fuzzy, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "redenumirea `%s' ca `%s' a eşuat: %s\n"
  
- #: dirmngr/dirmngr.c:1484
++#: dirmngr/dirmngr.c:1487
  #, fuzzy, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "linie prea lungă"
  
- #: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
++#: dirmngr/dirmngr.c:1542 dirmngr/dirmngr.c:1626
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "amprentă invalidă"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
++#: dirmngr/dirmngr.c:1578 dirmngr/dirmngr.c:1604 tools/gpgconf-comp.c:4032
  #, 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:1630
++#: dirmngr/dirmngr.c:1633
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1700
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1734
++#: dirmngr/dirmngr.c:1738
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1739
++#: dirmngr/dirmngr.c:1743
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1745
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1746
++#: dirmngr/dirmngr.c:1750
  #, fuzzy
  #| msgid "not forced"
  msgid "shutdown forced\n"
  msgstr "neforţat(ă)"
  
- #: dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1758
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1761
++#: dirmngr/dirmngr.c:1765
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10580,34 -8472,28 +10615,34 @@@ msgstr "stergere keyblock a eşuat: %s\
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2463
++#: dirmngr/server.c:2469
  #, 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:2474
++#: dirmngr/server.c:2480
  #, fuzzy, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "%s: am eşuat să creez hashtable: %s\n"
  
- #: dirmngr/server.c:2495
++#: dirmngr/server.c:2501
  #, 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:2503
++#: dirmngr/server.c:2509
  #, 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:2534
++#: dirmngr/server.c:2540
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2553
++#: dirmngr/server.c:2559
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
@@@ -10655,7 -8532,6 +10690,7 @@@ msgstr "DSA necesită folosirea unui al
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:167
  #, fuzzy
  msgid "quiet"
  msgstr "termină"
@@@ -10748,22 -8604,15 +10783,22 @@@ 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:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
- #: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
++#: tools/gpgconf-comp.c:766 tools/gpgconf-comp.c:865
  msgid "Options controlling the diagnostic output"
  msgstr ""
  
 +#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
- #: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
++#: tools/gpgconf-comp.c:779 tools/gpgconf-comp.c:888
  msgid "Options controlling the configuration"
  msgstr ""
  
- #: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
- #: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
++#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:723
++#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:901
  msgid "Options useful for debugging"
  msgstr ""
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
  msgid "Options controlling the security"
  msgstr ""
  
@@@ -10813,11 -8651,9 +10848,11 @@@ msgstr "eroare la crearea frazei-parol�
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
++#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
  msgid "|NAME|use NAME as default secret key"
  msgstr "|NUME|foloseşte NUME ca cheie secretă implicită"
  
- #: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
++#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:784
  #, fuzzy
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NUME|cifrare pentru NUME"
@@@ -10826,195 -8661,163 +10861,210 @@@
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
++#: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
  msgid "Configuration for Keyservers"
  msgstr ""
  
  #
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
++#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
  #, fuzzy
  msgid "|URL|use keyserver at URL"
  msgstr "nu am putut interpreta URL-ul serverului de chei\n"
  
- #: tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:741
  msgid "allow PKA lookups (DNS requests)"
  msgstr ""
  
- #: tools/gpgconf-comp.c:738
++#: tools/gpgconf-comp.c:744
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr ""
  
- #: tools/gpgconf-comp.c:787
++#: tools/gpgconf-comp.c:793
  msgid "disable all access to the dirmngr"
  msgstr ""
  
- #: tools/gpgconf-comp.c:790
++#: tools/gpgconf-comp.c:796
  #, fuzzy
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
  msgstr "|NUME|foloseşte algoritm cifrare NUME pentru fraza-parolă"
  
- #: tools/gpgconf-comp.c:820
++#: tools/gpgconf-comp.c:829
  msgid "do not check CRLs for root certificates"
  msgstr ""
  
- #: tools/gpgconf-comp.c:869
++#: tools/gpgconf-comp.c:878
  msgid "Options controlling the format of the output"
  msgstr ""
  
- #: tools/gpgconf-comp.c:905
++#: tools/gpgconf-comp.c:920
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:918
++#: tools/gpgconf-comp.c:933
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:947
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:958
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:948
++#: tools/gpgconf-comp.c:963
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:977
++#: tools/gpgconf-comp.c:992
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:985
++#: tools/gpgconf-comp.c:1000
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1066
++#: tools/gpgconf-comp.c:1081
  msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1067
++#: tools/gpgconf-comp.c:1082
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1083
  msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1069
++#: tools/gpgconf-comp.c:1084
  msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1070
++#: tools/gpgconf-comp.c:1085
  #, fuzzy
  #| msgid "network error"
  msgid "Network"
  msgstr "eroare reţea"
  
- #: tools/gpgconf-comp.c:1071
++#: tools/gpgconf-comp.c:1086
  #, fuzzy
  msgid "Passphrase Entry"
  msgstr "frază-parolă incorectă"
  
- #: tools/gpgconf-comp.c:1225
++#: tools/gpgconf-comp.c:1240
  #, fuzzy
  msgid "Component not suitable for launching"
  msgstr "cheia publică nu a fost găsită"
  
- #: tools/gpgconf-comp.c:3283
++#: tools/gpgconf-comp.c:3311
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3434
++#: tools/gpgconf-comp.c:3462
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf-comp.c:4036
+ #, fuzzy, c-format
+ msgid "error closing '%s'\n"
+ msgstr "eroare în `%s': %s\n"
+ 
++#: tools/gpgconf-comp.c:4038
+ #, fuzzy, c-format
+ #| msgid "error in `%s': %s\n"
+ msgid "error parsing '%s'\n"
+ msgstr "eroare în `%s': %s\n"
+ 
++#: tools/gpgconf.c:73
  msgid "list all components"
  msgstr ""
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "check all programs"
  msgstr ""
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|list options"
  msgstr ""
  
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
  msgid "|COMPONENT|change options"
  msgstr ""
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "|COMPONENT|check options"
  msgstr ""
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "apply global default values"
  msgstr ""
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
+ msgid "|FILE|update configuration files using FILE"
+ msgstr ""
+ 
++#: tools/gpgconf.c:83
  msgid "get the configuration directories for @GPGCONF@"
  msgstr ""
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:85
  #, fuzzy
  msgid "list global configuration file"
  msgstr "articol configurare necunoscut `%s'\n"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  #, fuzzy
  msgid "check global configuration file"
  msgstr "articol configurare necunoscut `%s'\n"
  
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:89
  #, fuzzy
  #| msgid "update the trust database"
  msgid "query the software version database"
  msgstr "actualizează baza de date de încredere"
  
- #: tools/gpgconf.c:86
++#: tools/gpgconf.c:90
  msgid "reload all or a given component"
  msgstr ""
  
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:91
  msgid "launch a given component"
  msgstr ""
  
- #: tools/gpgconf.c:88
++#: tools/gpgconf.c:92
  msgid "kill a given component"
  msgstr ""
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "use as output file"
  msgstr "foloseşte ca fişier ieşire"
  
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:102
  msgid "activate changes at runtime, if possible"
  msgstr ""
  
- #: tools/gpgconf.c:122
++#: tools/gpgconf.c:127
  #, fuzzy
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
  
- #: tools/gpgconf.c:125
++#: tools/gpgconf.c:130
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
  msgstr ""
  
- #: tools/gpgconf.c:545 tools/gpgconf.c:579
++#: tools/gpgconf.c:552 tools/gpgconf.c:587
  msgid "Need one component argument"
  msgstr ""
  
- #: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
++#: tools/gpgconf.c:561 tools/gpgconf.c:599 tools/gpgconf.c:632
  #, fuzzy
  msgid "Component not found"
  msgstr "cheia publică nu a fost găsită"
  
- #: tools/gpgconf.c:650
++#: tools/gpgconf.c:658
  #, fuzzy
  msgid "No argument allowed"
  msgstr "Nu sunt permise comenzi administrare\n"
diff --cc po/ru.po
index 3eea346,60f584a..b9c79ea
--- a/po/ru.po
+++ b/po/ru.po
@@@ -11,7 -11,6 +11,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: GnuPG 2.1.0\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-11-18 16:54+0100\n"
++"POT-Creation-Date: 2016-12-20 11:28+0100\n"
  "PO-Revision-Date: 2016-11-18 15:44+0100\n"
  "Last-Translator: Ineiev <ineiev at gnu.org>\n"
  "Language-Team: Russian <gnupg-ru at gnupg.org>\n"
@@@ -155,24 -126,10 +155,24 @@@ msgstr "Неверная фраза-п�
  msgid "ssh keys greater than %d bits are not supported\n"
  msgstr "ключи ssh длиннее %d бит не поддерживаются\n"
  
 +#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
- #: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1306 g10/keygen.c:4577
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
++#: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
  #, c-format
  msgid "can't create '%s': %s\n"
  msgstr "не могу создать '%s': %s\n"
  
 +#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
- #: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1307
++#: g10/import.c:305 g10/import.c:448 g10/import.c:621 g10/keygen.c:3681
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
- #: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
- #: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:825 g10/sign.c:1025
++#: g10/sign.c:1130 g10/sign.c:1275 g10/tdbdump.c:143 g10/tdbdump.c:151
++#: g10/tdbio.c:720 g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161
++#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
++#: dirmngr/certcache.c:368 dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1564
  #, c-format
  msgid "can't open '%s': %s\n"
  msgstr "не могу открыть '%s': %s\n"
@@@ -237,11 -183,9 +237,11 @@@ msgstr "
  msgid "failed to create stream from socket: %s\n"
  msgstr "сбой создания потока из сокета: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1100
++#: agent/divert-scd.c:92 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr "Вставьте карту с серийным номером"
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1101
++#: agent/divert-scd.c:93 g10/call-agent.c:1102
  msgid "Please remove the current card and insert the one with serial number"
  msgstr "Удалите текущую карту и вставьте карту с серийным номером"
  
@@@ -382,45 -300,30 +382,45 @@@ msgstr "
  "@Параметры:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
  msgid "run in daemon mode (background)"
  msgstr "запуск в режиме демона (фоновый режим)"
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
  msgid "run in server mode (foreground)"
  msgstr "запуск в режиме сервера (нефоновый режим)"
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
  msgid "run in supervised mode"
  msgstr "запуск в подконтрольном режиме"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:170 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "подробно"
  
 +#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "сократить подробности"
  
- #: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
  msgid "sh-style command output"
  msgstr "вывод команд в стиле sh"
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
  msgid "csh-style command output"
  msgstr "вывод команд в стиле csh"
  
- #: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
- #: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
++#: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
  msgid "|FILE|read options from FILE"
  msgstr "|FILE|взять параметры из файла FILE"
  
- #: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:177
  msgid "do not detach from the console"
  msgstr "не отсоединяться от консоли"
  
@@@ -496,19 -382,12 +496,19 @@@ 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:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:481 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1025 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:358
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:124 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr "Об ошибках в программе сообщайте по адресу <@EMAIL@>.\n"
  
- #: agent/gpg-agent.c:491
++#: agent/gpg-agent.c:490
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "Вызов: @GPG_AGENT@ [параметры] (-h для подсказки)"
  
- #: agent/gpg-agent.c:493
++#: agent/gpg-agent.c:492
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
@@@ -516,135 -395,100 +516,135 @@@ msgstr "
  "Синтаксис: @GPG_AGENT@ [параметры] [команда [аргументы]]\n"
  "Управление секретными ключами для @GNUPG@\n"
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:537 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:442
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr "запрошен недопустимый уровень отладки '%s'\n"
  
- #: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:793
++#: agent/gpg-agent.c:1082 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:812
  #, c-format
  msgid "Note: no default option file '%s'\n"
  msgstr "Замечание: основной файл параметров '%s' не обнаружен\n"
  
- #: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
- #: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1093 agent/gpg-agent.c:1935 g10/gpg.c:2510
++#: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:817
++#: dirmngr/dirmngr.c:1670 tools/symcryptrun.c:932
  #, c-format
  msgid "option file '%s': %s\n"
  msgstr "файл параметров '%s': %s\n"
  
- #: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:806
++#: agent/gpg-agent.c:1101 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:825
  #, c-format
  msgid "reading options from '%s'\n"
  msgstr "чтение параметров из '%s'\n"
  
- #: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
- #: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
++#: agent/gpg-agent.c:1223 g10/gpg.c:3643 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:936 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:527
  #, c-format
  msgid "Note: '%s' is not considered an option\n"
  msgstr "Замечание: '%s' не считается параметром\n"
  
- #: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
++#: agent/gpg-agent.c:2080 scd/scdaemon.c:1073 dirmngr/dirmngr.c:1081
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "не могу создать сокет: %s\n"
  
- #: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
++#: agent/gpg-agent.c:2097 scd/scdaemon.c:1086 dirmngr/dirmngr.c:1094
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr "слишком длинное имя сокета '%s'\n"
  
- #: agent/gpg-agent.c:2134
++#: agent/gpg-agent.c:2135
  msgid "a gpg-agent is already running - not starting a new one\n"
  msgstr "агент gpg уже запущен - еще один, новый, запущен не будет\n"
  
- #: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
++#: agent/gpg-agent.c:2145 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1126
  msgid "error getting nonce for the socket\n"
  msgstr "ошибка получения разового кода для сокета\n"
  
- #: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
++#: agent/gpg-agent.c:2150 scd/scdaemon.c:1113 dirmngr/dirmngr.c:1129
  #, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "ошибка связывания сокета с '%s': %s\n"
  
- #: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
- #: dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2160 agent/gpg-agent.c:2197 scd/scdaemon.c:1121
++#: dirmngr/dirmngr.c:1138
  #, c-format
  msgid "can't set permissions of '%s': %s\n"
  msgstr "не удалось задать права доступа для '%s': %s\n"
  
- #: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:2165 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1143
  #, c-format
  msgid "listen() failed: %s\n"
  msgstr "сбой listen(): %s\n"
  
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
++#: agent/gpg-agent.c:2172 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1149
  #, c-format
  msgid "listening on socket '%s'\n"
  msgstr "слушаем сокет '%s'\n"
  
- #: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: agent/gpg-agent.c:2191 agent/gpg-agent.c:2234 g10/exec.c:199
 +#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, c-format
  msgid "can't create directory '%s': %s\n"
  msgstr "не могу создать каталог '%s': %s\n"
  
- #: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: agent/gpg-agent.c:2194 agent/gpg-agent.c:2239 g10/openfile.c:491
 +#: g10/openfile.c:520 sm/keydb.c:103
  #, c-format
  msgid "directory '%s' created\n"
  msgstr "создан каталог '%s'\n"
  
- #: agent/gpg-agent.c:2244
++#: agent/gpg-agent.c:2245
  #, c-format
  msgid "stat() failed for '%s': %s\n"
  msgstr "сбой stat() для '%s': %s\n"
  
- #: agent/gpg-agent.c:2248
++#: agent/gpg-agent.c:2249
  #, c-format
  msgid "can't use '%s' as home directory\n"
  msgstr "невозможно использовать '%s' как домашний каталог\n"
  
- #: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
++#: agent/gpg-agent.c:2392 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1871
  #, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "ошибка чтения разового кода из файлового дескриптора %d: %s\n"
  
- #: agent/gpg-agent.c:2598
++#: agent/gpg-agent.c:2599
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr "обработчик 0x%lx для файлового дескриптора %d запущен\n"
  
- #: agent/gpg-agent.c:2603
++#: agent/gpg-agent.c:2604
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr "обработчик 0x%lx для файлового дескриптора %d завершился\n"
  
- #: agent/gpg-agent.c:2678
++#: agent/gpg-agent.c:2679
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr "обработчик ssh 0x%lx для файлового дескриптора %d запущен\n"
  
- #: agent/gpg-agent.c:2683
++#: agent/gpg-agent.c:2684
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr "обработчик ssh 0x%lx для файлового дескриптора %d завершился\n"
  
- #: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
++#: agent/gpg-agent.c:2881 scd/scdaemon.c:1272 dirmngr/dirmngr.c:2075
  #, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "сбой npth_pselect: %s - жду 1 секунду\n"
  
- #: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2954 scd/scdaemon.c:1321
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s остановлен\n"
  
- #: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
++#: agent/gpg-agent.c:3092 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  msgid "no gpg-agent running in this session\n"
  msgstr "в этом сеансе агент gpg не работает\n"
  
@@@ -661,8 -503,6 +661,8 @@@ msgstr "
  "Синтаксис: gpg-preset-passphrase [параметры] КОД_КЛЮЧА\n"
  "Работа с буфером паролей\n"
  
- #: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
++#: agent/protect-tool.c:106 g10/gpg.c:424 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:153 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -670,9 -510,6 +670,9 @@@ msgstr "
  "@Команды:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
- #: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:92 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:168 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -726,8 -555,6 +726,8 @@@ msgstr "отменено\n
  msgid "error while asking for the passphrase: %s\n"
  msgstr "ошибка запроса ввода фразы-пароля: %s\n"
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
- #: tools/gpgconf.c:323
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1472
++#: tools/gpgconf.c:328
  #, c-format
  msgid "error opening '%s': %s\n"
  msgstr "ошибка открытия '%s': %s\n"
@@@ -898,9 -696,6 +898,9 @@@ msgstr "алгоритм защиты %
  msgid "protection hash algorithm %d (%s) is not supported\n"
  msgstr "хеш-функция защиты %d (%s) не поддерживается\n"
  
 +#: common/exechelp-posix.c:359 common/exechelp-w32.c:438
 +#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
- #: dirmngr/ldap-wrapper.c:710
++#: dirmngr/ldap-wrapper.c:711
  #, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "ошибка при создании канала конвейера: %s\n"
@@@ -912,8 -704,6 +912,8 @@@
  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:848 dirmngr/dirmngr.c:1155
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1167
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "ошибка при дублировании процесса: %s\n"
@@@ -958,28 -739,23 +958,28 @@@ msgstr "не могу подключи�
  msgid "problem setting the gpg-agent options\n"
  msgstr "проблема задания параметров агента gpg\n"
  
- #: common/sysutils.c:144
++#: common/sysutils.c:148
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "не могу отключить создание файла образа памяти: %s\n"
  
- #: common/sysutils.c:239
++#: common/sysutils.c:250
  #, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "Внимание: небезопасный владелец %s \"%s\"\n"
  
- #: common/sysutils.c:271
++#: common/sysutils.c:282
  #, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "Внимание: небезопасные права доступа %s \"%s\"\n"
  
- #: common/sysutils.c:659
++#: common/sysutils.c:693
  #, fuzzy, c-format
  #| msgid "waiting for the agent to come up ... (%ds)\n"
  msgid "waiting for file '%s' to become accessible ...\n"
  msgstr "ожидаю подключения агента ... (%iс)\n"
  
- #: common/sysutils.c:685
++#: common/sysutils.c:719
  #, fuzzy, c-format
  #| msgid "error renaming '%s' to '%s': %s\n"
  msgid "renaming '%s' to '%s' failed: %s\n"
@@@ -1055,7 -816,6 +1055,7 @@@ msgstr "%s:%u: устаревший п�
  msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
  msgstr "Внимание: параметр \"%s%s\" устарел - он игнорируется\n"
  
- #: common/miscellaneous.c:554
++#: common/miscellaneous.c:556
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr "неизвестный отладочный флаг '%s' игнорируется\n"
@@@ -1159,8 -896,6 +1159,8 @@@ msgstr "Сеансовый ключ с�
  msgid "algorithm: %s"
  msgstr "алгоритм: %s"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3098
++#: scd/app-openpgp.c:3111
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "алгоритм (не поддерживается): %s"
@@@ -1346,7 -1039,6 +1346,7 @@@ msgstr "параметр \"%.50s\" не
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr "команда \"%.50s\" неоднозначна\n"
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1173
++#: common/argparse.c:401 dirmngr/dirmngr.c:1185
  msgid "out of core\n"
  msgstr "нехватка выделенной памяти\n"
  
@@@ -1404,8 -1085,6 +1404,8 @@@ msgstr "блокировка '%s' не 
  msgid "waiting for lock %s...\n"
  msgstr "ожидаю снятия блокировки %s...\n"
  
- #: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
- #: dirmngr/dirmngr.c:715
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:725
++#: dirmngr/dirmngr.c:734
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr "слишком старая версия %s (нужно %s, есть %s)\n"
@@@ -1443,7 -1114,6 +1443,7 @@@ msgstr "неожиданный текс
  msgid "invalid dash escaped line: "
  msgstr "недопустимая строка, выделенная дефисами: "
  
- #: g10/armor.c:873 g10/armor.c:1490
++#: g10/armor.c:873 g10/armor.c:1493
  #, c-format
  msgid "invalid radix64 character %02X skipped\n"
  msgstr "недопустимый символ radix64 %02X (игнорируется)\n"
@@@ -1460,7 -1127,6 +1460,7 @@@ msgstr "преждевременный 
  msgid "malformed CRC\n"
  msgstr "поврежденная контрольная сумма\n"
  
- #: g10/armor.c:962 g10/armor.c:1527
++#: g10/armor.c:962 g10/armor.c:1530
  #, c-format
  msgid "CRC error; %06lX - %06lX\n"
  msgstr "ошибка контрольной суммы; %06lX - %06lX\n"
@@@ -1473,16 -1137,13 +1473,16 @@@ msgstr "преждевременный 
  msgid "error in trailer line\n"
  msgstr "ошибка в строке дополнения\n"
  
- #: g10/armor.c:1303
++#: g10/armor.c:1306
  msgid "no valid OpenPGP data found.\n"
  msgstr "не найдено данных формата OpenPGP.\n"
  
- #: g10/armor.c:1308
++#: g10/armor.c:1311
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
  msgstr "недопустимый текстовый формат: строка длиннее %d символов\n"
  
- #: g10/armor.c:1312
++#: g10/armor.c:1315
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr ""
@@@ -1560,8 -1206,6 +1560,8 @@@ msgstr "Карта OpenPGP недост
  msgid "OpenPGP card no. %s detected\n"
  msgstr "Обнаружена карта OpenPGP номер %s\n"
  
- #: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
- #: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2030
++#: g10/keygen.c:4087 g10/revoke.c:215 g10/revoke.c:618
  msgid "can't do this in batch mode\n"
  msgstr "в пакетном режиме это действие невозможно\n"
  
@@@ -1569,14 -1212,9 +1569,14 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "Эта команда доступна только для карт версии 2.\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2454
++#: g10/card-util.c:109 scd/app-openpgp.c:2467
  msgid "Reset Code not or not anymore available\n"
  msgstr "Код сброса (больше) не доступен\n"
  
 +#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
- #: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
- #: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1768
++#: g10/keygen.c:1945 g10/keygen.c:2313 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "Ваш выбор? "
  
@@@ -1638,10 -1262,6 +1638,10 @@@ msgstr "URL для получения �
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr "Ошибка: Слишком длинный URL (предел - %d символов).\n"
  
- #: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
- #: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:334
++#: g10/import.c:592 g10/import.c:640 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
++#: dirmngr/dirmngr.c:1510 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, c-format
  msgid "error reading '%s': %s\n"
  msgstr "ошибка чтения '%s': %s\n"
@@@ -1708,7 -1313,6 +1708,7 @@@ msgstr "операция с ключо�
  msgid "not an OpenPGP card"
  msgstr "это не карта OpenPGP"
  
- #: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
++#: g10/card-util.c:1173 g10/keygen.c:4106 g10/keygen.c:5092
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr "ошибка при считывании информации ключа: %s\n"
@@@ -1742,13 -1341,10 +1742,13 @@@ msgstr "Какой Вам нужен р
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "Какой Вам нужен размер ключа для аутентификации? (%u) "
  
- #: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
++#: g10/card-util.c:1316 g10/keygen.c:2122 g10/keygen.c:2154
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "округлен до %u бит\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2207 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr "размер ключей %s должен быть в пределах %u-%u\n"
@@@ -1802,9 -1388,6 +1802,9 @@@ msgstr "   (2) Ключ шифрова�
  msgid "   (3) Authentication key\n"
  msgstr "   (3) Ключ аутентификации\n"
  
- #: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
- #: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
- #: g10/keygen.c:2314 g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1508
++#: g10/keygen.c:1794 g10/keygen.c:1822 g10/keygen.c:1952 g10/keygen.c:2060
++#: g10/keygen.c:2336 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Неправильный выбор.\n"
  
@@@ -1833,7 -1410,6 +1833,7 @@@ msgstr "Продолжить? (y/N) 
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr "Подтвердите сброс к заводским установкам (введите \"yes\") "
  
- #: g10/card-util.c:1816 g10/keyedit.c:1867
++#: g10/card-util.c:1816 g10/keyedit.c:1868
  msgid "quit this menu"
  msgstr "выйти из этого меню"
  
@@@ -1841,7 -1416,6 +1841,7 @@@
  msgid "show admin commands"
  msgstr "показать административные команды"
  
- #: g10/card-util.c:1819 g10/keyedit.c:1870
++#: g10/card-util.c:1819 g10/keyedit.c:1871
  msgid "show this help"
  msgstr "показать данную справку"
  
@@@ -1917,30 -1473,20 +1917,30 @@@ msgstr "Команды админист
  msgid "Admin commands are not allowed\n"
  msgstr "Команды администрирования не разрешены\n"
  
- #: g10/card-util.c:2127 g10/keyedit.c:2816
++#: g10/card-util.c:2127 g10/keyedit.c:2817
  msgid "Invalid command  (try \"help\")\n"
  msgstr "Недопустимая команда (список команд: \"help\")\n"
  
- #: g10/decrypt.c:191 g10/encrypt.c:955
++#: g10/decrypt.c:190 g10/encrypt.c:955
  msgid "--output doesn't work for this command\n"
  msgstr "--output для данной команды не работает\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4904 g10/keyring.c:398 g10/keyring.c:771
  #, c-format
  msgid "can't open '%s'\n"
  msgstr "не могу открыть '%s'\n"
  
 +#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
- #: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
- #: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4858 g10/keyedit.c:2051
++#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2163
  #, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "ключ \"%s\" не найден: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
- #: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
- #: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4866 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:645 g10/tofu.c:2171
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "ошибка чтения блока ключей: %s\n"
@@@ -1997,7 -1531,6 +1997,7 @@@ msgstr "имеется секретны
  msgid "use option \"--delete-secret-keys\" to delete it first.\n"
  msgstr "сначала удалите его командой \"--delete-secret-keys\".\n"
  
- #: g10/encrypt.c:232 g10/sign.c:1292
++#: g10/encrypt.c:232 g10/sign.c:1294
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "ошибка при создании фразы-пароля: %s\n"
@@@ -2016,7 -1546,6 +2016,7 @@@ msgstr "используется сим
  msgid "'%s' already compressed\n"
  msgstr "'%s' уже сжат\n"
  
- #: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:610
  #, c-format
  msgid "WARNING: '%s' is an empty file\n"
  msgstr "Внимание: файл '%s' пуст\n"
@@@ -2034,7 -1561,6 +2034,7 @@@ msgstr "
  "Внимание: принудительное использование симметричного шифра %s (%d)\n"
  "          нарушает предпочтения получателя\n"
  
- #: g10/encrypt.c:707 g10/sign.c:984
++#: g10/encrypt.c:707 g10/sign.c:986
  #, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2068,7 -1589,6 +2068,7 @@@ msgstr "данные зашифрова
  msgid "encrypted with unknown algorithm %d\n"
  msgstr "зашифровано неизвестным алгоритмом %d\n"
  
- #: g10/decrypt-data.c:164 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:129
  msgid ""
  "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
  msgstr ""
@@@ -2156,8 -1658,6 +2156,8 @@@ msgstr "при экспорте уда�
  msgid " - skipped"
  msgstr " - пропущено"
  
- #: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:845 g10/sign.c:1148
++#: g10/export.c:1251 g10/import.c:1543 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:847 g10/sign.c:1150
  #, c-format
  msgid "writing to '%s'\n"
  msgstr "сохраняю в '%s'\n"
@@@ -2180,8 -1676,6 +2180,8 @@@ msgstr "ключ %s: ключ типа 
  msgid "WARNING: nothing exported\n"
  msgstr "Внимание: нечего экспортировать\n"
  
- #: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
- #: g10/plaintext.c:151 g10/plaintext.c:174
++#: g10/export.c:2283 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/plaintext.c:167 g10/plaintext.c:190
  #, c-format
  msgid "error creating '%s': %s\n"
  msgstr "ошибка создания '%s': %s\n"
@@@ -2227,8 -1712,6 +2227,8 @@@ msgstr "ошибка получени�
  msgid "No fingerprint"
  msgstr "Нет отпечатка"
  
- #: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
- #: g10/revoke.c:701
++#: g10/getkey.c:1873 g10/keyedit.c:2929 g10/keyedit.c:3016 g10/revoke.c:637
++#: g10/revoke.c:702
  #, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "секретный ключ \"%s\" не найден: %s\n"
@@@ -2261,199 -1739,155 +2261,205 @@@ msgstr "
  msgid "using subkey %s instead of primary key %s\n"
  msgstr "использую подключ %s вместо первичного ключа %s\n"
  
- #: g10/gpg.c:424 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:200
  msgid "make a signature"
  msgstr "создать подпись"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:427
  msgid "make a clear text signature"
  msgstr "создать текстовую подпись"
  
- #: g10/gpg.c:426 sm/gpgsm.c:202
++#: g10/gpg.c:429 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "создать отделенную подпись"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:430 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "зашифровать данные"
  
- #: g10/gpg.c:429
++#: g10/gpg.c:432
  msgid "encryption only with symmetric cipher"
  msgstr "шифрование только симметричным шифром"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:434 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "расшифровать данные (по умолчанию)"
  
- #: g10/gpg.c:433 sm/gpgsm.c:206
++#: g10/gpg.c:436 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "проверить подпись"
  
- #: g10/gpg.c:435 sm/gpgsm.c:207
++#: g10/gpg.c:438 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "вывести список ключей"
  
- #: g10/gpg.c:437
++#: g10/gpg.c:440
  msgid "list keys and signatures"
  msgstr "вывести список ключей и подписей"
  
- #: g10/gpg.c:438
++#: g10/gpg.c:443
  msgid "list and check key signatures"
  msgstr "вывести и проверить подписи ключей"
  
- #: g10/gpg.c:439 sm/gpgsm.c:212
++#: g10/gpg.c:445 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "вывести список ключей и их отпечатков"
  
- #: g10/gpg.c:440 sm/gpgsm.c:210
++#: g10/gpg.c:446 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "вывести список секретных ключей"
  
- #: g10/gpg.c:442 sm/gpgsm.c:213
++#: g10/gpg.c:448 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "создать новую пару ключей"
  
- #: g10/gpg.c:444
++#: g10/gpg.c:451
  msgid "quickly generate a new key pair"
  msgstr "быстро создать новую пару ключей"
  
- #: g10/gpg.c:446
++#: g10/gpg.c:454
  msgid "quickly add a new user-id"
  msgstr "быстро добавить новый ID пользователя"
  
- #: g10/gpg.c:449
++#: g10/gpg.c:459
  msgid "quickly revoke a user-id"
  msgstr "быстро отозвать ID пользователя"
  
- #: g10/gpg.c:451
++#: g10/gpg.c:462
+ #, fuzzy
+ #| msgid "quickly generate a new key pair"
+ msgid "quickly set a new expiration date"
+ msgstr "быстро создать новую пару ключей"
+ 
++#: g10/gpg.c:464
  msgid "full featured key pair generation"
  msgstr "создание полноценной пары ключей"
  
- #: g10/gpg.c:452
++#: g10/gpg.c:467
  msgid "generate a revocation certificate"
  msgstr "создать сертификат отзыва"
  
- #: g10/gpg.c:454 sm/gpgsm.c:215
++#: g10/gpg.c:470 sm/gpgsm.c:216
  msgid "remove keys from the public keyring"
  msgstr "удалить ключи из таблицы открытых ключей"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:472
  msgid "remove keys from the secret keyring"
  msgstr "удалить ключи из таблицы секретных ключей"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:474
  msgid "quickly sign a key"
  msgstr "быстро подписать ключ"
  
- #: g10/gpg.c:460
++#: g10/gpg.c:476
  msgid "quickly sign a key locally"
  msgstr "быстро подписать ключ локально"
  
- #: g10/gpg.c:461
++#: g10/gpg.c:477
  msgid "sign a key"
  msgstr "подписать ключ"
  
- #: g10/gpg.c:462
++#: g10/gpg.c:478
  msgid "sign a key locally"
  msgstr "подписать ключ локально"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:479
  msgid "sign or edit a key"
  msgstr "подписать или редактировать ключ"
  
- #: g10/gpg.c:465 sm/gpgsm.c:233
++#: g10/gpg.c:481 sm/gpgsm.c:234
  msgid "change a passphrase"
  msgstr "сменить фразу-пароль"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:485
  msgid "export keys"
  msgstr "экспортировать ключи"
  
- #: g10/gpg.c:468
++#: g10/gpg.c:486
  msgid "export keys to a keyserver"
  msgstr "экспортировать ключи на сервер ключей"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:487
  msgid "import keys from a keyserver"
  msgstr "импортировать ключи с сервера ключей"
  
- #: g10/gpg.c:471
++#: g10/gpg.c:490
  msgid "search for keys on a keyserver"
  msgstr "искать ключи на сервере ключей"
  
- #: g10/gpg.c:473
++#: g10/gpg.c:492
  msgid "update all keys from a keyserver"
  msgstr "обновить все ключи с сервера ключей"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:498
  msgid "import/merge keys"
  msgstr "импортировать/объединить ключи"
  
- #: g10/gpg.c:482
++#: g10/gpg.c:501
  msgid "print the card status"
  msgstr "показать состояние карты"
  
- #: g10/gpg.c:483
++#: g10/gpg.c:502
  msgid "change data on a card"
  msgstr "изменить данные на карте"
  
- #: g10/gpg.c:484
++#: g10/gpg.c:504
  msgid "change a card's PIN"
  msgstr "сменить PIN карты"
  
- #: g10/gpg.c:496
++#: g10/gpg.c:516
  msgid "update the trust database"
  msgstr "обновить таблицу доверия"
  
- #: g10/gpg.c:505
++#: g10/gpg.c:525
  msgid "print message digests"
  msgstr "вывести хеши сообщений"
  
- #: g10/gpg.c:508 sm/gpgsm.c:228
++#: g10/gpg.c:528 sm/gpgsm.c:229
  msgid "run in server mode"
  msgstr "запуск в режиме сервера"
  
- #: g10/gpg.c:510
++#: g10/gpg.c:530
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr "|VALUE|установить правила TOFU для ключа"
  
- #: g10/gpg.c:514 sm/gpgsm.c:246
++#: g10/gpg.c:534 sm/gpgsm.c:248
  msgid "create ascii armored output"
  msgstr "вывод в текстовом формате"
  
- #: g10/gpg.c:517 sm/gpgsm.c:262
++#: g10/gpg.c:537 sm/gpgsm.c:264
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|USER-ID|зашифровать для пользователя USER-ID"
  
- #: g10/gpg.c:533 sm/gpgsm.c:298
++#: g10/gpg.c:553 sm/gpgsm.c:300
  msgid "|USER-ID|use USER-ID to sign or decrypt"
  msgstr "|USER-ID|использовать ключ USER-ID для подписи и расшифровки"
  
- #: g10/gpg.c:539
++#: g10/gpg.c:559
  msgid "|N|set compress level to N (0 disables)"
  msgstr "|N|установить уровень сжатия N (0 - без сжатия)"
  
- #: g10/gpg.c:546
++#: g10/gpg.c:566
  msgid "use canonical text mode"
  msgstr "использовать канонический текстовый режим"
  
- #: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
++#: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
  msgid "|FILE|write output to FILE"
  msgstr "|FILE|выводить данные в файл FILE"
  
- #: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
++#: g10/gpg.c:598 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
  msgid "do not make any changes"
  msgstr "не делать никаких изменений"
  
- #: g10/gpg.c:579
++#: g10/gpg.c:599
  msgid "prompt before overwriting"
  msgstr "спросить перед перезаписью"
  
- #: g10/gpg.c:628
++#: g10/gpg.c:648
  msgid "use strict OpenPGP behavior"
  msgstr "строго следовать стандарту OpenPGP"
  
- #: g10/gpg.c:654 sm/gpgsm.c:355
++#: g10/gpg.c:674 sm/gpgsm.c:357
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2461,7 -1895,16 +2467,17 @@@ msgstr "
  "@\n"
  "(Полный список команд и параметров см. на странице man)\n"
  
- #: g10/gpg.c:657 sm/gpgsm.c:358
++#: g10/gpg.c:677
+ #, fuzzy
+ #| msgid ""
+ #| "@\n"
+ #| "Examples:\n"
+ #| "\n"
+ #| " -se -r Bob [file]          sign and encrypt for user Bob\n"
+ #| " --clear-sign [file]         make a clear text signature\n"
+ #| " --detach-sign [file]       make a detached signature\n"
+ #| " --list-keys [names]        show keys\n"
+ #| " --fingerprint [names]      show fingerprints\n"
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2481,11 -1924,9 +2497,11 @@@ msgstr "
  " --list-keys [имена]        показать ключи\n"
  " --fingerprint [имена]      показать отпечатки\n"
  
- #: g10/gpg.c:1026
++#: g10/gpg.c:1047
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
  msgstr "Вызов: @GPG@ [параметры] [файлы] (-h для подсказки)"
  
- #: g10/gpg.c:1029
++#: g10/gpg.c:1050
  msgid ""
  "Syntax: @GPG@ [options] [files]\n"
  "Sign, check, encrypt or decrypt\n"
@@@ -2495,7 -1936,6 +2511,7 @@@ msgstr "
  "Подписи и их проверка, шифрование и расшифровка\n"
  "Действие по умолчанию зависит от входных данных\n"
  
- #: g10/gpg.c:1040 sm/gpgsm.c:588
++#: g10/gpg.c:1061 sm/gpgsm.c:580
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2503,94 -1943,76 +2519,94 @@@ msgstr "
  "\n"
  "Поддерживаются следующие алгоритмы:\n"
  
- #: g10/gpg.c:1043
++#: g10/gpg.c:1064
  msgid "Pubkey: "
  msgstr "С открытым ключом: "
  
- #: g10/gpg.c:1050 g10/keyedit.c:3402
++#: g10/gpg.c:1071 g10/keyedit.c:3483
  msgid "Cipher: "
  msgstr "Симметричные шифры: "
  
- #: g10/gpg.c:1057
++#: g10/gpg.c:1078
  msgid "Hash: "
  msgstr "Хеш-функции: "
  
- #: g10/gpg.c:1064 g10/keyedit.c:3451
++#: g10/gpg.c:1085 g10/keyedit.c:3532
  msgid "Compression: "
  msgstr "Алгоритмы сжатия: "
  
- #: g10/gpg.c:1133 sm/gpgsm.c:662
++#: g10/gpg.c:1154 sm/gpgsm.c:654
  #, c-format
  msgid "usage: %s [options] %s\n"
  msgstr "вызов: %s [параметры] %s\n"
  
- #: g10/gpg.c:1321 sm/gpgsm.c:751
++#: g10/gpg.c:1342 sm/gpgsm.c:743
  msgid "conflicting commands\n"
  msgstr "несовместимые команды\n"
  
- #: g10/gpg.c:1339
++#: g10/gpg.c:1360
  #, c-format
  msgid "no = sign found in group definition '%s'\n"
  msgstr "в определении группы '%s' отсутствует знак =\n"
  
- #: g10/gpg.c:1537
++#: g10/gpg.c:1558
  #, c-format
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr "Внимание: небезопасный владелец домашнего каталога '%s'\n"
  
- #: g10/gpg.c:1540
++#: g10/gpg.c:1561
  #, c-format
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
  msgstr "Внимание: небезопасный владелец файла настроек '%s'\n"
  
- #: g10/gpg.c:1543
++#: g10/gpg.c:1564
  #, c-format
  msgid "WARNING: unsafe ownership on extension '%s'\n"
  msgstr "Внимание: небезопасный владелец файла модуля расширения '%s'\n"
  
- #: g10/gpg.c:1549
++#: g10/gpg.c:1570
  #, c-format
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
  msgstr "Внимание: небезопасные права доступа к домашнему каталогу '%s'\n"
  
- #: g10/gpg.c:1552
++#: g10/gpg.c:1573
  #, c-format
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
  msgstr "Внимание: небезопасные права доступа к файлу настроек '%s'\n"
  
- #: g10/gpg.c:1555
++#: g10/gpg.c:1576
  #, c-format
  msgid "WARNING: unsafe permissions on extension '%s'\n"
  msgstr "Внимание: небезопасные права доступа к файлу модуля расширения '%s'\n"
  
- #: g10/gpg.c:1561
++#: g10/gpg.c:1582
  #, c-format
  msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
  msgstr ""
  "Внимание: небезопасный владелец каталога, содержащего домашний каталог '%s'\n"
  
- #: g10/gpg.c:1564
++#: g10/gpg.c:1585
  #, c-format
  msgid ""
  "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
  msgstr ""
  "Внимание: небезопасный владелец каталога, содержащего файл настроек '%s'\n"
  
- #: g10/gpg.c:1567
++#: g10/gpg.c:1588
  #, c-format
  msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
  msgstr ""
  "Внимание: небезопасный владелец каталога,\n"
  "          содержащего модуль расширения '%s'\n"
  
- #: g10/gpg.c:1573
++#: g10/gpg.c:1594
  #, c-format
  msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
  msgstr ""
  "Внимание: небезопасные права доступа к каталогу,\n"
  "          содержащему домашний каталог '%s'\n"
  
- #: g10/gpg.c:1576
++#: g10/gpg.c:1597
  #, c-format
  msgid ""
  "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2598,499 -2020,342 +2614,439 @@@ msgstr "
  "ВНИМАНИЕ: небезопасные права доступа к каталогу,\n"
  "          содержащему файл настроек '%s'\n"
  
- #: g10/gpg.c:1579
++#: g10/gpg.c:1600
  #, c-format
  msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
  msgstr ""
  "Внимание: небезопасные права доступа к каталогу,\n"
  "          содержащему файл модуля расширения '%s'\n"
  
- #: g10/gpg.c:1786
++#: g10/gpg.c:1816
  #, c-format
  msgid "unknown configuration item '%s'\n"
  msgstr "неизвестный элемент в файле настроек '%s'\n"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1925
  msgid "display photo IDs during key listings"
  msgstr "показать в списке ключей фотоидентификаторы"
  
- #: g10/gpg.c:1895
++#: g10/gpg.c:1927
  msgid "show key usage information during key listings"
  msgstr "показать в списке ключей сведения о назначении ключа"
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1929
  msgid "show policy URLs during signature listings"
  msgstr "показать в списке подписей URL правил"
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1931
  msgid "show all notations during signature listings"
  msgstr "показать в списке подписей все замечания"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1933
  msgid "show IETF standard notations during signature listings"
  msgstr "показать в списке подписей замечания стандарта IETF"
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1937
  msgid "show user-supplied notations during signature listings"
  msgstr "показать в списке подписей пользовательские замечания"
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1939
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "показать в списке подписей URL предпочтительных серверов ключей"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1941
  msgid "show user ID validity during key listings"
  msgstr "показать в списке ключей действительность ID пользователей"
  
- #: g10/gpg.c:1911
++#: g10/gpg.c:1943
  msgid "show revoked and expired user IDs in key listings"
  msgstr "показать в списке ключей отозванные и просроченные ID пользователей"
  
- #: g10/gpg.c:1913
++#: g10/gpg.c:1945
  msgid "show revoked and expired subkeys in key listings"
  msgstr "показать в списке ключей отозванные и просроченные подключи"
  
- #: g10/gpg.c:1915
++#: g10/gpg.c:1947
  msgid "show the keyring name in key listings"
  msgstr "показать в списке ключей название таблицы ключей"
  
- #: g10/gpg.c:1917
++#: g10/gpg.c:1949
  msgid "show expiration dates during signature listings"
  msgstr "показать в списке подписей сроки действия"
  
- #: g10/gpg.c:2019 g10/gpg.c:2056
++#: g10/gpg.c:2051 g10/gpg.c:2088
  #, c-format
  msgid "valid values for option '%s':\n"
  msgstr "недопустимые значения для параметра \"%s\"\n"
  
- #: g10/gpg.c:2030
++#: g10/gpg.c:2062
  #, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "неизвестные правила TOFU '%s'\n"
  
- #: g10/gpg.c:2032 g10/gpg.c:2068
++#: g10/gpg.c:2064 g10/gpg.c:2100
  msgid "(use \"help\" to list choices)\n"
  msgstr "(\"help\" выведет список вариантов)\n"
  
- #: g10/gpg.c:2066
++#: g10/gpg.c:2098 g10/keygen.c:167
  #, c-format
  msgid "invalid value for option '%s'\n"
  msgstr "недопустимое значения для параметра \"%s\"\n"
  
- #: g10/gpg.c:2203
++#: g10/gpg.c:2235
  #, c-format
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "Замечание: старый основной файл параметров '%s' проигнорирован\n"
  
- #: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
++#: g10/gpg.c:2839 g10/gpg.c:3610 g10/gpg.c:3622
  #, c-format
  msgid "Note: %s is not for normal use!\n"
  msgstr "Замечание: %s не предназначен для нормального применения!\n"
  
- #: g10/gpg.c:2978 g10/gpg.c:2990
++#: g10/gpg.c:3011 g10/gpg.c:3023
  #, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "'%s' - не допустимый срок действия подписи\n"
  
- #: g10/gpg.c:3012
++#: g10/gpg.c:3045
  #, c-format
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "\"%s\" не является адресом электронной почты\n"
  
- #: g10/gpg.c:3044 sm/gpgsm.c:1166
++#: g10/gpg.c:3077 sm/gpgsm.c:1158
  #, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "недопустимый режим ввода пароля '%s'\n"
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3130
  #, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "'%s' - не допустимая таблица символов\n"
  
- #: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
++#: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
  msgid "could not parse keyserver URL\n"
  msgstr "не могу интерпретировать URL сервера ключей\n"
  
- #: g10/gpg.c:3137
++#: g10/gpg.c:3170
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: недопустимые параметры сервера ключей\n"
  
- #: g10/gpg.c:3140
++#: g10/gpg.c:3173
  msgid "invalid keyserver options\n"
  msgstr "недопустимые параметры сервера ключей\n"
  
- #: g10/gpg.c:3147
++#: g10/gpg.c:3180
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: недопустимые параметры импорта\n"
  
- #: g10/gpg.c:3150
++#: g10/gpg.c:3183
  msgid "invalid import options\n"
  msgstr "недопустимые параметры импорта\n"
  
- #: g10/gpg.c:3156 g10/gpg.c:3171
++#: g10/gpg.c:3189 g10/gpg.c:3204
  #, c-format
  msgid "invalid filter option: %s\n"
  msgstr "недопустимый параметр фильтра: %s\n"
  
- #: g10/gpg.c:3162
++#: g10/gpg.c:3195
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: недопустимые параметры экспорта\n"
  
- #: g10/gpg.c:3165
++#: g10/gpg.c:3198
  msgid "invalid export options\n"
  msgstr "недопустимые параметры экспорта\n"
  
- #: g10/gpg.c:3177
++#: g10/gpg.c:3210
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: недопустимые параметры списка\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3213
  msgid "invalid list options\n"
  msgstr "недопустимые параметры списка\n"
  
- #: g10/gpg.c:3188
++#: g10/gpg.c:3221
  msgid "display photo IDs during signature verification"
  msgstr "показать при проверке подписи фотоидентификаторы"
  
- #: g10/gpg.c:3190
++#: g10/gpg.c:3223
  msgid "show policy URLs during signature verification"
  msgstr "показать при проверке подписи URL правил"
  
- #: g10/gpg.c:3192
++#: g10/gpg.c:3225
  msgid "show all notations during signature verification"
  msgstr "показать при проверке подписей все замечания"
  
- #: g10/gpg.c:3194
++#: g10/gpg.c:3227
  msgid "show IETF standard notations during signature verification"
  msgstr "показать при проверке подписей замечания стандарта IETF"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3231
  msgid "show user-supplied notations during signature verification"
  msgstr "показать при проверке подписей пользовательские замечания"
  
- #: g10/gpg.c:3200
++#: g10/gpg.c:3233
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "показать при проверке подписей URL предпочтительных серверов ключей"
  
- #: g10/gpg.c:3202
++#: g10/gpg.c:3235
  msgid "show user ID validity during signature verification"
  msgstr "показать при проверке подписей действительность ID пользователей"
  
- #: g10/gpg.c:3204
++#: g10/gpg.c:3237
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  "показать при проверке подписей отозванные и просроченные ID пользователя"
  
- #: g10/gpg.c:3206
++#: g10/gpg.c:3239
  msgid "show only the primary user ID in signature verification"
  msgstr "показать при проверке подписей только первичный ID пользователя"
  
- #: g10/gpg.c:3208
++#: g10/gpg.c:3241
  msgid "validate signatures with PKA data"
  msgstr "проверить подписи по данным PKA"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3243
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr "поднять доверие подписей по действительным данным PKA"
  
- #: g10/gpg.c:3217
++#: g10/gpg.c:3250
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: недопустимые параметры проверки\n"
  
- #: g10/gpg.c:3220
++#: g10/gpg.c:3253
  msgid "invalid verify options\n"
  msgstr "недопустимые параметры проверки\n"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3260
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "не могу определить путь запуска для %s\n"
  
- #: g10/gpg.c:3417
++#: g10/gpg.c:3452
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: недопустимый список auto-key-locate\n"
  
- #: g10/gpg.c:3420
++#: g10/gpg.c:3455
  msgid "invalid auto-key-locate list\n"
  msgstr "недопустимый список auto-key-locate\n"
  
- #: g10/gpg.c:3553 sm/gpgsm.c:1507
++#: g10/gpg.c:3592 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
  msgstr "Внимание: возможно создание файла образа памяти!\n"
  
- #: g10/gpg.c:3564
++#: g10/gpg.c:3603
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "Внимание: %s отменяет %s\n"
  
- #: g10/gpg.c:3573
++#: g10/gpg.c:3612
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s с %s недопустимо!\n"
  
- #: g10/gpg.c:3576
++#: g10/gpg.c:3615
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s с %s не имеет смысла!\n"
  
- #: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
++#: g10/gpg.c:3630 sm/gpgsm.c:1518 dirmngr/dirmngr.c:951
  msgid "WARNING: running with faked system time: "
  msgstr "Внимание: работаем с фальшивым системным временем: "
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3651
  #, c-format
  msgid "will not run with insecure memory due to %s\n"
  msgstr "не будет работать с небезопасной памятью из-за %s\n"
  
- #: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
++#: g10/gpg.c:3686 g10/gpg.c:3710 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "выбран недопустимый алгоритм шифрования\n"
  
- #: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
++#: g10/gpg.c:3692 g10/gpg.c:3716 sm/gpgsm.c:1591 sm/gpgsm.c:1597
  msgid "selected digest algorithm is invalid\n"
  msgstr "выбрана недопустимая хеш-функция\n"
  
- #: g10/gpg.c:3659
++#: g10/gpg.c:3698
  msgid "selected compression algorithm is invalid\n"
  msgstr "выбран недопустимый алгоритм сжатия\n"
  
- #: g10/gpg.c:3665
++#: g10/gpg.c:3704
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "выбрана недопустимая хеш-функция для сертификации\n"
  
- #: g10/gpg.c:3680
++#: g10/gpg.c:3719
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed должен быть больше 0\n"
  
- #: g10/gpg.c:3682
++#: g10/gpg.c:3721
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed должен быть больше 1\n"
  
- #: g10/gpg.c:3684
++#: g10/gpg.c:3723
  msgid "max-cert-depth must be in the range from 1 to 255\n"
  msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
  
- #: g10/gpg.c:3686
++#: g10/gpg.c:3725
  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:3688
++#: g10/gpg.c:3727
  msgid "invalid min-cert-level; must be 1, 2, or 3\n"
  msgstr "недопустимый min-cert-level; должен быть 0, 1, 2 или 3\n"
  
- #: g10/gpg.c:3691
++#: g10/gpg.c:3730
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
  msgstr "Замечание: простой режим S2K (0) строго противопоказан\n"
  
- #: g10/gpg.c:3695
++#: g10/gpg.c:3734
  msgid "invalid S2K mode; must be 0, 1 or 3\n"
  msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
  
- #: g10/gpg.c:3702
++#: g10/gpg.c:3741
  msgid "invalid default preferences\n"
  msgstr "недопустимые предпочтения по умолчанию\n"
  
- #: g10/gpg.c:3706
++#: g10/gpg.c:3745
  msgid "invalid personal cipher preferences\n"
  msgstr "недопустимые личные предпочтения шифра\n"
  
- #: g10/gpg.c:3710
++#: g10/gpg.c:3749
  msgid "invalid personal digest preferences\n"
  msgstr "недопустимые личные предпочтения хеш-функции\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3753
  msgid "invalid personal compress preferences\n"
  msgstr "недопустимые личные предпочтения алгоритмов сжатия\n"
  
- #: g10/gpg.c:3750
++#: g10/gpg.c:3789
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s пока не работает совместно с %s!\n"
  
- #: g10/gpg.c:3797
++#: g10/gpg.c:3836
  #, c-format
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr "шифрование '%s' в режиме %s использовать нельзя\n"
  
- #: g10/gpg.c:3802
++#: g10/gpg.c:3841
  #, c-format
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr "хеш-функцию '%s' в режиме %s использовать нельзя\n"
  
- #: g10/gpg.c:3807
++#: g10/gpg.c:3846
  #, c-format
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr "сжатие '%s' в режиме %s использовать нельзя\n"
  
- #: g10/gpg.c:3906
++#: g10/gpg.c:3945
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "сбой инициализации таблицы доверия: %s\n"
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:3957
  msgid "WARNING: recipients (-r) given without using public key encryption\n"
  msgstr ""
  "ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
  "ключом\n"
  
- #: g10/gpg.c:3975
- msgid "--store [filename]"
- msgstr "--store [файл]"
- 
- #: g10/gpg.c:3985
- msgid "--symmetric [filename]"
- msgstr "--symmetric [файл]"
- 
- #: g10/gpg.c:3989
++#: g10/gpg.c:4028
  #, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "сбой симметричного шифрования '%s': %s\n"
  
- #: g10/gpg.c:4000
- msgid "--encrypt [filename]"
- msgstr "--encrypt [файл]"
- 
- #: g10/gpg.c:4016
- msgid "--symmetric --encrypt [filename]"
- msgstr "--symmetric --encrypt [файл]"
- 
- #: g10/gpg.c:4018
++#: g10/gpg.c:4057
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr "--symmetric --encrypt нельзя использовать совместно с --s2k-mode 0\n"
  
- #: g10/gpg.c:4021
++#: g10/gpg.c:4060
  #, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr "в режиме %s нельзя использовать --symmetric --encrypt\n"
  
- #: g10/gpg.c:4042
- msgid "--sign [filename]"
- msgstr "--sign [файл]"
- 
- #: g10/gpg.c:4058
- msgid "--sign --encrypt [filename]"
- msgstr "--sign --encrypt [файл]"
- 
- #: g10/gpg.c:4076
- msgid "--symmetric --sign --encrypt [filename]"
- msgstr "--symmetric --sign --encrypt [файл]"
- 
- #: g10/gpg.c:4078
++#: g10/gpg.c:4117
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  "нельзя использовать --symmetric --sign --encrypt совместно с --s2k-mode 0\n"
  
- #: g10/gpg.c:4081
++#: g10/gpg.c:4120
  #, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr "в режиме %s нельзя использовать --symmetric --sign --encrypt\n"
  
- #: g10/gpg.c:4105
- msgid "--sign --symmetric [filename]"
- msgstr "--sign --symmetric [файл]"
- 
- #: g10/gpg.c:4117
- msgid "--clearsign [filename]"
- msgstr "--clearsign [файл]"
- 
- #: g10/gpg.c:4147
- msgid "--decrypt [filename]"
- msgstr "--decrypt [файл]"
- 
- #: g10/gpg.c:4174
- msgid "--sign-key user-id"
- msgstr "--sign-key <ID пользователя>"
- 
- #: g10/gpg.c:4178
- msgid "--lsign-key user-id"
- msgstr "--lsign-key <ID пользователя>"
- 
- #: g10/gpg.c:4199
- msgid "--edit-key user-id [commands]"
- msgstr "--edit-key <ID пользователя> [команды]"
- 
- #: g10/gpg.c:4215
- msgid "--passwd <user-id>"
- msgstr "--passwd <ID пользователя>"
- 
- #: g10/gpg.c:4411 g10/keyserver.c:1837
++#: g10/gpg.c:4462 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "сбой при отправке на сервер ключей: %s\n"
  
- #: g10/gpg.c:4416
++#: g10/gpg.c:4467
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "сбой при получении с сервера ключей: %s\n"
  
- #: g10/gpg.c:4422
++#: g10/gpg.c:4473
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "сбой при экспорте ключа: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4486
  #, c-format
  msgid "export as ssh key failed: %s\n"
  msgstr "сбой при экспорте в виде ключа ssh: %s\n"
  
- #: g10/gpg.c:4447
++#: g10/gpg.c:4498
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "сбой при поиске на сервере ключей: %s\n"
  
- #: g10/gpg.c:4460
++#: g10/gpg.c:4511
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "сбой при обновлении с сервера ключей: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4578
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "ошибка преобразования из текстового формата: %s\n"
  
- #: g10/gpg.c:4538
++#: g10/gpg.c:4589
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "ошибка преобразования в текстовый формат: %s\n"
  
- #: g10/gpg.c:4630
++#: g10/gpg.c:4681
  #, c-format
  msgid "invalid hash algorithm '%s'\n"
  msgstr "недопустимая хеш-функция '%s'\n"
  
- #: g10/gpg.c:4776 g10/tofu.c:2002
++#: g10/gpg.c:4827 g10/tofu.c:2151
  #, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "ошибка синтаксического анализа спецификации ключа '%s': %s\n"
  
- #: g10/gpg.c:4788
++#: g10/gpg.c:4839
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr "'%s' не является идентификатором, отпечатком или кодом ключа\n"
  
- #: g10/gpg.c:4835
- msgid "[filename]"
- msgstr "[файл]"
- 
- #: g10/gpg.c:4841
++#: g10/gpg.c:4894
  msgid "Go ahead and type your message ...\n"
  msgstr "Пишите сообщение ...\n"
  
- #: g10/gpg.c:5179
++#: g10/gpg.c:5232
  msgid "the given certification policy URL is invalid\n"
  msgstr "заданный URL правил сертификации неверен\n"
  
- #: g10/gpg.c:5181
++#: g10/gpg.c:5234
  msgid "the given signature policy URL is invalid\n"
  msgstr "заданный URL правил подписи неверен\n"
  
- #: g10/gpg.c:5214
++#: g10/gpg.c:5267
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "заданный URL предпочтительного сервера ключей неверен\n"
  
@@@ -3102,7 -2365,6 +3058,7 @@@ msgstr "|FILE|взять ключи и�
  msgid "make timestamp conflicts only a warning"
  msgstr "при несоответствии метки времени - только предупреждение"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:345
++#: g10/gpgv.c:82 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|выводить информацию в файл с дескриптором FD"
  
@@@ -3131,133 -2388,105 +3087,133 @@@ msgstr "Справки нет
  msgid "No help available for '%s'"
  msgstr "Нет справки для '%s'"
  
- #: g10/import.c:151
++#: g10/import.c:152
  msgid "import signatures that are marked as local-only"
  msgstr "импортировать подписи, обозначенные как 'только локальные'"
  
- #: g10/import.c:154
++#: g10/import.c:155
  msgid "repair damage from the pks keyserver during import"
  msgstr "устранить при импорте повреждения от сервера ключей pks"
  
- #: g10/import.c:157
++#: g10/import.c:158
  msgid "do not clear the ownertrust values during import"
  msgstr "не сбрасывать уровни доверия владельцам после импорта"
  
- #: g10/import.c:160
++#: g10/import.c:161
  msgid "do not update the trustdb after import"
  msgstr "не обновлять таблицу доверия после импорта"
  
- #: g10/import.c:163
++#: g10/import.c:164
  msgid "show key during import"
  msgstr "показывать ключ во время импорта"
  
- #: g10/import.c:166
++#: g10/import.c:167
  msgid "only accept updates to existing keys"
  msgstr "обновлять только существующие ключи"
  
- #: g10/import.c:169
++#: g10/import.c:170
  msgid "remove unusable parts from key after import"
  msgstr "удалить после импорта непригодные части ключа"
  
- #: g10/import.c:172
++#: g10/import.c:173
  msgid "remove as much as possible from key after import"
  msgstr "удалить после импорта из ключа как можно больше"
  
- #: g10/import.c:175
++#: g10/import.c:176
  msgid "run import filters and export key immediately"
  msgstr "применить фильтры импорта и немедленно экспортировать ключ"
  
- #: g10/import.c:326 g10/import.c:568
++#: g10/import.c:327 g10/import.c:569
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "пропущен блок типа %d\n"
  
- #: g10/import.c:585
++#: g10/import.c:586
  #, c-format
  msgid "%lu keys processed so far\n"
  msgstr "обработано %lu ключей\n"
  
- #: g10/import.c:655
++#: g10/import.c:656
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "Всего обработано: %lu\n"
  
- #: g10/import.c:658
++#: g10/import.c:659
  #, c-format
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "        пропущено ключей PGP-2: %lu\n"
  
- #: g10/import.c:660
++#: g10/import.c:661
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "        пропущено новых ключей: %lu\n"
  
- #: g10/import.c:663
++#: g10/import.c:664
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "           без ID пользователя: %lu\n"
  
- #: g10/import.c:666 sm/import.c:130
++#: g10/import.c:667 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "                 импортировано: %lu"
  
- #: g10/import.c:670 sm/import.c:134
++#: g10/import.c:671 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "                  неизмененных: %lu\n"
  
- #: g10/import.c:672
++#: g10/import.c:673
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "         новых ID пользователя: %lu\n"
  
- #: g10/import.c:674
++#: g10/import.c:675
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "               новых подключей: %lu\n"
  
- #: g10/import.c:676
++#: g10/import.c:677
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "                новых подписей: %lu\n"
  
- #: g10/import.c:678
++#: g10/import.c:679
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "          новых отзывов ключей: %lu\n"
  
- #: g10/import.c:680 sm/import.c:136
++#: g10/import.c:681 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "    прочитано секретных ключей: %lu\n"
  
- #: g10/import.c:682 sm/import.c:138
++#: g10/import.c:683 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "импортировано секретных ключей: %lu\n"
  
- #: g10/import.c:684 sm/import.c:140
++#: g10/import.c:685 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr " неизмененных секретных ключей: %lu\n"
  
- #: g10/import.c:686 sm/import.c:142
++#: g10/import.c:687 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "             не импортировано: %lu\n"
  
- #: g10/import.c:688
++#: g10/import.c:689
  #, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "             очищено подписей: %lu\n"
  
- #: g10/import.c:690
++#: g10/import.c:691
  #, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "     очищено ID пользователей: %lu\n"
  
- #: g10/import.c:1034
++#: g10/import.c:1035
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
@@@ -3266,189 -2495,151 +3222,189 @@@ msgstr "
  "Внимание: ключ %s содержит предпочтения для недоступных\n"
  "алгоритмов для следующих ID пользователей:\n"
  
- #: g10/import.c:1076
++#: g10/import.c:1077
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr "         \"%s\": предпочитает шифр %s\n"
  
- #: g10/import.c:1091
++#: g10/import.c:1092
  #, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "         \"%s\": предпочитает хеш-функцию %s\n"
  
- #: g10/import.c:1103
++#: g10/import.c:1104
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr "         \"%s\": предпочитает алгоритм сжатия %s\n"
  
- #: g10/import.c:1116
++#: g10/import.c:1117
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr "крайне желательно, чтобы Вы обновили свои предпочтения и\n"
  
- #: g10/import.c:1118
++#: g10/import.c:1119
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  "распространили этот ключ во избежание возможных нестыковок алгоритмов\n"
  
- #: g10/import.c:1143
++#: g10/import.c:1144
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  "свои предпочтения можно обновить командой gpg --edit-key %s updpref save\n"
  
- #: g10/import.c:1379 g10/import.c:2167
++#: g10/import.c:1380 g10/import.c:2168
  #, c-format
  msgid "key %s: no user ID\n"
  msgstr "ключ %s: нет ID пользователя\n"
  
- #: g10/import.c:1385
++#: g10/import.c:1386
  #, c-format
  msgid "key %s: %s\n"
  msgstr "ключ %s: %s\n"
  
- #: g10/import.c:1386 g10/import.c:2141
++#: g10/import.c:1387 g10/import.c:2142
  msgid "rejected by import screener"
  msgstr "исключен фильтром импорта"
  
- #: g10/import.c:1416
++#: g10/import.c:1417
  #, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "ключ %s: повреждение подключа PKS исправлено\n"
  
- #: g10/import.c:1434
++#: g10/import.c:1435
  #, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "ключ %s: принят без самозаверенного ID пользователя \"%s\"\n"
  
- #: g10/import.c:1444 g10/import.c:1475
++#: g10/import.c:1445 g10/import.c:1476
  #, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "ключ %s: нет действительных ID пользователя\n"
  
- #: g10/import.c:1446
++#: g10/import.c:1447
  msgid "this may be caused by a missing self-signature\n"
  msgstr "может быть, из-за отсутствия самоподписи\n"
  
- #: g10/import.c:1516 g10/import.c:2318
++#: g10/import.c:1517 g10/import.c:2319
  #, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "ключ %s: не найден открытый ключ: %s\n"
  
- #: g10/import.c:1522
++#: g10/import.c:1523
  #, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "ключ %s: новый ключ - пропущен\n"
  
- #: g10/import.c:1537
++#: g10/import.c:1538
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "нет доступной для записи таблицы ключей: %s\n"
  
- #: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
++#: g10/import.c:1547 g10/import.c:1648 g10/import.c:2385
  #, c-format
  msgid "error writing keyring '%s': %s\n"
  msgstr "ошибка записи таблицы ключей '%s': %s\n"
  
- #: g10/import.c:1566
++#: g10/import.c:1567
  #, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "ключ %s: импортирован открытый ключ \"%s\"\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1591
  #, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "ключ %s: не совпадает с нашей копией\n"
  
- #: g10/import.c:1606 g10/import.c:2342
++#: g10/import.c:1607 g10/import.c:2343
  #, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "ключ %s: оригинальный блок ключей не найден: %s\n"
  
- #: g10/import.c:1614 g10/import.c:2349
++#: g10/import.c:1615 g10/import.c:2350
  #, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "ключ %s: оригинальный блок ключей не читается: %s\n"
  
- #: g10/import.c:1657
++#: g10/import.c:1658
  #, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "ключ %s: \"%s\" 1 новый ID пользователя\n"
  
- #: g10/import.c:1660
++#: g10/import.c:1661
  #, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "ключ %s: \"%s\" %d новых ID пользователя\n"
  
- #: g10/import.c:1663
++#: g10/import.c:1664
  #, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "ключ %s: \"%s\" 1 новая подпись\n"
  
- #: g10/import.c:1666
++#: g10/import.c:1667
  #, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "ключ %s: \"%s\" %d новых подписей\n"
  
- #: g10/import.c:1669
++#: g10/import.c:1670
  #, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "ключ %s: \"%s\" 1 новый подключ\n"
  
- #: g10/import.c:1672
++#: g10/import.c:1673
  #, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "ключ %s: \"%s\" %d новых подключей\n"
  
- #: g10/import.c:1675
++#: g10/import.c:1676
  #, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "ключ %s: \"%s\" %d подпись очищена\n"
  
- #: g10/import.c:1678
++#: g10/import.c:1679
  #, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "ключ %s: \"%s\" %d подписей очищено\n"
  
- #: g10/import.c:1681
++#: g10/import.c:1682
  #, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "ключ %s: \"%s\" %d ID пользователя очищен\n"
  
- #: g10/import.c:1684
++#: g10/import.c:1685
  #, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "ключ %s: \"%s\" %d ID пользователя очищено\n"
  
- #: g10/import.c:1707
++#: g10/import.c:1708
  #, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "ключ %s: \"%s\" не изменен\n"
  
- #: g10/import.c:2019 g10/import.c:2264
++#: g10/import.c:2020 g10/import.c:2265
  #, c-format
  msgid "key %s: secret key imported\n"
  msgstr "ключ %s: импортирован секретный ключ\n"
  
- #: g10/import.c:2027
++#: g10/import.c:2028
  #, c-format
  msgid "key %s: secret key already exists\n"
  msgstr "ключ %s: секретный ключ уже имеется\n"
  
- #: g10/import.c:2035
++#: g10/import.c:2036
  #, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "ключ %s: ошибка отправки в агент: %s\n"
  
- #: g10/import.c:2140
++#: g10/import.c:2141
  #, c-format
  msgid "secret key %s: %s\n"
  msgstr "секретный ключ %s: %s\n"
  
- #: g10/import.c:2160 g10/import.c:2195
++#: g10/import.c:2161 g10/import.c:2196
  msgid "importing secret keys not allowed\n"
  msgstr "импорт секретного ключа не допускается\n"
  
- #: g10/import.c:2184
++#: g10/import.c:2185
  #, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr "ключ %s: секретный ключ с недопустимым шифром %d - пропущен\n"
@@@ -3463,139 -2654,112 +3419,139 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2256
++#: g10/import.c:2257
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr "Для переноса '%s' выполните на каждой криптографической карте: %s\n"
  
- #: g10/import.c:2311
++#: g10/import.c:2312
  #, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr "ключ %s: нет открытого ключа - не могу применить сертификат отзыва\n"
  
- #: g10/import.c:2360
++#: g10/import.c:2361
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "ключ %s: недействительный сертификат отзыва: %s - отвергнут\n"
  
- #: g10/import.c:2393
++#: g10/import.c:2394
  #, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "ключ %s: сертификат отзыва \"%s\" импортирован\n"
  
- #: g10/import.c:2469
++#: g10/import.c:2470
  #, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "ключ %s: нет ID пользователя для подписи\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2487
  #, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr ""
  "ключ %s: алгоритм с открытым ключом у ID пользователя \"%s\" не "
  "поддерживается\n"
  
- #: g10/import.c:2488
++#: g10/import.c:2489
  #, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "ключ %s: неправильная самоподпись на ID пользователя \"%s\"\n"
  
- #: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
++#: g10/import.c:2506 g10/import.c:2532 g10/import.c:2583
  #, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "ключ %s: алгоритм с открытым ключом не поддерживается\n"
  
- #: g10/import.c:2506
++#: g10/import.c:2507
  #, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "ключ %s: недействительная прямая подпись ключа\n"
  
- #: g10/import.c:2520
++#: g10/import.c:2521
  #, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "ключ %s: нет подключа для связывания ключей\n"
  
- #: g10/import.c:2533
++#: g10/import.c:2534
  #, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "ключ %s: недопустимая связь подключей\n"
  
- #: g10/import.c:2549
++#: g10/import.c:2550
  #, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "ключ %s: удалено многократное связывание подключей\n"
  
- #: g10/import.c:2571
++#: g10/import.c:2572
  #, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "ключ %s: нет подключа для отзыва ключа\n"
  
- #: g10/import.c:2584
++#: g10/import.c:2585
  #, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "ключ %s: неверный отзыв подключа\n"
  
- #: g10/import.c:2599
++#: g10/import.c:2600
  #, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "ключ %s: удален многократный отзыв подключей\n"
  
- #: g10/import.c:2641
++#: g10/import.c:2642
  #, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "ключ %s: пропущен ID пользователя \"%s\"\n"
  
- #: g10/import.c:2665
++#: g10/import.c:2666
  #, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "ключ %s: пропущен подключ\n"
  
- #: g10/import.c:2694
++#: g10/import.c:2695
  #, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "ключ %s: неэкспортируемая подпись (класс 0x%02X) - пропущена\n"
  
- #: g10/import.c:2705
++#: g10/import.c:2706
  #, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "ключ %s: сертификат отзыва в неправильном месте - пропущен\n"
  
- #: g10/import.c:2723
++#: g10/import.c:2724
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "ключ %s: недействительный сертификат отзыва: %s - пропущен\n"
  
- #: g10/import.c:2737
++#: g10/import.c:2738
  #, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "ключ %s: подпись подключа в неправильном месте - пропущена\n"
  
- #: g10/import.c:2745
++#: g10/import.c:2746
  #, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "ключ %s: неожиданный класс подписи (0x%02X) - пропущена\n"
  
- #: g10/import.c:2887
++#: g10/import.c:2888
  #, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "ключ %s: обнаружено дублирование ID пользователя - объединены\n"
  
- #: g10/import.c:2951
++#: g10/import.c:2952
  #, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr "Внимание: ключ %s, возможно, отозван: запрашиваю ключ отзыва %s\n"
  
- #: g10/import.c:2967
++#: g10/import.c:2968
  #, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr "Внимание: ключ %s, возможно, отозван: ключ отзыва %s отсутствует.\n"
  
- #: g10/import.c:3031
++#: g10/import.c:3032
  #, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "ключ %s: добавлен сертификат отзыва \"%s\"\n"
  
- #: g10/import.c:3069
++#: g10/import.c:3070
  #, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "ключ %s: добавлена прямая подпись ключа\n"
@@@ -3630,48 -2788,38 +3586,48 @@@ msgstr "источник блока к�
  msgid "error opening key DB: %s\n"
  msgstr "ошибка открытия базы данных ключей: %s\n"
  
- #: g10/keydb.c:1782
++#: g10/keydb.c:1786
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "сбой пересоставления буфера таблицы ключей: %s\n"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[revocation]"
  msgstr "[отзыв]"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[self-signature]"
  msgstr "[самоподпись]"
  
- #: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
++#: g10/keyedit.c:433 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: dirmngr/ldap-wrapper.c:694
  #, c-format
  msgid "error allocating memory: %s\n"
  msgstr "ошибка выделения памяти: %s\n"
  
- #: g10/keyedit.c:629
++#: g10/keyedit.c:630
  #, c-format
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr ""
  "не удалось проверить подпись: алгоритм с открытым ключом %d не "
  "поддерживается: %s.\n"
  
- #: g10/keyedit.c:638
++#: g10/keyedit.c:639
  #, c-format
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "не удалось проверить подпись: хеш-функция %d не поддерживается: %s.\n"
  
- #: g10/keyedit.c:800
++#: g10/keyedit.c:801
  msgid " (reordered signatures follow)"
  msgstr "(порядок подписей изменен)"
  
- #: g10/keyedit.c:913
++#: g10/keyedit.c:914
  #, c-format
  msgid "key %s:\n"
  msgstr "ключ %s:\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:917
  #, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
@@@ -3679,7 -2827,6 +3635,7 @@@ msgstr[0] "%d повторная под
  msgstr[1] "%d повторные подписи удалены\n"
  msgstr[2] "%d повторных подписей удалено\n"
  
- #: g10/keyedit.c:919 g10/keylist.c:480
++#: g10/keyedit.c:920 g10/keylist.c:480
  #, c-format
  msgid "%d signature not checked due to a missing key\n"
  msgid_plural "%d signatures not checked due to missing keys\n"
@@@ -3687,7 -2834,6 +3643,7 @@@ msgstr[0] "%d подпись не пр�
  msgstr[1] "%d подписи не проверены за отсутствием ключа\n"
  msgstr[2] "%d подписей не проверено за отсутствием ключа\n"
  
- #: g10/keyedit.c:923 g10/keylist.c:476
++#: g10/keyedit.c:924 g10/keylist.c:476
  #, c-format
  msgid "%d bad signature\n"
  msgid_plural "%d bad signatures\n"
@@@ -3695,7 -2841,6 +3651,7 @@@ msgstr[0] "%d плохая подпис
  msgstr[1] "%d плохих подписи\n"
  msgstr[2] "%d плохих подписей\n"
  
- #: g10/keyedit.c:927
++#: g10/keyedit.c:928
  #, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
@@@ -3703,7 -2848,6 +3659,7 @@@ msgstr[0] "Порядок %d подпи
  msgstr[1] "Порядок %d подписей изменен\n"
  msgstr[2] "Порядок %d подписей изменен\n"
  
- #: g10/keyedit.c:932
++#: g10/keyedit.c:933
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
@@@ -3712,7 -2856,6 +3668,7 @@@ msgstr "
  "Внимание: обнаружены ошибки, проверялись только самоподписи; для проверки "
  "всех подписей выполните '%s'.\n"
  
- #: g10/keyedit.c:992 g10/pkclist.c:274
++#: g10/keyedit.c:993 g10/pkclist.c:274
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
  "keys\n"
@@@ -3723,17 -2866,14 +3679,17 @@@ msgstr "
  "достоверности ключей других пользователей (проверяет паспорт,\n"
  "сверяет отпечатки ключей из разных источников и т.п.)\n"
  
- #: g10/keyedit.c:996 g10/pkclist.c:286
++#: g10/keyedit.c:997 g10/pkclist.c:286
  #, c-format
  msgid "  %d = I trust marginally\n"
  msgstr " %d = Доверяю ограниченно\n"
  
- #: g10/keyedit.c:997 g10/pkclist.c:288
++#: g10/keyedit.c:998 g10/pkclist.c:288
  #, c-format
  msgid "  %d = I trust fully\n"
  msgstr " %d = Полностью доверяю\n"
  
- #: g10/keyedit.c:1015
++#: g10/keyedit.c:1016
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
@@@ -3743,52 -2883,40 +3699,52 @@@ msgstr "
  "позволяет ключу, который Вы подписываете, делать подписи доверия\n"
  "от Вашего имени.\n"
  
- #: g10/keyedit.c:1032
++#: g10/keyedit.c:1033
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  "Введите домен, ограничивающий использование данной подписи, или пустую "
  "строку, если нет ограничений.\n"
  
- #: g10/keyedit.c:1160
++#: g10/keyedit.c:1161
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr "ID пользователя \"%s\" пропущен: это не текстовый ID.\n"
  
- #: g10/keyedit.c:1168
++#: g10/keyedit.c:1169
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "ID пользователя \"%s\" отозван."
  
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
- #: g10/keyedit.c:2246
++#: g10/keyedit.c:1178 g10/keyedit.c:1206 g10/keyedit.c:1233 g10/keyedit.c:1417
++#: g10/keyedit.c:2247
  msgid "Are you sure you still want to sign it? (y/N) "
  msgstr "Вы все равно хотите его подписать? (y/N) "
  
- #: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
- #: g10/keyedit.c:2251 g10/keyedit.c:3177
++#: g10/keyedit.c:1192 g10/keyedit.c:1220 g10/keyedit.c:1247 g10/keyedit.c:1423
++#: g10/keyedit.c:2252 g10/keyedit.c:3178
  msgid "  Unable to sign.\n"
  msgstr "  Не могу подписать.\n"
  
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1197
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "Срок действия ID пользователя \"%s\" истек."
  
- #: g10/keyedit.c:1224
++#: g10/keyedit.c:1225
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "ID пользователя \"%s\" не самозаверен."
  
- #: g10/keyedit.c:1253
++#: g10/keyedit.c:1254
  #, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "ID пользователя \"%s\" можно подписать."
  
- #: g10/keyedit.c:1255
++#: g10/keyedit.c:1256
  msgid "Sign it? (y/N) "
  msgstr "Подписать его? (y/N) "
  
- #: g10/keyedit.c:1282
++#: g10/keyedit.c:1283
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -3797,11 -2925,9 +3753,11 @@@ msgstr "
  "Самоподпись у \"%s\" -\n"
  "это подпись типа PGP 2.x.\n"
  
- #: g10/keyedit.c:1291
++#: g10/keyedit.c:1292
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr "Вы хотите преобразовать ее в самоподпись OpenPGP? (y/N) "
  
- #: g10/keyedit.c:1304
++#: g10/keyedit.c:1305
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3810,11 -2936,9 +3766,11 @@@ msgstr "
  "Ваша текущая подпись на \"%s\"\n"
  "просрочена.\n"
  
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:1310
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr "Вы хотите сделать новую подпись для замены просроченной? (y/N) "
  
- #: g10/keyedit.c:1330
++#: g10/keyedit.c:1331
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3823,44 -2947,35 +3779,44 @@@ msgstr "
  "Ваша текущая подпись на \"%s\"\n"
  "является локальной.\n"
  
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:1336
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr "Вы хотите преобразовать ее в полную экспортируемую подпись? (y/N) "
  
- #: g10/keyedit.c:1355
++#: g10/keyedit.c:1356
  #, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "\"%s\" уже локально подписан ключом %s\n"
  
- #: g10/keyedit.c:1359
++#: g10/keyedit.c:1360
  #, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "\"%s\" уже подписан ключом %s\n"
  
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:1365
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "Вы все равно хотите снова подписать его? (y/N) "
  
- #: g10/keyedit.c:1386
++#: g10/keyedit.c:1387
  #, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "Нечего подписывать ключом %s\n"
  
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1411
  msgid "This key has expired!"
  msgstr "Данный ключ просрочен!"
  
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1429
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "Срок действия данного ключа истекает %s.\n"
  
- #: g10/keyedit.c:1434
++#: g10/keyedit.c:1435
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr ""
  "Вы хотите, чтобы Ваша подпись была действительна до того же времени? (Y/n) "
  
- #: g10/keyedit.c:1475
++#: g10/keyedit.c:1476
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -3869,31 -2984,25 +3825,31 @@@ msgstr "
  "Насколько хорошо Вы проверили, что ключ действительно принадлежит\n"
  "указанному выше человеку? Если не знаете, что ответить, введите \"0\".\n"
  
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1481
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) Не буду отвечать.%s\n"
  
- #: g10/keyedit.c:1482
++#: g10/keyedit.c:1483
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) Никакой проверки не было.%s\n"
  
- #: g10/keyedit.c:1484
++#: g10/keyedit.c:1485
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) Была частичная проверка.%s\n"
  
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:1488
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) Проверка была очень тщательной.%s\n"
  
- #: g10/keyedit.c:1494
++#: g10/keyedit.c:1495
  msgid "Your selection? (enter '?' for more information): "
  msgstr "Ваш выбор? (введите '?' для получения информации): "
  
- #: g10/keyedit.c:1521
++#: g10/keyedit.c:1522
  #, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -3902,222 -3011,168 +3858,222 @@@ msgstr "
  "Вы уверены, что хотите подписать этот ключ\n"
  "своим ключом \"%s\" (%s)?\n"
  
- #: g10/keyedit.c:1529
++#: g10/keyedit.c:1530
  msgid "This will be a self-signature.\n"
  msgstr "Это будет самоподпись.\n"
  
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:1535
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr "Внимание: подпись не будет помечена как неэкспортируемая.\n"
  
- #: g10/keyedit.c:1541
++#: g10/keyedit.c:1542
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr "Внимание: подпись не будет помечена как неотзываемая.\n"
  
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1552
  msgid "The signature will be marked as non-exportable.\n"
  msgstr "Подпись будет помечена как неэкспортируемая.\n"
  
- #: g10/keyedit.c:1558
++#: g10/keyedit.c:1559
  msgid "The signature will be marked as non-revocable.\n"
  msgstr "Подпись будет помечена как неотзываемая.\n"
  
- #: g10/keyedit.c:1565
++#: g10/keyedit.c:1566
  msgid "I have not checked this key at all.\n"
  msgstr "Этот ключ мной никак не проверялся.\n"
  
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:1571
  msgid "I have checked this key casually.\n"
  msgstr "Мной проведена поверхностная проверка этого ключа.\n"
  
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:1576
  msgid "I have checked this key very carefully.\n"
  msgstr "Этот ключ проверен мной очень тщательно.\n"
  
- #: g10/keyedit.c:1587
++#: g10/keyedit.c:1588
  msgid "Really sign? (y/N) "
  msgstr "Действительно подписать? (y/N) "
  
- #: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
- #: g10/keyedit.c:6463 g10/sign.c:323
++#: g10/keyedit.c:1639 g10/keyedit.c:6308 g10/keyedit.c:6391 g10/keyedit.c:6500
++#: g10/keyedit.c:6562 g10/sign.c:325
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "подписать не удалось: %s\n"
  
- #: g10/keyedit.c:1725
++#: g10/keyedit.c:1726
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  "В ключе только заготовка или элементы для карты -\n"
  "фразы-пароля для изменения нет.\n"
  
- #: g10/keyedit.c:1755
++#: g10/keyedit.c:1756
  #, c-format
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "ключ %s: ошибка изменения фразы-пароля: %s\n"
  
- #: g10/keyedit.c:1869
++#: g10/keyedit.c:1870
  msgid "save and quit"
  msgstr "сохранить и выйти"
  
- #: g10/keyedit.c:1872
++#: g10/keyedit.c:1873
  msgid "show key fingerprint"
  msgstr "показать отпечаток ключа"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1874
  msgid "show the keygrip"
  msgstr "показать код ключа"
  
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1875
  msgid "list key and user IDs"
  msgstr "вывести список ключей и ID пользователя"
  
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1877
  msgid "select user ID N"
  msgstr "выбрать ID пользователя N"
  
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1878
  msgid "select subkey N"
  msgstr "выбрать подключ N"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1879
  msgid "check signatures"
  msgstr "проверка подписей"
  
- #: g10/keyedit.c:1884
++#: g10/keyedit.c:1885
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr "подписать выбранные ID пользователя [* описание команд см. ниже]"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1890
  msgid "sign selected user IDs locally"
  msgstr "локально подписать выбранные ID пользователя"
  
- #: g10/keyedit.c:1890
++#: g10/keyedit.c:1891
  msgid "sign selected user IDs with a trust signature"
  msgstr "подписать выбранные ID пользователя подписью доверия"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1893
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr "подписать выбранные ID пользователя без возможности отзыва"
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1895
  msgid "add a user ID"
  msgstr "добавить ID пользователя"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1897
  msgid "add a photo ID"
  msgstr "добавить фотоидентификатор"
  
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1898
  msgid "delete selected user IDs"
  msgstr "удалить выбранные ID пользователя"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1901
  msgid "add a subkey"
  msgstr "добавить подключ"
  
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1904
  msgid "add a key to a smartcard"
  msgstr "добавить ключ на криптографическую карту"
  
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1906
  msgid "move a key to a smartcard"
  msgstr "переместить ключ на криптографическую карту"
  
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1908
  msgid "move a backup key to a smartcard"
  msgstr "переместить архивный ключ на криптографическую карту"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1910
  msgid "delete selected subkeys"
  msgstr "удалить выбранные подключи"
  
- #: g10/keyedit.c:1911
++#: g10/keyedit.c:1912
  msgid "add a revocation key"
  msgstr "добавить ключ отзыва"
  
- #: g10/keyedit.c:1913
++#: g10/keyedit.c:1914
  msgid "delete signatures from the selected user IDs"
  msgstr "удалить подписи с выбранных ID пользователя"
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1916
  msgid "change the expiration date for the key or selected subkeys"
  msgstr "сменить срок действия ключа или выбранных подключей"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1918
  msgid "flag the selected user ID as primary"
  msgstr "пометить выбранный ID пользователя как первичный"
  
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1921
  msgid "list preferences (expert)"
  msgstr "список предпочтений (экспертам)"
  
- #: g10/keyedit.c:1921
++#: g10/keyedit.c:1922
  msgid "list preferences (verbose)"
  msgstr "список предпочтений (подробный)"
  
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:1924
  msgid "set preference list for the selected user IDs"
  msgstr "установить список предпочтений для выбранных ID пользователя"
  
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1927
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr ""
  "установить URL предпочтительного сервера ключей для выбранных ID пользователя"
  
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1929
  msgid "set a notation for the selected user IDs"
  msgstr "установить замечание для выбранных ID пользователя"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1931
  msgid "change the passphrase"
  msgstr "сменить фразу-пароль"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1934
  msgid "change the ownertrust"
  msgstr "изменить уровень доверия владельцу"
  
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1937
  msgid "revoke signatures on the selected user IDs"
  msgstr "отозвать подписи у выбранных ID пользователя"
  
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1939
  msgid "revoke selected user IDs"
  msgstr "отозвать выбранные ID пользователя"
  
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1942
  msgid "revoke key or selected subkeys"
  msgstr "отозвать ключ или выбранные подключи"
  
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1944
  msgid "enable key"
  msgstr "подключить ключ"
  
- #: g10/keyedit.c:1944
++#: g10/keyedit.c:1945
  msgid "disable key"
  msgstr "отключить ключ"
  
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1947
  msgid "show selected photo IDs"
  msgstr "показать выбранные фотоидентификаторы"
  
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1949
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  "сжать непригодные ID пользователей и удалить непригодные подписи из ключа"
  
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:1951
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr "сжать непригодные ID пользователей и удалить все подписи из ключа"
  
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2063
  msgid "Secret key is available.\n"
  msgstr "Секретный ключ доступен.\n"
  
- #: g10/keyedit.c:2162
++#: g10/keyedit.c:2163
  msgid "Need the secret key to do this.\n"
  msgstr "Для данного действия нужен секретный ключ.\n"
  
- #: g10/keyedit.c:2183
++#: g10/keyedit.c:2184
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4128,229 -3183,181 +4084,235 @@@ msgstr "
  "  't' (подписи доверия, tsign), 'nr' (неотзываемые, \n"
  "  nrsign) или любое их сочетание (ltsign, tnrsign и т.д.).\n"
  
- #: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
++#: g10/keyedit.c:2240 g10/keyedit.c:3178 g10/keyedit.c:3317 g10/keyedit.c:3379
  msgid "Key is revoked."
  msgstr "Ключ отозван."
  
- #: g10/keyedit.c:2262
++#: g10/keyedit.c:2263
  msgid "Really sign all user IDs? (y/N) "
  msgstr "Действительно подписать все ID пользователя? (y/N) "
  
- #: g10/keyedit.c:2266
++#: g10/keyedit.c:2267
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "Действительно подписать все текстовые ID пользователя? (y/N) "
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2275
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Подсказка: Выберите ID пользователей, которые нужно подписать\n"
  
- #: g10/keyedit.c:2285
++#: g10/keyedit.c:2286
  #, c-format
  msgid "Unknown signature type '%s'\n"
  msgstr "Неизвестный тип подписи '%s'\n"
  
- #: g10/keyedit.c:2309
++#: g10/keyedit.c:2310
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
  msgstr "Данная команда в режиме %s недопустима.\n"
  
- #: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
++#: g10/keyedit.c:2332 g10/keyedit.c:2356 g10/keyedit.c:2550
  msgid "You must select at least one user ID.\n"
  msgstr "Вы должны выбрать хотя бы один ID пользователя.\n"
  
- #: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
++#: g10/keyedit.c:2334 g10/keyedit.c:2358 g10/keyedit.c:2512 g10/keyedit.c:2552
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr "(Команда '%s'.)\n"
  
- #: g10/keyedit.c:2336
++#: g10/keyedit.c:2337
  msgid "You can't delete the last user ID!\n"
  msgstr "Вы не можете удалить последний ID пользователя!\n"
  
- #: g10/keyedit.c:2339
++#: g10/keyedit.c:2340
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "Действительно удалить все выбранные ID пользователей? (y/N) "
  
- #: g10/keyedit.c:2340
++#: g10/keyedit.c:2341
  msgid "Really remove this user ID? (y/N) "
  msgstr "Действительно удалить этот ID пользователя? (y/N) "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2397
++#: g10/keyedit.c:2398
  msgid "Really move the primary key? (y/N) "
  msgstr "Действительно переместить первичный ключ? (y/N) "
  
- #: g10/keyedit.c:2409 g10/keyedit.c:4866
++#: g10/keyedit.c:2410 g10/keyedit.c:4964
  msgid "You must select exactly one key.\n"
  msgstr "Вы должны выбрать хотя бы один ключ.\n"
  
- #: g10/keyedit.c:2436
++#: g10/keyedit.c:2437
  msgid "Command expects a filename argument\n"
  msgstr "Команде нужен аргумент-имя файла\n"
  
- #: g10/keyedit.c:2457
++#: g10/keyedit.c:2458
  #, c-format
  msgid "Can't open '%s': %s\n"
  msgstr "Не могу открыть '%s': %s\n"
  
- #: g10/keyedit.c:2474
++#: g10/keyedit.c:2475
  #, c-format
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "Ошибка чтения архивного ключа из '%s': %s\n"
  
- #: g10/keyedit.c:2509
++#: g10/keyedit.c:2510
  msgid "You must select at least one key.\n"
  msgstr "Вы должны выбрать хотя бы один ключ.\n"
  
- #: g10/keyedit.c:2515
++#: g10/keyedit.c:2516
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "Вы действительно хотите удалить выбранные ключи? (y/N) "
  
- #: g10/keyedit.c:2517
++#: g10/keyedit.c:2518
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "Вы действительно хотите удалить данный ключ? (y/N) "
  
- #: g10/keyedit.c:2555
++#: g10/keyedit.c:2556
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr "Действительно отозвать все выбранные ID пользователей? (y/N) "
  
- #: g10/keyedit.c:2556
++#: g10/keyedit.c:2557
  msgid "Really revoke this user ID? (y/N) "
  msgstr "Действительно отозвать данный ID пользователя? (y/N) "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2575
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "Вы действительно хотите отозвать ключ целиком? (y/N) "
  
- #: g10/keyedit.c:2585
++#: g10/keyedit.c:2586
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "Вы действительно хотите отозвать выбранные подключи? (y/N) "
  
- #: g10/keyedit.c:2587
++#: g10/keyedit.c:2588
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "Вы действительно хотите отозвать данный подключ? (y/N) "
  
- #: g10/keyedit.c:2645
++#: g10/keyedit.c:2646
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  "Нельзя присваивать степень доверия, когда таблица доверия указана "
  "пользователем\n"
  
- #: g10/keyedit.c:2690
++#: g10/keyedit.c:2691
  msgid "Set preference list to:\n"
  msgstr "Установить предпочтения в:\n"
  
- #: g10/keyedit.c:2697
++#: g10/keyedit.c:2698
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr ""
  "Действительно обновить предпочтения для выбранных ID пользователей? (y/N) "
  
- #: g10/keyedit.c:2699
++#: g10/keyedit.c:2700
  msgid "Really update the preferences? (y/N) "
  msgstr "Действительно обновить предпочтения? (y/N) "
  
- #: g10/keyedit.c:2773
++#: g10/keyedit.c:2774
  msgid "Save changes? (y/N) "
  msgstr "Сохранить изменения? (y/N) "
  
- #: g10/keyedit.c:2777
++#: g10/keyedit.c:2778
  msgid "Quit without saving? (y/N) "
  msgstr "Выйти без сохранения? (y/N) "
  
- #: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
- #: g10/keyedit.c:3267 g10/keyedit.c:3332
++#: g10/keyedit.c:2789 g10/keyedit.c:2799 g10/keyedit.c:2943 g10/keyedit.c:3046
++#: g10/keyedit.c:3268 g10/keyedit.c:3333 g10/keyedit.c:3409
  #, c-format
  msgid "update failed: %s\n"
  msgstr "сбой при обновлении: %s\n"
  
- #: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
++#: g10/keyedit.c:2805 g10/keyedit.c:3273 g10/keyedit.c:3338 g10/keyedit.c:3416
  msgid "Key not changed so no update needed.\n"
  msgstr "Ключ не изменялся - обновление не нужно.\n"
  
- #: g10/keyedit.c:3038
++#: g10/keyedit.c:3039
  #, c-format
  msgid "User ID revocation failed: %s\n"
  msgstr "Сбой при отзыве идентификатора: %s\n"
  
- #: g10/keyedit.c:3083
++#: g10/keyedit.c:3084
  #, c-format
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "\"%s\" - не отпечаток\n"
  
- #: g10/keyedit.c:3112
++#: g10/keyedit.c:3113
  #, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "\"%s\" - не первичный отпечаток\n"
  
- #: g10/keyedit.c:3248 g10/keyedit.c:3251
++#: g10/keyedit.c:3249 g10/keyedit.c:3252
  #, c-format
  msgid "Invalid user ID '%s': %s\n"
  msgstr "Недопустимый ID пользователя '%s': %s\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  msgid "No matching user IDs."
  msgstr "Нет подходящих ID пользователей."
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  msgid "Nothing to sign.\n"
  msgstr "Подписывать нечего.\n"
  
- #: g10/keyedit.c:3427
++#: g10/keyedit.c:3388
+ #, 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:3508
  msgid "Digest: "
  msgstr "Хеш: "
  
- #: g10/keyedit.c:3484
++#: g10/keyedit.c:3565
  msgid "Features: "
  msgstr "Характеристики: "
  
- #: g10/keyedit.c:3495
++#: g10/keyedit.c:3576
  msgid "Keyserver no-modify"
  msgstr "Не изменять на сервере"
  
- #: g10/keyedit.c:3510 g10/keylist.c:377
++#: g10/keyedit.c:3591 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr "Предпочтительный сервер ключей: "
  
- #: g10/keyedit.c:3518 g10/keyedit.c:3519
++#: g10/keyedit.c:3599 g10/keyedit.c:3600
  msgid "Notations: "
  msgstr "Замечания: "
  
- #: g10/keyedit.c:3764
++#: g10/keyedit.c:3845
  msgid "There are no preferences on a PGP 2.x-style user ID.\n"
  msgstr "В ID пользователя типа PGP 2.x не может быть предпочтений.\n"
  
- #: g10/keyedit.c:3836
++#: g10/keyedit.c:3917
  #, c-format
  msgid "The following key was revoked on %s by %s key %s\n"
  msgstr "Следующий ключ был отозван %s пользователем %s ключом %s\n"
  
- #: g10/keyedit.c:3860
++#: g10/keyedit.c:3941
  #, c-format
  msgid "This key may be revoked by %s key %s"
  msgstr "Данный ключ может быть отозван пользователем %s ключом %s"
  
- #: g10/keyedit.c:3866
++#: g10/keyedit.c:3947
  msgid "(sensitive)"
  msgstr "(особо важный)"
  
- #: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3989 g10/keyedit.c:4131 g10/keylist.c:262 g10/keyserver.c:538
  #, c-format
  msgid "created: %s"
  msgstr "     создан: %s"
  
- #: g10/keyedit.c:3911 g10/keylist.c:1852
++#: g10/keyedit.c:3992 g10/keylist.c:1852
  #, c-format
  msgid "revoked: %s"
  msgstr "    отозван: %s"
  
- #: g10/keyedit.c:3913 g10/keylist.c:1858
++#: g10/keyedit.c:3994 g10/keylist.c:1858
  #, c-format
  msgid "expired: %s"
  msgstr "просрочен с: %s"
  
- #: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyedit.c:3996 g10/keyedit.c:4133 g10/keylist.c:264 g10/keylist.c:1864
 +#: g10/keyserver.c:544
  #, c-format
  msgid "expires: %s"
  msgstr "   годен до: %s"
@@@ -4358,30 -3365,24 +4320,30 @@@
  # perhaps this should be somewhere in help/man
  # (S - подпись, C - сертификация, E - шифрование, A - аутентификация)
  # too long for repeating messages.
- #: g10/keyedit.c:3917
++#: g10/keyedit.c:3998
  #, c-format
  msgid "usage: %s"
  msgstr "назначение: %s"
  
- #: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
++#: g10/keyedit.c:4006 g10/keyedit.c:4026 g10/keylist.c:267
  msgid "card-no: "
  msgstr "номер карты: "
  
- #: g10/keyedit.c:3984
++#: g10/keyedit.c:4065
  #, c-format
  msgid "trust: %s"
  msgstr "доверие: %s"
  
- #: g10/keyedit.c:3988
++#: g10/keyedit.c:4069
  #, c-format
  msgid "validity: %s"
  msgstr "достоверность: %s"
  
- #: g10/keyedit.c:3995
++#: g10/keyedit.c:4076
  msgid "This key has been disabled"
  msgstr "Данный ключ отключен"
  
- #: g10/keyedit.c:4013
++#: g10/keyedit.c:4094
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4389,19 -3390,13 +4351,19 @@@ msgstr "
  "Учтите, что показанная достоверность ключа может быть неверной,\n"
  "пока Вы не перезапустите программу.\n"
  
- #: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
- #: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: g10/keyedit.c:4150 g10/keyedit.c:4581 g10/keyserver.c:548
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:712
 +#: dirmngr/ocsp.c:703
  msgid "revoked"
  msgstr "отозван"
  
- #: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
- #: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4152 g10/keyedit.c:4583 g10/keyserver.c:552
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:714
  msgid "expired"
  msgstr "просрочен"
  
  # check it
- #: g10/keyedit.c:4188
++#: g10/keyedit.c:4269
  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"
@@@ -4410,15 -3405,12 +4372,15 @@@ msgstr "
  "          привести к тому, что первичным станет считаться другой\n"
  "          ID пользователя.\n"
  
- #: g10/keyedit.c:4240
++#: g10/keyedit.c:4321
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr "Внимание: Срок действия Вашего подключа для шифрования истекает.\n"
  
- #: g10/keyedit.c:4241
++#: g10/keyedit.c:4322
  msgid "You may want to change its expiration date too.\n"
  msgstr "Возможно, надо поменять также срок действия.\n"
  
- #: g10/keyedit.c:4300
++#: g10/keyedit.c:4381
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4427,35 -3419,27 +4389,35 @@@ msgstr "
  "Внимание: Это ключ типа PGP2. Добавление фотоидентификатора может\n"
  "          в некоторых версиях PGP вызвать отбраковку ключа.\n"
  
- #: g10/keyedit.c:4305 g10/keyedit.c:4595
++#: g10/keyedit.c:4386 g10/keyedit.c:4676
  msgid "Are you sure you still want to add it? (y/N) "
  msgstr "Вы уверены, что хотите добавить это? (y/N) "
  
- #: g10/keyedit.c:4311
++#: g10/keyedit.c:4392
  msgid "You may not add a photo ID to a PGP2-style key.\n"
  msgstr "Нельзя добавить фотоидентификатор в ключ типа PGP2.\n"
  
- #: g10/keyedit.c:4326 g10/keygen.c:2697
++#: g10/keyedit.c:4407 g10/keygen.c:2719
  msgid "Such a user ID already exists on this key!\n"
  msgstr "Такой ID пользователя на этом ключе уже есть!\n"
  
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4509
  msgid "Delete this good signature? (y/N/q)"
  msgstr "Удалить данную действительную подпись? (y/N/q)"
  
- #: g10/keyedit.c:4438
++#: g10/keyedit.c:4519
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "Удалить данную недействительную подпись? (y/N/q)"
  
- #: g10/keyedit.c:4442
++#: g10/keyedit.c:4523
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "Удалить данную неизвестную подпись? (y/N/q)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4530
  msgid "Really delete this self-signature? (y/N)"
  msgstr "Действительно удалить данную самоподпись? (y/N)"
  
- #: g10/keyedit.c:4465
++#: g10/keyedit.c:4546
  #, c-format
  msgid "Deleted %d signature.\n"
  msgid_plural "Deleted %d signatures.\n"
@@@ -4463,20 -3447,16 +4425,20 @@@ msgstr[0] "Удалена %d подпи
  msgstr[1] "Удалены %d подписи.\n"
  msgstr[2] "Удалено %d подписей.\n"
  
- #: g10/keyedit.c:4469
++#: g10/keyedit.c:4550
  msgid "Nothing deleted.\n"
  msgstr "Ничего не удалено.\n"
  
- #: g10/keyedit.c:4504 g10/trust.c:693
++#: g10/keyedit.c:4585 g10/trust.c:716
  msgid "invalid"
  msgstr "недопустимый"
  
- #: g10/keyedit.c:4506
++#: g10/keyedit.c:4587
  #, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "ID пользователя \"%s\" сжат: %s\n"
  
- #: g10/keyedit.c:4512
++#: g10/keyedit.c:4593
  #, c-format
  msgid "User ID \"%s\": %d signature removed\n"
  msgid_plural "User ID \"%s\": %d signatures removed\n"
@@@ -4484,17 -3464,14 +4446,17 @@@ msgstr[0] "ID пользователя 
  msgstr[1] "ID пользователя \"%s\": %d подписи удалены\n"
  msgstr[2] "ID пользователя \"%s\": %d подписей удалено\n"
  
- #: g10/keyedit.c:4520
++#: g10/keyedit.c:4601
  #, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "ID пользователя \"%s\" уже минимизирован\n"
  
- #: g10/keyedit.c:4521
++#: g10/keyedit.c:4602
  #, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "ID пользователя \"%s\": уже очищен\n"
  
- #: g10/keyedit.c:4590
++#: g10/keyedit.c:4671
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4503,36 -3480,28 +4465,36 @@@ msgstr "
  "Внимание: Это ключ типа PGP 2.x. Добавление особого отзывающего ключа\n"
  "          может в некоторых версиях PGP вызвать выбраковку ключа.\n"
  
- #: g10/keyedit.c:4601
++#: g10/keyedit.c:4682
  msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
  msgstr "Нельзя добавить особый отзывающий ключ в ключ типа PGP 2.x.\n"
  
- #: g10/keyedit.c:4618
++#: g10/keyedit.c:4699
  msgid "Enter the user ID of the designated revoker: "
  msgstr "Укажите ID пользователя ключа, назначенного отзывающим: "
  
- #: g10/keyedit.c:4643
++#: g10/keyedit.c:4724
  msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
  msgstr "нельзя назначить отзывающим ключ типа PGP 2.x\n"
  
- #: g10/keyedit.c:4658
++#: g10/keyedit.c:4739
  msgid "you cannot appoint a key as its own designated revoker\n"
  msgstr "ключ не может быть назначен отзывающим самого себя\n"
  
- #: g10/keyedit.c:4680
++#: g10/keyedit.c:4761
  msgid "this key has already been designated as a revoker\n"
  msgstr "этот ключ уже назначен отзывающим\n"
  
- #: g10/keyedit.c:4698
++#: g10/keyedit.c:4779
  msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
  msgstr "Внимание: назначение ключа отзывающим невозможно отменить!\n"
  
- #: g10/keyedit.c:4704
++#: g10/keyedit.c:4785
  msgid ""
  "Are you sure you want to appoint this key as a designated revoker? (y/N) "
  msgstr "Вы уверены, что хотите назначить данный ключ отзывающим? (y/N) "
  
- #: g10/keyedit.c:4755
++#: g10/keyedit.c:4848
  msgid ""
  "Are you sure you want to change the expiration time for multiple subkeys? (y/"
  "N) "
@@@ -4540,229 -3509,178 +4502,229 @@@ msgstr "
  "Вы уверены, что хотите изменить срок действия сразу нескольких подключей? (y/"
  "N) "
  
- #: g10/keyedit.c:4760
++#: g10/keyedit.c:4853
  msgid "Changing expiration time for a subkey.\n"
  msgstr "Смена срока действия подключа.\n"
  
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:4856
  msgid "Changing expiration time for the primary key.\n"
  msgstr "Смена срока действия первичного ключа.\n"
  
- #: g10/keyedit.c:4814
++#: g10/keyedit.c:4910
  msgid "You can't change the expiration date of a v3 key\n"
  msgstr "Нельзя изменить срок действия ключа v3\n"
  
- #: g10/keyedit.c:4987
++#: g10/keyedit.c:5085
  #, c-format
  msgid "signing subkey %s is already cross-certified\n"
  msgstr "подписывающий подключ %s уже перекрестно заверен\n"
  
- #: g10/keyedit.c:4993
++#: g10/keyedit.c:5091
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr "подключ %s не для подписей, он не нуждается в перекрестном заверении\n"
  
- #: g10/keyedit.c:5108
++#: g10/keyedit.c:5206
  msgid "Please select exactly one user ID.\n"
  msgstr "Выберите ровно один ID пользователя.\n"
  
- #: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
++#: g10/keyedit.c:5247 g10/keyedit.c:5361 g10/keyedit.c:5474 g10/keyedit.c:5611
  #, c-format
  msgid "skipping v3 self-signature on user ID \"%s\"\n"
  msgstr "пропуск самоподписи v3 на ID пользователя \"%s\"\n"
  
- #: g10/keyedit.c:5320
++#: g10/keyedit.c:5418
  msgid "Enter your preferred keyserver URL: "
  msgstr "Введите URL предпочтительного сервера ключей: "
  
- #: g10/keyedit.c:5399
++#: g10/keyedit.c:5497
  msgid "Are you sure you want to replace it? (y/N) "
  msgstr "Вы действительно хотите заменить его? (y/N) "
  
- #: g10/keyedit.c:5400
++#: g10/keyedit.c:5498
  msgid "Are you sure you want to delete it? (y/N) "
  msgstr "Вы действительно хотите удалить его? (y/N) "
  
- #: g10/keyedit.c:5459
++#: g10/keyedit.c:5557
  msgid "Enter the notation: "
  msgstr "Введите замечание: "
  
- #: g10/keyedit.c:5606
++#: g10/keyedit.c:5704
  msgid "Proceed? (y/N) "
  msgstr "Продолжить? (y/N) "
  
- #: g10/keyedit.c:5676
++#: g10/keyedit.c:5774
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "Нет ID пользователя с индексом %d\n"
  
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5836
  #, c-format
  msgid "No user ID with hash %s\n"
  msgstr "Нет ID пользователя с хешем %s\n"
  
- #: g10/keyedit.c:5839
++#: g10/keyedit.c:5937
  #, c-format
  msgid "No subkey with key ID '%s'.\n"
  msgstr "Нет подключа с ID ключа '%s'.\n"
  
- #: g10/keyedit.c:5861
++#: g10/keyedit.c:5959
  #, c-format
  msgid "No subkey with index %d\n"
  msgstr "Нет подключа с индексом %d\n"
  
- #: g10/keyedit.c:6002
++#: g10/keyedit.c:6100
  #, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "ID пользователя: \"%s\"\n"
  
- #: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
++#: g10/keyedit.c:6103 g10/keyedit.c:6205 g10/keyedit.c:6253
  #, c-format
  msgid "signed by your key %s on %s%s%s\n"
  msgstr "подписано Вашим ключом %s %s%s%s\n"
  
- #: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
++#: g10/keyedit.c:6105 g10/keyedit.c:6207 g10/keyedit.c:6255
  msgid " (non-exportable)"
  msgstr " (неэкспортируемая)"
  
- #: g10/keyedit.c:6011
++#: g10/keyedit.c:6109
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "Срок действия подписи истек %s.\n"
  
- #: g10/keyedit.c:6016
++#: g10/keyedit.c:6114
  msgid "Are you sure you still want to revoke it? (y/N) "
  msgstr "Вы уверены, что хотите отозвать? (y/N) "
  
- #: g10/keyedit.c:6021
++#: g10/keyedit.c:6119
  msgid "Create a revocation certificate for this signature? (y/N) "
  msgstr "Создать сертификат отзыва для данной подписи? (y/N) "
  
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6173
  msgid "Not signed by you.\n"
  msgstr "Вами не подписано.\n"
  
- #: g10/keyedit.c:6081
++#: g10/keyedit.c:6179
  #, c-format
  msgid "You have signed these user IDs on key %s:\n"
  msgstr "Вы подписали эти ID пользователей на ключе %s:\n"
  
- #: g10/keyedit.c:6110
++#: g10/keyedit.c:6208
  msgid " (non-revocable)"
  msgstr " (неотзываемая)"
  
- #: g10/keyedit.c:6117
++#: g10/keyedit.c:6215
  #, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "отозвано Вашим ключом %s %s\n"
  
- #: g10/keyedit.c:6142
++#: g10/keyedit.c:6240
  msgid "You are about to revoke these signatures:\n"
  msgstr "Вы отзываете следующие подписи:\n"
  
- #: g10/keyedit.c:6165
++#: g10/keyedit.c:6263
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "Действительно создать сертификат отзыва? (y/N) "
  
- #: g10/keyedit.c:6198
++#: g10/keyedit.c:6296
  msgid "no secret key\n"
  msgstr "нет секретного ключа\n"
  
- #: g10/keyedit.c:6246
++#: g10/keyedit.c:6344
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr "попытка отзыва непользовательского идентификатора: %s\n"
  
- #: g10/keyedit.c:6256
++#: g10/keyedit.c:6354
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "ID пользователя \"%s\" уже отозван\n"
  
- #: g10/keyedit.c:6273
++#: g10/keyedit.c:6371
  #, c-format
  msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
  msgstr "Внимание: подпись ID пользователя датирована %d секундами в будущем\n"
  
- #: g10/keyedit.c:6386
++#: g10/keyedit.c:6485
  #, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "Ключ %s уже отозван.\n"
  
- #: g10/keyedit.c:6448
++#: g10/keyedit.c:6547
  #, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "Подключ %s уже отозван.\n"
  
- #: g10/keyedit.c:6545
++#: g10/keyedit.c:6644
  #, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr "Показ фотоидентификатора %s размера %ld для ключа %s (uid %d)\n"
  
- #: g10/keygen.c:305
++#: g10/keygen.c:316
  #, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "предпочтение '%s' дублируется\n"
  
- #: g10/keygen.c:312
++#: g10/keygen.c:323
  msgid "too many cipher preferences\n"
  msgstr "слишком много шифровых предпочтений\n"
  
- #: g10/keygen.c:314
++#: g10/keygen.c:325
  msgid "too many digest preferences\n"
  msgstr "слишком много предпочтений для хеш-функций\n"
  
- #: g10/keygen.c:316
++#: g10/keygen.c:327
  msgid "too many compression preferences\n"
  msgstr "слишком много предпочтений для методов сжатия\n"
  
- #: g10/keygen.c:457
++#: g10/keygen.c:468
  #, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "недопустимый элемент '%s' в строке предпочтений\n"
  
- #: g10/keygen.c:936
++#: g10/keygen.c:947
  msgid "writing direct signature\n"
  msgstr "запись прямой подписи\n"
  
- #: g10/keygen.c:982
++#: g10/keygen.c:993
  msgid "writing self signature\n"
  msgstr "запись самоподписи\n"
  
- #: g10/keygen.c:1038
++#: g10/keygen.c:1049
  msgid "writing key binding signature\n"
  msgstr "запись объединяющей подписи\n"
  
- #: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
- #: g10/keygen.c:1610 g10/keygen.c:1615
++#: g10/keygen.c:1413 g10/keygen.c:1418 g10/keygen.c:1470 g10/keygen.c:1475
++#: g10/keygen.c:1622 g10/keygen.c:1627
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "неверный размер ключа; использую %u бит\n"
  
- #: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
++#: g10/keygen.c:1424 g10/keygen.c:1481 g10/keygen.c:1489 g10/keygen.c:1633
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "размер ключа округлен вверх до %u бит\n"
  
- #: g10/keygen.c:1503
++#: g10/keygen.c:1515
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  "Внимание: некоторые реализации OpenPGP не могут обрабатывать ключи DSA с "
  "такой длиной хеша\n"
  
- #: g10/keygen.c:1677
++#: g10/keygen.c:1689
  msgid "Sign"
  msgstr "Подписать"
  
- #: g10/keygen.c:1680
++#: g10/keygen.c:1692
  msgid "Certify"
  msgstr "Заверить"
  
- #: g10/keygen.c:1683
++#: g10/keygen.c:1695
  msgid "Encrypt"
  msgstr "Зашифровать"
  
- #: g10/keygen.c:1686
++#: g10/keygen.c:1698
  msgid "Authenticate"
  msgstr "Аутентифицировать"
  
@@@ -4776,150 -3694,119 +4738,150 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1705
++#: g10/keygen.c:1717
  msgid "SsEeAaQq"
  msgstr "11223300"
  
- #: g10/keygen.c:1732
++#: g10/keygen.c:1744
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "Возможные действия для ключа %s: "
  
- #: g10/keygen.c:1738
++#: g10/keygen.c:1750
  msgid "Current allowed actions: "
  msgstr "Допустимы действия: "
  
- #: g10/keygen.c:1743
++#: g10/keygen.c:1755
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) Переключить возможность использования для подписи\n"
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) Переключить возможность использования для шифрования\n"
  
- #: g10/keygen.c:1749
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) Переключить возможность использования для аутентификации\n"
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) Завершено\n"
  
- #: g10/keygen.c:1881 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1893 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Выберите тип ключа:\n"
  
- #: g10/keygen.c:1885
++#: g10/keygen.c:1897
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) RSA и RSA (по умолчанию)\n"
  
- #: g10/keygen.c:1889
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA и Elgamal\n"
  
- #: g10/keygen.c:1892
++#: g10/keygen.c:1904
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (только для подписи)\n"
  
- #: g10/keygen.c:1894
++#: g10/keygen.c:1906
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (только для подписи)\n"
  
- #: g10/keygen.c:1900
++#: g10/keygen.c:1912
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) Elgamal (только для шифрования)\n"
  
- #: g10/keygen.c:1902
++#: g10/keygen.c:1914
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (только для шифрования)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1920
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (с требуемыми возможностями)\n"
  
- #: g10/keygen.c:1910
++#: g10/keygen.c:1922
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (с требуемыми возможностями)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1928
  #, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) ECC и ECC\n"
  
- #: g10/keygen.c:1918
++#: g10/keygen.c:1930
  #, c-format
  msgid "  (%d) ECC (sign only)\n"
  msgstr "  (%d) ECC (только для подписи)\n"
  
- #: g10/keygen.c:1920
++#: g10/keygen.c:1932
  #, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "  (%d) ECC (с требуемыми возможностями)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1934
  #, c-format
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "  (%d) ECC (только для шифрования)\n"
  
- #: g10/keygen.c:1926
++#: g10/keygen.c:1938
  #, c-format
  msgid "  (%d) Existing key\n"
  msgstr "  (%d) Имеющийся ключ\n"
  
- #: g10/keygen.c:2022 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:206
  msgid "Enter the keygrip: "
  msgstr "Введите код ключа:"
  
- #: g10/keygen.c:2035 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2047 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr "Недопустимый код ключа (ожидается 40 шестнадцатеричных цифр)\n"
  
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2049 sm/certreqgen-ui.c:216
  msgid "No key with this keygrip\n"
  msgstr "Нет ключа с таким кодом\n"
  
- #: g10/keygen.c:2111 g10/keygen.c:2125
++#: g10/keygen.c:2133 g10/keygen.c:2147
  #, c-format
  msgid "rounded to %u bits\n"
  msgstr "округлен до %u бит\n"
  
- #: g10/keygen.c:2166
++#: g10/keygen.c:2188
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr "длина ключей %s может быть от %u до %u бит.\n"
  
- #: g10/keygen.c:2174
++#: g10/keygen.c:2196
  #, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Какой размер подключа необходим? (%u) "
  
- #: g10/keygen.c:2177 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2199 sm/certreqgen-ui.c:183
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Какой размер ключа Вам необходим? (%u) "
  
- #: g10/keygen.c:2191 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2213 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Запрошенный размер ключа - %u бит\n"
  
- #: g10/keygen.c:2237
++#: g10/keygen.c:2259
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Выберите эллиптическую кривую:\n"
  
- #: g10/keygen.c:2409
++#: g10/keygen.c:2431
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -4935,7 -3822,6 +4897,7 @@@ msgstr "
  "      <n>m = срок действия ключа - n месяцев\n"
  "      <n>y = срок действия ключа - n лет\n"
  
- #: g10/keygen.c:2420
++#: g10/keygen.c:2442
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -4951,38 -3837,30 +4913,38 @@@ msgstr "
  "      <n>m = срок действия подписи - n месяцев\n"
  "      <n>y = срок действия подписи - n лет\n"
  
- #: g10/keygen.c:2443
++#: g10/keygen.c:2465
  msgid "Key is valid for? (0) "
  msgstr "Срок действия ключа? (0) "
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2470
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Срок действия подписи? (%s) "
  
- #: g10/keygen.c:2461 g10/keygen.c:2486
++#: g10/keygen.c:2483 g10/keygen.c:2508
  msgid "invalid value\n"
  msgstr "недопустимое значение\n"
  
- #: g10/keygen.c:2468
++#: g10/keygen.c:2490
  msgid "Key does not expire at all\n"
  msgstr "Срок действия ключа не ограничен\n"
  
- #: g10/keygen.c:2469
++#: g10/keygen.c:2491
  msgid "Signature does not expire at all\n"
  msgstr "Срок действия подписи не ограничен\n"
  
- #: g10/keygen.c:2474
++#: g10/keygen.c:2496
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "Ключ действителен до %s\n"
  
- #: g10/keygen.c:2475
++#: g10/keygen.c:2497
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "Подпись действительна до %s\n"
  
- #: g10/keygen.c:2479
++#: g10/keygen.c:2501
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -4990,11 -3868,9 +4952,11 @@@ msgstr "
  "Ваша система не может отображать даты после 2038 года.\n"
  "Однако даты до 2106 года будут обрабатываться верно.\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2514
  msgid "Is this correct? (y/N) "
  msgstr "Все верно? (y/N) "
  
- #: g10/keygen.c:2560
++#: g10/keygen.c:2582
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5008,7 -3884,6 +4970,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2575
++#: g10/keygen.c:2597
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -5024,49 -3899,38 +4986,49 @@@ msgstr "
  "    \"Вася Пушкин (персонаж) <vp at test.ru>\"\n"
  "\n"
  
- #: g10/keygen.c:2594
++#: g10/keygen.c:2616
  msgid "Real name: "
  msgstr "Ваше полное имя: "
  
- #: g10/keygen.c:2603
++#: g10/keygen.c:2625
  msgid "Invalid character in name\n"
  msgstr "Недопустимый символ в имени\n"
  
- #: g10/keygen.c:2604
++#: g10/keygen.c:2626
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr "Символы '%s' и '%s' в имени появляться не могут\n"
  
- #: g10/keygen.c:2608
++#: g10/keygen.c:2630
  msgid "Name may not start with a digit\n"
  msgstr "Имя не должно начинаться с цифры\n"
  
- #: g10/keygen.c:2611
++#: g10/keygen.c:2633
  msgid "Name must be at least 5 characters long\n"
  msgstr "Имя не должно быть короче 5 символов\n"
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2643
  msgid "Email address: "
  msgstr "Адрес электронной почты: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2649
  msgid "Not a valid email address\n"
  msgstr "Неправильный адрес электронной почты\n"
  
- #: g10/keygen.c:2636
++#: g10/keygen.c:2658
  msgid "Comment: "
  msgstr "Примечание: "
  
- #: g10/keygen.c:2642
++#: g10/keygen.c:2664
  msgid "Invalid character in comment\n"
  msgstr "Недопустимый символ в примечании\n"
  
- #: g10/keygen.c:2678
++#: g10/keygen.c:2700
  #, c-format
  msgid "You are using the '%s' character set.\n"
  msgstr "Используется таблица символов: '%s'.\n"
  
- #: g10/keygen.c:2684
++#: g10/keygen.c:2706
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5077,7 -3941,6 +5039,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2689
++#: g10/keygen.c:2711
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr ""
  "Не вставляйте адрес электронной почты в имя пользователя или примечание\n"
@@@ -5093,31 -3956,24 +5055,31 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2714
++#: g10/keygen.c:2736
  msgid "NnCcEeOoQq"
  msgstr "NnCcEeOoQq"
  
- #: g10/keygen.c:2724
++#: g10/keygen.c:2746
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "Сменить (N)Имя, (C)Примечание, (E)Адрес или (Q)Выход? "
  
- #: g10/keygen.c:2725
++#: g10/keygen.c:2747
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr "Сменить (N)Имя, (C)Примечание, (E)Адрес или (O)Принять/(Q)Выход? "
  
- #: g10/keygen.c:2730
++#: g10/keygen.c:2752
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "Сменить (N)Имя, (E)Адрес или (Q)Выход? "
  
- #: g10/keygen.c:2731
++#: g10/keygen.c:2753
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "Сменить (N)Имя, (E)Адрес или (O)Принять/(Q)Выход? "
  
- #: g10/keygen.c:2750
++#: g10/keygen.c:2772
  msgid "Please correct the error first\n"
  msgstr "Сначала исправьте ошибку\n"
  
- #: g10/keygen.c:2796
++#: g10/keygen.c:2818
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5130,13 -3986,10 +5092,13 @@@ msgstr "
  "случайных чисел больше возможностей получить достаточное количество "
  "энтропии.\n"
  
- #: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
- #: g10/keygen.c:4777 g10/keygen.c:4882
++#: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
++#: g10/keygen.c:4330 g10/keygen.c:4803 g10/keygen.c:5064 g10/keygen.c:5169
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Сбой при создании ключа: %s\n"
  
- #: g10/keygen.c:3598
++#: g10/keygen.c:3922
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5147,63 -4000,50 +5109,63 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3924
  msgid "Continue? (Y/n) "
  msgstr "Продолжить? (Y/n) "
  
- #: g10/keygen.c:3621
++#: g10/keygen.c:3945
  #, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "Ключ для \"%s\" уже существует\n"
  
- #: g10/keygen.c:3626
++#: g10/keygen.c:3950
  msgid "Create anyway? (y/N) "
  msgstr "Все равно создать новый? (y/N) "
  
- #: g10/keygen.c:3632
++#: g10/keygen.c:3956
  msgid "creating anyway\n"
  msgstr "принудительное создание\n"
  
- #: g10/keygen.c:3981
++#: g10/keygen.c:4315
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  "Замечание: \"%s %s\" вызывает полнофункциональный диалог создания ключа.\n"
  
- #: g10/keygen.c:4013
++#: g10/keygen.c:4358
  msgid "Key generation canceled.\n"
  msgstr "Создание ключа прервано.\n"
  
- #: g10/keygen.c:4073
++#: g10/keygen.c:4418
  #, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "не могу создать архивную копию, файл '%s': %s\n"
  
- #: g10/keygen.c:4093
++#: g10/keygen.c:4438
  #, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "Замечание: архивная копия ключа с карты сохранена в '%s'\n"
  
- #: g10/keygen.c:4244 g10/keygen.c:4393
++#: g10/keygen.c:4589 g10/keygen.c:4738
  #, c-format
  msgid "writing public key to '%s'\n"
  msgstr "сохранение открытого ключа в '%s'\n"
  
- #: g10/keygen.c:4387
++#: g10/keygen.c:4732
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "нет доступной для записи таблицы открытых ключей: %s\n"
  
- #: g10/keygen.c:4401
++#: g10/keygen.c:4746
  #, c-format
  msgid "error writing public keyring '%s': %s\n"
  msgstr "ошибка записи таблицы открытых ключей '%s': %s\n"
  
- #: g10/keygen.c:4433
++#: g10/keygen.c:4778
  msgid "public and secret key created and signed.\n"
  msgstr "открытый и секретный ключи созданы и подписаны.\n"
  
- #: g10/keygen.c:4445
++#: g10/keygen.c:4790
  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"
@@@ -5211,7 -4051,6 +5173,7 @@@ msgstr "
  "Учтите, что данный ключ не может использоваться для шифрования. Вы можете\n"
  "воспользоваться командой \"--edit-key\" и создать подключ для этих целей.\n"
  
- #: g10/keygen.c:4649 g10/keygen.c:4833
++#: g10/keygen.c:4936 g10/keygen.c:5120
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5219,7 -4058,6 +5181,7 @@@ msgstr "
  "ключ создан на %lu секунду в будущем (петля во времени или проблемы с "
  "часами)\n"
  
- #: g10/keygen.c:4651 g10/keygen.c:4835
++#: g10/keygen.c:4938 g10/keygen.c:5122
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5227,19 -4065,15 +5189,19 @@@ msgstr "
  "ключ создан на %lu секунд в будущем (петля во времени или проблемы с "
  "часами)\n"
  
- #: g10/keygen.c:4662 g10/keygen.c:4846
++#: g10/keygen.c:4949 g10/keygen.c:5133
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgstr "Замечание: создание подключей для ключей v3 не совместимо с OpenPGP\n"
  
- #: g10/keygen.c:4674 g10/keygen.c:4676
++#: g10/keygen.c:4961 g10/keygen.c:4963
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Секретные части первичного ключа отсутствуют.\n"
  
- #: g10/keygen.c:4683 g10/keygen.c:4685
++#: g10/keygen.c:4970 g10/keygen.c:4972
  msgid "Secret parts of primary key are stored on-card.\n"
  msgstr "Секретные части первичного ключа хранятся на карте.\n"
  
- #: g10/keygen.c:4704 g10/keygen.c:4860
++#: g10/keygen.c:4991 g10/keygen.c:5147
  msgid "Really create? (y/N) "
  msgstr "Действительно создать? (y/N) "
  
@@@ -5558,123 -4327,97 +5520,123 @@@ msgstr "Внимание: наблюд�
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
  msgstr "отдельный сертификат отзыва: задействуется командой \"gpg --import\"\n"
  
- #: g10/mainproc.c:1233 g10/mainproc.c:1276
++#: g10/mainproc.c:1238 g10/mainproc.c:1281
  msgid "no signature found\n"
  msgstr "подпись не найдена\n"
  
- #: g10/mainproc.c:1607
++#: g10/mainproc.c:1612
  #, c-format
  msgid "BAD signature from \"%s\""
  msgstr "ПЛОХАЯ подпись пользователя \"%s\""
  
- #: g10/mainproc.c:1609
++#: g10/mainproc.c:1614
  #, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Просроченная подпись пользователя \"%s\""
  
- #: g10/mainproc.c:1611
++#: g10/mainproc.c:1616
  #, c-format
  msgid "Good signature from \"%s\""
  msgstr "Действительная подпись пользователя \"%s\""
  
- #: g10/mainproc.c:1630
++#: g10/mainproc.c:1635
  msgid "signature verification suppressed\n"
  msgstr "проверка подписи подавлена\n"
  
- #: g10/mainproc.c:1739
++#: g10/mainproc.c:1744
  msgid "can't handle this ambiguous signature data\n"
  msgstr "не могу обработать эти неоднозначные данные подписи\n"
  
- #: g10/mainproc.c:1753 g10/mainproc.c:1761
++#: g10/mainproc.c:1758 g10/mainproc.c:1766
  #, c-format
  msgid "Signature made %s\n"
  msgstr "Подпись сделана %s\n"
  
- #: g10/mainproc.c:1754 g10/mainproc.c:1762
++#: g10/mainproc.c:1759 g10/mainproc.c:1767
  #, c-format
  msgid "               using %s key %s\n"
  msgstr "               ключом %s с ID %s\n"
  
- #: g10/mainproc.c:1766
++#: g10/mainproc.c:1771
  #, c-format
  msgid "Signature made %s using %s key ID %s\n"
  msgstr "Подпись сделана %s ключом %s с ID %s\n"
  
- #: g10/mainproc.c:1772
++#: g10/mainproc.c:1777
  #, c-format
  msgid "               issuer \"%s\"\n"
  msgstr "                издатель \"%s\"\n"
  
- #: g10/mainproc.c:1789
++#: g10/mainproc.c:1794
  msgid "Key available at: "
  msgstr "Ключ доступен на: "
  
- #: g10/mainproc.c:2024
++#: g10/mainproc.c:2029
  msgid "[uncertain]"
  msgstr "[сомнительно]"
  
- #: g10/mainproc.c:2062
++#: g10/mainproc.c:2067
  #, c-format
  msgid "                aka \"%s\""
  msgstr "                или \"%s\""
  
- #: g10/mainproc.c:2145
++#: g10/mainproc.c:2150
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "Подпись просрочена %s\n"
  
- #: g10/mainproc.c:2149
++#: g10/mainproc.c:2154
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "Подпись действительна до %s\n"
  
- #: g10/mainproc.c:2160
++#: g10/mainproc.c:2165
  #, c-format
  msgid "%s signature, digest algorithm %s%s%s\n"
  msgstr "формат подписи: %s, хеш-функция %s%s%s\n"
  
- #: g10/mainproc.c:2161
++#: g10/mainproc.c:2166
  msgid "binary"
  msgstr "двоичный"
  
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2167
  msgid "textmode"
  msgstr "текстовый"
  
- #: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "неизвестно"
  
- #: g10/mainproc.c:2164
++#: g10/mainproc.c:2169
  msgid ", key algorithm "
  msgstr ", алгоритм ключа "
  
- #: g10/mainproc.c:2199
++#: g10/mainproc.c:2204
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr "Внимание: не отделенная подпись; файл '%s' НЕ был проверен!\n"
  
- #: g10/mainproc.c:2229
++#: g10/mainproc.c:2234
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "Не могу проверить подпись: %s\n"
  
- #: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
++#: g10/mainproc.c:2327 g10/mainproc.c:2346 g10/mainproc.c:2470
  msgid "not a detached signature\n"
  msgstr "не отделенная подпись\n"
  
- #: g10/mainproc.c:2375
++#: g10/mainproc.c:2380
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
  msgstr ""
  "Внимание: обнаружено несколько подписей. Проверена будет только первая.\n"
  
- #: g10/mainproc.c:2384
++#: g10/mainproc.c:2389
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "отдельная подпись класса 0x%02x\n"
  
- #: g10/mainproc.c:2469
++#: g10/mainproc.c:2474
  msgid "old style (PGP 2.x) signature\n"
  msgstr "подпись старого типа (PGP 2.x)\n"
  
@@@ -5955,23 -4644,18 +5917,23 @@@ msgstr "Это правильная ф�
  msgid "unable to display photo ID!\n"
  msgstr "не могу отобразить фотоидентификатор!\n"
  
- #: g10/pkclist.c:72 g10/revoke.c:757
++#: g10/pkclist.c:72 g10/revoke.c:758
  msgid "No reason specified"
  msgstr "Причина не указана"
  
- #: g10/pkclist.c:74 g10/revoke.c:759
++#: g10/pkclist.c:74 g10/revoke.c:760
  msgid "Key is superseded"
  msgstr "Ключ заменен другим"
  
- #: g10/pkclist.c:76 g10/revoke.c:758
++#: g10/pkclist.c:76 g10/revoke.c:759
  msgid "Key has been compromised"
  msgstr "Ключ был раскрыт"
  
- #: g10/pkclist.c:78 g10/revoke.c:760
++#: g10/pkclist.c:78 g10/revoke.c:761
  msgid "Key is no longer used"
  msgstr "Ключ больше не используется"
  
- #: g10/pkclist.c:80 g10/revoke.c:761
++#: g10/pkclist.c:80 g10/revoke.c:762
  msgid "User ID is no longer valid"
  msgstr "ID пользователя больше не действителен"
  
@@@ -6048,7 -4719,6 +6010,7 @@@ msgstr "
  "Минимальный уровень доверия данному ключу: %s\n"
  "\n"
  
- #: g10/pkclist.c:310 g10/revoke.c:786
++#: g10/pkclist.c:310 g10/revoke.c:787
  msgid "Your decision? "
  msgstr "Ваше решение? "
  
@@@ -6087,9 -4750,13 +6049,14 @@@ msgstr "Данный ключ прин�
  msgid "%s: This key is bad!  It has been marked as untrusted!\n"
  msgstr "%s: Некачественный ключ! Он помечен как недоверенный!\n"
  
 +#: g10/pkclist.c:484
+ #, fuzzy
+ #| msgid ""
+ #| "This key has is bad!  It has been marked as untrusted!  If you\n"
+ #| "*really* know what you are doing, you may answer the next\n"
+ #| "question with yes.\n"
  msgid ""
- "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "This key is bad!  It has been marked as untrusted!  If you\n"
  "*really* know what you are doing, you may answer the next\n"
  "question with yes.\n"
  msgstr ""
@@@ -6237,33 -4874,26 +6204,33 @@@ msgstr "
  msgid "No such user ID.\n"
  msgstr "Нет такого ID пользователя.\n"
  
- #: g10/pkclist.c:1197 g10/pkclist.c:1273
++#: g10/pkclist.c:1197 g10/pkclist.c:1274
  msgid "skipped: public key already set as default recipient\n"
  msgstr "пропущено: открытый ключ уже установлен для получателя по умолчанию\n"
  
- #: g10/pkclist.c:1218
++#: g10/pkclist.c:1219
  msgid "Public key is disabled.\n"
  msgstr "Открытый ключ отключен.\n"
  
- #: g10/pkclist.c:1228
++#: g10/pkclist.c:1229
  msgid "skipped: public key already set\n"
  msgstr "пропущено: открытый ключ уже установлен\n"
  
- #: g10/pkclist.c:1263
++#: g10/pkclist.c:1264
  #, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "неизвестный получатель по умолчанию \"%s\"\n"
  
- #: g10/pkclist.c:1312
++#: g10/pkclist.c:1313
  msgid "no valid addressees\n"
  msgstr "нет пригодных адресов\n"
  
- #: g10/pkclist.c:1665
++#: g10/pkclist.c:1666
  #, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "Замечание: у ключа %s нет функции %s\n"
  
- #: g10/pkclist.c:1690
++#: g10/pkclist.c:1691
  #, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "Замечание: у ключа %s нет предпочтения для %s\n"
@@@ -6272,28 -4901,22 +6239,28 @@@
  msgid "data not saved; use option \"--output\" to save it\n"
  msgstr "данные не сохранены; используйте \"--output\" для сохранения\n"
  
- #: g10/plaintext.c:598
++#: g10/plaintext.c:614
  msgid "Detached signature.\n"
  msgstr "Отделенная подпись.\n"
  
- #: g10/plaintext.c:606
++#: g10/plaintext.c:622
  msgid "Please enter name of data file: "
  msgstr "Введите имя файла с данными: "
  
- #: g10/plaintext.c:643
++#: g10/plaintext.c:659
  msgid "reading stdin ...\n"
  msgstr "читаю stdin ...\n"
  
- #: g10/plaintext.c:688
++#: g10/plaintext.c:704
  msgid "no signed data\n"
  msgstr "нет подписанных данных\n"
  
- #: g10/plaintext.c:706
++#: g10/plaintext.c:722
  #, c-format
  msgid "can't open signed data '%s'\n"
  msgstr "не могу открыть подписанные данные '%s'\n"
  
- #: g10/plaintext.c:741
++#: g10/plaintext.c:757
  #, c-format
  msgid "can't open signed data fd=%d: %s\n"
  msgstr "не могу открыть подписанные данные fd=%d: %s\n"
@@@ -6358,7 -4967,6 +6325,7 @@@ msgstr "Секретный ключ н�
  msgid "Create a designated revocation certificate for this key? (y/N) "
  msgstr "Создать сертификат отзыва данного ключа? (y/N) "
  
- #: g10/revoke.c:336 g10/revoke.c:727
++#: g10/revoke.c:336 g10/revoke.c:728
  msgid "ASCII armored output forced.\n"
  msgstr "Для вывода использован текстовый формат ASCII.\n"
  
@@@ -6401,9 -5003,8 +6368,9 @@@ msgstr "
  "Пользуйтесь им для отзыва этого ключа в случае раскрытия или потери\n"
  "секретного ключа. Однако, если секретный ключ доступен, лучше создать\n"
  "новый сертификат с указанием причины отзыва. Подробности см. в описании\n"
- "команды gpg \"--gen-revoke\" в руководстве по GnuPG."
+ "команды gpg \"--generate-revocation\" в руководстве по GnuPG."
  
- #: g10/revoke.c:575
++#: g10/revoke.c:576
  msgid ""
  "To avoid an accidental use of this file, a colon has been inserted\n"
  "before the 5 dashes below.  Remove this colon with a text editor\n"
@@@ -6413,12 -5014,10 +6380,12 @@@ msgstr "
  "вставлено двоеточие. Удалите это двоеточие в текстовом редакторе\n"
  "перед импортированием и публикацией этого сертификата отзыва."
  
- #: g10/revoke.c:590
++#: g10/revoke.c:591
  #, c-format
  msgid "revocation certificate stored as '%s.rev'\n"
  msgstr "сертификат отзыва записан в '%s.rev'.\n"
  
- #: g10/revoke.c:634
++#: g10/revoke.c:635
  #, c-format
  msgid "secret key \"%s\" not found\n"
  msgstr "секретный ключ \"%s\" не найден\n"
@@@ -6426,21 -5025,17 +6393,21 @@@
  #. TRANSLATORS: The %s prints a key specification which
  #. for example has been given at the command line.  Several lines
  #. lines with secret key infos are printed after this message.
- #: g10/revoke.c:661
++#: g10/revoke.c:662
  #, c-format
  msgid "'%s' matches multiple secret keys:\n"
  msgstr "'%s' соответствует нескольким секретным ключам:\n"
  
- #: g10/revoke.c:688
++#: g10/revoke.c:689
  #, c-format
  msgid "error searching the keyring: %s\n"
  msgstr "ошибка поиска в таблице ключей %s\n"
  
- #: g10/revoke.c:711
++#: g10/revoke.c:712
  msgid "Create a revocation certificate for this key? (y/N) "
  msgstr "Создать сертификат отзыва данного ключа? (y/N) "
  
- #: g10/revoke.c:735
++#: g10/revoke.c:736
  msgid ""
  "Revocation certificate created.\n"
  "\n"
@@@ -6459,33 -5054,26 +6426,33 @@@ msgstr "
  "носитель будет поврежден, но будьте осторожны: система печати\n"
  "Вашей машины может сохранить данные и сделать их доступными для других!\n"
  
- #: g10/revoke.c:769
++#: g10/revoke.c:770
  msgid "Please select the reason for the revocation:\n"
  msgstr "Укажите причину отзыва:\n"
  
- #: g10/revoke.c:779
++#: g10/revoke.c:780
  msgid "Cancel"
  msgstr "Отмена"
  
- #: g10/revoke.c:781
++#: g10/revoke.c:782
  #, c-format
  msgid "(Probably you want to select %d here)\n"
  msgstr "(Скорее всего, Вы здесь выберете %d)\n"
  
- #: g10/revoke.c:822
++#: g10/revoke.c:823
  msgid "Enter an optional description; end it with an empty line:\n"
  msgstr "Введите необязательное пояснение; завершите пустой строкой:\n"
  
- #: g10/revoke.c:850
++#: g10/revoke.c:851
  #, c-format
  msgid "Reason for revocation: %s\n"
  msgstr "Причина отзыва: %s\n"
  
- #: g10/revoke.c:852
++#: g10/revoke.c:853
  msgid "(No description given)\n"
  msgstr "(Пояснения отсутствуют)\n"
  
- #: g10/revoke.c:857
++#: g10/revoke.c:858
  msgid "Is this okay? (y/N) "
  msgstr "Все правильно? (y/N) "
  
@@@ -6625,12 -5193,10 +6592,12 @@@ msgstr "
  "Внимание: невозможно развернуть %% в URL предпочтительного сервера ключей "
  "(слишком длинный). Использую неразвернутым.\n"
  
- #: g10/sign.c:329
++#: g10/sign.c:331
  #, c-format
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "подпись %s/%s пользователя \"%s\"\n"
  
- #: g10/sign.c:878
++#: g10/sign.c:880
  #, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6638,11 -5204,9 +6605,11 @@@ msgstr "
  "Внимание: использование хеш-функции %s (%d) нарушает предпочтения "
  "получателя\n"
  
- #: g10/sign.c:1009
++#: g10/sign.c:1011
  msgid "signing:"
  msgstr "подпись:"
  
- #: g10/sign.c:1286
++#: g10/sign.c:1288
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "будет использовано шифрование по %s\n"
@@@ -6667,7 -5227,6 +6634,7 @@@ msgid "this is a PGP generated Elgamal 
  msgstr ""
  "это ключ Elgamal, созданный PGP, он не обеспечивает безопасность подписи!"
  
- #: g10/tdbdump.c:57 g10/trustdb.c:362
++#: g10/tdbdump.c:57 g10/trustdb.c:369
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "запись о доверии %lu, тип %d: ошибка записи: %s\n"
@@@ -6712,7 -5263,6 +6679,7 @@@ msgstr "ошибка при поиск�
  msgid "read error in '%s': %s\n"
  msgstr "ошибка чтения в '%s': %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "таблица доверия: сбой синхронизации: %s\n"
@@@ -6855,71 -5376,77 +6822,97 @@@ msgstr "не могу обработа�
  msgid "input line longer than %d characters\n"
  msgstr "строка ввода длиннее %d символов\n"
  
- #: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
++#: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
  #, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "ошибка в начале операции с базой данных TOFU: %s\n"
  
- #: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
++#: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr "ошибка записи изменения в базе данных TOFU: %s\n"
  
- #: g10/tofu.c:357 g10/tofu.c:699
++#: g10/tofu.c:355 g10/tofu.c:888
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr "ошибка отката назад изменения в базе данных TOFU: %s\n"
  
- #: g10/tofu.c:501
++#: g10/tofu.c:505
  #, c-format
  msgid "unsupported TOFU database version: %s\n"
  msgstr "версия базы данных TOFU (не поддерживается): %s\n"
  
- #: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
- #: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
- #: g10/tofu.c:3056
++#: g10/tofu.c:538
+ #, fuzzy, c-format
+ #| msgid "error creating temporary file: %s\n"
+ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
+ msgstr "ошибка создания временного файла: %s\n"
+ 
++#: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
+ msgid "TOFU DB error"
+ msgstr ""
+ 
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2340 g10/tofu.c:2359
++#: g10/tofu.c:2372 g10/tofu.c:2384 g10/tofu.c:2399 g10/tofu.c:2411
++#: g10/tofu.c:2980 g10/tofu.c:2997 g10/tofu.c:3033 g10/tofu.c:3050
++#: g10/tofu.c:3353
  #, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "ошибка чтения базы данных TOFU: %s\n"
  
- #: g10/tofu.c:566 g10/tofu.c:574
++#: g10/tofu.c:716 g10/tofu.c:724
  #, c-format
  msgid "error determining TOFU database's version: %s\n"
  msgstr "ошибка определения версии базы данных TOFU: %s\n"
  
- #: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
++#: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
  #, c-format
  msgid "error initializing TOFU database: %s\n"
  msgstr "ошибка инициализации базы данных TOFU: %s\n"
  
- #: g10/tofu.c:765
++#: g10/tofu.c:844
+ #, fuzzy, c-format
+ #| msgid "error reading TOFU database: %s\n"
+ msgid "error creating 'encryptions' TOFU table: %s\n"
+ msgstr "ошибка чтения базы данных TOFU: %s\n"
+ 
++#: g10/tofu.c:874
+ #, c-format
+ msgid "adding column effective_policy to bindings DB: %s\n"
+ msgstr ""
+ 
++#: g10/tofu.c:956
  #, c-format
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "ошибка открытия базы данных TOFU '%s': %s\n"
  
- #: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
++#: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
  #, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "ошибка обновления базы данных TOFU: %s\n"
  
- #: g10/tofu.c:1239
++#: g10/tofu.c:1328
  #, c-format
  msgid ""
  "This is the first time the email address \"%s\" is being used with key %s."
  msgstr "Адрес электронной почты \"%s\" используется с ключом %s впервые."
  
- #: g10/tofu.c:1247
- #, c-format
- msgid "The email address \"%s\" is associated with %d keys!"
- msgstr "Адрес электронной почты \"%s\" связан с %d ключами!"
- 
- #: g10/tofu.c:1251
++#: g10/tofu.c:1337
+ #, fuzzy, c-format
+ #| msgid "The email address \"%s\" is associated with %d keys!"
+ msgid "The email address \"%s\" is associated with %d key!"
+ msgid_plural "The email address \"%s\" is associated with %d keys!"
+ msgstr[0] "Адрес электронной почты \"%s\" связан с %d ключами!"
+ msgstr[1] "Адрес электронной почты \"%s\" связан с %d ключами!"
+ msgstr[2] "Адрес электронной почты \"%s\" связан с %d ключами!"
+ 
++#: g10/tofu.c:1343
  msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  " Поскольку правило привязки было 'автоматически', оно изменилось на "
  "'спрашивать'."
  
- #: g10/tofu.c:1257
++#: g10/tofu.c:1349
  #, c-format
  msgid ""
  "Please indicate whether this email address should be associated with key %s "
@@@ -6928,26 -5455,21 +6921,26 @@@ msgstr "
  "Укажите, пожалуйста, следует ли связать этот адрес электронной почты с "
  "ключом %s или вы думаете, что кто-то выдает себя за \"%s\"."
  
- #: g10/tofu.c:1513
++#: g10/tofu.c:1605
  #, c-format
  msgid "error gathering other user IDs: %s\n"
  msgstr "ошибка при сборе ID других пользователей: %s\n"
  
- #: g10/tofu.c:1523
++#: g10/tofu.c:1615
  msgid "This key's user IDs:\n"
  msgstr "Идентификаторы пользователя этого ключа:\n"
  
- #: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
++#: g10/tofu.c:1631 g10/tofu.c:1796
  #, c-format
  msgid "policy: %s"
  msgstr "правило: %s"
  
- #: g10/tofu.c:1630
++#: g10/tofu.c:1722
  #, c-format
  msgid "error gathering signature stats: %s\n"
  msgstr "ошибка сбора статистики подписей: %s\n"
  
- #: g10/tofu.c:1634
++#: g10/tofu.c:1726
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
@@@ -6955,67 -5477,121 +6948,137 @@@ msgstr[0] "Адрес электрон�
  msgstr[1] "Адрес электронной почты \"%s\" связан с %d ключами:\n"
  msgstr[2] "Адрес электронной почты \"%s\" связан с %d ключами:\n"
  
- #: g10/tofu.c:1651
++#: g10/tofu.c:1744
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr "Статистика ключей с адресом электронной почты \"%s\":\n"
  
- #: g10/tofu.c:1684 g10/tofu.c:1689
++#: g10/tofu.c:1785 g10/tofu.c:1790
  msgid ", "
  msgstr ", "
  
- #: g10/tofu.c:1693
++#: g10/tofu.c:1794
  msgid "this key"
  msgstr "этот ключ"
  
- #: g10/tofu.c:1715
- #, c-format
- msgid "Verified %d message"
- msgid_plural "Verified %d messages"
++#: g10/tofu.c:1820
+ #, fuzzy, c-format
+ #| msgid "Verified %d message"
+ #| msgid_plural "Verified %d messages"
+ msgid "Verified %d message."
+ msgid_plural "Verified %d messages."
  msgstr[0] "Проверено %d сообщение"
  msgstr[1] "Проверены %d сообщения"
  msgstr[2] "Проверено %d сообщений"
  
- #: g10/tofu.c:1719
- #, c-format
- msgid "Encrypted %d message"
- msgid_plural "Encrypted %d messages"
++#: g10/tofu.c:1824
+ #, fuzzy, c-format
+ #| msgid "Encrypted %d message"
+ #| msgid_plural "Encrypted %d messages"
+ msgid "Encrypted %d message."
+ msgid_plural "Encrypted %d messages."
  msgstr[0] "Зашифровано %d сообщение"
  msgstr[1] "Зашифрованы %d сообщения"
  msgstr[2] "Зашифровано %d сообщений"
  
- #: g10/tofu.c:1734
- #, c-format
- msgid " over the past day."
- msgid_plural " over the past %d days."
++#: g10/tofu.c:1831
+ #, fuzzy, c-format
+ #| msgid "Verified %d message"
+ #| msgid_plural "Verified %d messages"
+ msgid "Verified %d message in the future."
+ msgid_plural "Verified %d messages in the future."
+ msgstr[0] "Проверено %d сообщение"
+ msgstr[1] "Проверены %d сообщения"
+ msgstr[2] "Проверено %d сообщений"
+ 
++#: g10/tofu.c:1835
+ #, fuzzy, c-format
+ #| msgid ", and encrypted %ld message in the past %s"
+ #| msgid_plural ", and encrypted %ld messages in the past %s"
+ msgid "Encrypted %d message in the future."
+ msgid_plural "Encrypted %d messages in the future."
+ msgstr[0] ", зашифровано %ld сообщение за %s."
+ msgstr[1] ", зашифрованы %ld сообщения за %s."
+ msgstr[2] ", зашифровано %ld сообщений за %s."
+ 
++#: g10/tofu.c:1849
+ #, fuzzy, c-format
+ #| msgid " over the past day."
+ #| msgid_plural " over the past %d days."
+ msgid "Messages verified over the past %d day: %d."
+ msgid_plural "Messages verified over the past %d days: %d."
  msgstr[0] " за %d прошедший день."
  msgstr[1] " за %d прошедших дня."
  msgstr[2] " за %d прошедших дней."
  
- #: g10/tofu.c:1740
- #, c-format
- msgid " over the past month."
- msgid_plural " over the past %d months."
++#: g10/tofu.c:1855
+ #, fuzzy, c-format
+ #| msgid " over the past day."
+ #| msgid_plural " over the past %d days."
+ msgid "Messages encrypted over the past %d day: %d."
+ msgid_plural "Messages encrypted over the past %d days: %d."
+ msgstr[0] " за %d прошедший день."
+ msgstr[1] " за %d прошедших дня."
+ msgstr[2] " за %d прошедших дней."
+ 
++#: g10/tofu.c:1865
+ #, fuzzy, c-format
+ #| msgid " over the past month."
+ #| msgid_plural " over the past %d months."
+ msgid "Messages verified over the past %d month: %d."
+ msgid_plural "Messages verified over the past %d months: %d."
  msgstr[0] " за %d прошедший месяц."
  msgstr[1] " за %d прошедших месяца."
  msgstr[2] " за %d прошедших месяцев."
  
- #: g10/tofu.c:1746
- #, c-format
- msgid " over the past year."
- msgid_plural " over the past %d years."
++#: g10/tofu.c:1871
+ #, fuzzy, c-format
+ #| msgid " over the past month."
+ #| msgid_plural " over the past %d months."
+ msgid "Messages encrypted over the past %d month: %d."
+ msgid_plural "Messages encrypted over the past %d months: %d."
+ msgstr[0] " за %d прошедший месяц."
+ msgstr[1] " за %d прошедших месяца."
+ msgstr[2] " за %d прошедших месяцев."
+ 
++#: g10/tofu.c:1881
+ #, fuzzy, c-format
+ #| msgid " over the past year."
+ #| msgid_plural " over the past %d years."
+ msgid "Messages verified over the past %d year: %d."
+ msgid_plural "Messages verified over the past %d years: %d."
  msgstr[0] " за %d прошедший год."
  msgstr[1] " за %d прошедших дня."
  msgstr[2] " за %d прошедших дней."
  
- #: g10/tofu.c:1752
- msgid " in the past."
- msgstr " в прошлом."
++#: g10/tofu.c:1887
+ #, fuzzy, c-format
+ #| msgid " over the past year."
+ #| msgid_plural " over the past %d years."
+ msgid "Messages encrypted over the past %d year: %d."
+ msgid_plural "Messages encrypted over the past %d years: %d."
+ msgstr[0] " за %d прошедший год."
+ msgstr[1] " за %d прошедших дня."
+ msgstr[2] " за %d прошедших дней."
+ 
++#: g10/tofu.c:1895
+ #, fuzzy, c-format
+ #| msgid " over the past day."
+ #| msgid_plural " over the past %d days."
+ msgid "Messages verified in the past: %d."
+ msgstr " за %d прошедший день."
+ 
++#: g10/tofu.c:1899
+ #, fuzzy, c-format
+ #| msgid ", and encrypted %ld message in the past %s"
+ #| msgid_plural ", and encrypted %ld messages in the past %s"
+ msgid "Messages encrypted in the past: %d."
+ msgstr ", зашифровано %ld сообщение за %s."
  
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1767
++#: g10/tofu.c:1916
  msgid "TOFU detected a binding conflict"
  msgstr ""
  "Обычно с конкретным адресом электронной почты связан только один ключ. "
@@@ -7028,145 -5604,151 +7091,176 @@@
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1809
++#: g10/tofu.c:1958
  msgid "gGaAuUrRbB"
  msgstr "gGaAuUrRbB"
  
- #: g10/tofu.c:1815
++#: g10/tofu.c:1964
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  "(G)Хороший, (A)Пока принять, (U)Неясно, (R)Пока отвергнуть, (B)Плохой? "
  
- #: g10/tofu.c:1823
++#: g10/tofu.c:1972
  msgid "Defaulting to unknown."
  msgstr "Принимается исходное значение (неясно)."
  
- #: g10/tofu.c:1938 g10/tofu.c:2074
++#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr "Обнаружено повреждение базы данных TOFU.\n"
  
- #: g10/tofu.c:1994
++#: g10/tofu.c:2143
  #, c-format
  msgid "resetting keydb: %s\n"
  msgstr "сброс базы данных ключей: %s\n"
  
- #: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
- #: g10/tofu.c:2425
- #, c-format
- msgid "error setting TOFU binding's trust level to %s\n"
++#: g10/tofu.c:2601
+ #, fuzzy, c-format
+ #| msgid "error setting TOFU binding's trust level to %s\n"
+ msgid "error setting TOFU binding's policy to %s\n"
  msgstr "ошибка установки уровня доверия привязки TOFU в %s\n"
  
- #: g10/tofu.c:2473
++#: g10/tofu.c:2794
  #, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "ошибка при смене правила TOFU: %s\n"
  
- #. TRANSLATORS: The tilde ('~') is used here to indicate a
- #. * non-breakable space
- #: g10/tofu.c:2574
- #, c-format
- msgid "%d~year"
- msgid_plural "%d~years"
++#: g10/tofu.c:2839
+ #, fuzzy, c-format
+ #| msgid "%d~year"
+ #| msgid_plural "%d~years"
+ msgid "%lld~year"
+ msgid_plural "%lld~years"
  msgstr[0] "%d~год"
  msgstr[1] "%d~года"
  msgstr[2] "%d~лет"
  
- #: g10/tofu.c:2583
- #, c-format
- msgid "%d~month"
- msgid_plural "%d~months"
++#: g10/tofu.c:2844
+ #, fuzzy, c-format
+ #| msgid "%d~month"
+ #| msgid_plural "%d~months"
+ msgid "%lld~month"
+ msgid_plural "%lld~months"
  msgstr[0] "%d~месяц"
  msgstr[1] "%d~месяца"
  msgstr[2] "%d~месяцев"
  
- #: g10/tofu.c:2592
++#: g10/tofu.c:2849
  #, c-format
- msgid "%d~day"
- msgid_plural "%d~days"
+ msgid "%lld~week"
+ msgid_plural "%lld~weeks"
+ msgstr[0] ""
+ msgstr[1] ""
+ msgstr[2] ""
+ 
++#: g10/tofu.c:2854
+ #, fuzzy, c-format
+ #| msgid "%d~day"
+ #| msgid_plural "%d~days"
+ msgid "%lld~day"
+ msgid_plural "%lld~days"
  msgstr[0] "%d~день"
  msgstr[1] "%d~дня"
  msgstr[2] "%d~дней"
  
- #: g10/tofu.c:2601
- #, c-format
- msgid "%d~hour"
- msgid_plural "%d~hours"
++#: g10/tofu.c:2859
+ #, fuzzy, c-format
+ #| msgid "%d~hour"
+ #| msgid_plural "%d~hours"
+ msgid "%lld~hour"
+ msgid_plural "%lld~hours"
  msgstr[0] "%d~час"
  msgstr[1] "%d~часа"
  msgstr[2] "%d~часов"
  
- #: g10/tofu.c:2610
- #, c-format
- msgid "%d~minute"
- msgid_plural "%d~minutes"
++#: g10/tofu.c:2864
+ #, fuzzy, c-format
+ #| msgid "%d~minute"
+ #| msgid_plural "%d~minutes"
+ msgid "%lld~minute"
+ msgid_plural "%lld~minutes"
  msgstr[0] "%d~минута"
  msgstr[1] "%d~минуты"
  msgstr[2] "%d~минут"
  
- #: g10/tofu.c:2619
- #, c-format
- msgid "%d~second"
- msgid_plural "%d~seconds"
++#: g10/tofu.c:2866
+ #, fuzzy, c-format
+ #| msgid "%d~second"
+ #| msgid_plural "%d~seconds"
+ msgid "%lld~second"
+ msgid_plural "%lld~seconds"
  msgstr[0] "%d~секунда"
  msgstr[1] "%d~секунды"
  msgstr[2] "%d~секунд"
  
- #: g10/tofu.c:2802
++#: g10/tofu.c:3103
  #, c-format
- msgid "%s: "
- msgstr "%s: "
+ msgid "%s: Verified 0~signatures and encrypted 0~messages."
+ msgstr ""
  
- #: g10/tofu.c:2806
- #, c-format
- msgid "Verified %ld signatures"
++#: g10/tofu.c:3109
+ #, fuzzy, c-format
+ #| msgid "Verified %ld signatures"
+ msgid "%s: Verified 0 signatures."
  msgstr "Проверено %ld подписей"
  
- #: g10/tofu.c:2816
- #, c-format
- msgid "Verified %ld signature in the past %s"
- msgid_plural "Verified %ld signatures in the past %s"
++#: g10/tofu.c:3117
+ #, fuzzy, c-format
+ #| msgid "Verified %ld signature in the past %s"
+ #| msgid_plural "Verified %ld signatures in the past %s"
+ msgid "%s: Verified %ld~signature in the past %s."
+ msgid_plural "%s: Verified %ld~signatures in the past %s."
  msgstr[0] "Проверена %ld подпись за %s."
  msgstr[1] "Проверены %ld прописи за %s."
  msgstr[2] "Проверено %ld подписей за %s."
  
- #: g10/tofu.c:2826
- #, c-format
- msgid ", and encrypted %ld messages"
- msgstr ", зашифровано %ld сообщений"
++#: g10/tofu.c:3127
+ #, fuzzy
+ #| msgid "Encrypted %d message"
+ #| msgid_plural "Encrypted %d messages"
+ msgid "Encrypted 0 messages."
+ msgstr "Зашифровано %d сообщение"
  
- #: g10/tofu.c:2835
- #, c-format
- msgid ", and encrypted %ld message in the past %s"
- msgid_plural ", and encrypted %ld messages in the past %s"
++#: g10/tofu.c:3135
+ #, fuzzy, c-format
+ #| msgid ", and encrypted %ld message in the past %s"
+ #| msgid_plural ", and encrypted %ld messages in the past %s"
+ msgid "Encrypted %ld~message in the past %s."
+ msgid_plural "Encrypted %ld~messages in the past %s."
  msgstr[0] ", зашифровано %ld сообщение за %s."
  msgstr[1] ", зашифрованы %ld сообщения за %s."
  msgstr[2] ", зашифровано %ld сообщений за %s."
  
- #: g10/tofu.c:2880
++#: g10/tofu.c:3146
+ #, fuzzy, c-format
+ #| msgid "policy: %s"
+ msgid "(policy: %s)"
+ msgstr "правило: %s"
+ 
++#: g10/tofu.c:3177
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  "Внимание: мы до сих пор не видели ни одного сообщения, подписанного этим "
  "ключом и этим идентификатором пользователя!\n"
  
- #: g10/tofu.c:2883
++#: g10/tofu.c:3180
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  "Внимание: мы до сих пор видели только одно сообщение, подписанное этим "
  "ключом и этим идентификатором пользователя!\n"
  
- #: g10/tofu.c:2887
++#: g10/tofu.c:3184
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  "Внимание: мы до сих пор не зашифровали этим ключом ни одного сообщения!\n"
  
- #: g10/tofu.c:2890
++#: g10/tofu.c:3187
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  "Внимание: мы до сих пор зашифровали этим ключом только одно сообщение!\n"
  
- #: g10/tofu.c:2919
++#: g10/tofu.c:3216
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7199,20 -5781,17 +7293,21 @@@ msgstr[2] "
  "некачественный командой\n"
  "  %s\n"
  
- #: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
- #: g10/tofu.c:3480 g10/tofu.c:3572
++#: g10/tofu.c:3298 g10/tofu.c:3449 g10/tofu.c:3627 g10/tofu.c:3670
++#: g10/tofu.c:3784 g10/tofu.c:3859 g10/tofu.c:3894
  #, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "ошибка при открытии базы данных TOFU: %s\n"
  
- #: g10/tofu.c:3185
- #, c-format
- msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
++#: g10/tofu.c:3482
+ #, fuzzy, c-format
+ #| msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
  msgstr ""
  "ВНИМАНИЕ: Шифрование для ключа %s, у которого нет неотозванных "
  "идентификаторов пользователя.\n"
  
- #: g10/tofu.c:3515
++#: g10/tofu.c:3819
  #, c-format
  msgid "error setting policy for key %s, user id \"%s\": %s"
  msgstr ""
@@@ -7244,68 -5818,54 +7339,68 @@@ msgstr "ключ %s: нет откры�
  msgid "key %s marked as ultimately trusted\n"
  msgstr "ключ %s помечен как абсолютно доверенный\n"
  
- #: g10/trustdb.c:341
++#: g10/trustdb.c:348
  #, c-format
  msgid "trust record %lu, req type %d: read failed: %s\n"
  msgstr "запись о доверии %lu, тип запроса %d: сбой чтения: %s\n"
  
- #: g10/trustdb.c:347
++#: g10/trustdb.c:354
  #, c-format
  msgid "trust record %lu is not of requested type %d\n"
  msgstr "тип записи о доверии %lu отличается от запрошенного (%d)\n"
  
- #: g10/trustdb.c:422
++#: g10/trustdb.c:429
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr "Можно попытаться пересоздать таблицу доверия командами:\n"
  
- #: g10/trustdb.c:431
++#: g10/trustdb.c:438
  msgid "If that does not work, please consult the manual\n"
  msgstr "Если это не выйдет, обратитесь к руководству пользователя\n"
  
- #: g10/trustdb.c:468
++#: g10/trustdb.c:475
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  "не могу использовать неизвестную модель (%d) - использую модель доверия %s\n"
  
- #: g10/trustdb.c:474
++#: g10/trustdb.c:481
  #, c-format
  msgid "using %s trust model\n"
  msgstr "использую модель доверия %s\n"
  
- #: g10/trustdb.c:511
++#: g10/trustdb.c:518
  msgid "no need for a trustdb check\n"
  msgstr "проверка таблицы доверия не нужна\n"
  
- #: g10/trustdb.c:517 g10/trustdb.c:2160
++#: g10/trustdb.c:524 g10/trustdb.c:2187
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "срок следующей проверки таблицы доверия %s\n"
  
- #: g10/trustdb.c:526
++#: g10/trustdb.c:533
  #, c-format
  msgid "no need for a trustdb check with '%s' trust model\n"
  msgstr "проверять таблицу доверия при модели доверия '%s' не нужно\n"
  
- #: g10/trustdb.c:542
++#: g10/trustdb.c:549
  #, c-format
  msgid "no need for a trustdb update with '%s' trust model\n"
  msgstr "обновлять таблицу доверия при модели доверия '%s' не нужно\n"
  
- #: g10/trustdb.c:749 g10/trustdb.c:1313
++#: g10/trustdb.c:756 g10/trustdb.c:1340
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "открытый ключ %s не найден: %s\n"
  
- #: g10/trustdb.c:966
++#: g10/trustdb.c:973
  msgid "please do a --check-trustdb\n"
  msgstr "выполните --check-trustdb, пожалуйста\n"
  
- #: g10/trustdb.c:971
++#: g10/trustdb.c:978
  msgid "checking the trustdb\n"
  msgstr "проверка таблицы доверия\n"
  
- #: g10/trustdb.c:1883
++#: g10/trustdb.c:1910
  #, c-format
  msgid "%d key processed"
  msgid_plural "%d keys processed"
@@@ -7313,7 -5873,6 +7408,7 @@@ msgstr[0] "обработан %d клю
  msgstr[1] "обработаны %d ключа"
  msgstr[2] "обработано %d ключей"
  
- #: g10/trustdb.c:1886
++#: g10/trustdb.c:1913
  #, c-format
  msgid " (%d validity count cleared)\n"
  msgid_plural " (%d validity counts cleared)\n"
@@@ -7321,16 -5880,13 +7416,16 @@@ msgstr[0] " (сброшен %d счет
  msgstr[1] " (сброшены %d счетчика достоверности)\n"
  msgstr[2] " (сброшено %d счетчиков достоверности)\n"
  
- #: g10/trustdb.c:1956
++#: g10/trustdb.c:1983
  msgid "no ultimately trusted keys found\n"
  msgstr "абсолютно доверенных ключей не найдено\n"
  
- #: g10/trustdb.c:1970
++#: g10/trustdb.c:1997
  #, c-format
  msgid "public key of ultimately trusted key %s not found\n"
  msgstr "открытый ключ для абсолютно доверенного ключа %s не найден\n"
  
- #: g10/trustdb.c:2087
++#: g10/trustdb.c:2114
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7338,7 -5894,6 +7433,7 @@@ msgstr "
  "глубина: %d  достоверных: %3d  подписанных: %3d  доверие: %d-, %dq, %dn, "
  "%dm, %df, %du\n"
  
- #: g10/trustdb.c:2167
++#: g10/trustdb.c:2194
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr ""
@@@ -7448,19 -5982,14 +7543,19 @@@ msgstr "
  "Синтаксис: kbxutil [параметры] [файлы]\n"
  "Просмотр, экспорт, импорт данных щита с ключами\n"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3208
++#: scd/app-nks.c:718 scd/app-openpgp.c:3221
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr "Модули RSA пропущены, или их размер не равен %d бит\n"
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3220
++#: scd/app-nks.c:726 scd/app-openpgp.c:3233
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr "отсутствует открытая экспонента RSA, или ее размер превышает %d бит\n"
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
- #: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
- #: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1965 scd/app-openpgp.c:1984
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2166 scd/app-openpgp.c:2430
++#: scd/app-openpgp.c:2477 scd/app-openpgp.c:2582 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "Функция обработки PIN возвратила ошибку: %s\n"
@@@ -7509,83 -6029,65 +7604,83 @@@ msgstr "
  "|P|Введите код разблокировки PIN (PUK) ключа для создания квалифицированных "
  "подписей."
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2511 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "ошибка при получении нового PIN: %s\n"
  
- #: scd/app-openpgp.c:806
++#: scd/app-openpgp.c:801
  #, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "сбой при сохранении отпечатка: %s\n"
  
- #: scd/app-openpgp.c:819
++#: scd/app-openpgp.c:814
  #, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "сбой при сохранении даты создания: %s\n"
  
- #: scd/app-openpgp.c:1236
++#: scd/app-openpgp.c:1247
  msgid "response does not contain the RSA modulus\n"
  msgstr "в ответе отсутствует модуль RSA\n"
  
- #: scd/app-openpgp.c:1243
++#: scd/app-openpgp.c:1254
  msgid "response does not contain the RSA public exponent\n"
  msgstr "в ответе отсутствует открытая экспонента RSA\n"
  
- #: scd/app-openpgp.c:1353
++#: scd/app-openpgp.c:1364
  msgid "response does not contain the EC public key\n"
  msgstr "в ответе отсутствует открытый ключ эллиптической кривой\n"
  
- #: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:1464 scd/app-openpgp.c:3825
  msgid "response does not contain the public key data\n"
  msgstr "ответ не содержит данных открытого ключа\n"
  
- #: scd/app-openpgp.c:1551
++#: scd/app-openpgp.c:1564
  #, c-format
  msgid "reading public key failed: %s\n"
  msgstr "сбой при чтении открытого ключа: %s\n"
  
- #: scd/app-openpgp.c:1903
++#: scd/app-openpgp.c:1916
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr "основной PIN применяется как %s\n"
  
- #: scd/app-openpgp.c:1910
++#: scd/app-openpgp.c:1923
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  "не удалось применить основной PIN как %s: %s - далее применяться\n"
  "как основной не будет\n"
  
- #: scd/app-openpgp.c:1925
++#: scd/app-openpgp.c:1938
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr "||Введите PIN%%0A[сделано подписей: %lu]"
  
- #: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
++#: scd/app-openpgp.c:1949 scd/app-openpgp.c:2424
  msgid "||Please enter the PIN"
  msgstr "||Введите PIN"
  
- #: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2173 scd/app-openpgp.c:2437
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr "PIN для CHV%d слишком короток, минимальная длина %d\n"
  
- #: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
- #: scd/app-openpgp.c:4114
++#: scd/app-openpgp.c:2004 scd/app-openpgp.c:2043 scd/app-openpgp.c:2185
++#: scd/app-openpgp.c:4126
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "сбой при проверке CHV%d: %s\n"
  
- #: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
++#: scd/app-openpgp.c:2072 scd/app-openpgp.c:2458 scd/app-openpgp.c:4556
  msgid "error retrieving CHV status from card\n"
  msgstr "ошибка получения статуса CHV с карты\n"
  
- #: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
++#: scd/app-openpgp.c:2078 scd/app-openpgp.c:4565
  msgid "card is permanently locked!\n"
  msgstr "карта окончательно заблокирована!\n"
  
- #: scd/app-openpgp.c:2072
++#: scd/app-openpgp.c:2085
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7599,24 -6101,19 +7694,24 @@@ msgstr[2] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:2082
++#: scd/app-openpgp.c:2095
  #, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "|A|Введите административный PIN%%0A[осталось попыток: %d]"
  
- #: scd/app-openpgp.c:2086
++#: scd/app-openpgp.c:2099
  msgid "|A|Please enter the Admin PIN"
  msgstr "|A|Введите административный PIN"
  
- #: scd/app-openpgp.c:2107
++#: scd/app-openpgp.c:2120
  msgid "access to admin commands is not configured\n"
  msgstr "доступ к командам управления не настроен\n"
  
- #: scd/app-openpgp.c:2460
++#: scd/app-openpgp.c:2473
  msgid "||Please enter the Reset Code for the card"
  msgstr "||Введите код сброса для карты"
  
- #: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
++#: scd/app-openpgp.c:2483 scd/app-openpgp.c:2537
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr "Код сброса слишком короток; минимальная длина %d\n"
@@@ -7624,77 -6121,59 +7719,77 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2493
++#: scd/app-openpgp.c:2506
  msgid "|RN|New Reset Code"
  msgstr "|RN|Новый код сброса"
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|AN|New Admin PIN"
  msgstr "|AN|Новый административный PIN"
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|N|New PIN"
  msgstr "|N|Новый PIN"
  
- #: scd/app-openpgp.c:2565
++#: scd/app-openpgp.c:2578
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "|A|Введите административный PIN и новый административный PIN"
  
- #: scd/app-openpgp.c:2566
++#: scd/app-openpgp.c:2579
  msgid "||Please enter the PIN and New PIN"
  msgstr "||Введите PIN и новый PIN"
  
- #: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
++#: scd/app-openpgp.c:2635 scd/app-openpgp.c:3885
  msgid "error reading application data\n"
  msgstr "ошибка чтения данных приложения\n"
  
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
++#: scd/app-openpgp.c:2641 scd/app-openpgp.c:3892
  msgid "error reading fingerprint DO\n"
  msgstr "ошибка чтения отпечатка DO\n"
  
- #: scd/app-openpgp.c:2638
++#: scd/app-openpgp.c:2651
  msgid "key already exists\n"
  msgstr "ключ уже существует\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2655
  msgid "existing key will be replaced\n"
  msgstr "существующий ключ будет заменен\n"
  
- #: scd/app-openpgp.c:2644
++#: scd/app-openpgp.c:2657
  msgid "generating new key\n"
  msgstr "генерация нового ключа\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2659
  msgid "writing new key\n"
  msgstr "запись нового ключа\n"
  
- #: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
++#: scd/app-openpgp.c:3201 scd/app-openpgp.c:3553
  msgid "creation timestamp missing\n"
  msgstr "пропущена метка времени создания\n"
  
- #: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
++#: scd/app-openpgp.c:3243 scd/app-openpgp.c:3251
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr "Простое число RSA %s пропущено или его размер не равен %d бит\n"
  
- #: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
++#: scd/app-openpgp.c:3384 scd/app-openpgp.c:3647
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "сбой сохранения ключа: %s\n"
  
- #: scd/app-openpgp.c:3534
++#: scd/app-openpgp.c:3547
  msgid "unsupported curve\n"
  msgstr "кривая не поддерживается\n"
  
- #: scd/app-openpgp.c:3790
++#: scd/app-openpgp.c:3802
  msgid "please wait while key is being generated ...\n"
  msgstr "пожалуйста, подождите, пока будет генерироваться ключ ...\n"
  
- #: scd/app-openpgp.c:3798
++#: scd/app-openpgp.c:3810
  msgid "generating key failed\n"
  msgstr "сбой при генерации ключа\n"
  
- #: scd/app-openpgp.c:3804
++#: scd/app-openpgp.c:3816
  #, c-format
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
@@@ -7702,31 -6181,25 +7797,31 @@@ msgstr[0] "создание ключа 
  msgstr[1] "создание ключа завершено (%d секунды)\n"
  msgstr[2] "создание ключа завершено (%d секунд)\n"
  
- #: scd/app-openpgp.c:3838
++#: scd/app-openpgp.c:3850
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "недопустимая структура карты OpenPGP (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:3900
  msgid "fingerprint on card does not match requested one\n"
  msgstr "отпечаток на карте не совпадает с запрошенным\n"
  
- #: scd/app-openpgp.c:4004
++#: scd/app-openpgp.c:4016
  #, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "карта не поддерживает хеш-функцию %s\n"
  
- #: scd/app-openpgp.c:4089
++#: scd/app-openpgp.c:4101
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "создано подписей: %lu\n"
  
- #: scd/app-openpgp.c:4551
++#: scd/app-openpgp.c:4570
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  "проверка административного PIN в данный момент запрещена этой командой\n"
  
- #: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
++#: scd/app-openpgp.c:4871 scd/app-openpgp.c:4882
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "нет доступа к %s - непригодная карта OpenPGP?\n"
@@@ -7746,7 -6216,6 +7841,7 @@@ msgstr "|N|Первоначальны�
  msgid "run in multi server mode (foreground)"
  msgstr "работать в многосерверном режиме (нефоновый режим)"
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|LEVEL|установить уровень отладки, равный LEVEL"
  
@@@ -7786,11 -6246,9 +7881,11 @@@ msgstr "не позволять исп�
  msgid "use variable length input for pinpad"
  msgstr "использовать входные данные переменой длины для клавиатуры считывателя"
  
- #: scd/scdaemon.c:287
++#: scd/scdaemon.c:286
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Вызов: @SCDAEMON@ [параметры] (-h для подсказки)"
  
- #: scd/scdaemon.c:289
++#: scd/scdaemon.c:288
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
@@@ -7798,17 -6256,14 +7893,17 @@@ msgstr "
  "Синтаксис: scdaemon [параметры] [команда [аргументы]]\n"
  "Демон криптографических карт для @GNUPG@\n"
  
- #: scd/scdaemon.c:786
++#: scd/scdaemon.c:784
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  "используйте параметр '--daemon' для запуска приложения в фоновом режиме\n"
  
- #: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1904
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "обработчик fd %d запущен\n"
  
- #: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
++#: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1909
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "обработчик fd %d остановлен\n"
@@@ -7884,9 -6323,6 +7979,9 @@@ msgstr "число соответств
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "ключ не найден в буфере dirmngr: %s\n"
  
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
 +#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  msgid "failed to allocate keyDB handle\n"
  msgstr "сбой при выделении памяти под указатель на базу данных\n"
  
@@@ -8360,11 -6694,9 +8455,11 @@@ msgstr "
  msgid "resource problem: out of core\n"
  msgstr "проблема ресурсов: нехватка выделенной памяти\n"
  
- #: sm/decrypt.c:330
++#: sm/decrypt.c:332
  msgid "(this is the RC2 algorithm)\n"
  msgstr "(это алгоритм RC2)\n"
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:334
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr "(это не похоже на зашифрованное сообщение)\n"
  
@@@ -8405,115 -6729,87 +8500,115 @@@ msgstr "вывести список в�
  msgid "list certificate chain"
  msgstr "вывести список цепочек сертификатов"
  
- #: sm/gpgsm.c:218
++#: sm/gpgsm.c:219
  msgid "import certificates"
  msgstr "импорт сертификатов"
  
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
  msgid "export certificates"
  msgstr "экспорт сертификатов"
  
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:228
  msgid "register a smartcard"
  msgstr "зарегистрировать криптографическую карту"
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:231
  msgid "pass a command to the dirmngr"
  msgstr "передать команду dirmngr"
  
- #: sm/gpgsm.c:232
++#: sm/gpgsm.c:233
  msgid "invoke gpg-protect-tool"
  msgstr "вызываем gpg-protect-tool"
  
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:250
  msgid "create base-64 encoded output"
  msgstr "вывод в кодировке base64"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in PEM format"
  msgstr "предполагаю, что входные данные в формате PEM"
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in base-64 format"
  msgstr "предполагаю, что входные данные в формате base64"
  
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:262
  msgid "assume input is in binary format"
  msgstr "предполагаю, что входные данные в двоичном формате"
  
- #: sm/gpgsm.c:267
++#: sm/gpgsm.c:269
  msgid "never consult a CRL"
  msgstr "не сверять со списком отозванных сертификатов"
  
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:279
  msgid "check validity using OCSP"
  msgstr "проверка достоверности с помощью OCSP"
  
- #: sm/gpgsm.c:282
++#: sm/gpgsm.c:284
  msgid "|N|number of certificates to include"
  msgstr "|N|число включаемых сертификатов"
  
- #: sm/gpgsm.c:285
++#: sm/gpgsm.c:287
  msgid "|FILE|take policy information from FILE"
  msgstr "|FILE|взять информацию о правилах из файла FILE"
  
- #: sm/gpgsm.c:288
++#: sm/gpgsm.c:290
  msgid "do not check certificate policies"
  msgstr "не проверять правила сертификата"
  
- #: sm/gpgsm.c:292
++#: sm/gpgsm.c:294
  msgid "fetch missing issuer certificates"
  msgstr "запросить недостающих издателей сертификатов"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "don't use the terminal at all"
  msgstr "не использовать терминал совсем"
  
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:307
  msgid "|FILE|write a server mode log to FILE"
  msgstr "|FILE|сохранять журнал режима сервера в файле FILE"
  
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:312
  msgid "|FILE|write an audit log to FILE"
  msgstr "|FILE|сохранять журнал аудита в файле FILE"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "batch mode: never ask"
  msgstr "пакетный режим: ничего не спрашивать"
  
- #: sm/gpgsm.c:314
++#: sm/gpgsm.c:316
  msgid "assume yes on most questions"
  msgstr "принять 'да' как ответ на большинство вопросов"
  
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:317
  msgid "assume no on most questions"
  msgstr "принять 'нет' как ответ на большинство вопросов"
  
- #: sm/gpgsm.c:318
++#: sm/gpgsm.c:320
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "|FILE|добавить таблицу ключей в список таблиц ключей"
  
- #: sm/gpgsm.c:321
++#: sm/gpgsm.c:323
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|USER-ID|использовать USER-ID как основной секретный ключ"
  
- #: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|SPEC|искать ключи на данном сервере ключей"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|NAME|использовать алгоритм шифрования NAME"
  
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:352
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|NAME|использовать хеш-функцию NAME"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:559
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
  msgstr "Вызов: @GPGSM@ [параметры] [файлы] (-h для подсказки)"
  
- #: sm/gpgsm.c:570
++#: sm/gpgsm.c:562
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
  "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@@ -8524,46 -6820,37 +8619,46 @@@ msgstr "
  "MIME\n"
  "Операция по умолчанию зависит от входных данных\n"
  
- #: sm/gpgsm.c:774
++#: sm/gpgsm.c:766
  #, c-format
  msgid "Note: won't be able to encrypt to '%s': %s\n"
  msgstr "Замечание: не могу зашифровать для '%s': %s\n"
  
- #: sm/gpgsm.c:785
++#: sm/gpgsm.c:777
  #, c-format
  msgid "unknown validation model '%s'\n"
  msgstr "неизвестная схема проверки '%s'\n"
  
- #: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
  #, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "%s:%u: не задано имя хоста\n"
  
- #: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr "%s:%u: задан пароль, но не задан пользователь\n"
  
- #: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
  #, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr "%s:%u: пропускаю эту строку\n"
  
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1427
  msgid "could not parse keyserver\n"
  msgstr "не удалось определить сервер ключей\n"
  
- #: sm/gpgsm.c:1636
++#: sm/gpgsm.c:1630
  #, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "импорт общих сертификатов '%s'\n"
  
- #: sm/gpgsm.c:1677
++#: sm/gpgsm.c:1671
  #, c-format
  msgid "can't sign using '%s': %s\n"
  msgstr "невозможно подписать с помощью '%s': %s\n"
  
- #: sm/gpgsm.c:2033
++#: sm/gpgsm.c:2028
  msgid "invalid command (there is no implicit command)\n"
  msgstr "недопустимая команда (неявной команды нет)\n"
  
@@@ -9342,8 -7478,6 +9437,8 @@@ msgstr "
  "Доступ к списку отозванных сертификатов невозможен\n"
  "из-за того, что не задействуется %s\n"
  
 +#: dirmngr/crlfetch.c:223 dirmngr/ldap-wrapper-ce.c:488
- #: dirmngr/ldap-wrapper.c:742 dirmngr/misc.c:563
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:563
  #, c-format
  msgid "error initializing reader object: %s\n"
  msgstr "ошибка инициализации объекта устройства чтения: %s\n"
@@@ -9516,120 -7614,92 +9611,120 @@@ msgstr "нужно абсолютно�
  msgid "looking up '%s'\n"
  msgstr "поиск '%s'\n"
  
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:160
  msgid "list the contents of the CRL cache"
  msgstr "вывести содержание буфера списков отозванных сертификатов"
  
- #: dirmngr/dirmngr.c:158
++#: dirmngr/dirmngr.c:161
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|FILE|загрузить список отозванных сертификатов из файла FILE в буфер"
  
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:162
  msgid "|URL|fetch a CRL from URL"
  msgstr "|URL|получить список отозванных сертификатов из URL"
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:163
  msgid "shutdown the dirmngr"
  msgstr "выключить dirmngr"
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:164
  msgid "flush the cache"
  msgstr "записать буфер на диск"
  
- #: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
- #: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
++#: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|FILE|сохранять журнал режима сервера в файле FILE"
  
- #: dirmngr/dirmngr.c:177
++#: dirmngr/dirmngr.c:180
  msgid "run without asking a user"
  msgstr "работать, не спрашивая пользователя"
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:181
  msgid "force loading of outdated CRLs"
  msgstr "принудительная загрузка устаревших списков отозванных сертификатов"
  
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:182
  msgid "allow sending OCSP requests"
  msgstr "разрешить посылку запросов OCSP"
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:184
  #, fuzzy
  #| msgid "query the software version database"
  msgid "allow online software version check"
  msgstr "запросить базу данных версий программ"
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:185
  msgid "inhibit the use of HTTP"
  msgstr "запретить использование HTTP"
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:186
  msgid "inhibit the use of LDAP"
  msgstr "запретить использование LDAP"
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:188
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  "игнорировать точки распространения списков отозванных сертификатов по HTTP"
  
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  "игнорировать точки распространения списков отозванных сертификатов по LDAP"
  
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:192
  msgid "ignore certificate contained OCSP service URLs"
  msgstr "игнорировать URL служб OCSP из сертификата"
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr "|URL|перенаправлять все запросы HTTP на URL"
  
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
  msgid "|HOST|use HOST for LDAP queries"
  msgstr "|HOST|использовать хост HOST для поиска LDAP"
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr "не пользоваться запасными хостами с --ldap-proxy"
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:202
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FILE|взять список серверов LDAP из файла FILE"
  
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  "добавлять новые серверы, обнаруженные в точках распространения списков "
  "отозванных сертификатов, в список серверов"
  
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr "|N|установить время ожидания LDAP N секунд"
  
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:210
  msgid "|URL|use OCSP responder at URL"
  msgstr "|URL|использовать ответчик OCSP по URL"
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:212
  msgid "|FPR|OCSP response signed by FPR"
  msgstr "|FPR|ответ OCSP подписан сертификатом с отпечатком FPR"
  
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:218
  msgid "|N|do not return more than N items in one query"
  msgstr "|N|не возвращать более чем N результатов одного поиска"
  
- #: dirmngr/dirmngr.c:220
++#: dirmngr/dirmngr.c:223
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  "|FILE|использовать сертификаты удостоверяющего центра из файла FILE для HKP "
  "по TLS"
  
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:225
  msgid "route all network traffic via Tor"
  msgstr "проводить весь сетевой обмен через Tor"
  
- #: dirmngr/dirmngr.c:240
++#: dirmngr/dirmngr.c:246
  msgid ""
  "@\n"
  "(See the \"info\" manual for a complete listing of all commands and "
@@@ -9638,11 -7708,9 +9733,11 @@@ msgstr "
  "@\n"
  "(Полный список команд и параметров см. в руководстве \"info\")\n"
  
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:361
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Вызов: @DIRMNGR@ [параметры] (-h для подсказки)"
  
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:363
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9650,77 -7718,60 +9745,77 @@@ msgstr "
  "Синтаксис: @DIRMNGR@ [параметры] [команда [аргументы]]\n"
  "Доступ к OCSP, серверам ключей, спискам отозванных сертификатов для @GNUPG@\n"
  
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:443
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr "допустимые уровни отладки: %s\n"
  
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
- #: tools/gpgconf.c:648
++#: dirmngr/dirmngr.c:496 tools/gpgconf.c:550 tools/gpgconf.c:585
++#: tools/gpgconf.c:656
  #, c-format
  msgid "usage: %s [options] "
  msgstr "вызов: %s [параметры] "
  
- #: dirmngr/dirmngr.c:1062
++#: dirmngr/dirmngr.c:1074
  msgid "colons are not allowed in the socket name\n"
  msgstr "двоеточия в имени сокета недопустимы\n"
  
- #: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
++#: dirmngr/dirmngr.c:1300 dirmngr/server.c:1585
  #, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "сбой при получении списка отозванных сертификатов из '%s': %s\n"
  
- #: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
++#: dirmngr/dirmngr.c:1306 dirmngr/server.c:1591
  #, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "сбой обработки списка отозванных сертификатов из '%s': %s\n"
  
- #: dirmngr/dirmngr.c:1484
++#: dirmngr/dirmngr.c:1487
  #, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "%s:%u: слишком длинная строка - пропущена\n"
  
- #: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
++#: dirmngr/dirmngr.c:1542 dirmngr/dirmngr.c:1626
  #, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "%s:%u: обнаружен неверный отпечаток\n"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
++#: dirmngr/dirmngr.c:1578 dirmngr/dirmngr.c:1604 tools/gpgconf-comp.c:4032
  #, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "%s:%u: ошибка чтения: %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1633
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr "%s:%u: мусор в конце строки игнорируется\n"
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1700
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr "получен SIGHUP - повторное чтение настроек и запись буферов на диск\n"
  
- #: dirmngr/dirmngr.c:1734
++#: dirmngr/dirmngr.c:1738
  msgid "SIGUSR2 received - no action defined\n"
  msgstr "получен SIGUSR2 - действие не определено\n"
  
- #: dirmngr/dirmngr.c:1739
++#: dirmngr/dirmngr.c:1743
  msgid "SIGTERM received - shutting down ...\n"
  msgstr "получен SIGTERM - завершение работы ...\n"
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1745
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr "получен SIGTERM - осталось %d активных соединений\n"
  
- #: dirmngr/dirmngr.c:1746
++#: dirmngr/dirmngr.c:1750
  msgid "shutdown forced\n"
  msgstr "принудительное выключение\n"
  
- #: dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1758
  msgid "SIGINT received - immediate shutdown\n"
  msgstr "получен SIGINT - немедленное завершение работы\n"
  
- #: dirmngr/dirmngr.c:1761
++#: dirmngr/dirmngr.c:1765
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr "получен сигнал %d - действие не определено\n"
@@@ -10183,32 -8135,26 +10278,32 @@@ msgstr "сбой fetch_next_cert: %s\n
  msgid "max_replies %d exceeded\n"
  msgstr "превышено max_replies %d\n"
  
- #: dirmngr/server.c:2463
++#: dirmngr/server.c:2469
  #, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "сбой при выделении памяти под управляющую структуру: %s\n"
  
- #: dirmngr/server.c:2474
++#: dirmngr/server.c:2480
  #, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "сбой размещения контекста Assuan: %s\n"
  
- #: dirmngr/server.c:2495
++#: dirmngr/server.c:2501
  #, c-format
  msgid "failed to initialize the server: %s\n"
  msgstr "сбой инициализации сервера: %s\n"
  
- #: dirmngr/server.c:2503
++#: dirmngr/server.c:2509
  #, c-format
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "сбой регистрации команд с помощью Assuan: %s\n"
  
- #: dirmngr/server.c:2534
++#: dirmngr/server.c:2540
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr "проблема с приемом Assuan: %s\n"
  
- #: dirmngr/server.c:2553
++#: dirmngr/server.c:2559
  #, c-format
  msgid "Assuan processing failed: %s\n"
  msgstr "сбой обработки Assuan: %s\n"
@@@ -10253,7 -8190,6 +10348,7 @@@ msgstr "
  "сертификат не следовало использовать для подписывания списка отозванных "
  "сертификатов\n"
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:167
  msgid "quiet"
  msgstr "менее подробно"
  
@@@ -10344,22 -8260,15 +10439,22 @@@ msgstr "сбой отправки ст�
  msgid "error sending standard options: %s\n"
  msgstr "ошибка отправки стандартных параметров: %s\n"
  
 +#: tools/gpgconf-comp.c:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
- #: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
++#: tools/gpgconf-comp.c:766 tools/gpgconf-comp.c:865
  msgid "Options controlling the diagnostic output"
  msgstr "Параметры, управляющие выводом диагностики"
  
 +#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
- #: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
++#: tools/gpgconf-comp.c:779 tools/gpgconf-comp.c:888
  msgid "Options controlling the configuration"
  msgstr "Параметры, управляющие настройками"
  
- #: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
- #: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
++#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:723
++#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:901
  msgid "Options useful for debugging"
  msgstr "Параметры, полезные для отладки"
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
  msgid "Options controlling the security"
  msgstr "Параметры, управляющие безопасностью"
  
@@@ -10407,11 -8305,9 +10502,11 @@@ msgstr "не разрешать пов�
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr "|N|установить время ожидания ввода пароля N секунд"
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
++#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
  msgid "|NAME|use NAME as default secret key"
  msgstr "|NAME|использовать NAME как основной секретный ключ"
  
- #: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
++#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:784
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NAME|зашифровывать также для ID пользователя NAME"
  
@@@ -10419,178 -8314,152 +10514,196 @@@
  msgid "|SPEC|set up email aliases"
  msgstr "|SPEC|установить синонимы электронной почты"
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
++#: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
  msgid "Configuration for Keyservers"
  msgstr "Настройки серверов ключей"
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
++#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
  msgid "|URL|use keyserver at URL"
  msgstr "|URL|использовать север ключей по URL"
  
- #: tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:741
  msgid "allow PKA lookups (DNS requests)"
  msgstr "разрешить поиск по PKA (запросы DNS)"
  
- #: tools/gpgconf-comp.c:738
++#: tools/gpgconf-comp.c:744
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr ""
  "|MECHANISMS|использовать механизмы MECHANISMS для поиска ключей по адресу "
  "электронной почты"
  
- #: tools/gpgconf-comp.c:787
++#: tools/gpgconf-comp.c:793
  msgid "disable all access to the dirmngr"
  msgstr "полностью запретить доступ к dirmngr"
  
- #: tools/gpgconf-comp.c:790
++#: tools/gpgconf-comp.c:796
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
  msgstr "|NAME|использовать кодировку NAME для фраз-паролей PKCS#12"
  
- #: tools/gpgconf-comp.c:820
++#: tools/gpgconf-comp.c:829
  msgid "do not check CRLs for root certificates"
  msgstr "не проверять списки отозванных сертификатов для корневых сертификатов"
  
- #: tools/gpgconf-comp.c:869
++#: tools/gpgconf-comp.c:878
  msgid "Options controlling the format of the output"
  msgstr "Параметры, управляющие форматом вывода"
  
- #: tools/gpgconf-comp.c:905
++#: tools/gpgconf-comp.c:920
  msgid "Options controlling the interactivity and enforcement"
  msgstr "Параметры, управляющие интерактивностью и принудительными действиями"
  
- #: tools/gpgconf-comp.c:918
++#: tools/gpgconf-comp.c:933
  msgid "Options controlling the use of Tor"
  msgstr "Параметры, управляющие применением Tor"
  
- #: tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:947
  msgid "Configuration for HTTP servers"
  msgstr "Настройки серверов HTTP"
  
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:958
  msgid "use system's HTTP proxy setting"
  msgstr "использовать системные настройки промежуточного сервера HTTP"
  
- #: tools/gpgconf-comp.c:948
++#: tools/gpgconf-comp.c:963
  msgid "Configuration of LDAP servers to use"
  msgstr "Настройки серверов LDAP"
  
- #: tools/gpgconf-comp.c:977
++#: tools/gpgconf-comp.c:992
  msgid "LDAP server list"
  msgstr "Список серверов LDAP"
  
- #: tools/gpgconf-comp.c:985
++#: tools/gpgconf-comp.c:1000
  msgid "Configuration for OCSP"
  msgstr "Настройки OCSP"
  
- #: tools/gpgconf-comp.c:1066
++#: tools/gpgconf-comp.c:1081
  #, fuzzy
  #| msgid "GPG for OpenPGP"
  msgid "OpenPGP"
  msgstr "GPG для OpenPGP"
  
- #: tools/gpgconf-comp.c:1067
++#: tools/gpgconf-comp.c:1082
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1083
  #, fuzzy
  #| msgid "Smartcard Daemon"
  msgid "Smartcards"
  msgstr "Демон криптографических карт"
  
- #: tools/gpgconf-comp.c:1069
++#: tools/gpgconf-comp.c:1084
  #, fuzzy
  #| msgid "GPG for S/MIME"
  msgid "S/MIME"
  msgstr "GPG для S/MIME"
  
- #: tools/gpgconf-comp.c:1070
++#: tools/gpgconf-comp.c:1085
  msgid "Network"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1071
++#: tools/gpgconf-comp.c:1086
  #, fuzzy
  #| msgid "PIN and Passphrase Entry"
  msgid "Passphrase Entry"
  msgstr "Ввод PIN и фраз-паролей"
  
- #: tools/gpgconf-comp.c:1225
++#: tools/gpgconf-comp.c:1240
  msgid "Component not suitable for launching"
  msgstr "Компонент не подходит для запуска"
  
- #: tools/gpgconf-comp.c:3283
++#: tools/gpgconf-comp.c:3311
  #, c-format
  msgid "External verification of component %s failed"
  msgstr "Внешняя проверка компонента %s не прошла"
  
- #: tools/gpgconf-comp.c:3434
++#: tools/gpgconf-comp.c:3462
  msgid "Note that group specifications are ignored\n"
  msgstr "Обратите внимание, что спецификации групп игнорируются\n"
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf-comp.c:4036
+ #, fuzzy, c-format
+ #| msgid "error closing '%s': %s\n"
+ msgid "error closing '%s'\n"
+ msgstr "ошибка закрытия '%s': %s\n"
+ 
++#: tools/gpgconf-comp.c:4038
+ #, fuzzy, c-format
+ #| msgid "error hashing '%s': %s\n"
+ msgid "error parsing '%s'\n"
+ msgstr "ошибка при получении хеша '%s': %s\n"
+ 
++#: tools/gpgconf.c:73
  msgid "list all components"
  msgstr "вывод списка всех компонентов"
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "check all programs"
  msgstr "проверить все программы"
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|list options"
  msgstr "|COMPONENT|вывод списка параметров"
  
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
  msgid "|COMPONENT|change options"
  msgstr "|COMPONENT|изменить параметры"
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "|COMPONENT|check options"
  msgstr "|COMPONENT|проверить параметры"
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "apply global default values"
  msgstr "применить глобальные значения по умолчанию"
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
+ #, fuzzy
+ #| msgid "|FILE|take policy information from FILE"
+ msgid "|FILE|update configuration files using FILE"
+ msgstr "|FILE|взять информацию о правилах из файла FILE"
+ 
++#: tools/gpgconf.c:83
  msgid "get the configuration directories for @GPGCONF@"
  msgstr "получить каталоги настроек для @GPGCONF@"
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:85
  msgid "list global configuration file"
  msgstr "указать глобальный файл настроек"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  msgid "check global configuration file"
  msgstr "проверить глобальный файл настроек"
  
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:89
  msgid "query the software version database"
  msgstr "запросить базу данных версий программ"
  
- #: tools/gpgconf.c:86
++#: tools/gpgconf.c:90
  msgid "reload all or a given component"
  msgstr "перезагрузить все или заданный компонент"
  
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:91
  msgid "launch a given component"
  msgstr "запустить заданный компонент"
  
- #: tools/gpgconf.c:88
++#: tools/gpgconf.c:92
  msgid "kill a given component"
  msgstr "выключить заданный компонент"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "use as output file"
  msgstr "вывод в указанный файл"
  
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:102
  msgid "activate changes at runtime, if possible"
  msgstr "задействовать изменения во время исполнения, если возможно"
  
- #: tools/gpgconf.c:122
++#: tools/gpgconf.c:127
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "Вызов: @GPGCONF@ [параметры] (-h для подсказки)"
  
- #: tools/gpgconf.c:125
++#: tools/gpgconf.c:130
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10598,15 -8467,12 +10711,15 @@@ msgstr "
  "Синтаксис: @GPGCONF@ [параметры]\n"
  "Управляет параметрами настроек инструментария @GNUPG@\n"
  
- #: tools/gpgconf.c:545 tools/gpgconf.c:579
++#: tools/gpgconf.c:552 tools/gpgconf.c:587
  msgid "Need one component argument"
  msgstr "Требуется однокомпонентный аргумент"
  
- #: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
++#: tools/gpgconf.c:561 tools/gpgconf.c:599 tools/gpgconf.c:632
  msgid "Component not found"
  msgstr "Компонент не найден"
  
- #: tools/gpgconf.c:650
++#: tools/gpgconf.c:658
  msgid "No argument allowed"
  msgstr "Аргументы не разрешены"
  
diff --cc po/sk.po
index 5a65f2f,5a41f8a..06a1e0b
--- a/po/sk.po
+++ b/po/sk.po
@@@ -9,7 -9,6 +9,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg 1.2.5\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-11-18 16:54+0100\n"
++"POT-Creation-Date: 2016-12-20 11:28+0100\n"
  "PO-Revision-Date: 2004-07-20 15:52+0200\n"
  "Last-Translator: Michal Majer <mmajer at econ.umb.sk>\n"
  "Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
@@@ -158,25 -129,11 +158,25 @@@ msgstr "nesprávne heslo
  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:838 common/dotlock.c:839 g10/card-util.c:839
- #: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1306 g10/keygen.c:4577
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
++#: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't create '%s': %s\n"
  msgstr "nemôžem vytvoriť `%s': %s\n"
  
 +#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
- #: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1307
++#: g10/import.c:305 g10/import.c:448 g10/import.c:621 g10/keygen.c:3681
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
- #: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
- #: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:825 g10/sign.c:1025
++#: g10/sign.c:1130 g10/sign.c:1275 g10/tdbdump.c:143 g10/tdbdump.c:151
++#: g10/tdbio.c:720 g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161
++#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
++#: dirmngr/certcache.c:368 dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1564
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
@@@ -239,11 -185,9 +239,11 @@@ msgstr "Prosím, vložte heslo; toto j
  msgid "failed to create stream from socket: %s\n"
  msgstr "%s: nepodarilo sa vytvoriť hashovaciu tabuľku: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1100
++#: agent/divert-scd.c:92 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1101
++#: agent/divert-scd.c:93 g10/call-agent.c:1102
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  
@@@ -386,48 -304,33 +386,48 @@@ msgstr "
  "Možnosti:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
  #, fuzzy
  #| msgid "Key is superseded"
  msgid "run in supervised mode"
  msgstr "Kľúč je nahradený"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:170 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "s dodatočnými informáciami"
  
 +#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "byť o trochu tichší"
  
- #: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
  msgid "csh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
- #: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
++#: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
  #, fuzzy
  msgid "|FILE|read options from FILE"
  msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
  
- #: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:177
  msgid "do not detach from the console"
  msgstr ""
  
@@@ -512,164 -398,122 +512,164 @@@ msgstr "nepodporované
  #. 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:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:481 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1025 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:358
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:124 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  #, fuzzy
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr ""
  "Chyby oznámte, prosím, na adresu <gnupg-bugs at gnu.org>.\n"
  "Pripomienky k prekladu <sk-i18n at lists.linux.sk>.\n"
  
- #: agent/gpg-agent.c:491
++#: agent/gpg-agent.c:490
  #, fuzzy
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
  
- #: agent/gpg-agent.c:493
++#: agent/gpg-agent.c:492
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:537 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:442
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:793
++#: agent/gpg-agent.c:1082 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:812
  #, 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"
  
- #: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
- #: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1093 agent/gpg-agent.c:1935 g10/gpg.c:2510
++#: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:817
++#: dirmngr/dirmngr.c:1670 tools/symcryptrun.c:932
  #, 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"
  
- #: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:806
++#: agent/gpg-agent.c:1101 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:825
  #, 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:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
- #: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
++#: agent/gpg-agent.c:1223 g10/gpg.c:3643 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:936 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:527
  #, 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:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
++#: agent/gpg-agent.c:2080 scd/scdaemon.c:1073 dirmngr/dirmngr.c:1081
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
  msgstr "%s: nemôžem vytvoriť: %s\n"
  
- #: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
++#: agent/gpg-agent.c:2097 scd/scdaemon.c:1086 dirmngr/dirmngr.c:1094
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2134
++#: agent/gpg-agent.c:2135
  #, fuzzy
  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:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
++#: agent/gpg-agent.c:2145 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1126
  #, fuzzy
  msgid "error getting nonce for the socket\n"
  msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
++#: agent/gpg-agent.c:2150 scd/scdaemon.c:1113 dirmngr/dirmngr.c:1129
  #, fuzzy, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "chyba pri posielaní na `%s': %s\n"
  
- #: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
- #: dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2160 agent/gpg-agent.c:2197 scd/scdaemon.c:1121
++#: dirmngr/dirmngr.c:1138
  #, 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:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:2165 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1143
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
  msgstr "aktualizácia zlyhala: %s\n"
  
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
++#: agent/gpg-agent.c:2172 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1149
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
  msgstr "zapisujem tajný kľúč do `%s'\n"
  
- #: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: agent/gpg-agent.c:2191 agent/gpg-agent.c:2234 g10/exec.c:199
 +#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, 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:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: agent/gpg-agent.c:2194 agent/gpg-agent.c:2239 g10/openfile.c:491
 +#: g10/openfile.c:520 sm/keydb.c:103
  #, fuzzy, c-format
  msgid "directory '%s' created\n"
  msgstr "%s: adresár vytvorený\n"
  
- #: agent/gpg-agent.c:2244
++#: agent/gpg-agent.c:2245
  #, 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:2248
++#: agent/gpg-agent.c:2249
  #, 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:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
++#: agent/gpg-agent.c:2392 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1871
  #, fuzzy, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "chyba pri čítaní `%s': %s\n"
  
- #: agent/gpg-agent.c:2598
++#: agent/gpg-agent.c:2599
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2603
++#: agent/gpg-agent.c:2604
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2678
++#: agent/gpg-agent.c:2679
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2683
++#: agent/gpg-agent.c:2684
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
++#: agent/gpg-agent.c:2881 scd/scdaemon.c:1272 dirmngr/dirmngr.c:2075
  #, 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:2942 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2954 scd/scdaemon.c:1321
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
  msgstr "%s: preskočené: %s\n"
  
- #: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
++#: agent/gpg-agent.c:3092 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  #, fuzzy
  msgid "no gpg-agent running in this session\n"
  msgstr "gpg-agent nie je v tomto sedení dostupný\n"
@@@ -685,8 -527,6 +685,8 @@@ msgid "
  "Password cache maintenance\n"
  msgstr ""
  
- #: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
++#: agent/protect-tool.c:106 g10/gpg.c:424 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:153 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -694,9 -534,6 +694,9 @@@ msgstr "
  "@Príkazy:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
- #: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:92 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:168 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -750,8 -579,6 +750,8 @@@ 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:362 dirmngr/dirmngr.c:1469
- #: tools/gpgconf.c:323
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1472
++#: tools/gpgconf.c:328
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
  msgstr "chyba pri čítaní `%s': %s\n"
@@@ -921,9 -719,6 +921,9 @@@ msgstr "ochranný algoritmus %d%s nie j
  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:438
 +#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
- #: dirmngr/ldap-wrapper.c:710
++#: dirmngr/ldap-wrapper.c:711
  #, fuzzy, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "chyba pri vytváraní hesla: %s\n"
@@@ -935,8 -727,6 +935,8 @@@
  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:848 dirmngr/dirmngr.c:1155
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1167
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
  msgstr "chyba pri čítaní `%s': %s\n"
@@@ -983,27 -764,22 +983,27 @@@ msgstr "nemôžem sa pripojiť k `%s': 
  msgid "problem setting the gpg-agent options\n"
  msgstr "problém s agentom: agent vracia 0x%lx\n"
  
- #: common/sysutils.c:144
++#: common/sysutils.c:148
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "nemôžem vypnúť vytváranie core súborov: %s\n"
  
- #: common/sysutils.c:239
++#: common/sysutils.c:250
  #, fuzzy, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "VAROVANIE: vlastníctvo pre %s nastavené nebezpečne \"%s\"\n"
  
- #: common/sysutils.c:271
++#: common/sysutils.c:282
  #, fuzzy, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "VAROVANIE: prístupové práva pre %s nie sú nastavené bezpečne \"%s\"\n"
  
- #: common/sysutils.c:659
++#: common/sysutils.c:693
  #, fuzzy, c-format
  msgid "waiting for file '%s' to become accessible ...\n"
  msgstr "aktualizácia zlyhala: %s\n"
  
- #: common/sysutils.c:685
++#: common/sysutils.c:719
  #, fuzzy, c-format
  msgid "renaming '%s' to '%s' failed: %s\n"
  msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
@@@ -1079,7 -840,6 +1079,7 @@@ msgstr "
  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:554
++#: common/miscellaneous.c:556
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
@@@ -1194,8 -931,6 +1194,8 @@@ msgstr "%s: súbor kľúčov (keyring) 
  msgid "algorithm: %s"
  msgstr "ASCII kódovanie: %s\n"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3098
++#: scd/app-openpgp.c:3111
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
@@@ -1407,7 -1100,6 +1407,7 @@@ msgstr "
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr ""
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1173
++#: common/argparse.c:401 dirmngr/dirmngr.c:1185
  #, fuzzy
  msgid "out of core\n"
  msgstr "nespracované"
@@@ -1466,8 -1147,6 +1466,8 @@@ msgstr "verejný kľúč %08lX nebol n�
  msgid "waiting for lock %s...\n"
  msgstr "zapisujem tajný kľúč do `%s'\n"
  
- #: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
- #: dirmngr/dirmngr.c:715
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:725
++#: dirmngr/dirmngr.c:734
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
@@@ -1507,7 -1178,6 +1507,7 @@@ msgstr "neočakávané kódovanie ASCII
  msgid "invalid dash escaped line: "
  msgstr "nesprávne označenie riadku mínusmi: "
  
- #: g10/armor.c:873 g10/armor.c:1490
++#: g10/armor.c:873 g10/armor.c:1493
  #, fuzzy, c-format
  msgid "invalid radix64 character %02X skipped\n"
  msgstr "neplatný znak vo formáte radix64 %02x bol preskočený\n"
@@@ -1524,7 -1191,6 +1524,7 @@@ msgstr "predčasný koniec súboru (v C
  msgid "malformed CRC\n"
  msgstr "nesprávny formát CRC\n"
  
- #: g10/armor.c:962 g10/armor.c:1527
++#: g10/armor.c:962 g10/armor.c:1530
  #, fuzzy, c-format
  msgid "CRC error; %06lX - %06lX\n"
  msgstr "Chyba CRC; %06lx - %06lx\n"
@@@ -1538,16 -1202,13 +1538,16 @@@ msgstr "predčasný koniec súboru (v p
  msgid "error in trailer line\n"
  msgstr "chyba v pätičke\n"
  
- #: g10/armor.c:1303
++#: g10/armor.c:1306
  msgid "no valid OpenPGP data found.\n"
  msgstr "nenájdené žiadne platné dáta vo formáte OpenPGP.\n"
  
- #: g10/armor.c:1308
++#: g10/armor.c:1311
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
  msgstr "neplatné kódovanie ASCII: riadok je dlhší ako %d znakov\n"
  
- #: g10/armor.c:1312
++#: g10/armor.c:1315
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr ""
@@@ -1636,8 -1282,6 +1636,8 @@@ msgstr "tajný kľúč nie je dostupný
  msgid "OpenPGP card no. %s detected\n"
  msgstr ""
  
- #: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
- #: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2030
++#: g10/keygen.c:4087 g10/revoke.c:215 g10/revoke.c:618
  #, fuzzy
  msgid "can't do this in batch mode\n"
  msgstr "nemožno previesť v dávkovom móde\n"
@@@ -1647,15 -1290,10 +1647,15 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "Tento príkaz nie je v módoch %s dovolený.\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2454
++#: g10/card-util.c:109 scd/app-openpgp.c:2467
  #, fuzzy
  msgid "Reset Code not or not anymore available\n"
  msgstr "tajné časti kľúča nie sú dostupné\n"
  
 +#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
- #: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
- #: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1768
++#: g10/keygen.c:1945 g10/keygen.c:2313 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "Váš výber? "
  
@@@ -1722,10 -1346,6 +1722,10 @@@ msgstr "žiadny zodpovedajúci verejn�
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
- #: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:334
++#: g10/import.c:592 g10/import.c:640 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
++#: dirmngr/dirmngr.c:1510 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
@@@ -1799,7 -1404,6 +1799,7 @@@ msgstr "Vytvorenie kľúča sa nepodari
  msgid "not an OpenPGP card"
  msgstr "nenájdené žiadne platné dáta vo formáte OpenPGP.\n"
  
- #: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
++#: g10/card-util.c:1173 g10/keygen.c:4106 g10/keygen.c:5092
  #, 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"
@@@ -1830,13 -1429,10 +1830,13 @@@ msgstr "Akú veľkosť kľúča si praj
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "Akú veľkosť kľúča si prajete? (1024) "
  
- #: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
++#: g10/card-util.c:1316 g10/keygen.c:2122 g10/keygen.c:2154
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "zaokrúhlené na %u bitov\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2207 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr ""
@@@ -1891,9 -1477,6 +1891,9 @@@ msgstr "   (%d) RSA (len na šifrovanie
  msgid "   (3) Authentication key\n"
  msgstr ""
  
- #: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
- #: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
- #: g10/keygen.c:2314 g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1508
++#: g10/keygen.c:1794 g10/keygen.c:1822 g10/keygen.c:1952 g10/keygen.c:2060
++#: g10/keygen.c:2336 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Neplatný výber.\n"
  
@@@ -1927,7 -1504,6 +1927,7 @@@ msgstr "Skutočne podpísať? 
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1816 g10/keyedit.c:1867
++#: g10/card-util.c:1816 g10/keyedit.c:1868
  msgid "quit this menu"
  msgstr "ukončiť toto menu"
  
@@@ -1936,7 -1511,6 +1936,7 @@@
  msgid "show admin commands"
  msgstr "konfliktné príkazy\n"
  
- #: g10/card-util.c:1819 g10/keyedit.c:1870
++#: g10/card-util.c:1819 g10/keyedit.c:1871
  msgid "show this help"
  msgstr "ukázať túto pomoc"
  
@@@ -2020,31 -1576,21 +2020,31 @@@ msgstr "konfliktné príkazy\n
  msgid "Admin commands are not allowed\n"
  msgstr "zapisujem tajný kľúč do `%s'\n"
  
- #: g10/card-util.c:2127 g10/keyedit.c:2816
++#: g10/card-util.c:2127 g10/keyedit.c:2817
  msgid "Invalid command  (try \"help\")\n"
  msgstr "Neplatný príkaz (skúste \"help\")\n"
  
- #: g10/decrypt.c:191 g10/encrypt.c:955
++#: g10/decrypt.c:190 g10/encrypt.c:955
  msgid "--output doesn't work for this command\n"
  msgstr "--output pre tento príkaz nefunguje\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4904 g10/keyring.c:398 g10/keyring.c:771
  #, fuzzy, c-format
  #| msgid "can't open `%s'\n"
  msgid "can't open '%s'\n"
  msgstr "nemožno otvoriť `%s'\n"
  
 +#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
- #: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
- #: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4858 g10/keyedit.c:2051
++#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2163
  #, fuzzy, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "kľúč `%s' nebol nájdený: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
- #: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
- #: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4866 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:645 g10/tofu.c:2171
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "chyba pri čítaní bloku kľúča: %s\n"
@@@ -2106,7 -1640,6 +2106,7 @@@ msgstr "existuje tajný kľúč pre ten
  msgid "use option \"--delete-secret-keys\" to delete it first.\n"
  msgstr "aby ste ho zmazali, použite najprv prepínač \"--delete-secret-key\".\n"
  
- #: g10/encrypt.c:232 g10/sign.c:1292
++#: g10/encrypt.c:232 g10/sign.c:1294
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "chyba pri vytváraní hesla: %s\n"
@@@ -2126,7 -1656,6 +2126,7 @@@ msgstr "použitá šifra %s\n
  msgid "'%s' already compressed\n"
  msgstr "`%s' je už skomprimovaný\n"
  
- #: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:610
  #, fuzzy, c-format
  #| msgid "WARNING: `%s' is an empty file\n"
  msgid "WARNING: '%s' is an empty file\n"
@@@ -2144,7 -1671,6 +2144,7 @@@ msgid "
  "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
  msgstr "vyžiadaná symetrická šifra %s (%d) nevyhovuje predvoľbám príjemcu\n"
  
- #: g10/encrypt.c:707 g10/sign.c:984
++#: g10/encrypt.c:707 g10/sign.c:986
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2179,7 -1700,6 +2179,7 @@@ msgstr "%s zašifrované dáta\n
  msgid "encrypted with unknown algorithm %d\n"
  msgstr "zašifrované neznámym algoritmom %d\n"
  
- #: g10/decrypt-data.c:164 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:129
  msgid ""
  "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
  msgstr ""
@@@ -2277,8 -1779,6 +2277,8 @@@ msgstr "
  msgid " - skipped"
  msgstr "%s: preskočené: %s\n"
  
- #: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:845 g10/sign.c:1148
++#: g10/export.c:1251 g10/import.c:1543 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:847 g10/sign.c:1150
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
@@@ -2303,8 -1799,6 +2303,8 @@@ msgstr "kľúč %08lX: PGP 2.x kľúč 
  msgid "WARNING: nothing exported\n"
  msgstr "VAROVANIE: nič nebolo vyexportované\n"
  
- #: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
- #: g10/plaintext.c:151 g10/plaintext.c:174
++#: g10/export.c:2283 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/plaintext.c:167 g10/plaintext.c:190
  #, fuzzy, c-format
  #| msgid "error creating `%s': %s\n"
  msgid "error creating '%s': %s\n"
@@@ -2352,8 -1837,6 +2352,8 @@@ msgstr "chyba pri vytváraní `%s': %s\
  msgid "No fingerprint"
  msgstr "vypísať fingerprint"
  
- #: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
- #: g10/revoke.c:701
++#: g10/getkey.c:1873 g10/keyedit.c:2929 g10/keyedit.c:3016 g10/revoke.c:637
++#: g10/revoke.c:702
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "tajný kľúč `%s' nebol nájdený: %s\n"
@@@ -2387,222 -1865,178 +2387,228 @@@ 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/gpg.c:424 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:200
  #, fuzzy
  msgid "make a signature"
  msgstr "vytvoriť podpis oddelený od dokumentu"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:427
  #, fuzzy
  msgid "make a clear text signature"
  msgstr "|[súbor]|vytvoriť podpis v čitateľnom dokumente"
  
- #: g10/gpg.c:426 sm/gpgsm.c:202
++#: g10/gpg.c:429 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "vytvoriť podpis oddelený od dokumentu"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:430 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "šifrovať dáta"
  
- #: g10/gpg.c:429
++#: g10/gpg.c:432
  msgid "encryption only with symmetric cipher"
  msgstr "šifrovanie len so symetrickou šifrou"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:434 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "dešifrovať dáta (implicitne)"
  
- #: g10/gpg.c:433 sm/gpgsm.c:206
++#: g10/gpg.c:436 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "verifikovať podpis"
  
- #: g10/gpg.c:435 sm/gpgsm.c:207
++#: g10/gpg.c:438 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "vypísať zoznam kľúčov"
  
- #: g10/gpg.c:437
++#: g10/gpg.c:440
  msgid "list keys and signatures"
  msgstr "vypísať zoznam kľúčov a podpisov"
  
- #: g10/gpg.c:438
++#: g10/gpg.c:443
  #, fuzzy
  msgid "list and check key signatures"
  msgstr "skontrolovať podpisy kľúčov"
  
- #: g10/gpg.c:439 sm/gpgsm.c:212
++#: g10/gpg.c:445 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "vypísať zoznam kľúčov a fingerprintov"
  
- #: g10/gpg.c:440 sm/gpgsm.c:210
++#: g10/gpg.c:446 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "vypísať zoznam tajných kľúčov"
  
- #: g10/gpg.c:442 sm/gpgsm.c:213
++#: g10/gpg.c:448 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "vytvoriť nový pár kľúčov"
  
- #: g10/gpg.c:444
++#: g10/gpg.c:451
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly generate a new key pair"
  msgstr "vytvoriť nový pár kľúčov"
  
- #: g10/gpg.c:446
++#: g10/gpg.c:454
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly add a new user-id"
  msgstr "vytvoriť nový pár kľúčov"
  
- #: g10/gpg.c:449
++#: g10/gpg.c:459
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly revoke a user-id"
  msgstr "vytvoriť nový pár kľúčov"
  
- #: g10/gpg.c:451
++#: g10/gpg.c:462
+ #, fuzzy
+ #| msgid "generate a new key pair"
+ msgid "quickly set a new expiration date"
+ msgstr "vytvoriť nový pár kľúčov"
+ 
++#: g10/gpg.c:464
  msgid "full featured key pair generation"
  msgstr ""
  
- #: g10/gpg.c:452
++#: g10/gpg.c:467
  msgid "generate a revocation certificate"
  msgstr "vytvoriť revokačný certifikát"
  
- #: g10/gpg.c:454 sm/gpgsm.c:215
++#: g10/gpg.c:470 sm/gpgsm.c:216
  msgid "remove keys from the public keyring"
  msgstr "odstrániť kľúč zo súboru verejných kľúčov"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:472
  msgid "remove keys from the secret keyring"
  msgstr "odstrániť kľúč zo súboru tajných kľúčov"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:474
  #, fuzzy
  #| msgid "sign a key"
  msgid "quickly sign a key"
  msgstr "podpísať kľúč"
  
- #: g10/gpg.c:460
++#: g10/gpg.c:476
  #, fuzzy
  #| msgid "sign a key locally"
  msgid "quickly sign a key locally"
  msgstr "podpísať kľúč lokálne"
  
- #: g10/gpg.c:461
++#: g10/gpg.c:477
  msgid "sign a key"
  msgstr "podpísať kľúč"
  
- #: g10/gpg.c:462
++#: g10/gpg.c:478
  msgid "sign a key locally"
  msgstr "podpísať kľúč lokálne"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:479
  msgid "sign or edit a key"
  msgstr "podpísať alebo modifikovať kľúč"
  
- #: g10/gpg.c:465 sm/gpgsm.c:233
++#: g10/gpg.c:481 sm/gpgsm.c:234
  #, fuzzy
  msgid "change a passphrase"
  msgstr "zmeniť heslo"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:485
  msgid "export keys"
  msgstr "exportovať kľúče"
  
- #: g10/gpg.c:468
++#: g10/gpg.c:486
  msgid "export keys to a keyserver"
  msgstr "exportovať kľúče na server kľúčov"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:487
  msgid "import keys from a keyserver"
  msgstr "importovať kľúče zo servera kľúčov"
  
- #: g10/gpg.c:471
++#: g10/gpg.c:490
  msgid "search for keys on a keyserver"
  msgstr "vyhľadať kľúče na serveri kľúčov"
  
- #: g10/gpg.c:473
++#: g10/gpg.c:492
  msgid "update all keys from a keyserver"
  msgstr "aktualizovať všetky kľúče zo servera kľúčov"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:498
  msgid "import/merge keys"
  msgstr "importovať/zlúčiť kľúče"
  
- #: g10/gpg.c:482
++#: g10/gpg.c:501
  msgid "print the card status"
  msgstr ""
  
- #: g10/gpg.c:483
++#: g10/gpg.c:502
  msgid "change data on a card"
  msgstr ""
  
- #: g10/gpg.c:484
++#: g10/gpg.c:504
  msgid "change a card's PIN"
  msgstr ""
  
- #: g10/gpg.c:496
++#: g10/gpg.c:516
  msgid "update the trust database"
  msgstr "aktualizovať databázu dôvery"
  
- #: g10/gpg.c:505
++#: g10/gpg.c:525
  #, fuzzy
  msgid "print message digests"
  msgstr "|algo [súbory]|vypíš hash"
  
- #: g10/gpg.c:508 sm/gpgsm.c:228
++#: g10/gpg.c:528 sm/gpgsm.c:229
  msgid "run in server mode"
  msgstr ""
  
- #: g10/gpg.c:510
++#: g10/gpg.c:530
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:514 sm/gpgsm.c:246
++#: g10/gpg.c:534 sm/gpgsm.c:248
  msgid "create ascii armored output"
  msgstr "vytvor výstup zakódovaný pomocou ASCII"
  
- #: g10/gpg.c:517 sm/gpgsm.c:262
++#: g10/gpg.c:537 sm/gpgsm.c:264
  #, fuzzy
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|MENO|šifrovať pre MENO"
  
- #: g10/gpg.c:533 sm/gpgsm.c:298
++#: g10/gpg.c:553 sm/gpgsm.c:300
  #, 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:539
++#: g10/gpg.c:559
  #, 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:546
++#: g10/gpg.c:566
  msgid "use canonical text mode"
  msgstr "použiť kánonický textový mód"
  
- #: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
++#: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
  #, fuzzy
  msgid "|FILE|write output to FILE"
  msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
  
- #: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
++#: g10/gpg.c:598 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
  msgid "do not make any changes"
  msgstr "nevykonať žiadne zmeny"
  
- #: g10/gpg.c:579
++#: g10/gpg.c:599
  msgid "prompt before overwriting"
  msgstr "vyžiadať potvrdenie pred prepísaním"
  
- #: g10/gpg.c:628
++#: g10/gpg.c:648
  msgid "use strict OpenPGP behavior"
  msgstr ""
  
- #: g10/gpg.c:654 sm/gpgsm.c:355
++#: g10/gpg.c:674 sm/gpgsm.c:357
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2611,7 -2045,16 +2617,17 @@@ msgstr "
  "(Použite manuálové stránky pre kompletný zoznam všetkých príkazov a "
  "možností)\n"
  
- #: g10/gpg.c:657 sm/gpgsm.c:358
++#: g10/gpg.c:677
+ #, fuzzy
+ #| msgid ""
+ #| "@\n"
+ #| "Examples:\n"
+ #| "\n"
+ #| " -se -r Bob [file]          sign and encrypt for user Bob\n"
+ #| " --clear-sign [file]         make a clear text signature\n"
+ #| " --detach-sign [file]       make a detached signature\n"
+ #| " --list-keys [names]        show keys\n"
+ #| " --fingerprint [names]      show fingerprints\n"
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2631,13 -2074,11 +2647,13 @@@ msgstr "
  " --list-keys [mená]        vypísať kľúče\n"
  " --fingerprint [mená]      vypísať fingerprinty\n"
  
- #: g10/gpg.c:1026
++#: g10/gpg.c:1047
  #, 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:1029
++#: g10/gpg.c:1050
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg [options] [files]\n"
@@@ -2652,7 -2093,6 +2668,7 @@@ msgstr "
  "podpísať, overiť, šifrovať alebo dešifrovať\n"
  "implicitné operácie závisia od vstupných dát\n"
  
- #: g10/gpg.c:1040 sm/gpgsm.c:588
++#: g10/gpg.c:1061 sm/gpgsm.c:580
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2660,612 -2100,434 +2676,549 @@@ msgstr "
  "\n"
  "Podporované algoritmy:\n"
  
- #: g10/gpg.c:1043
++#: g10/gpg.c:1064
  msgid "Pubkey: "
  msgstr "Verejné kľúče: "
  
- #: g10/gpg.c:1050 g10/keyedit.c:3402
++#: g10/gpg.c:1071 g10/keyedit.c:3483
  msgid "Cipher: "
  msgstr "Šifry: "
  
- #: g10/gpg.c:1057
++#: g10/gpg.c:1078
  msgid "Hash: "
  msgstr "Hash: "
  
- #: g10/gpg.c:1064 g10/keyedit.c:3451
++#: g10/gpg.c:1085 g10/keyedit.c:3532
  msgid "Compression: "
  msgstr "Kompresia: "
  
- #: g10/gpg.c:1133 sm/gpgsm.c:662
++#: g10/gpg.c:1154 sm/gpgsm.c:654
  #, fuzzy, c-format
  msgid "usage: %s [options] %s\n"
  msgstr "použitie: gpg [možnosti] "
  
- #: g10/gpg.c:1321 sm/gpgsm.c:751
++#: g10/gpg.c:1342 sm/gpgsm.c:743
  msgid "conflicting commands\n"
  msgstr "konfliktné príkazy\n"
  
- #: g10/gpg.c:1339
++#: g10/gpg.c:1360
  #, 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:1537
++#: g10/gpg.c:1558
  #, 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:1540
++#: g10/gpg.c:1561
  #, 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:1543
++#: g10/gpg.c:1564
  #, 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:1549
++#: g10/gpg.c:1570
  #, 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:1552
++#: g10/gpg.c:1573
  #, 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:1555
++#: g10/gpg.c:1576
  #, 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:1561
++#: g10/gpg.c:1582
  #, 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:1564
++#: g10/gpg.c:1585
  #, 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:1567
++#: g10/gpg.c:1588
  #, 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:1573
++#: g10/gpg.c:1594
  #, 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:1576
++#: g10/gpg.c:1597
  #, 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:1579
++#: g10/gpg.c:1600
  #, 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:1786
++#: g10/gpg.c:1816
  #, fuzzy, c-format
  msgid "unknown configuration item '%s'\n"
  msgstr "neznáma položka konfigurácie \"%s\"\n"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1925
  msgid "display photo IDs during key listings"
  msgstr ""
  
- #: g10/gpg.c:1895
++#: g10/gpg.c:1927
  #, 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:1897
++#: g10/gpg.c:1929
  msgid "show policy URLs during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1931
  #, 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:1901
++#: g10/gpg.c:1933
  msgid "show IETF standard notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1937
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1939
  #, fuzzy
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "zadané URL pre podpisovú politiku je neplatné\n"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1941
  msgid "show user ID validity during key listings"
  msgstr ""
  
- #: g10/gpg.c:1911
++#: g10/gpg.c:1943
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  
- #: g10/gpg.c:1913
++#: g10/gpg.c:1945
  msgid "show revoked and expired subkeys in key listings"
  msgstr ""
  
- #: g10/gpg.c:1915
++#: g10/gpg.c:1947
  #, fuzzy
  msgid "show the keyring name in key listings"
  msgstr "ukáž v ktorom súbore kľúčov je vypísaný kľúč"
  
- #: g10/gpg.c:1917
++#: g10/gpg.c:1949
  #, 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:2019 g10/gpg.c:2056
++#: g10/gpg.c:2051 g10/gpg.c:2088
  #, fuzzy, c-format
  msgid "valid values for option '%s':\n"
  msgstr "neplatný parameter pre import\n"
  
- #: g10/gpg.c:2030
++#: g10/gpg.c:2062
  #, fuzzy, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "neznámy implicitný adresát `%s'\n"
  
- #: g10/gpg.c:2032 g10/gpg.c:2068
++#: g10/gpg.c:2064 g10/gpg.c:2100
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2066
++#: g10/gpg.c:2098 g10/keygen.c:167
  #, fuzzy, c-format
  msgid "invalid value for option '%s'\n"
  msgstr "neplatný parameter pre import\n"
  
- #: g10/gpg.c:2203
++#: g10/gpg.c:2235
  #, fuzzy, c-format
  #| msgid "NOTE: old default options file `%s' ignored\n"
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "POZNÁMKA: starý implicitný súbor s možnosťami `%s ignorovaný'\n"
  
- #: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
++#: g10/gpg.c:2839 g10/gpg.c:3610 g10/gpg.c:3622
  #, 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:2978 g10/gpg.c:2990
++#: g10/gpg.c:3011 g10/gpg.c:3023
  #, fuzzy, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "%s nie je platná znaková sada\n"
  
- #: g10/gpg.c:3012
++#: g10/gpg.c:3045
  #, fuzzy, c-format
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "Neplatná e-mailová adresa\n"
  
- #: g10/gpg.c:3044 sm/gpgsm.c:1166
++#: g10/gpg.c:3077 sm/gpgsm.c:1158
  #, fuzzy, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "neplatný hashovací algoritmus `%s'\n"
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3130
  #, fuzzy, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "%s nie je platná znaková sada\n"
  
- #: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
++#: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
  #, fuzzy
  msgid "could not parse keyserver URL\n"
  msgstr "nemožno použiť URI servera kľúčov - chyba analýzy URI\n"
  
- #: g10/gpg.c:3137
++#: g10/gpg.c:3170
  #, fuzzy, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: neplatný parameter pre export\n"
  
- #: g10/gpg.c:3140
++#: g10/gpg.c:3173
  #, fuzzy
  msgid "invalid keyserver options\n"
  msgstr "neplatný parameter pre export\n"
  
- #: g10/gpg.c:3147
++#: g10/gpg.c:3180
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: neplatný parameter pre import\n"
  
- #: g10/gpg.c:3150
++#: g10/gpg.c:3183
  msgid "invalid import options\n"
  msgstr "neplatný parameter pre import\n"
  
- #: g10/gpg.c:3156 g10/gpg.c:3171
++#: g10/gpg.c:3189 g10/gpg.c:3204
  #, fuzzy, c-format
  msgid "invalid filter option: %s\n"
  msgstr "neplatný parameter pre import\n"
  
- #: g10/gpg.c:3162
++#: g10/gpg.c:3195
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: neplatný parameter pre export\n"
  
- #: g10/gpg.c:3165
++#: g10/gpg.c:3198
  msgid "invalid export options\n"
  msgstr "neplatný parameter pre export\n"
  
- #: g10/gpg.c:3177
++#: g10/gpg.c:3210
  #, fuzzy, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: neplatný parameter pre import\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3213
  #, fuzzy
  msgid "invalid list options\n"
  msgstr "neplatný parameter pre import\n"
  
- #: g10/gpg.c:3188
++#: g10/gpg.c:3221
  msgid "display photo IDs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3190
++#: g10/gpg.c:3223
  msgid "show policy URLs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3192
++#: g10/gpg.c:3225
  #, fuzzy
  msgid "show all notations during signature verification"
  msgstr "%s nie je platná znaková sada\n"
  
- #: g10/gpg.c:3194
++#: g10/gpg.c:3227
  msgid "show IETF standard notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3231
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3200
++#: g10/gpg.c:3233
  #, fuzzy
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "zadané URL pre podpisovú politiku je neplatné\n"
  
- #: g10/gpg.c:3202
++#: g10/gpg.c:3235
  #, fuzzy
  msgid "show user ID validity during signature verification"
  msgstr "%s nie je platná znaková sada\n"
  
- #: g10/gpg.c:3204
++#: g10/gpg.c:3237
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  
- #: g10/gpg.c:3206
++#: g10/gpg.c:3239
  #, fuzzy
  msgid "show only the primary user ID in signature verification"
  msgstr "%s nie je platná znaková sada\n"
  
- #: g10/gpg.c:3208
++#: g10/gpg.c:3241
  msgid "validate signatures with PKA data"
  msgstr ""
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3243
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr ""
  
- #: g10/gpg.c:3217
++#: g10/gpg.c:3250
  #, fuzzy, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: neplatný parameter pre export\n"
  
- #: g10/gpg.c:3220
++#: g10/gpg.c:3253
  #, fuzzy
  msgid "invalid verify options\n"
  msgstr "neplatný parameter pre export\n"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3260
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "nemožno nastaviť exec-path na %s\n"
  
- #: g10/gpg.c:3417
++#: g10/gpg.c:3452
  #, fuzzy, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: neplatný parameter pre export\n"
  
- #: g10/gpg.c:3420
++#: g10/gpg.c:3455
  msgid "invalid auto-key-locate list\n"
  msgstr ""
  
- #: g10/gpg.c:3553 sm/gpgsm.c:1507
++#: g10/gpg.c:3592 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
  msgstr "VAROVANIE: program môže vytvoriť súbor core!\n"
  
- #: g10/gpg.c:3564
++#: g10/gpg.c:3603
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "VAROVANIE: %s prepíše %s\n"
  
- #: g10/gpg.c:3573
++#: g10/gpg.c:3612
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "Nie je dovolené používať %s s %s!\n"
  
- #: g10/gpg.c:3576
++#: g10/gpg.c:3615
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s nedáva s %s zmysel!\n"
  
- #: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
++#: g10/gpg.c:3630 sm/gpgsm.c:1518 dirmngr/dirmngr.c:951
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3651
  #, fuzzy, c-format
  msgid "will not run with insecure memory due to %s\n"
  msgstr "zapisujem tajný kľúč do `%s'\n"
  
- #: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
++#: g10/gpg.c:3686 g10/gpg.c:3710 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "vybraný šifrovací algoritmus je neplatný\n"
  
- #: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
++#: g10/gpg.c:3692 g10/gpg.c:3716 sm/gpgsm.c:1591 sm/gpgsm.c:1597
  msgid "selected digest algorithm is invalid\n"
  msgstr "vybraný hashovací algoritmus je neplatný\n"
  
- #: g10/gpg.c:3659
++#: g10/gpg.c:3698
  #, fuzzy
  msgid "selected compression algorithm is invalid\n"
  msgstr "vybraný šifrovací algoritmus je neplatný\n"
  
- #: g10/gpg.c:3665
++#: g10/gpg.c:3704
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "vybraný hashovací algoritmus je neplatný\n"
  
- #: g10/gpg.c:3680
++#: g10/gpg.c:3719
  msgid "completes-needed must be greater than 0\n"
  msgstr "položka completes-needed musí byť väčšia ako 0\n"
  
- #: g10/gpg.c:3682
++#: g10/gpg.c:3721
  msgid "marginals-needed must be greater than 1\n"
  msgstr "položka marginals-needed musí byť väčšia ako 1\n"
  
- #: g10/gpg.c:3684
++#: g10/gpg.c:3723
  #, fuzzy
  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:3686
++#: g10/gpg.c:3725
  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:3688
++#: g10/gpg.c:3727
  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:3691
++#: g10/gpg.c:3730
  #, fuzzy
  #| 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:3695
++#: g10/gpg.c:3734
  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:3702
++#: g10/gpg.c:3741
  msgid "invalid default preferences\n"
  msgstr "neplatné defaultné predvoľby\n"
  
- #: g10/gpg.c:3706
++#: g10/gpg.c:3745
  msgid "invalid personal cipher preferences\n"
  msgstr "neplatné užívateľské predvoľby pre šifrovanie\n"
  
- #: g10/gpg.c:3710
++#: g10/gpg.c:3749
  msgid "invalid personal digest preferences\n"
  msgstr "neplatné užívateľské predvoľby pre hashovanie\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3753
  msgid "invalid personal compress preferences\n"
  msgstr "neplatné užívateľské predvoľby pre kompresiu\n"
  
- #: g10/gpg.c:3750
++#: g10/gpg.c:3789
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s ešte nepracuje s %s\n"
  
- #: g10/gpg.c:3797
++#: g10/gpg.c:3836
  #, fuzzy, c-format
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr "nemôžete použiť šifrovací algoritmus \"%s\" v móde %s\n"
  
- #: g10/gpg.c:3802
++#: g10/gpg.c:3841
  #, fuzzy, c-format
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr "nemôžete použiť hashovací algoritmus \"%s\" v móde %s\n"
  
- #: g10/gpg.c:3807
++#: g10/gpg.c:3846
  #, fuzzy, c-format
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr "nemôžete použiť kompresný algoritmus \"%s\" v móde %s\n"
  
- #: g10/gpg.c:3906
++#: g10/gpg.c:3945
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "nemôžem inicializovať databázu dôvery: %s\n"
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:3957
  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:3975
- msgid "--store [filename]"
- msgstr "--store [meno súboru]"
- 
- #: g10/gpg.c:3985
- msgid "--symmetric [filename]"
- msgstr "--symmetric [meno súboru]"
- 
- #: g10/gpg.c:3989
++#: g10/gpg.c:4028
  #, fuzzy, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "dešifrovanie zlyhalo: %s\n"
  
- #: g10/gpg.c:4000
- msgid "--encrypt [filename]"
- msgstr "--encrypt [meno súboru]"
- 
- #: g10/gpg.c:4016
- #, fuzzy
- msgid "--symmetric --encrypt [filename]"
- msgstr "--sign --encrypt [meno súboru]"
- 
- #: g10/gpg.c:4018
++#: g10/gpg.c:4057
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4021
++#: g10/gpg.c:4060
  #, fuzzy, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr ""
  "použitie %s nie je v móde %s dovolené\n"
  "\n"
  
- #: g10/gpg.c:4042
- msgid "--sign [filename]"
- msgstr "--sign [meno súboru]"
- 
- #: g10/gpg.c:4058
- msgid "--sign --encrypt [filename]"
- msgstr "--sign --encrypt [meno súboru]"
- 
- #: g10/gpg.c:4076
- #, fuzzy
- msgid "--symmetric --sign --encrypt [filename]"
- msgstr "--sign --encrypt [meno súboru]"
- 
- #: g10/gpg.c:4078
++#: g10/gpg.c:4117
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4081
++#: g10/gpg.c:4120
  #, fuzzy, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr ""
  "použitie %s nie je v móde %s dovolené\n"
  "\n"
  
- #: g10/gpg.c:4105
- msgid "--sign --symmetric [filename]"
- msgstr "--sign --symmetric [meno súboru]"
- 
- #: g10/gpg.c:4117
- msgid "--clearsign [filename]"
- msgstr "--clearsign [meno súboru]"
- 
- #: g10/gpg.c:4147
- msgid "--decrypt [filename]"
- msgstr "--decrypt [meno súboru]"
- 
- #: g10/gpg.c:4174
- msgid "--sign-key user-id"
- msgstr "--sign-key id užívateľa"
- 
- #: g10/gpg.c:4178
- msgid "--lsign-key user-id"
- msgstr "--lsign-key id užívateľa"
- 
- #: g10/gpg.c:4199
- msgid "--edit-key user-id [commands]"
- msgstr "--edit-key id užívateľa [príkazy]"
- 
- #: g10/gpg.c:4215
- #, fuzzy
- msgid "--passwd <user-id>"
- msgstr "--sign-key id užívateľa"
- 
- #: g10/gpg.c:4411 g10/keyserver.c:1837
++#: g10/gpg.c:4462 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "nepodarilo poslať kľúč na server: %s\n"
  
- #: g10/gpg.c:4416
++#: g10/gpg.c:4467
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "nepodarilo sa prijať kľúč zo servera: %s\n"
  
- #: g10/gpg.c:4422
++#: g10/gpg.c:4473
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "nepodaril sa export kľúča: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4486
  #, 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:4447
++#: g10/gpg.c:4498
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "nepodarilo sa nájsť server: %s\n"
  
- #: g10/gpg.c:4460
++#: g10/gpg.c:4511
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "aktualizácia servera zlyhala: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4578
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "dekódovanie z ASCII formátu zlyhalo: %s\n"
  
- #: g10/gpg.c:4538
++#: g10/gpg.c:4589
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
  
- #: g10/gpg.c:4630
++#: g10/gpg.c:4681
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
  msgstr "neplatný hashovací algoritmus `%s'\n"
  
- #: g10/gpg.c:4776 g10/tofu.c:2002
++#: g10/gpg.c:4827 g10/tofu.c:2151
  #, fuzzy, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: g10/gpg.c:4788
++#: g10/gpg.c:4839
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4835
- msgid "[filename]"
- msgstr "[meno súboru]"
- 
- #: g10/gpg.c:4841
++#: g10/gpg.c:4894
  msgid "Go ahead and type your message ...\n"
  msgstr "Začnite písať svoju správu ...\n"
  
- #: g10/gpg.c:5179
++#: g10/gpg.c:5232
  msgid "the given certification policy URL is invalid\n"
  msgstr "zadané URL pre certifikačnú politiku je neplatné\n"
  
- #: g10/gpg.c:5181
++#: g10/gpg.c:5234
  msgid "the given signature policy URL is invalid\n"
  msgstr "zadané URL pre podpisovú politiku je neplatné\n"
  
- #: g10/gpg.c:5214
++#: g10/gpg.c:5267
  #, fuzzy
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "zadané URL pre podpisovú politiku je neplatné\n"
@@@ -3279,7 -2539,6 +3232,7 @@@ msgstr "Zmazať tento kľúč zo súbor
  msgid "make timestamp conflicts only a warning"
  msgstr "konflikt časového razítka"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:345
++#: g10/gpgv.c:82 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|zapísať informácie o stave do tohto FD"
  
@@@ -3310,330 -2564,264 +3263,330 @@@ msgstr "Pomoc nie je k dispozícii
  msgid "No help available for '%s'"
  msgstr "Pomoc nie je dostupná pre '%s'"
  
- #: g10/import.c:151
++#: g10/import.c:152
  msgid "import signatures that are marked as local-only"
  msgstr ""
  
- #: g10/import.c:154
++#: g10/import.c:155
  msgid "repair damage from the pks keyserver during import"
  msgstr ""
  
- #: g10/import.c:157
++#: g10/import.c:158
  #, fuzzy
  msgid "do not clear the ownertrust values during import"
  msgstr "aktualizovať databázu dôvery"
  
- #: g10/import.c:160
++#: g10/import.c:161
  #, fuzzy
  msgid "do not update the trustdb after import"
  msgstr "aktualizovať databázu dôvery"
  
- #: g10/import.c:163
++#: g10/import.c:164
  #, fuzzy
  msgid "show key during import"
  msgstr "vypísať fingerprint"
  
- #: g10/import.c:166
++#: g10/import.c:167
  msgid "only accept updates to existing keys"
  msgstr ""
  
- #: g10/import.c:169
++#: g10/import.c:170
  #, fuzzy
  msgid "remove unusable parts from key after import"
  msgstr "nepoužiteľný tajný kľúč"
  
- #: g10/import.c:172
++#: g10/import.c:173
  msgid "remove as much as possible from key after import"
  msgstr ""
  
- #: g10/import.c:175
++#: g10/import.c:176
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:326 g10/import.c:568
++#: g10/import.c:327 g10/import.c:569
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "blok typu %d bol preskočený\n"
  
- #: g10/import.c:585
++#: g10/import.c:586
  #, fuzzy, c-format
  msgid "%lu keys processed so far\n"
  msgstr "%lu kľúče boli doteraz spracované\n"
  
- #: g10/import.c:655
++#: g10/import.c:656
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "Celkovo spracovaných kľúčov: %lu\n"
  
- #: g10/import.c:658
++#: g10/import.c:659
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "      preskočené nové kľúče: %lu\n"
  
- #: g10/import.c:660
++#: g10/import.c:661
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "      preskočené nové kľúče: %lu\n"
  
- #: g10/import.c:663
++#: g10/import.c:664
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "        bez identifikátorov: %lu\n"
  
- #: g10/import.c:666 sm/import.c:130
++#: g10/import.c:667 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "                importované: %lu"
  
- #: g10/import.c:670 sm/import.c:134
++#: g10/import.c:671 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "                  bez zmien: %lu\n"
  
- #: g10/import.c:672
++#: g10/import.c:673
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "         nové id užívateľov: %lu\n"
  
- #: g10/import.c:674
++#: g10/import.c:675
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "              nové podkľúče: %lu\n"
  
- #: g10/import.c:676
++#: g10/import.c:677
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "               nové podpisy: %lu\n"
  
- #: g10/import.c:678
++#: g10/import.c:679
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "      nové revokácie kľúčov: %lu\n"
  
- #: g10/import.c:680 sm/import.c:136
++#: g10/import.c:681 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "      prečítané tajné kľúče: %lu\n"
  
- #: g10/import.c:682 sm/import.c:138
++#: g10/import.c:683 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "    importované tajné kľúče: %lu\n"
  
- #: g10/import.c:684 sm/import.c:140
++#: g10/import.c:685 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr "      tajné kľúče nezmenené: %lu\n"
  
- #: g10/import.c:686 sm/import.c:142
++#: g10/import.c:687 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "           neimportované: %lu\n"
  
- #: g10/import.c:688
++#: g10/import.c:689
  #, fuzzy, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "               nové podpisy: %lu\n"
  
- #: g10/import.c:690
++#: g10/import.c:691
  #, fuzzy, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "      prečítané tajné kľúče: %lu\n"
  
- #: g10/import.c:1034
++#: g10/import.c:1035
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
  "algorithms on these user IDs:\n"
  msgstr ""
  
- #: g10/import.c:1076
++#: g10/import.c:1077
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1091
++#: g10/import.c:1092
  #, fuzzy, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "%s podpis, hashovací algoritmus %s\n"
  
- #: g10/import.c:1103
++#: g10/import.c:1104
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1116
++#: g10/import.c:1117
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr ""
  
- #: g10/import.c:1118
++#: g10/import.c:1119
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  
- #: g10/import.c:1143
++#: g10/import.c:1144
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  
- #: g10/import.c:1379 g10/import.c:2167
++#: g10/import.c:1380 g10/import.c:2168
  #, fuzzy, c-format
  msgid "key %s: no user ID\n"
  msgstr "kľúč %08lX: chyba identifikátor užívateľa\n"
  
- #: g10/import.c:1385
++#: g10/import.c:1386
  #, fuzzy, c-format
  msgid "key %s: %s\n"
  msgstr "preskočený `%s': %s\n"
  
- #: g10/import.c:1386 g10/import.c:2141
++#: g10/import.c:1387 g10/import.c:2142
  msgid "rejected by import screener"
  msgstr ""
  
- #: g10/import.c:1416
++#: g10/import.c:1417
  #, fuzzy, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "kľúč %08lX: HKP poškodenie podkľúča opravené\n"
  
  # c-format
- #: g10/import.c:1434
++#: g10/import.c:1435
  #, fuzzy, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr ""
  "kľúč %08lX: prijaté id užívateľa '%s', ktorý nie je podpísaný ním samým\n"
  
- #: g10/import.c:1444 g10/import.c:1475
++#: g10/import.c:1445 g10/import.c:1476
  #, fuzzy, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "kľúč %08lX: chýba platný identifikátor užívateľa\n"
  
- #: g10/import.c:1446
++#: g10/import.c:1447
  msgid "this may be caused by a missing self-signature\n"
  msgstr "môže to byť spôsobené chýbajúcim podpisom kľúča ním samým\n"
  
- #: g10/import.c:1516 g10/import.c:2318
++#: g10/import.c:1517 g10/import.c:2319
  #, fuzzy, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "kľúč %08lX: verejný kľúč nenájdený: %s\n"
  
- #: g10/import.c:1522
++#: g10/import.c:1523
  #, fuzzy, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "kľúč %08lX: nový kľúč - preskočený\n"
  
- #: g10/import.c:1537
++#: g10/import.c:1538
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "nenájdený zapisovateľný súbor kľúčov (keyring): %s\n"
  
- #: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
++#: g10/import.c:1547 g10/import.c:1648 g10/import.c:2385
  #, fuzzy, c-format
  #| msgid "error writing keyring `%s': %s\n"
  msgid "error writing keyring '%s': %s\n"
  msgstr "chyba pri zápise súboru kľúčov (keyring)  `%s': %s\n"
  
- #: g10/import.c:1566
++#: g10/import.c:1567
  #, fuzzy, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "kľúč %08lX: verejný kľúč \"%s\" importovaný\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1591
  #, fuzzy, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "kľúč %08lX: nezodpovedá našej kópii\n"
  
- #: g10/import.c:1606 g10/import.c:2342
++#: g10/import.c:1607 g10/import.c:2343
  #, fuzzy, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "kľúč %08lX: nemôžem nájsť originálny blok kľúča: %s\n"
  
- #: g10/import.c:1614 g10/import.c:2349
++#: g10/import.c:1615 g10/import.c:2350
  #, fuzzy, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "kľúč %08lX: nemôžem čítať originálny blok kľúča: %s\n"
  
- #: g10/import.c:1657
++#: g10/import.c:1658
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "kľúč %08lX: \"%s\" 1 nový identifikátor užívateľa\n"
  
- #: g10/import.c:1660
++#: g10/import.c:1661
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "kľúč %08lX: \"%s\" %d nových identifikátorov užívateľa\n"
  
- #: g10/import.c:1663
++#: g10/import.c:1664
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "kľúč %08lX: \"%s\" 1 nový podpis\n"
  
- #: g10/import.c:1666
++#: g10/import.c:1667
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "kľúč %08lX: \"%s\" %d nových podpisov\n"
  
- #: g10/import.c:1669
++#: g10/import.c:1670
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "kľúč %08lX: \"%s\" 1 nový podkľúč\n"
  
- #: g10/import.c:1672
++#: g10/import.c:1673
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "kľúč %08lX: \"%s\" %d nových podkľúčov\n"
  
- #: g10/import.c:1675
++#: g10/import.c:1676
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "kľúč %08lX: \"%s\" %d nových podpisov\n"
  
- #: g10/import.c:1678
++#: g10/import.c:1679
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "kľúč %08lX: \"%s\" %d nových podpisov\n"
  
- #: g10/import.c:1681
++#: g10/import.c:1682
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "kľúč %08lX: \"%s\" %d nových identifikátorov užívateľa\n"
  
- #: g10/import.c:1684
++#: g10/import.c:1685
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "kľúč %08lX: \"%s\" %d nových identifikátorov užívateľa\n"
  
- #: g10/import.c:1707
++#: g10/import.c:1708
  #, fuzzy, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "kľúč %08lX: \"%s\" bez zmeny\n"
  
- #: g10/import.c:2019 g10/import.c:2264
++#: g10/import.c:2020 g10/import.c:2265
  #, fuzzy, c-format
  msgid "key %s: secret key imported\n"
  msgstr "kľúč %08lX: tajný kľúč importovaný\n"
  
- #: g10/import.c:2027
++#: g10/import.c:2028
  #, fuzzy, c-format
  #| msgid "skipped: secret key already present\n"
  msgid "key %s: secret key already exists\n"
  msgstr "preskočené: tajný kľúč je už v databáze\n"
  
- #: g10/import.c:2035
++#: g10/import.c:2036
  #, fuzzy, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "chyba pri posielaní na `%s': %s\n"
  
- #: g10/import.c:2140
++#: g10/import.c:2141
  #, fuzzy, c-format
  msgid "secret key %s: %s\n"
  msgstr "tajný kľúč `%s' nebol nájdený: %s\n"
  
- #: g10/import.c:2160 g10/import.c:2195
++#: g10/import.c:2161 g10/import.c:2196
  #, fuzzy
  msgid "importing secret keys not allowed\n"
  msgstr "zapisujem tajný kľúč do `%s'\n"
  
- #: g10/import.c:2184
++#: g10/import.c:2185
  #, fuzzy, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr "kľúč %08lX: tajný kľúč bez verejného kľúča %d - preskočené\n"
@@@ -3648,144 -2836,117 +3601,144 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2256
++#: g10/import.c:2257
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2311
++#: g10/import.c:2312
  #, fuzzy, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
  "kľúč %08lX: chýba verejný kľúč - nemôžem aplikovať revokačný certifikát\n"
  
- #: g10/import.c:2360
++#: g10/import.c:2361
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "kľúč %08lX: neplatný revokačný certifikát: %s - zamietnuté\n"
  
- #: g10/import.c:2393
++#: g10/import.c:2394
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "kľúč %08lX: \"%s\" revokačný certifikát importovaný\n"
  
- #: g10/import.c:2469
++#: g10/import.c:2470
  #, fuzzy, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "kľúč %08lX: neexistuje id užívateľa pre podpis\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2487
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr ""
  "kľúč %08lX: nepodporovaný algoritmus verejného kľúča u užívateľského id \"%s"
  "\"\n"
  
- #: g10/import.c:2488
++#: g10/import.c:2489
  #, fuzzy, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr ""
  "kľúč %08lX: neplatný podpis kľúča ním samým u užívateľského id \"%s\"\n"
  
- #: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
++#: g10/import.c:2506 g10/import.c:2532 g10/import.c:2583
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "kľúč %08lX: nepodporovaný algoritmus verejného kľúča\n"
  
- #: g10/import.c:2506
++#: g10/import.c:2507
  #, fuzzy, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "kľúč %08lX: podpis kľúča ním samým (direct key signature)\n"
  
- #: g10/import.c:2520
++#: g10/import.c:2521
  #, fuzzy, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "kľúč %08lX: neexistuje podkľúč pre viazanie kľúčov\n"
  
- #: g10/import.c:2533
++#: g10/import.c:2534
  #, fuzzy, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "kľúč %08lX: neplatná väzba podkľúča\n"
  
- #: g10/import.c:2549
++#: g10/import.c:2550
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "kľúč %08lX: zmazaná viacnásobná väzba podkľúča\n"
  
- #: g10/import.c:2571
++#: g10/import.c:2572
  #, fuzzy, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "kľúč %08lX: neexistuje podkľúč na revokáciu kľúča\n"
  
- #: g10/import.c:2584
++#: g10/import.c:2585
  #, fuzzy, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "kľúč %08lX: neplatný revokačný podkľúč\n"
  
- #: g10/import.c:2599
++#: g10/import.c:2600
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "kľúč %08lX: zmazaná viacnásobná revokácia podkľúča\n"
  
- #: g10/import.c:2641
++#: g10/import.c:2642
  #, fuzzy, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "kľúč %08lX: identifikátor užívateľa preskočený '"
  
- #: g10/import.c:2665
++#: g10/import.c:2666
  #, fuzzy, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "kľúč %08lX: podkľúč preskočený\n"
  
- #: g10/import.c:2694
++#: g10/import.c:2695
  #, fuzzy, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "kľúč %08lX: podpis nie je exportovateľný (trieda %02x) - preskočené\n"
  
- #: g10/import.c:2705
++#: g10/import.c:2706
  #, fuzzy, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "kľúč %08lX: revokačný certifikát na zlom mieste - preskočené \n"
  
- #: g10/import.c:2723
++#: g10/import.c:2724
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "kľúč %08lX: neplatný revokačný certifikát: %s - preskočené\n"
  
- #: g10/import.c:2737
++#: g10/import.c:2738
  #, fuzzy, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "kľúč %08lX: podpis subkľúča na zlom mieste - preskočené \n"
  
- #: g10/import.c:2745
++#: g10/import.c:2746
  #, fuzzy, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "kľúč %08lX: neočakávaná podpisová trieda (0x%02X) - preskočené\n"
  
- #: g10/import.c:2887
++#: g10/import.c:2888
  #, fuzzy, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "kľúč %08lX: zistený duplikovaný identifikátor užívateľa - zlúčený\n"
  
- #: g10/import.c:2951
++#: g10/import.c:2952
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr ""
  "VAROVANIE: kľúč %08lX môže byť revokovaný: skúšam získať revokačný kľúč "
  "%08lX\n"
  
- #: g10/import.c:2967
++#: g10/import.c:2968
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr ""
  "VAROVANIE: kľúč %08lX môže byť revokovaný: revokačný kľúč %08lX nenájdený.\n"
  
- #: g10/import.c:3031
++#: g10/import.c:3032
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "kľúč %08lX: pridaný revokačný certifikát \"%s\"\n"
  
- #: g10/import.c:3069
++#: g10/import.c:3070
  #, fuzzy, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "kľúč %08lX: podpis kľúča ním samým (direct key signature)\n"
@@@ -3822,54 -2977,43 +3775,54 @@@ msgstr "chyba pri vytváraní `%s': %s\
  msgid "error opening key DB: %s\n"
  msgstr "chyba pri čítaní `%s': %s\n"
  
- #: g10/keydb.c:1782
++#: g10/keydb.c:1786
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "zlyhalo obnovenie vyrovnávacej pamäti kľúčov: %s\n"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[revocation]"
  msgstr "[revokácia]"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[self-signature]"
  msgstr "[podpis kľúča ním samým]"
  
- #: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
++#: g10/keyedit.c:433 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: dirmngr/ldap-wrapper.c:694
  #, fuzzy, c-format
  msgid "error allocating memory: %s\n"
  msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
  
- #: g10/keyedit.c:629
++#: g10/keyedit.c:630
  #, fuzzy, c-format
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr "kľúč %08lX: nepodporovaný algoritmus verejného kľúča\n"
  
- #: g10/keyedit.c:638
++#: g10/keyedit.c:639
  #, fuzzy, c-format
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "%s podpis, hashovací algoritmus %s\n"
  
- #: g10/keyedit.c:800
++#: g10/keyedit.c:801
  #, fuzzy
  msgid " (reordered signatures follow)"
  msgstr "Dobrý podpis od \""
  
- #: g10/keyedit.c:913
++#: g10/keyedit.c:914
  #, fuzzy, c-format
  msgid "key %s:\n"
  msgstr "preskočený `%s': %s\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:917
  #, fuzzy, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
  msgstr[0] "Užívateľské ID \"%s\" je revokované."
  msgstr[1] "Užívateľské ID \"%s\" je revokované."
  
- #: g10/keyedit.c:919 g10/keylist.c:480
++#: g10/keyedit.c:920 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
@@@ -3877,7 -3021,6 +3830,7 @@@ msgid_plural "%d signatures not checke
  msgstr[0] "1 podpis neoverený, pretože chýba kľúč\n"
  msgstr[1] "1 podpis neoverený, pretože chýba kľúč\n"
  
- #: g10/keyedit.c:923 g10/keylist.c:476
++#: g10/keyedit.c:924 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
@@@ -3885,21 -3028,18 +3838,21 @@@ msgid_plural "%d bad signatures\n
  msgstr[0] "%d zlých podpisov\n"
  msgstr[1] "%d zlých podpisov\n"
  
- #: g10/keyedit.c:927
++#: g10/keyedit.c:928
  #, fuzzy, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
  msgstr[0] "Dobrý podpis od \""
  msgstr[1] "Dobrý podpis od \""
  
- #: g10/keyedit.c:932
++#: g10/keyedit.c:933
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:992 g10/pkclist.c:274
++#: g10/keyedit.c:993 g10/pkclist.c:274
  #, fuzzy
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
@@@ -3912,68 -3052,53 +3865,68 @@@ msgstr "
  "kontrolou fingerprintov z rôznych zdrojov...)?\n"
  "\n"
  
- #: g10/keyedit.c:996 g10/pkclist.c:286
++#: g10/keyedit.c:997 g10/pkclist.c:286
  #, fuzzy, c-format
  msgid "  %d = I trust marginally\n"
  msgstr " %d = Dôverujem čiastočne\n"
  
- #: g10/keyedit.c:997 g10/pkclist.c:288
++#: g10/keyedit.c:998 g10/pkclist.c:288
  #, fuzzy, c-format
  msgid "  %d = I trust fully\n"
  msgstr " %d = Dôverujem úplne\n"
  
- #: g10/keyedit.c:1015
++#: g10/keyedit.c:1016
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
  "trust signatures on your behalf.\n"
  msgstr ""
  
- #: g10/keyedit.c:1032
++#: g10/keyedit.c:1033
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  
- #: g10/keyedit.c:1160
++#: g10/keyedit.c:1161
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1168
++#: g10/keyedit.c:1169
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "Užívateľské ID \"%s\" je revokované."
  
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
- #: g10/keyedit.c:2246
++#: g10/keyedit.c:1178 g10/keyedit.c:1206 g10/keyedit.c:1233 g10/keyedit.c:1417
++#: g10/keyedit.c:2247
  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:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
- #: g10/keyedit.c:2251 g10/keyedit.c:3177
++#: g10/keyedit.c:1192 g10/keyedit.c:1220 g10/keyedit.c:1247 g10/keyedit.c:1423
++#: g10/keyedit.c:2252 g10/keyedit.c:3178
  msgid "  Unable to sign.\n"
  msgstr "  Nemožno podpísať.\n"
  
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1197
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "Užívateľské ID \"%s\" je revokované."
  
- #: g10/keyedit.c:1224
++#: g10/keyedit.c:1225
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "ID užívateľa \"%s\" nie je podpísané ním samým."
  
- #: g10/keyedit.c:1253
++#: g10/keyedit.c:1254
  #, fuzzy, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "ID užívateľa \"%s\" nie je podpísané ním samým."
  
- #: g10/keyedit.c:1255
++#: g10/keyedit.c:1256
  #, fuzzy
  msgid "Sign it? (y/N) "
  msgstr "Skutočne podpísať? "
  
- #: g10/keyedit.c:1282
++#: g10/keyedit.c:1283
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -3982,11 -3107,9 +3935,11 @@@ msgstr "
  "Podpis kľúča \"%s\" ním samým je\n"
  "podpis vo formáte PGP 2.x.\n"
  
- #: g10/keyedit.c:1291
++#: g10/keyedit.c:1292
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr "Prajete si ho zmeniť na formát OpenPGP? (a/N) "
  
- #: g10/keyedit.c:1304
++#: g10/keyedit.c:1305
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3996,11 -3119,9 +3949,11 @@@ msgstr "
  "je len lokálny.\n"
  "\n"
  
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:1310
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr "Chcete, aby platnosť Vášho podpisu vypršala v rovnakom čase? (A/n) "
  
- #: g10/keyedit.c:1330
++#: g10/keyedit.c:1331
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -4010,43 -3131,34 +3963,43 @@@ msgstr "
  "je len lokálny.\n"
  "\n"
  
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:1336
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr "Prajete si ho zmeniť na plne exportovateľný podpis? (a/N) "
  
- #: g10/keyedit.c:1355
++#: g10/keyedit.c:1356
  #, fuzzy, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "\"%s\" je už lokálne podpísaný kľúčom %08lX\n"
  
- #: g10/keyedit.c:1359
++#: g10/keyedit.c:1360
  #, fuzzy, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "\"%s\" je už podpísaný kľúčom %08lX\n"
  
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:1365
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "Ste si istý, že stále chcete podpísať tento kľúč? (a/N) "
  
- #: g10/keyedit.c:1386
++#: g10/keyedit.c:1387
  #, fuzzy, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "Nič na podpísanie kľúčom %08lX\n"
  
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1411
  msgid "This key has expired!"
  msgstr "Platnosť kľúča vypršala!"
  
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1429
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "Platnosť kľúča vyprší %s.\n"
  
- #: g10/keyedit.c:1434
++#: g10/keyedit.c:1435
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr "Chcete, aby platnosť Vášho podpisu vypršala v rovnakom čase? (A/n) "
  
- #: g10/keyedit.c:1475
++#: g10/keyedit.c:1476
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -4056,32 -3168,26 +4009,32 @@@ msgstr "
  "patrí vyššie uvedenej osobe?\n"
  "Pokiaľ nepoznáte odpoveď, zadajte \"0\".\n"
  
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1481
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) Neodpoviem.%s\n"
  
- #: g10/keyedit.c:1482
++#: g10/keyedit.c:1483
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) Vôbec som to nekontroloval(a).%s\n"
  
- #: g10/keyedit.c:1484
++#: g10/keyedit.c:1485
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) Čiastočne som to overil(a).%s\n"
  
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:1488
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) Veľmi dôkladne som to overil(a).%s\n"
  
- #: g10/keyedit.c:1494
++#: g10/keyedit.c:1495
  #, fuzzy
  msgid "Your selection? (enter '?' for more information): "
  msgstr "Váš výber? ('?' - viac informácií): "
  
- #: g10/keyedit.c:1521
++#: g10/keyedit.c:1522
  #, fuzzy, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -4090,28 -3196,24 +4043,28 @@@ msgstr "
  "Ste si istý, že chcete podpísať tento kľúč\n"
  "svojím kľúčom: \""
  
- #: g10/keyedit.c:1529
++#: g10/keyedit.c:1530
  #, fuzzy
  msgid "This will be a self-signature.\n"
  msgstr ""
  "\n"
  "Ide o podpis kľúča ním samým\n"
  
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:1535
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr ""
  "\n"
  "VAROVANIE: podpis nebude označený ako neexportovateľný.\n"
  
- #: g10/keyedit.c:1541
++#: g10/keyedit.c:1542
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr ""
  "\n"
  "VAROVANIE: podpis nebude označený ako neodvolateľný (non-revocable).\n"
  
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1552
  #, fuzzy
  msgid "The signature will be marked as non-exportable.\n"
  msgstr ""
@@@ -4119,237 -3221,187 +4072,237 @@@
  "Podpis bude označený ako neexportovateľný.\n"
  "\n"
  
- #: g10/keyedit.c:1558
++#: g10/keyedit.c:1559
  #, fuzzy
  msgid "The signature will be marked as non-revocable.\n"
  msgstr ""
  "\n"
  "Podpis bude označený ako neodvolateľný (non-revocable).\n"
  
- #: g10/keyedit.c:1565
++#: g10/keyedit.c:1566
  #, fuzzy
  msgid "I have not checked this key at all.\n"
  msgstr ""
  "\n"
  "Vôbec som tento kľúč neoveril.\n"
  
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:1571
  #, fuzzy
  msgid "I have checked this key casually.\n"
  msgstr ""
  "\n"
  "Čiastočne som overil tento kľúč.\n"
  
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:1576
  #, fuzzy
  msgid "I have checked this key very carefully.\n"
  msgstr ""
  "\n"
  "Velmi dôkladne som overil tento kľúč.\n"
  
- #: g10/keyedit.c:1587
++#: g10/keyedit.c:1588
  #, fuzzy
  msgid "Really sign? (y/N) "
  msgstr "Skutočne podpísať? "
  
- #: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
- #: g10/keyedit.c:6463 g10/sign.c:323
++#: g10/keyedit.c:1639 g10/keyedit.c:6308 g10/keyedit.c:6391 g10/keyedit.c:6500
++#: g10/keyedit.c:6562 g10/sign.c:325
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "podpisovanie zlyhalo: %s\n"
  
- #: g10/keyedit.c:1725
++#: g10/keyedit.c:1726
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  
- #: g10/keyedit.c:1755
++#: g10/keyedit.c:1756
  #, fuzzy, c-format
  #| msgid "error creating passphrase: %s\n"
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: g10/keyedit.c:1869
++#: g10/keyedit.c:1870
  msgid "save and quit"
  msgstr "uložiť a ukončiť"
  
- #: g10/keyedit.c:1872
++#: g10/keyedit.c:1873
  #, fuzzy
  msgid "show key fingerprint"
  msgstr "vypísať fingerprint"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1874
  #, fuzzy
  msgid "show the keygrip"
  msgstr "Podpisová notácia: "
  
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1875
  msgid "list key and user IDs"
  msgstr "vypísať zoznam kľúčov a id užívateľov"
  
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1877
  msgid "select user ID N"
  msgstr "vyberte identifikátor užívateľa N"
  
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1878
  #, fuzzy
  msgid "select subkey N"
  msgstr "vyberte identifikátor užívateľa N"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1879
  #, fuzzy
  msgid "check signatures"
  msgstr "revokovať podpisy"
  
- #: g10/keyedit.c:1884
++#: g10/keyedit.c:1885
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr ""
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1890
  #, fuzzy
  msgid "sign selected user IDs locally"
  msgstr "podpísať kľúč lokálne"
  
- #: g10/keyedit.c:1890
++#: g10/keyedit.c:1891
  #, fuzzy
  msgid "sign selected user IDs with a trust signature"
  msgstr "Nápoveda: Vyberte id užívateľa na podpísanie\n"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1893
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr ""
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1895
  msgid "add a user ID"
  msgstr "pridať identifikátor užívateľa"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1897
  msgid "add a photo ID"
  msgstr "pridať fotografické ID"
  
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1898
  #, fuzzy
  msgid "delete selected user IDs"
  msgstr "zmazať identifikátor užívateľa"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1901
  #, fuzzy
  msgid "add a subkey"
  msgstr "addkey"
  
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1904
  msgid "add a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1906
  msgid "move a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1908
  msgid "move a backup key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1910
  #, fuzzy
  msgid "delete selected subkeys"
  msgstr "zmazať sekundárny kľúč"
  
- #: g10/keyedit.c:1911
++#: g10/keyedit.c:1912
  msgid "add a revocation key"
  msgstr "pridať revokačný kľúč"
  
- #: g10/keyedit.c:1913
++#: g10/keyedit.c:1914
  #, fuzzy
  msgid "delete signatures from the selected user IDs"
  msgstr "Skutočne aktualizovať predvoľby pre vybrané id užívateľa? "
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1916
  #, fuzzy
  msgid "change the expiration date for the key or selected subkeys"
  msgstr "Nemôžete zmeniť dobu platnosti kľúča verzie 3\n"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1918
  #, fuzzy
  msgid "flag the selected user ID as primary"
  msgstr "označiť užívateľské ID ako primárne"
  
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1921
  msgid "list preferences (expert)"
  msgstr "vypísať zoznam predvolieb (pre expertov)"
  
- #: g10/keyedit.c:1921
++#: g10/keyedit.c:1922
  msgid "list preferences (verbose)"
  msgstr "vypísať zoznam predvolieb (podrobne)"
  
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:1924
  #, fuzzy
  msgid "set preference list for the selected user IDs"
  msgstr "Skutočne aktualizovať predvoľby pre vybrané id užívateľa? "
  
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1927
  #, fuzzy
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr "nemožno použiť URI servera kľúčov - chyba analýzy URI\n"
  
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1929
  #, fuzzy
  msgid "set a notation for the selected user IDs"
  msgstr "Skutočne aktualizovať predvoľby pre vybrané id užívateľa? "
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1931
  msgid "change the passphrase"
  msgstr "zmeniť heslo"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1934
  msgid "change the ownertrust"
  msgstr "zmeniť dôveryhodnosť vlastníka kľúča"
  
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1937
  #, fuzzy
  msgid "revoke signatures on the selected user IDs"
  msgstr "Skutočne revokovať všetky vybrané id užívateľa? "
  
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1939
  #, fuzzy
  msgid "revoke selected user IDs"
  msgstr "revokovať identifikátor užívateľa"
  
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1942
  #, fuzzy
  msgid "revoke key or selected subkeys"
  msgstr "revokovať sekundárny kľúč"
  
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1944
  #, fuzzy
  msgid "enable key"
  msgstr "nastaviť kľúč ako platný (enable)"
  
- #: g10/keyedit.c:1944
++#: g10/keyedit.c:1945
  #, fuzzy
  msgid "disable key"
  msgstr "nastaviť kľúč ako neplatný (disable)"
  
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1947
  #, fuzzy
  msgid "show selected photo IDs"
  msgstr "ukázať fotografické ID"
  
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1949
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:1951
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2063
  msgid "Secret key is available.\n"
  msgstr "Tajný kľúč je dostupný.\n"
  
- #: g10/keyedit.c:2162
++#: g10/keyedit.c:2163
  msgid "Need the secret key to do this.\n"
  msgstr "Na vykonanie tejto operácie je potrebný tajný kľúč.\n"
  
- #: g10/keyedit.c:2183
++#: g10/keyedit.c:2184
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4357,279 -3409,224 +4310,284 @@@
  "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
  msgstr ""
  
- #: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
++#: g10/keyedit.c:2240 g10/keyedit.c:3178 g10/keyedit.c:3317 g10/keyedit.c:3379
  msgid "Key is revoked."
  msgstr "Kľúč revokovaný."
  
- #: g10/keyedit.c:2262
++#: g10/keyedit.c:2263
  #, fuzzy
  msgid "Really sign all user IDs? (y/N) "
  msgstr "Skutočne podpísať všetky id užívateľa? "
  
- #: g10/keyedit.c:2266
++#: g10/keyedit.c:2267
  #, fuzzy
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "Skutočne podpísať všetky id užívateľa? "
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2275
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Nápoveda: Vyberte id užívateľa na podpísanie\n"
  
- #: g10/keyedit.c:2285
++#: g10/keyedit.c:2286
  #, fuzzy, c-format
  msgid "Unknown signature type '%s'\n"
  msgstr "neznáma trieda podpisu"
  
- #: g10/keyedit.c:2309
++#: g10/keyedit.c:2310
  #, 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/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
++#: g10/keyedit.c:2332 g10/keyedit.c:2356 g10/keyedit.c:2550
  msgid "You must select at least one user ID.\n"
  msgstr "Musíte vybrať aspoň jedno id užívateľa.\n"
  
- #: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
++#: g10/keyedit.c:2334 g10/keyedit.c:2358 g10/keyedit.c:2512 g10/keyedit.c:2552
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2336
++#: g10/keyedit.c:2337
  msgid "You can't delete the last user ID!\n"
  msgstr "Nemôžete zmazať posledné id užívateľa!\n"
  
- #: g10/keyedit.c:2339
++#: g10/keyedit.c:2340
  #, fuzzy
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "Skutočne odstrániť všetky vybrané id užívateľa? "
  
- #: g10/keyedit.c:2340
++#: g10/keyedit.c:2341
  #, fuzzy
  msgid "Really remove this user ID? (y/N) "
  msgstr "Skutočne odstrániť toto id užívateľa? "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2397
++#: g10/keyedit.c:2398
  #, fuzzy
  msgid "Really move the primary key? (y/N) "
  msgstr "Skutočne odstrániť toto id užívateľa? "
  
- #: g10/keyedit.c:2409 g10/keyedit.c:4866
++#: g10/keyedit.c:2410 g10/keyedit.c:4964
  #, fuzzy
  msgid "You must select exactly one key.\n"
  msgstr "Musíte vybrať aspoň jeden kľúč.\n"
  
- #: g10/keyedit.c:2436
++#: g10/keyedit.c:2437
  msgid "Command expects a filename argument\n"
  msgstr ""
  
- #: g10/keyedit.c:2457
++#: g10/keyedit.c:2458
  #, fuzzy, c-format
  msgid "Can't open '%s': %s\n"
  msgstr "nemôžem otvoriť `%s': %s\n"
  
- #: g10/keyedit.c:2474
++#: g10/keyedit.c:2475
  #, fuzzy, c-format
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
  
- #: g10/keyedit.c:2509
++#: g10/keyedit.c:2510
  msgid "You must select at least one key.\n"
  msgstr "Musíte vybrať aspoň jeden kľúč.\n"
  
- #: g10/keyedit.c:2515
++#: g10/keyedit.c:2516
  #, fuzzy
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "Skutočne chcete zmazať vybrané kľúče? "
  
- #: g10/keyedit.c:2517
++#: g10/keyedit.c:2518
  #, fuzzy
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "Skutočne chcete zmazať tento kľúč? "
  
- #: g10/keyedit.c:2555
++#: g10/keyedit.c:2556
  #, fuzzy
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr "Skutočne revokovať všetky vybrané id užívateľa? "
  
- #: g10/keyedit.c:2556
++#: g10/keyedit.c:2557
  #, fuzzy
  msgid "Really revoke this user ID? (y/N) "
  msgstr "Skutočne revokovať toto id užívateľa? "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2575
  #, fuzzy
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "Skutočne chcete revokovať tento kľúč? "
  
- #: g10/keyedit.c:2585
++#: g10/keyedit.c:2586
  #, fuzzy
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "Skutočne chcete revokovať vybrané kľúče? "
  
- #: g10/keyedit.c:2587
++#: g10/keyedit.c:2588
  #, fuzzy
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "Skutočne chcete revokovať tento kľúč? "
  
- #: g10/keyedit.c:2645
++#: g10/keyedit.c:2646
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  
- #: g10/keyedit.c:2690
++#: g10/keyedit.c:2691
  #, fuzzy
  msgid "Set preference list to:\n"
  msgstr "nastaviť zoznam predvolieb"
  
- #: g10/keyedit.c:2697
++#: g10/keyedit.c:2698
  #, fuzzy
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr "Skutočne aktualizovať predvoľby pre vybrané id užívateľa? "
  
- #: g10/keyedit.c:2699
++#: g10/keyedit.c:2700
  #, fuzzy
  msgid "Really update the preferences? (y/N) "
  msgstr "Skutočne aktualizovať predvoľby? "
  
- #: g10/keyedit.c:2773
++#: g10/keyedit.c:2774
  #, fuzzy
  msgid "Save changes? (y/N) "
  msgstr "Uložiť zmeny? "
  
- #: g10/keyedit.c:2777
++#: g10/keyedit.c:2778
  #, fuzzy
  msgid "Quit without saving? (y/N) "
  msgstr "Ukončiť bez uloženia? "
  
- #: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
- #: g10/keyedit.c:3267 g10/keyedit.c:3332
++#: g10/keyedit.c:2789 g10/keyedit.c:2799 g10/keyedit.c:2943 g10/keyedit.c:3046
++#: g10/keyedit.c:3268 g10/keyedit.c:3333 g10/keyedit.c:3409
  #, c-format
  msgid "update failed: %s\n"
  msgstr "aktualizácia zlyhala: %s\n"
  
- #: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
++#: g10/keyedit.c:2805 g10/keyedit.c:3273 g10/keyedit.c:3338 g10/keyedit.c:3416
  msgid "Key not changed so no update needed.\n"
  msgstr "kľúč nebol zmenený, takže nie je potrebné ho aktualizovať.\n"
  
- #: g10/keyedit.c:3038
++#: g10/keyedit.c:3039
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
  msgstr "Vytvorenie kľúča sa nepodarilo: %s\n"
  
- #: g10/keyedit.c:3083
++#: g10/keyedit.c:3084
  #, fuzzy, c-format
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "chyba: neplatný odtlačok\n"
  
- #: g10/keyedit.c:3112
++#: g10/keyedit.c:3113
  #, fuzzy, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "nemôžem inicializovať databázu dôvery: %s\n"
  
- #: g10/keyedit.c:3248 g10/keyedit.c:3251
++#: g10/keyedit.c:3249 g10/keyedit.c:3252
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
  msgstr "neplatná hodnota\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  #, 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:3254
++#: g10/keyedit.c:3255
  #, fuzzy
  msgid "Nothing to sign.\n"
  msgstr "Nič na podpísanie kľúčom %08lX\n"
  
- #: g10/keyedit.c:3427
++#: g10/keyedit.c:3388
+ #, fuzzy, c-format
+ msgid "'%s' is not a valid expiration time\n"
+ msgstr "%s nie je platná znaková sada\n"
+ 
++#: g10/keyedit.c:3508
  msgid "Digest: "
  msgstr "Digest: "
  
- #: g10/keyedit.c:3484
++#: g10/keyedit.c:3565
  msgid "Features: "
  msgstr "Charakteristiky: "
  
- #: g10/keyedit.c:3495
++#: g10/keyedit.c:3576
  msgid "Keyserver no-modify"
  msgstr ""
  
- #: g10/keyedit.c:3510 g10/keylist.c:377
++#: g10/keyedit.c:3591 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr ""
  
- #: g10/keyedit.c:3518 g10/keyedit.c:3519
++#: g10/keyedit.c:3599 g10/keyedit.c:3600
  #, fuzzy
  msgid "Notations: "
  msgstr "Notácie: "
  
- #: g10/keyedit.c:3764
++#: g10/keyedit.c:3845
  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:3836
++#: g10/keyedit.c:3917
  #, 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:3860
++#: g10/keyedit.c:3941
  #, 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:3866
++#: g10/keyedit.c:3947
  #, fuzzy
  msgid "(sensitive)"
  msgstr "(citlivá informácia)"
  
- #: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3989 g10/keyedit.c:4131 g10/keylist.c:262 g10/keyserver.c:538
  #, fuzzy, c-format
  msgid "created: %s"
  msgstr "%s: nemôžem vytvoriť: %s\n"
  
- #: g10/keyedit.c:3911 g10/keylist.c:1852
++#: g10/keyedit.c:3992 g10/keylist.c:1852
  #, fuzzy, c-format
  msgid "revoked: %s"
  msgstr "[revokované]"
  
- #: g10/keyedit.c:3913 g10/keylist.c:1858
++#: g10/keyedit.c:3994 g10/keylist.c:1858
  #, fuzzy, c-format
  msgid "expired: %s"
  msgstr " [platnosť skončí: %s]"
  
- #: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyedit.c:3996 g10/keyedit.c:4133 g10/keylist.c:264 g10/keylist.c:1864
 +#: g10/keyserver.c:544
  #, fuzzy, c-format
  msgid "expires: %s"
  msgstr " [platnosť skončí: %s]"
  
- #: g10/keyedit.c:3917
++#: g10/keyedit.c:3998
  #, fuzzy, c-format
  msgid "usage: %s"
  msgstr " dôvera: %c/%c"
  
- #: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
++#: g10/keyedit.c:4006 g10/keyedit.c:4026 g10/keylist.c:267
  msgid "card-no: "
  msgstr ""
  
- #: g10/keyedit.c:3984
++#: g10/keyedit.c:4065
  #, fuzzy, c-format
  msgid "trust: %s"
  msgstr " dôvera: %c/%c"
  
- #: g10/keyedit.c:3988
++#: g10/keyedit.c:4069
  #, c-format
  msgid "validity: %s"
  msgstr ""
  
- #: g10/keyedit.c:3995
++#: g10/keyedit.c:4076
  msgid "This key has been disabled"
  msgstr "Tento kľúč bol označený za neplatný (disabled)"
  
- #: g10/keyedit.c:4013
++#: g10/keyedit.c:4094
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4637,20 -3634,14 +4595,20 @@@ 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:4069 g10/keyedit.c:4500 g10/keyserver.c:548
- #: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: g10/keyedit.c:4150 g10/keyedit.c:4581 g10/keyserver.c:548
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:712
 +#: dirmngr/ocsp.c:703
  #, fuzzy
  msgid "revoked"
  msgstr "[revokované]"
  
- #: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
- #: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4152 g10/keyedit.c:4583 g10/keyserver.c:552
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:714
  #, fuzzy
  msgid "expired"
  msgstr "expire"
  
- #: g10/keyedit.c:4188
++#: g10/keyedit.c:4269
  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"
@@@ -4658,17 -3649,14 +4616,17 @@@ 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:4240
++#: g10/keyedit.c:4321
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr ""
  
- #: g10/keyedit.c:4241
++#: g10/keyedit.c:4322
  #, fuzzy
  #| 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:4300
++#: g10/keyedit.c:4381
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4677,35 -3665,27 +4635,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:4305 g10/keyedit.c:4595
++#: g10/keyedit.c:4386 g10/keyedit.c:4676
  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:4311
++#: g10/keyedit.c:4392
  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:4326 g10/keygen.c:2697
++#: g10/keyedit.c:4407 g10/keygen.c:2719
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4509
  msgid "Delete this good signature? (y/N/q)"
  msgstr "Zmazať tento dobrý podpis? (a/N/u)"
  
- #: g10/keyedit.c:4438
++#: g10/keyedit.c:4519
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "Zmazať tento neplatný podpis? (a/N/u)"
  
- #: g10/keyedit.c:4442
++#: g10/keyedit.c:4523
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "Zmazať tento neznámy podpis? (a/N/u)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4530
  msgid "Really delete this self-signature? (y/N)"
  msgstr "Skutočne zmazať tento podpis podpísaný sebou samým? (a/N)"
  
- #: g10/keyedit.c:4465
++#: g10/keyedit.c:4546
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
@@@ -4713,38 -3693,31 +4671,38 @@@ msgid_plural "Deleted %d signatures.\n
  msgstr[0] "Zmazaný %d podpis.\n"
  msgstr[1] "Zmazaný %d podpis.\n"
  
- #: g10/keyedit.c:4469
++#: g10/keyedit.c:4550
  msgid "Nothing deleted.\n"
  msgstr "Nič nebolo zmaznané.\n"
  
- #: g10/keyedit.c:4504 g10/trust.c:693
++#: g10/keyedit.c:4585 g10/trust.c:716
  #, fuzzy
  msgid "invalid"
  msgstr "neplatný spôsob reprezentácie v ASCII"
  
- #: g10/keyedit.c:4506
++#: g10/keyedit.c:4587
  #, fuzzy, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "Užívateľské ID \"%s\" je revokované."
  
- #: g10/keyedit.c:4512
++#: g10/keyedit.c:4593
  #, 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:4520
++#: g10/keyedit.c:4601
  #, fuzzy, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "užívateľské ID \"%s\" je už revokované\n"
  
- #: g10/keyedit.c:4521
++#: g10/keyedit.c:4602
  #, fuzzy, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "užívateľské ID \"%s\" je už revokované\n"
  
- #: g10/keyedit.c:4590
++#: g10/keyedit.c:4671
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4753,278 -3726,219 +4711,278 @@@ 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:4601
++#: g10/keyedit.c:4682
  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:4618
++#: g10/keyedit.c:4699
  msgid "Enter the user ID of the designated revoker: "
  msgstr "Vložte identifikátor užívateľa povereného revokáciou: "
  
- #: g10/keyedit.c:4643
++#: g10/keyedit.c:4724
  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:4658
++#: g10/keyedit.c:4739
  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:4680
++#: g10/keyedit.c:4761
  #, fuzzy
  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:4698
++#: g10/keyedit.c:4779
  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:4704
++#: g10/keyedit.c:4785
  #, 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:4755
++#: g10/keyedit.c:4848
  #, 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:4760
++#: g10/keyedit.c:4853
  #, fuzzy
  msgid "Changing expiration time for a subkey.\n"
  msgstr "Mením dobu platnosti sekundárneho kľúča.\n"
  
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:4856
  msgid "Changing expiration time for the primary key.\n"
  msgstr "Mením dobu platnosti primárneho kľúča.\n"
  
- #: g10/keyedit.c:4814
++#: g10/keyedit.c:4910
  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:4987
++#: g10/keyedit.c:5085
  #, 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:4993
++#: g10/keyedit.c:5091
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr ""
  
- #: g10/keyedit.c:5108
++#: g10/keyedit.c:5206
  msgid "Please select exactly one user ID.\n"
  msgstr "Prosím, vyberte práve jedno id užívateľa.\n"
  
- #: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
++#: g10/keyedit.c:5247 g10/keyedit.c:5361 g10/keyedit.c:5474 g10/keyedit.c:5611
  #, 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:5320
++#: g10/keyedit.c:5418
  msgid "Enter your preferred keyserver URL: "
  msgstr ""
  
- #: g10/keyedit.c:5399
++#: g10/keyedit.c:5497
  #, 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:5400
++#: g10/keyedit.c:5498
  #, 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:5459
++#: g10/keyedit.c:5557
  #, fuzzy
  msgid "Enter the notation: "
  msgstr "Podpisová notácia: "
  
- #: g10/keyedit.c:5606
++#: g10/keyedit.c:5704
  #, fuzzy
  msgid "Proceed? (y/N) "
  msgstr "Prepísať (a/N)? "
  
- #: g10/keyedit.c:5676
++#: g10/keyedit.c:5774
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "Neexistuje identifikátor užívateľa s indexom %d\n"
  
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5836
  #, 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:5839
++#: g10/keyedit.c:5937
  #, 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:5861
++#: g10/keyedit.c:5959
  #, fuzzy, c-format
  msgid "No subkey with index %d\n"
  msgstr "Neexistuje identifikátor užívateľa s indexom %d\n"
  
- #: g10/keyedit.c:6002
++#: g10/keyedit.c:6100
  #, fuzzy, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "id užívateľa: \""
  
- #: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
++#: g10/keyedit.c:6103 g10/keyedit.c:6205 g10/keyedit.c:6253
  #, 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:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
++#: g10/keyedit.c:6105 g10/keyedit.c:6207 g10/keyedit.c:6255
  msgid " (non-exportable)"
  msgstr " (nexeportovateľné)"
  
- #: g10/keyedit.c:6011
++#: g10/keyedit.c:6109
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "Platnosť podpisu vyprší %s.\n"
  
- #: g10/keyedit.c:6016
++#: g10/keyedit.c:6114
  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:6021
++#: g10/keyedit.c:6119
  msgid "Create a revocation certificate for this signature? (y/N) "
  msgstr "Vytvoriť pre tento podpis revokačný certifikát? (a/N)"
  
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6173
  #, fuzzy
  msgid "Not signed by you.\n"
  msgstr "   podpísané %08lX v %s%s\n"
  
- #: g10/keyedit.c:6081
++#: g10/keyedit.c:6179
  #, 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:6110
++#: g10/keyedit.c:6208
  #, fuzzy
  msgid " (non-revocable)"
  msgstr " (nexeportovateľné)"
  
- #: g10/keyedit.c:6117
++#: g10/keyedit.c:6215
  #, fuzzy, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "   revokované %08lX v %s\n"
  
- #: g10/keyedit.c:6142
++#: g10/keyedit.c:6240
  msgid "You are about to revoke these signatures:\n"
  msgstr "Chystáte sa revokovať tieto podpisy:\n"
  
- #: g10/keyedit.c:6165
++#: g10/keyedit.c:6263
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "Skutočne vytvoriť revokačné certifikáty? (a/N) "
  
- #: g10/keyedit.c:6198
++#: g10/keyedit.c:6296
  msgid "no secret key\n"
  msgstr "neexistuje tajný kľúč\n"
  
- #: g10/keyedit.c:6246
++#: g10/keyedit.c:6344
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6256
++#: g10/keyedit.c:6354
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "užívateľské ID \"%s\" je už revokované\n"
  
- #: g10/keyedit.c:6273
++#: g10/keyedit.c:6371
  #, 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:6386
++#: g10/keyedit.c:6485
  #, fuzzy, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "užívateľské ID \"%s\" je už revokované\n"
  
- #: g10/keyedit.c:6448
++#: g10/keyedit.c:6547
  #, fuzzy, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "užívateľské ID \"%s\" je už revokované\n"
  
- #: g10/keyedit.c:6545
++#: g10/keyedit.c:6644
  #, fuzzy, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr ""
  "Zobrazujem %s fotografické ID s veľkosťou %ld pre kľúč 0x%08lX (uid %d)\n"
  
- #: g10/keygen.c:305
++#: g10/keygen.c:316
  #, fuzzy, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "duplicita predvoľby %c%lu\n"
  
- #: g10/keygen.c:312
++#: g10/keygen.c:323
  #, fuzzy
  msgid "too many cipher preferences\n"
  msgstr "príliš veľa `%c' predvolieb\n"
  
- #: g10/keygen.c:314
++#: g10/keygen.c:325
  #, fuzzy
  msgid "too many digest preferences\n"
  msgstr "príliš veľa `%c' predvolieb\n"
  
- #: g10/keygen.c:316
++#: g10/keygen.c:327
  #, fuzzy
  msgid "too many compression preferences\n"
  msgstr "príliš veľa `%c' predvolieb\n"
  
- #: g10/keygen.c:457
++#: g10/keygen.c:468
  #, fuzzy, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "neplatný znak v reťazci s predvoľbami\n"
  
- #: g10/keygen.c:936
++#: g10/keygen.c:947
  msgid "writing direct signature\n"
  msgstr "zapisujem podpis kľúča ním samým (direct signature)\n"
  
- #: g10/keygen.c:982
++#: g10/keygen.c:993
  msgid "writing self signature\n"
  msgstr "zapisujem podpis kľúča sebou samým\n"
  
- #: g10/keygen.c:1038
++#: g10/keygen.c:1049
  msgid "writing key binding signature\n"
  msgstr "zapisujem \"key-binding\" podpis\n"
  
- #: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
- #: g10/keygen.c:1610 g10/keygen.c:1615
++#: g10/keygen.c:1413 g10/keygen.c:1418 g10/keygen.c:1470 g10/keygen.c:1475
++#: g10/keygen.c:1622 g10/keygen.c:1627
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "neplatná dĺžka kľúča; použijem %u bitov\n"
  
- #: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
++#: g10/keygen.c:1424 g10/keygen.c:1481 g10/keygen.c:1489 g10/keygen.c:1633
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "dĺžka kľúča zaokrúhlená na %u bitov\n"
  
- #: g10/keygen.c:1503
++#: g10/keygen.c:1515
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1677
++#: g10/keygen.c:1689
  #, fuzzy
  msgid "Sign"
  msgstr "sign"
  
- #: g10/keygen.c:1680
++#: g10/keygen.c:1692
  msgid "Certify"
  msgstr ""
  
- #: g10/keygen.c:1683
++#: g10/keygen.c:1695
  #, fuzzy
  msgid "Encrypt"
  msgstr "šifrovať dáta"
  
- #: g10/keygen.c:1686
++#: g10/keygen.c:1698
  msgid "Authenticate"
  msgstr ""
  
@@@ -5038,157 -3952,126 +4996,157 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1705
++#: g10/keygen.c:1717
  msgid "SsEeAaQq"
  msgstr ""
  
- #: g10/keygen.c:1732
++#: g10/keygen.c:1744
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr ""
  
- #: g10/keygen.c:1738
++#: g10/keygen.c:1750
  msgid "Current allowed actions: "
  msgstr ""
  
- #: g10/keygen.c:1743
++#: g10/keygen.c:1755
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr ""
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1758
  #, fuzzy, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%d) ElGamal (len na šifrovanie)\n"
  
- #: g10/keygen.c:1749
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr ""
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr ""
  
- #: g10/keygen.c:1881 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1893 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Prosím, vyberte druh kľúča, ktorý chcete:\n"
  
- #: g10/keygen.c:1885
++#: g10/keygen.c:1897
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) DSA a ElGamal (implicitný)\n"
  
- #: g10/keygen.c:1889
++#: g10/keygen.c:1901
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA a ElGamal (implicitný)\n"
  
- #: g10/keygen.c:1892
++#: g10/keygen.c:1904
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (len na podpis)\n"
  
- #: g10/keygen.c:1894
++#: g10/keygen.c:1906
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (len na podpis)\n"
  
- #: g10/keygen.c:1900
++#: g10/keygen.c:1912
  #, fuzzy, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) ElGamal (len na šifrovanie)\n"
  
- #: g10/keygen.c:1902
++#: g10/keygen.c:1914
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (len na šifrovanie)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1920
  #, fuzzy, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (len na šifrovanie)\n"
  
- #: g10/keygen.c:1910
++#: g10/keygen.c:1922
  #, fuzzy, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (len na šifrovanie)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1928
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA a ElGamal (implicitný)\n"
  
- #: g10/keygen.c:1918
++#: g10/keygen.c:1930
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (len na podpis)\n"
  
- #: g10/keygen.c:1920
++#: g10/keygen.c:1932
  #, fuzzy, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) RSA (len na šifrovanie)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1934
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) RSA (len na šifrovanie)\n"
  
- #: g10/keygen.c:1926
++#: g10/keygen.c:1938
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) RSA (len na šifrovanie)\n"
  
- #: g10/keygen.c:2022 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:206
  #, fuzzy
  msgid "Enter the keygrip: "
  msgstr "Podpisová notácia: "
  
- #: g10/keygen.c:2035 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2047 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2049 sm/certreqgen-ui.c:216
  #, fuzzy
  msgid "No key with this keygrip\n"
  msgstr "Neexistuje identifikátor užívateľa s indexom %d\n"
  
- #: g10/keygen.c:2111 g10/keygen.c:2125
++#: g10/keygen.c:2133 g10/keygen.c:2147
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
  msgstr "zaokrúhlené na %u bitov\n"
  
- #: g10/keygen.c:2166
++#: g10/keygen.c:2188
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr ""
  
- #: g10/keygen.c:2174
++#: g10/keygen.c:2196
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Akú veľkosť kľúča si prajete? (1024) "
  
- #: g10/keygen.c:2177 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2199 sm/certreqgen-ui.c:183
  #, fuzzy, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Akú veľkosť kľúča si prajete? (1024) "
  
- #: g10/keygen.c:2191 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2213 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Požadovaná dĺžka kľúča je %u bitov.\n"
  
- #: g10/keygen.c:2237
++#: g10/keygen.c:2259
  #, fuzzy
  #| msgid "Please select what kind of key you want:\n"
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Prosím, vyberte druh kľúča, ktorý chcete:\n"
  
- #: g10/keygen.c:2409
++#: g10/keygen.c:2431
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5204,7 -4087,6 +5162,7 @@@ msgstr "
  "      <n>m = doba platnosti kľúča skončí za n mesiacov\n"
  "      <n>y = doba platnosti kľúča skončí za n rokov\n"
  
- #: g10/keygen.c:2420
++#: g10/keygen.c:2442
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5220,40 -4102,32 +5178,40 @@@ msgstr "
  "      <n>m = doba platnosti podpisu skončí za n mesiacov\n"
  "      <n>y = doba platnosti podpisu skončí za n rokov\n"
  
- #: g10/keygen.c:2443
++#: g10/keygen.c:2465
  msgid "Key is valid for? (0) "
  msgstr "Kľúč je platný na? (0) "
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2470
  #, fuzzy, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Podpis je platný na? (0) "
  
- #: g10/keygen.c:2461 g10/keygen.c:2486
++#: g10/keygen.c:2483 g10/keygen.c:2508
  msgid "invalid value\n"
  msgstr "neplatná hodnota\n"
  
- #: g10/keygen.c:2468
++#: g10/keygen.c:2490
  #, fuzzy
  msgid "Key does not expire at all\n"
  msgstr "platnosť %s neskončí\n"
  
- #: g10/keygen.c:2469
++#: g10/keygen.c:2491
  #, fuzzy
  msgid "Signature does not expire at all\n"
  msgstr "platnosť %s neskončí\n"
  
- #: g10/keygen.c:2474
++#: g10/keygen.c:2496
  #, fuzzy, c-format
  msgid "Key expires at %s\n"
  msgstr "platnosť %s skončí %s\n"
  
- #: g10/keygen.c:2475
++#: g10/keygen.c:2497
  #, fuzzy, c-format
  msgid "Signature expires at %s\n"
  msgstr "Platnosť podpisu vyprší %s\n"
  
- #: g10/keygen.c:2479
++#: g10/keygen.c:2501
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5261,12 -4135,10 +5219,12 @@@ msgstr "
  "Váš systém nevie zobraziť dátumy po roku 2038.\n"
  "V každom prípade budú dátumy korektne spracovávané do roku 2106.\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2514
  #, fuzzy
  msgid "Is this correct? (y/N) "
  msgstr "Je to správne (a/n)? "
  
- #: g10/keygen.c:2560
++#: g10/keygen.c:2582
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5277,7 -4149,6 +5235,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2575
++#: g10/keygen.c:2597
  #, fuzzy
  msgid ""
  "\n"
@@@ -5294,50 -4165,39 +5252,50 @@@ msgstr "
  "    \"Jozko Mrkvicka (student) <jozko at mrkvicka.sk>\"\n"
  "\n"
  
- #: g10/keygen.c:2594
++#: g10/keygen.c:2616
  msgid "Real name: "
  msgstr "Meno a priezvisko: "
  
- #: g10/keygen.c:2603
++#: g10/keygen.c:2625
  msgid "Invalid character in name\n"
  msgstr "Neplatný znak ve mene\n"
  
- #: g10/keygen.c:2604
++#: g10/keygen.c:2626
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2608
++#: g10/keygen.c:2630
  msgid "Name may not start with a digit\n"
  msgstr "Meno nemôže začínať číslicou\n"
  
- #: g10/keygen.c:2611
++#: g10/keygen.c:2633
  msgid "Name must be at least 5 characters long\n"
  msgstr "Meno musí byť dlhé aspoň 5 znakov\n"
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2643
  msgid "Email address: "
  msgstr "E-mailová adresa: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2649
  msgid "Not a valid email address\n"
  msgstr "Neplatná e-mailová adresa\n"
  
- #: g10/keygen.c:2636
++#: g10/keygen.c:2658
  msgid "Comment: "
  msgstr "Komentár: "
  
- #: g10/keygen.c:2642
++#: g10/keygen.c:2664
  msgid "Invalid character in comment\n"
  msgstr "Neplatný znak v komentári\n"
  
- #: g10/keygen.c:2678
++#: g10/keygen.c:2700
  #, fuzzy, c-format
  #| msgid "You are using the `%s' character set.\n"
  msgid "You are using the '%s' character set.\n"
  msgstr "Používate znakovú sadu `%s'.\n"
  
- #: g10/keygen.c:2684
++#: g10/keygen.c:2706
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5348,7 -4208,6 +5306,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2689
++#: g10/keygen.c:2711
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr "Do poľa meno alebo komentár nepíšte, prosím, e-mailovú adresu.\n"
  
@@@ -5363,35 -4222,28 +5321,35 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2714
++#: g10/keygen.c:2736
  msgid "NnCcEeOoQq"
  msgstr "mMkKeEPpUu"
  
- #: g10/keygen.c:2724
++#: g10/keygen.c:2746
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "Zmeniť (M)eno, (K)omentár, (E)-mail alebo (U)končiť? "
  
- #: g10/keygen.c:2725
++#: g10/keygen.c:2747
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr "Zmeniť (M)eno, (K)omentár, (E)-mail alebo (P)okračovať/(U)končiť? "
  
- #: g10/keygen.c:2730
++#: g10/keygen.c:2752
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "Zmeniť (M)eno, (K)omentár, (E)-mail alebo (U)končiť? "
  
- #: g10/keygen.c:2731
++#: g10/keygen.c:2753
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "Zmeniť (M)eno, (K)omentár, (E)-mail alebo (P)okračovať/(U)končiť? "
  
- #: g10/keygen.c:2750
++#: g10/keygen.c:2772
  msgid "Please correct the error first\n"
  msgstr "Najskôr, prosím, opravte chybu\n"
  
- #: g10/keygen.c:2796
++#: g10/keygen.c:2818
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5403,13 -4255,10 +5361,13 @@@ msgstr "
  "používať disky); vďaka tomu má generátor lepšiu šancu získať dostatok "
  "entropie.\n"
  
- #: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
- #: g10/keygen.c:4777 g10/keygen.c:4882
++#: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
++#: g10/keygen.c:4330 g10/keygen.c:4803 g10/keygen.c:5064 g10/keygen.c:5169
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Vytvorenie kľúča sa nepodarilo: %s\n"
  
- #: g10/keygen.c:3598
++#: g10/keygen.c:3922
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5417,66 -4266,53 +5375,66 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3924
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3621
++#: g10/keygen.c:3945
  #, fuzzy, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "`%s' je už skomprimovaný\n"
  
- #: g10/keygen.c:3626
++#: g10/keygen.c:3950
  #, fuzzy
  msgid "Create anyway? (y/N) "
  msgstr "Použiť napriek tomu tento kľúč? "
  
- #: g10/keygen.c:3632
++#: g10/keygen.c:3956
  #, fuzzy
  msgid "creating anyway\n"
  msgstr "vytvoriť nový pár kľúčov"
  
- #: g10/keygen.c:3981
++#: g10/keygen.c:4315
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:4013
++#: g10/keygen.c:4358
  msgid "Key generation canceled.\n"
  msgstr "Vytváranie kľúča bolo zrušené.\n"
  
- #: g10/keygen.c:4073
++#: g10/keygen.c:4418
  #, fuzzy, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "nemôžem vytvoriť `%s': %s\n"
  
- #: g10/keygen.c:4093
++#: g10/keygen.c:4438
  #, fuzzy, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "POZNÁMKA: platnosť tajného kľúča %08lX skončila %s\n"
  
- #: g10/keygen.c:4244 g10/keygen.c:4393
++#: g10/keygen.c:4589 g10/keygen.c:4738
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
  msgstr "zapisujem verejný kľúč do `%s'\n"
  
- #: g10/keygen.c:4387
++#: g10/keygen.c:4732
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "nenájdený zapisovateľný súbor verejných kľúčov (pubring): %s\n"
  
- #: g10/keygen.c:4401
++#: g10/keygen.c:4746
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error writing public keyring '%s': %s\n"
  msgstr "chyba pri zápise do súboru verejných kľúčov `%s': %s\n"
  
- #: g10/keygen.c:4433
++#: g10/keygen.c:4778
  msgid "public and secret key created and signed.\n"
  msgstr "verejný a tajný kľúč boli vytvorené a podpísané.\n"
  
- #: g10/keygen.c:4445
++#: g10/keygen.c:4790
  #, fuzzy
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
@@@ -5485,7 -4321,6 +5443,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:4649 g10/keygen.c:4833
++#: g10/keygen.c:4936 g10/keygen.c:5120
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5493,7 -4328,6 +5451,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:4651 g10/keygen.c:4835
++#: g10/keygen.c:4938 g10/keygen.c:5122
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5501,22 -4335,18 +5459,22 @@@ 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:4662 g10/keygen.c:4846
++#: g10/keygen.c:4949 g10/keygen.c:5133
  #, fuzzy
  #| 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:4674 g10/keygen.c:4676
++#: g10/keygen.c:4961 g10/keygen.c:4963
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Tajné časti primárneho kľúča nie sú dostupné.\n"
  
- #: g10/keygen.c:4683 g10/keygen.c:4685
++#: g10/keygen.c:4970 g10/keygen.c:4972
  #, fuzzy
  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:4704 g10/keygen.c:4860
++#: g10/keygen.c:4991 g10/keygen.c:5147
  #, fuzzy
  msgid "Really create? (y/N) "
  msgstr "Skutočne vytvoriť? "
@@@ -5847,128 -4612,102 +5805,128 @@@ msgstr "
  "samostatný revokačný certifikát -  použite \"gpg --import\", ak ho chcete "
  "využiť\n"
  
- #: g10/mainproc.c:1233 g10/mainproc.c:1276
++#: g10/mainproc.c:1238 g10/mainproc.c:1281
  #, fuzzy
  msgid "no signature found\n"
  msgstr "Dobrý podpis od \""
  
- #: g10/mainproc.c:1607
++#: g10/mainproc.c:1612
  #, fuzzy, c-format
  msgid "BAD signature from \"%s\""
  msgstr "ZLÝ podpis od \""
  
- #: g10/mainproc.c:1609
++#: g10/mainproc.c:1614
  #, fuzzy, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Podpis s vypršanou platnosťou od \""
  
- #: g10/mainproc.c:1611
++#: g10/mainproc.c:1616
  #, fuzzy, c-format
  msgid "Good signature from \"%s\""
  msgstr "Dobrý podpis od \""
  
- #: g10/mainproc.c:1630
++#: g10/mainproc.c:1635
  msgid "signature verification suppressed\n"
  msgstr "verifikácia podpisu potlačená\n"
  
- #: g10/mainproc.c:1739
++#: g10/mainproc.c:1744
  #, fuzzy
  msgid "can't handle this ambiguous signature data\n"
  msgstr "neviem pracovať s týmito násobnými podpismi\n"
  
- #: g10/mainproc.c:1753 g10/mainproc.c:1761
++#: g10/mainproc.c:1758 g10/mainproc.c:1766
  #, fuzzy, c-format
  msgid "Signature made %s\n"
  msgstr "Platnosť podpisu vypršala %s\n"
  
- #: g10/mainproc.c:1754 g10/mainproc.c:1762
++#: g10/mainproc.c:1759 g10/mainproc.c:1767
  #, 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:1766
++#: g10/mainproc.c:1771
  #, 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:1772
++#: g10/mainproc.c:1777
  #, fuzzy, c-format
  msgid "               issuer \"%s\"\n"
  msgstr "                alias \""
  
- #: g10/mainproc.c:1789
++#: g10/mainproc.c:1794
  msgid "Key available at: "
  msgstr "Kľúč k dispozícii na: "
  
- #: g10/mainproc.c:2024
++#: g10/mainproc.c:2029
  msgid "[uncertain]"
  msgstr "[neistý]  "
  
- #: g10/mainproc.c:2062
++#: g10/mainproc.c:2067
  #, fuzzy, c-format
  msgid "                aka \"%s\""
  msgstr "                alias \""
  
- #: g10/mainproc.c:2145
++#: g10/mainproc.c:2150
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "Platnosť podpisu vypršala %s\n"
  
- #: g10/mainproc.c:2149
++#: g10/mainproc.c:2154
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "Platnosť podpisu vyprší %s\n"
  
- #: g10/mainproc.c:2160
++#: g10/mainproc.c:2165
  #, 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:2161
++#: g10/mainproc.c:2166
  msgid "binary"
  msgstr "binárne"
  
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2167
  msgid "textmode"
  msgstr "textový mód"
  
- #: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "neznáme"
  
- #: g10/mainproc.c:2164
++#: g10/mainproc.c:2169
  #, fuzzy
  #| msgid "unknown pubkey algorithm"
  msgid ", key algorithm "
  msgstr "neznámy algoritmus verejného kľúča"
  
- #: g10/mainproc.c:2199
++#: g10/mainproc.c:2204
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2229
++#: g10/mainproc.c:2234
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "Nemôžem overiť podpis: %s\n"
  
- #: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
++#: g10/mainproc.c:2327 g10/mainproc.c:2346 g10/mainproc.c:2470
  msgid "not a detached signature\n"
  msgstr "toto nie je podpis oddelený od dokumentu\n"
  
- #: g10/mainproc.c:2375
++#: g10/mainproc.c:2380
  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:2384
++#: g10/mainproc.c:2389
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "samostatný podpis triedy 0x%02x\n"
  
- #: g10/mainproc.c:2469
++#: g10/mainproc.c:2474
  msgid "old style (PGP 2.x) signature\n"
  msgstr "podpis starého typu (PGP 2.x)\n"
  
@@@ -6256,23 -4941,18 +6214,23 @@@ msgstr "Je táto fotografia správna (a
  msgid "unable to display photo ID!\n"
  msgstr "nemožno nastaviť exec-path na %s\n"
  
- #: g10/pkclist.c:72 g10/revoke.c:757
++#: g10/pkclist.c:72 g10/revoke.c:758
  msgid "No reason specified"
  msgstr "Dôvod nebol špecifikovaný"
  
- #: g10/pkclist.c:74 g10/revoke.c:759
++#: g10/pkclist.c:74 g10/revoke.c:760
  msgid "Key is superseded"
  msgstr "Kľúč je nahradený"
  
- #: g10/pkclist.c:76 g10/revoke.c:758
++#: g10/pkclist.c:76 g10/revoke.c:759
  msgid "Key has been compromised"
  msgstr "Kľúč bol skompromitovaný"
  
- #: g10/pkclist.c:78 g10/revoke.c:760
++#: g10/pkclist.c:78 g10/revoke.c:761
  msgid "Key is no longer used"
  msgstr "Kľúč sa už nepoužíva"
  
- #: g10/pkclist.c:80 g10/revoke.c:761
++#: g10/pkclist.c:80 g10/revoke.c:762
  msgid "User ID is no longer valid"
  msgstr "Identifikátor užívateľa už neplatí"
  
@@@ -6353,7 -5020,6 +6311,7 @@@ msgid "
  "\n"
  msgstr ""
  
- #: g10/pkclist.c:310 g10/revoke.c:786
++#: g10/pkclist.c:310 g10/revoke.c:787
  msgid "Your decision? "
  msgstr "Vaše rozhodnutie? "
  
@@@ -6392,10 -5051,9 +6350,10 @@@ msgstr "Tento kľúč patrí nám (mám
  msgid "%s: This key is bad!  It has been marked as untrusted!\n"
  msgstr ""
  
 +#: g10/pkclist.c:484
  #, fuzzy
  msgid ""
- "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "This key is bad!  It has been marked as untrusted!  If you\n"
  "*really* know what you are doing, you may answer the next\n"
  "question with yes.\n"
  msgstr ""
@@@ -6553,33 -5181,26 +6511,33 @@@ msgstr "
  msgid "No such user ID.\n"
  msgstr "Takýto identifikátor užívateľa neexistuje.\n"
  
- #: g10/pkclist.c:1197 g10/pkclist.c:1273
++#: g10/pkclist.c:1197 g10/pkclist.c:1274
  msgid "skipped: public key already set as default recipient\n"
  msgstr "preskočené: verejný kľúč je už nastavený podľa implicitného adresáta\n"
  
- #: g10/pkclist.c:1218
++#: g10/pkclist.c:1219
  msgid "Public key is disabled.\n"
  msgstr "Verejný kľúč je neplatný (disabled).\n"
  
- #: g10/pkclist.c:1228
++#: g10/pkclist.c:1229
  msgid "skipped: public key already set\n"
  msgstr "preskočené: verejný kľúč je už nastavený\n"
  
- #: g10/pkclist.c:1263
++#: g10/pkclist.c:1264
  #, fuzzy, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "neznámy implicitný adresát `%s'\n"
  
- #: g10/pkclist.c:1312
++#: g10/pkclist.c:1313
  msgid "no valid addressees\n"
  msgstr "žiadne platné adresy\n"
  
- #: g10/pkclist.c:1665
++#: g10/pkclist.c:1666
  #, 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:1690
++#: g10/pkclist.c:1691
  #, fuzzy, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "kľúč %08lX: chyba identifikátor užívateľa\n"
@@@ -6588,29 -5208,23 +6546,29 @@@
  msgid "data not saved; use option \"--output\" to save it\n"
  msgstr "dáta neboli uložené; na ich uloženie použite prepínač \"--output\"\n"
  
- #: g10/plaintext.c:598
++#: g10/plaintext.c:614
  msgid "Detached signature.\n"
  msgstr "Podpis oddelený od dokumentu.\n"
  
- #: g10/plaintext.c:606
++#: g10/plaintext.c:622
  msgid "Please enter name of data file: "
  msgstr "Prosím, vložte názov dátového súboru: "
  
- #: g10/plaintext.c:643
++#: g10/plaintext.c:659
  msgid "reading stdin ...\n"
  msgstr "čítam štandardný vstup (stdin) ...\n"
  
- #: g10/plaintext.c:688
++#: g10/plaintext.c:704
  msgid "no signed data\n"
  msgstr "chýbajú podpísané dáta\n"
  
- #: g10/plaintext.c:706
++#: g10/plaintext.c:722
  #, fuzzy, c-format
  #| msgid "can't open signed data `%s'\n"
  msgid "can't open signed data '%s'\n"
  msgstr "nemôžem otvoriť podpísané dáta '%s'\n"
  
- #: g10/plaintext.c:741
++#: g10/plaintext.c:757
  #, fuzzy, c-format
  msgid "can't open signed data fd=%d: %s\n"
  msgstr "nemôžem otvoriť podpísané dáta '%s'\n"
@@@ -6679,7 -5279,6 +6637,7 @@@ msgstr "Tajný kľúč je dostupný.\n
  msgid "Create a designated revocation certificate for this key? (y/N) "
  msgstr "Vytvoriť pre tento podpis revokačný certifikát? "
  
- #: g10/revoke.c:336 g10/revoke.c:727
++#: g10/revoke.c:336 g10/revoke.c:728
  msgid "ASCII armored output forced.\n"
  msgstr "Vynútený ASCII textový výstup.\n"
  
@@@ -6715,23 -5308,20 +6673,23 @@@ msgid "
  "the secret key.  However, if the secret key is still accessible,\n"
  "it is better to generate a new revocation certificate and give\n"
  "a reason for the revocation.  For details see the description of\n"
- "of the gpg command \"--gen-revoke\" in the GnuPG manual."
+ "of the gpg command \"--generate-revocation\" in the GnuPG manual."
  msgstr ""
  
- #: g10/revoke.c:575
++#: g10/revoke.c:576
  msgid ""
  "To avoid an accidental use of this file, a colon has been inserted\n"
  "before the 5 dashes below.  Remove this colon with a text editor\n"
  "before importing and publishing this revocation certificate."
  msgstr ""
  
- #: g10/revoke.c:590
++#: g10/revoke.c:591
  #, fuzzy, c-format
  #| msgid "Revocation certificate created.\n"
  msgid "revocation certificate stored as '%s.rev'\n"
  msgstr "Revokačný certifikát bol vytvorený.\n"
  
- #: g10/revoke.c:634
++#: g10/revoke.c:635
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found\n"
  msgstr "tajný kľúč `%s' nebol nájdený: %s\n"
@@@ -6739,23 -5329,19 +6697,23 @@@
  #. TRANSLATORS: The %s prints a key specification which
  #. for example has been given at the command line.  Several lines
  #. lines with secret key infos are printed after this message.
- #: g10/revoke.c:661
++#: g10/revoke.c:662
  #, c-format
  msgid "'%s' matches multiple secret keys:\n"
  msgstr ""
  
- #: g10/revoke.c:688
++#: g10/revoke.c:689
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error searching the keyring: %s\n"
  msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
  
- #: g10/revoke.c:711
++#: g10/revoke.c:712
  #, fuzzy
  msgid "Create a revocation certificate for this key? (y/N) "
  msgstr "Vytvoriť pre tento podpis revokačný certifikát? "
  
- #: g10/revoke.c:735
++#: g10/revoke.c:736
  msgid ""
  "Revocation certificate created.\n"
  "\n"
@@@ -6773,33 -5359,26 +6731,33 @@@ msgstr "
  "Ale hrozí nebezpečenstvo: Tlačový systém Vášho počítača môže ukladať dáta a\n"
  "sprístupniť ich iným!\n"
  
- #: g10/revoke.c:769
++#: g10/revoke.c:770
  msgid "Please select the reason for the revocation:\n"
  msgstr "Prosím výberte dôvod na revokáciu:\n"
  
- #: g10/revoke.c:779
++#: g10/revoke.c:780
  msgid "Cancel"
  msgstr "Zrušiť"
  
- #: g10/revoke.c:781
++#: g10/revoke.c:782
  #, c-format
  msgid "(Probably you want to select %d here)\n"
  msgstr "(Pravdepodobne ste chceli vybrať %d)\n"
  
- #: g10/revoke.c:822
++#: g10/revoke.c:823
  msgid "Enter an optional description; end it with an empty line:\n"
  msgstr "Ak chcete, napíšte popis; ukončite prázdnym riadkom:\n"
  
- #: g10/revoke.c:850
++#: g10/revoke.c:851
  #, c-format
  msgid "Reason for revocation: %s\n"
  msgstr "Dôvod na revokáciu: %s\n"
  
- #: g10/revoke.c:852
++#: g10/revoke.c:853
  msgid "(No description given)\n"
  msgstr "(Žiadny popis)\n"
  
- #: g10/revoke.c:857
++#: g10/revoke.c:858
  #, fuzzy
  msgid "Is this okay? (y/N) "
  msgstr "Je to v poriadku? "
@@@ -6935,23 -5494,19 +6893,23 @@@ msgstr "
  "VAROVANIE: nemôžem %%-expandovať URL politiky (príliš dlhé). Použité "
  "neexpandované.\n"
  
- #: g10/sign.c:329
++#: g10/sign.c:331
  #, fuzzy, c-format
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s podpis od: \"%s\"\n"
  
- #: g10/sign.c:878
++#: g10/sign.c:880
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
  msgstr ""
  "vyžiadaný hashovací algoritmus %s (%d) nevyhovuje predvoľbám príjemcu\n"
  
- #: g10/sign.c:1009
++#: g10/sign.c:1011
  msgid "signing:"
  msgstr "podpisujem:"
  
- #: g10/sign.c:1286
++#: g10/sign.c:1288
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "bude použité šifrovanie %s\n"
@@@ -6978,7 -5529,6 +6936,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:362
++#: g10/tdbdump.c:57 g10/trustdb.c:369
  #, 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"
@@@ -7028,7 -5570,6 +6986,7 @@@ msgstr "chyba pri hľadaní záznamu d�
  msgid "read error in '%s': %s\n"
  msgstr "chyba pri čítaní: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "databáza dôvery: synchronizácia zlyhala %s\n"
@@@ -7174,298 -5686,306 +7132,372 @@@ msgstr "nemôžem pracovať s riadkami 
  msgid "input line longer than %d characters\n"
  msgstr "vstupný riadok je dlhší ako %d znakov\n"
  
- #: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
++#: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
  #, fuzzy, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "chyba pri posielaní na `%s': %s\n"
  
- #: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
++#: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:357 g10/tofu.c:699
++#: g10/tofu.c:355 g10/tofu.c:888
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:501
++#: g10/tofu.c:505
  #, fuzzy, c-format
  msgid "unsupported TOFU database version: %s\n"
  msgstr ""
  "\n"
  "Podporované algoritmy:\n"
  
- #: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
- #: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
- #: g10/tofu.c:3056
++#: g10/tofu.c:538
+ #, fuzzy, c-format
+ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
+ 
++#: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
+ msgid "TOFU DB error"
+ msgstr ""
+ 
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2340 g10/tofu.c:2359
++#: g10/tofu.c:2372 g10/tofu.c:2384 g10/tofu.c:2399 g10/tofu.c:2411
++#: g10/tofu.c:2980 g10/tofu.c:2997 g10/tofu.c:3033 g10/tofu.c:3050
++#: g10/tofu.c:3353
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "chyba pri posielaní na `%s': %s\n"
  
- #: g10/tofu.c:566 g10/tofu.c:574
++#: g10/tofu.c:716 g10/tofu.c:724
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error determining TOFU database's version: %s\n"
  msgstr "chyba pri zápise do súboru tajných kľúčov `%s': %s\n"
  
- #: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
++#: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing TOFU database: %s\n"
  msgstr "%s: chyba pri zápise adresárového záznamu: %s\n"
  
- #: g10/tofu.c:765
++#: g10/tofu.c:844
+ #, fuzzy, c-format
+ msgid "error creating 'encryptions' TOFU table: %s\n"
+ msgstr "chyba pri posielaní na `%s': %s\n"
+ 
++#: g10/tofu.c:874
+ #, c-format
+ msgid "adding column effective_policy to bindings DB: %s\n"
+ msgstr ""
+ 
++#: g10/tofu.c:956
  #, fuzzy, c-format
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "chyba pri čítaní `%s': %s\n"
  
- #: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
++#: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "chyba pri posielaní na `%s': %s\n"
  
- #: g10/tofu.c:1239
++#: g10/tofu.c:1328
  #, c-format
  msgid ""
  "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1247
++#: g10/tofu.c:1337
  #, c-format
- msgid "The email address \"%s\" is associated with %d keys!"
- msgstr ""
+ msgid "The email address \"%s\" is associated with %d key!"
+ msgid_plural "The email address \"%s\" is associated with %d keys!"
+ msgstr[0] ""
+ msgstr[1] ""
  
- #: g10/tofu.c:1251
++#: g10/tofu.c:1343
  msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  
- #: g10/tofu.c:1257
++#: g10/tofu.c:1349
  #, c-format
  msgid ""
  "Please indicate whether this email address should be associated with key %s "
  "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1513
++#: g10/tofu.c:1605
  #, fuzzy, c-format
  msgid "error gathering other user IDs: %s\n"
  msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: g10/tofu.c:1523
++#: g10/tofu.c:1615
  #, fuzzy
  #| msgid "list key and user IDs"
  msgid "This key's user IDs:\n"
  msgstr "vypísať zoznam kľúčov a id užívateľov"
  
- #: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
++#: g10/tofu.c:1631 g10/tofu.c:1796
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "policy: %s"
  msgstr "Politika: "
  
- #: g10/tofu.c:1630
++#: g10/tofu.c:1722
  #, fuzzy, c-format
  msgid "error gathering signature stats: %s\n"
  msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: g10/tofu.c:1634
++#: g10/tofu.c:1726
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1651
++#: g10/tofu.c:1744
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1684 g10/tofu.c:1689
++#: g10/tofu.c:1785 g10/tofu.c:1790
  msgid ", "
  msgstr ""
  
- #: g10/tofu.c:1693
++#: g10/tofu.c:1794
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
  msgstr "vypísať zoznam kľúčov"
  
- #: g10/tofu.c:1715
++#: g10/tofu.c:1820
+ #, fuzzy, c-format
+ msgid "Verified %d message."
+ msgid_plural "Verified %d messages."
+ msgstr[0] "|algo [súbory]|vypíš hash"
+ msgstr[1] "|algo [súbory]|vypíš hash"
+ 
++#: g10/tofu.c:1824
  #, fuzzy, c-format
- msgid "Verified %d message"
- msgid_plural "Verified %d messages"
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid "Encrypted %d message."
+ msgid_plural "Encrypted %d messages."
+ msgstr[0] "zašifrované s %lu heslami\n"
+ msgstr[1] "zašifrované s %lu heslami\n"
+ 
++#: g10/tofu.c:1831
+ #, fuzzy, c-format
+ msgid "Verified %d message in the future."
+ msgid_plural "Verified %d messages in the future."
+ msgstr[0] "|algo [súbory]|vypíš hash"
+ msgstr[1] "|algo [súbory]|vypíš hash"
+ 
++#: g10/tofu.c:1835
+ #, fuzzy, c-format
+ msgid "Encrypted %d message in the future."
+ msgid_plural "Encrypted %d messages in the future."
  msgstr[0] "|algo [súbory]|vypíš hash"
  msgstr[1] "|algo [súbory]|vypíš hash"
  
- #: g10/tofu.c:1719
++#: g10/tofu.c:1849
  #, c-format
- msgid "Encrypted %d message"
- msgid_plural "Encrypted %d messages"
+ msgid "Messages verified over the past %d day: %d."
+ msgid_plural "Messages verified over the past %d days: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1734
++#: g10/tofu.c:1855
  #, c-format
- msgid " over the past day."
- msgid_plural " over the past %d days."
+ msgid "Messages encrypted over the past %d day: %d."
+ msgid_plural "Messages encrypted over the past %d days: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1740
++#: g10/tofu.c:1865
  #, c-format
- msgid " over the past month."
- msgid_plural " over the past %d months."
+ msgid "Messages verified over the past %d month: %d."
+ msgid_plural "Messages verified over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1746
++#: g10/tofu.c:1871
  #, c-format
- msgid " over the past year."
- msgid_plural " over the past %d years."
+ msgid "Messages encrypted over the past %d month: %d."
+ msgid_plural "Messages encrypted over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1752
- msgid " in the past."
++#: g10/tofu.c:1881
+ #, c-format
+ msgid "Messages verified over the past %d year: %d."
+ msgid_plural "Messages verified over the past %d years: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1887
+ #, c-format
+ msgid "Messages encrypted over the past %d year: %d."
+ msgid_plural "Messages encrypted over the past %d years: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1895
+ #, c-format
+ msgid "Messages verified in the past: %d."
  msgstr ""
  
++#: g10/tofu.c:1899
+ #, fuzzy, c-format
+ msgid "Messages encrypted in the past: %d."
+ msgstr "|algo [súbory]|vypíš hash"
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1767
++#: g10/tofu.c:1916
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1809
++#: g10/tofu.c:1958
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1815
++#: g10/tofu.c:1964
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1823
++#: g10/tofu.c:1972
  msgid "Defaulting to unknown."
  msgstr ""
  
- #: g10/tofu.c:1938 g10/tofu.c:2074
++#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
- #: g10/tofu.c:1994
++#: g10/tofu.c:2143
  #, fuzzy, c-format
  msgid "resetting keydb: %s\n"
  msgstr "chyba pri zápise súboru kľúčov (keyring)  `%s': %s\n"
  
- #: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
- #: g10/tofu.c:2425
++#: g10/tofu.c:2601
  #, fuzzy, c-format
- msgid "error setting TOFU binding's trust level to %s\n"
+ msgid "error setting TOFU binding's policy to %s\n"
  msgstr "chyba pri čítaní `%s': %s\n"
  
- #: g10/tofu.c:2473
++#: g10/tofu.c:2794
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "chyba pri vytváraní hesla: %s\n"
  
- #. TRANSLATORS: The tilde ('~') is used here to indicate a
- #. * non-breakable space
- #: g10/tofu.c:2574
++#: g10/tofu.c:2839
  #, c-format
- msgid "%d~year"
- msgid_plural "%d~years"
+ msgid "%lld~year"
+ msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2583
++#: g10/tofu.c:2844
  #, c-format
- msgid "%d~month"
- msgid_plural "%d~months"
+ msgid "%lld~month"
+ msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2592
++#: g10/tofu.c:2849
  #, c-format
- msgid "%d~day"
- msgid_plural "%d~days"
+ msgid "%lld~week"
+ msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2854
  #, c-format
- msgid "%d~hour"
- msgid_plural "%d~hours"
+ msgid "%lld~day"
+ msgid_plural "%lld~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2610
++#: g10/tofu.c:2859
  #, c-format
- msgid "%d~minute"
- msgid_plural "%d~minutes"
+ msgid "%lld~hour"
+ msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2619
++#: g10/tofu.c:2864
  #, c-format
- msgid "%d~second"
- msgid_plural "%d~seconds"
+ msgid "%lld~minute"
+ msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2802
++#: g10/tofu.c:2866
  #, c-format
- msgid "%s: "
+ msgid "%lld~second"
+ msgid_plural "%lld~seconds"
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:3103
+ #, c-format
+ msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:2806
++#: g10/tofu.c:3109
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
- msgid "Verified %ld signatures"
+ msgid "%s: Verified 0 signatures."
  msgstr "Zmazaných %d podpisov.\n"
  
- #: g10/tofu.c:2816
++#: g10/tofu.c:3117
  #, fuzzy, c-format
- msgid "Verified %ld signature in the past %s"
- msgid_plural "Verified %ld signatures in the past %s"
+ msgid "%s: Verified %ld~signature in the past %s."
+ msgid_plural "%s: Verified %ld~signatures in the past %s."
  msgstr[0] "|algo [súbory]|vypíš hash"
  msgstr[1] "|algo [súbory]|vypíš hash"
  
- #: g10/tofu.c:2826
- #, fuzzy, c-format
++#: g10/tofu.c:3127
+ #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
- msgid ", and encrypted %ld messages"
+ msgid "Encrypted 0 messages."
  msgstr "zašifrované s %lu heslami\n"
  
- #: g10/tofu.c:2835
++#: g10/tofu.c:3135
  #, fuzzy, c-format
- msgid ", and encrypted %ld message in the past %s"
- msgid_plural ", and encrypted %ld messages in the past %s"
+ msgid "Encrypted %ld~message in the past %s."
+ msgid_plural "Encrypted %ld~messages in the past %s."
  msgstr[0] "|algo [súbory]|vypíš hash"
  msgstr[1] "|algo [súbory]|vypíš hash"
  
- #: g10/tofu.c:2880
++#: g10/tofu.c:3146
+ #, fuzzy, c-format
+ #| msgid "Policy: "
+ msgid "(policy: %s)"
+ msgstr "Politika: "
+ 
++#: g10/tofu.c:3177
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2883
++#: g10/tofu.c:3180
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2887
++#: g10/tofu.c:3184
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2890
++#: g10/tofu.c:3187
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2919
++#: g10/tofu.c:3216
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7482,18 -6002,14 +7514,18 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
- #: g10/tofu.c:3480 g10/tofu.c:3572
++#: g10/tofu.c:3298 g10/tofu.c:3449 g10/tofu.c:3627 g10/tofu.c:3670
++#: g10/tofu.c:3784 g10/tofu.c:3859 g10/tofu.c:3894
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "chyba pri posielaní na `%s': %s\n"
  
- #: g10/tofu.c:3185
++#: g10/tofu.c:3482
  #, c-format
- msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
  msgstr ""
  
- #: g10/tofu.c:3515
++#: g10/tofu.c:3819
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7526,74 -6037,59 +7558,74 @@@ msgstr "
  msgid "key %s marked as ultimately trusted\n"
  msgstr "kľúč označený ako absolútne dôveryhodný.\n"
  
- #: g10/trustdb.c:341
++#: g10/trustdb.c:348
  #, 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:347
++#: g10/trustdb.c:354
  #, 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:422
++#: g10/trustdb.c:429
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr ""
  
- #: g10/trustdb.c:431
++#: g10/trustdb.c:438
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:468
++#: g10/trustdb.c:475
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:474
++#: g10/trustdb.c:481
  #, c-format
  msgid "using %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:511
++#: g10/trustdb.c:518
  msgid "no need for a trustdb check\n"
  msgstr "nie je nutné kontrolovať databázu dôvery\n"
  
- #: g10/trustdb.c:517 g10/trustdb.c:2160
++#: g10/trustdb.c:524 g10/trustdb.c:2187
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "dalšia kontrola databázy dôvery %s\n"
  
- #: g10/trustdb.c:526
++#: g10/trustdb.c:533
  #, 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:542
++#: g10/trustdb.c:549
  #, 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:749 g10/trustdb.c:1313
++#: g10/trustdb.c:756 g10/trustdb.c:1340
  #, fuzzy, c-format
  msgid "public key %s not found: %s\n"
  msgstr "verejný kľúč %08lX nebol nájdený: %s\n"
  
- #: g10/trustdb.c:966
++#: g10/trustdb.c:973
  msgid "please do a --check-trustdb\n"
  msgstr "prosím vykonajte --check-trustdb\n"
  
- #: g10/trustdb.c:971
++#: g10/trustdb.c:978
  msgid "checking the trustdb\n"
  msgstr "kontrolujem databázu dôvery\n"
  
- #: g10/trustdb.c:1883
++#: g10/trustdb.c:1910
  #, 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:1886
++#: g10/trustdb.c:1913
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7601,22 -6097,18 +7633,22 @@@ msgid_plural " (%d validity counts clea
  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:1956
++#: g10/trustdb.c:1983
  msgid "no ultimately trusted keys found\n"
  msgstr "neboli nájdené žiadne absolútne dôveryhodné kľúče\n"
  
- #: g10/trustdb.c:1970
++#: g10/trustdb.c:1997
  #, 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:2087
++#: g10/trustdb.c:2114
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr ""
  
- #: g10/trustdb.c:2167
++#: g10/trustdb.c:2194
  #, 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"
@@@ -7730,19 -6201,14 +7762,19 @@@ msgid "
  "List, export, import Keybox data\n"
  msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3208
++#: scd/app-nks.c:718 scd/app-openpgp.c:3221
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3220
++#: scd/app-nks.c:726 scd/app-openpgp.c:3233
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
- #: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
- #: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1965 scd/app-openpgp.c:1984
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2166 scd/app-openpgp.c:2430
++#: scd/app-openpgp.c:2477 scd/app-openpgp.c:2582 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr ""
@@@ -7791,84 -6248,66 +7823,84 @@@ msgid "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2511 scd/app-dinsig.c:532
  #, fuzzy, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: scd/app-openpgp.c:806
++#: scd/app-openpgp.c:801
  #, fuzzy, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "nemôžem inicializovať databázu dôvery: %s\n"
  
- #: scd/app-openpgp.c:819
++#: scd/app-openpgp.c:814
  #, fuzzy, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "zlyhalo obnovenie vyrovnávacej pamäti kľúčov: %s\n"
  
- #: scd/app-openpgp.c:1236
++#: scd/app-openpgp.c:1247
  msgid "response does not contain the RSA modulus\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1243
++#: scd/app-openpgp.c:1254
  msgid "response does not contain the RSA public exponent\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1353
++#: scd/app-openpgp.c:1364
  #, fuzzy
  #| msgid "remove keys from the public keyring"
  msgid "response does not contain the EC public key\n"
  msgstr "odstrániť kľúč zo súboru verejných kľúčov"
  
- #: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:1464 scd/app-openpgp.c:3825
  msgid "response does not contain the public key data\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1551
++#: scd/app-openpgp.c:1564
  #, fuzzy, c-format
  msgid "reading public key failed: %s\n"
  msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
  
- #: scd/app-openpgp.c:1903
++#: scd/app-openpgp.c:1916
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1910
++#: scd/app-openpgp.c:1923
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1925
++#: scd/app-openpgp.c:1938
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr ""
  
- #: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
++#: scd/app-openpgp.c:1949 scd/app-openpgp.c:2424
  #, fuzzy
  msgid "||Please enter the PIN"
  msgstr "zmeniť heslo"
  
- #: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2173 scd/app-openpgp.c:2437
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
- #: scd/app-openpgp.c:4114
++#: scd/app-openpgp.c:2004 scd/app-openpgp.c:2043 scd/app-openpgp.c:2185
++#: scd/app-openpgp.c:4126
  #, fuzzy, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "nepodarilo poslať kľúč na server: %s\n"
  
- #: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
++#: scd/app-openpgp.c:2072 scd/app-openpgp.c:2458 scd/app-openpgp.c:4556
  msgid "error retrieving CHV status from card\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
++#: scd/app-openpgp.c:2078 scd/app-openpgp.c:4565
  msgid "card is permanently locked!\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2072
++#: scd/app-openpgp.c:2085
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7878,26 -6317,21 +7910,26 @@@ msgstr[1] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:2082
++#: scd/app-openpgp.c:2095
  #, fuzzy, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "zmeniť heslo"
  
- #: scd/app-openpgp.c:2086
++#: scd/app-openpgp.c:2099
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
  msgstr "zmeniť heslo"
  
- #: scd/app-openpgp.c:2107
++#: scd/app-openpgp.c:2120
  msgid "access to admin commands is not configured\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2460
++#: scd/app-openpgp.c:2473
  #, fuzzy
  msgid "||Please enter the Reset Code for the card"
  msgstr "Prosím výberte dôvod na revokáciu:\n"
  
- #: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
++#: scd/app-openpgp.c:2483 scd/app-openpgp.c:2537
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr ""
@@@ -7905,117 -6339,93 +7937,117 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2493
++#: scd/app-openpgp.c:2506
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|AN|New Admin PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|N|New PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2565
++#: scd/app-openpgp.c:2578
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "zmeniť heslo"
  
- #: scd/app-openpgp.c:2566
++#: scd/app-openpgp.c:2579
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
  msgstr "zmeniť heslo"
  
- #: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
++#: scd/app-openpgp.c:2635 scd/app-openpgp.c:3885
  #, fuzzy
  msgid "error reading application data\n"
  msgstr "chyba pri čítaní bloku kľúča: %s\n"
  
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
++#: scd/app-openpgp.c:2641 scd/app-openpgp.c:3892
  #, fuzzy
  msgid "error reading fingerprint DO\n"
  msgstr "%s: chyba pri čítaní voľného záznamu: %s\n"
  
- #: scd/app-openpgp.c:2638
++#: scd/app-openpgp.c:2651
  #, fuzzy
  msgid "key already exists\n"
  msgstr "`%s' je už skomprimovaný\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2655
  msgid "existing key will be replaced\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2644
++#: scd/app-openpgp.c:2657
  #, fuzzy
  msgid "generating new key\n"
  msgstr "vytvoriť nový pár kľúčov"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2659
  #, fuzzy
  msgid "writing new key\n"
  msgstr "vytvoriť nový pár kľúčov"
  
- #: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
++#: scd/app-openpgp.c:3201 scd/app-openpgp.c:3553
  msgid "creation timestamp missing\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
++#: scd/app-openpgp.c:3243 scd/app-openpgp.c:3251
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
++#: scd/app-openpgp.c:3384 scd/app-openpgp.c:3647
  #, fuzzy, c-format
  msgid "failed to store the key: %s\n"
  msgstr "nemôžem inicializovať databázu dôvery: %s\n"
  
- #: scd/app-openpgp.c:3534
++#: scd/app-openpgp.c:3547
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "toto URI nie je podporované"
  
- #: scd/app-openpgp.c:3790
++#: scd/app-openpgp.c:3802
  msgid "please wait while key is being generated ...\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3798
++#: scd/app-openpgp.c:3810
  #, fuzzy
  msgid "generating key failed\n"
  msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
  
- #: scd/app-openpgp.c:3804
++#: scd/app-openpgp.c:3816
  #, fuzzy, c-format
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
  msgstr[0] "Vytvorenie kľúča sa nepodarilo: %s\n"
  msgstr[1] "Vytvorenie kľúča sa nepodarilo: %s\n"
  
- #: scd/app-openpgp.c:3838
++#: scd/app-openpgp.c:3850
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:3900
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4004
++#: scd/app-openpgp.c:4016
  #, fuzzy, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "%s podpis, hashovací algoritmus %s\n"
  
- #: scd/app-openpgp.c:4089
++#: scd/app-openpgp.c:4101
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4551
++#: scd/app-openpgp.c:4570
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
++#: scd/app-openpgp.c:4871 scd/app-openpgp.c:4882
  #, fuzzy, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "nenájdené žiadne platné dáta vo formáte OpenPGP.\n"
@@@ -8036,7 -6443,6 +8068,7 @@@ msgstr "
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
@@@ -8081,27 -6478,22 +8113,27 @@@ msgstr "konfliktné príkazy\n
  msgid "use variable length input for pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:287
++#: scd/scdaemon.c:286
  #, fuzzy
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
  
- #: scd/scdaemon.c:289
++#: scd/scdaemon.c:288
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
  msgstr ""
  
- #: scd/scdaemon.c:786
++#: scd/scdaemon.c:784
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1904
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
++#: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1909
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
@@@ -8181,9 -6557,6 +8213,9 @@@ msgstr "chyba pri vytváraní hesla: %s
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
  
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
 +#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  #, fuzzy
  msgid "failed to allocate keyDB handle\n"
  msgstr "nemôžem inicializovať databázu dôvery: %s\n"
@@@ -8678,11 -6949,9 +8710,11 @@@ msgstr "
  msgid "resource problem: out of core\n"
  msgstr ""
  
- #: sm/decrypt.c:330
++#: sm/decrypt.c:332
  msgid "(this is the RC2 algorithm)\n"
  msgstr ""
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:334
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr ""
  
@@@ -8726,128 -6987,100 +8758,128 @@@ msgstr "vypísať zoznam tajných kľú
  msgid "list certificate chain"
  msgstr "nesprávny certifikát"
  
- #: sm/gpgsm.c:218
++#: sm/gpgsm.c:219
  #, fuzzy
  msgid "import certificates"
  msgstr "nesprávny certifikát"
  
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
  #, fuzzy
  msgid "export certificates"
  msgstr "nesprávny certifikát"
  
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:228
  msgid "register a smartcard"
  msgstr ""
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:231
  msgid "pass a command to the dirmngr"
  msgstr ""
  
- #: sm/gpgsm.c:232
++#: sm/gpgsm.c:233
  msgid "invoke gpg-protect-tool"
  msgstr ""
  
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:250
  #, fuzzy
  msgid "create base-64 encoded output"
  msgstr "vytvor výstup zakódovaný pomocou ASCII"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in PEM format"
  msgstr ""
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in base-64 format"
  msgstr ""
  
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:262
  msgid "assume input is in binary format"
  msgstr ""
  
- #: sm/gpgsm.c:267
++#: sm/gpgsm.c:269
  msgid "never consult a CRL"
  msgstr ""
  
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:279
  msgid "check validity using OCSP"
  msgstr ""
  
- #: sm/gpgsm.c:282
++#: sm/gpgsm.c:284
  msgid "|N|number of certificates to include"
  msgstr ""
  
- #: sm/gpgsm.c:285
++#: sm/gpgsm.c:287
  msgid "|FILE|take policy information from FILE"
  msgstr ""
  
- #: sm/gpgsm.c:288
++#: sm/gpgsm.c:290
  msgid "do not check certificate policies"
  msgstr ""
  
- #: sm/gpgsm.c:292
++#: sm/gpgsm.c:294
  msgid "fetch missing issuer certificates"
  msgstr ""
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "don't use the terminal at all"
  msgstr "vôbec nepoužívať terminál"
  
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:307
  msgid "|FILE|write a server mode log to FILE"
  msgstr ""
  
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:312
  #, fuzzy
  msgid "|FILE|write an audit log to FILE"
  msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "batch mode: never ask"
  msgstr "dávkový režim: nikdy sa na nič nepýtať"
  
- #: sm/gpgsm.c:314
++#: sm/gpgsm.c:316
  msgid "assume yes on most questions"
  msgstr "automaticky odpovedať áno na väčšinu otázok"
  
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:317
  msgid "assume no on most questions"
  msgstr "automaticky odpovedať NIE na väčšinu otázok"
  
- #: sm/gpgsm.c:318
++#: sm/gpgsm.c:320
  #, 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:321
++#: sm/gpgsm.c:323
  #, fuzzy
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|MENO|použi MENO ako implicitný tajný kľúč"
  
- #: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
  #, 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:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|ALG|použiť šifrovací algoritmus ALG"
  
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:352
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|ALG|použiť hashovací algoritmus ALG"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:559
  #, 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:570
++#: sm/gpgsm.c:562
  #, fuzzy
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
@@@ -8858,47 -7091,38 +8890,47 @@@ msgstr "
  "podpísať, overiť, šifrovať alebo dešifrovať\n"
  "implicitné operácie závisia od vstupných dát\n"
  
- #: sm/gpgsm.c:774
++#: sm/gpgsm.c:766
  #, 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:785
++#: sm/gpgsm.c:777
  #, fuzzy, c-format
  msgid "unknown validation model '%s'\n"
  msgstr "neznámy implicitný adresát `%s'\n"
  
- #: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
  #, fuzzy, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "(Žiadny popis)\n"
  
- #: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr ""
  
- #: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
  #, fuzzy, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr " s = preskočiť tento kľúč\n"
  
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1427
  #, fuzzy
  msgid "could not parse keyserver\n"
  msgstr "nemožno použiť URI servera kľúčov - chyba analýzy URI\n"
  
- #: sm/gpgsm.c:1636
++#: sm/gpgsm.c:1630
  #, fuzzy, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "zapisujem do '%s'\n"
  
- #: sm/gpgsm.c:1677
++#: sm/gpgsm.c:1671
  #, fuzzy, c-format
  msgid "can't sign using '%s': %s\n"
  msgstr "nemôžem zavrieť `%s': %s\n"
  
- #: sm/gpgsm.c:2033
++#: sm/gpgsm.c:2028
  msgid "invalid command (there is no implicit command)\n"
  msgstr ""
  
@@@ -9658,8 -7731,6 +9690,8 @@@ msgstr "
  msgid "CRL access not possible due to disabled %s\n"
  msgstr ""
  
 +#: dirmngr/crlfetch.c:223 dirmngr/ldap-wrapper-ce.c:488
- #: dirmngr/ldap-wrapper.c:742 dirmngr/misc.c:563
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:563
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
@@@ -9844,116 -7879,88 +9876,116 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:160
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:158
++#: dirmngr/dirmngr.c:161
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
  
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:162
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:163
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:164
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
- #: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
++#: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:177
++#: dirmngr/dirmngr.c:180
  #, fuzzy
  msgid "run without asking a user"
  msgstr "Ukončiť bez uloženia? "
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:181
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:182
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:184
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:185
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:186
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:188
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:192
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:202
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
  
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:210
  #, 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:209
++#: dirmngr/dirmngr.c:212
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:218
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:220
++#: dirmngr/dirmngr.c:223
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:225
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:240
++#: dirmngr/dirmngr.c:246
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -9967,91 -7974,72 +9999,91 @@@ msgstr "
  "(Použite manuálové stránky pre kompletný zoznam všetkých príkazov a "
  "možností)\n"
  
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:361
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
  
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:363
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:443
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
- #: tools/gpgconf.c:648
++#: dirmngr/dirmngr.c:496 tools/gpgconf.c:550 tools/gpgconf.c:585
++#: tools/gpgconf.c:656
  #, fuzzy, c-format
  msgid "usage: %s [options] "
  msgstr "použitie: gpg [možnosti] "
  
- #: dirmngr/dirmngr.c:1062
++#: dirmngr/dirmngr.c:1074
  #, fuzzy
  #| 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:1301 dirmngr/server.c:1585
++#: dirmngr/dirmngr.c:1300 dirmngr/server.c:1585
  #, fuzzy, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
  
- #: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
++#: dirmngr/dirmngr.c:1306 dirmngr/server.c:1591
  #, fuzzy, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
  
- #: dirmngr/dirmngr.c:1484
++#: dirmngr/dirmngr.c:1487
  #, fuzzy, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "riadok je príliš dlhý\n"
  
- #: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
++#: dirmngr/dirmngr.c:1542 dirmngr/dirmngr.c:1626
  #, fuzzy, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "chyba: neplatný odtlačok\n"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
++#: dirmngr/dirmngr.c:1578 dirmngr/dirmngr.c:1604 tools/gpgconf-comp.c:4032
  #, fuzzy, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "chyba pri čítaní: %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1633
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1700
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1734
++#: dirmngr/dirmngr.c:1738
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1739
++#: dirmngr/dirmngr.c:1743
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1745
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1746
++#: dirmngr/dirmngr.c:1750
  #, fuzzy
  msgid "shutdown forced\n"
  msgstr "nespracované"
  
- #: dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1758
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1761
++#: dirmngr/dirmngr.c:1765
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10533,33 -8422,27 +10565,33 @@@ msgstr "zmazanie bloku kľúča sa nepo
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2463
++#: dirmngr/server.c:2469
  #, fuzzy, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "nemôžem vytvoriť `%s': %s\n"
  
- #: dirmngr/server.c:2474
++#: dirmngr/server.c:2480
  #, fuzzy, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "%s: nepodarilo sa vytvoriť hashovaciu tabuľku: %s\n"
  
- #: dirmngr/server.c:2495
++#: dirmngr/server.c:2501
  #, 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:2503
++#: dirmngr/server.c:2509
  #, 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:2534
++#: dirmngr/server.c:2540
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2553
++#: dirmngr/server.c:2559
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
@@@ -10607,7 -8481,6 +10639,7 @@@ msgstr "DSA požaduje použitie 160 bit
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:167
  #, fuzzy
  msgid "quiet"
  msgstr "ukončiť"
@@@ -10700,22 -8553,15 +10732,22 @@@ msgstr "podpisovanie zlyhalo: %s\n
  msgid "error sending standard options: %s\n"
  msgstr "chyba pri posielaní na `%s': %s\n"
  
 +#: tools/gpgconf-comp.c:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
- #: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
++#: tools/gpgconf-comp.c:766 tools/gpgconf-comp.c:865
  msgid "Options controlling the diagnostic output"
  msgstr ""
  
 +#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
- #: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
++#: tools/gpgconf-comp.c:779 tools/gpgconf-comp.c:888
  msgid "Options controlling the configuration"
  msgstr ""
  
- #: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
- #: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
++#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:723
++#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:901
  msgid "Options useful for debugging"
  msgstr ""
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
  msgid "Options controlling the security"
  msgstr ""
  
@@@ -10765,11 -8600,9 +10797,11 @@@ msgstr "chyba pri vytváraní hesla: %s
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
++#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
  msgid "|NAME|use NAME as default secret key"
  msgstr "|MENO|použi MENO ako implicitný tajný kľúč"
  
- #: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
++#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:784
  #, fuzzy
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|MENO|šifrovať pre MENO"
@@@ -10778,194 -8610,161 +10810,208 @@@
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
++#: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
  msgid "Configuration for Keyservers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
++#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
  #, 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:735
++#: tools/gpgconf-comp.c:741
  msgid "allow PKA lookups (DNS requests)"
  msgstr ""
  
- #: tools/gpgconf-comp.c:738
++#: tools/gpgconf-comp.c:744
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr ""
  
- #: tools/gpgconf-comp.c:787
++#: tools/gpgconf-comp.c:793
  msgid "disable all access to the dirmngr"
  msgstr ""
  
- #: tools/gpgconf-comp.c:790
++#: tools/gpgconf-comp.c:796
  #, fuzzy
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
  msgstr "|ALG|použiť šifrovací algoritmus ALG pre heslá"
  
- #: tools/gpgconf-comp.c:820
++#: tools/gpgconf-comp.c:829
  msgid "do not check CRLs for root certificates"
  msgstr ""
  
- #: tools/gpgconf-comp.c:869
++#: tools/gpgconf-comp.c:878
  msgid "Options controlling the format of the output"
  msgstr ""
  
- #: tools/gpgconf-comp.c:905
++#: tools/gpgconf-comp.c:920
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:918
++#: tools/gpgconf-comp.c:933
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:947
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:958
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:948
++#: tools/gpgconf-comp.c:963
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:977
++#: tools/gpgconf-comp.c:992
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:985
++#: tools/gpgconf-comp.c:1000
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1066
++#: tools/gpgconf-comp.c:1081
  msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1067
++#: tools/gpgconf-comp.c:1082
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1083
  msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1069
++#: tools/gpgconf-comp.c:1084
  msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1070
++#: tools/gpgconf-comp.c:1085
  #, fuzzy
  #| msgid "network error"
  msgid "Network"
  msgstr "chyba siete"
  
- #: tools/gpgconf-comp.c:1071
++#: tools/gpgconf-comp.c:1086
  #, fuzzy
  msgid "Passphrase Entry"
  msgstr "nesprávne heslo"
  
- #: tools/gpgconf-comp.c:1225
++#: tools/gpgconf-comp.c:1240
  #, fuzzy
  msgid "Component not suitable for launching"
  msgstr "verejný kľúč nenájdený"
  
- #: tools/gpgconf-comp.c:3283
++#: tools/gpgconf-comp.c:3311
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3434
++#: tools/gpgconf-comp.c:3462
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf-comp.c:4036
+ #, fuzzy, c-format
+ msgid "error closing '%s'\n"
+ msgstr "chyba pri čítaní `%s': %s\n"
+ 
++#: tools/gpgconf-comp.c:4038
+ #, fuzzy, c-format
+ msgid "error parsing '%s'\n"
+ msgstr "chyba pri čítaní `%s': %s\n"
+ 
++#: tools/gpgconf.c:73
  msgid "list all components"
  msgstr ""
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "check all programs"
  msgstr ""
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|list options"
  msgstr ""
  
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
  msgid "|COMPONENT|change options"
  msgstr ""
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "|COMPONENT|check options"
  msgstr ""
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "apply global default values"
  msgstr ""
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
+ msgid "|FILE|update configuration files using FILE"
+ msgstr ""
+ 
++#: tools/gpgconf.c:83
  msgid "get the configuration directories for @GPGCONF@"
  msgstr ""
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:85
  #, fuzzy
  msgid "list global configuration file"
  msgstr "neznáma položka konfigurácie \"%s\"\n"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  #, fuzzy
  msgid "check global configuration file"
  msgstr "neznáma položka konfigurácie \"%s\"\n"
  
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:89
  #, fuzzy
  #| msgid "update the trust database"
  msgid "query the software version database"
  msgstr "aktualizovať databázu dôvery"
  
- #: tools/gpgconf.c:86
++#: tools/gpgconf.c:90
  msgid "reload all or a given component"
  msgstr ""
  
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:91
  msgid "launch a given component"
  msgstr ""
  
- #: tools/gpgconf.c:88
++#: tools/gpgconf.c:92
  msgid "kill a given component"
  msgstr ""
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "use as output file"
  msgstr "použiť ako výstupný súbor"
  
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:102
  msgid "activate changes at runtime, if possible"
  msgstr ""
  
- #: tools/gpgconf.c:122
++#: tools/gpgconf.c:127
  #, fuzzy
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
  
- #: tools/gpgconf.c:125
++#: tools/gpgconf.c:130
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
  msgstr ""
  
- #: tools/gpgconf.c:545 tools/gpgconf.c:579
++#: tools/gpgconf.c:552 tools/gpgconf.c:587
  msgid "Need one component argument"
  msgstr ""
  
- #: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
++#: tools/gpgconf.c:561 tools/gpgconf.c:599 tools/gpgconf.c:632
  #, fuzzy
  msgid "Component not found"
  msgstr "verejný kľúč nenájdený"
  
- #: tools/gpgconf.c:650
++#: tools/gpgconf.c:658
  #, fuzzy
  msgid "No argument allowed"
  msgstr "zapisujem tajný kľúč do `%s'\n"
diff --cc po/sv.po
index 82ea732,a863d39..ad19bdd
--- a/po/sv.po
+++ b/po/sv.po
@@@ -24,7 -24,6 +24,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg trunk\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-11-18 16:54+0100\n"
++"POT-Creation-Date: 2016-12-20 11:28+0100\n"
  "PO-Revision-Date: 2011-01-12 14:53+0100\n"
  "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
  "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@@ -185,25 -156,11 +185,25 @@@ 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:838 common/dotlock.c:839 g10/card-util.c:839
- #: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1306 g10/keygen.c:4577
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
++#: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't create '%s': %s\n"
  msgstr "kan inte skapa \"%s\": %s\n"
  
 +#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
- #: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1307
++#: g10/import.c:305 g10/import.c:448 g10/import.c:621 g10/keygen.c:3681
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
- #: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
- #: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:825 g10/sign.c:1025
++#: g10/sign.c:1130 g10/sign.c:1275 g10/tdbdump.c:143 g10/tdbdump.c:151
++#: g10/tdbio.c:720 g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161
++#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
++#: dirmngr/certcache.c:368 dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1564
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
@@@ -268,11 -214,9 +268,11 @@@ msgstr "
  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:92 g10/call-agent.c:1100
++#: agent/divert-scd.c:92 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr "Mata in kortet med serienummer"
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1101
++#: agent/divert-scd.c:93 g10/call-agent.c:1102
  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"
  
@@@ -432,47 -350,32 +432,47 @@@ msgstr "
  "@Flaggor:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
  msgid "run in daemon mode (background)"
  msgstr "kör i demonläge (bakgrund)"
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
  msgid "run in server mode (foreground)"
  msgstr "kör i serverläge (förgrund)"
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
  #, fuzzy
  #| msgid "run in server mode"
  msgid "run in supervised mode"
  msgstr "kör i serverläge"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:170 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "utförlig"
  
 +#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "var något tystare"
  
- #: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
  msgid "sh-style command output"
  msgstr "sh-liknande kommandoutdata"
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
  msgid "csh-style command output"
  msgstr "csh-liknande kommandoutdata"
  
- #: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
- #: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
++#: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
  msgid "|FILE|read options from FILE"
  msgstr "|FIL|läs inställningar från FIL"
  
- #: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:177
  msgid "do not detach from the console"
  msgstr "frigör inte från konsollen"
  
@@@ -556,23 -442,16 +556,23 @@@ 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:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:481 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1025 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:358
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:124 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr ""
  "Rapportera fel till <@EMAIL@>.\n"
  "Skicka synpunkter på översättningen till <tp-sv at listor.tp-sv.se>.\n"
  
- #: agent/gpg-agent.c:491
++#: agent/gpg-agent.c:490
  #, 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:493
++#: agent/gpg-agent.c:492
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -584,151 -463,116 +584,151 @@@ msgstr "
  "Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
  "Hantering av hemliga nycklar för GnuPG\n"
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:537 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:442
  #, 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:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:793
++#: agent/gpg-agent.c:1082 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:812
  #, 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"
  
- #: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
- #: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1093 agent/gpg-agent.c:1935 g10/gpg.c:2510
++#: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:817
++#: dirmngr/dirmngr.c:1670 tools/symcryptrun.c:932
  #, fuzzy, c-format
  #| msgid "option file `%s': %s\n"
  msgid "option file '%s': %s\n"
  msgstr "inställningsfil \"%s\": %s\n"
  
- #: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:806
++#: agent/gpg-agent.c:1101 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:825
  #, 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:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
- #: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
++#: agent/gpg-agent.c:1223 g10/gpg.c:3643 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:936 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:527
  #, 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:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
++#: agent/gpg-agent.c:2080 scd/scdaemon.c:1073 dirmngr/dirmngr.c:1081
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "kan inte skapa uttag: %s\n"
  
- #: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
++#: agent/gpg-agent.c:2097 scd/scdaemon.c:1086 dirmngr/dirmngr.c:1094
  #, 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:2134
++#: agent/gpg-agent.c:2135
  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:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
++#: agent/gpg-agent.c:2145 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1126
  msgid "error getting nonce for the socket\n"
  msgstr "fel vid hämtning av nonce för uttaget\n"
  
- #: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
++#: agent/gpg-agent.c:2150 scd/scdaemon.c:1113 dirmngr/dirmngr.c:1129
  #, 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:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
- #: dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2160 agent/gpg-agent.c:2197 scd/scdaemon.c:1121
++#: dirmngr/dirmngr.c:1138
  #, 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:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:2165 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1143
  #, c-format
  msgid "listen() failed: %s\n"
  msgstr "listen() misslyckades: %s\n"
  
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
++#: agent/gpg-agent.c:2172 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1149
  #, 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:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: agent/gpg-agent.c:2191 agent/gpg-agent.c:2234 g10/exec.c:199
 +#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, 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:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: agent/gpg-agent.c:2194 agent/gpg-agent.c:2239 g10/openfile.c:491
 +#: g10/openfile.c:520 sm/keydb.c:103
  #, fuzzy, c-format
  #| msgid "directory `%s' created\n"
  msgid "directory '%s' created\n"
  msgstr "katalogen \"%s\" skapades\n"
  
- #: agent/gpg-agent.c:2244
++#: agent/gpg-agent.c:2245
  #, 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:2248
++#: agent/gpg-agent.c:2249
  #, 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:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
++#: agent/gpg-agent.c:2392 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1871
  #, 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:2598
++#: agent/gpg-agent.c:2599
  #, 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:2603
++#: agent/gpg-agent.c:2604
  #, 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:2678
++#: agent/gpg-agent.c:2679
  #, 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:2683
++#: agent/gpg-agent.c:2684
  #, 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:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
++#: agent/gpg-agent.c:2881 scd/scdaemon.c:1272 dirmngr/dirmngr.c:2075
  #, 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:2942 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2954 scd/scdaemon.c:1321
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s stoppad\n"
  
- #: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
++#: agent/gpg-agent.c:3092 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  msgid "no gpg-agent running in this session\n"
  msgstr "ingen gpg-agent kör i den här sessionen\n"
  
@@@ -746,8 -588,6 +746,8 @@@ msgstr "
  "Syntax: gpg-preset-passphrase [flaggor] NYCKELHASH\n"
  "Underhåll av lösenordscache\n"
  
- #: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
++#: agent/protect-tool.c:106 g10/gpg.c:424 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:153 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -756,9 -596,6 +756,9 @@@ 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:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
- #: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:92 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:168 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -812,8 -641,6 +812,8 @@@ 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:362 dirmngr/dirmngr.c:1469
- #: tools/gpgconf.c:323
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1472
++#: tools/gpgconf.c:328
  #, fuzzy, c-format
  #| msgid "error opening `%s': %s\n"
  msgid "error opening '%s': %s\n"
@@@ -999,9 -797,6 +999,9 @@@ msgstr "skyddsalgoritmen %d%s stöds in
  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:438
 +#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
- #: dirmngr/ldap-wrapper.c:710
++#: dirmngr/ldap-wrapper.c:711
  #, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "fel när ett rör skapades: %s\n"
@@@ -1014,8 -806,6 +1014,8 @@@
  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:848 dirmngr/dirmngr.c:1155
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1167
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "fel vid grening av process: %s\n"
@@@ -1065,29 -846,24 +1065,29 @@@ msgstr "kan inte ansluta till \"%s\": %
  msgid "problem setting the gpg-agent options\n"
  msgstr "inställningsproblem för gpg-agent\n"
  
- #: common/sysutils.c:144
++#: common/sysutils.c:148
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "kan inte stänga av minnesutskrifter: %s\n"
  
- #: common/sysutils.c:239
++#: common/sysutils.c:250
  #, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "Varning: osäkert ägarskap på %s \"%s\"\n"
  
  # Extension är vad? FIXME
- #: common/sysutils.c:271
++#: common/sysutils.c:282
  #, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "Varning: osäkra rättigheter på %s \"%s\"\n"
  
- #: common/sysutils.c:659
++#: common/sysutils.c:693
  #, 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:685
++#: common/sysutils.c:719
  #, fuzzy, c-format
  #| msgid "renaming `%s' to `%s' failed: %s\n"
  msgid "renaming '%s' to '%s' failed: %s\n"
@@@ -1164,7 -925,6 +1164,7 @@@ msgstr "%s:%u: föråldrad flagga \"%s\
  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:554
++#: common/miscellaneous.c:556
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
@@@ -1276,8 -1013,6 +1276,8 @@@ msgstr "Sessionsnyckel skapad
  msgid "algorithm: %s"
  msgstr "algoritm: %s"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3098
++#: scd/app-openpgp.c:3111
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "algoritmen stöds inte: %s"
@@@ -1467,7 -1160,6 +1467,7 @@@ msgstr "flagga \"%.50s\" är tvetydig\n
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr "kommandot \"%.50s\" är tvetydigt\n"
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1173
++#: common/argparse.c:401 dirmngr/dirmngr.c:1185
  msgid "out of core\n"
  msgstr "slut på minne\n"
  
@@@ -1530,8 -1211,6 +1530,8 @@@ msgstr "låset \"%s\" gjordes inte: %s\
  msgid "waiting for lock %s...\n"
  msgstr "väntar på låset %s...\n"
  
- #: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
- #: dirmngr/dirmngr.c:715
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:725
++#: dirmngr/dirmngr.c:734
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr "%s är för gammal (behöver %s, har %s)\n"
@@@ -1571,7 -1242,6 +1571,7 @@@ msgid "invalid dash escaped line: 
  msgstr "ogiltig rad som börjar med bindestreck: "
  
  # överhoppad eller hoppades över?
- #: g10/armor.c:873 g10/armor.c:1490
++#: g10/armor.c:873 g10/armor.c:1493
  #, c-format
  msgid "invalid radix64 character %02X skipped\n"
  msgstr "ogiltigt radix64-tecken %02X hoppades över\n"
@@@ -1589,7 -1256,6 +1589,7 @@@ msgstr "för tidigt filslut (i CRC-summ
  msgid "malformed CRC\n"
  msgstr "felformaterad CRC-summa\n"
  
- #: g10/armor.c:962 g10/armor.c:1527
++#: g10/armor.c:962 g10/armor.c:1530
  #, c-format
  msgid "CRC error; %06lX - %06lX\n"
  msgstr "CRC-fel; %06lX - %06lX\n"
@@@ -1602,16 -1266,13 +1602,16 @@@ msgstr "för tidigt filslut (i den avsl
  msgid "error in trailer line\n"
  msgstr "fel i avslutande rad\n"
  
- #: g10/armor.c:1303
++#: g10/armor.c:1306
  msgid "no valid OpenPGP data found.\n"
  msgstr "hittade ingen giltig OpenPGP-data.\n"
  
- #: g10/armor.c:1308
++#: g10/armor.c:1311
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
  msgstr "ogiltigt ASCII-skal: raden är längre än %d tecken\n"
  
- #: g10/armor.c:1312
++#: g10/armor.c:1315
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr ""
@@@ -1704,8 -1350,6 +1704,8 @@@ msgstr "OpenPGP-kort är inte tillgäng
  msgid "OpenPGP card no. %s detected\n"
  msgstr "OpenPGP-kort nr. %s identifierades\n"
  
- #: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
- #: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2030
++#: g10/keygen.c:4087 g10/revoke.c:215 g10/revoke.c:618
  msgid "can't do this in batch mode\n"
  msgstr "kan inte göra detta i satsläge\n"
  
@@@ -1713,14 -1356,9 +1713,14 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "Detta kommando är endast tillgängligt för kort av version 2\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2454
++#: g10/card-util.c:109 scd/app-openpgp.c:2467
  msgid "Reset Code not or not anymore available\n"
  msgstr "Återställningskoden är inte tillgänglig längre\n"
  
 +#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
- #: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
- #: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1768
++#: g10/keygen.c:1945 g10/keygen.c:2313 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "Vad väljer du? "
  
@@@ -1782,10 -1406,6 +1782,10 @@@ msgstr "Url för att hämta publik nyck
  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"
  
- #: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
- #: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:334
++#: g10/import.c:592 g10/import.c:640 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
++#: dirmngr/dirmngr.c:1510 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
@@@ -1853,7 -1458,6 +1853,7 @@@ msgstr "nyckelåtgärden är inte möjl
  msgid "not an OpenPGP card"
  msgstr "inte ett OpenPGP-kort"
  
- #: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
++#: g10/card-util.c:1173 g10/keygen.c:4106 g10/keygen.c:5092
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr "fel vid hämtning av aktuell nyckelinformation: %s\n"
@@@ -1893,13 -1492,10 +1893,13 @@@ msgstr "Vilken nyckelstorlek vill du an
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "Vilken nyckelstorlek vill du använda för autentiseringsnyckeln? (%u) "
  
- #: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
++#: g10/card-util.c:1316 g10/keygen.c:2122 g10/keygen.c:2154
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "avrundade uppåt till %u bitar\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2207 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr "%s nyckelstorlekar måste vara inom intervallet %u-%u\n"
@@@ -1961,9 -1547,6 +1961,9 @@@ msgstr "   (2) Krypteringsnyckel\n
  msgid "   (3) Authentication key\n"
  msgstr "   (3) Autentiseringsnyckel\n"
  
- #: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
- #: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
- #: g10/keygen.c:2314 g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1508
++#: g10/keygen.c:1794 g10/keygen.c:1822 g10/keygen.c:1952 g10/keygen.c:2060
++#: g10/keygen.c:2336 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Ogiltigt val.\n"
  
@@@ -1999,7 -1576,6 +1999,7 @@@ msgstr "Signera den? (j/N) 
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1816 g10/keyedit.c:1867
++#: g10/card-util.c:1816 g10/keyedit.c:1868
  msgid "quit this menu"
  msgstr "avsluta denna meny"
  
@@@ -2007,7 -1582,6 +2007,7 @@@
  msgid "show admin commands"
  msgstr "visa administratörskommandon"
  
- #: g10/card-util.c:1819 g10/keyedit.c:1870
++#: g10/card-util.c:1819 g10/keyedit.c:1871
  msgid "show this help"
  msgstr "visa denna hjälp"
  
@@@ -2085,32 -1641,22 +2085,32 @@@ msgstr "Administrationskommandon tillå
  msgid "Admin commands are not allowed\n"
  msgstr "Administrationskommandon tillåts inte\n"
  
- #: g10/card-util.c:2127 g10/keyedit.c:2816
++#: g10/card-util.c:2127 g10/keyedit.c:2817
  msgid "Invalid command  (try \"help\")\n"
  msgstr "Ogiltigt kommando (prova med \"help\")\n"
  
- #: g10/decrypt.c:191 g10/encrypt.c:955
++#: g10/decrypt.c:190 g10/encrypt.c:955
  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:4851 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4904 g10/keyring.c:398 g10/keyring.c:771
  #, fuzzy, c-format
  #| msgid "can't open `%s'\n"
  msgid "can't open '%s'\n"
  msgstr "kan inte öppna \"%s\"\n"
  
 +#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
- #: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
- #: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4858 g10/keyedit.c:2051
++#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2163
  #, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "nyckeln \"%s\" hittades inte: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
- #: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
- #: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4866 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:645 g10/tofu.c:2171
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "fel vid läsning av nyckelblock: %s\n"
@@@ -2171,7 -1705,6 +2171,7 @@@ msgstr "det finns en hemlig nyckel fö
  msgid "use option \"--delete-secret-keys\" to delete it first.\n"
  msgstr "använd flaggan \"--delete-secret-keys\"för att ta bort den först.\n"
  
- #: g10/encrypt.c:232 g10/sign.c:1292
++#: g10/encrypt.c:232 g10/sign.c:1294
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "fel när lösenfras skapades: %s\n"
@@@ -2191,7 -1721,6 +2191,7 @@@ msgstr "använder %s-chiffer\n
  msgid "'%s' already compressed\n"
  msgstr "\"%s\" är redan komprimerad\n"
  
- #: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:610
  #, fuzzy, c-format
  #| msgid "WARNING: `%s' is an empty file\n"
  msgid "WARNING: '%s' is an empty file\n"
@@@ -2211,7 -1738,6 +2211,7 @@@ msgstr "
  "VARNING: tvinga symmetriskt chiffer med %s (%d) strider mot "
  "mottagarinställningarna\n"
  
- #: g10/encrypt.c:707 g10/sign.c:984
++#: g10/encrypt.c:707 g10/sign.c:986
  #, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2247,7 -1768,6 +2247,7 @@@ msgid "encrypted with unknown algorith
  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:164 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:129
  msgid ""
  "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
  msgstr ""
@@@ -2342,8 -1844,6 +2342,8 @@@ msgstr "ta bort så mycket som möjlig
  msgid " - skipped"
  msgstr "%s: hoppade över: %s\n"
  
- #: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:845 g10/sign.c:1148
++#: g10/export.c:1251 g10/import.c:1543 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:847 g10/sign.c:1150
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
@@@ -2367,8 -1863,6 +2367,8 @@@ msgstr "nyckeln %s: nyckel av PGP 2.x-t
  msgid "WARNING: nothing exported\n"
  msgstr "VARNING: ingenting exporterat\n"
  
- #: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
- #: g10/plaintext.c:151 g10/plaintext.c:174
++#: g10/export.c:2283 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/plaintext.c:167 g10/plaintext.c:190
  #, fuzzy, c-format
  #| msgid "error creating `%s': %s\n"
  msgid "error creating '%s': %s\n"
@@@ -2418,8 -1903,6 +2418,8 @@@ msgstr "fel vid hämtning av \"%s\" vi
  msgid "No fingerprint"
  msgstr "Inget fingeravtryck"
  
- #: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
- #: g10/revoke.c:701
++#: g10/getkey.c:1873 g10/keyedit.c:2929 g10/keyedit.c:3016 g10/revoke.c:637
++#: g10/revoke.c:702
  #, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "hemliga nyckeln \"%s\" hittades inte: %s\n"
@@@ -2452,212 -1930,168 +2452,218 @@@ 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/gpg.c:424 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:200
  msgid "make a signature"
  msgstr "skapa en signatur"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:427
  msgid "make a clear text signature"
  msgstr "skapa en klartextsignatur"
  
- #: g10/gpg.c:426 sm/gpgsm.c:202
++#: g10/gpg.c:429 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "skapa signatur i en separat fil"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:430 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "kryptera data"
  
- #: g10/gpg.c:429
++#: g10/gpg.c:432
  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:431 sm/gpgsm.c:205
++#: g10/gpg.c:434 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "dekryptera data (standard)"
  
- #: g10/gpg.c:433 sm/gpgsm.c:206
++#: g10/gpg.c:436 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "validera en signatur"
  
- #: g10/gpg.c:435 sm/gpgsm.c:207
++#: g10/gpg.c:438 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "lista nycklar"
  
- #: g10/gpg.c:437
++#: g10/gpg.c:440
  msgid "list keys and signatures"
  msgstr "lista nycklar och signaturer"
  
- #: g10/gpg.c:438
++#: g10/gpg.c:443
  msgid "list and check key signatures"
  msgstr "lista och kontrollera nyckelsignaturer"
  
- #: g10/gpg.c:439 sm/gpgsm.c:212
++#: g10/gpg.c:445 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "lista nycklar och fingeravtryck"
  
- #: g10/gpg.c:440 sm/gpgsm.c:210
++#: g10/gpg.c:446 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "lista hemliga nycklar"
  
- #: g10/gpg.c:442 sm/gpgsm.c:213
++#: g10/gpg.c:448 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "generera ett nytt nyckelpar"
  
- #: g10/gpg.c:444
++#: g10/gpg.c:451
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly generate a new key pair"
  msgstr "generera ett nytt nyckelpar"
  
- #: g10/gpg.c:446
++#: g10/gpg.c:454
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly add a new user-id"
  msgstr "generera ett nytt nyckelpar"
  
- #: g10/gpg.c:449
++#: g10/gpg.c:459
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly revoke a user-id"
  msgstr "generera ett nytt nyckelpar"
  
- #: g10/gpg.c:451
++#: g10/gpg.c:462
+ #, fuzzy
+ #| msgid "generate a new key pair"
+ msgid "quickly set a new expiration date"
+ msgstr "generera ett nytt nyckelpar"
+ 
++#: g10/gpg.c:464
  msgid "full featured key pair generation"
  msgstr ""
  
- #: g10/gpg.c:452
++#: g10/gpg.c:467
  msgid "generate a revocation certificate"
  msgstr "generera ett spärrcertifikat"
  
- #: g10/gpg.c:454 sm/gpgsm.c:215
++#: g10/gpg.c:470 sm/gpgsm.c:216
  msgid "remove keys from the public keyring"
  msgstr "ta bort nycklar från den publika nyckelringen"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:472
  msgid "remove keys from the secret keyring"
  msgstr "ta bort nycklar från den hemliga nyckelringen"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:474
  #, fuzzy
  #| msgid "sign a key"
  msgid "quickly sign a key"
  msgstr "signera en nyckel"
  
- #: g10/gpg.c:460
++#: g10/gpg.c:476
  #, fuzzy
  #| msgid "sign a key locally"
  msgid "quickly sign a key locally"
  msgstr "signera en nyckel lokalt"
  
- #: g10/gpg.c:461
++#: g10/gpg.c:477
  msgid "sign a key"
  msgstr "signera en nyckel"
  
- #: g10/gpg.c:462
++#: g10/gpg.c:478
  msgid "sign a key locally"
  msgstr "signera en nyckel lokalt"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:479
  msgid "sign or edit a key"
  msgstr "signera eller redigera en nyckel"
  
- #: g10/gpg.c:465 sm/gpgsm.c:233
++#: g10/gpg.c:481 sm/gpgsm.c:234
  msgid "change a passphrase"
  msgstr "ändra en lösenfras"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:485
  msgid "export keys"
  msgstr "exportera nycklar"
  
- #: g10/gpg.c:468
++#: g10/gpg.c:486
  msgid "export keys to a keyserver"
  msgstr "exportera nycklar till en nyckelserver"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:487
  msgid "import keys from a keyserver"
  msgstr "importera nycklar från en nyckelserver"
  
- #: g10/gpg.c:471
++#: g10/gpg.c:490
  msgid "search for keys on a keyserver"
  msgstr "sök efter nycklar hos en nyckelserver"
  
- #: g10/gpg.c:473
++#: g10/gpg.c:492
  msgid "update all keys from a keyserver"
  msgstr "uppdatera alla nycklar nycklar från en nyckelserver"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:498
  msgid "import/merge keys"
  msgstr "importera/slå samman nycklar"
  
- #: g10/gpg.c:482
++#: g10/gpg.c:501
  msgid "print the card status"
  msgstr "skriv ut kortstatus"
  
- #: g10/gpg.c:483
++#: g10/gpg.c:502
  msgid "change data on a card"
  msgstr "ändra data på ett kort"
  
- #: g10/gpg.c:484
++#: g10/gpg.c:504
  msgid "change a card's PIN"
  msgstr "ändra PIN-kod för ett kort"
  
- #: g10/gpg.c:496
++#: g10/gpg.c:516
  msgid "update the trust database"
  msgstr "uppdatera tillitsdatabasen"
  
- #: g10/gpg.c:505
++#: g10/gpg.c:525
  msgid "print message digests"
  msgstr "skriv ut kontrollsummor"
  
- #: g10/gpg.c:508 sm/gpgsm.c:228
++#: g10/gpg.c:528 sm/gpgsm.c:229
  msgid "run in server mode"
  msgstr "kör i serverläge"
  
- #: g10/gpg.c:510
++#: g10/gpg.c:530
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:514 sm/gpgsm.c:246
++#: g10/gpg.c:534 sm/gpgsm.c:248
  msgid "create ascii armored output"
  msgstr "skapa utdata med ett ascii-skal"
  
- #: g10/gpg.c:517 sm/gpgsm.c:262
++#: g10/gpg.c:537 sm/gpgsm.c:264
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|ANVÄNDAR-ID|kryptera för ANVÄNDAR-ID"
  
- #: g10/gpg.c:533 sm/gpgsm.c:298
++#: g10/gpg.c:553 sm/gpgsm.c:300
  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:539
++#: g10/gpg.c:559
  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:546
++#: g10/gpg.c:566
  msgid "use canonical text mode"
  msgstr "använd \"ursprunglig text\"-läget"
  
- #: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
++#: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
  msgid "|FILE|write output to FILE"
  msgstr "|FIL|skriv utdata till FIL"
  
- #: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
++#: g10/gpg.c:598 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
  msgid "do not make any changes"
  msgstr "gör inga ändringar"
  
- #: g10/gpg.c:579
++#: g10/gpg.c:599
  msgid "prompt before overwriting"
  msgstr "fråga innan överskrivning"
  
- #: g10/gpg.c:628
++#: g10/gpg.c:648
  msgid "use strict OpenPGP behavior"
  msgstr "använd strikt OpenPGP-beteende"
  
  # inställningar istället för flaggor?
  # Nej, här är det bruksanvisningen för kommandoraden.
- #: g10/gpg.c:654 sm/gpgsm.c:355
++#: g10/gpg.c:674 sm/gpgsm.c:357
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2665,7 -2099,16 +2671,17 @@@ msgstr "
  "@\n"
  "(Se manualsidan för en fullständig lista över alla kommandon och flaggor)\n"
  
- #: g10/gpg.c:657 sm/gpgsm.c:358
++#: g10/gpg.c:677
+ #, fuzzy
+ #| msgid ""
+ #| "@\n"
+ #| "Examples:\n"
+ #| "\n"
+ #| " -se -r Bob [file]          sign and encrypt for user Bob\n"
+ #| " --clear-sign [file]         make a clear text signature\n"
+ #| " --detach-sign [file]       make a detached signature\n"
+ #| " --list-keys [names]        show keys\n"
+ #| " --fingerprint [names]      show fingerprints\n"
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2685,14 -2128,12 +2701,14 @@@ msgstr "
  "--list-keys [namn]          visa nycklar\n"
  "--fingerprint [namn]        visa fingeravtryck\n"
  
- #: g10/gpg.c:1026
++#: g10/gpg.c:1047
  #, 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:1029
++#: g10/gpg.c:1050
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg [options] [files]\n"
@@@ -2707,7 -2148,6 +2723,7 @@@ msgstr "
  "signera, kontrollera, kryptera eller dekryptera\n"
  "standardåtgärden beror på inmatningsdata\n"
  
- #: g10/gpg.c:1040 sm/gpgsm.c:588
++#: g10/gpg.c:1061 sm/gpgsm.c:580
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2715,84 -2155,69 +2731,84 @@@ msgstr "
  "\n"
  "Algoritmer som stöds:\n"
  
- #: g10/gpg.c:1043
++#: g10/gpg.c:1064
  msgid "Pubkey: "
  msgstr "Publik nyckel: "
  
- #: g10/gpg.c:1050 g10/keyedit.c:3402
++#: g10/gpg.c:1071 g10/keyedit.c:3483
  msgid "Cipher: "
  msgstr "Chiffer: "
  
- #: g10/gpg.c:1057
++#: g10/gpg.c:1078
  msgid "Hash: "
  msgstr "Kontrollsumma: "
  
- #: g10/gpg.c:1064 g10/keyedit.c:3451
++#: g10/gpg.c:1085 g10/keyedit.c:3532
  msgid "Compression: "
  msgstr "Komprimering: "
  
- #: g10/gpg.c:1133 sm/gpgsm.c:662
++#: g10/gpg.c:1154 sm/gpgsm.c:654
  #, fuzzy, c-format
  #| msgid "usage: gpgsm [options] "
  msgid "usage: %s [options] %s\n"
  msgstr "användning: gpgsm [flaggor] "
  
- #: g10/gpg.c:1321 sm/gpgsm.c:751
++#: g10/gpg.c:1342 sm/gpgsm.c:743
  msgid "conflicting commands\n"
  msgstr "motstridiga kommandon\n"
  
  # Vad betyder detta?
- #: g10/gpg.c:1339
++#: g10/gpg.c:1360
  #, 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:1537
++#: g10/gpg.c:1558
  #, 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:1540
++#: g10/gpg.c:1561
  #, 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:1543
++#: g10/gpg.c:1564
  #, 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:1549
++#: g10/gpg.c:1570
  #, 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:1552
++#: g10/gpg.c:1573
  #, 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:1555
++#: g10/gpg.c:1576
  #, 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:1561
++#: g10/gpg.c:1582
  #, 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:1564
++#: g10/gpg.c:1585
  #, fuzzy, c-format
  #| msgid ""
  #| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2802,21 -2227,18 +2818,21 @@@ msgstr "
  "VARNING: osäkert ägarskap på inneslutande katalog för konfigurationsfilen "
  "\"%s\"\n"
  
- #: g10/gpg.c:1567
++#: g10/gpg.c:1588
  #, 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:1573
++#: g10/gpg.c:1594
  #, 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:1576
++#: g10/gpg.c:1597
  #, fuzzy, c-format
  #| msgid ""
  #| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2827,530 -2249,373 +2843,470 @@@ msgstr "
  "VARNING: osäkra rättigheter på inneslutande katalog för konfigurationsfilen "
  "\"%s\"\n"
  
- #: g10/gpg.c:1579
++#: g10/gpg.c:1600
  #, 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:1786
++#: g10/gpg.c:1816
  #, fuzzy, c-format
  #| msgid "unknown configuration item `%s'\n"
  msgid "unknown configuration item '%s'\n"
  msgstr "okänd konfigurationspost \"%s\"\n"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1925
  msgid "display photo IDs during key listings"
  msgstr "visa foto-id under nyckellistning"
  
- #: g10/gpg.c:1895
++#: g10/gpg.c:1927
  #, 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:1897
++#: g10/gpg.c:1929
  msgid "show policy URLs during signature listings"
  msgstr "visa policy-url:er under signaturlistningar"
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1931
  msgid "show all notations during signature listings"
  msgstr "visa alla notationer under signaturlistningar"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1933
  msgid "show IETF standard notations during signature listings"
  msgstr "visa IETF-standardnotationer under signaturlistningar"
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1937
  msgid "show user-supplied notations during signature listings"
  msgstr "visa användarangivna notationer under signaturlistningar"
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1939
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "visa url:er till föredragna nyckelservrar under signaturlistningar"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1941
  msgid "show user ID validity during key listings"
  msgstr "visa giltighet för användaridentitet vid nyckellistningar "
  
- #: g10/gpg.c:1911
++#: g10/gpg.c:1943
  msgid "show revoked and expired user IDs in key listings"
  msgstr "visa spärrade och utgångna användaridentiteter i nyckellistningar"
  
- #: g10/gpg.c:1913
++#: g10/gpg.c:1945
  msgid "show revoked and expired subkeys in key listings"
  msgstr "visa spärrade och utgångna undernycklar i nyckellistningar"
  
- #: g10/gpg.c:1915
++#: g10/gpg.c:1947
  msgid "show the keyring name in key listings"
  msgstr "visa nyckelringens namn i nyckellistningar"
  
- #: g10/gpg.c:1917
++#: g10/gpg.c:1949
  msgid "show expiration dates during signature listings"
  msgstr "visa utgångsdatum under signaturlistningar"
  
- #: g10/gpg.c:2019 g10/gpg.c:2056
++#: g10/gpg.c:2051 g10/gpg.c:2088
  #, 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:2030
++#: g10/gpg.c:2062
  #, fuzzy, c-format
  #| msgid "unknown option `%s'\n"
  msgid "unknown TOFU policy '%s'\n"
  msgstr "okänd flagga \"%s\"\n"
  
- #: g10/gpg.c:2032 g10/gpg.c:2068
++#: g10/gpg.c:2064 g10/gpg.c:2100
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2066
++#: g10/gpg.c:2098 g10/keygen.c:167
  #, fuzzy, c-format
  #| msgid "missing argument for option \"%.50s\"\n"
  msgid "invalid value for option '%s'\n"
  msgstr "argument för flaggan \"%.50s\" saknas\n"
  
- #: g10/gpg.c:2203
++#: g10/gpg.c:2235
  #, fuzzy, c-format
  #| msgid "NOTE: old default options file `%s' ignored\n"
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "OBS: den gamla inställningsfilen \"%s\" används inte\n"
  
- #: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
++#: g10/gpg.c:2839 g10/gpg.c:3610 g10/gpg.c:3622
  #, 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:2978 g10/gpg.c:2990
++#: g10/gpg.c:3011 g10/gpg.c:3023
  #, 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:3012
++#: g10/gpg.c:3045
  #, 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:3044 sm/gpgsm.c:1166
++#: g10/gpg.c:3077 sm/gpgsm.c:1158
  #, 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:3097
++#: g10/gpg.c:3130
  #, 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:3119 g10/gpg.c:3322 g10/keyedit.c:5338
++#: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
  msgid "could not parse keyserver URL\n"
  msgstr "kunde inte tolka url till nyckelserver\n"
  
- #: g10/gpg.c:3137
++#: g10/gpg.c:3170
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: ogiltiga flaggor för nyckelserver\n"
  
- #: g10/gpg.c:3140
++#: g10/gpg.c:3173
  msgid "invalid keyserver options\n"
  msgstr "ogiltiga flaggor för nyckelserver\n"
  
- #: g10/gpg.c:3147
++#: g10/gpg.c:3180
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: ogiltiga importeringsflaggor\n"
  
- #: g10/gpg.c:3150
++#: g10/gpg.c:3183
  msgid "invalid import options\n"
  msgstr "ogiltiga importflaggor\n"
  
- #: g10/gpg.c:3156 g10/gpg.c:3171
++#: g10/gpg.c:3189 g10/gpg.c:3204
  #, fuzzy, c-format
  #| msgid "invalid list options\n"
  msgid "invalid filter option: %s\n"
  msgstr "ogiltiga listflaggor\n"
  
- #: g10/gpg.c:3162
++#: g10/gpg.c:3195
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: ogiltiga exportflaggor\n"
  
- #: g10/gpg.c:3165
++#: g10/gpg.c:3198
  msgid "invalid export options\n"
  msgstr "ogiltiga exportinställningar\n"
  
- #: g10/gpg.c:3177
++#: g10/gpg.c:3210
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: ogiltiga listflaggor\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3213
  msgid "invalid list options\n"
  msgstr "ogiltiga listflaggor\n"
  
- #: g10/gpg.c:3188
++#: g10/gpg.c:3221
  msgid "display photo IDs during signature verification"
  msgstr "visa foto-id under signaturvalidering"
  
- #: g10/gpg.c:3190
++#: g10/gpg.c:3223
  msgid "show policy URLs during signature verification"
  msgstr "visa policy-url:er under signaturvalidering"
  
- #: g10/gpg.c:3192
++#: g10/gpg.c:3225
  msgid "show all notations during signature verification"
  msgstr "visa alla notationer under signaturvalidering"
  
- #: g10/gpg.c:3194
++#: g10/gpg.c:3227
  msgid "show IETF standard notations during signature verification"
  msgstr "visa IETF-standardnotationer under signaturvalidering"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3231
  msgid "show user-supplied notations during signature verification"
  msgstr "visa användarangivna notationer under signaturvalidering"
  
- #: g10/gpg.c:3200
++#: g10/gpg.c:3233
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "visa url:er till föredragna nyckelserver under signaturvalidering"
  
- #: g10/gpg.c:3202
++#: g10/gpg.c:3235
  msgid "show user ID validity during signature verification"
  msgstr "visa giltighet för användaridentitet vid signaturvalidering"
  
- #: g10/gpg.c:3204
++#: g10/gpg.c:3237
  msgid "show revoked and expired user IDs in signature verification"
  msgstr "visa spärrade och utgångna användaridentiteter i signaturvalidering"
  
- #: g10/gpg.c:3206
++#: g10/gpg.c:3239
  msgid "show only the primary user ID in signature verification"
  msgstr "visa endast primär användaridentitet i signaturvalidering"
  
- #: g10/gpg.c:3208
++#: g10/gpg.c:3241
  msgid "validate signatures with PKA data"
  msgstr "validera signaturer med PKA-data"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3243
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr "öka tillit på signaturer med giltigt PKA-data"
  
- #: g10/gpg.c:3217
++#: g10/gpg.c:3250
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: ogiltiga flaggor för validering\n"
  
- #: g10/gpg.c:3220
++#: g10/gpg.c:3253
  msgid "invalid verify options\n"
  msgstr "ogiltiga flaggor för validering\n"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3260
  #, 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:3417
++#: g10/gpg.c:3452
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: ogiltig auto-key-locate-lista\n"
  
- #: g10/gpg.c:3420
++#: g10/gpg.c:3455
  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:3553 sm/gpgsm.c:1507
++#: g10/gpg.c:3592 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
  msgstr "VARNING: programmet kan komma att skapa en minnesavbild!\n"
  
- #: g10/gpg.c:3564
++#: g10/gpg.c:3603
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "VARNING: %s gäller istället för %s\n"
  
- #: g10/gpg.c:3573
++#: g10/gpg.c:3612
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s är inte tillåten tillsammans med %s!\n"
  
- #: g10/gpg.c:3576
++#: g10/gpg.c:3615
  #, 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:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
++#: g10/gpg.c:3630 sm/gpgsm.c:1518 dirmngr/dirmngr.c:951
  msgid "WARNING: running with faked system time: "
  msgstr "VARNING: kör med falsk systemtid: "
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3651
  #, 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:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
++#: g10/gpg.c:3686 g10/gpg.c:3710 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "den valda chifferalgoritmen är ogiltig\n"
  
- #: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
++#: g10/gpg.c:3692 g10/gpg.c:3716 sm/gpgsm.c:1591 sm/gpgsm.c:1597
  msgid "selected digest algorithm is invalid\n"
  msgstr "vald sammandragsalgoritm är ogiltig\n"
  
- #: g10/gpg.c:3659
++#: g10/gpg.c:3698
  msgid "selected compression algorithm is invalid\n"
  msgstr "vald komprimeringsalgoritm är ogiltig\n"
  
- #: g10/gpg.c:3665
++#: g10/gpg.c:3704
  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:3680
++#: g10/gpg.c:3719
  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:3682
++#: g10/gpg.c:3721
  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:3684
++#: g10/gpg.c:3723
  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:3686
++#: g10/gpg.c:3725
  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:3688
++#: g10/gpg.c:3727
  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:3691
++#: g10/gpg.c:3730
  #, fuzzy
  #| 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:3695
++#: g10/gpg.c:3734
  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:3702
++#: g10/gpg.c:3741
  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:3706
++#: g10/gpg.c:3745
  msgid "invalid personal cipher preferences\n"
  msgstr "ogiltig inställning av personligt chiffer\n"
  
- #: g10/gpg.c:3710
++#: g10/gpg.c:3749
  msgid "invalid personal digest preferences\n"
  msgstr "ogiltig inställning av föredragna kontrollsummealgoritmer\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3753
  msgid "invalid personal compress preferences\n"
  msgstr "ogiltig inställning av föredragna kompressionsalgoritmer\n"
  
- #: g10/gpg.c:3750
++#: g10/gpg.c:3789
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s fungerar ännu inte med  %s\n"
  
- #: g10/gpg.c:3797
++#: g10/gpg.c:3836
  #, fuzzy, c-format
  #| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr "du får inte använda chifferalgoritmen \"%s\" när du är i %s-läget\n"
  
- #: g10/gpg.c:3802
++#: g10/gpg.c:3841
  #, fuzzy, c-format
  #| msgid "you may not use digest algorithm `%s' while in %s mode\n"
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr ""
  "du får inte använda sammandragsalgoritmen \"%s\" när du är i %s-läget\n"
  
- #: g10/gpg.c:3807
++#: g10/gpg.c:3846
  #, fuzzy, c-format
  #| msgid "you may not use compression algorithm `%s' while in %s mode\n"
  msgid "you may not use compression algorithm '%s' while 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:3906
++#: g10/gpg.c:3945
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:3957
  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:3975
- msgid "--store [filename]"
- msgstr "--store [filnamn]"
- 
- #: g10/gpg.c:3985
- msgid "--symmetric [filename]"
- msgstr "--symmetric [filnamn]"
- 
- #: g10/gpg.c:3989
++#: g10/gpg.c:4028
  #, 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:4000
- msgid "--encrypt [filename]"
- msgstr "--encrypt [filnamn]"
- 
- #: g10/gpg.c:4016
- msgid "--symmetric --encrypt [filename]"
- msgstr "--symmetric --encrypt [filnamn]"
- 
- #: g10/gpg.c:4018
++#: g10/gpg.c:4057
  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:4021
++#: g10/gpg.c:4060
  #, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr "du kan inte använda --symmetric --encrypt i %s-läget\n"
  
- #: g10/gpg.c:4042
- msgid "--sign [filename]"
- msgstr "--sign [filnamn]"
- 
- #: g10/gpg.c:4058
- msgid "--sign --encrypt [filename]"
- msgstr "--sign --encrypt [filnamn]"
- 
- #: g10/gpg.c:4076
- msgid "--symmetric --sign --encrypt [filename]"
- msgstr "--symmetric --sign --encrypt [filnamn]"
- 
- #: g10/gpg.c:4078
++#: g10/gpg.c:4117
  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:4081
++#: g10/gpg.c:4120
  #, c-format
  msgid "you cannot use --symmetric --sign --encrypt while 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:4105
- msgid "--sign --symmetric [filename]"
- msgstr "--sign --symmetric [filnamn]"
- 
- #: g10/gpg.c:4117
- msgid "--clearsign [filename]"
- msgstr "--clearsign [filnamn]"
- 
- #: g10/gpg.c:4147
- msgid "--decrypt [filename]"
- msgstr "--decrypt [filnamn]"
- 
- #: g10/gpg.c:4174
- msgid "--sign-key user-id"
- msgstr "--sign-key användaridentitet"
- 
- #: g10/gpg.c:4178
- msgid "--lsign-key user-id"
- msgstr "--lsign-key användaridentitet"
- 
- #: g10/gpg.c:4199
- msgid "--edit-key user-id [commands]"
- msgstr "--edit-key användaridentitet [kommandon]"
- 
- #: g10/gpg.c:4215
- msgid "--passwd <user-id>"
- msgstr "--passwd <användaridentitet>"
- 
- #: g10/gpg.c:4411 g10/keyserver.c:1837
++#: g10/gpg.c:4462 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "sändning till nyckelservern misslyckades: %s\n"
  
- #: g10/gpg.c:4416
++#: g10/gpg.c:4467
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "hämtning från nyckelservern misslyckades: %s\n"
  
- #: g10/gpg.c:4422
++#: g10/gpg.c:4473
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "export av nyckeln misslyckades: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4486
  #, 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:4447
++#: g10/gpg.c:4498
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "sökning på nyckelservern misslyckades: %s\n"
  
- #: g10/gpg.c:4460
++#: g10/gpg.c:4511
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "uppdatering av  nyckeln från en nyckelserver misslyckades: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4578
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
  
- #: g10/gpg.c:4538
++#: g10/gpg.c:4589
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "misslyckades med att skapa ASCII-skal: %s\n"
  
- #: g10/gpg.c:4630
++#: g10/gpg.c:4681
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
  msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
  
- #: g10/gpg.c:4776 g10/tofu.c:2002
++#: g10/gpg.c:4827 g10/tofu.c:2151
  #, 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:4788
++#: g10/gpg.c:4839
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4835
- msgid "[filename]"
- msgstr "[filnamn]"
- 
- #: g10/gpg.c:4841
++#: g10/gpg.c:4894
  msgid "Go ahead and type your message ...\n"
  msgstr "Skriv ditt meddelande här ...\n"
  
- #: g10/gpg.c:5179
++#: g10/gpg.c:5232
  msgid "the given certification policy URL is invalid\n"
  msgstr "den angivna URL som beskriver certifieringsspolicy är ogiltig\n"
  
- #: g10/gpg.c:5181
++#: g10/gpg.c:5234
  msgid "the given signature policy URL is invalid\n"
  msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
  
- #: g10/gpg.c:5214
++#: g10/gpg.c:5267
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "den angivna föredragna nyckelserver-url:n är ogiltig\n"
  
@@@ -3365,7 -2628,6 +3321,7 @@@ msgstr "|FIL|ta nycklarna från nyckelr
  msgid "make timestamp conflicts only a warning"
  msgstr "utfärda enbart en varning när tidsstämpeln är orimlig"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:345
++#: g10/gpgv.c:82 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|skriv statusinformation till denna FD"
  
@@@ -3395,138 -2652,110 +3351,138 @@@ msgstr "Det finns ingen hjälp tillgän
  msgid "No help available for '%s'"
  msgstr "Det finns ingen hjälp tillgänglig för \"%s\""
  
- #: g10/import.c:151
++#: g10/import.c:152
  msgid "import signatures that are marked as local-only"
  msgstr "importera signaturer som är markerade som endast lokala"
  
- #: g10/import.c:154
++#: g10/import.c:155
  msgid "repair damage from the pks keyserver during import"
  msgstr "reparera skada från pks-nyckelservern under importering"
  
- #: g10/import.c:157
++#: g10/import.c:158
  #, fuzzy
  #| msgid "do not update the trustdb after import"
  msgid "do not clear the ownertrust values during import"
  msgstr "uppdatera inte tillitsdatabasen efter importering"
  
- #: g10/import.c:160
++#: g10/import.c:161
  msgid "do not update the trustdb after import"
  msgstr "uppdatera inte tillitsdatabasen efter importering"
  
- #: g10/import.c:163
++#: g10/import.c:164
  #, fuzzy
  #| msgid "show key fingerprint"
  msgid "show key during import"
  msgstr "visa nyckelns fingeravtryck"
  
- #: g10/import.c:166
++#: g10/import.c:167
  msgid "only accept updates to existing keys"
  msgstr "acceptera endast uppdateringar till befintliga nycklar"
  
- #: g10/import.c:169
++#: g10/import.c:170
  msgid "remove unusable parts from key after import"
  msgstr "ta bort oanvändbara delar från nyckeln efter importering"
  
- #: g10/import.c:172
++#: g10/import.c:173
  msgid "remove as much as possible from key after import"
  msgstr "ta bort så mycket som möjligt från nyckeln efter importering"
  
- #: g10/import.c:175
++#: g10/import.c:176
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:326 g10/import.c:568
++#: g10/import.c:327 g10/import.c:569
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "hoppar över block av typen %d\n"
  
- #: g10/import.c:585
++#: g10/import.c:586
  #, c-format
  msgid "%lu keys processed so far\n"
  msgstr "%lu nycklar behandlade än så länge\n"
  
- #: g10/import.c:655
++#: g10/import.c:656
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "Totalt antal behandlade enheter: %lu\n"
  
- #: g10/import.c:658
++#: g10/import.c:659
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "        överhoppade nya nycklar: %lu\n"
  
- #: g10/import.c:660
++#: g10/import.c:661
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "        överhoppade nya nycklar: %lu\n"
  
- #: g10/import.c:663
++#: g10/import.c:664
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "       utan användaridentiteter: %lu\n"
  
- #: g10/import.c:666 sm/import.c:130
++#: g10/import.c:667 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "                    importerade: %lu"
  
- #: g10/import.c:670 sm/import.c:134
++#: g10/import.c:671 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "                    oförändrade: %lu\n"
  
- #: g10/import.c:672
++#: g10/import.c:673
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "        nya användaridentiteter: %lu\n"
  
- #: g10/import.c:674
++#: g10/import.c:675
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "               nya undernycklar: %lu\n"
  
- #: g10/import.c:676
++#: g10/import.c:677
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "                 nya signaturer: %lu\n"
  
- #: g10/import.c:678
++#: g10/import.c:679
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "          nya nyckelspärrningar: %lu\n"
  
- #: g10/import.c:680 sm/import.c:136
++#: g10/import.c:681 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "    antal lästa hemliga nycklar: %lu\n"
  
- #: g10/import.c:682 sm/import.c:138
++#: g10/import.c:683 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "    importerade hemliga nycklar: %lu\n"
  
- #: g10/import.c:684 sm/import.c:140
++#: g10/import.c:685 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr "    oförändrade hemliga nycklar: %lu\n"
  
- #: g10/import.c:686 sm/import.c:142
++#: g10/import.c:687 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "               inte importerade: %lu\n"
  
- #: g10/import.c:688
++#: g10/import.c:689
  #, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "             signaturer rensade: %lu\n"
  
- #: g10/import.c:690
++#: g10/import.c:691
  #, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "    användaridentiteter rensade: %lu\n"
  
- #: g10/import.c:1034
++#: g10/import.c:1035
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
@@@ -3535,198 -2764,160 +3491,198 @@@ msgstr "
  "VARNING: nyckeln %s innehåller inställningar för otillgängliga\n"
  "algoritmer för dessa användaridentiteter:\n"
  
- #: g10/import.c:1076
++#: g10/import.c:1077
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr "         \"%s\": inställning för chifferalgoritmen %s\n"
  
- #: g10/import.c:1091
++#: g10/import.c:1092
  #, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "         \"%s\": inställning för sammandragsalgoritmen %s\n"
  
- #: g10/import.c:1103
++#: g10/import.c:1104
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr "         \"%s\": inställning för komprimeringsalgoritmen %s\n"
  
- #: g10/import.c:1116
++#: g10/import.c:1117
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr "det rekommenderas starkt att du uppdaterar dina inställningar\n"
  
- #: g10/import.c:1118
++#: g10/import.c:1119
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  "och distribuerar denna nyckel igen för att undvika tänkbara problem\n"
  "med att algoritmerna inte stämmer\n"
  
- #: g10/import.c:1143
++#: g10/import.c:1144
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  "du kan uppdatera dina inställningar med: gpg --edit-key %s updpref save\n"
  
- #: g10/import.c:1379 g10/import.c:2167
++#: g10/import.c:1380 g10/import.c:2168
  #, c-format
  msgid "key %s: no user ID\n"
  msgstr "nyckel %s: ingen användaridentitet\n"
  
- #: g10/import.c:1385
++#: g10/import.c:1386
  #, fuzzy, c-format
  #| msgid "skipped \"%s\": %s\n"
  msgid "key %s: %s\n"
  msgstr "hoppade över \"%s\": %s\n"
  
- #: g10/import.c:1386 g10/import.c:2141
++#: g10/import.c:1387 g10/import.c:2142
  msgid "rejected by import screener"
  msgstr ""
  
  # Undernyckeln är skadad på HKP-servern. Vanligt fel vid många undernycklar.
- #: g10/import.c:1416
++#: g10/import.c:1417
  #, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "nyckeln %s: PKS-skadad undernyckel reparerades\n"
  
  # vad innebär fnutten i slutet?
- #: g10/import.c:1434
++#: g10/import.c:1435
  #, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "nyckel %s: accepterade icke-självsignerad användaridentitet \"%s\"\n"
  
- #: g10/import.c:1444 g10/import.c:1475
++#: g10/import.c:1445 g10/import.c:1476
  #, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "nyckel %s: inga giltiga användaridentiteter\n"
  
- #: g10/import.c:1446
++#: g10/import.c:1447
  msgid "this may be caused by a missing self-signature\n"
  msgstr "detta kan bero på att det saknas en självsignatur\n"
  
- #: g10/import.c:1516 g10/import.c:2318
++#: g10/import.c:1517 g10/import.c:2319
  #, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "nyckel %s: hittade ingen publik nyckel: %s\n"
  
- #: g10/import.c:1522
++#: g10/import.c:1523
  #, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "nyckel %s: ny nyckel - hoppade över\n"
  
- #: g10/import.c:1537
++#: g10/import.c:1538
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "hittade ingen nyckelring som gick att skriva till: %s\n"
  
- #: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
++#: g10/import.c:1547 g10/import.c:1648 g10/import.c:2385
  #, fuzzy, c-format
  #| msgid "error writing keyring `%s': %s\n"
  msgid "error writing keyring '%s': %s\n"
  msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
  
  # fixme: I appended the %s -wk
- #: g10/import.c:1566
++#: g10/import.c:1567
  #, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "nyckel %s: publika nyckeln \"%s\" importerades\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1591
  #, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "nyckel %s: stämmer inte mot vår lokala kopia\n"
  
- #: g10/import.c:1606 g10/import.c:2342
++#: g10/import.c:1607 g10/import.c:2343
  #, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "nyckel %s: kan inte hitta det ursprungliga nyckelblocket: %s\n"
  
- #: g10/import.c:1614 g10/import.c:2349
++#: g10/import.c:1615 g10/import.c:2350
  #, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "nyckel %s: kan inte läsa det ursprungliga nyckelblocket %s\n"
  
- #: g10/import.c:1657
++#: g10/import.c:1658
  #, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "nyckel %s: \"%s\" 1 ny användaridentitet\n"
  
- #: g10/import.c:1660
++#: g10/import.c:1661
  #, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "nyckel %s: \"%s\" %d nya användaridentiteter\n"
  
- #: g10/import.c:1663
++#: g10/import.c:1664
  #, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "nyckel %s: \"%s\" 1 ny signatur\n"
  
- #: g10/import.c:1666
++#: g10/import.c:1667
  #, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "nyckel %s: \"%s\" %d nya signaturer\n"
  
- #: g10/import.c:1669
++#: g10/import.c:1670
  #, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "nyckel %s: \"%s\" 1 ny undernyckel\n"
  
- #: g10/import.c:1672
++#: g10/import.c:1673
  #, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "nyckel %s: \"%s\" %d nya undernycklar\n"
  
- #: g10/import.c:1675
++#: g10/import.c:1676
  #, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "nyckel %s: \"%s\" %d signatur rensad\n"
  
- #: g10/import.c:1678
++#: g10/import.c:1679
  #, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "nyckel %s: \"%s\" %d signaturer rensade\n"
  
- #: g10/import.c:1681
++#: g10/import.c:1682
  #, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "nyckel %s: \"%s\" %d användaridentitet rensad\n"
  
- #: g10/import.c:1684
++#: g10/import.c:1685
  #, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "nyckel %s: \"%s\" %d användaridentiteter rensade\n"
  
- #: g10/import.c:1707
++#: g10/import.c:1708
  #, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "nyckel %s: \"%s\" inte ändrad\n"
  
- #: g10/import.c:2019 g10/import.c:2264
++#: g10/import.c:2020 g10/import.c:2265
  #, c-format
  msgid "key %s: secret key imported\n"
  msgstr "nyckel %s: hemlig nyckel importerades\n"
  
- #: g10/import.c:2027
++#: g10/import.c:2028
  #, fuzzy, c-format
  #| msgid "skipped: secret key already present\n"
  msgid "key %s: secret key already exists\n"
  msgstr "hoppade över: hemlig nyckel finns redan\n"
  
- #: g10/import.c:2035
++#: g10/import.c:2036
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "key %s: error sending to agent: %s\n"
  msgstr "fel vid sändning av %s-kommando: %s\n"
  
- #: g10/import.c:2140
++#: g10/import.c:2141
  #, fuzzy, c-format
  #| msgid "secret key \"%s\" not found: %s\n"
  msgid "secret key %s: %s\n"
  msgstr "hemliga nyckeln \"%s\" hittades inte: %s\n"
  
- #: g10/import.c:2160 g10/import.c:2195
++#: g10/import.c:2161 g10/import.c:2196
  msgid "importing secret keys not allowed\n"
  msgstr "import av hemliga nycklar tillåts inte\n"
  
- #: g10/import.c:2184
++#: g10/import.c:2185
  #, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr "nyckel %s: hemlig nyckel med ogiltigt chiffer %d - hoppade över\n"
@@@ -3741,143 -2932,116 +3697,143 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2256
++#: g10/import.c:2257
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2311
++#: g10/import.c:2312
  #, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr "nyckel %s: ingen publik nyckel - kan inte verkställa spärrcertifikat\n"
  
- #: g10/import.c:2360
++#: g10/import.c:2361
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "nyckel %s: ogiltigt spärrcertifikat: %s - avvisat\n"
  
- #: g10/import.c:2393
++#: g10/import.c:2394
  #, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "nyckel %s: \"%s\" spärrcertifikat importerat\n"
  
- #: g10/import.c:2469
++#: g10/import.c:2470
  #, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "nyckel %s: ingen användaridentitet för signaturen\n"
  
  # fixme: I appended the %s -wk
- #: g10/import.c:2486
++#: g10/import.c:2487
  #, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr ""
  "nyckel %s: algoritmen för publika nycklar stöds inte för "
  "användaridentiteten  \"%s\"\n"
  
- #: g10/import.c:2488
++#: g10/import.c:2489
  #, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "nyckel %s: ogiltig självsignatur på användaridentiteten \"%s\"\n"
  
- #: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
++#: g10/import.c:2506 g10/import.c:2532 g10/import.c:2583
  #, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "nyckel %s: algoritmen för publika nycklar stöds inte\n"
  
- #: g10/import.c:2506
++#: g10/import.c:2507
  #, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "nyckel %s: ogiltig direkt nyckelsignatur\n"
  
- #: g10/import.c:2520
++#: g10/import.c:2521
  #, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "nyckel %s: ingen undernyckel för nyckelbindning\n"
  
- #: g10/import.c:2533
++#: g10/import.c:2534
  #, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "nyckel %s: ogiltig undernyckelbindning\n"
  
- #: g10/import.c:2549
++#: g10/import.c:2550
  #, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "nyckel %s: tog bort flera undernyckelbindningar\n"
  
- #: g10/import.c:2571
++#: g10/import.c:2572
  #, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "nyckel %s: ingen undernyckel för nyckelspärrning\n"
  
- #: g10/import.c:2584
++#: g10/import.c:2585
  #, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "nyckel %s: ogiltig spärr av undernyckel\n"
  
- #: g10/import.c:2599
++#: g10/import.c:2600
  #, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "nyckel %s: tog bort flera spärrar av undernyckel\n"
  
- #: g10/import.c:2641
++#: g10/import.c:2642
  #, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "nyckel %s: hoppade över användaridentiteten \"%s\"\n"
  
- #: g10/import.c:2665
++#: g10/import.c:2666
  #, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "nyckel %s: hoppade över undernyckel\n"
  
- #: g10/import.c:2694
++#: g10/import.c:2695
  #, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "nyckel %s: icke-exporterbar signatur (klass 0x%02X) - hoppade över\n"
  
- #: g10/import.c:2705
++#: g10/import.c:2706
  #, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "nyckel %s: spärrcertifikat på fel plats - hoppade över\n"
  
  # nyckeln eller certifikatet??
- #: g10/import.c:2723
++#: g10/import.c:2724
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "nyckel %s: ogiltigt spärrcertifikat: %s - hoppade över\n"
  
- #: g10/import.c:2737
++#: g10/import.c:2738
  #, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "nyckel %s: signatur på undernyckel på fel plats - hoppade över\n"
  
  # nyckeln eller klassen?
- #: g10/import.c:2745
++#: g10/import.c:2746
  #, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "nyckel %s: oväntad signaturklass  (0x%02X) - hoppade över\n"
  
- #: g10/import.c:2887
++#: g10/import.c:2888
  #, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr ""
  "nyckel %s: dubblett av användaridentiteten hittades - slog samman dem\n"
  
- #: g10/import.c:2951
++#: g10/import.c:2952
  #, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr "VARNING: nyckeln %s kan ha spärrats: hämtar spärrnyckeln %s\n"
  
- #: g10/import.c:2967
++#: g10/import.c:2968
  #, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr "VARNING: nyckeln %s kan ha spärrats: spärrnyckeln %s saknas.\n"
  
- #: g10/import.c:3031
++#: g10/import.c:3032
  #, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "nyckel %s: \"%s\" spärrcertifikat lades till\n"
  
- #: g10/import.c:3069
++#: g10/import.c:3070
  #, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "nyckel %s: lade till direkt nyckelsignatur\n"
@@@ -3918,52 -3076,42 +3874,52 @@@ msgstr "nyckelblockresurs \"%s\": %s\n
  msgid "error opening key DB: %s\n"
  msgstr "fel vid öppnandet av \"%s\": %s\n"
  
- #: g10/keydb.c:1782
++#: g10/keydb.c:1786
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "misslyckades med att återskapa nyckelringscache: %s\n"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[revocation]"
  msgstr "[spärr]"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[self-signature]"
  msgstr "[självsignatur]"
  
- #: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
++#: g10/keyedit.c:433 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: dirmngr/ldap-wrapper.c:694
  #, fuzzy, c-format
  #| msgid "error allocating enough memory: %s\n"
  msgid "error allocating memory: %s\n"
  msgstr "fel vid allokering av tillräckligt mycket minne: %s\n"
  
- #: g10/keyedit.c:629
++#: g10/keyedit.c:630
  #, fuzzy, c-format
  #| msgid "key %s: unsupported public key algorithm\n"
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr "nyckel %s: algoritmen för publika nycklar stöds inte\n"
  
- #: g10/keyedit.c:638
++#: g10/keyedit.c:639
  #, fuzzy, c-format
  #| msgid "card does not support digest algorithm %s\n"
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "kortet har inte stöd för sammandragsalgoritmen %s\n"
  
- #: g10/keyedit.c:800
++#: g10/keyedit.c:801
  #, fuzzy
  #| msgid "Good signature from"
  msgid " (reordered signatures follow)"
  msgstr "Korrekt signatur från"
  
- #: g10/keyedit.c:913
++#: g10/keyedit.c:914
  #, fuzzy, c-format
  #| msgid "skipped \"%s\": %s\n"
  msgid "key %s:\n"
  msgstr "hoppade över \"%s\": %s\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:917
  #, fuzzy, c-format
  #| msgid "User ID \"%s\": %d signature removed\n"
  msgid "%d duplicate signature removed\n"
@@@ -3971,7 -3119,6 +3927,7 @@@ msgid_plural "%d duplicate signatures r
  msgstr[0] "Användaridentitet \"%s\": %d signaturer borttagna\n"
  msgstr[1] "Användaridentitet \"%s\": %d signaturer borttagna\n"
  
- #: g10/keyedit.c:919 g10/keylist.c:480
++#: g10/keyedit.c:920 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
@@@ -3979,7 -3126,6 +3935,7 @@@ msgid_plural "%d signatures not checke
  msgstr[0] "1 signatur validerades inte eftersom nyckeln saknades\n"
  msgstr[1] "1 signatur validerades inte eftersom nyckeln saknades\n"
  
- #: g10/keyedit.c:923 g10/keylist.c:476
++#: g10/keyedit.c:924 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
@@@ -3987,7 -3133,6 +3943,7 @@@ msgid_plural "%d bad signatures\n
  msgstr[0] "%d felaktiga signaturer\n"
  msgstr[1] "%d felaktiga signaturer\n"
  
- #: g10/keyedit.c:927
++#: g10/keyedit.c:928
  #, fuzzy, c-format
  #| msgid "Good signature from"
  msgid "%d signature reordered\n"
@@@ -3995,14 -3140,12 +3951,14 @@@ msgid_plural "%d signatures reordered\n
  msgstr[0] "Korrekt signatur från"
  msgstr[1] "Korrekt signatur från"
  
- #: g10/keyedit.c:932
++#: g10/keyedit.c:933
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:992 g10/pkclist.c:274
++#: g10/keyedit.c:993 g10/pkclist.c:274
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
  "keys\n"
@@@ -4013,17 -3156,14 +3969,17 @@@ msgstr "
  "korrekt validera andra användares nycklar (genom att undersöka pass,\n"
  "undersöka fingeravtryck från olika källor, etc.)\n"
  
- #: g10/keyedit.c:996 g10/pkclist.c:286
++#: g10/keyedit.c:997 g10/pkclist.c:286
  #, c-format
  msgid "  %d = I trust marginally\n"
  msgstr " %d = Jag litar marginellt\n"
  
- #: g10/keyedit.c:997 g10/pkclist.c:288
++#: g10/keyedit.c:998 g10/pkclist.c:288
  #, c-format
  msgid "  %d = I trust fully\n"
  msgstr " %d = Jag litar fullständigt\n"
  
- #: g10/keyedit.c:1015
++#: g10/keyedit.c:1016
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
@@@ -4033,51 -3173,39 +3989,51 @@@ msgstr "
  "Ett djup större än 1 tillåter att nyckeln som du signerar kan\n"
  "skapa tillitssignaturer åt dig.\n"
  
- #: g10/keyedit.c:1032
++#: g10/keyedit.c:1033
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  "Ange en domän för att begränsa denna signatur. eller Enter för ingen.\n"
  
- #: g10/keyedit.c:1160
++#: g10/keyedit.c:1161
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1168
++#: g10/keyedit.c:1169
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "Användaridentiteten \"%s\" är spärrad."
  
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
- #: g10/keyedit.c:2246
++#: g10/keyedit.c:1178 g10/keyedit.c:1206 g10/keyedit.c:1233 g10/keyedit.c:1417
++#: g10/keyedit.c:2247
  msgid "Are you sure you still want to sign it? (y/N) "
  msgstr "Vill du verkligen fortfarande signera den? (j/N)"
  
- #: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
- #: g10/keyedit.c:2251 g10/keyedit.c:3177
++#: g10/keyedit.c:1192 g10/keyedit.c:1220 g10/keyedit.c:1247 g10/keyedit.c:1423
++#: g10/keyedit.c:2252 g10/keyedit.c:3178
  msgid "  Unable to sign.\n"
  msgstr "  Kan inte signera.\n"
  
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1197
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "Giltighetstiden för användaridentiteten \"%s\" har gått ut."
  
- #: g10/keyedit.c:1224
++#: g10/keyedit.c:1225
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "Användaridentiteten \"%s\" är inte självsignerad."
  
- #: g10/keyedit.c:1253
++#: g10/keyedit.c:1254
  #, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "Användaridentiteten \"%s\" är signerbar.  "
  
- #: g10/keyedit.c:1255
++#: g10/keyedit.c:1256
  msgid "Sign it? (y/N) "
  msgstr "Signera den? (j/N) "
  
- #: g10/keyedit.c:1282
++#: g10/keyedit.c:1283
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -4086,11 -3214,9 +4042,11 @@@ msgstr "
  "Självsignaturen på \"%s\"\n"
  "är en signatur av PGP 2.x-typ.\n"
  
- #: g10/keyedit.c:1291
++#: g10/keyedit.c:1292
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr "Vill du göra om den till en självsignatur av OpenPGP-typ? (j/N) "
  
- #: g10/keyedit.c:1304
++#: g10/keyedit.c:1305
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -4099,13 -3225,11 +4055,13 @@@ msgstr "
  "Giltighetstiden för din nuvarande signatur på \"%s\"\n"
  "har gått ut.\n"
  
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:1310
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr ""
  "Vill du skapa en ny signatur som ersätter den vars giltighetstid gått ut? (J/"
  "n) "
  
- #: g10/keyedit.c:1330
++#: g10/keyedit.c:1331
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -4114,44 -3238,35 +4070,44 @@@ msgstr "
  "Din nuvarande signatur på \"%s\"\n"
  "är en lokal signatur.\n"
  
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:1336
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr "Vill du ändra den till en fullständig exporterbar signatur? (j/N) "
  
- #: g10/keyedit.c:1355
++#: g10/keyedit.c:1356
  #, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "\"%s\" var redan lokalt signerad med nyckeln %s\n"
  
- #: g10/keyedit.c:1359
++#: g10/keyedit.c:1360
  #, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "\"%s\" var redan signerad av nyckeln %s\n"
  
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:1365
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "Vill du verkligen signera den igen ändå?(j/N)"
  
- #: g10/keyedit.c:1386
++#: g10/keyedit.c:1387
  #, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "Det finns inget att signera med nyckeln %s\n"
  
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1411
  msgid "This key has expired!"
  msgstr "Giltighetstiden för denna nyckel har gått ut!"
  
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1429
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "Denna nyckels giltighetstid går ut vid %s.\n"
  
- #: g10/keyedit.c:1434
++#: g10/keyedit.c:1435
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr ""
  "Vill du att giltighetstiden för signaturen ska upphöra vid samma tid? (J/n) "
  
- #: g10/keyedit.c:1475
++#: g10/keyedit.c:1476
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -4160,33 -3275,27 +4116,33 @@@ msgstr "
  "Hur noga har du kontrollerat att nyckeln du ska signera verkligen tillhör\n"
  "personen som nämns ovan?  Om du inte vet vad du ska svara, svara \"0\".\n"
  
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1481
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) Jag vill inte svara.%s\n"
  
- #: g10/keyedit.c:1482
++#: g10/keyedit.c:1483
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) Jag har inte kontrollerat alls.%s\n"
  
- #: g10/keyedit.c:1484
++#: g10/keyedit.c:1485
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) Jag har gjort viss kontroll.%s\n"
  
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:1488
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) Jag har gjort en noggrann kontroll.%s\n"
  
- #: g10/keyedit.c:1494
++#: g10/keyedit.c:1495
  #, fuzzy
  #| msgid "Your selection? (enter `?' for more information): "
  msgid "Your selection? (enter '?' for more information): "
  msgstr "Ditt val? (skriv \"?\" för mer information): "
  
- #: g10/keyedit.c:1521
++#: g10/keyedit.c:1522
  #, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -4195,230 -3304,176 +4151,230 @@@ msgstr "
  "Är du verkligen säker på att du vill signera denna nyckel\n"
  "med din nyckel \"%s\" (%s)\n"
  
- #: g10/keyedit.c:1529
++#: g10/keyedit.c:1530
  msgid "This will be a self-signature.\n"
  msgstr "Detta kommer att bli en självsignatur.\n"
  
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:1535
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr "VARNING: signaturen kommer inte att markeras som icke-exporterbar.\n"
  
- #: g10/keyedit.c:1541
++#: g10/keyedit.c:1542
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr "VARNING: signaturen kommer att markeras som icke-spärrbar.\n"
  
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1552
  msgid "The signature will be marked as non-exportable.\n"
  msgstr "Signaturen kommer att markeras som icke-exporterbar.\n"
  
- #: g10/keyedit.c:1558
++#: g10/keyedit.c:1559
  msgid "The signature will be marked as non-revocable.\n"
  msgstr "Signaturen kommer att märkas som icke möjlig att spärra.\n"
  
- #: g10/keyedit.c:1565
++#: g10/keyedit.c:1566
  msgid "I have not checked this key at all.\n"
  msgstr "Jag har inte kontrollerat denna nyckel alls.\n"
  
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:1571
  msgid "I have checked this key casually.\n"
  msgstr "Jag har gjort viss kontroll av denna nyckel.\n"
  
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:1576
  msgid "I have checked this key very carefully.\n"
  msgstr "Jag har gjort en noggrann kontroll av denna nyckel.\n"
  
- #: g10/keyedit.c:1587
++#: g10/keyedit.c:1588
  msgid "Really sign? (y/N) "
  msgstr "Verkligen signera? (j/N) "
  
- #: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
- #: g10/keyedit.c:6463 g10/sign.c:323
++#: g10/keyedit.c:1639 g10/keyedit.c:6308 g10/keyedit.c:6391 g10/keyedit.c:6500
++#: g10/keyedit.c:6562 g10/sign.c:325
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "signeringen misslyckades: %s\n"
  
- #: g10/keyedit.c:1725
++#: g10/keyedit.c:1726
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  "Nyckeln har endast en stump eller nyckelobjekt på kortet - ingen lösenfras "
  "att ändra.\n"
  
- #: g10/keyedit.c:1755
++#: g10/keyedit.c:1756
  #, fuzzy, c-format
  #| msgid "error creating passphrase: %s\n"
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "fel när lösenfras skapades: %s\n"
  
- #: g10/keyedit.c:1869
++#: g10/keyedit.c:1870
  msgid "save and quit"
  msgstr "spara och avsluta"
  
- #: g10/keyedit.c:1872
++#: g10/keyedit.c:1873
  msgid "show key fingerprint"
  msgstr "visa nyckelns fingeravtryck"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1874
  #, fuzzy
  #| msgid "Enter the keygrip: "
  msgid "show the keygrip"
  msgstr "Ange nyckelhashen: "
  
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1875
  msgid "list key and user IDs"
  msgstr "lista nycklar och användaridentiteter"
  
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1877
  msgid "select user ID N"
  msgstr "välj användaridentiteten N"
  
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1878
  msgid "select subkey N"
  msgstr "välj undernyckel N"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1879
  msgid "check signatures"
  msgstr "kontrollera signaturer"
  
- #: g10/keyedit.c:1884
++#: g10/keyedit.c:1885
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr ""
  "signera valda användaridentiteter [* se nedan för relaterade kommandon]"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1890
  msgid "sign selected user IDs locally"
  msgstr "signera valda användaridentiteter lokalt"
  
- #: g10/keyedit.c:1890
++#: g10/keyedit.c:1891
  msgid "sign selected user IDs with a trust signature"
  msgstr "signera valda användaridentiteter med en tillitssignatur"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1893
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr "signera valda användaridentiteter med en icke-spärrbar signatur"
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1895
  msgid "add a user ID"
  msgstr "lägg till en användaridentitet"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1897
  msgid "add a photo ID"
  msgstr "lägg till ett foto-id"
  
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1898
  msgid "delete selected user IDs"
  msgstr "ta bort valda användaridentiteter"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1901
  msgid "add a subkey"
  msgstr "lägg till en undernyckel"
  
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1904
  msgid "add a key to a smartcard"
  msgstr "lägg till en nyckel till ett smartkort"
  
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1906
  msgid "move a key to a smartcard"
  msgstr "flytta en nyckel till ett smartkort"
  
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1908
  msgid "move a backup key to a smartcard"
  msgstr "flytta en nyckelkopia till ett smartkort"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1910
  msgid "delete selected subkeys"
  msgstr "ta bort valda undernycklar"
  
- #: g10/keyedit.c:1911
++#: g10/keyedit.c:1912
  msgid "add a revocation key"
  msgstr "lägg till en spärrnyckel"
  
- #: g10/keyedit.c:1913
++#: g10/keyedit.c:1914
  msgid "delete signatures from the selected user IDs"
  msgstr "ta bort signaturer från valda användaridentiteter"
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1916
  msgid "change the expiration date for the key or selected subkeys"
  msgstr "ändra utgångsdatumet för nyckeln eller valda undernycklar"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1918
  msgid "flag the selected user ID as primary"
  msgstr "flagga vald användaridentitet som primär"
  
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1921
  msgid "list preferences (expert)"
  msgstr "lista inställningar (expertläge)"
  
- #: g10/keyedit.c:1921
++#: g10/keyedit.c:1922
  msgid "list preferences (verbose)"
  msgstr "lista inställningar (utförligt)"
  
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:1924
  msgid "set preference list for the selected user IDs"
  msgstr "ställ in inställningslista för valda användaridentiteter"
  
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1927
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr ""
  "ställ in url till föredragen nyckelserver för valda användaridentiteter"
  
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1929
  msgid "set a notation for the selected user IDs"
  msgstr "ställ in en notation för valda användaridentiteter"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1931
  msgid "change the passphrase"
  msgstr "ändra lösenfrasen"
  
  # originalet borde ha ett value
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1934
  msgid "change the ownertrust"
  msgstr "ändra ägartillitsvärdet"
  
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1937
  msgid "revoke signatures on the selected user IDs"
  msgstr "spärra signaturer på valda användaridentiteter"
  
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1939
  msgid "revoke selected user IDs"
  msgstr "spärra valda användaridentiteter"
  
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1942
  msgid "revoke key or selected subkeys"
  msgstr "spärra nyckel eller valda undernycklar"
  
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1944
  msgid "enable key"
  msgstr "aktivera nyckel"
  
- #: g10/keyedit.c:1944
++#: g10/keyedit.c:1945
  msgid "disable key"
  msgstr "inaktivera nyckel"
  
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1947
  msgid "show selected photo IDs"
  msgstr "visa valda foto-id:n"
  
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1949
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  "komprimera oanvändbara användaridentiteter och ta bort oanvändbara "
  "signaturer från nyckeln"
  
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:1951
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  "komprimera oanvändbara användaridentiteter och ta bort alla signaturer från "
  "nyckeln"
  
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2063
  msgid "Secret key is available.\n"
  msgstr "Den hemliga nyckeln finns tillgänglig.\n"
  
- #: g10/keyedit.c:2162
++#: g10/keyedit.c:2163
  msgid "Need the secret key to do this.\n"
  msgstr "Den hemliga nyckeln behövs för att göra detta.\n"
  
- #: g10/keyedit.c:2183
++#: g10/keyedit.c:2184
  #, fuzzy
  #| msgid ""
  #| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4438,273 -3493,219 +4394,279 @@@ msgstr "
  "signaturer\n"
  "  (nrsign), eller en kombination av dessa (ltsign, tnrsign, etc.).\n"
  
- #: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
++#: g10/keyedit.c:2240 g10/keyedit.c:3178 g10/keyedit.c:3317 g10/keyedit.c:3379
  msgid "Key is revoked."
  msgstr "Nyckeln är spärrad."
  
- #: g10/keyedit.c:2262
++#: g10/keyedit.c:2263
  msgid "Really sign all user IDs? (y/N) "
  msgstr "Verkligen signera alla användaridentiteter? (j/N) "
  
- #: g10/keyedit.c:2266
++#: g10/keyedit.c:2267
  #, fuzzy
  #| msgid "Really sign all user IDs? (y/N) "
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "Verkligen signera alla användaridentiteter? (j/N) "
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2275
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Tips: Välj de användaridentiteter som du vill signera\n"
  
- #: g10/keyedit.c:2285
++#: g10/keyedit.c:2286
  #, fuzzy, c-format
  #| msgid "Unknown signature type `%s'\n"
  msgid "Unknown signature type '%s'\n"
  msgstr "Okänd signaturtyp \"%s\"\n"
  
- #: g10/keyedit.c:2309
++#: g10/keyedit.c:2310
  #, 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/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
++#: g10/keyedit.c:2332 g10/keyedit.c:2356 g10/keyedit.c:2550
  msgid "You must select at least one user ID.\n"
  msgstr "Du måste välja åtminstone en användaridentitet.\n"
  
- #: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
++#: g10/keyedit.c:2334 g10/keyedit.c:2358 g10/keyedit.c:2512 g10/keyedit.c:2552
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2336
++#: g10/keyedit.c:2337
  msgid "You can't delete the last user ID!\n"
  msgstr "Du kan inte ta bort den sista användaridentiteten!\n"
  
- #: g10/keyedit.c:2339
++#: g10/keyedit.c:2340
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "Verkligen ta bort alla valda användaridentiteter? (j/N) "
  
- #: g10/keyedit.c:2340
++#: g10/keyedit.c:2341
  msgid "Really remove this user ID? (y/N) "
  msgstr "Verkligen ta bort denna användaridentitet? (j/N) "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2397
++#: g10/keyedit.c:2398
  msgid "Really move the primary key? (y/N) "
  msgstr "Verkligen flytta den primära nyckeln? (j/N) "
  
- #: g10/keyedit.c:2409 g10/keyedit.c:4866
++#: g10/keyedit.c:2410 g10/keyedit.c:4964
  msgid "You must select exactly one key.\n"
  msgstr "Du måste välja exakt en nyckel.\n"
  
- #: g10/keyedit.c:2436
++#: g10/keyedit.c:2437
  msgid "Command expects a filename argument\n"
  msgstr "Kommandot förväntar ett filnamnsargument\n"
  
- #: g10/keyedit.c:2457
++#: g10/keyedit.c:2458
  #, fuzzy, c-format
  #| msgid "Can't open `%s': %s\n"
  msgid "Can't open '%s': %s\n"
  msgstr "Kan inte öppna \"%s\": %s\n"
  
- #: g10/keyedit.c:2474
++#: g10/keyedit.c:2475
  #, fuzzy, c-format
  #| msgid "Error reading backup key from `%s': %s\n"
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "Fel vid läsning av säkerhetskopierad nyckel från \"%s\": %s\n"
  
- #: g10/keyedit.c:2509
++#: g10/keyedit.c:2510
  msgid "You must select at least one key.\n"
  msgstr "Du måste välja åtminstone en nyckel.\n"
  
- #: g10/keyedit.c:2515
++#: g10/keyedit.c:2516
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "Vill du verkligen ta bort de valda nycklarna? (j/N) "
  
- #: g10/keyedit.c:2517
++#: g10/keyedit.c:2518
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "Vill du verkligen ta bort denna nyckel? (j/N) "
  
- #: g10/keyedit.c:2555
++#: g10/keyedit.c:2556
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr "Verkligen spärra alla valda användaridentiteter? (j/N) "
  
- #: g10/keyedit.c:2556
++#: g10/keyedit.c:2557
  msgid "Really revoke this user ID? (y/N) "
  msgstr "Verkligen spärra denna användaridentitet? (j/N) "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2575
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "Vill du verkligen spärra hela nyckeln? (j/N) "
  
- #: g10/keyedit.c:2585
++#: g10/keyedit.c:2586
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "Vill du verkligen spärra de valda undernycklarna? (j/N) "
  
- #: g10/keyedit.c:2587
++#: g10/keyedit.c:2588
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "Vill du verkligen spärra denna undernyckel? (j/N) "
  
- #: g10/keyedit.c:2645
++#: g10/keyedit.c:2646
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  "Ägartillit får inte ställas in när en tillitsdatabas används som användaren "
  "tillhandahåller\n"
  
- #: g10/keyedit.c:2690
++#: g10/keyedit.c:2691
  msgid "Set preference list to:\n"
  msgstr "Ställ in inställningslista till:\n"
  
- #: g10/keyedit.c:2697
++#: g10/keyedit.c:2698
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr ""
  "Vill du verkligen uppdatera inställningarna för valda användaridentiteter? "
  "(j/N) "
  
- #: g10/keyedit.c:2699
++#: g10/keyedit.c:2700
  msgid "Really update the preferences? (y/N) "
  msgstr "Vill du verkligen uppdatera inställningarna? (j/N) "
  
- #: g10/keyedit.c:2773
++#: g10/keyedit.c:2774
  msgid "Save changes? (y/N) "
  msgstr "Spara ändringar? (j/N) "
  
- #: g10/keyedit.c:2777
++#: g10/keyedit.c:2778
  msgid "Quit without saving? (y/N) "
  msgstr "Avsluta utan att spara? (j/N) "
  
- #: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
- #: g10/keyedit.c:3267 g10/keyedit.c:3332
++#: g10/keyedit.c:2789 g10/keyedit.c:2799 g10/keyedit.c:2943 g10/keyedit.c:3046
++#: g10/keyedit.c:3268 g10/keyedit.c:3333 g10/keyedit.c:3409
  #, c-format
  msgid "update failed: %s\n"
  msgstr "uppdateringen misslyckades: %s\n"
  
- #: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
++#: g10/keyedit.c:2805 g10/keyedit.c:3273 g10/keyedit.c:3338 g10/keyedit.c:3416
  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:3038
++#: g10/keyedit.c:3039
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
  msgstr "Nyckelgenereringen misslyckades: %s\n"
  
- #: g10/keyedit.c:3083
++#: g10/keyedit.c:3084
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "ogiltigt fingeravtryck"
  
- #: g10/keyedit.c:3112
++#: g10/keyedit.c:3113
  #, 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:3248 g10/keyedit.c:3251
++#: g10/keyedit.c:3249 g10/keyedit.c:3252
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
  msgstr "ogiltigt värde\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  #, fuzzy
  #| msgid "No such user ID.\n"
  msgid "No matching user IDs."
  msgstr "Ingen sådan användaridentitet.\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  #, 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:3427
++#: g10/keyedit.c:3388
+ #, 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:3508
  msgid "Digest: "
  msgstr "Sammandrag: "
  
- #: g10/keyedit.c:3484
++#: g10/keyedit.c:3565
  msgid "Features: "
  msgstr "Funktioner: "
  
- #: g10/keyedit.c:3495
++#: g10/keyedit.c:3576
  msgid "Keyserver no-modify"
  msgstr "Nyckelserver no-modify"
  
- #: g10/keyedit.c:3510 g10/keylist.c:377
++#: g10/keyedit.c:3591 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr "Föredragen nyckelserver: "
  
- #: g10/keyedit.c:3518 g10/keyedit.c:3519
++#: g10/keyedit.c:3599 g10/keyedit.c:3600
  msgid "Notations: "
  msgstr "Notationer: "
  
- #: g10/keyedit.c:3764
++#: g10/keyedit.c:3845
  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:3836
++#: g10/keyedit.c:3917
  #, 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:3860
++#: g10/keyedit.c:3941
  #, 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:3866
++#: g10/keyedit.c:3947
  msgid "(sensitive)"
  msgstr "(känsligt)"
  
- #: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3989 g10/keyedit.c:4131 g10/keylist.c:262 g10/keyserver.c:538
  #, c-format
  msgid "created: %s"
  msgstr "skapat: %s"
  
- #: g10/keyedit.c:3911 g10/keylist.c:1852
++#: g10/keyedit.c:3992 g10/keylist.c:1852
  #, c-format
  msgid "revoked: %s"
  msgstr "spärrad: %s"
  
- #: g10/keyedit.c:3913 g10/keylist.c:1858
++#: g10/keyedit.c:3994 g10/keylist.c:1858
  #, c-format
  msgid "expired: %s"
  msgstr "utgånget: %s"
  
- #: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyedit.c:3996 g10/keyedit.c:4133 g10/keylist.c:264 g10/keylist.c:1864
 +#: g10/keyserver.c:544
  #, c-format
  msgid "expires: %s"
  msgstr "går ut: %s"
  
- #: g10/keyedit.c:3917
++#: g10/keyedit.c:3998
  #, c-format
  msgid "usage: %s"
  msgstr "användning: %s"
  
- #: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
++#: g10/keyedit.c:4006 g10/keyedit.c:4026 g10/keylist.c:267
  msgid "card-no: "
  msgstr "kortnummer: "
  
- #: g10/keyedit.c:3984
++#: g10/keyedit.c:4065
  #, c-format
  msgid "trust: %s"
  msgstr "tillit: %s"
  
- #: g10/keyedit.c:3988
++#: g10/keyedit.c:4069
  #, c-format
  msgid "validity: %s"
  msgstr "giltighet: %s"
  
- #: g10/keyedit.c:3995
++#: g10/keyedit.c:4076
  msgid "This key has been disabled"
  msgstr "Denna nyckel har stängts av"
  
- #: g10/keyedit.c:4013
++#: g10/keyedit.c:4094
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4712,18 -3713,12 +4674,18 @@@ msgstr "
  "Observera! Den visade nyckelgiltigheten kan vara felaktig\n"
  "såvida inte du startar om programmet.\n"
  
- #: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
- #: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: g10/keyedit.c:4150 g10/keyedit.c:4581 g10/keyserver.c:548
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:712
 +#: dirmngr/ocsp.c:703
  msgid "revoked"
  msgstr "spärrad"
  
- #: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
- #: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4152 g10/keyedit.c:4583 g10/keyserver.c:552
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:714
  msgid "expired"
  msgstr "utgånget"
  
- #: g10/keyedit.c:4188
++#: g10/keyedit.c:4269
  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"
@@@ -4732,17 -3727,14 +4694,17 @@@ msgstr "
  "Detta kommando kan göra att en annan användaridentitet antas\n"
  "vara den primära identiteten.\n"
  
- #: g10/keyedit.c:4240
++#: g10/keyedit.c:4321
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr ""
  
- #: g10/keyedit.c:4241
++#: g10/keyedit.c:4322
  #, fuzzy
  #| 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:4300
++#: g10/keyedit.c:4381
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4751,36 -3743,28 +4713,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:4305 g10/keyedit.c:4595
++#: g10/keyedit.c:4386 g10/keyedit.c:4676
  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:4311
++#: g10/keyedit.c:4392
  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:4326 g10/keygen.c:2697
++#: g10/keyedit.c:4407 g10/keygen.c:2719
  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:4428
++#: g10/keyedit.c:4509
  msgid "Delete this good signature? (y/N/q)"
  msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
  
- #: g10/keyedit.c:4438
++#: g10/keyedit.c:4519
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
  
- #: g10/keyedit.c:4442
++#: g10/keyedit.c:4523
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "Vill du radera denna okända signatur? (j/N/a)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4530
  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:4465
++#: g10/keyedit.c:4546
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
@@@ -4788,20 -3772,16 +4750,20 @@@ msgid_plural "Deleted %d signatures.\n
  msgstr[0] "Raderade %d signatur.\n"
  msgstr[1] "Raderade %d signatur.\n"
  
- #: g10/keyedit.c:4469
++#: g10/keyedit.c:4550
  msgid "Nothing deleted.\n"
  msgstr "Ingenting raderat.\n"
  
- #: g10/keyedit.c:4504 g10/trust.c:693
++#: g10/keyedit.c:4585 g10/trust.c:716
  msgid "invalid"
  msgstr "ogiltigt"
  
- #: g10/keyedit.c:4506
++#: g10/keyedit.c:4587
  #, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "Användaridentiteten \"%s\" komprimerad: %s\n"
  
- #: g10/keyedit.c:4512
++#: g10/keyedit.c:4593
  #, fuzzy, c-format
  #| msgid "User ID \"%s\": %d signature removed\n"
  msgid "User ID \"%s\": %d signature removed\n"
@@@ -4809,17 -3789,14 +4771,17 @@@ msgid_plural "User ID \"%s\": %d signat
  msgstr[0] "Användaridentitet \"%s\": %d signaturer borttagna\n"
  msgstr[1] "Användaridentitet \"%s\": %d signaturer borttagna\n"
  
- #: g10/keyedit.c:4520
++#: g10/keyedit.c:4601
  #, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "Användaridentitet \"%s\": redan minimerad\n"
  
- #: g10/keyedit.c:4521
++#: g10/keyedit.c:4602
  #, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "Användaridentitet \"%s\": redan rensad\n"
  
- #: g10/keyedit.c:4590
++#: g10/keyedit.c:4671
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4829,39 -3806,31 +4791,39 @@@ msgstr "
  "denna\n"
  "         nyckel inte användas i vissa versioner av PGP.\n"
  
- #: g10/keyedit.c:4601
++#: g10/keyedit.c:4682
  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:4618
++#: g10/keyedit.c:4699
  msgid "Enter the user ID of the designated revoker: "
  msgstr "Ange användaridentiteten för spärrnyckeln: "
  
- #: g10/keyedit.c:4643
++#: g10/keyedit.c:4724
  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:4658
++#: g10/keyedit.c:4739
  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:4680
++#: g10/keyedit.c:4761
  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:4698
++#: g10/keyedit.c:4779
  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:4704
++#: g10/keyedit.c:4785
  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:4755
++#: g10/keyedit.c:4848
  #, fuzzy
  #| msgid ""
  #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4871,238 -3840,187 +4833,238 @@@ 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:4760
++#: g10/keyedit.c:4853
  msgid "Changing expiration time for a subkey.\n"
  msgstr "Ändrar utgångstid för en undernyckel.\n"
  
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:4856
  msgid "Changing expiration time for the primary key.\n"
  msgstr "Ändrar giltighetstid för den primära nyckeln.\n"
  
- #: g10/keyedit.c:4814
++#: g10/keyedit.c:4910
  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"
  
  # Vad betyder det?
- #: g10/keyedit.c:4987
++#: g10/keyedit.c:5085
  #, c-format
  msgid "signing subkey %s is already cross-certified\n"
  msgstr "signeringsundernyckeln %s är redan korscertifierad\n"
  
- #: g10/keyedit.c:4993
++#: g10/keyedit.c:5091
  #, 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:5108
++#: g10/keyedit.c:5206
  msgid "Please select exactly one user ID.\n"
  msgstr "Välj endast en användaridentitet.\n"
  
- #: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
++#: g10/keyedit.c:5247 g10/keyedit.c:5361 g10/keyedit.c:5474 g10/keyedit.c:5611
  #, 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:5320
++#: g10/keyedit.c:5418
  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:5399
++#: g10/keyedit.c:5497
  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:5400
++#: g10/keyedit.c:5498
  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:5459
++#: g10/keyedit.c:5557
  msgid "Enter the notation: "
  msgstr "Ange notationen: "
  
- #: g10/keyedit.c:5606
++#: g10/keyedit.c:5704
  msgid "Proceed? (y/N) "
  msgstr "Fortsätt? (j/N) "
  
- #: g10/keyedit.c:5676
++#: g10/keyedit.c:5774
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "Ingen användaridentitet med indexet %d\n"
  
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5836
  #, c-format
  msgid "No user ID with hash %s\n"
  msgstr "Ingen användaridentitet med hashen %s\n"
  
- #: g10/keyedit.c:5839
++#: g10/keyedit.c:5937
  #, 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:5861
++#: g10/keyedit.c:5959
  #, c-format
  msgid "No subkey with index %d\n"
  msgstr "Ingen undernyckel med indexet %d\n"
  
- #: g10/keyedit.c:6002
++#: g10/keyedit.c:6100
  #, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "användaridentitet: \"%s\"\n"
  
- #: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
++#: g10/keyedit.c:6103 g10/keyedit.c:6205 g10/keyedit.c:6253
  #, 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:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
++#: g10/keyedit.c:6105 g10/keyedit.c:6207 g10/keyedit.c:6255
  msgid " (non-exportable)"
  msgstr "  (icke exporterbar)"
  
- #: g10/keyedit.c:6011
++#: g10/keyedit.c:6109
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "Denna signatur gick ut den %s.\n"
  
  # nyckel? signatur?
- #: g10/keyedit.c:6016
++#: g10/keyedit.c:6114
  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:6021
++#: g10/keyedit.c:6119
  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:6075
++#: g10/keyedit.c:6173
  msgid "Not signed by you.\n"
  msgstr "Inte signerad av dig.\n"
  
- #: g10/keyedit.c:6081
++#: g10/keyedit.c:6179
  #, 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:6110
++#: g10/keyedit.c:6208
  msgid " (non-revocable)"
  msgstr " (inte spärrbar)"
  
- #: g10/keyedit.c:6117
++#: g10/keyedit.c:6215
  #, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "spärrad av din nyckel %s den %s\n"
  
- #: g10/keyedit.c:6142
++#: g10/keyedit.c:6240
  msgid "You are about to revoke these signatures:\n"
  msgstr "Du är på väg att spärra dessa signaturer:\n"
  
- #: g10/keyedit.c:6165
++#: g10/keyedit.c:6263
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "Vill du verkligen skapa spärrcertifikatet? (j/N) "
  
- #: g10/keyedit.c:6198
++#: g10/keyedit.c:6296
  msgid "no secret key\n"
  msgstr "ingen hemlig nyckel\n"
  
- #: g10/keyedit.c:6246
++#: g10/keyedit.c:6344
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6256
++#: g10/keyedit.c:6354
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "användaridentiteten \"%s\" är redan spärrad\n"
  
- #: g10/keyedit.c:6273
++#: g10/keyedit.c:6371
  #, 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:6386
++#: g10/keyedit.c:6485
  #, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "Nyckeln %s är redan spärrad.\n"
  
- #: g10/keyedit.c:6448
++#: g10/keyedit.c:6547
  #, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "Undernyckeln %s är redan spärrad.\n"
  
- #: g10/keyedit.c:6545
++#: g10/keyedit.c:6644
  #, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr "Visar %s foto-id med storleken %ld för nyckeln %s (uid %d)\n"
  
- #: g10/keygen.c:305
++#: g10/keygen.c:316
  #, fuzzy, c-format
  #| msgid "preference `%s' duplicated\n"
  msgid "preference '%s' duplicated\n"
  msgstr "inställningen \"%s\" förekommer flera gånger\n"
  
- #: g10/keygen.c:312
++#: g10/keygen.c:323
  msgid "too many cipher preferences\n"
  msgstr "för många chifferinställningar\n"
  
- #: g10/keygen.c:314
++#: g10/keygen.c:325
  msgid "too many digest preferences\n"
  msgstr "för många sammandragsinställningar\n"
  
- #: g10/keygen.c:316
++#: g10/keygen.c:327
  msgid "too many compression preferences\n"
  msgstr "för många komprimeringsinställningar\n"
  
- #: g10/keygen.c:457
++#: g10/keygen.c:468
  #, fuzzy, c-format
  #| msgid "invalid item `%s' in preference string\n"
  msgid "invalid item '%s' in preference string\n"
  msgstr "ogiltig post \"%s\" i inställningssträngen\n"
  
- #: g10/keygen.c:936
++#: g10/keygen.c:947
  msgid "writing direct signature\n"
  msgstr "skriver direkt signatur\n"
  
- #: g10/keygen.c:982
++#: g10/keygen.c:993
  msgid "writing self signature\n"
  msgstr "skriver självsignatur\n"
  
- #: g10/keygen.c:1038
++#: g10/keygen.c:1049
  msgid "writing key binding signature\n"
  msgstr "skriver signatur knuten till nyckeln\n"
  
- #: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
- #: g10/keygen.c:1610 g10/keygen.c:1615
++#: g10/keygen.c:1413 g10/keygen.c:1418 g10/keygen.c:1470 g10/keygen.c:1475
++#: g10/keygen.c:1622 g10/keygen.c:1627
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "ogiltig nyckelstorlek; använder %u bitar\n"
  
- #: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
++#: g10/keygen.c:1424 g10/keygen.c:1481 g10/keygen.c:1489 g10/keygen.c:1633
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "nyckelstorleken avrundad uppåt till %u bitar\n"
  
- #: g10/keygen.c:1503
++#: g10/keygen.c:1515
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  "VARNING: vissa OpenPGP-program kan inte hantera en DSA-nyckel med den här "
  "sammandragsstorleken\n"
  
- #: g10/keygen.c:1677
++#: g10/keygen.c:1689
  msgid "Sign"
  msgstr "Signera"
  
- #: g10/keygen.c:1680
++#: g10/keygen.c:1692
  msgid "Certify"
  msgstr "Certifiera"
  
- #: g10/keygen.c:1683
++#: g10/keygen.c:1695
  msgid "Encrypt"
  msgstr "Kryptera"
  
- #: g10/keygen.c:1686
++#: g10/keygen.c:1698
  msgid "Authenticate"
  msgstr "Autentisera"
  
@@@ -5120,159 -4038,128 +5082,159 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1705
++#: g10/keygen.c:1717
  msgid "SsEeAaQq"
  msgstr "SsKkAaQq"
  
- #: g10/keygen.c:1732
++#: g10/keygen.c:1744
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "Möjliga åtgärder för en %s-nyckel: "
  
- #: g10/keygen.c:1738
++#: g10/keygen.c:1750
  msgid "Current allowed actions: "
  msgstr "För närvarande tillåtna åtgärder: "
  
- #: g10/keygen.c:1743
++#: g10/keygen.c:1755
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) Växla signeringsförmågan\n"
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) Växla krypteringsförmågan\n"
  
- #: g10/keygen.c:1749
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) Växla autentiseringsförmågan\n"
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) Färdig\n"
  
- #: g10/keygen.c:1881 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1893 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Välj vilken typ av nyckel du vill ha:\n"
  
- #: g10/keygen.c:1885
++#: g10/keygen.c:1897
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) RSA och RSA (standard)\n"
  
- #: g10/keygen.c:1889
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA och Elgamal\n"
  
- #: g10/keygen.c:1892
++#: g10/keygen.c:1904
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (endast signering)\n"
  
- #: g10/keygen.c:1894
++#: g10/keygen.c:1906
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (endast signering)\n"
  
- #: g10/keygen.c:1900
++#: g10/keygen.c:1912
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) Elgamal (endast kryptering)\n"
  
- #: g10/keygen.c:1902
++#: g10/keygen.c:1914
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (endast kryptering)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1920
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (ställ in dina egna förmågor)\n"
  
- #: g10/keygen.c:1910
++#: g10/keygen.c:1922
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (ställ in dina egna förmågor)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1928
  #, fuzzy, c-format
  #| msgid "   (%d) DSA and Elgamal\n"
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA och Elgamal\n"
  
- #: g10/keygen.c:1918
++#: g10/keygen.c:1930
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (endast signering)\n"
  
- #: g10/keygen.c:1920
++#: g10/keygen.c:1932
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (set your own capabilities)\n"
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) DSA (ställ in dina egna förmågor)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1934
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) RSA (endast kryptering)\n"
  
- #: g10/keygen.c:1926
++#: g10/keygen.c:1938
  #, fuzzy, c-format
  #| msgid "   (%d) Existing key\n"
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) Befintlig nyckel\n"
  
- #: g10/keygen.c:2022 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:206
  msgid "Enter the keygrip: "
  msgstr "Ange nyckelhashen: "
  
- #: g10/keygen.c:2035 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2047 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr "Inte en giltig nyckelhash (förväntade 40 hexadecimala siffror)\n"
  
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2049 sm/certreqgen-ui.c:216
  msgid "No key with this keygrip\n"
  msgstr "Ingen nyckel med denna nyckelhash\n"
  
- #: g10/keygen.c:2111 g10/keygen.c:2125
++#: g10/keygen.c:2133 g10/keygen.c:2147
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
  msgstr "avrundade uppåt till %u bitar\n"
  
- #: g10/keygen.c:2166
++#: g10/keygen.c:2188
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr "%s-nycklar kan vara mellan %u och %u bitar långa.\n"
  
- #: g10/keygen.c:2174
++#: g10/keygen.c:2196
  #, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Vilken nyckelstorlek vill du använda för undernyckeln? (%u) "
  
- #: g10/keygen.c:2177 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2199 sm/certreqgen-ui.c:183
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Vilken nyckelstorlek vill du ha? (%u) "
  
- #: g10/keygen.c:2191 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2213 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Den efterfrågade nyckelstorleken är %u bitar\n"
  
- #: g10/keygen.c:2237
++#: g10/keygen.c:2259
  #, fuzzy
  #| msgid "Please select what kind of key you want:\n"
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Välj vilken typ av nyckel du vill ha:\n"
  
  # borde kolla upp möjligheterna i källkoden att använda v m å istället för wmy
- #: g10/keygen.c:2409
++#: g10/keygen.c:2431
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5289,7 -4176,6 +5251,7 @@@ msgstr "
  "      <n>y = nyckeln blir ogiltig efter n år\n"
  
  # borde kolla upp möjligheterna i källkoden att använda v m å istället för wmy
- #: g10/keygen.c:2420
++#: g10/keygen.c:2442
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5305,38 -4191,30 +5267,38 @@@ msgstr "
  "      <n>m = signaturen blir ogiltig efter n månader\n"
  "      <n>y = signaturen blir ogiltig efter n år\n"
  
- #: g10/keygen.c:2443
++#: g10/keygen.c:2465
  msgid "Key is valid for? (0) "
  msgstr "För hur lång tid ska nyckeln vara giltig? (0) "
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2470
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Signaturen är giltig hur länge? (%s) "
  
- #: g10/keygen.c:2461 g10/keygen.c:2486
++#: g10/keygen.c:2483 g10/keygen.c:2508
  msgid "invalid value\n"
  msgstr "ogiltigt värde\n"
  
- #: g10/keygen.c:2468
++#: g10/keygen.c:2490
  msgid "Key does not expire at all\n"
  msgstr "Nyckeln går aldrig ut\n"
  
- #: g10/keygen.c:2469
++#: g10/keygen.c:2491
  msgid "Signature does not expire at all\n"
  msgstr "Signaturen går aldrig ut\n"
  
- #: g10/keygen.c:2474
++#: g10/keygen.c:2496
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "Nyckeln går ut %s\n"
  
- #: g10/keygen.c:2475
++#: g10/keygen.c:2497
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "Signaturen går ut %s\n"
  
- #: g10/keygen.c:2479
++#: g10/keygen.c:2501
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5344,11 -4222,9 +5306,11 @@@ msgstr "
  "Ditt system kan inte visa datum senare än år 2038.\n"
  "Datum fram till år 2106 kommer dock att hanteras korrekt.\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2514
  msgid "Is this correct? (y/N) "
  msgstr "Stämmer detta? (j/N) "
  
- #: g10/keygen.c:2560
++#: g10/keygen.c:2582
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5363,7 -4239,6 +5325,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2575
++#: g10/keygen.c:2597
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -5381,50 -4256,39 +5343,50 @@@ msgstr "
  "    \"Gustav Vasa (Brutal kung) <gustav at trekronor.se>\"\n"
  "\n"
  
- #: g10/keygen.c:2594
++#: g10/keygen.c:2616
  msgid "Real name: "
  msgstr "Namn: "
  
- #: g10/keygen.c:2603
++#: g10/keygen.c:2625
  msgid "Invalid character in name\n"
  msgstr "Ogiltigt tecken i namnet\n"
  
- #: g10/keygen.c:2604
++#: g10/keygen.c:2626
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2608
++#: g10/keygen.c:2630
  msgid "Name may not start with a digit\n"
  msgstr "Namnet får inte börja med en siffra\n"
  
- #: g10/keygen.c:2611
++#: g10/keygen.c:2633
  msgid "Name must be at least 5 characters long\n"
  msgstr "Namnet måste vara åtminstone 5 tecken långt\n"
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2643
  msgid "Email address: "
  msgstr "E-postadress: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2649
  msgid "Not a valid email address\n"
  msgstr "E-postadressen är ogiltig\n"
  
- #: g10/keygen.c:2636
++#: g10/keygen.c:2658
  msgid "Comment: "
  msgstr "Kommentar: "
  
- #: g10/keygen.c:2642
++#: g10/keygen.c:2664
  msgid "Invalid character in comment\n"
  msgstr "Ogiltigt tecken i kommentaren\n"
  
- #: g10/keygen.c:2678
++#: g10/keygen.c:2700
  #, fuzzy, c-format
  #| msgid "You are using the `%s' character set.\n"
  msgid "You are using the '%s' character set.\n"
  msgstr "Du använder teckentabellen \"%s\"\n"
  
- #: g10/keygen.c:2684
++#: g10/keygen.c:2706
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5435,7 -4299,6 +5397,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2689
++#: g10/keygen.c:2711
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr "Ange inte e-postadressen som namn eller kommentar\n"
  
@@@ -5451,35 -4314,28 +5413,35 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2714
++#: g10/keygen.c:2736
  msgid "NnCcEeOoQq"
  msgstr "NnKkEeOoAa"
  
- #: g10/keygen.c:2724
++#: g10/keygen.c:2746
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (A)vsluta? "
  
- #: g10/keygen.c:2725
++#: g10/keygen.c:2747
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (O)k/(A)vsluta? "
  
- #: g10/keygen.c:2730
++#: g10/keygen.c:2752
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (A)vsluta? "
  
- #: g10/keygen.c:2731
++#: g10/keygen.c:2753
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (O)k/(A)vsluta? "
  
- #: g10/keygen.c:2750
++#: g10/keygen.c:2772
  msgid "Please correct the error first\n"
  msgstr "Rätta först felet\n"
  
- #: g10/keygen.c:2796
++#: g10/keygen.c:2818
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5491,13 -4347,10 +5453,13 @@@ msgstr "
  "hårddisken) under primtalsgenereringen; detta ger slumptalsgeneratorn\n"
  "en större chans att samla ihop en tillräcklig mängd slumpmässig data.\n"
  
- #: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
- #: g10/keygen.c:4777 g10/keygen.c:4882
++#: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
++#: g10/keygen.c:4330 g10/keygen.c:4803 g10/keygen.c:5064 g10/keygen.c:5169
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Nyckelgenereringen misslyckades: %s\n"
  
- #: g10/keygen.c:3598
++#: g10/keygen.c:3922
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5505,72 -4358,59 +5467,72 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3924
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3621
++#: g10/keygen.c:3945
  #, fuzzy, c-format
  #| msgid "key already exists\n"
  msgid "A key for \"%s\" already exists\n"
  msgstr "nyckeln finns redan\n"
  
- #: g10/keygen.c:3626
++#: g10/keygen.c:3950
  #, fuzzy
  #| msgid "Use this key anyway? (y/N) "
  msgid "Create anyway? (y/N) "
  msgstr "Vill du använda nyckeln ändå? (j/N) "
  
- #: g10/keygen.c:3632
++#: g10/keygen.c:3956
  #, fuzzy
  #| msgid "generating new key\n"
  msgid "creating anyway\n"
  msgstr "genererar ny nyckel\n"
  
- #: g10/keygen.c:3981
++#: g10/keygen.c:4315
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:4013
++#: g10/keygen.c:4358
  msgid "Key generation canceled.\n"
  msgstr "Skapandet av nycklar avbröts.\n"
  
- #: g10/keygen.c:4073
++#: g10/keygen.c:4418
  #, fuzzy, c-format
  #| msgid "can't create backup file `%s': %s\n"
  msgid "can't create backup file '%s': %s\n"
  msgstr "kan inte skapa säkerhetskopian \"%s\": %s\n"
  
- #: g10/keygen.c:4093
++#: g10/keygen.c:4438
  #, fuzzy, c-format
  #| msgid "NOTE: backup of card key saved to `%s'\n"
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "OBSERVERA: säkerhetskopia av kortnyckeln sparades i \"%s\"\n"
  
- #: g10/keygen.c:4244 g10/keygen.c:4393
++#: g10/keygen.c:4589 g10/keygen.c:4738
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
  msgstr "skriver den publika nyckeln till \"%s\"\n"
  
- #: g10/keygen.c:4387
++#: g10/keygen.c:4732
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "ingen skrivbar publik nyckelring hittades: %s\n"
  
- #: g10/keygen.c:4401
++#: g10/keygen.c:4746
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error writing public keyring '%s': %s\n"
  msgstr "fel vid skrivning av publika nyckelringen \"%s\": %s\n"
  
- #: g10/keygen.c:4433
++#: g10/keygen.c:4778
  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:4445
++#: g10/keygen.c:4790
  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"
@@@ -5580,7 -4420,6 +5542,7 @@@ msgstr "
  "syfte.\n"
  
  # c-format behövs inte i singularis
- #: g10/keygen.c:4649 g10/keygen.c:4833
++#: g10/keygen.c:4936 g10/keygen.c:5120
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5588,7 -4427,6 +5550,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:4651 g10/keygen.c:4835
++#: g10/keygen.c:4938 g10/keygen.c:5122
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5596,21 -4434,17 +5558,21 @@@ msgstr "
  "nyckeln är skapad %lu sekunder in i framtiden (problemet är\n"
  "relaterat till tidsresande eller en felställd klocka)\n"
  
- #: g10/keygen.c:4662 g10/keygen.c:4846
++#: g10/keygen.c:4949 g10/keygen.c:5133
  #, fuzzy
  #| 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:4674 g10/keygen.c:4676
++#: g10/keygen.c:4961 g10/keygen.c:4963
  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:4683 g10/keygen.c:4685
++#: g10/keygen.c:4970 g10/keygen.c:4972
  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:4704 g10/keygen.c:4860
++#: g10/keygen.c:4991 g10/keygen.c:5147
  msgid "Really create? (y/N) "
  msgstr "Verkligen skapa? (j/N) "
  
@@@ -5941,130 -4710,104 +5903,130 @@@ msgstr "
  "fristående spärrcertifikat - använd \"gpg --import\" för\n"
  "att verkställa\n"
  
- #: g10/mainproc.c:1233 g10/mainproc.c:1276
++#: g10/mainproc.c:1238 g10/mainproc.c:1281
  msgid "no signature found\n"
  msgstr "ingen signatur hittades\n"
  
- #: g10/mainproc.c:1607
++#: g10/mainproc.c:1612
  #, c-format
  msgid "BAD signature from \"%s\""
  msgstr "FELAKTIG signatur från \"%s\""
  
- #: g10/mainproc.c:1609
++#: g10/mainproc.c:1614
  #, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Utgången signatur från \"%s\""
  
- #: g10/mainproc.c:1611
++#: g10/mainproc.c:1616
  #, c-format
  msgid "Good signature from \"%s\""
  msgstr "Korrekt signatur från \"%s\""
  
- #: g10/mainproc.c:1630
++#: g10/mainproc.c:1635
  msgid "signature verification suppressed\n"
  msgstr "signaturvalidering utlämnad\n"
  
- #: g10/mainproc.c:1739
++#: g10/mainproc.c:1744
  msgid "can't handle this ambiguous signature data\n"
  msgstr "kan inte hantera detta tvetydliga signaturdata\n"
  
- #: g10/mainproc.c:1753 g10/mainproc.c:1761
++#: g10/mainproc.c:1758 g10/mainproc.c:1766
  #, c-format
  msgid "Signature made %s\n"
  msgstr "Signatur gjord %s\n"
  
- #: g10/mainproc.c:1754 g10/mainproc.c:1762
++#: g10/mainproc.c:1759 g10/mainproc.c:1767
  #, c-format
  msgid "               using %s key %s\n"
  msgstr "             med %s-nyckeln %s\n"
  
- #: g10/mainproc.c:1766
++#: g10/mainproc.c:1771
  #, 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:1772
++#: g10/mainproc.c:1777
  #, fuzzy, c-format
  #| msgid "                aka \"%s\""
  msgid "               issuer \"%s\"\n"
  msgstr "      även känd som \"%s\""
  
- #: g10/mainproc.c:1789
++#: g10/mainproc.c:1794
  msgid "Key available at: "
  msgstr "Nyckeln tillgänglig hos: "
  
  # 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:2024
++#: g10/mainproc.c:2029
  msgid "[uncertain]"
  msgstr "[osäkert]"
  
- #: g10/mainproc.c:2062
++#: g10/mainproc.c:2067
  #, c-format
  msgid "                aka \"%s\""
  msgstr "      även känd som \"%s\""
  
- #: g10/mainproc.c:2145
++#: g10/mainproc.c:2150
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "Giltighetstiden för signaturen har upphört %s\n"
  
- #: g10/mainproc.c:2149
++#: g10/mainproc.c:2154
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "Giltighetstiden för signaturen går ut %s\n"
  
- #: g10/mainproc.c:2160
++#: g10/mainproc.c:2165
  #, 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:2161
++#: g10/mainproc.c:2166
  msgid "binary"
  msgstr "binär"
  
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2167
  msgid "textmode"
  msgstr "textläge"
  
- #: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "okänd"
  
- #: g10/mainproc.c:2164
++#: g10/mainproc.c:2169
  #, fuzzy
  #| msgid "algorithm: %s"
  msgid ", key algorithm "
  msgstr "algoritm: %s"
  
- #: g10/mainproc.c:2199
++#: g10/mainproc.c:2204
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2229
++#: g10/mainproc.c:2234
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "Kan inte kontrollera signaturen: %s\n"
  
- #: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
++#: g10/mainproc.c:2327 g10/mainproc.c:2346 g10/mainproc.c:2470
  msgid "not a detached signature\n"
  msgstr "detta är inte någon signatur i en separat fil\n"
  
- #: g10/mainproc.c:2375
++#: g10/mainproc.c:2380
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
  msgstr ""
  "VARNING: multipla signaturer upptäckta. Endast den första kommer att "
  "kontrolleras.\n"
  
- #: g10/mainproc.c:2384
++#: g10/mainproc.c:2389
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "fristående signatur av klassen 0x%02x\n"
  
- #: g10/mainproc.c:2469
++#: g10/mainproc.c:2474
  msgid "old style (PGP 2.x) signature\n"
  msgstr "signatur av den gamla (PGP 2.x) typen\n"
  
@@@ -6365,25 -5054,20 +6327,25 @@@ msgstr "Är detta foto korrekt (j/N/a)
  msgid "unable to display photo ID!\n"
  msgstr "kan inte visa foto-id!\n"
  
- #: g10/pkclist.c:72 g10/revoke.c:757
++#: g10/pkclist.c:72 g10/revoke.c:758
  msgid "No reason specified"
  msgstr "Ingen anledning har angivits"
  
  # tveksam översättning. funderar på "ersatt av något bättre" men det
  # känns inte heller bra. Betyder att nyckeln inte används längre, utan användaren har skapat en ny nyckel som ersätter den gamla.
- #: g10/pkclist.c:74 g10/revoke.c:759
++#: g10/pkclist.c:74 g10/revoke.c:760
  msgid "Key is superseded"
  msgstr "Nyckeln är åsidosatt"
  
- #: g10/pkclist.c:76 g10/revoke.c:758
++#: g10/pkclist.c:76 g10/revoke.c:759
  msgid "Key has been compromised"
  msgstr "Nyckeln har blivit komprometterad"
  
- #: g10/pkclist.c:78 g10/revoke.c:760
++#: g10/pkclist.c:78 g10/revoke.c:761
  msgid "Key is no longer used"
  msgstr "Nyckeln används inte längre"
  
- #: g10/pkclist.c:80 g10/revoke.c:761
++#: g10/pkclist.c:80 g10/revoke.c:762
  msgid "User ID is no longer valid"
  msgstr "Användaridentiteten är inte längre giltig"
  
@@@ -6461,7 -5132,6 +6423,7 @@@ msgstr "
  "Minimum tillitsnivå för denna nyckel är: %s\n"
  "\n"
  
- #: g10/pkclist.c:310 g10/revoke.c:786
++#: g10/pkclist.c:310 g10/revoke.c:787
  msgid "Your decision? "
  msgstr "Vad väljer du? "
  
@@@ -6664,20 -5296,16 +6626,20 @@@ msgstr "
  msgid "No such user ID.\n"
  msgstr "Ingen sådan användaridentitet.\n"
  
- #: g10/pkclist.c:1197 g10/pkclist.c:1273
++#: g10/pkclist.c:1197 g10/pkclist.c:1274
  msgid "skipped: public key already set as default recipient\n"
  msgstr ""
  "hoppade över: den publika nyckeln är redan inställd som standardmottagare\n"
  
- #: g10/pkclist.c:1218
++#: g10/pkclist.c:1219
  msgid "Public key is disabled.\n"
  msgstr "Den publika nyckeln är inaktiverad.\n"
  
- #: g10/pkclist.c:1228
++#: g10/pkclist.c:1229
  msgid "skipped: public key already set\n"
  msgstr "hoppade över: publik nyckel redan angiven\n"
  
- #: g10/pkclist.c:1263
++#: g10/pkclist.c:1264
  #, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "okänd standardmottagare \"%s\"\n"
@@@ -6685,16 -5313,13 +6647,16 @@@
  # plural av adressee
  # dvs. den som meddelandet är adresserat till.
  # Åtskillnad görs mellan adressee och receiver.
- #: g10/pkclist.c:1312
++#: g10/pkclist.c:1313
  msgid "no valid addressees\n"
  msgstr "inga giltiga adressater\n"
  
- #: g10/pkclist.c:1665
++#: g10/pkclist.c:1666
  #, 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:1690
++#: g10/pkclist.c:1691
  #, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "Observera: nyckeln %s har ingen inställning för %s\n"
@@@ -6703,31 -5327,25 +6665,31 @@@
  msgid "data not saved; use option \"--output\" to save it\n"
  msgstr "data sparades inte, använd flaggan \"--output\" för att spara det\n"
  
- #: g10/plaintext.c:598
++#: g10/plaintext.c:614
  msgid "Detached signature.\n"
  msgstr "Signatur i en separat fil.\n"
  
- #: g10/plaintext.c:606
++#: g10/plaintext.c:622
  msgid "Please enter name of data file: "
  msgstr "Ange namnet på datafilen: "
  
- #: g10/plaintext.c:643
++#: g10/plaintext.c:659
  msgid "reading stdin ...\n"
  msgstr "läser från standard in ...\n"
  
- #: g10/plaintext.c:688
++#: g10/plaintext.c:704
  msgid "no signed data\n"
  msgstr "ingen signerad data\n"
  
  # se förra kommentaren
- #: g10/plaintext.c:706
++#: g10/plaintext.c:722
  #, fuzzy, c-format
  #| msgid "can't open signed data `%s'\n"
  msgid "can't open signed data '%s'\n"
  msgstr "kan inte öppna signerat data \"%s\"\n"
  
  # se förra kommentaren
- #: g10/plaintext.c:741
++#: g10/plaintext.c:757
  #, c-format
  msgid "can't open signed data fd=%d: %s\n"
  msgstr "kan inte öppna signerad data fd=%d: %s\n"
@@@ -6803,7 -5407,6 +6765,7 @@@ msgstr "Skapa ett spärrcertifikat fö
  # -do-not-force översatt med:
  # genomdriv inte
  # I detta fall gäller det ett revokeringscertifikat, som gnupg alltid skapar i ASCII-format för att det ska gå att skriva ut.
- #: g10/revoke.c:336 g10/revoke.c:727
++#: g10/revoke.c:336 g10/revoke.c:728
  msgid "ASCII armored output forced.\n"
  msgstr "utdata med ett ascii-skal genomdrivet.\n"
  
@@@ -6841,23 -5438,20 +6803,23 @@@ msgid "
  "the secret key.  However, if the secret key is still accessible,\n"
  "it is better to generate a new revocation certificate and give\n"
  "a reason for the revocation.  For details see the description of\n"
- "of the gpg command \"--gen-revoke\" in the GnuPG manual."
+ "of the gpg command \"--generate-revocation\" in the GnuPG manual."
  msgstr ""
  
- #: g10/revoke.c:575
++#: g10/revoke.c:576
  msgid ""
  "To avoid an accidental use of this file, a colon has been inserted\n"
  "before the 5 dashes below.  Remove this colon with a text editor\n"
  "before importing and publishing this revocation certificate."
  msgstr ""
  
- #: g10/revoke.c:590
++#: g10/revoke.c:591
  #, fuzzy, c-format
  #| msgid "Revocation certificate created.\n"
  msgid "revocation certificate stored as '%s.rev'\n"
  msgstr "Spärrcertifikat skapat.\n"
  
- #: g10/revoke.c:634
++#: g10/revoke.c:635
  #, fuzzy, c-format
  #| msgid "secret key \"%s\" not found: %s\n"
  msgid "secret key \"%s\" not found\n"
@@@ -6866,22 -5460,18 +6828,22 @@@ msgstr "hemliga nyckeln \"%s\" hittade
  #. TRANSLATORS: The %s prints a key specification which
  #. for example has been given at the command line.  Several lines
  #. lines with secret key infos are printed after this message.
- #: g10/revoke.c:661
++#: g10/revoke.c:662
  #, c-format
  msgid "'%s' matches multiple secret keys:\n"
  msgstr ""
  
- #: g10/revoke.c:688
++#: g10/revoke.c:689
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error searching the keyring: %s\n"
  msgstr "fel när nyckelringen \"%s\" skapades: %s\n"
  
- #: g10/revoke.c:711
++#: g10/revoke.c:712
  msgid "Create a revocation certificate for this key? (y/N) "
  msgstr "Skapa ett spärrcertifikat för denna nyckel? (j/N) "
  
- #: g10/revoke.c:735
++#: g10/revoke.c:736
  msgid ""
  "Revocation certificate created.\n"
  "\n"
@@@ -6899,33 -5489,26 +6861,33 @@@ msgstr "
  "media blir oläsligt.  Men se upp:  Utskriftsfunktionen på\n"
  "din dator kan spara data så att det blir åtkomligt för andra!\n"
  
- #: g10/revoke.c:769
++#: g10/revoke.c:770
  msgid "Please select the reason for the revocation:\n"
  msgstr "Välj anledning till varför nyckeln spärras:\n"
  
- #: g10/revoke.c:779
++#: g10/revoke.c:780
  msgid "Cancel"
  msgstr "Avbryt"
  
- #: g10/revoke.c:781
++#: g10/revoke.c:782
  #, c-format
  msgid "(Probably you want to select %d here)\n"
  msgstr "(Troligen vill du välja %d här)\n"
  
- #: g10/revoke.c:822
++#: g10/revoke.c:823
  msgid "Enter an optional description; end it with an empty line:\n"
  msgstr "Ange en valfri beskrivning; avsluta med en tom rad:\n"
  
- #: g10/revoke.c:850
++#: g10/revoke.c:851
  #, c-format
  msgid "Reason for revocation: %s\n"
  msgstr "Anledning för spärrning: %s\n"
  
- #: g10/revoke.c:852
++#: g10/revoke.c:853
  msgid "(No description given)\n"
  msgstr "(Ingen beskrivning angiven)\n"
  
- #: g10/revoke.c:857
++#: g10/revoke.c:858
  msgid "Is this okay? (y/N) "
  msgstr "Är detta OK? (j/N) "
  
@@@ -7074,12 -5637,10 +7036,12 @@@ msgstr "
  "VARNING: kunde inte %%-expandera url för föredragen nyckelserver (för "
  "stor).  Använder oexpanderad.\n"
  
- #: g10/sign.c:329
++#: g10/sign.c:331
  #, c-format
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s/%s signatur från: \"%s\"\n"
  
- #: g10/sign.c:878
++#: g10/sign.c:880
  #, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -7087,11 -5648,9 +7049,11 @@@ msgstr "
  "VARNING: tvinga sammandragsalgoritmen %s (%d) strider mot "
  "mottagarinställningarna\n"
  
- #: g10/sign.c:1009
++#: g10/sign.c:1011
  msgid "signing:"
  msgstr "signerar:"
  
- #: g10/sign.c:1286
++#: g10/sign.c:1288
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "krypteringen %s kommer att användas\n"
@@@ -7117,7 -5672,6 +7079,7 @@@ msgid "this is a PGP generated Elgamal 
  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:362
++#: g10/tdbdump.c:57 g10/trustdb.c:369
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "tillitspost: %lu, typ %d: kunde inte skriva: %s\n"
@@@ -7165,7 -5711,6 +7127,7 @@@ msgstr "fel vid sökning av tillitsvär
  msgid "read error in '%s': %s\n"
  msgstr "läsfel i \"%s\":  %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "tillitsdatabas: synkronisering misslyckades: %s\n"
@@@ -7314,309 -5830,322 +7276,388 @@@ msgstr "kan inte hantera text med rade
  msgid "input line longer than %d characters\n"
  msgstr "indataraden är längre än %d tecken\n"
  
- #: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
++#: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
  #, fuzzy, c-format
  #| msgid "error sending standard options: %s\n"
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "fel vid sändning av standardflaggor: %s\n"
  
- #: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
++#: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:357 g10/tofu.c:699
++#: g10/tofu.c:355 g10/tofu.c:888
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:501
++#: g10/tofu.c:505
  #, fuzzy, c-format
  #| msgid "unsupported algorithm: %s"
  msgid "unsupported TOFU database version: %s\n"
  msgstr "algoritmen stöds inte: %s"
  
- #: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
- #: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
- #: g10/tofu.c:3056
++#: g10/tofu.c:538
+ #, fuzzy, c-format
+ #| msgid "error creating temporary file: %s\n"
+ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
+ msgstr "fel när temporärfil skapades: %s\n"
+ 
++#: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
+ msgid "TOFU DB error"
+ msgstr ""
+ 
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2340 g10/tofu.c:2359
++#: g10/tofu.c:2372 g10/tofu.c:2384 g10/tofu.c:2399 g10/tofu.c:2411
++#: g10/tofu.c:2980 g10/tofu.c:2997 g10/tofu.c:3033 g10/tofu.c:3050
++#: g10/tofu.c:3353
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error reading TOFU database: %s\n"
  msgstr "fel vid sändning av %s-kommando: %s\n"
  
- #: g10/tofu.c:566 g10/tofu.c:574
++#: g10/tofu.c:716 g10/tofu.c:724
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error determining TOFU database's version: %s\n"
  msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n"
  
- #: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
++#: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing TOFU database: %s\n"
  msgstr "%s: fel vid läsning av katalogpost: %s\n"
  
- #: g10/tofu.c:765
++#: g10/tofu.c:844
+ #, fuzzy, c-format
+ #| msgid "error sending %s command: %s\n"
+ msgid "error creating 'encryptions' TOFU table: %s\n"
+ msgstr "fel vid sändning av %s-kommando: %s\n"
+ 
++#: g10/tofu.c:874
+ #, c-format
+ msgid "adding column effective_policy to bindings DB: %s\n"
+ msgstr ""
+ 
++#: g10/tofu.c:956
  #, fuzzy, c-format
  #| msgid "error opening `%s': %s\n"
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "fel vid öppnandet av \"%s\": %s\n"
  
- #: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
++#: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error updating TOFU database: %s\n"
  msgstr "fel vid sändning av %s-kommando: %s\n"
  
- #: g10/tofu.c:1239
++#: g10/tofu.c:1328
  #, c-format
  msgid ""
  "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1247
++#: g10/tofu.c:1337
  #, c-format
- msgid "The email address \"%s\" is associated with %d keys!"
- msgstr ""
+ msgid "The email address \"%s\" is associated with %d key!"
+ msgid_plural "The email address \"%s\" is associated with %d keys!"
+ msgstr[0] ""
+ msgstr[1] ""
  
- #: g10/tofu.c:1251
++#: g10/tofu.c:1343
  msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  
- #: g10/tofu.c:1257
++#: g10/tofu.c:1349
  #, c-format
  msgid ""
  "Please indicate whether this email address should be associated with key %s "
  "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1513
++#: g10/tofu.c:1605
  #, fuzzy, c-format
  #| msgid "error getting new PIN: %s\n"
  msgid "error gathering other user IDs: %s\n"
  msgstr "fel vid hämtning av ny PIN-kod: %s\n"
  
- #: g10/tofu.c:1523
++#: g10/tofu.c:1615
  #, fuzzy
  #| msgid "list key and user IDs"
  msgid "This key's user IDs:\n"
  msgstr "lista nycklar och användaridentiteter"
  
- #: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
++#: g10/tofu.c:1631 g10/tofu.c:1796
  #, fuzzy, c-format
  #| msgid "validity: %s"
  msgid "policy: %s"
  msgstr "giltighet: %s"
  
- #: g10/tofu.c:1630
++#: g10/tofu.c:1722
  #, fuzzy, c-format
  #| msgid "error getting stored flags: %s\n"
  msgid "error gathering signature stats: %s\n"
  msgstr "fel vid hämtning av lagrade flaggor: %s\n"
  
- #: g10/tofu.c:1634
++#: g10/tofu.c:1726
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1651
++#: g10/tofu.c:1744
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1684 g10/tofu.c:1689
++#: g10/tofu.c:1785 g10/tofu.c:1790
  msgid ", "
  msgstr ""
  
- #: g10/tofu.c:1693
++#: g10/tofu.c:1794
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
  msgstr "lista nycklar"
  
- #: g10/tofu.c:1715
++#: g10/tofu.c:1820
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid "Verified %d message."
+ msgid_plural "Verified %d messages."
+ msgstr[0] "skriv ut kontrollsummor"
+ msgstr[1] "skriv ut kontrollsummor"
+ 
++#: g10/tofu.c:1824
+ #, fuzzy, c-format
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid "Encrypted %d message."
+ msgid_plural "Encrypted %d messages."
+ msgstr[0] "krypterad med %lu lösenfraser\n"
+ msgstr[1] "krypterad med %lu lösenfraser\n"
+ 
++#: g10/tofu.c:1831
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid "Verified %d message in the future."
+ msgid_plural "Verified %d messages in the future."
+ msgstr[0] "skriv ut kontrollsummor"
+ msgstr[1] "skriv ut kontrollsummor"
+ 
++#: g10/tofu.c:1835
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid "Verified %d message"
- msgid_plural "Verified %d messages"
+ msgid "Encrypted %d message in the future."
+ msgid_plural "Encrypted %d messages in the future."
  msgstr[0] "skriv ut kontrollsummor"
  msgstr[1] "skriv ut kontrollsummor"
  
- #: g10/tofu.c:1719
++#: g10/tofu.c:1849
  #, c-format
- msgid "Encrypted %d message"
- msgid_plural "Encrypted %d messages"
+ msgid "Messages verified over the past %d day: %d."
+ msgid_plural "Messages verified over the past %d days: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1734
++#: g10/tofu.c:1855
  #, c-format
- msgid " over the past day."
- msgid_plural " over the past %d days."
+ msgid "Messages encrypted over the past %d day: %d."
+ msgid_plural "Messages encrypted over the past %d days: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1740
++#: g10/tofu.c:1865
  #, c-format
- msgid " over the past month."
- msgid_plural " over the past %d months."
+ msgid "Messages verified over the past %d month: %d."
+ msgid_plural "Messages verified over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1746
++#: g10/tofu.c:1871
  #, c-format
- msgid " over the past year."
- msgid_plural " over the past %d years."
+ msgid "Messages encrypted over the past %d month: %d."
+ msgid_plural "Messages encrypted over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1752
- msgid " in the past."
++#: g10/tofu.c:1881
+ #, c-format
+ msgid "Messages verified over the past %d year: %d."
+ msgid_plural "Messages verified over the past %d years: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1887
+ #, c-format
+ msgid "Messages encrypted over the past %d year: %d."
+ msgid_plural "Messages encrypted over the past %d years: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1895
+ #, c-format
+ msgid "Messages verified in the past: %d."
  msgstr ""
  
++#: g10/tofu.c:1899
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid "Messages encrypted in the past: %d."
+ msgstr "skriv ut kontrollsummor"
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1767
++#: g10/tofu.c:1916
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1809
++#: g10/tofu.c:1958
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1815
++#: g10/tofu.c:1964
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1823
++#: g10/tofu.c:1972
  msgid "Defaulting to unknown."
  msgstr ""
  
- #: g10/tofu.c:1938 g10/tofu.c:2074
++#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
- #: g10/tofu.c:1994
++#: g10/tofu.c:2143
  #, fuzzy, c-format
  #| msgid "error writing key: %s\n"
  msgid "resetting keydb: %s\n"
  msgstr "fel vid skrivning av nyckel: %s\n"
  
- #: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
- #: g10/tofu.c:2425
++#: g10/tofu.c:2601
  #, fuzzy, c-format
  #| msgid "error storing flags: %s\n"
- msgid "error setting TOFU binding's trust level to %s\n"
+ msgid "error setting TOFU binding's policy to %s\n"
  msgstr "fel vid lagring av flaggor: %s\n"
  
- #: g10/tofu.c:2473
++#: g10/tofu.c:2794
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "error changing TOFU policy: %s\n"
  msgstr "fel när ett rör skapades: %s\n"
  
- #. TRANSLATORS: The tilde ('~') is used here to indicate a
- #. * non-breakable space
- #: g10/tofu.c:2574
++#: g10/tofu.c:2839
  #, c-format
- msgid "%d~year"
- msgid_plural "%d~years"
+ msgid "%lld~year"
+ msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2583
++#: g10/tofu.c:2844
  #, c-format
- msgid "%d~month"
- msgid_plural "%d~months"
+ msgid "%lld~month"
+ msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2592
++#: g10/tofu.c:2849
  #, c-format
- msgid "%d~day"
- msgid_plural "%d~days"
+ msgid "%lld~week"
+ msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2854
+ #, c-format
+ msgid "%lld~day"
+ msgid_plural "%lld~days"
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:2859
  #, c-format
- msgid "%d~hour"
- msgid_plural "%d~hours"
+ msgid "%lld~hour"
+ msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2610
++#: g10/tofu.c:2864
  #, c-format
- msgid "%d~minute"
- msgid_plural "%d~minutes"
+ msgid "%lld~minute"
+ msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2619
++#: g10/tofu.c:2866
  #, c-format
- msgid "%d~second"
- msgid_plural "%d~seconds"
+ msgid "%lld~second"
+ msgid_plural "%lld~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2802
++#: g10/tofu.c:3103
  #, c-format
- msgid "%s: "
+ msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:2806
++#: g10/tofu.c:3109
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
- msgid "Verified %ld signatures"
+ msgid "%s: Verified 0 signatures."
  msgstr "Raderade %d signaturer.\n"
  
- #: g10/tofu.c:2816
++#: g10/tofu.c:3117
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid "Verified %ld signature in the past %s"
- msgid_plural "Verified %ld signatures in the past %s"
+ msgid "%s: Verified %ld~signature in the past %s."
+ msgid_plural "%s: Verified %ld~signatures in the past %s."
  msgstr[0] "skriv ut kontrollsummor"
  msgstr[1] "skriv ut kontrollsummor"
  
- #: g10/tofu.c:2826
- #, fuzzy, c-format
++#: g10/tofu.c:3127
+ #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
- msgid ", and encrypted %ld messages"
+ msgid "Encrypted 0 messages."
  msgstr "krypterad med %lu lösenfraser\n"
  
- #: g10/tofu.c:2835
++#: g10/tofu.c:3135
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid ", and encrypted %ld message in the past %s"
- msgid_plural ", and encrypted %ld messages in the past %s"
+ msgid "Encrypted %ld~message in the past %s."
+ msgid_plural "Encrypted %ld~messages in the past %s."
  msgstr[0] "skriv ut kontrollsummor"
  msgstr[1] "skriv ut kontrollsummor"
  
- #: g10/tofu.c:2880
++#: g10/tofu.c:3146
+ #, fuzzy, c-format
+ #| msgid "validity: %s"
+ msgid "(policy: %s)"
+ msgstr "giltighet: %s"
+ 
++#: g10/tofu.c:3177
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2883
++#: g10/tofu.c:3180
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2887
++#: g10/tofu.c:3184
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2890
++#: g10/tofu.c:3187
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2919
++#: g10/tofu.c:3216
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7633,19 -6162,15 +7674,19 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
- #: g10/tofu.c:3480 g10/tofu.c:3572
++#: g10/tofu.c:3298 g10/tofu.c:3449 g10/tofu.c:3627 g10/tofu.c:3670
++#: g10/tofu.c:3784 g10/tofu.c:3859 g10/tofu.c:3894
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error opening TOFU database: %s\n"
  msgstr "fel vid sändning av %s-kommando: %s\n"
  
- #: g10/tofu.c:3185
++#: g10/tofu.c:3482
  #, c-format
- msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
  msgstr ""
  
- #: g10/tofu.c:3515
++#: g10/tofu.c:3819
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7681,73 -6201,59 +7722,73 @@@ msgstr "nyckeln %s är markerad med fö
  
  # req står för request
  # kollat med Werner. Per
- #: g10/trustdb.c:341
++#: g10/trustdb.c:348
  #, 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:347
++#: g10/trustdb.c:354
  #, 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:422
++#: g10/trustdb.c:429
  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:431
++#: g10/trustdb.c:438
  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:468
++#: g10/trustdb.c:475
  #, 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:474
++#: g10/trustdb.c:481
  #, c-format
  msgid "using %s trust model\n"
  msgstr "använder tillitsmodellen %s\n"
  
- #: g10/trustdb.c:511
++#: g10/trustdb.c:518
  msgid "no need for a trustdb check\n"
  msgstr "det behövs ingen kontroll av tillitsdatabasen\n"
  
- #: g10/trustdb.c:517 g10/trustdb.c:2160
++#: g10/trustdb.c:524 g10/trustdb.c:2187
  #, 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:526
++#: g10/trustdb.c:533
  #, 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:542
++#: g10/trustdb.c:549
  #, 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:749 g10/trustdb.c:1313
++#: g10/trustdb.c:756 g10/trustdb.c:1340
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "publika nyckeln %s hittades inte: %s\n"
  
- #: g10/trustdb.c:966
++#: g10/trustdb.c:973
  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:971
++#: g10/trustdb.c:978
  msgid "checking the trustdb\n"
  msgstr "kontrollerar  tillitsdatabasen\n"
  
- #: g10/trustdb.c:1883
++#: g10/trustdb.c:1910
  #, fuzzy, c-format
  #| msgid "%lu keys processed so far\n"
  msgid "%d key processed"
@@@ -7756,7 -6262,6 +7797,7 @@@ msgstr[0] "%lu nycklar behandlade än s
  msgstr[1] "%lu nycklar behandlade än så länge\n"
  
  # Vad är detta!?
- #: g10/trustdb.c:1886
++#: g10/trustdb.c:1913
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7764,23 -6269,19 +7805,23 @@@ msgid_plural " (%d validity counts clea
  msgstr[0] "%d nycklar behandlade (%d validity counts rensade)\n"
  msgstr[1] "%d nycklar behandlade (%d validity counts rensade)\n"
  
- #: g10/trustdb.c:1956
++#: g10/trustdb.c:1983
  msgid "no ultimately trusted keys found\n"
  msgstr "hittade inga nycklar med förbehållslöst förtroende\n"
  
- #: g10/trustdb.c:1970
++#: g10/trustdb.c:1997
  #, 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:2087
++#: g10/trustdb.c:2114
  #, 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:2167
++#: g10/trustdb.c:2194
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr ""
@@@ -7908,19 -6388,14 +7949,19 @@@ msgstr "
  "Syntax: kbxutil [flaggor] [filer]\n"
  "lista, exportera, importera nyckelskåpsdata\n"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3208
++#: scd/app-nks.c:718 scd/app-openpgp.c:3221
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr "RSA modulus saknas eller är inte %d bitar stor\n"
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3220
++#: scd/app-nks.c:726 scd/app-openpgp.c:3233
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr "Publik RSA-exponent saknas eller större än %d bitar\n"
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
- #: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
- #: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1965 scd/app-openpgp.c:1984
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2166 scd/app-openpgp.c:2430
++#: scd/app-openpgp.c:2477 scd/app-openpgp.c:2582 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "PIN-återanrop returnerade fel: %s\n"
@@@ -7970,85 -6436,67 +8011,85 @@@ msgstr "
  "|P|Ange upplåsningskoden (PUK-koden) för nyckeln att skapa kvalificerade "
  "signaturer med."
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2511 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "fel vid hämtning av ny PIN-kod: %s\n"
  
- #: scd/app-openpgp.c:806
++#: scd/app-openpgp.c:801
  #, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "misslyckades med att lagra fingeravtrycket: %s\n"
  
- #: scd/app-openpgp.c:819
++#: scd/app-openpgp.c:814
  #, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "misslyckades med att lagra datum för skapandet: %s\n"
  
- #: scd/app-openpgp.c:1236
++#: scd/app-openpgp.c:1247
  msgid "response does not contain the RSA modulus\n"
  msgstr "svaret innehåller inte en RSA-modulus\n"
  
- #: scd/app-openpgp.c:1243
++#: scd/app-openpgp.c:1254
  msgid "response does not contain the RSA public exponent\n"
  msgstr "svaret innehåller inte den publika RSA-exponenten\n"
  
- #: scd/app-openpgp.c:1353
++#: scd/app-openpgp.c:1364
  #, fuzzy
  #| msgid "response does not contain the RSA public exponent\n"
  msgid "response does not contain the EC public key\n"
  msgstr "svaret innehåller inte den publika RSA-exponenten\n"
  
- #: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:1464 scd/app-openpgp.c:3825
  msgid "response does not contain the public key data\n"
  msgstr "svaret innehåller inte publikt nyckeldata\n"
  
- #: scd/app-openpgp.c:1551
++#: scd/app-openpgp.c:1564
  #, c-format
  msgid "reading public key failed: %s\n"
  msgstr "läsning av publik nyckel misslyckades: %s\n"
  
- #: scd/app-openpgp.c:1903
++#: scd/app-openpgp.c:1916
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr "använder standard-PIN som %s\n"
  
- #: scd/app-openpgp.c:1910
++#: scd/app-openpgp.c:1923
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  "misslyckades med att använda standard-PIN som %s: %s - inaktiverar "
  "ytterligare standardanvändning\n"
  
- #: scd/app-openpgp.c:1925
++#: scd/app-openpgp.c:1938
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr "||Ange PIN-koden%%0A[signaturer kvar: %lu]"
  
- #: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
++#: scd/app-openpgp.c:1949 scd/app-openpgp.c:2424
  msgid "||Please enter the PIN"
  msgstr "||Ange PIN-koden"
  
- #: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2173 scd/app-openpgp.c:2437
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr "PIN-kod för CHV%d är för kort; minimumlängd är %d\n"
  
- #: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
- #: scd/app-openpgp.c:4114
++#: scd/app-openpgp.c:2004 scd/app-openpgp.c:2043 scd/app-openpgp.c:2185
++#: scd/app-openpgp.c:4126
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "validering av CHV%d misslyckades: %s\n"
  
- #: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
++#: scd/app-openpgp.c:2072 scd/app-openpgp.c:2458 scd/app-openpgp.c:4556
  msgid "error retrieving CHV status from card\n"
  msgstr "fel vid hämtning av CHV-status från kort\n"
  
- #: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
++#: scd/app-openpgp.c:2078 scd/app-openpgp.c:4565
  msgid "card is permanently locked!\n"
  msgstr "kortet är låst permanent!\n"
  
- #: scd/app-openpgp.c:2072
++#: scd/app-openpgp.c:2085
  #, fuzzy, c-format
  #| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@@ -8061,24 -6509,19 +8102,24 @@@ msgstr[1] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:2082
++#: scd/app-openpgp.c:2095
  #, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "|A|Ange administratörens PIN-kod%%0A[återstående försök: %d]"
  
- #: scd/app-openpgp.c:2086
++#: scd/app-openpgp.c:2099
  msgid "|A|Please enter the Admin PIN"
  msgstr "|A|Ange administratörens PIN-kod"
  
- #: scd/app-openpgp.c:2107
++#: scd/app-openpgp.c:2120
  msgid "access to admin commands is not configured\n"
  msgstr "åtkomst till administrationskommandon är inte konfigurerat\n"
  
- #: scd/app-openpgp.c:2460
++#: scd/app-openpgp.c:2473
  msgid "||Please enter the Reset Code for the card"
  msgstr "||Ange nollställningskoden för kortet"
  
- #: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
++#: scd/app-openpgp.c:2483 scd/app-openpgp.c:2537
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr "Nollställningskoden är för kort; minimumlängd är %d\n"
@@@ -8086,83 -6529,65 +8127,83 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2493
++#: scd/app-openpgp.c:2506
  msgid "|RN|New Reset Code"
  msgstr "|RN|Ny nollställningskod"
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|AN|New Admin PIN"
  msgstr "|AN|Ny Admin PIN-kod"
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|N|New PIN"
  msgstr "|N|Ny PIN-kod"
  
- #: scd/app-openpgp.c:2565
++#: scd/app-openpgp.c:2578
  #, fuzzy
  #| msgid "|A|Please enter the Admin PIN"
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "|A|Ange administratörens PIN-kod"
  
- #: scd/app-openpgp.c:2566
++#: scd/app-openpgp.c:2579
  #, fuzzy
  #| msgid "||Please enter the PIN"
  msgid "||Please enter the PIN and New PIN"
  msgstr "||Ange PIN-koden"
  
- #: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
++#: scd/app-openpgp.c:2635 scd/app-openpgp.c:3885
  msgid "error reading application data\n"
  msgstr "fel vid läsning av programdata\n"
  
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
++#: scd/app-openpgp.c:2641 scd/app-openpgp.c:3892
  msgid "error reading fingerprint DO\n"
  msgstr "fel vid läsning av fingeravtryckets DO\n"
  
- #: scd/app-openpgp.c:2638
++#: scd/app-openpgp.c:2651
  msgid "key already exists\n"
  msgstr "nyckeln finns redan\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2655
  msgid "existing key will be replaced\n"
  msgstr "befintlig nyckel kommer att ersättas\n"
  
- #: scd/app-openpgp.c:2644
++#: scd/app-openpgp.c:2657
  msgid "generating new key\n"
  msgstr "genererar ny nyckel\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2659
  msgid "writing new key\n"
  msgstr "skriver ny nyckel\n"
  
- #: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
++#: scd/app-openpgp.c:3201 scd/app-openpgp.c:3553
  msgid "creation timestamp missing\n"
  msgstr "tidsstämpel för skapandet saknas\n"
  
- #: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
++#: scd/app-openpgp.c:3243 scd/app-openpgp.c:3251
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr "RSA-primtal %s saknas eller inte %d bitar stor\n"
  
- #: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
++#: scd/app-openpgp.c:3384 scd/app-openpgp.c:3647
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "misslyckades med att lagra nyckeln: %s\n"
  
- #: scd/app-openpgp.c:3534
++#: scd/app-openpgp.c:3547
  #, fuzzy
  #| msgid "unsupported algorithm: %s"
  msgid "unsupported curve\n"
  msgstr "algoritmen stöds inte: %s"
  
- #: scd/app-openpgp.c:3790
++#: scd/app-openpgp.c:3802
  msgid "please wait while key is being generated ...\n"
  msgstr "var god vänta under tiden nyckeln genereras ...\n"
  
- #: scd/app-openpgp.c:3798
++#: scd/app-openpgp.c:3810
  msgid "generating key failed\n"
  msgstr "nyckelgenereringen misslyckades\n"
  
- #: scd/app-openpgp.c:3804
++#: scd/app-openpgp.c:3816
  #, fuzzy, c-format
  #| msgid "key generation completed (%d seconds)\n"
  msgid "key generation completed (%d second)\n"
@@@ -8170,32 -6595,26 +8211,32 @@@ msgid_plural "key generation completed 
  msgstr[0] "nyckelgenereringen är färdig (%d sekunder)\n"
  msgstr[1] "nyckelgenereringen är färdig (%d sekunder)\n"
  
- #: scd/app-openpgp.c:3838
++#: scd/app-openpgp.c:3850
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "ogiltig struktur för OpenPGP-kort (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:3900
  msgid "fingerprint on card does not match requested one\n"
  msgstr "avtrycket på kortet stämmer inte med den begärda\n"
  
- #: scd/app-openpgp.c:4004
++#: scd/app-openpgp.c:4016
  #, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "kortet har inte stöd för sammandragsalgoritmen %s\n"
  
- #: scd/app-openpgp.c:4089
++#: scd/app-openpgp.c:4101
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "signaturer skapade hittills: %lu\n"
  
- #: scd/app-openpgp.c:4551
++#: scd/app-openpgp.c:4570
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  "validering av Admin PIN-kod är för närvarande förbjudet genom detta "
  "kommando\n"
  
- #: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
++#: scd/app-openpgp.c:4871 scd/app-openpgp.c:4882
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "kan inte komma åt %s - ogiltigt OpenPGP-kort?\n"
@@@ -8217,7 -6633,6 +8258,7 @@@ msgstr "|N|Initial PIN-kod
  msgid "run in multi server mode (foreground)"
  msgstr "kör i multiserverläge (förgrund)"
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|NIVÅ|ställ in felsökningsnivån till NIVÅ"
  
@@@ -8259,13 -6665,11 +8300,13 @@@ msgstr "neka användning av administrat
  msgid "use variable length input for pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:287
++#: scd/scdaemon.c:286
  #, 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:289
++#: scd/scdaemon.c:288
  #, fuzzy
  #| msgid ""
  #| "Syntax: scdaemon [options] [command [args]]\n"
@@@ -8277,19 -6681,16 +8318,19 @@@ msgstr "
  "Syntax: scdaemon [flaggor] [kommando [argument]]\n"
  "Smartkortsdemon för GnuPG\n"
  
- #: scd/scdaemon.c:786
++#: scd/scdaemon.c:784
  #, fuzzy
  #| 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:1160 dirmngr/dirmngr.c:1900
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1904
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "hanterare för fd %d startad\n"
  
- #: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
++#: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1909
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "hanterare för fd %d avslutad\n"
@@@ -8371,9 -6756,6 +8412,9 @@@ msgstr "antal matchande certifikat: %d\
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "uppslag av endast-mellanlagrad dirmngr-nyckel misslyckades: %s\n"
  
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
 +#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  msgid "failed to allocate keyDB handle\n"
  msgstr "misslyckades med att allokera keyDB-hanterare\n"
  
@@@ -8878,11 -7158,9 +8919,11 @@@ msgstr "
  msgid "resource problem: out of core\n"
  msgstr "resursproblem: slut på minne\n"
  
- #: sm/decrypt.c:330
++#: sm/decrypt.c:332
  msgid "(this is the RC2 algorithm)\n"
  msgstr "(det här är RC2-algoritmen)\n"
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:334
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr "(det här verkar inte vara ett krypterat meddelande)\n"
  
@@@ -8926,118 -7196,90 +8967,118 @@@ msgstr "lista externa nycklar
  msgid "list certificate chain"
  msgstr "lista certifikatkedja"
  
- #: sm/gpgsm.c:218
++#: sm/gpgsm.c:219
  msgid "import certificates"
  msgstr "importera certifikat"
  
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
  msgid "export certificates"
  msgstr "exportera certifikat"
  
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:228
  msgid "register a smartcard"
  msgstr "registrera ett smartkort"
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:231
  msgid "pass a command to the dirmngr"
  msgstr "skicka ett kommando till dirmngr"
  
- #: sm/gpgsm.c:232
++#: sm/gpgsm.c:233
  msgid "invoke gpg-protect-tool"
  msgstr "starta gpg-protect-tool"
  
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:250
  msgid "create base-64 encoded output"
  msgstr "skapa base-64-kodat utdata"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in PEM format"
  msgstr "anta att inmatning är i PEM-format"
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in base-64 format"
  msgstr "anta att inmatning är i base-64-format"
  
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:262
  msgid "assume input is in binary format"
  msgstr "anta att inmatning är i binärformat"
  
- #: sm/gpgsm.c:267
++#: sm/gpgsm.c:269
  msgid "never consult a CRL"
  msgstr "kontrollera aldrig mot spärrlista"
  
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:279
  msgid "check validity using OCSP"
  msgstr "kontrollera giltigheten med OCSP"
  
- #: sm/gpgsm.c:282
++#: sm/gpgsm.c:284
  msgid "|N|number of certificates to include"
  msgstr "|N|antal certifikat att inkludera"
  
- #: sm/gpgsm.c:285
++#: sm/gpgsm.c:287
  msgid "|FILE|take policy information from FILE"
  msgstr "|FIL|hämta policyinformation från FIL"
  
- #: sm/gpgsm.c:288
++#: sm/gpgsm.c:290
  msgid "do not check certificate policies"
  msgstr "kontrollera inte certifikatpolicier"
  
- #: sm/gpgsm.c:292
++#: sm/gpgsm.c:294
  msgid "fetch missing issuer certificates"
  msgstr "hämta saknade utfärdarcertifikat"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "don't use the terminal at all"
  msgstr "använd inte terminalen alls"
  
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:307
  msgid "|FILE|write a server mode log to FILE"
  msgstr "|FIL|skriv en serverlägeslogg till FIL"
  
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:312
  msgid "|FILE|write an audit log to FILE"
  msgstr "|FIL|skriv en granskningslogg till FIL"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "batch mode: never ask"
  msgstr "satsläge: fråga aldrig"
  
- #: sm/gpgsm.c:314
++#: sm/gpgsm.c:316
  msgid "assume yes on most questions"
  msgstr "anta ja på de flesta frågorna"
  
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:317
  msgid "assume no on most questions"
  msgstr "anta nej på de flesta frågorna"
  
- #: sm/gpgsm.c:318
++#: sm/gpgsm.c:320
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "|FIL|lägg till nyckelring till listan över nyckelringar"
  
- #: sm/gpgsm.c:321
++#: sm/gpgsm.c:323
  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:331 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|SPEC|använd denna nyckelserver för att slå upp nycklar"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|NAMN|använd chifferalgoritmen NAMN"
  
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:352
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|NAMN|använd algoritmen NAMN för kontrollsummor"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:559
  #, 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:570
++#: sm/gpgsm.c:562
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpgsm [options] [files]\n"
@@@ -9052,50 -7294,41 +9093,50 @@@ msgstr "
  "signera, kontrollera, kryptera eller dekryptera med S/MIME-protokollet\n"
  "standardåtgärden beror på inmatningsdata\n"
  
- #: sm/gpgsm.c:774
++#: sm/gpgsm.c:766
  #, 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:785
++#: sm/gpgsm.c:777
  #, fuzzy, c-format
  #| msgid "unknown validation model `%s'\n"
  msgid "unknown validation model '%s'\n"
  msgstr "okänd valideringsmodell \"%s\"\n"
  
- #: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
  #, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "%s:%u: inget värdnamn angivet\n"
  
- #: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr "%s:%u: lösenord angivet utan användare\n"
  
- #: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
  #, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr "%s:%u: hoppar över denna rad\n"
  
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1427
  msgid "could not parse keyserver\n"
  msgstr "kunde inte tolka nyckelserver\n"
  
- #: sm/gpgsm.c:1636
++#: sm/gpgsm.c:1630
  #, fuzzy, c-format
  #| msgid "importing common certificates `%s'\n"
  msgid "importing common certificates '%s'\n"
  msgstr "importerar vanliga certifikat \"%s\"\n"
  
- #: sm/gpgsm.c:1677
++#: sm/gpgsm.c:1671
  #, 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:2033
++#: sm/gpgsm.c:2028
  msgid "invalid command (there is no implicit command)\n"
  msgstr "ogiltigt kommando (det finns inget implicit kommando)\n"
  
@@@ -9928,8 -8010,6 +9969,8 @@@ msgstr "
  msgid "CRL access not possible due to disabled %s\n"
  msgstr ""
  
 +#: dirmngr/crlfetch.c:223 dirmngr/ldap-wrapper-ce.c:488
- #: dirmngr/ldap-wrapper.c:742 dirmngr/misc.c:563
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:563
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
@@@ -10131,128 -8175,100 +10172,128 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:160
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:158
++#: dirmngr/dirmngr.c:161
  #, 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:159
++#: dirmngr/dirmngr.c:162
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:163
  #, fuzzy
  #| msgid "pass a command to the dirmngr"
  msgid "shutdown the dirmngr"
  msgstr "skicka ett kommando till dirmngr"
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:164
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
- #: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
++#: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|FIL|skriv serverlägesloggar till FIL"
  
- #: dirmngr/dirmngr.c:177
++#: dirmngr/dirmngr.c:180
  #, fuzzy
  #| msgid "Quit without saving? (y/N) "
  msgid "run without asking a user"
  msgstr "Avsluta utan att spara? (j/N) "
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:181
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:182
  #, fuzzy
  #| msgid "allow PKA lookups (DNS requests)"
  msgid "allow sending OCSP requests"
  msgstr "tillåt PKA-uppslag (DNS-förfrågningar)"
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:184
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:185
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:186
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:188
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:192
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:202
  #, 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:201
++#: dirmngr/dirmngr.c:204
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
  #, 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:207
++#: dirmngr/dirmngr.c:210
  #, fuzzy
  #| msgid "|URL|use keyserver at URL"
  msgid "|URL|use OCSP responder at URL"
  msgstr "|URL| använd nyckelservern på URL"
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:212
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:218
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:220
++#: dirmngr/dirmngr.c:223
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:225
  msgid "route all network traffic via Tor"
  msgstr ""
  
  # inställningar istället för flaggor?
  # Nej, här är det bruksanvisningen för kommandoraden.
- #: dirmngr/dirmngr.c:240
++#: dirmngr/dirmngr.c:246
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -10265,13 -8281,11 +10306,13 @@@ msgstr "
  "@\n"
  "(Se manualsidan för en fullständig lista över alla kommandon och flaggor)\n"
  
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:361
  #, 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:355
++#: dirmngr/dirmngr.c:363
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -10283,88 -8297,71 +10324,88 @@@ msgstr "
  "Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
  "Hantering av hemliga nycklar för GnuPG\n"
  
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:443
  #, 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:488 tools/gpgconf.c:543 tools/gpgconf.c:577
- #: tools/gpgconf.c:648
++#: dirmngr/dirmngr.c:496 tools/gpgconf.c:550 tools/gpgconf.c:585
++#: tools/gpgconf.c:656
  #, fuzzy, c-format
  #| msgid "usage: gpgsm [options] "
  msgid "usage: %s [options] "
  msgstr "användning: gpgsm [flaggor] "
  
- #: dirmngr/dirmngr.c:1062
++#: dirmngr/dirmngr.c:1074
  #, fuzzy
  #| 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:1301 dirmngr/server.c:1585
++#: dirmngr/dirmngr.c:1300 dirmngr/server.c:1585
  #, 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:1307 dirmngr/server.c:1591
++#: dirmngr/dirmngr.c:1306 dirmngr/server.c:1591
  #, 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:1484
++#: dirmngr/dirmngr.c:1487
  #, 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:1539 dirmngr/dirmngr.c:1623
++#: dirmngr/dirmngr.c:1542 dirmngr/dirmngr.c:1626
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "ogiltigt fingeravtryck"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
++#: dirmngr/dirmngr.c:1578 dirmngr/dirmngr.c:1604 tools/gpgconf-comp.c:4032
  #, 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:1630
++#: dirmngr/dirmngr.c:1633
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1700
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1734
++#: dirmngr/dirmngr.c:1738
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1739
++#: dirmngr/dirmngr.c:1743
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1745
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1746
++#: dirmngr/dirmngr.c:1750
  #, fuzzy
  #| msgid "not forced"
  msgid "shutdown forced\n"
  msgstr "inte tvingad"
  
- #: dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1758
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1761
++#: dirmngr/dirmngr.c:1765
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10894,36 -8792,30 +10935,36 @@@ msgstr "val misslyckades: %s\n
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2463
++#: dirmngr/server.c:2469
  #, 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:2474
++#: dirmngr/server.c:2480
  #, 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:2495
++#: dirmngr/server.c:2501
  #, 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:2503
++#: dirmngr/server.c:2509
  #, 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:2534
++#: dirmngr/server.c:2540
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2553
++#: dirmngr/server.c:2559
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
@@@ -10980,7 -8863,6 +11021,7 @@@ msgstr "
  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:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:167
  msgid "quiet"
  msgstr "tyst"
  
@@@ -11082,22 -8944,15 +11123,22 @@@ msgstr "sändande rad misslyckades: %s\
  msgid "error sending standard options: %s\n"
  msgstr "fel vid sändning av standardflaggor: %s\n"
  
 +#: tools/gpgconf-comp.c:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
- #: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
++#: tools/gpgconf-comp.c:766 tools/gpgconf-comp.c:865
  msgid "Options controlling the diagnostic output"
  msgstr "Flaggor som kontrollerar diagnosutdata"
  
 +#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
- #: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
++#: tools/gpgconf-comp.c:779 tools/gpgconf-comp.c:888
  msgid "Options controlling the configuration"
  msgstr "Flaggor som kontrollerar konfigurationen"
  
- #: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
- #: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
++#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:723
++#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:901
  msgid "Options useful for debugging"
  msgstr "Flaggor användbara för felsökning"
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
  msgid "Options controlling the security"
  msgstr "Flaggor som kontrollerar säkerheten"
  
@@@ -11147,11 -8991,9 +11188,11 @@@ msgstr "tillåt inte återanvändning a
  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:698 tools/gpgconf-comp.c:775
++#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
  msgid "|NAME|use NAME as default secret key"
  msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
  
- #: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
++#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:784
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NAMN|kryptera även till användaridentiteten NAMN"
  
@@@ -11159,186 -9000,160 +11200,204 @@@
  msgid "|SPEC|set up email aliases"
  msgstr "|SPEC|ange e-postalias (ett eller flera)"
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
++#: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
  msgid "Configuration for Keyservers"
  msgstr "Konfiguration för nyckelservrar"
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
++#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
  msgid "|URL|use keyserver at URL"
  msgstr "|URL| använd nyckelservern på URL"
  
- #: tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:741
  msgid "allow PKA lookups (DNS requests)"
  msgstr "tillåt PKA-uppslag (DNS-förfrågningar)"
  
- #: tools/gpgconf-comp.c:738
++#: tools/gpgconf-comp.c:744
  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:787
++#: tools/gpgconf-comp.c:793
  msgid "disable all access to the dirmngr"
  msgstr "inaktivera all åtkomst till dirmngr"
  
- #: tools/gpgconf-comp.c:790
++#: tools/gpgconf-comp.c:796
  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:820
++#: tools/gpgconf-comp.c:829
  msgid "do not check CRLs for root certificates"
  msgstr "kontrollera inte spärrlistor för rotcertifikat"
  
- #: tools/gpgconf-comp.c:869
++#: tools/gpgconf-comp.c:878
  msgid "Options controlling the format of the output"
  msgstr "Flaggor som kontrollerar formatet på utdata"
  
- #: tools/gpgconf-comp.c:905
++#: tools/gpgconf-comp.c:920
  msgid "Options controlling the interactivity and enforcement"
  msgstr "Flaggor som kontrollerar interaktivitet och framtvingande"
  
- #: tools/gpgconf-comp.c:918
++#: tools/gpgconf-comp.c:933
  #, fuzzy
  #| msgid "Options controlling the security"
  msgid "Options controlling the use of Tor"
  msgstr "Flaggor som kontrollerar säkerheten"
  
- #: tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:947
  msgid "Configuration for HTTP servers"
  msgstr "Konfiguration för HTTP-servrar"
  
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:958
  msgid "use system's HTTP proxy setting"
  msgstr "använd systemets HTTP-proxyinställningar"
  
- #: tools/gpgconf-comp.c:948
++#: tools/gpgconf-comp.c:963
  msgid "Configuration of LDAP servers to use"
  msgstr "Konfiguration av LDAP-servrar som ska användas"
  
- #: tools/gpgconf-comp.c:977
++#: tools/gpgconf-comp.c:992
  msgid "LDAP server list"
  msgstr "LDAP-serverlista"
  
- #: tools/gpgconf-comp.c:985
++#: tools/gpgconf-comp.c:1000
  msgid "Configuration for OCSP"
  msgstr "Konfiguration för OCSP"
  
- #: tools/gpgconf-comp.c:1066
++#: tools/gpgconf-comp.c:1081
  msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1067
++#: tools/gpgconf-comp.c:1082
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1083
  msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1069
++#: tools/gpgconf-comp.c:1084
  msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1070
++#: tools/gpgconf-comp.c:1085
  msgid "Network"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1071
++#: tools/gpgconf-comp.c:1086
  #, fuzzy
  #| msgid "Bad Passphrase"
  msgid "Passphrase Entry"
  msgstr "Felaktig lösenfras"
  
- #: tools/gpgconf-comp.c:1225
++#: tools/gpgconf-comp.c:1240
  #, fuzzy
  #| msgid "Component not found"
  msgid "Component not suitable for launching"
  msgstr "Komponenten hittades inte"
  
- #: tools/gpgconf-comp.c:3283
++#: tools/gpgconf-comp.c:3311
  #, c-format
  msgid "External verification of component %s failed"
  msgstr "Extern validering av komponenten %s misslyckades"
  
- #: tools/gpgconf-comp.c:3434
++#: tools/gpgconf-comp.c:3462
  msgid "Note that group specifications are ignored\n"
  msgstr "Observera att gruppspecifikationer ignoreras\n"
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf-comp.c:4036
+ #, 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:4038
+ #, fuzzy, c-format
+ #| msgid "error in `%s': %s\n"
+ msgid "error parsing '%s'\n"
+ msgstr "fel i \"%s\": %s\n"
+ 
++#: tools/gpgconf.c:73
  msgid "list all components"
  msgstr "lista alla komponenter"
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "check all programs"
  msgstr "kontrollera alla program"
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|list options"
  msgstr "|KOMPONENT|lista flaggor"
  
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
  msgid "|COMPONENT|change options"
  msgstr "|KOMPONENT|ändra flaggor"
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "|COMPONENT|check options"
  msgstr "|KOMPONENT|kontrollera flaggor"
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "apply global default values"
  msgstr "tillämpa globala standardvärden"
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
+ #, 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:83
  #, 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:81
++#: tools/gpgconf.c:85
  msgid "list global configuration file"
  msgstr "lista global konfigurationsfil"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  msgid "check global configuration file"
  msgstr "kontrollera global konfigurationsfil"
  
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:89
  #, fuzzy
  #| msgid "update the trust database"
  msgid "query the software version database"
  msgstr "uppdatera tillitsdatabasen"
  
- #: tools/gpgconf.c:86
++#: tools/gpgconf.c:90
  #, fuzzy
  #| msgid "list all components"
  msgid "reload all or a given component"
  msgstr "lista alla komponenter"
  
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:91
  #, fuzzy
  #| msgid "list all components"
  msgid "launch a given component"
  msgstr "lista alla komponenter"
  
- #: tools/gpgconf.c:88
++#: tools/gpgconf.c:92
  #, fuzzy
  #| msgid "list all components"
  msgid "kill a given component"
  msgstr "lista alla komponenter"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "use as output file"
  msgstr "använd som fil för utdata"
  
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:102
  msgid "activate changes at runtime, if possible"
  msgstr "aktivera ändringar vid körtid, om möjligt"
  
- #: tools/gpgconf.c:122
++#: tools/gpgconf.c:127
  #, 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:125
++#: tools/gpgconf.c:130
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpgconf [options]\n"
@@@ -11350,15 -9165,12 +11409,15 @@@ msgstr "
  "Syntax: gpgconf [flaggor]\n"
  "Hantera konfigurationsinställningar för verktygen i GnuPG-systemet\n"
  
- #: tools/gpgconf.c:545 tools/gpgconf.c:579
++#: tools/gpgconf.c:552 tools/gpgconf.c:587
  msgid "Need one component argument"
  msgstr "Behöver ett komponentargument"
  
- #: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
++#: tools/gpgconf.c:561 tools/gpgconf.c:599 tools/gpgconf.c:632
  msgid "Component not found"
  msgstr "Komponenten hittades inte"
  
- #: tools/gpgconf.c:650
++#: tools/gpgconf.c:658
  msgid "No argument allowed"
  msgstr "Inget argument tillåts"
  
diff --cc po/tr.po
index f080bdc,9dac294..fc497dd
--- a/po/tr.po
+++ b/po/tr.po
@@@ -7,7 -7,6 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg 2.0.10rc1\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-11-18 16:54+0100\n"
++"POT-Creation-Date: 2016-12-20 11:28+0100\n"
  "PO-Revision-Date: 2015-02-11 19:18+0100\n"
  "Last-Translator: Nilgün Belma Bugüner <nilgun at belgeler.gen.tr>\n"
  "Language-Team: Turkish\n"
@@@ -156,25 -127,11 +156,25 @@@ msgstr "Anahtar Parolası hatalı
  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:838 common/dotlock.c:839 g10/card-util.c:839
- #: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1306 g10/keygen.c:4577
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
++#: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't create '%s': %s\n"
  msgstr "\"%s\" oluşturulamıyor: %s\n"
  
 +#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
- #: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1307
++#: g10/import.c:305 g10/import.c:448 g10/import.c:621 g10/keygen.c:3681
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
- #: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
- #: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:825 g10/sign.c:1025
++#: g10/sign.c:1130 g10/sign.c:1275 g10/tdbdump.c:143 g10/tdbdump.c:151
++#: g10/tdbio.c:720 g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161
++#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
++#: dirmngr/certcache.c:368 dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1564
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
@@@ -239,11 -185,9 +239,11 @@@ msgstr "
  msgid "failed to create stream from socket: %s\n"
  msgstr "sokette akım oluşturulamadı: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1100
++#: agent/divert-scd.c:92 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1101
++#: agent/divert-scd.c:93 g10/call-agent.c:1102
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  
@@@ -402,47 -320,32 +402,47 @@@ msgstr "
  "@Seçenekler:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
  msgid "run in daemon mode (background)"
  msgstr "artalan süreci olarak çalışır"
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
  msgid "run in server mode (foreground)"
  msgstr "sunucu olarak (önalanda) çalışır"
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
  #, fuzzy
  #| msgid "run in server mode"
  msgid "run in supervised mode"
  msgstr "sunucu kipinde çalışır"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:170 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "ayrıntılı"
  
 +#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "biraz daha sessiz olur"
  
- #: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
  msgid "sh-style command output"
  msgstr "sh tarzı komut çıktısı"
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
  msgid "csh-style command output"
  msgstr "csh tarzı komut çıktısı"
  
- #: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
- #: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
++#: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
  msgid "|FILE|read options from FILE"
  msgstr "|DOSYA|seçenekler DOSYAdan okunur"
  
- #: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:177
  msgid "do not detach from the console"
  msgstr "konsoldan kopulmaz"
  
@@@ -525,22 -411,15 +525,22 @@@ 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:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:481 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1025 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:358
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:124 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  #, fuzzy
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr "Yazılım hatalarını lütfen <"
  
- #: agent/gpg-agent.c:491
++#: agent/gpg-agent.c:490
  #, 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:493
++#: agent/gpg-agent.c:492
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -552,149 -431,114 +552,149 @@@ msgstr "
  "Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
  "GnuPG için gizli anahtar yönetimi\n"
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:537 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:442
  #, 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:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:793
++#: agent/gpg-agent.c:1082 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:812
  #, 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"
  
- #: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
- #: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1093 agent/gpg-agent.c:1935 g10/gpg.c:2510
++#: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:817
++#: dirmngr/dirmngr.c:1670 tools/symcryptrun.c:932
  #, fuzzy, c-format
  #| msgid "option file `%s': %s\n"
  msgid "option file '%s': %s\n"
  msgstr "seçenek dosyası \"%s\": %s\n"
  
- #: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:806
++#: agent/gpg-agent.c:1101 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:825
  #, 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:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
- #: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
++#: agent/gpg-agent.c:1223 g10/gpg.c:3643 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:936 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:527
  #, 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:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
++#: agent/gpg-agent.c:2080 scd/scdaemon.c:1073 dirmngr/dirmngr.c:1081
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "soket oluşturulamıyor: %s\n"
  
- #: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
++#: agent/gpg-agent.c:2097 scd/scdaemon.c:1086 dirmngr/dirmngr.c:1094
  #, 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:2134
++#: agent/gpg-agent.c:2135
  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:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
++#: agent/gpg-agent.c:2145 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1126
  msgid "error getting nonce for the socket\n"
  msgstr "soket için tuz alınırken hata\n"
  
- #: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
++#: agent/gpg-agent.c:2150 scd/scdaemon.c:1113 dirmngr/dirmngr.c:1129
  #, 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:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
- #: dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2160 agent/gpg-agent.c:2197 scd/scdaemon.c:1121
++#: dirmngr/dirmngr.c:1138
  #, 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:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:2165 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1143
  #, c-format
  msgid "listen() failed: %s\n"
  msgstr "soket dinleme başarısız: %s\n"
  
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
++#: agent/gpg-agent.c:2172 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1149
  #, fuzzy, c-format
  #| msgid "listening on socket `%s'\n"
  msgid "listening on socket '%s'\n"
  msgstr "`%s' soketi dinlemede\n"
  
- #: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: agent/gpg-agent.c:2191 agent/gpg-agent.c:2234 g10/exec.c:199
 +#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, 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:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: agent/gpg-agent.c:2194 agent/gpg-agent.c:2239 g10/openfile.c:491
 +#: g10/openfile.c:520 sm/keydb.c:103
  #, fuzzy, c-format
  #| msgid "directory `%s' created\n"
  msgid "directory '%s' created\n"
  msgstr "dizin `%s' oluşturuldu\n"
  
- #: agent/gpg-agent.c:2244
++#: agent/gpg-agent.c:2245
  #, 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:2248
++#: agent/gpg-agent.c:2249
  #, 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:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
++#: agent/gpg-agent.c:2392 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1871
  #, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "fd %d üzerinde tuz okunurken hata: %s\n"
  
- #: agent/gpg-agent.c:2598
++#: agent/gpg-agent.c:2599
  #, 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:2603
++#: agent/gpg-agent.c:2604
  #, 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:2678
++#: agent/gpg-agent.c:2679
  #, 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:2683
++#: agent/gpg-agent.c:2684
  #, 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:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
++#: agent/gpg-agent.c:2881 scd/scdaemon.c:1272 dirmngr/dirmngr.c:2075
  #, 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:2942 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2954 scd/scdaemon.c:1321
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s durdu\n"
  
- #: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
++#: agent/gpg-agent.c:3092 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  msgid "no gpg-agent running in this session\n"
  msgstr "bu oturumda çalışan gpg-agent yok\n"
  
@@@ -711,8 -553,6 +711,8 @@@ msgstr "
  "Sözdizimi: gpg-preset-passphrase [seçenekler] ANHMAŞASI\n"
  "Parola arabelleği bakımcısı\n"
  
- #: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
++#: agent/protect-tool.c:106 g10/gpg.c:424 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:153 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -720,9 -560,6 +720,9 @@@ msgstr "
  "@Komutlar:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
- #: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:92 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:168 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -778,8 -607,6 +778,8 @@@ 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:362 dirmngr/dirmngr.c:1469
- #: tools/gpgconf.c:323
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1472
++#: tools/gpgconf.c:328
  #, fuzzy, c-format
  #| msgid "error opening `%s': %s\n"
  msgid "error opening '%s': %s\n"
@@@ -964,9 -762,6 +964,9 @@@ msgstr "koruma algoritması %d%s destek
  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:438
 +#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
- #: dirmngr/ldap-wrapper.c:710
++#: dirmngr/ldap-wrapper.c:711
  #, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "boru oluşturulurken hata: %s\n"
@@@ -979,8 -771,6 +979,8 @@@
  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:848 dirmngr/dirmngr.c:1155
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1167
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "süreç çatallanırken hata: %s\n"
@@@ -1030,28 -811,23 +1030,28 @@@ msgstr "\"%s\" sunucusuna bağlanılama
  msgid "problem setting the gpg-agent options\n"
  msgstr "gpg-agent seçenekleri ayarlanırken sorun çıktı\n"
  
- #: common/sysutils.c:144
++#: common/sysutils.c:148
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "\"core\" oluşumu iptal edilemedi: %s\n"
  
- #: common/sysutils.c:239
++#: common/sysutils.c:250
  #, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "UYARI: %s üzerinde sahiplik güvensiz: \"%s\"\n"
  
- #: common/sysutils.c:271
++#: common/sysutils.c:282
  #, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "UYARI: %s üzerinde izinler güvensiz: \"%s\"\n"
  
- #: common/sysutils.c:659
++#: common/sysutils.c:693
  #, 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:685
++#: common/sysutils.c:719
  #, fuzzy, c-format
  #| msgid "renaming `%s' to `%s' failed: %s\n"
  msgid "renaming '%s' to '%s' failed: %s\n"
@@@ -1128,7 -889,6 +1128,7 @@@ msgstr "%s:%u: eskimiş seçenek \"%s\
  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:554
++#: common/miscellaneous.c:556
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
@@@ -1244,8 -981,6 +1244,8 @@@ msgstr "Oturum anahtarı oluşturuldu
  msgid "algorithm: %s"
  msgstr "algoritma: %s"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3098
++#: scd/app-openpgp.c:3111
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "desteklenmeyen algoritma: %s"
@@@ -1437,7 -1130,6 +1437,7 @@@ msgstr "\"%.50s\" seçeneği belirsiz\n
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr "\"%.50s\" komutu belirsiz\n"
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1173
++#: common/argparse.c:401 dirmngr/dirmngr.c:1185
  msgid "out of core\n"
  msgstr "nüve dışında\n"
  
@@@ -1500,8 -1181,6 +1500,8 @@@ msgstr "kilit `%s' yapılmadı: %s\n
  msgid "waiting for lock %s...\n"
  msgstr "%s kilidi için bekleniyor...\n"
  
- #: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
- #: dirmngr/dirmngr.c:715
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:725
++#: dirmngr/dirmngr.c:734
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr "%s çok eski (gereken %s, sizinki %s)\n"
@@@ -1539,7 -1210,6 +1539,7 @@@ msgstr "beklenmeyen zırh: 
  msgid "invalid dash escaped line: "
  msgstr "araçizgisi escape'lı satır geçersiz: "
  
- #: g10/armor.c:873 g10/armor.c:1490
++#: g10/armor.c:873 g10/armor.c:1493
  #, c-format
  msgid "invalid radix64 character %02X skipped\n"
  msgstr "geçersiz radix64 karakteri %02X atlandı\n"
@@@ -1556,7 -1223,6 +1556,7 @@@ msgstr "dosya sonu belirsiz (CRC içind
  msgid "malformed CRC\n"
  msgstr "CRC bozulmuş\n"
  
- #: g10/armor.c:962 g10/armor.c:1527
++#: g10/armor.c:962 g10/armor.c:1530
  #, c-format
  msgid "CRC error; %06lX - %06lX\n"
  msgstr "CRC hatası; %06lX - %06lX\n"
@@@ -1569,16 -1233,13 +1569,16 @@@ msgstr "dosya sonu belirsiz (kuyruk iç
  msgid "error in trailer line\n"
  msgstr "kuyruk satırında hata\n"
  
- #: g10/armor.c:1303
++#: g10/armor.c:1306
  msgid "no valid OpenPGP data found.\n"
  msgstr "geçerli OpenPGP verisi yok\n"
  
- #: g10/armor.c:1308
++#: g10/armor.c:1311
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
  msgstr "geçersiz zırh: satır %d karakterden uzun\n"
  
- #: g10/armor.c:1312
++#: g10/armor.c:1315
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr ""
@@@ -1669,8 -1315,6 +1669,8 @@@ msgstr "OpenPGP anahtarı kullanılabil
  msgid "OpenPGP card no. %s detected\n"
  msgstr "%s numaralı OpenPGP kartı saptandı\n"
  
- #: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
- #: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2030
++#: g10/keygen.c:4087 g10/revoke.c:215 g10/revoke.c:618
  msgid "can't do this in batch mode\n"
  msgstr "bu önceden betik kipinde yapılamaz\n"
  
@@@ -1678,14 -1321,9 +1678,14 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "Bu komut sadece 2. sürüm kartlar için kullanılabilir\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2454
++#: g10/card-util.c:109 scd/app-openpgp.c:2467
  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:142 g10/card-util.c:1471 g10/card-util.c:1587
- #: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
- #: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1768
++#: g10/keygen.c:1945 g10/keygen.c:2313 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "Seçiminiz? "
  
@@@ -1747,10 -1371,6 +1747,10 @@@ msgstr "genel anahtarın alınacağı U
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr "Hata: URL çok uzun (sınır: %d karakter).\n"
  
- #: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
- #: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:334
++#: g10/import.c:592 g10/import.c:640 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
++#: dirmngr/dirmngr.c:1510 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
@@@ -1817,7 -1422,6 +1817,7 @@@ msgstr "anahtar işlemi mümkün değil
  msgid "not an OpenPGP card"
  msgstr "bir OpenPGP kartı değil"
  
- #: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
++#: g10/card-util.c:1173 g10/keygen.c:4106 g10/keygen.c:5092
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr "geçerli anahtar bilgisi alınırken hata: %s\n"
@@@ -1848,13 -1447,10 +1848,13 @@@ msgstr "İstediğiniz anahtar uzunluğ
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
  
- #: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
++#: g10/card-util.c:1316 g10/keygen.c:2122 g10/keygen.c:2154
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "%u bite yuvarlandı\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2207 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr "%s anahtar uzunlukları %u-%u aralığında olmalı\n"
@@@ -1913,9 -1499,6 +1913,9 @@@ msgstr "   (2) Şifreleme anahtarı\n
  msgid "   (3) Authentication key\n"
  msgstr "   (3) Kimlik kanıtlama anahtarı\n"
  
- #: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
- #: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
- #: g10/keygen.c:2314 g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1508
++#: g10/keygen.c:1794 g10/keygen.c:1822 g10/keygen.c:1952 g10/keygen.c:2060
++#: g10/keygen.c:2336 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Seçim geçersiz.\n"
  
@@@ -1950,7 -1527,6 +1950,7 @@@ msgstr "İmzalayacak mısınız? (e/H v
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1816 g10/keyedit.c:1867
++#: g10/card-util.c:1816 g10/keyedit.c:1868
  msgid "quit this menu"
  msgstr "bu menüden çık"
  
@@@ -1958,7 -1533,6 +1958,7 @@@
  msgid "show admin commands"
  msgstr "yönetici komutlarını gösterir"
  
- #: g10/card-util.c:1819 g10/keyedit.c:1870
++#: g10/card-util.c:1819 g10/keyedit.c:1871
  msgid "show this help"
  msgstr "bunu gösterir"
  
@@@ -2034,31 -1590,21 +2034,31 @@@ msgstr "Yönetici komutlarına izin ver
  msgid "Admin commands are not allowed\n"
  msgstr "Yönetici komutlarına izin verilmez\n"
  
- #: g10/card-util.c:2127 g10/keyedit.c:2816
++#: g10/card-util.c:2127 g10/keyedit.c:2817
  msgid "Invalid command  (try \"help\")\n"
  msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
  
- #: g10/decrypt.c:191 g10/encrypt.c:955
++#: g10/decrypt.c:190 g10/encrypt.c:955
  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:4851 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4904 g10/keyring.c:398 g10/keyring.c:771
  #, fuzzy, c-format
  #| msgid "can't open `%s'\n"
  msgid "can't open '%s'\n"
  msgstr "`%s' açılamadı\n"
  
 +#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
- #: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
- #: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4858 g10/keyedit.c:2051
++#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2163
  #, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "anahtar \"%s\" yok: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
- #: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
- #: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4866 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:645 g10/tofu.c:2171
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "anahtar bloğu okunurken hata: %s\n"
@@@ -2119,7 -1653,6 +2119,7 @@@ msgstr "genel anahtar \"%s\" için bir 
  msgid "use option \"--delete-secret-keys\" to delete it first.\n"
  msgstr "onu önce \"--delete-secret-keys\" ile silmelisiniz.\n"
  
- #: g10/encrypt.c:232 g10/sign.c:1292
++#: g10/encrypt.c:232 g10/sign.c:1294
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "anahtar parolası oluşturulurken hata: %s\n"
@@@ -2139,7 -1669,6 +2139,7 @@@ msgstr "%s şifrelemesi kullanılıyor\
  msgid "'%s' already compressed\n"
  msgstr "`%s' zaten sıkıştırılmış\n"
  
- #: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:610
  #, fuzzy, c-format
  #| msgid "WARNING: `%s' is an empty file\n"
  msgid "WARNING: '%s' is an empty file\n"
@@@ -2159,7 -1686,6 +2159,7 @@@ msgstr "
  "UYARI: alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı "
  "zorlanıyor\n"
  
- #: g10/encrypt.c:707 g10/sign.c:984
++#: g10/encrypt.c:707 g10/sign.c:986
  #, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2194,7 -1715,6 +2194,7 @@@ msgstr "%s şifreli veri\n
  msgid "encrypted with unknown algorithm %d\n"
  msgstr "bilinmeyen algoritma %d ile şifrelenmiş\n"
  
- #: g10/decrypt-data.c:164 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:129
  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"
@@@ -2288,8 -1790,6 +2288,8 @@@ msgstr "ihraç sırasında anahtardan m
  msgid " - skipped"
  msgstr "%s: atlandı: %s\n"
  
- #: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:845 g10/sign.c:1148
++#: g10/export.c:1251 g10/import.c:1543 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:847 g10/sign.c:1150
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
@@@ -2313,8 -1809,6 +2313,8 @@@ msgstr "anahtar %s: PGP 2.x tarzı bir 
  msgid "WARNING: nothing exported\n"
  msgstr "UYARI: hiçbir şey dışarı aktarılmadı\n"
  
- #: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
- #: g10/plaintext.c:151 g10/plaintext.c:174
++#: g10/export.c:2283 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/plaintext.c:167 g10/plaintext.c:190
  #, fuzzy, c-format
  #| msgid "error creating `%s': %s\n"
  msgid "error creating '%s': %s\n"
@@@ -2364,8 -1849,6 +2364,8 @@@ msgstr "`%s' %s üzerinden alınırken 
  msgid "No fingerprint"
  msgstr "Parmak izi yok"
  
- #: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
- #: g10/revoke.c:701
++#: g10/getkey.c:1873 g10/keyedit.c:2929 g10/keyedit.c:3016 g10/revoke.c:637
++#: g10/revoke.c:702
  #, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "gizli anahtar \"%s\" yok: %s\n"
@@@ -2398,211 -1876,167 +2398,217 @@@ 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/gpg.c:424 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:200
  msgid "make a signature"
  msgstr "bir imza yapar"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:427
  msgid "make a clear text signature"
  msgstr "açıkça okunabilen bir imza yapar"
  
- #: g10/gpg.c:426 sm/gpgsm.c:202
++#: g10/gpg.c:429 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "bağımsız bir imza yapar"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:430 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "veriyi şifreler"
  
- #: g10/gpg.c:429
++#: g10/gpg.c:432
  msgid "encryption only with symmetric cipher"
  msgstr "sadece simetrik şifre ile şifreler"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:434 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "veri şifresini açar (öntanımlı)"
  
- #: g10/gpg.c:433 sm/gpgsm.c:206
++#: g10/gpg.c:436 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "bir imzayı doğrular"
  
- #: g10/gpg.c:435 sm/gpgsm.c:207
++#: g10/gpg.c:438 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "anahtarları listeler"
  
- #: g10/gpg.c:437
++#: g10/gpg.c:440
  msgid "list keys and signatures"
  msgstr "anahtarları ve imzaları listeler"
  
- #: g10/gpg.c:438
++#: g10/gpg.c:443
  msgid "list and check key signatures"
  msgstr "anahtar imzalarını listeler ve sınar"
  
- #: g10/gpg.c:439 sm/gpgsm.c:212
++#: g10/gpg.c:445 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "anahtarları ve parmak izlerini listeler"
  
- #: g10/gpg.c:440 sm/gpgsm.c:210
++#: g10/gpg.c:446 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "gizli anahtarları listeler"
  
- #: g10/gpg.c:442 sm/gpgsm.c:213
++#: g10/gpg.c:448 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "yeni bir anahtar çifti üretir"
  
- #: g10/gpg.c:444
++#: g10/gpg.c:451
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly generate a new key pair"
  msgstr "yeni bir anahtar çifti üretir"
  
- #: g10/gpg.c:446
++#: g10/gpg.c:454
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly add a new user-id"
  msgstr "yeni bir anahtar çifti üretir"
  
- #: g10/gpg.c:449
++#: g10/gpg.c:459
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly revoke a user-id"
  msgstr "yeni bir anahtar çifti üretir"
  
- #: g10/gpg.c:451
++#: g10/gpg.c:462
+ #, fuzzy
+ #| msgid "generate a new key pair"
+ msgid "quickly set a new expiration date"
+ msgstr "yeni bir anahtar çifti üretir"
+ 
++#: g10/gpg.c:464
  msgid "full featured key pair generation"
  msgstr ""
  
- #: g10/gpg.c:452
++#: g10/gpg.c:467
  msgid "generate a revocation certificate"
  msgstr "bir yürürlükten kaldırma sertifikası üretir"
  
- #: g10/gpg.c:454 sm/gpgsm.c:215
++#: g10/gpg.c:470 sm/gpgsm.c:216
  msgid "remove keys from the public keyring"
  msgstr "anahtarları genel anahtar zincirinden siler"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:472
  msgid "remove keys from the secret keyring"
  msgstr "anahtarları gizli anahtar zincirinden siler"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:474
  #, fuzzy
  #| msgid "sign a key"
  msgid "quickly sign a key"
  msgstr "bir anahtarı imzalar"
  
- #: g10/gpg.c:460
++#: g10/gpg.c:476
  #, fuzzy
  #| msgid "sign a key locally"
  msgid "quickly sign a key locally"
  msgstr "bir anahtarı yerel olarak imzalar"
  
- #: g10/gpg.c:461
++#: g10/gpg.c:477
  msgid "sign a key"
  msgstr "bir anahtarı imzalar"
  
- #: g10/gpg.c:462
++#: g10/gpg.c:478
  msgid "sign a key locally"
  msgstr "bir anahtarı yerel olarak imzalar"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:479
  msgid "sign or edit a key"
  msgstr "bir anahtarı düzenler ve imzalar"
  
- #: g10/gpg.c:465 sm/gpgsm.c:233
++#: g10/gpg.c:481 sm/gpgsm.c:234
  msgid "change a passphrase"
  msgstr "anahtar parolası değiştirir"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:485
  msgid "export keys"
  msgstr "anahtarları gönderir"
  
- #: g10/gpg.c:468
++#: g10/gpg.c:486
  msgid "export keys to a keyserver"
  msgstr "anahtarları bir anahtar sunucusuna gönderir"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:487
  msgid "import keys from a keyserver"
  msgstr "anahtarları bir anahtar sunucusundan indirir"
  
- #: g10/gpg.c:471
++#: g10/gpg.c:490
  msgid "search for keys on a keyserver"
  msgstr "bir anahtar sunucusunda anahtarları arar"
  
- #: g10/gpg.c:473
++#: g10/gpg.c:492
  msgid "update all keys from a keyserver"
  msgstr "anahtarları bir anahtar sunucusundan günceller"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:498
  msgid "import/merge keys"
  msgstr "anahtarları indirir/katıştırır"
  
- #: g10/gpg.c:482
++#: g10/gpg.c:501
  msgid "print the card status"
  msgstr "kart durumunu basar"
  
- #: g10/gpg.c:483
++#: g10/gpg.c:502
  msgid "change data on a card"
  msgstr "kart üzerindeki veriyi değiştirir"
  
- #: g10/gpg.c:484
++#: g10/gpg.c:504
  msgid "change a card's PIN"
  msgstr "bir kartın PIN'ini değiştirir"
  
- #: g10/gpg.c:496
++#: g10/gpg.c:516
  msgid "update the trust database"
  msgstr "güvence veritabanını günceller"
  
- #: g10/gpg.c:505
++#: g10/gpg.c:525
  msgid "print message digests"
  msgstr "ileti özetlerini gösterir"
  
- #: g10/gpg.c:508 sm/gpgsm.c:228
++#: g10/gpg.c:528 sm/gpgsm.c:229
  msgid "run in server mode"
  msgstr "sunucu kipinde çalışır"
  
- #: g10/gpg.c:510
++#: g10/gpg.c:530
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:514 sm/gpgsm.c:246
++#: g10/gpg.c:534 sm/gpgsm.c:248
  msgid "create ascii armored output"
  msgstr "ascii zırhlı çıktı oluşturur"
  
- #: g10/gpg.c:517 sm/gpgsm.c:262
++#: g10/gpg.c:537 sm/gpgsm.c:264
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|KULLANICI-KİMLİĞİ|KULLANICI-KİMLİĞİ için şifreleme yapar"
  
- #: g10/gpg.c:533 sm/gpgsm.c:298
++#: g10/gpg.c:553 sm/gpgsm.c:300
  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:539
++#: g10/gpg.c:559
  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:546
++#: g10/gpg.c:566
  msgid "use canonical text mode"
  msgstr "kurallı metin kipini kullanır"
  
- #: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
++#: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
  msgid "|FILE|write output to FILE"
  msgstr "|DOSYA|çıktı DOSYAya yazılır"
  
- #: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
++#: g10/gpg.c:598 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
  msgid "do not make any changes"
  msgstr "hiçbir değişiklik yapmaz"
  
- #: g10/gpg.c:579
++#: g10/gpg.c:599
  msgid "prompt before overwriting"
  msgstr "üzerine yazmadan önce sorar"
  
- #: g10/gpg.c:628
++#: g10/gpg.c:648
  msgid "use strict OpenPGP behavior"
  msgstr "kesin OpenPGP davranışı etkin olur"
  
- #: g10/gpg.c:654 sm/gpgsm.c:355
++#: g10/gpg.c:674 sm/gpgsm.c:357
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2610,7 -2044,16 +2616,17 @@@ msgstr "
  "@\n"
  "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
  
- #: g10/gpg.c:657 sm/gpgsm.c:358
++#: g10/gpg.c:677
+ #, fuzzy
+ #| msgid ""
+ #| "@\n"
+ #| "Examples:\n"
+ #| "\n"
+ #| " -se -r Bob [file]          sign and encrypt for user Bob\n"
+ #| " --clear-sign [file]         make a clear text signature\n"
+ #| " --detach-sign [file]       make a detached signature\n"
+ #| " --list-keys [names]        show keys\n"
+ #| " --fingerprint [names]      show fingerprints\n"
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2630,13 -2073,11 +2646,13 @@@ msgstr "
  " --list-keys [isimler]      anahtarları listeler\n"
  " --fingerprint [isimler]    parmak izlerini gösterir\n"
  
- #: g10/gpg.c:1026
++#: g10/gpg.c:1047
  #, 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:1029
++#: g10/gpg.c:1050
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg [options] [files]\n"
@@@ -2651,7 -2092,6 +2667,7 @@@ msgstr "
  "imzalama, kontrol, şifreleme veya çözme\n"
  "öntanımlı işlem girilen veriye bağımlıdır\n"
  
- #: g10/gpg.c:1040 sm/gpgsm.c:588
++#: g10/gpg.c:1061 sm/gpgsm.c:580
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2659,81 -2099,66 +2675,81 @@@ msgstr "
  "\n"
  "Desteklenen algoritmalar:\n"
  
- #: g10/gpg.c:1043
++#: g10/gpg.c:1064
  msgid "Pubkey: "
  msgstr "GenAnah: "
  
- #: g10/gpg.c:1050 g10/keyedit.c:3402
++#: g10/gpg.c:1071 g10/keyedit.c:3483
  msgid "Cipher: "
  msgstr "Şifre: "
  
- #: g10/gpg.c:1057
++#: g10/gpg.c:1078
  msgid "Hash: "
  msgstr "Hash: "
  
- #: g10/gpg.c:1064 g10/keyedit.c:3451
++#: g10/gpg.c:1085 g10/keyedit.c:3532
  msgid "Compression: "
  msgstr "Sıkıştırma: "
  
- #: g10/gpg.c:1133 sm/gpgsm.c:662
++#: g10/gpg.c:1154 sm/gpgsm.c:654
  #, fuzzy, c-format
  #| msgid "usage: gpgsm [options] "
  msgid "usage: %s [options] %s\n"
  msgstr "kullanımı: gpgsm [seçenekler] "
  
- #: g10/gpg.c:1321 sm/gpgsm.c:751
++#: g10/gpg.c:1342 sm/gpgsm.c:743
  msgid "conflicting commands\n"
  msgstr "çelişen komutlar\n"
  
- #: g10/gpg.c:1339
++#: g10/gpg.c:1360
  #, 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:1537
++#: g10/gpg.c:1558
  #, 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:1540
++#: g10/gpg.c:1561
  #, 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:1543
++#: g10/gpg.c:1564
  #, 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:1549
++#: g10/gpg.c:1570
  #, 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:1552
++#: g10/gpg.c:1573
  #, 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:1555
++#: g10/gpg.c:1576
  #, 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:1561
++#: g10/gpg.c:1582
  #, 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:1564
++#: g10/gpg.c:1585
  #, fuzzy, c-format
  #| msgid ""
  #| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2741,19 -2166,16 +2757,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:1567
++#: g10/gpg.c:1588
  #, 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:1573
++#: g10/gpg.c:1594
  #, 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:1576
++#: g10/gpg.c:1597
  #, fuzzy, c-format
  #| msgid ""
  #| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2762,527 -2184,369 +2778,466 @@@ 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:1579
++#: g10/gpg.c:1600
  #, 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:1786
++#: g10/gpg.c:1816
  #, 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:1893
++#: g10/gpg.c:1925
  msgid "display photo IDs during key listings"
  msgstr "anahtarların listelenmesi sırasında foto kimliklerini gösterir"
  
- #: g10/gpg.c:1895
++#: g10/gpg.c:1927
  #, 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:1897
++#: g10/gpg.c:1929
  msgid "show policy URLs during signature listings"
  msgstr "imza listelemesi sırasında poliçe URLleri gösterilir"
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1931
  msgid "show all notations during signature listings"
  msgstr "imza listelemesi sırasında tüm simgelemi gösterir"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1933
  msgid "show IETF standard notations during signature listings"
  msgstr "imza listelemesi sırasında IETF standart simgelemlerini gösterir"
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1937
  msgid "show user-supplied notations during signature listings"
  msgstr "imza listelemesi sırasında kullanıcı kanaklı simgelemleri gösterir"
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1939
  msgid "show preferred keyserver URLs during signature listings"
  msgstr ""
  "imza listelemesi sırasında tercih edilen anahtar sunucusu adresi gösterilir"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1941
  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:1911
++#: g10/gpg.c:1943
  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:1913
++#: g10/gpg.c:1945
  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:1915
++#: g10/gpg.c:1947
  msgid "show the keyring name in key listings"
  msgstr "anahtar zinciri ismini anahtar listelerinde gösterir"
  
- #: g10/gpg.c:1917
++#: g10/gpg.c:1949
  msgid "show expiration dates during signature listings"
  msgstr "imza listelemesi sırasında zamanaşımı tarihleri gösterilir"
  
- #: g10/gpg.c:2019 g10/gpg.c:2056
++#: g10/gpg.c:2051 g10/gpg.c:2088
  #, 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:2030
++#: g10/gpg.c:2062
  #, fuzzy, c-format
  #| msgid "unknown option `%s'\n"
  msgid "unknown TOFU policy '%s'\n"
  msgstr "`%s' seçeneği bilinmiyor\n"
  
- #: g10/gpg.c:2032 g10/gpg.c:2068
++#: g10/gpg.c:2064 g10/gpg.c:2100
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2066
++#: g10/gpg.c:2098 g10/keygen.c:167
  #, fuzzy, c-format
  #| msgid "missing argument for option \"%.50s\"\n"
  msgid "invalid value for option '%s'\n"
  msgstr "\"%.50s\" seçeneği için değiştirge eksik\n"
  
- #: g10/gpg.c:2203
++#: g10/gpg.c:2235
  #, fuzzy, c-format
  #| msgid "NOTE: old default options file `%s' ignored\n"
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "BİLGİ: eski öntanımlı seçenekler dosyası `%s' yoksayıldı\n"
  
- #: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
++#: g10/gpg.c:2839 g10/gpg.c:3610 g10/gpg.c:3622
  #, 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:2978 g10/gpg.c:2990
++#: g10/gpg.c:3011 g10/gpg.c:3023
  #, 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:3012
++#: g10/gpg.c:3045
  #, 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:3044 sm/gpgsm.c:1166
++#: g10/gpg.c:3077 sm/gpgsm.c:1158
  #, 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:3097
++#: g10/gpg.c:3130
  #, 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:3119 g10/gpg.c:3322 g10/keyedit.c:5338
++#: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
  msgid "could not parse keyserver URL\n"
  msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
  
- #: g10/gpg.c:3137
++#: g10/gpg.c:3170
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n"
  
- #: g10/gpg.c:3140
++#: g10/gpg.c:3173
  msgid "invalid keyserver options\n"
  msgstr "anahtar sunucusu seçenekleri geçersiz\n"
  
- #: g10/gpg.c:3147
++#: g10/gpg.c:3180
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
  
- #: g10/gpg.c:3150
++#: g10/gpg.c:3183
  msgid "invalid import options\n"
  msgstr "içselleştirme seçenekleri geçersiz\n"
  
- #: g10/gpg.c:3156 g10/gpg.c:3171
++#: g10/gpg.c:3189 g10/gpg.c:3204
  #, fuzzy, c-format
  #| msgid "invalid list options\n"
  msgid "invalid filter option: %s\n"
  msgstr "liste seçenekleri geçersiz\n"
  
- #: g10/gpg.c:3162
++#: g10/gpg.c:3195
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
  
- #: g10/gpg.c:3165
++#: g10/gpg.c:3198
  msgid "invalid export options\n"
  msgstr "dışsallaştırma seçenekleri geçersiz\n"
  
- #: g10/gpg.c:3177
++#: g10/gpg.c:3210
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: liste seçenekleri geçersiz\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3213
  msgid "invalid list options\n"
  msgstr "liste seçenekleri geçersiz\n"
  
- #: g10/gpg.c:3188
++#: g10/gpg.c:3221
  msgid "display photo IDs during signature verification"
  msgstr "imza doğrulaması sırasında foto kimliklerini gösterir"
  
- #: g10/gpg.c:3190
++#: g10/gpg.c:3223
  msgid "show policy URLs during signature verification"
  msgstr "imza doğrulaması sırasında poliçe adreslerini gösterir"
  
- #: g10/gpg.c:3192
++#: g10/gpg.c:3225
  msgid "show all notations during signature verification"
  msgstr "imza doğrulaması sırasında tüm simgelemi gösterir"
  
- #: g10/gpg.c:3194
++#: g10/gpg.c:3227
  msgid "show IETF standard notations during signature verification"
  msgstr "imza doğrulaması sırasında IETF standart simgelemlerini gösterir"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3231
  msgid "show user-supplied notations during signature verification"
  msgstr "imza doğrulaması sırasında kullanıcı kaynaklı simgelemleri gösterir"
  
- #: g10/gpg.c:3200
++#: g10/gpg.c:3233
  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:3202
++#: g10/gpg.c:3235
  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:3204
++#: g10/gpg.c:3237
  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:3206
++#: g10/gpg.c:3239
  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:3208
++#: g10/gpg.c:3241
  msgid "validate signatures with PKA data"
  msgstr "imzaları PKA verisi ile doğrular"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3243
  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:3217
++#: g10/gpg.c:3250
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
  
- #: g10/gpg.c:3220
++#: g10/gpg.c:3253
  msgid "invalid verify options\n"
  msgstr "doğrulama seçenekleri geçersiz\n"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3260
  #, 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:3417
++#: g10/gpg.c:3452
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: özdevinimli anahtar konumlama listesi geçersiz\n"
  
- #: g10/gpg.c:3420
++#: g10/gpg.c:3455
  msgid "invalid auto-key-locate list\n"
  msgstr "özdevinimli anahtar konumlama listesi geçersiz\n"
  
- #: g10/gpg.c:3553 sm/gpgsm.c:1507
++#: g10/gpg.c:3592 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
  msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
  
- #: g10/gpg.c:3564
++#: g10/gpg.c:3603
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "UYARI: %s %s'i aşıyor\n"
  
- #: g10/gpg.c:3573
++#: g10/gpg.c:3612
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s ile %s birlikte kullanılmaz!\n"
  
- #: g10/gpg.c:3576
++#: g10/gpg.c:3615
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s, %s ile etkisiz olur!\n"
  
- #: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
++#: g10/gpg.c:3630 sm/gpgsm.c:1518 dirmngr/dirmngr.c:951
  msgid "WARNING: running with faked system time: "
  msgstr "UYARI: sahte sistem zamanıyla çalışıyor: "
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3651
  #, 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:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
++#: g10/gpg.c:3686 g10/gpg.c:3710 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "seçilen şifre algoritması geçersiz\n"
  
- #: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
++#: g10/gpg.c:3692 g10/gpg.c:3716 sm/gpgsm.c:1591 sm/gpgsm.c:1597
  msgid "selected digest algorithm is invalid\n"
  msgstr "seçilen özet algoritması geçersiz\n"
  
- #: g10/gpg.c:3659
++#: g10/gpg.c:3698
  msgid "selected compression algorithm is invalid\n"
  msgstr "seçilen şifre algoritması geçersiz\n"
  
- #: g10/gpg.c:3665
++#: g10/gpg.c:3704
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "seçilen sertifikalama özet algoritması geçersiz\n"
  
- #: g10/gpg.c:3680
++#: g10/gpg.c:3719
  msgid "completes-needed must be greater than 0\n"
  msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
  
- #: g10/gpg.c:3682
++#: g10/gpg.c:3721
  msgid "marginals-needed must be greater than 1\n"
  msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
  
- #: g10/gpg.c:3684
++#: g10/gpg.c:3723
  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:3686
++#: g10/gpg.c:3725
  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:3688
++#: g10/gpg.c:3727
  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:3691
++#: g10/gpg.c:3730
  #, fuzzy
  #| 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:3695
++#: g10/gpg.c:3734
  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:3702
++#: g10/gpg.c:3741
  msgid "invalid default preferences\n"
  msgstr "öntanımlı tercihler geçersiz\n"
  
- #: g10/gpg.c:3706
++#: g10/gpg.c:3745
  msgid "invalid personal cipher preferences\n"
  msgstr "kişisel şifre tercihleri geçersiz\n"
  
- #: g10/gpg.c:3710
++#: g10/gpg.c:3749
  msgid "invalid personal digest preferences\n"
  msgstr "kişisel özet tercihleri geçersiz\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3753
  msgid "invalid personal compress preferences\n"
  msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
  
- #: g10/gpg.c:3750
++#: g10/gpg.c:3789
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s, %s ile henüz çalışmıyor\n"
  
- #: g10/gpg.c:3797
++#: g10/gpg.c:3836
  #, fuzzy, c-format
  #| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr "%2$s kipindeyken '%1$s' şifreleme algoritması kullanılamaz\n"
  
- #: g10/gpg.c:3802
++#: g10/gpg.c:3841
  #, fuzzy, c-format
  #| msgid "you may not use digest algorithm `%s' while in %s mode\n"
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr "%2$s kipindeyken '%1$s' özet algoritması kullanılamaz\n"
  
- #: g10/gpg.c:3807
++#: g10/gpg.c:3846
  #, fuzzy, c-format
  #| msgid "you may not use compression algorithm `%s' while in %s mode\n"
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr "%2$s kipindeyken '%1$s' sıkıştırma algoritması kullanılamaz\n"
  
- #: g10/gpg.c:3906
++#: g10/gpg.c:3945
  #, 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:3918
++#: g10/gpg.c:3957
  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:3975
- msgid "--store [filename]"
- msgstr "--store [dosyaismi]"
- 
- #: g10/gpg.c:3985
- msgid "--symmetric [filename]"
- msgstr "--symmetric [dosyaismi]"
- 
- #: g10/gpg.c:3989
++#: g10/gpg.c:4028
  #, 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:4000
- msgid "--encrypt [filename]"
- msgstr "--encrypt [dosyaismi]"
- 
- #: g10/gpg.c:4016
- msgid "--symmetric --encrypt [filename]"
- msgstr "--symmetric --encrypt [dosyaismi]"
- 
- #: g10/gpg.c:4018
++#: g10/gpg.c:4057
  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:4021
++#: g10/gpg.c:4060
  #, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr "%s kipindeyken  --symmetric --encrypt kullanamazsınız\n"
  
- #: g10/gpg.c:4042
- msgid "--sign [filename]"
- msgstr "--sign [dosyaismi]"
- 
- #: g10/gpg.c:4058
- msgid "--sign --encrypt [filename]"
- msgstr "--sign --encrypt [dosyaismi]"
- 
- #: g10/gpg.c:4076
- msgid "--symmetric --sign --encrypt [filename]"
- msgstr "--symmetric --sign --encrypt [dosyaismi]"
- 
- #: g10/gpg.c:4078
++#: g10/gpg.c:4117
  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:4081
++#: g10/gpg.c:4120
  #, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr "%s kipindeyken --symmetric --sign --encrypt kullanamazsınız.\n"
  
- #: g10/gpg.c:4105
- msgid "--sign --symmetric [filename]"
- msgstr "--sign --symmetric [DOSYA]"
- 
- #: g10/gpg.c:4117
- msgid "--clearsign [filename]"
- msgstr "--clearsign [dosyaismi]"
- 
- #: g10/gpg.c:4147
- msgid "--decrypt [filename]"
- msgstr "--decrypt [dosyaismi]"
- 
- #: g10/gpg.c:4174
- msgid "--sign-key user-id"
- msgstr "--sign-key kullanıcı-kimliği"
- 
- #: g10/gpg.c:4178
- msgid "--lsign-key user-id"
- msgstr "--lsign-key kullanıcı-kimliği"
- 
- #: g10/gpg.c:4199
- msgid "--edit-key user-id [commands]"
- msgstr "--edit-key kullanıcı-kimliği [komutlar]"
- 
- #: g10/gpg.c:4215
- #, fuzzy
- msgid "--passwd <user-id>"
- msgstr "--sign-key kullanıcı-kimliği"
- 
- #: g10/gpg.c:4411 g10/keyserver.c:1837
++#: g10/gpg.c:4462 g10/keyserver.c:1837
  #, 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:4416
++#: g10/gpg.c:4467
  #, 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:4422
++#: g10/gpg.c:4473
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4486
  #, 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:4447
++#: g10/gpg.c:4498
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "anahtar sunucusunda arama başarısız: %s\n"
  
- #: g10/gpg.c:4460
++#: g10/gpg.c:4511
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4578
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "zırhın kaldırılması başarısız: %s\n"
  
- #: g10/gpg.c:4538
++#: g10/gpg.c:4589
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "zırhlama başarısız: %s\n"
  
- #: g10/gpg.c:4630
++#: g10/gpg.c:4681
  #, 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:4776 g10/tofu.c:2002
++#: g10/gpg.c:4827 g10/tofu.c:2151
  #, 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:4788
++#: g10/gpg.c:4839
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4835
- msgid "[filename]"
- msgstr "[dosyaismi]"
- 
- #: g10/gpg.c:4841
++#: g10/gpg.c:4894
  msgid "Go ahead and type your message ...\n"
  msgstr "İletinizi yazın ...\n"
  
- #: g10/gpg.c:5179
++#: g10/gpg.c:5232
  msgid "the given certification policy URL is invalid\n"
  msgstr "belirtilen sertifika güvence adresi geçersiz\n"
  
- #: g10/gpg.c:5181
++#: g10/gpg.c:5234
  msgid "the given signature policy URL is invalid\n"
  msgstr "belirtilen imza güvence adresi geçersiz\n"
  
- #: g10/gpg.c:5214
++#: g10/gpg.c:5267
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
  
@@@ -3294,7 -2556,6 +3249,7 @@@ msgstr "|DOSYA|anahtarlar DOSYA anahta
  msgid "make timestamp conflicts only a warning"
  msgstr "zaman damgası çelişkilerini uyarı olarak bildirir"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:345
++#: g10/gpgv.c:82 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|durum bilgisini bu FD'ye yazar"
  
@@@ -3325,138 -2581,110 +3280,138 @@@ msgstr "yardım mevcut değil
  msgid "No help available for '%s'"
  msgstr "\"%s\" için yardım mevcut değil"
  
- #: g10/import.c:151
++#: g10/import.c:152
  msgid "import signatures that are marked as local-only"
  msgstr "salt-yerel olarak imlenmiş imzaları ithal eder"
  
- #: g10/import.c:154
++#: g10/import.c:155
  msgid "repair damage from the pks keyserver during import"
  msgstr "ithalat sırasında pks anahtar sunucusundaki bozukluğu giderir"
  
- #: g10/import.c:157
++#: g10/import.c:158
  #, fuzzy
  #| msgid "do not update the trustdb after import"
  msgid "do not clear the ownertrust values during import"
  msgstr "ithalat sonrası güvence veritabanını güncellemez"
  
- #: g10/import.c:160
++#: g10/import.c:161
  msgid "do not update the trustdb after import"
  msgstr "ithalat sonrası güvence veritabanını güncellemez"
  
- #: g10/import.c:163
++#: g10/import.c:164
  #, fuzzy
  #| msgid "show key fingerprint"
  msgid "show key during import"
  msgstr "parmakizini gösterir"
  
- #: g10/import.c:166
++#: g10/import.c:167
  msgid "only accept updates to existing keys"
  msgstr "güncellemeleri sadece mevcut anahtarlar için kabul eder"
  
- #: g10/import.c:169
++#: g10/import.c:170
  msgid "remove unusable parts from key after import"
  msgstr "ithalat sonrası anahtardan kullanışsız parçaları kaldırır"
  
- #: g10/import.c:172
++#: g10/import.c:173
  msgid "remove as much as possible from key after import"
  msgstr "ithalat sonrası anahtardan mümkün olduğunca çok şey kaldırır"
  
- #: g10/import.c:175
++#: g10/import.c:176
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:326 g10/import.c:568
++#: g10/import.c:327 g10/import.c:569
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "%d türündeki blok atlanıyor\n"
  
- #: g10/import.c:585
++#: g10/import.c:586
  #, c-format
  msgid "%lu keys processed so far\n"
  msgstr "şu ana kadar %lu anahtar işlendi\n"
  
- #: g10/import.c:655
++#: g10/import.c:656
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "İşlenmiş toplam miktar: %lu\n"
  
- #: g10/import.c:658
++#: g10/import.c:659
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "     yeni anahtarlar atlandı: %lu\n"
  
- #: g10/import.c:660
++#: g10/import.c:661
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "     yeni anahtarlar atlandı: %lu\n"
  
- #: g10/import.c:663
++#: g10/import.c:664
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "         kullanıcı kimliksiz: %lu\n"
  
- #: g10/import.c:666 sm/import.c:130
++#: g10/import.c:667 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "                      alınan: %lu"
  
- #: g10/import.c:670 sm/import.c:134
++#: g10/import.c:671 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "                   değişmedi: %lu\n"
  
- #: g10/import.c:672
++#: g10/import.c:673
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "      yeni kullanıcı kimliği: %lu\n"
  
- #: g10/import.c:674
++#: g10/import.c:675
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "    yeni yardımcı anahtarlar: %lu\n"
  
- #: g10/import.c:676
++#: g10/import.c:677
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "                yeni imzalar: %lu\n"
  
- #: g10/import.c:678
++#: g10/import.c:679
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "      yeni anahtar iptalleri: %lu\n"
  
- #: g10/import.c:680 sm/import.c:136
++#: g10/import.c:681 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "     gizli anahtarlar okundu: %lu\n"
  
- #: g10/import.c:682 sm/import.c:138
++#: g10/import.c:683 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "  gizli anahtarlar indirildi: %lu\n"
  
- #: g10/import.c:684 sm/import.c:140
++#: g10/import.c:685 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr "  gizli anahtarlar değişmedi: %lu\n"
  
- #: g10/import.c:686 sm/import.c:142
++#: g10/import.c:687 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "             alınamadı: %lu\n"
  
- #: g10/import.c:688
++#: g10/import.c:689
  #, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "    temizlenen imzalar: %lu\n"
  
- #: g10/import.c:690
++#: g10/import.c:691
  #, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "     temizlenen kullanıcı kimlikleri: %lu\n"
  
- #: g10/import.c:1034
++#: g10/import.c:1035
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
@@@ -3465,197 -2693,159 +3420,197 @@@ msgstr "
  "UYARI: anahtar %s bu kullanıcı kimliklerde kullanışsız algoritmalar için "
  "tercihler içeriyor:\n"
  
- #: g10/import.c:1076
++#: g10/import.c:1077
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr "         \"%s\": şifreleme algoritması %s için tercih edilir\n"
  
- #: g10/import.c:1091
++#: g10/import.c:1092
  #, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "         \"%s\": özet algoritması %s için tercih edilir\n"
  
- #: g10/import.c:1103
++#: g10/import.c:1104
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr ""
  "         \"%s\": sıkıştırma algoritması %s için tercih edilir\n"
  "\n"
  
- #: g10/import.c:1116
++#: g10/import.c:1117
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr "tercihlerinizi güncellemenizi ve\n"
  
- #: g10/import.c:1118
++#: g10/import.c:1119
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  "olası algoritma uyuşmazlığı sorunlarından kaçınmak için bu anahtarı\n"
  "tekrar dağıtmanızı şiddetle öneririz.\n"
  
- #: g10/import.c:1143
++#: g10/import.c:1144
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  "tercihlerinizi böyle güncelleyemezsiniz: gpg --edit-key %s updpref save\n"
  
- #: g10/import.c:1379 g10/import.c:2167
++#: g10/import.c:1380 g10/import.c:2168
  #, c-format
  msgid "key %s: no user ID\n"
  msgstr "anahtar %s: kullanıcı kimliği yok\n"
  
- #: g10/import.c:1385
++#: g10/import.c:1386
  #, fuzzy, c-format
  #| msgid "skipped \"%s\": %s\n"
  msgid "key %s: %s\n"
  msgstr "\"%s\" atlandı: %s\n"
  
- #: g10/import.c:1386 g10/import.c:2141
++#: g10/import.c:1387 g10/import.c:2142
  msgid "rejected by import screener"
  msgstr ""
  
- #: g10/import.c:1416
++#: g10/import.c:1417
  #, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "anahtar %s: PKS yardımcı anahtar bozulması giderildi\n"
  
- #: g10/import.c:1434
++#: g10/import.c:1435
  #, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "anahtar %s: öz-imzalı olmayan kullanıcı kimliği \"%s\" kabul edildi\n"
  
- #: g10/import.c:1444 g10/import.c:1475
++#: g10/import.c:1445 g10/import.c:1476
  #, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "anahtar %s: geçerli kullanıcı kimliği yok\n"
  
- #: g10/import.c:1446
++#: g10/import.c:1447
  msgid "this may be caused by a missing self-signature\n"
  msgstr "bu kayıp bir öz-imza yüzünden meydana gelebilir\n"
  
- #: g10/import.c:1516 g10/import.c:2318
++#: g10/import.c:1517 g10/import.c:2319
  #, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "anahtar %s: genel anahtar yok: %s\n"
  
- #: g10/import.c:1522
++#: g10/import.c:1523
  #, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "anahtar %s: yeni anahtar - atlandı\n"
  
- #: g10/import.c:1537
++#: g10/import.c:1538
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "yazılabilir bir anahtar zinciri yok: %s\n"
  
- #: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
++#: g10/import.c:1547 g10/import.c:1648 g10/import.c:2385
  #, fuzzy, c-format
  #| msgid "error writing keyring `%s': %s\n"
  msgid "error writing keyring '%s': %s\n"
  msgstr "\"%s\" anahtarlığına yazarken hata oluştu: %s\n"
  
- #: g10/import.c:1566
++#: g10/import.c:1567
  #, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "anahtar %s: genel anahtar \"%s\" alındı\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1591
  #, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "anahtar %s: bizim kopyamızla eşleşmiyor\n"
  
- #: g10/import.c:1606 g10/import.c:2342
++#: g10/import.c:1607 g10/import.c:2343
  #, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "anahtar %s: özgün anahtar bloku bulunamadı: %s\n"
  
- #: g10/import.c:1614 g10/import.c:2349
++#: g10/import.c:1615 g10/import.c:2350
  #, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "anahtar %s: özgün anahtar bloku okunamadı: %s\n"
  
- #: g10/import.c:1657
++#: g10/import.c:1658
  #, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "anahtar %s: \"%s\" 1 yeni kullanıcı kimliği\n"
  
- #: g10/import.c:1660
++#: g10/import.c:1661
  #, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "anahtar %s: \"%s\" %d yeni kullanıcı kimliği\n"
  
- #: g10/import.c:1663
++#: g10/import.c:1664
  #, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "anahtar %s: \"%s\" 1 yeni imza\n"
  
- #: g10/import.c:1666
++#: g10/import.c:1667
  #, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "anahtar %s: \"%s\" %d yeni imza\n"
  
- #: g10/import.c:1669
++#: g10/import.c:1670
  #, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "anahtar %s: %s 1 yeni yardımcı anahtar\n"
  
- #: g10/import.c:1672
++#: g10/import.c:1673
  #, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "anahtar %s: \"%s\" %d yeni yardımcı anahtar\n"
  
- #: g10/import.c:1675
++#: g10/import.c:1676
  #, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "anahtar %s: \"%s\" %d imza temizlendi\n"
  
- #: g10/import.c:1678
++#: g10/import.c:1679
  #, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "anahtar %s: \"%s\" %d imza temizlendi\n"
  
- #: g10/import.c:1681
++#: g10/import.c:1682
  #, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "anahtar %s: \"%s\" %d kullanıcı kimliği temizlendi\n"
  
- #: g10/import.c:1684
++#: g10/import.c:1685
  #, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "anahtar %s: \"%s\" %d kullanıcı kimliği temizlendi\n"
  
- #: g10/import.c:1707
++#: g10/import.c:1708
  #, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "anahtar %s: \"%s\" değişmedi\n"
  
- #: g10/import.c:2019 g10/import.c:2264
++#: g10/import.c:2020 g10/import.c:2265
  #, c-format
  msgid "key %s: secret key imported\n"
  msgstr "anahtar %s: gizli anahtar alındı\n"
  
- #: g10/import.c:2027
++#: g10/import.c:2028
  #, fuzzy, c-format
  #| msgid "skipped: secret key already present\n"
  msgid "key %s: secret key already exists\n"
  msgstr "atlandı: gizli anahtar zaten var\n"
  
- #: g10/import.c:2035
++#: g10/import.c:2036
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "key %s: error sending to agent: %s\n"
  msgstr "%s komutu gönderilirken hata: %s\n"
  
- #: g10/import.c:2140
++#: g10/import.c:2141
  #, fuzzy, c-format
  #| msgid "secret key \"%s\" not found: %s\n"
  msgid "secret key %s: %s\n"
  msgstr "gizli anahtar \"%s\" yok: %s\n"
  
- #: g10/import.c:2160 g10/import.c:2195
++#: g10/import.c:2161 g10/import.c:2196
  msgid "importing secret keys not allowed\n"
  msgstr "gizli anahtarı alımına izin verilmez\n"
  
- #: g10/import.c:2184
++#: g10/import.c:2185
  #, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr "anahtar %s: geçersiz şifreli (%d) gizli anahtar - atlandı\n"
@@@ -3670,147 -2860,120 +3625,147 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2256
++#: g10/import.c:2257
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2311
++#: g10/import.c:2312
  #, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
  "anahtar %s: genel anahtar değil - yürürlükten kaldırma sertifikası "
  "uygulanamaz\n"
  
- #: g10/import.c:2360
++#: g10/import.c:2361
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr ""
  "anahtar %s: yürürlükten kaldırma sertifikası geçersiz: %s - reddedildi\n"
  
- #: g10/import.c:2393
++#: g10/import.c:2394
  #, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "anahtar %s: \"%s\" yürürlükten kaldırma sertifikası alındı\n"
  
- #: g10/import.c:2469
++#: g10/import.c:2470
  #, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "anahtar %s: imza için kullanıcı kimliği yok\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2487
  #, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr ""
  "anahtar %s: genel anahtar algoritması, kullanıcı kimliği \"%s\" için "
  "desteklenmiyor\n"
  
- #: g10/import.c:2488
++#: g10/import.c:2489
  #, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "anahtar %s: kullanıcı kimliği \"%s\" için öz-imza geçersiz\n"
  
- #: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
++#: g10/import.c:2506 g10/import.c:2532 g10/import.c:2583
  #, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "anahtar %s: genel anahtar algoritması desteklenmiyor\n"
  
- #: g10/import.c:2506
++#: g10/import.c:2507
  #, fuzzy, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "anahtar %s: doğrudan anahtar imzası eklendi\n"
  
- #: g10/import.c:2520
++#: g10/import.c:2521
  #, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "anahtar %s: anahtarı garantilemek için yardımcı anahtar yok\n"
  
- #: g10/import.c:2533
++#: g10/import.c:2534
  #, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "anahtar %s: yardımcı anahtar garantileme geçersiz\n"
  
- #: g10/import.c:2549
++#: g10/import.c:2550
  #, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "anahtar %s: çok sayıda yardımcı anahtar bağlantısı silindi\n"
  
- #: g10/import.c:2571
++#: g10/import.c:2572
  #, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "anahtar %s: anahtarı yürürlükten kaldırılacak yardımcı anahtar yok\n"
  
- #: g10/import.c:2584
++#: g10/import.c:2585
  #, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "anahtar %s: yardımcı anahtar yürürlükten kaldırması geçersiz\n"
  
- #: g10/import.c:2599
++#: g10/import.c:2600
  #, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr ""
  "anahtar %s: çok sayıda yardımcı anahtar yürürlükten kaldırması silindi\n"
  
- #: g10/import.c:2641
++#: g10/import.c:2642
  #, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "anahtar %s: kullanıcı kimliği \"%s\" atlandı\n"
  
- #: g10/import.c:2665
++#: g10/import.c:2666
  #, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "anahtar %s: yardımcı anahtar atlandı\n"
  
- #: g10/import.c:2694
++#: g10/import.c:2695
  #, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "anahtar %s: imza gönderilebilir değil (0x%02X sınıfı) - atlandı\n"
  
- #: g10/import.c:2705
++#: g10/import.c:2706
  #, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "anahtar %s: yürürlükten kaldırma sertifikası yanlış yerde - atlandı\n"
  
- #: g10/import.c:2723
++#: g10/import.c:2724
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "anahtar %s: yürürlükten kaldırma sertifikası geçersiz: %s - atlandı\n"
  
- #: g10/import.c:2737
++#: g10/import.c:2738
  #, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "anahtar %s: yardımcı anahtar imzası yanlış yerde - atlandı\n"
  
- #: g10/import.c:2745
++#: g10/import.c:2746
  #, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "anahtar %s: umulmayan imza sınıfı (0x%02X) - atlandı\n"
  
- #: g10/import.c:2887
++#: g10/import.c:2888
  #, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "anahtar %s: çift kullanıcı kimliği saptandı - birleştirildi\n"
  
- #: g10/import.c:2951
++#: g10/import.c:2952
  #, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr ""
  "UYARI: anahtar %s yürürlükten kaldırılmış olmalı: yürürlükten kaldırma "
  "anahtarı %s alınıyor\n"
  
- #: g10/import.c:2967
++#: g10/import.c:2968
  #, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr ""
  "UYARI: anahtar %s yürürlükten kaldırılmış olabilir: yürürlükten kaldırma "
  "anahtarı %s mevcut değil.\n"
  
- #: g10/import.c:3031
++#: g10/import.c:3032
  #, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "anahtar %s: \"%s\" yürürlükten kaldırma sertifikası eklendi\n"
  
- #: g10/import.c:3069
++#: g10/import.c:3070
  #, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "anahtar %s: doğrudan anahtar imzası eklendi\n"
@@@ -3851,52 -3008,42 +3806,52 @@@ msgstr "anahtar bloku özkaynağı `%s'
  msgid "error opening key DB: %s\n"
  msgstr "'%s' açılırken hata: %s\n"
  
- #: g10/keydb.c:1782
++#: g10/keydb.c:1786
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "anahtar zinciri önbelleği yeniden oluşturulurken hata: %s\n"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[revocation]"
  msgstr "[yürürlükten kaldırma]"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[self-signature]"
  msgstr "[öz-imza]"
  
- #: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
++#: g10/keyedit.c:433 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: dirmngr/ldap-wrapper.c:694
  #, fuzzy, c-format
  #| msgid "error allocating enough memory: %s\n"
  msgid "error allocating memory: %s\n"
  msgstr "yeterli bellek ayrılırken hata: %s\n"
  
- #: g10/keyedit.c:629
++#: g10/keyedit.c:630
  #, fuzzy, c-format
  #| msgid "key %s: unsupported public key algorithm\n"
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr "anahtar %s: genel anahtar algoritması desteklenmiyor\n"
  
- #: g10/keyedit.c:638
++#: g10/keyedit.c:639
  #, fuzzy, c-format
  #| msgid "card does not support digest algorithm %s\n"
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "kart %s özet algoritmasını desteklemiyor\n"
  
- #: g10/keyedit.c:800
++#: g10/keyedit.c:801
  #, fuzzy
  #| msgid "Good signature from"
  msgid " (reordered signatures follow)"
  msgstr "Buradaki imzeler iyi:"
  
- #: g10/keyedit.c:913
++#: g10/keyedit.c:914
  #, fuzzy, c-format
  #| msgid "skipped \"%s\": %s\n"
  msgid "key %s:\n"
  msgstr "\"%s\" atlandı: %s\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:917
  #, fuzzy, c-format
  #| msgid "User ID \"%s\": %d signature removed\n"
  msgid "%d duplicate signature removed\n"
@@@ -3904,7 -3051,6 +3859,7 @@@ msgid_plural "%d duplicate signatures r
  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:919 g10/keylist.c:480
++#: g10/keyedit.c:920 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
@@@ -3912,7 -3058,6 +3867,7 @@@ msgid_plural "%d signatures not checke
  msgstr[0] "1 imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
  msgstr[1] "1 imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
  
- #: g10/keyedit.c:923 g10/keylist.c:476
++#: g10/keyedit.c:924 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
@@@ -3920,7 -3065,6 +3875,7 @@@ msgid_plural "%d bad signatures\n
  msgstr[0] "%d kötü imza\n"
  msgstr[1] "%d kötü imza\n"
  
- #: g10/keyedit.c:927
++#: g10/keyedit.c:928
  #, fuzzy, c-format
  #| msgid "Good signature from"
  msgid "%d signature reordered\n"
@@@ -3928,14 -3072,12 +3883,14 @@@ msgid_plural "%d signatures reordered\n
  msgstr[0] "Buradaki imzeler iyi:"
  msgstr[1] "Buradaki imzeler iyi:"
  
- #: g10/keyedit.c:932
++#: g10/keyedit.c:933
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:992 g10/pkclist.c:274
++#: g10/keyedit.c:993 g10/pkclist.c:274
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
  "keys\n"
@@@ -3946,17 -3088,14 +3901,17 @@@ msgstr "
  "derecesine lütfen karar verin. (pasportuna mı bakarsınız yoksa farklı\n"
  "kaynaklardan parmakizlerini mi kontrol edersiniz...) kararınızı verin\n"
  
- #: g10/keyedit.c:996 g10/pkclist.c:286
++#: g10/keyedit.c:997 g10/pkclist.c:286
  #, c-format
  msgid "  %d = I trust marginally\n"
  msgstr " %d = Şöyle böyle güveniyorum\n"
  
- #: g10/keyedit.c:997 g10/pkclist.c:288
++#: g10/keyedit.c:998 g10/pkclist.c:288
  #, c-format
  msgid "  %d = I trust fully\n"
  msgstr " %d = Tamamen güveniyorum\n"
  
- #: g10/keyedit.c:1015
++#: g10/keyedit.c:1016
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
@@@ -3966,50 -3105,38 +3921,50 @@@ msgstr "
  "1'den büyük bir derinlik, imzaladığınız anhatarın kendi yararınıza\n"
  "güvence imzaları yapmayı mümkün kılar.\n"
  
- #: g10/keyedit.c:1032
++#: g10/keyedit.c:1033
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr "Bu imzayı kısıtlayacak bir etki alanı girin, yoksa <enter> tuşlayın.\n"
  
- #: g10/keyedit.c:1160
++#: g10/keyedit.c:1161
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1168
++#: g10/keyedit.c:1169
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
  
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
- #: g10/keyedit.c:2246
++#: g10/keyedit.c:1178 g10/keyedit.c:1206 g10/keyedit.c:1233 g10/keyedit.c:1417
++#: g10/keyedit.c:2247
  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:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
- #: g10/keyedit.c:2251 g10/keyedit.c:3177
++#: g10/keyedit.c:1192 g10/keyedit.c:1220 g10/keyedit.c:1247 g10/keyedit.c:1423
++#: g10/keyedit.c:2252 g10/keyedit.c:3178
  msgid "  Unable to sign.\n"
  msgstr "  İmzalanamıyor.\n"
  
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1197
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "Kullanıcı kimliği \"%s\" zamanaşımına uğradı."
  
- #: g10/keyedit.c:1224
++#: g10/keyedit.c:1225
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "Kullanıcı kimliği \"%s\" öz-imzalı değil."
  
- #: g10/keyedit.c:1253
++#: g10/keyedit.c:1254
  #, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "Kullanıcı kimliği \"%s\" imzalanabilir.  "
  
- #: g10/keyedit.c:1255
++#: g10/keyedit.c:1256
  msgid "Sign it? (y/N) "
  msgstr "İmzalayacak mısınız? (e/H veya y/N) "
  
- #: g10/keyedit.c:1282
++#: g10/keyedit.c:1283
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -4018,12 -3145,10 +3973,12 @@@ msgstr "
  "\"%s\" üzerindeki öz-imza\n"
  "bir PGP 2.x tarzı imza.\n"
  
- #: g10/keyedit.c:1291
++#: g10/keyedit.c:1292
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr ""
  "Bir OpenPGP öz-imzası haline getirilmesini istiyor musunuz? (e/H veya y/N) "
  
- #: g10/keyedit.c:1304
++#: g10/keyedit.c:1305
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -4032,13 -3157,11 +3987,13 @@@ msgstr "
  "\"%s\" üzerindeki imzanızın\n"
  "kullanım süresi dolmuş.\n"
  
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:1310
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr ""
  "Yeni imzanızın süresi dolmuş biriyle değiştirilmesini ister misiniz? (e/H "
  "veya y/N) "
  
- #: g10/keyedit.c:1330
++#: g10/keyedit.c:1331
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -4047,46 -3170,37 +4002,46 @@@ msgstr "
  "\"%s\" üzerindeki imzanız\n"
  "dahili bir imza.\n"
  
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:1336
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr ""
  "Bu imzanın dışarda da geçerli hale getirilmesini istiyor musunuz? (e/H veya "
  "y/N) "
  
- #: g10/keyedit.c:1355
++#: g10/keyedit.c:1356
  #, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "\"%s\" zaten %s anahtarıyla yerel olarak imzalanmış\n"
  
- #: g10/keyedit.c:1359
++#: g10/keyedit.c:1360
  #, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "\"%s\" zaten %s anahtarıyla imzalanmış\n"
  
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:1365
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "Onu yine de imzalamak istiyor musunuz? (e/H veya y/N) "
  
- #: g10/keyedit.c:1386
++#: g10/keyedit.c:1387
  #, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "%s anahtarı ile imzalanacak hiçbir şey yok\n"
  
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1411
  msgid "This key has expired!"
  msgstr "Bu anahtarın kullanım süresi dolmuş!"
  
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1429
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "Bu anahtarın geçerliliği %s de bitiyor.\n"
  
- #: g10/keyedit.c:1434
++#: g10/keyedit.c:1435
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr ""
  "İmzanızın da aynı süreyle geçerli olmasını ister misiniz? (E/h veya Y/n) "
  
- #: g10/keyedit.c:1475
++#: g10/keyedit.c:1476
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -4095,33 -3209,27 +4050,33 @@@ msgstr "
  "Bu anahtarın ismi yukarda yazılı kişiye ait olduğunu ne kadar dikkatli\n"
  "doğruladınız?  Bu sorunun cevabını bilmiyorsanız \"0\" yazın.\n"
  
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1481
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) Cevabı bilmiyorum. %s\n"
  
- #: g10/keyedit.c:1482
++#: g10/keyedit.c:1483
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) Tamamen kontrol edildi.%s\n"
  
- #: g10/keyedit.c:1484
++#: g10/keyedit.c:1485
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) İlişkisel denetim yaptım.%s\n"
  
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:1488
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) Çok dikkatli bir denetim yaptım.%s\n"
  
- #: g10/keyedit.c:1494
++#: g10/keyedit.c:1495
  #, fuzzy
  #| msgid "Your selection? (enter `?' for more information): "
  msgid "Your selection? (enter '?' for more information): "
  msgstr "Seçiminiz? (daha fazla bilgi için: '?'): "
  
- #: g10/keyedit.c:1521
++#: g10/keyedit.c:1522
  #, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -4131,232 -3239,178 +4086,232 @@@ msgstr "
  "gerçekten\n"
  "emin misiniz?\n"
  
- #: g10/keyedit.c:1529
++#: g10/keyedit.c:1530
  msgid "This will be a self-signature.\n"
  msgstr "Bu bir öz-imza olacak.\n"
  
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:1535
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr "UYARI: imza dışarı gönderilemez olarak imlenmeyecek.\n"
  
- #: g10/keyedit.c:1541
++#: g10/keyedit.c:1542
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr "UYARI: imza yürürlükten kaldırılamaz olarak imlenmeyecek.\n"
  
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1552
  msgid "The signature will be marked as non-exportable.\n"
  msgstr "İmza dışarı gönderilemez olarak imlenecek.\n"
  
- #: g10/keyedit.c:1558
++#: g10/keyedit.c:1559
  msgid "The signature will be marked as non-revocable.\n"
  msgstr "İmza yürürlükten kaldırılamaz olarak imlenecek.\n"
  
- #: g10/keyedit.c:1565
++#: g10/keyedit.c:1566
  msgid "I have not checked this key at all.\n"
  msgstr "Her şeyiyle bu anahtarı sınayamadım.\n"
  
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:1571
  msgid "I have checked this key casually.\n"
  msgstr "Bu anahtarı karşılaştırmalı olarak sınadım.\n"
  
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:1576
  msgid "I have checked this key very carefully.\n"
  msgstr "Bu anahtarı çok dikkatle sınadım.\n"
  
- #: g10/keyedit.c:1587
++#: g10/keyedit.c:1588
  msgid "Really sign? (y/N) "
  msgstr "Gerçekten imzalayacak mısınız? (e/H veya y/N) "
  
- #: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
- #: g10/keyedit.c:6463 g10/sign.c:323
++#: g10/keyedit.c:1639 g10/keyedit.c:6308 g10/keyedit.c:6391 g10/keyedit.c:6500
++#: g10/keyedit.c:6562 g10/sign.c:325
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "imzalama başarısız: %s\n"
  
- #: g10/keyedit.c:1725
++#: g10/keyedit.c:1726
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  "Anahtar sadece kısa veya karta özel öğeler içeriyor,\n"
  "değiştirilecek bir anahtar parolası yok.\n"
  
- #: g10/keyedit.c:1755
++#: g10/keyedit.c:1756
  #, fuzzy, c-format
  #| msgid "error creating passphrase: %s\n"
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "anahtar parolası oluşturulurken hata: %s\n"
  
- #: g10/keyedit.c:1869
++#: g10/keyedit.c:1870
  msgid "save and quit"
  msgstr "kaydet ve çık"
  
- #: g10/keyedit.c:1872
++#: g10/keyedit.c:1873
  msgid "show key fingerprint"
  msgstr "parmakizini gösterir"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1874
  #, fuzzy
  msgid "show the keygrip"
  msgstr "Simgelemi giriniz: "
  
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1875
  msgid "list key and user IDs"
  msgstr "anahtarı ve kullanıcı kimliğini gösterir"
  
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1877
  msgid "select user ID N"
  msgstr "N kullanıcı kimliğini seçer"
  
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1878
  msgid "select subkey N"
  msgstr "N yardımcı anahtarını"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1879
  msgid "check signatures"
  msgstr "imzaları sınar"
  
- #: g10/keyedit.c:1884
++#: g10/keyedit.c:1885
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr ""
  "seçilen kullanıcı kimliği imzalar [* ilgili komutlar için aşağıya bakın]"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1890
  msgid "sign selected user IDs locally"
  msgstr "kullanıcı kimlikleri yerel olarak imzalar"
  
- #: g10/keyedit.c:1890
++#: g10/keyedit.c:1891
  msgid "sign selected user IDs with a trust signature"
  msgstr "seçili kullanıcı kimlikleri bir güvence imzasıyla imzalar"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1893
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr ""
  "seçili kullanıcı kimlikleri yürürlükten kaldırılamayan bir imzayla imzalar"
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1895
  msgid "add a user ID"
  msgstr "bir kullanıcı kimliği ekler"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1897
  msgid "add a photo ID"
  msgstr "bir foto kimliği ekler"
  
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1898
  msgid "delete selected user IDs"
  msgstr "seçili kullanıcı kimlikleri siler"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1901
  msgid "add a subkey"
  msgstr "bir yardımcı anahtar ekler"
  
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1904
  msgid "add a key to a smartcard"
  msgstr "bir akıllı karta bir anahtar ekler"
  
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1906
  msgid "move a key to a smartcard"
  msgstr "bir akıllı karttan bir anahtarı taşır"
  
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1908
  msgid "move a backup key to a smartcard"
  msgstr "bir akıllı karttan bir yedekleme anahtarını taşır"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1910
  msgid "delete selected subkeys"
  msgstr "seçili yardımcı anahtarları siler"
  
- #: g10/keyedit.c:1911
++#: g10/keyedit.c:1912
  msgid "add a revocation key"
  msgstr "bir yürürlükten kaldırma anahtarı ekler"
  
- #: g10/keyedit.c:1913
++#: g10/keyedit.c:1914
  msgid "delete signatures from the selected user IDs"
  msgstr "seçili kullanıcı kimliklerden imzaları siler"
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1916
  msgid "change the expiration date for the key or selected subkeys"
  msgstr ""
  "anahtar için ya da seçili yardımcı anahtarlar için zamanaşımı tarihini "
  "değiştirir"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1918
  msgid "flag the selected user ID as primary"
  msgstr "seçili kullanıcı kimliğini asıl olarak imler"
  
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1921
  msgid "list preferences (expert)"
  msgstr "tercihleri listeler (uzman)"
  
- #: g10/keyedit.c:1921
++#: g10/keyedit.c:1922
  msgid "list preferences (verbose)"
  msgstr "tercihleri listeler (ayrıntılı)"
  
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:1924
  msgid "set preference list for the selected user IDs"
  msgstr "Seçili kullanıcı kimlikler için tercih listesini belirler "
  
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1927
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr ""
  "seçili kullanıcı kimlikler için tercih edilen anahtar sunucu adresini "
  "belirler"
  
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1929
  msgid "set a notation for the selected user IDs"
  msgstr "seçili kullanıcı kimlikleri için bir simgelem belirler"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1931
  msgid "change the passphrase"
  msgstr "anahtar parolasını değiştirir"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1934
  msgid "change the ownertrust"
  msgstr "sahibiningüvencesini değiştirir"
  
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1937
  msgid "revoke signatures on the selected user IDs"
  msgstr "Seçili tüm kullanıcı kimliklerdeki imzaları yürürlükten kaldırır"
  
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1939
  msgid "revoke selected user IDs"
  msgstr "Seçili tüm kullanıcı kimlikleri yürürlükten kaldırır"
  
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1942
  msgid "revoke key or selected subkeys"
  msgstr "anahtarı ya da seçili yardımcı anahtarları yürürlükten kaldırır"
  
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1944
  msgid "enable key"
  msgstr "anahtarı kullanıma sokar"
  
- #: g10/keyedit.c:1944
++#: g10/keyedit.c:1945
  msgid "disable key"
  msgstr "anahtarı iptal eder"
  
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1947
  msgid "show selected photo IDs"
  msgstr "seçili foto kimlikleri gösterir"
  
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1949
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  "kullanışsız kullanıcı kimlikleri sıkıştırır ve kullanışsız imzaları "
  "anahtardan kaldırır"
  
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:1951
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  "kullanışsız kullanıcı kimlikleri sıkıştırır ve tüm imzaları anahtardan "
  "kaldırır"
  
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2063
  msgid "Secret key is available.\n"
  msgstr "Gizli anahtar mevcut.\n"
  
- #: g10/keyedit.c:2162
++#: g10/keyedit.c:2163
  msgid "Need the secret key to do this.\n"
  msgstr "Bunu yapmak için gizli anahtar gerekli.\n"
  
- #: g10/keyedit.c:2183
++#: g10/keyedit.c:2184
  #, fuzzy
  #| msgid ""
  #| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4375,284 -3429,230 +4330,290 @@@ msgstr "
  "  için 'nr', yerel imzalar için 'l' (lsign) veya buların karışımı   olarak "
  "(ltsign, tnrsign gibi).\n"
  
- #: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
++#: g10/keyedit.c:2240 g10/keyedit.c:3178 g10/keyedit.c:3317 g10/keyedit.c:3379
  msgid "Key is revoked."
  msgstr "Anahtar yürürlükten kaldırıldı."
  
- #: g10/keyedit.c:2262
++#: g10/keyedit.c:2263
  msgid "Really sign all user IDs? (y/N) "
  msgstr "Tüm kullanıcı kimlikler gerçekten imzalanacak mı? (e/H ya da y/N)"
  
- #: g10/keyedit.c:2266
++#: g10/keyedit.c:2267
  #, fuzzy
  #| msgid "Really sign all user IDs? (y/N) "
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "Tüm kullanıcı kimlikler gerçekten imzalanacak mı? (e/H ya da y/N)"
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2275
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "İpucu: İmzalamak için bir kullanıcı kimliği seçiniz\n"
  
- #: g10/keyedit.c:2285
++#: g10/keyedit.c:2286
  #, fuzzy, c-format
  #| msgid "Unknown signature type `%s'\n"
  msgid "Unknown signature type '%s'\n"
  msgstr "imza türü `%s' bilinmiyor\n"
  
- #: g10/keyedit.c:2309
++#: g10/keyedit.c:2310
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
  msgstr "%s kipindeyken bu komut kullanılamaz.\n"
  
- #: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
++#: g10/keyedit.c:2332 g10/keyedit.c:2356 g10/keyedit.c:2550
  msgid "You must select at least one user ID.\n"
  msgstr "En az bir kullanıcı kimliği seçmelisiniz.\n"
  
- #: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
++#: g10/keyedit.c:2334 g10/keyedit.c:2358 g10/keyedit.c:2512 g10/keyedit.c:2552
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2336
++#: g10/keyedit.c:2337
  msgid "You can't delete the last user ID!\n"
  msgstr "Son kullanıcı kimliğini silemezsiniz!\n"
  
- #: g10/keyedit.c:2339
++#: g10/keyedit.c:2340
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr ""
  "Seçilen tüm kullanıcı kimlikler gerçekten silinecek mi? (e/H ya da y/N) "
  
- #: g10/keyedit.c:2340
++#: g10/keyedit.c:2341
  msgid "Really remove this user ID? (y/N) "
  msgstr "Bu kullanıcı kimliği gerçekten silinecek mi? (e/H ya da y/N) "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2397
++#: g10/keyedit.c:2398
  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:2409 g10/keyedit.c:4866
++#: g10/keyedit.c:2410 g10/keyedit.c:4964
  msgid "You must select exactly one key.\n"
  msgstr "Sadece ve sadece bir anahtar seçmelisiniz.\n"
  
- #: g10/keyedit.c:2436
++#: g10/keyedit.c:2437
  msgid "Command expects a filename argument\n"
  msgstr "Komut değiştirge olarak bir dosya ismi gerektiriyor\n"
  
- #: g10/keyedit.c:2457
++#: g10/keyedit.c:2458
  #, fuzzy, c-format
  #| msgid "Can't open `%s': %s\n"
  msgid "Can't open '%s': %s\n"
  msgstr "`%s' açılamıyor: %s\n"
  
- #: g10/keyedit.c:2474
++#: g10/keyedit.c:2475
  #, fuzzy, c-format
  #| msgid "Error reading backup key from `%s': %s\n"
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "yedekleme anahtarı `%s' den okunurken hata oluştu: %s\n"
  
- #: g10/keyedit.c:2509
++#: g10/keyedit.c:2510
  msgid "You must select at least one key.\n"
  msgstr "En az bir anahtar seçmelisiniz.\n"
  
- #: g10/keyedit.c:2515
++#: g10/keyedit.c:2516
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "Seçili anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
  
- #: g10/keyedit.c:2517
++#: g10/keyedit.c:2518
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "Bu anahtarı gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
  
- #: g10/keyedit.c:2555
++#: g10/keyedit.c:2556
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr ""
  "Seçilen tüm kullanıcı kimlikleri gerçekten yürülükten kaldırılacak mı? (e/H "
  "ya da y/N) "
  
- #: g10/keyedit.c:2556
++#: g10/keyedit.c:2557
  msgid "Really revoke this user ID? (y/N) "
  msgstr ""
  "Bu kullanıcı kimliği gerçekten yürürlükten kaldırılacak mı? (e/H ya da y/N) "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2575
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr ""
  "Anahtarın tamamını yürürlükten kaldırmayı gerçekten istiyor musunuz? (e/H ya "
  "da y/N) "
  
- #: g10/keyedit.c:2585
++#: g10/keyedit.c:2586
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr ""
  "Seçili yardımcı anahtarları gerçekten yürürlükten kaldırmak istiyor musunuz? "
  "(e/H ya da y/N) "
  
- #: g10/keyedit.c:2587
++#: g10/keyedit.c:2588
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr ""
  "Bu yardımcı anahtarı gerçekten yürürlükten kaldırmak istiyor musunuz? (e/H "
  "ya da y/N) "
  
- #: g10/keyedit.c:2645
++#: g10/keyedit.c:2646
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  "Kullanıcı taraından sağlanmış bir güvence veritabanı kullanılarak "
  "sahibiningüvencesi belirlenemez\n"
  
- #: g10/keyedit.c:2690
++#: g10/keyedit.c:2691
  msgid "Set preference list to:\n"
  msgstr "Belirlenecek tercih listesi:\n"
  
- #: g10/keyedit.c:2697
++#: g10/keyedit.c:2698
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr ""
  "Seçili kullanıcı kimlikler için tercihleri gerçekten güncellemek istiyor "
  "musunuz? (e/H ya da y/N) "
  
- #: g10/keyedit.c:2699
++#: g10/keyedit.c:2700
  msgid "Really update the preferences? (y/N) "
  msgstr "Tercihleri gerçekten güncellemek istiyor musunuz? (e/H ya da y/N) "
  
- #: g10/keyedit.c:2773
++#: g10/keyedit.c:2774
  msgid "Save changes? (y/N) "
  msgstr "Değişiklikler kaydedilecek mi? (e/H ya da y/N) "
  
- #: g10/keyedit.c:2777
++#: g10/keyedit.c:2778
  msgid "Quit without saving? (y/N) "
  msgstr "Kaydetmeden çıkılsın mı? (e/H ya da y/N) "
  
- #: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
- #: g10/keyedit.c:3267 g10/keyedit.c:3332
++#: g10/keyedit.c:2789 g10/keyedit.c:2799 g10/keyedit.c:2943 g10/keyedit.c:3046
++#: g10/keyedit.c:3268 g10/keyedit.c:3333 g10/keyedit.c:3409
  #, c-format
  msgid "update failed: %s\n"
  msgstr "güncelleme başarısız: %s\n"
  
- #: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
++#: g10/keyedit.c:2805 g10/keyedit.c:3273 g10/keyedit.c:3338 g10/keyedit.c:3416
  msgid "Key not changed so no update needed.\n"
  msgstr "Güncelleme gereği olmadığından anahtar değişmedi.\n"
  
- #: g10/keyedit.c:3038
++#: g10/keyedit.c:3039
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
  msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
  
- #: g10/keyedit.c:3083
++#: g10/keyedit.c:3084
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "parmakizi geçersiz"
  
- #: g10/keyedit.c:3112
++#: g10/keyedit.c:3113
  #, 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:3248 g10/keyedit.c:3251
++#: g10/keyedit.c:3249 g10/keyedit.c:3252
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
  msgstr "değer hatalı\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  #, 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:3254
++#: g10/keyedit.c:3255
  #, 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:3427
++#: g10/keyedit.c:3388
+ #, 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:3508
  msgid "Digest: "
  msgstr "Özet: "
  
- #: g10/keyedit.c:3484
++#: g10/keyedit.c:3565
  msgid "Features: "
  msgstr "Özellikler: "
  
- #: g10/keyedit.c:3495
++#: g10/keyedit.c:3576
  msgid "Keyserver no-modify"
  msgstr "Anahtar sunucusu değişmez"
  
- #: g10/keyedit.c:3510 g10/keylist.c:377
++#: g10/keyedit.c:3591 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr "Tercih edilen anahtar sunucusu: "
  
- #: g10/keyedit.c:3518 g10/keyedit.c:3519
++#: g10/keyedit.c:3599 g10/keyedit.c:3600
  msgid "Notations: "
  msgstr "Simgelemler: "
  
- #: g10/keyedit.c:3764
++#: g10/keyedit.c:3845
  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:3836
++#: g10/keyedit.c:3917
  #, 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:3860
++#: g10/keyedit.c:3941
  #, 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:3866
++#: g10/keyedit.c:3947
  msgid "(sensitive)"
  msgstr "(duyarlı)"
  
- #: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3989 g10/keyedit.c:4131 g10/keylist.c:262 g10/keyserver.c:538
  #, c-format
  msgid "created: %s"
  msgstr "oluşturuldu: %s"
  
- #: g10/keyedit.c:3911 g10/keylist.c:1852
++#: g10/keyedit.c:3992 g10/keylist.c:1852
  #, c-format
  msgid "revoked: %s"
  msgstr "yürürlükten kaldırıldı: %s"
  
- #: g10/keyedit.c:3913 g10/keylist.c:1858
++#: g10/keyedit.c:3994 g10/keylist.c:1858
  #, c-format
  msgid "expired: %s"
  msgstr "son kullanma tarihi: %s"
  
- #: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyedit.c:3996 g10/keyedit.c:4133 g10/keylist.c:264 g10/keylist.c:1864
 +#: g10/keyserver.c:544
  #, c-format
  msgid "expires: %s"
  msgstr "son kullanma tarihi: %s"
  
- #: g10/keyedit.c:3917
++#: g10/keyedit.c:3998
  #, c-format
  msgid "usage: %s"
  msgstr "kullanımı: %s"
  
- #: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
++#: g10/keyedit.c:4006 g10/keyedit.c:4026 g10/keylist.c:267
  msgid "card-no: "
  msgstr "kart-no: "
  
- #: g10/keyedit.c:3984
++#: g10/keyedit.c:4065
  #, c-format
  msgid "trust: %s"
  msgstr "güvencesi: %s"
  
- #: g10/keyedit.c:3988
++#: g10/keyedit.c:4069
  #, c-format
  msgid "validity: %s"
  msgstr "geçerliliği: %s"
  
- #: g10/keyedit.c:3995
++#: g10/keyedit.c:4076
  msgid "This key has been disabled"
  msgstr "Bu anahtar iptal edilmişti"
  
- #: g10/keyedit.c:4013
++#: g10/keyedit.c:4094
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4660,18 -3660,12 +4621,18 @@@ 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:4069 g10/keyedit.c:4500 g10/keyserver.c:548
- #: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: g10/keyedit.c:4150 g10/keyedit.c:4581 g10/keyserver.c:548
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:712
 +#: dirmngr/ocsp.c:703
  msgid "revoked"
  msgstr "yürürlükten kaldırıldı"
  
- #: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
- #: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4152 g10/keyedit.c:4583 g10/keyserver.c:552
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:714
  msgid "expired"
  msgstr "zamanaşımına uğradı"
  
- #: g10/keyedit.c:4188
++#: g10/keyedit.c:4269
  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"
@@@ -4680,17 -3674,14 +4641,17 @@@ msgstr "
  "       farklı bir kullanıcı kimliğin birincil kullanıcı kimlik olarak\n"
  "       kabul edilmesini sağlayabilirsiniz.\n"
  
- #: g10/keyedit.c:4240
++#: g10/keyedit.c:4321
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr ""
  
- #: g10/keyedit.c:4241
++#: g10/keyedit.c:4322
  #, fuzzy
  #| 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:4300
++#: g10/keyedit.c:4381
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4699,35 -3690,27 +4660,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:4305 g10/keyedit.c:4595
++#: g10/keyedit.c:4386 g10/keyedit.c:4676
  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:4311
++#: g10/keyedit.c:4392
  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:4326 g10/keygen.c:2697
++#: g10/keyedit.c:4407 g10/keygen.c:2719
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4509
  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:4438
++#: g10/keyedit.c:4519
  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:4442
++#: g10/keyedit.c:4523
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k veya y/N/k)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4530
  msgid "Really delete this self-signature? (y/N)"
  msgstr "Bu öz-imza gerçekten silinecek mi? (e/H veya y/N)"
  
- #: g10/keyedit.c:4465
++#: g10/keyedit.c:4546
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
@@@ -4735,20 -3718,16 +4696,20 @@@ msgid_plural "Deleted %d signatures.\n
  msgstr[0] "%d imza silindi.\n"
  msgstr[1] "%d imza silindi.\n"
  
- #: g10/keyedit.c:4469
++#: g10/keyedit.c:4550
  msgid "Nothing deleted.\n"
  msgstr "Hiçbir şey silinmedi.\n"
  
- #: g10/keyedit.c:4504 g10/trust.c:693
++#: g10/keyedit.c:4585 g10/trust.c:716
  msgid "invalid"
  msgstr "geçersiz"
  
- #: g10/keyedit.c:4506
++#: g10/keyedit.c:4587
  #, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "kullanıcı kimliği \"%s\" yoğun: %s\n"
  
- #: g10/keyedit.c:4512
++#: g10/keyedit.c:4593
  #, fuzzy, c-format
  #| msgid "User ID \"%s\": %d signature removed\n"
  msgid "User ID \"%s\": %d signature removed\n"
@@@ -4756,17 -3735,14 +4717,17 @@@ msgid_plural "User ID \"%s\": %d signat
  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:4520
++#: g10/keyedit.c:4601
  #, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "kullanıcı kimliği \"%s\": zaten küçük\n"
  
- #: g10/keyedit.c:4521
++#: g10/keyedit.c:4602
  #, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "kullanıcı kimliği \"%s\": zaten temiz\n"
  
- #: g10/keyedit.c:4590
++#: g10/keyedit.c:4671
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4776,47 -3752,39 +4737,47 @@@ msgstr "
  "       eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n"
  "       ile sonuçlanabilir.\n"
  
- #: g10/keyedit.c:4601
++#: g10/keyedit.c:4682
  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:4618
++#: g10/keyedit.c:4699
  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:4643
++#: g10/keyedit.c:4724
  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:4658
++#: g10/keyedit.c:4739
  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:4680
++#: g10/keyedit.c:4761
  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:4698
++#: g10/keyedit.c:4779
  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:4704
++#: g10/keyedit.c:4785
  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:4755
++#: g10/keyedit.c:4848
  #, fuzzy
  #| msgid ""
  #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4827,240 -3795,189 +4788,240 @@@ 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:4760
++#: g10/keyedit.c:4853
  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:4763
++#: g10/keyedit.c:4856
  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:4814
++#: g10/keyedit.c:4910
  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:4987
++#: g10/keyedit.c:5085
  #, c-format
  msgid "signing subkey %s is already cross-certified\n"
  msgstr "yardımcı imzalama anahtarı %s zaten çapraz sertifikalı\n"
  
- #: g10/keyedit.c:4993
++#: g10/keyedit.c:5091
  #, 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:5108
++#: g10/keyedit.c:5206
  msgid "Please select exactly one user ID.\n"
  msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n"
  
- #: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
++#: g10/keyedit.c:5247 g10/keyedit.c:5361 g10/keyedit.c:5474 g10/keyedit.c:5611
  #, 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:5320
++#: g10/keyedit.c:5418
  msgid "Enter your preferred keyserver URL: "
  msgstr "Tercih ettiğiniz sunucunun adresini girin: "
  
- #: g10/keyedit.c:5399
++#: g10/keyedit.c:5497
  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:5400
++#: g10/keyedit.c:5498
  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:5459
++#: g10/keyedit.c:5557
  msgid "Enter the notation: "
  msgstr "Simgelemi giriniz: "
  
- #: g10/keyedit.c:5606
++#: g10/keyedit.c:5704
  msgid "Proceed? (y/N) "
  msgstr "Devam? (e/H ya da y/N) "
  
- #: g10/keyedit.c:5676
++#: g10/keyedit.c:5774
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
  
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5836
  #, c-format
  msgid "No user ID with hash %s\n"
  msgstr "%s çittirmeli kullanıcı kimliği yok\n"
  
- #: g10/keyedit.c:5839
++#: g10/keyedit.c:5937
  #, 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:5861
++#: g10/keyedit.c:5959
  #, c-format
  msgid "No subkey with index %d\n"
  msgstr "%d indisli bir yardımcı anahtar yok\n"
  
- #: g10/keyedit.c:6002
++#: g10/keyedit.c:6100
  #, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "Kullanıcı kimliği: \"%s\"\n"
  
- #: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
++#: g10/keyedit.c:6103 g10/keyedit.c:6205 g10/keyedit.c:6253
  #, 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:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
++#: g10/keyedit.c:6105 g10/keyedit.c:6207 g10/keyedit.c:6255
  msgid " (non-exportable)"
  msgstr " (dışarda geçersiz)"
  
- #: g10/keyedit.c:6011
++#: g10/keyedit.c:6109
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
  
- #: g10/keyedit.c:6016
++#: g10/keyedit.c:6114
  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:6021
++#: g10/keyedit.c:6119
  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:6075
++#: g10/keyedit.c:6173
  msgid "Not signed by you.\n"
  msgstr ""
  
- #: g10/keyedit.c:6081
++#: g10/keyedit.c:6179
  #, 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:6110
++#: g10/keyedit.c:6208
  msgid " (non-revocable)"
  msgstr " (yürülükten kaldırılmaz)"
  
- #: g10/keyedit.c:6117
++#: g10/keyedit.c:6215
  #, 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:6142
++#: g10/keyedit.c:6240
  msgid "You are about to revoke these signatures:\n"
  msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
  
- #: g10/keyedit.c:6165
++#: g10/keyedit.c:6263
  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:6198
++#: g10/keyedit.c:6296
  msgid "no secret key\n"
  msgstr "gizli anahtar yok\n"
  
- #: g10/keyedit.c:6246
++#: g10/keyedit.c:6344
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6256
++#: g10/keyedit.c:6354
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
  
- #: g10/keyedit.c:6273
++#: g10/keyedit.c:6371
  #, 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:6386
++#: g10/keyedit.c:6485
  #, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "Anahtar %s zaten yürürlükten kaldırılmış.\n"
  
- #: g10/keyedit.c:6448
++#: g10/keyedit.c:6547
  #, 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:6545
++#: g10/keyedit.c:6644
  #, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr ""
  "Anahtar 0x%3$s (kull-kiml %4$d) için %2$ld uzunluktaki %1$s foto kimliği "
  "gösteriliyor\n"
  
- #: g10/keygen.c:305
++#: g10/keygen.c:316
  #, fuzzy, c-format
  #| msgid "preference `%s' duplicated\n"
  msgid "preference '%s' duplicated\n"
  msgstr "'%s' tercihi yinelendi\n"
  
- #: g10/keygen.c:312
++#: g10/keygen.c:323
  msgid "too many cipher preferences\n"
  msgstr "çok fazla şifreleme tercihi\n"
  
- #: g10/keygen.c:314
++#: g10/keygen.c:325
  msgid "too many digest preferences\n"
  msgstr "çok fazla özet tercihi\n"
  
- #: g10/keygen.c:316
++#: g10/keygen.c:327
  msgid "too many compression preferences\n"
  msgstr "çok fazla sıkıştırma tercihi\n"
  
- #: g10/keygen.c:457
++#: g10/keygen.c:468
  #, fuzzy, c-format
  #| msgid "invalid item `%s' in preference string\n"
  msgid "invalid item '%s' in preference string\n"
  msgstr "tercih dizgesindeki '%s' öğesi geçersiz\n"
  
- #: g10/keygen.c:936
++#: g10/keygen.c:947
  msgid "writing direct signature\n"
  msgstr "doğrudan imza yazılıyor\n"
  
- #: g10/keygen.c:982
++#: g10/keygen.c:993
  msgid "writing self signature\n"
  msgstr "öz-imza yazılıyor\n"
  
- #: g10/keygen.c:1038
++#: g10/keygen.c:1049
  msgid "writing key binding signature\n"
  msgstr "anahtarı garantileyen imzayı yazıyor\n"
  
- #: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
- #: g10/keygen.c:1610 g10/keygen.c:1615
++#: g10/keygen.c:1413 g10/keygen.c:1418 g10/keygen.c:1470 g10/keygen.c:1475
++#: g10/keygen.c:1622 g10/keygen.c:1627
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "anahtar uzunluğu geçersiz; %u bit kullanılıyor\n"
  
- #: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
++#: g10/keygen.c:1424 g10/keygen.c:1481 g10/keygen.c:1489 g10/keygen.c:1633
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "anahtar uzunluğu %u bite yuvarlandı\n"
  
- #: g10/keygen.c:1503
++#: g10/keygen.c:1515
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  "UYARI: bazı OpenPGP uygulamaları bu özet boyutlu bir DSA anahtarıyla "
  "çalışamayabilir\n"
  
- #: g10/keygen.c:1677
++#: g10/keygen.c:1689
  msgid "Sign"
  msgstr "İmzalama"
  
- #: g10/keygen.c:1680
++#: g10/keygen.c:1692
  msgid "Certify"
  msgstr "Onayla"
  
- #: g10/keygen.c:1683
++#: g10/keygen.c:1695
  msgid "Encrypt"
  msgstr "Şifrele"
  
- #: g10/keygen.c:1686
++#: g10/keygen.c:1698
  msgid "Authenticate"
  msgstr "Kimlik kanıtla"
  
@@@ -5074,159 -3991,128 +5035,159 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1705
++#: g10/keygen.c:1717
  msgid "SsEeAaQq"
  msgstr "OoŞşKkçÇ"
  
- #: g10/keygen.c:1732
++#: g10/keygen.c:1744
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "bir %s anahtarı için olası eylemler: "
  
- #: g10/keygen.c:1738
++#: g10/keygen.c:1750
  msgid "Current allowed actions: "
  msgstr "Şimdilik mümkün eylemler: "
  
- #: g10/keygen.c:1743
++#: g10/keygen.c:1755
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) İmzalama yeteneğini açar/kapar\n"
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) Şifreleme yeteneğini açar/kapar\n"
  
- #: g10/keygen.c:1749
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) Kimlik kanıtlama yeteneğini açar/kapar\n"
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) Bitti\n"
  
- #: g10/keygen.c:1881 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1893 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Lütfen istediğiniz anahtarı seçiniz:\n"
  
- #: g10/keygen.c:1885
++#: g10/keygen.c:1897
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "  (%d) DSA ve ElGamal (öntanımlı)\n"
  
- #: g10/keygen.c:1889
++#: g10/keygen.c:1901
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "  (%d) DSA ve ElGamal (öntanımlı)\n"
  
- #: g10/keygen.c:1892
++#: g10/keygen.c:1904
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (yalnız imzalamak için)\n"
  
- #: g10/keygen.c:1894
++#: g10/keygen.c:1906
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (sadece imzalamak için)\n"
  
- #: g10/keygen.c:1900
++#: g10/keygen.c:1912
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) ElGamal (yalnız şifrelemek için)\n"
  
- #: g10/keygen.c:1902
++#: g10/keygen.c:1914
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (sadece şifrelemek için)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1920
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (yeteneklerini belirtin)\n"
  
- #: g10/keygen.c:1910
++#: g10/keygen.c:1922
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (yeteneklerini belirtin)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1928
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "  (%d) DSA ve ElGamal (öntanımlı)\n"
  
- #: g10/keygen.c:1918
++#: g10/keygen.c:1930
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (yalnız imzalamak için)\n"
  
- #: g10/keygen.c:1920
++#: g10/keygen.c:1932
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (set your own capabilities)\n"
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) DSA (yeteneklerini belirtin)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1934
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) RSA (sadece şifrelemek için)\n"
  
- #: g10/keygen.c:1926
++#: g10/keygen.c:1938
  #, fuzzy, c-format
  #| msgid "   (%d) Existing key\n"
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) Mevcut anahtar\n"
  
- #: g10/keygen.c:2022 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:206
  #, fuzzy
  msgid "Enter the keygrip: "
  msgstr "Simgelemi giriniz: "
  
- #: g10/keygen.c:2035 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2047 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2049 sm/certreqgen-ui.c:216
  #, fuzzy
  msgid "No key with this keygrip\n"
  msgstr "%d indisli bir yardımcı anahtar yok\n"
  
- #: g10/keygen.c:2111 g10/keygen.c:2125
++#: g10/keygen.c:2133 g10/keygen.c:2147
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
  msgstr "%u bite yuvarlandı\n"
  
- #: g10/keygen.c:2166
++#: g10/keygen.c:2188
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr "%s anahtarları %u bit ile %u bit arasında olmalı.\n"
  
- #: g10/keygen.c:2174
++#: g10/keygen.c:2196
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
  
- #: g10/keygen.c:2177 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2199 sm/certreqgen-ui.c:183
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
  
- #: g10/keygen.c:2191 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2213 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "İstenen anahtar uzunluğu: %u bit\n"
  
- #: g10/keygen.c:2237
++#: g10/keygen.c:2259
  #, fuzzy
  #| msgid "Please select what kind of key you want:\n"
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Lütfen istediğiniz anahtarı seçiniz:\n"
  
- #: g10/keygen.c:2409
++#: g10/keygen.c:2431
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5242,7 -4128,6 +5203,7 @@@ msgstr "
  "      <n>m = anahtar n ay geçerli\n"
  "      <n>y = anahtar n yıl geçerli\n"
  
- #: g10/keygen.c:2420
++#: g10/keygen.c:2442
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5258,38 -4143,30 +5219,38 @@@ msgstr "
  "      <n>m = imza n ay geçerli\n"
  "      <n>y = imza n yıl geçerli\n"
  
- #: g10/keygen.c:2443
++#: g10/keygen.c:2465
  msgid "Key is valid for? (0) "
  msgstr "Anahtar ne kadar geçerli olacak? (0) "
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2470
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "İmza ne kadar geçerli olacak? (%s) "
  
- #: g10/keygen.c:2461 g10/keygen.c:2486
++#: g10/keygen.c:2483 g10/keygen.c:2508
  msgid "invalid value\n"
  msgstr "değer hatalı\n"
  
- #: g10/keygen.c:2468
++#: g10/keygen.c:2490
  msgid "Key does not expire at all\n"
  msgstr "Anahtar hep geçerli olacak\n"
  
- #: g10/keygen.c:2469
++#: g10/keygen.c:2491
  msgid "Signature does not expire at all\n"
  msgstr "İmza hep geçerli olacak\n"
  
- #: g10/keygen.c:2474
++#: g10/keygen.c:2496
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "Anahtarın geçerliliği %s de bitecek.\n"
  
- #: g10/keygen.c:2475
++#: g10/keygen.c:2497
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "İmzanın geçerliliği %s de bitecek.\n"
  
- #: g10/keygen.c:2479
++#: g10/keygen.c:2501
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5297,11 -4174,9 +5258,11 @@@ msgstr "
  "Sisteminiz 2038 yılından sonraki tarihleri gösteremiyor.\n"
  "Ama emin olun ki 2106 yılına kadar elde edilebilecek.\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2514
  msgid "Is this correct? (y/N) "
  msgstr "Bu doğru mu? (e/H ya da y/N) "
  
- #: g10/keygen.c:2560
++#: g10/keygen.c:2582
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5316,7 -4191,6 +5277,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2575
++#: g10/keygen.c:2597
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -5332,50 -4206,39 +5293,50 @@@ msgstr "
  "\t\"Fatih Sultan Mehmed (Padisah) <padisah at ottoman.gov>\"\n"
  "\n"
  
- #: g10/keygen.c:2594
++#: g10/keygen.c:2616
  msgid "Real name: "
  msgstr "Adınız ve Soyadınız: "
  
- #: g10/keygen.c:2603
++#: g10/keygen.c:2625
  msgid "Invalid character in name\n"
  msgstr "Ad ve soyadınızda geçersiz karakter var\n"
  
- #: g10/keygen.c:2604
++#: g10/keygen.c:2626
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2608
++#: g10/keygen.c:2630
  msgid "Name may not start with a digit\n"
  msgstr "Ad ve soyadınız bir rakamla başlamamalı\n"
  
- #: g10/keygen.c:2611
++#: g10/keygen.c:2633
  msgid "Name must be at least 5 characters long\n"
  msgstr "Ad ve soyadınız en az 5 harfli olmalı\n"
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2643
  msgid "Email address: "
  msgstr "E-posta adresiniz: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2649
  msgid "Not a valid email address\n"
  msgstr "geçerli bir E-posta adresi değil\n"
  
- #: g10/keygen.c:2636
++#: g10/keygen.c:2658
  msgid "Comment: "
  msgstr "Önbilgi: "
  
- #: g10/keygen.c:2642
++#: g10/keygen.c:2664
  msgid "Invalid character in comment\n"
  msgstr "Önbilgi alanında geçersiz karakter var\n"
  
- #: g10/keygen.c:2678
++#: g10/keygen.c:2700
  #, fuzzy, c-format
  #| msgid "You are using the `%s' character set.\n"
  msgid "You are using the '%s' character set.\n"
  msgstr "`%s' karakter kümesini kullanıyorsunuz.\n"
  
- #: g10/keygen.c:2684
++#: g10/keygen.c:2706
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5386,7 -4249,6 +5347,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2689
++#: g10/keygen.c:2711
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr ""
  "Lütfen E-posta adresinizi Adı ve Soyadı veya Açıklama alanı içine koymayın\n"
@@@ -5402,37 -4264,30 +5363,37 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2714
++#: g10/keygen.c:2736
  msgid "NnCcEeOoQq"
  msgstr "AaYyEeTtKk"
  
- #: g10/keygen.c:2724
++#: g10/keygen.c:2746
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da Çı(k)? "
  
- #: g10/keygen.c:2725
++#: g10/keygen.c:2747
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr ""
  "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da (T)amam/Çı(k)? "
  
- #: g10/keygen.c:2730
++#: g10/keygen.c:2752
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da Çı(k)? "
  
- #: g10/keygen.c:2731
++#: g10/keygen.c:2753
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr ""
  "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da (T)amam/Çı(k)? "
  
- #: g10/keygen.c:2750
++#: g10/keygen.c:2772
  msgid "Please correct the error first\n"
  msgstr "Lütfen önce hatayı düzeltin\n"
  
- #: g10/keygen.c:2796
++#: g10/keygen.c:2818
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5445,13 -4300,10 +5406,13 @@@ msgstr "
  "iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n"
  "üretecine yardımcı olur. \n"
  
- #: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
- #: g10/keygen.c:4777 g10/keygen.c:4882
++#: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
++#: g10/keygen.c:4330 g10/keygen.c:4803 g10/keygen.c:5064 g10/keygen.c:5169
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
  
- #: g10/keygen.c:3598
++#: g10/keygen.c:3922
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5459,71 -4311,58 +5420,71 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3924
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3621
++#: g10/keygen.c:3945
  #, fuzzy, c-format
  #| msgid "key already exists\n"
  msgid "A key for \"%s\" already exists\n"
  msgstr "anahtar zaten mevcut\n"
  
- #: g10/keygen.c:3626
++#: g10/keygen.c:3950
  #, fuzzy
  #| msgid "Use this key anyway? (y/N) "
  msgid "Create anyway? (y/N) "
  msgstr "Bu anahtar yine de kullanılsın mı? (e/H ya da y/N) "
  
- #: g10/keygen.c:3632
++#: g10/keygen.c:3956
  #, fuzzy
  #| msgid "generating new key\n"
  msgid "creating anyway\n"
  msgstr "yeni anahtar üretiliyor\n"
  
- #: g10/keygen.c:3981
++#: g10/keygen.c:4315
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:4013
++#: g10/keygen.c:4358
  msgid "Key generation canceled.\n"
  msgstr "Anahtar üretimi durduruldu.\n"
  
- #: g10/keygen.c:4073
++#: g10/keygen.c:4418
  #, fuzzy, c-format
  #| msgid "can't create backup file `%s': %s\n"
  msgid "can't create backup file '%s': %s\n"
  msgstr "'%s' yedek dosyası oluşturulamıyor: %s\n"
  
- #: g10/keygen.c:4093
++#: g10/keygen.c:4438
  #, fuzzy, c-format
  #| msgid "NOTE: backup of card key saved to `%s'\n"
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "BİLGİ: kart anahtarının yedeklemesi '%s' e kaydedildi\n"
  
- #: g10/keygen.c:4244 g10/keygen.c:4393
++#: g10/keygen.c:4589 g10/keygen.c:4738
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
  msgstr "genel anahtarı `%s'e yazıyor\n"
  
- #: g10/keygen.c:4387
++#: g10/keygen.c:4732
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "yazılabilir bir genel anahtar zinciri yok: %s\n"
  
- #: g10/keygen.c:4401
++#: g10/keygen.c:4746
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error writing public keyring '%s': %s\n"
  msgstr "`%s' genel anahtarlığa yazılırken hata oluştu: %s\n"
  
- #: g10/keygen.c:4433
++#: g10/keygen.c:4778
  msgid "public and secret key created and signed.\n"
  msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
  
- #: g10/keygen.c:4445
++#: g10/keygen.c:4790
  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"
@@@ -5531,14 -4370,12 +5492,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:4649 g10/keygen.c:4833
++#: g10/keygen.c:4936 g10/keygen.c:5120
  #, 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:4651 g10/keygen.c:4835
++#: g10/keygen.c:4938 g10/keygen.c:5122
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5546,22 -4383,18 +5507,22 @@@ msgstr "
  "anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
  "problemi)\n"
  
- #: g10/keygen.c:4662 g10/keygen.c:4846
++#: g10/keygen.c:4949 g10/keygen.c:5133
  #, fuzzy
  #| 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:4674 g10/keygen.c:4676
++#: g10/keygen.c:4961 g10/keygen.c:4963
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
  
- #: g10/keygen.c:4683 g10/keygen.c:4685
++#: g10/keygen.c:4970 g10/keygen.c:4972
  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:4704 g10/keygen.c:4860
++#: g10/keygen.c:4991 g10/keygen.c:5147
  msgid "Really create? (y/N) "
  msgstr "Gerçekten oluşturulsun mu? (e/H ya da y/N) "
  
@@@ -5889,126 -4657,100 +5850,126 @@@ msgid "standalone revocation - use \"gp
  msgstr ""
  "tek başına yürürlükten kaldırma - uygulamak için \"gpg --import\" kullanın\n"
  
- #: g10/mainproc.c:1233 g10/mainproc.c:1276
++#: g10/mainproc.c:1238 g10/mainproc.c:1281
  msgid "no signature found\n"
  msgstr "hiç imza yok\n"
  
- #: g10/mainproc.c:1607
++#: g10/mainproc.c:1612
  #, c-format
  msgid "BAD signature from \"%s\""
  msgstr "\"%s\" deki imza KÖTÜ"
  
- #: g10/mainproc.c:1609
++#: g10/mainproc.c:1614
  #, c-format
  msgid "Expired signature from \"%s\""
  msgstr "\"%s\" deki imza zamanaşımına uğramış"
  
- #: g10/mainproc.c:1611
++#: g10/mainproc.c:1616
  #, c-format
  msgid "Good signature from \"%s\""
  msgstr "\"%s\" deki imza iyi"
  
- #: g10/mainproc.c:1630
++#: g10/mainproc.c:1635
  msgid "signature verification suppressed\n"
  msgstr "imza doğrulama engellendi\n"
  
- #: g10/mainproc.c:1739
++#: g10/mainproc.c:1744
  msgid "can't handle this ambiguous signature data\n"
  msgstr "bu belirsiz imza verisi elde edilemiyor\n"
  
- #: g10/mainproc.c:1753 g10/mainproc.c:1761
++#: g10/mainproc.c:1758 g10/mainproc.c:1766
  #, c-format
  msgid "Signature made %s\n"
  msgstr "İmza %s de\n"
  
- #: g10/mainproc.c:1754 g10/mainproc.c:1762
++#: g10/mainproc.c:1759 g10/mainproc.c:1767
  #, c-format
  msgid "               using %s key %s\n"
  msgstr "               %s kullanılarak anahtar %s ile yapılmış\n"
  
- #: g10/mainproc.c:1766
++#: g10/mainproc.c:1771
  #, 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:1772
++#: g10/mainproc.c:1777
  #, fuzzy, c-format
  #| msgid "                aka \"%s\""
  msgid "               issuer \"%s\"\n"
  msgstr "                nam-ı diğer \"%s\""
  
- #: g10/mainproc.c:1789
++#: g10/mainproc.c:1794
  msgid "Key available at: "
  msgstr "Anahtar burada:"
  
- #: g10/mainproc.c:2024
++#: g10/mainproc.c:2029
  msgid "[uncertain]"
  msgstr "[şüpheli]"
  
- #: g10/mainproc.c:2062
++#: g10/mainproc.c:2067
  #, c-format
  msgid "                aka \"%s\""
  msgstr "                nam-ı diğer \"%s\""
  
- #: g10/mainproc.c:2145
++#: g10/mainproc.c:2150
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "Bu imzanın geçerliliği %s de bitti.\n"
  
- #: g10/mainproc.c:2149
++#: g10/mainproc.c:2154
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "Bu imzanın geçerliliği %s de bitecek.\n"
  
- #: g10/mainproc.c:2160
++#: g10/mainproc.c:2165
  #, 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:2161
++#: g10/mainproc.c:2166
  msgid "binary"
  msgstr "ikili"
  
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2167
  msgid "textmode"
  msgstr "metinkipi"
  
- #: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "bilinmeyen"
  
- #: g10/mainproc.c:2164
++#: g10/mainproc.c:2169
  #, fuzzy
  #| msgid "algorithm: %s"
  msgid ", key algorithm "
  msgstr "algoritma: %s"
  
- #: g10/mainproc.c:2199
++#: g10/mainproc.c:2204
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2229
++#: g10/mainproc.c:2234
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "İmza kontrol edilemedi: %s\n"
  
- #: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
++#: g10/mainproc.c:2327 g10/mainproc.c:2346 g10/mainproc.c:2470
  msgid "not a detached signature\n"
  msgstr "bir bağımsız imza değil\n"
  
- #: g10/mainproc.c:2375
++#: g10/mainproc.c:2380
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
  msgstr "UYARI: çoklu imzalar saptandı. Sadece ilki denetlenecek.\n"
  
- #: g10/mainproc.c:2384
++#: g10/mainproc.c:2389
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "0x%02x sınıfı tek başına imza\n"
  
- #: g10/mainproc.c:2469
++#: g10/mainproc.c:2474
  msgid "old style (PGP 2.x) signature\n"
  msgstr "eski stil (PGP 2.x) imza\n"
  
@@@ -6309,23 -4997,18 +6270,23 @@@ msgstr "Bu foto doğru mu? (e/H/ç vey
  msgid "unable to display photo ID!\n"
  msgstr "foto kimliği gösterilemiyor!\n"
  
- #: g10/pkclist.c:72 g10/revoke.c:757
++#: g10/pkclist.c:72 g10/revoke.c:758
  msgid "No reason specified"
  msgstr "Belirtilmiş bir neden yok"
  
- #: g10/pkclist.c:74 g10/revoke.c:759
++#: g10/pkclist.c:74 g10/revoke.c:760
  msgid "Key is superseded"
  msgstr "Anahtarın yerine başkası konulmuş ve iptal edilmiştir"
  
- #: g10/pkclist.c:76 g10/revoke.c:758
++#: g10/pkclist.c:76 g10/revoke.c:759
  msgid "Key has been compromised"
  msgstr "Anahtar tehlikede"
  
- #: g10/pkclist.c:78 g10/revoke.c:760
++#: g10/pkclist.c:78 g10/revoke.c:761
  msgid "Key is no longer used"
  msgstr "Anahtar artık kullanılmayacak"
  
- #: g10/pkclist.c:80 g10/revoke.c:761
++#: g10/pkclist.c:80 g10/revoke.c:762
  msgid "User ID is no longer valid"
  msgstr "Kullanıcı kimliği artık geçersiz"
  
@@@ -6402,7 -5072,6 +6363,7 @@@ msgstr "
  "Bu anahtar için asgari güvence seviyesi: %s\n"
  "\n"
  
- #: g10/pkclist.c:310 g10/revoke.c:786
++#: g10/pkclist.c:310 g10/revoke.c:787
  msgid "Your decision? "
  msgstr "Kararınız? "
  
@@@ -6609,33 -5240,26 +6570,33 @@@ msgstr "
  msgid "No such user ID.\n"
  msgstr "Böyle bir kullanıcı kimliği yok.\n"
  
- #: g10/pkclist.c:1197 g10/pkclist.c:1273
++#: g10/pkclist.c:1197 g10/pkclist.c:1274
  msgid "skipped: public key already set as default recipient\n"
  msgstr "atlandı: genel anahtar zaten öntanımlı alıcı olarak ayarlanmış\n"
  
- #: g10/pkclist.c:1218
++#: g10/pkclist.c:1219
  msgid "Public key is disabled.\n"
  msgstr "Genel anahtar iptal edildi.\n"
  
- #: g10/pkclist.c:1228
++#: g10/pkclist.c:1229
  msgid "skipped: public key already set\n"
  msgstr "atlandı: genel anahtar zaten belirtilmiş\n"
  
- #: g10/pkclist.c:1263
++#: g10/pkclist.c:1264
  #, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "öntanımlı alıcı \"%s\" bilinmiyor\n"
  
- #: g10/pkclist.c:1312
++#: g10/pkclist.c:1313
  msgid "no valid addressees\n"
  msgstr "geçerli adresler yok\n"
  
- #: g10/pkclist.c:1665
++#: g10/pkclist.c:1666
  #, 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:1690
++#: g10/pkclist.c:1691
  #, 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"
@@@ -6644,29 -5267,23 +6605,29 @@@
  msgid "data not saved; use option \"--output\" to save it\n"
  msgstr "veri kaydedilmedi; kaydetmek için \"--output\" seçeneğini kullanın\n"
  
- #: g10/plaintext.c:598
++#: g10/plaintext.c:614
  msgid "Detached signature.\n"
  msgstr "Bağımsız imza.\n"
  
- #: g10/plaintext.c:606
++#: g10/plaintext.c:622
  msgid "Please enter name of data file: "
  msgstr "Lütfen veri dosyasının ismini girin: "
  
- #: g10/plaintext.c:643
++#: g10/plaintext.c:659
  msgid "reading stdin ...\n"
  msgstr "standart girdiden okuyor ...\n"
  
- #: g10/plaintext.c:688
++#: g10/plaintext.c:704
  msgid "no signed data\n"
  msgstr "imzalı veri yok\n"
  
- #: g10/plaintext.c:706
++#: g10/plaintext.c:722
  #, fuzzy, c-format
  #| msgid "can't open signed data `%s'\n"
  msgid "can't open signed data '%s'\n"
  msgstr "imzalı veri '%s'  açılamadı\n"
  
- #: g10/plaintext.c:741
++#: g10/plaintext.c:757
  #, c-format
  msgid "can't open signed data fd=%d: %s\n"
  msgstr "imzalı veri fd=%d açılamadı: %s\n"
@@@ -6737,7 -5340,6 +6698,7 @@@ msgstr "
  "Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H ya "
  "da y/N) "
  
- #: g10/revoke.c:336 g10/revoke.c:727
++#: g10/revoke.c:336 g10/revoke.c:728
  msgid "ASCII armored output forced.\n"
  msgstr "ASCII zırhlı çıktı istendi.\n"
  
@@@ -6776,23 -5372,20 +6737,23 @@@ msgid "
  "the secret key.  However, if the secret key is still accessible,\n"
  "it is better to generate a new revocation certificate and give\n"
  "a reason for the revocation.  For details see the description of\n"
- "of the gpg command \"--gen-revoke\" in the GnuPG manual."
+ "of the gpg command \"--generate-revocation\" in the GnuPG manual."
  msgstr ""
  
- #: g10/revoke.c:575
++#: g10/revoke.c:576
  msgid ""
  "To avoid an accidental use of this file, a colon has been inserted\n"
  "before the 5 dashes below.  Remove this colon with a text editor\n"
  "before importing and publishing this revocation certificate."
  msgstr ""
  
- #: g10/revoke.c:590
++#: g10/revoke.c:591
  #, fuzzy, c-format
  #| msgid "Revocation certificate created.\n"
  msgid "revocation certificate stored as '%s.rev'\n"
  msgstr "Yürürlükten kaldırma sertifikası üretildi.\n"
  
- #: g10/revoke.c:634
++#: g10/revoke.c:635
  #, fuzzy, c-format
  #| msgid "secret key \"%s\" not found: %s\n"
  msgid "secret key \"%s\" not found\n"
@@@ -6801,24 -5394,20 +6762,24 @@@ msgstr "gizli anahtar \"%s\" yok: %s\n
  #. TRANSLATORS: The %s prints a key specification which
  #. for example has been given at the command line.  Several lines
  #. lines with secret key infos are printed after this message.
- #: g10/revoke.c:661
++#: g10/revoke.c:662
  #, c-format
  msgid "'%s' matches multiple secret keys:\n"
  msgstr ""
  
- #: g10/revoke.c:688
++#: g10/revoke.c:689
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error searching the keyring: %s\n"
  msgstr "`%s' anahtarlığı oluşturulurken hata: %s\n"
  
- #: g10/revoke.c:711
++#: g10/revoke.c:712
  msgid "Create a revocation certificate for this key? (y/N) "
  msgstr ""
  "Bu anahtar için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H "
  "ya da y/N) "
  
- #: g10/revoke.c:735
++#: g10/revoke.c:736
  msgid ""
  "Revocation certificate created.\n"
  "\n"
@@@ -6836,34 -5425,27 +6797,34 @@@ msgstr "
  "Sertifika kısa olacağından isterseniz, bir yazıcı çıktısı olarak alıp\n"
  "bir kasada da muhafaza edebilirsiniz.\n"
  
- #: g10/revoke.c:769
++#: g10/revoke.c:770
  msgid "Please select the reason for the revocation:\n"
  msgstr "Lütfen bir yürürlükten kaldırma sebebi seçiniz:\n"
  
- #: g10/revoke.c:779
++#: g10/revoke.c:780
  msgid "Cancel"
  msgstr "İptal"
  
- #: g10/revoke.c:781
++#: g10/revoke.c:782
  #, c-format
  msgid "(Probably you want to select %d here)\n"
  msgstr "(Burada %d seçtiğiniz varsayılıyor)\n"
  
- #: g10/revoke.c:822
++#: g10/revoke.c:823
  msgid "Enter an optional description; end it with an empty line:\n"
  msgstr ""
  "İsteğe bağlı açıklamayı girebilirsiniz; Boş bir satır işlemi sonlandırır:\n"
  
- #: g10/revoke.c:850
++#: g10/revoke.c:851
  #, c-format
  msgid "Reason for revocation: %s\n"
  msgstr "Yürürlükten kaldırma sebebi: %s\n"
  
- #: g10/revoke.c:852
++#: g10/revoke.c:853
  msgid "(No description given)\n"
  msgstr "(açıklama verilmedi)\n"
  
- #: g10/revoke.c:857
++#: g10/revoke.c:858
  msgid "Is this okay? (y/N) "
  msgstr "Bu tamam mı? (e/H ya da y/N) "
  
@@@ -7006,12 -5568,10 +6967,12 @@@ msgstr "
  "UYARI: tercih edilen anahtar sunucu adresi için %%lik uzatma imkansız\n"
  "(çok büyük). Uzatılmadan kullanılıyor.\n"
  
- #: g10/sign.c:329
++#: g10/sign.c:331
  #, c-format
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s/%s imza: \"%s\" den\n"
  
- #: g10/sign.c:878
++#: g10/sign.c:880
  #, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -7019,11 -5579,9 +6980,11 @@@ msgstr "
  "UYARI: alıcının tercihleriyle çelişen %s (%d) özet algoritması kullanılmak "
  "isteniyor\n"
  
- #: g10/sign.c:1009
++#: g10/sign.c:1011
  msgid "signing:"
  msgstr "imzalanıyor:"
  
- #: g10/sign.c:1286
++#: g10/sign.c:1288
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "%s şifrelemesi kullanılmayacak\n"
@@@ -7045,7 -5599,6 +7006,7 @@@ msgstr "atlandı: gizli anahtar zaten v
  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:362
++#: g10/tdbdump.c:57 g10/trustdb.c:369
  #, 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"
@@@ -7093,7 -5638,6 +7054,7 @@@ msgstr "`%s' deki güvence kaydını ar
  msgid "read error in '%s': %s\n"
  msgstr "`%s' için okuma hatası: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "güvence veritabanı: eşzamanlama başarısız: %s\n"
@@@ -7242,309 -5757,322 +7203,388 @@@ msgstr "%d karakterden daha uzun metin 
  msgid "input line longer than %d characters\n"
  msgstr "girdi satırı %d karakterden daha uzun\n"
  
- #: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
++#: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
  #, fuzzy, c-format
  #| msgid "error sending standard options: %s\n"
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "standart seçenekler gönderilirken hata: %s\n"
  
- #: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
++#: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:357 g10/tofu.c:699
++#: g10/tofu.c:355 g10/tofu.c:888
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:501
++#: g10/tofu.c:505
  #, fuzzy, c-format
  #| msgid "unsupported algorithm: %s"
  msgid "unsupported TOFU database version: %s\n"
  msgstr "desteklenmeyen algoritma: %s"
  
- #: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
- #: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
- #: g10/tofu.c:3056
++#: g10/tofu.c:538
+ #, fuzzy, c-format
+ #| msgid "error creating temporary file: %s\n"
+ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
+ msgstr "geçici dosya oluşturulurken hata: %s\n"
+ 
++#: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
+ msgid "TOFU DB error"
+ msgstr ""
+ 
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2340 g10/tofu.c:2359
++#: g10/tofu.c:2372 g10/tofu.c:2384 g10/tofu.c:2399 g10/tofu.c:2411
++#: g10/tofu.c:2980 g10/tofu.c:2997 g10/tofu.c:3033 g10/tofu.c:3050
++#: g10/tofu.c:3353
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error reading TOFU database: %s\n"
  msgstr "%s komutu gönderilirken hata: %s\n"
  
- #: g10/tofu.c:566 g10/tofu.c:574
++#: g10/tofu.c:716 g10/tofu.c:724
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error determining TOFU database's version: %s\n"
  msgstr "`%s' gizli anahtarlığa yazılırken hata oluştu: %s\n"
  
- #: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
++#: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing TOFU database: %s\n"
  msgstr "%s: dizin kaydını yazma hatası: %s\n"
  
- #: g10/tofu.c:765
++#: g10/tofu.c:844
+ #, fuzzy, c-format
+ #| msgid "error sending %s command: %s\n"
+ msgid "error creating 'encryptions' TOFU table: %s\n"
+ msgstr "%s komutu gönderilirken hata: %s\n"
+ 
++#: g10/tofu.c:874
+ #, c-format
+ msgid "adding column effective_policy to bindings DB: %s\n"
+ msgstr ""
+ 
++#: g10/tofu.c:956
  #, fuzzy, c-format
  #| msgid "error opening `%s': %s\n"
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "'%s' açılırken hata: %s\n"
  
- #: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
++#: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error updating TOFU database: %s\n"
  msgstr "%s komutu gönderilirken hata: %s\n"
  
- #: g10/tofu.c:1239
++#: g10/tofu.c:1328
  #, c-format
  msgid ""
  "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1247
++#: g10/tofu.c:1337
  #, c-format
- msgid "The email address \"%s\" is associated with %d keys!"
- msgstr ""
+ msgid "The email address \"%s\" is associated with %d key!"
+ msgid_plural "The email address \"%s\" is associated with %d keys!"
+ msgstr[0] ""
+ msgstr[1] ""
  
- #: g10/tofu.c:1251
++#: g10/tofu.c:1343
  msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  
- #: g10/tofu.c:1257
++#: g10/tofu.c:1349
  #, c-format
  msgid ""
  "Please indicate whether this email address should be associated with key %s "
  "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1513
++#: g10/tofu.c:1605
  #, fuzzy, c-format
  #| msgid "error getting new PIN: %s\n"
  msgid "error gathering other user IDs: %s\n"
  msgstr "yeni PIN alınırken hata: %s\n"
  
- #: g10/tofu.c:1523
++#: g10/tofu.c:1615
  #, fuzzy
  #| msgid "list key and user IDs"
  msgid "This key's user IDs:\n"
  msgstr "anahtarı ve kullanıcı kimliğini gösterir"
  
- #: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
++#: g10/tofu.c:1631 g10/tofu.c:1796
  #, fuzzy, c-format
  #| msgid "validity: %s"
  msgid "policy: %s"
  msgstr "geçerliliği: %s"
  
- #: g10/tofu.c:1630
++#: g10/tofu.c:1722
  #, fuzzy, c-format
  #| msgid "error getting stored flags: %s\n"
  msgid "error gathering signature stats: %s\n"
  msgstr "saklanmış bayraklar alınırken hata: %s\n"
  
- #: g10/tofu.c:1634
++#: g10/tofu.c:1726
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1651
++#: g10/tofu.c:1744
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1684 g10/tofu.c:1689
++#: g10/tofu.c:1785 g10/tofu.c:1790
  msgid ", "
  msgstr ""
  
- #: g10/tofu.c:1693
++#: g10/tofu.c:1794
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
  msgstr "anahtarları listeler"
  
- #: g10/tofu.c:1715
++#: g10/tofu.c:1820
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid "Verified %d message."
+ msgid_plural "Verified %d messages."
+ msgstr[0] "ileti özetlerini gösterir"
+ msgstr[1] "ileti özetlerini gösterir"
+ 
++#: g10/tofu.c:1824
+ #, fuzzy, c-format
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid "Encrypted %d message."
+ msgid_plural "Encrypted %d messages."
+ msgstr[0] "%lu anahtar parolası ile şifrelenmiş\n"
+ msgstr[1] "%lu anahtar parolası ile şifrelenmiş\n"
+ 
++#: g10/tofu.c:1831
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid "Verified %d message in the future."
+ msgid_plural "Verified %d messages in the future."
+ msgstr[0] "ileti özetlerini gösterir"
+ msgstr[1] "ileti özetlerini gösterir"
+ 
++#: g10/tofu.c:1835
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid "Verified %d message"
- msgid_plural "Verified %d messages"
+ msgid "Encrypted %d message in the future."
+ msgid_plural "Encrypted %d messages in the future."
  msgstr[0] "ileti özetlerini gösterir"
  msgstr[1] "ileti özetlerini gösterir"
  
- #: g10/tofu.c:1719
++#: g10/tofu.c:1849
  #, c-format
- msgid "Encrypted %d message"
- msgid_plural "Encrypted %d messages"
+ msgid "Messages verified over the past %d day: %d."
+ msgid_plural "Messages verified over the past %d days: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1734
++#: g10/tofu.c:1855
  #, c-format
- msgid " over the past day."
- msgid_plural " over the past %d days."
+ msgid "Messages encrypted over the past %d day: %d."
+ msgid_plural "Messages encrypted over the past %d days: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1740
++#: g10/tofu.c:1865
  #, c-format
- msgid " over the past month."
- msgid_plural " over the past %d months."
+ msgid "Messages verified over the past %d month: %d."
+ msgid_plural "Messages verified over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1746
++#: g10/tofu.c:1871
  #, c-format
- msgid " over the past year."
- msgid_plural " over the past %d years."
+ msgid "Messages encrypted over the past %d month: %d."
+ msgid_plural "Messages encrypted over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1752
- msgid " in the past."
++#: g10/tofu.c:1881
+ #, c-format
+ msgid "Messages verified over the past %d year: %d."
+ msgid_plural "Messages verified over the past %d years: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1887
+ #, c-format
+ msgid "Messages encrypted over the past %d year: %d."
+ msgid_plural "Messages encrypted over the past %d years: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1895
+ #, c-format
+ msgid "Messages verified in the past: %d."
  msgstr ""
  
++#: g10/tofu.c:1899
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid "Messages encrypted in the past: %d."
+ msgstr "ileti özetlerini gösterir"
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1767
++#: g10/tofu.c:1916
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1809
++#: g10/tofu.c:1958
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1815
++#: g10/tofu.c:1964
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1823
++#: g10/tofu.c:1972
  msgid "Defaulting to unknown."
  msgstr ""
  
- #: g10/tofu.c:1938 g10/tofu.c:2074
++#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
- #: g10/tofu.c:1994
++#: g10/tofu.c:2143
  #, fuzzy, c-format
  #| msgid "error writing key: %s\n"
  msgid "resetting keydb: %s\n"
  msgstr "anahtarı yazarken hata: %s\n"
  
- #: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
- #: g10/tofu.c:2425
++#: g10/tofu.c:2601
  #, fuzzy, c-format
  #| msgid "error storing flags: %s\n"
- msgid "error setting TOFU binding's trust level to %s\n"
+ msgid "error setting TOFU binding's policy to %s\n"
  msgstr "bayraklar saklanırken hata: %s\n"
  
- #: g10/tofu.c:2473
++#: g10/tofu.c:2794
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "error changing TOFU policy: %s\n"
  msgstr "boru oluşturulurken hata: %s\n"
  
- #. TRANSLATORS: The tilde ('~') is used here to indicate a
- #. * non-breakable space
- #: g10/tofu.c:2574
++#: g10/tofu.c:2839
  #, c-format
- msgid "%d~year"
- msgid_plural "%d~years"
+ msgid "%lld~year"
+ msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2583
++#: g10/tofu.c:2844
  #, c-format
- msgid "%d~month"
- msgid_plural "%d~months"
+ msgid "%lld~month"
+ msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2592
++#: g10/tofu.c:2849
  #, c-format
- msgid "%d~day"
- msgid_plural "%d~days"
+ msgid "%lld~week"
+ msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2854
+ #, c-format
+ msgid "%lld~day"
+ msgid_plural "%lld~days"
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:2859
  #, c-format
- msgid "%d~hour"
- msgid_plural "%d~hours"
+ msgid "%lld~hour"
+ msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2610
++#: g10/tofu.c:2864
  #, c-format
- msgid "%d~minute"
- msgid_plural "%d~minutes"
+ msgid "%lld~minute"
+ msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2619
++#: g10/tofu.c:2866
  #, c-format
- msgid "%d~second"
- msgid_plural "%d~seconds"
+ msgid "%lld~second"
+ msgid_plural "%lld~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2802
++#: g10/tofu.c:3103
  #, c-format
- msgid "%s: "
+ msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:2806
++#: g10/tofu.c:3109
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
- msgid "Verified %ld signatures"
+ msgid "%s: Verified 0 signatures."
  msgstr "%d imza silindi.\n"
  
- #: g10/tofu.c:2816
++#: g10/tofu.c:3117
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid "Verified %ld signature in the past %s"
- msgid_plural "Verified %ld signatures in the past %s"
+ msgid "%s: Verified %ld~signature in the past %s."
+ msgid_plural "%s: Verified %ld~signatures in the past %s."
  msgstr[0] "ileti özetlerini gösterir"
  msgstr[1] "ileti özetlerini gösterir"
  
- #: g10/tofu.c:2826
- #, fuzzy, c-format
++#: g10/tofu.c:3127
+ #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
- msgid ", and encrypted %ld messages"
+ msgid "Encrypted 0 messages."
  msgstr "%lu anahtar parolası ile şifrelenmiş\n"
  
- #: g10/tofu.c:2835
++#: g10/tofu.c:3135
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid ", and encrypted %ld message in the past %s"
- msgid_plural ", and encrypted %ld messages in the past %s"
+ msgid "Encrypted %ld~message in the past %s."
+ msgid_plural "Encrypted %ld~messages in the past %s."
  msgstr[0] "ileti özetlerini gösterir"
  msgstr[1] "ileti özetlerini gösterir"
  
- #: g10/tofu.c:2880
++#: g10/tofu.c:3146
+ #, fuzzy, c-format
+ #| msgid "validity: %s"
+ msgid "(policy: %s)"
+ msgstr "geçerliliği: %s"
+ 
++#: g10/tofu.c:3177
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2883
++#: g10/tofu.c:3180
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2887
++#: g10/tofu.c:3184
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2890
++#: g10/tofu.c:3187
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2919
++#: g10/tofu.c:3216
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7561,19 -6089,15 +7601,19 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
- #: g10/tofu.c:3480 g10/tofu.c:3572
++#: g10/tofu.c:3298 g10/tofu.c:3449 g10/tofu.c:3627 g10/tofu.c:3670
++#: g10/tofu.c:3784 g10/tofu.c:3859 g10/tofu.c:3894
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error opening TOFU database: %s\n"
  msgstr "%s komutu gönderilirken hata: %s\n"
  
- #: g10/tofu.c:3185
++#: g10/tofu.c:3482
  #, c-format
- msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
  msgstr ""
  
- #: g10/tofu.c:3515
++#: g10/tofu.c:3819
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7605,71 -6124,57 +7645,71 @@@ msgstr "anahtar %s: güvenli anahtar i�
  msgid "key %s marked as ultimately trusted\n"
  msgstr "anahtar %s son derece güvenli olarak imlendi.\n"
  
- #: g10/trustdb.c:341
++#: g10/trustdb.c:348
  #, 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:347
++#: g10/trustdb.c:354
  #, 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:422
++#: g10/trustdb.c:429
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr ""
  
- #: g10/trustdb.c:431
++#: g10/trustdb.c:438
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:468
++#: g10/trustdb.c:475
  #, 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:474
++#: g10/trustdb.c:481
  #, c-format
  msgid "using %s trust model\n"
  msgstr "%s güvence modeli kullanılıyor\n"
  
- #: g10/trustdb.c:511
++#: g10/trustdb.c:518
  msgid "no need for a trustdb check\n"
  msgstr "bir güvence veritabanı denetimi gereksiz\n"
  
- #: g10/trustdb.c:517 g10/trustdb.c:2160
++#: g10/trustdb.c:524 g10/trustdb.c:2187
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "sonraki güvence veritabanı denetimi %s de\n"
  
- #: g10/trustdb.c:526
++#: g10/trustdb.c:533
  #, 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:542
++#: g10/trustdb.c:549
  #, 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:749 g10/trustdb.c:1313
++#: g10/trustdb.c:756 g10/trustdb.c:1340
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "genel anahtar %s yok: %s\n"
  
- #: g10/trustdb.c:966
++#: g10/trustdb.c:973
  msgid "please do a --check-trustdb\n"
  msgstr "lütfen bir --check-trustdb yapın\n"
  
- #: g10/trustdb.c:971
++#: g10/trustdb.c:978
  msgid "checking the trustdb\n"
  msgstr "güvence veritabanı denetleniyor\n"
  
- #: g10/trustdb.c:1883
++#: g10/trustdb.c:1910
  #, fuzzy, c-format
  #| msgid "%lu keys processed so far\n"
  msgid "%d key processed"
@@@ -7677,7 -6182,6 +7717,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:1886
++#: g10/trustdb.c:1913
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7685,16 -6189,13 +7725,16 @@@ msgid_plural " (%d validity counts clea
  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:1956
++#: g10/trustdb.c:1983
  msgid "no ultimately trusted keys found\n"
  msgstr "son derece güvenli bir anahtar yok\n"
  
- #: g10/trustdb.c:1970
++#: g10/trustdb.c:1997
  #, 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:2087
++#: g10/trustdb.c:2114
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7702,7 -6203,6 +7742,7 @@@ msgstr "
  "derinlik: %d  geçerli: %3d  imzalı: %3d  güvenilir: %d-, %dq, %dn, %dm, %df, "
  "%du\n"
  
- #: g10/trustdb.c:2167
++#: g10/trustdb.c:2194
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr ""
@@@ -7820,19 -6299,14 +7860,19 @@@ msgstr "
  "Sözdizimi: kbxutil [seçenekler] [dosyalar]\n"
  "Anahtar kutusu verisini listeler, ithal ve ihraç eder\n"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3208
++#: scd/app-nks.c:718 scd/app-openpgp.c:3221
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr "RSA modülü ya eksik ya da %d bitlik değil\n"
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3220
++#: scd/app-nks.c:726 scd/app-openpgp.c:3233
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr "RSA genel üstel sayısı ya eksik ya da %d bitten büyük\n"
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
- #: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
- #: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1965 scd/app-openpgp.c:1984
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2166 scd/app-openpgp.c:2430
++#: scd/app-openpgp.c:2477 scd/app-openpgp.c:2582 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "PIN eylemcisi hata döndürdü: %s\n"
@@@ -7881,85 -6346,67 +7921,85 @@@ msgid "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2511 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "yeni PIN alınırken hata: %s\n"
  
- #: scd/app-openpgp.c:806
++#: scd/app-openpgp.c:801
  #, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "parmakizinin saklanması başarısız oldu: %s\n"
  
- #: scd/app-openpgp.c:819
++#: scd/app-openpgp.c:814
  #, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "oluşturma tarihinin saklanması başarısız oldu: %s\n"
  
- #: scd/app-openpgp.c:1236
++#: scd/app-openpgp.c:1247
  msgid "response does not contain the RSA modulus\n"
  msgstr "yanıt RSA modülü içermiyor\n"
  
- #: scd/app-openpgp.c:1243
++#: scd/app-openpgp.c:1254
  msgid "response does not contain the RSA public exponent\n"
  msgstr "yanıt RSA genel bileşenini içermiyor\n"
  
- #: scd/app-openpgp.c:1353
++#: scd/app-openpgp.c:1364
  #, fuzzy
  #| msgid "response does not contain the RSA public exponent\n"
  msgid "response does not contain the EC public key\n"
  msgstr "yanıt RSA genel bileşenini içermiyor\n"
  
- #: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:1464 scd/app-openpgp.c:3825
  msgid "response does not contain the public key data\n"
  msgstr "yanıt genel anahtar verisi içermiyor\n"
  
- #: scd/app-openpgp.c:1551
++#: scd/app-openpgp.c:1564
  #, c-format
  msgid "reading public key failed: %s\n"
  msgstr "genel anahtar okuması başarısız: %s\n"
  
- #: scd/app-openpgp.c:1903
++#: scd/app-openpgp.c:1916
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr "%s olarak öntanımlı PIN kullanılıyor\n"
  
- #: scd/app-openpgp.c:1910
++#: scd/app-openpgp.c:1923
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  "%s olarak öntanımlı PIN kullanılamadı: %s - öntanımlı kullanımı iptal "
  "ediliyor\n"
  
- #: scd/app-openpgp.c:1925
++#: scd/app-openpgp.c:1938
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr "||Lütfen PIN'i giriniz%%0A[yapılan imza: %lu]"
  
- #: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
++#: scd/app-openpgp.c:1949 scd/app-openpgp.c:2424
  msgid "||Please enter the PIN"
  msgstr "||Lütfen PIN'i giriniz"
  
- #: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2173 scd/app-openpgp.c:2437
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr "CHV%d için PIN çok kısa; asgari uzunluk: %d\n"
  
- #: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
- #: scd/app-openpgp.c:4114
++#: scd/app-openpgp.c:2004 scd/app-openpgp.c:2043 scd/app-openpgp.c:2185
++#: scd/app-openpgp.c:4126
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "CHV%d doğrulaması başarısız oldu: %s\n"
  
- #: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
++#: scd/app-openpgp.c:2072 scd/app-openpgp.c:2458 scd/app-openpgp.c:4556
  msgid "error retrieving CHV status from card\n"
  msgstr "karttan CHV durumu alınırken hata\n"
  
- #: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
++#: scd/app-openpgp.c:2078 scd/app-openpgp.c:4565
  msgid "card is permanently locked!\n"
  msgstr "kart kalıcı olarak kilitli!\n"
  
- #: scd/app-openpgp.c:2072
++#: scd/app-openpgp.c:2085
  #, fuzzy, c-format
  #| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@@ -7972,27 -6419,22 +8012,27 @@@ msgstr[1] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:2082
++#: scd/app-openpgp.c:2095
  #, fuzzy, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr ""
  "|A|Lütfen Yönetici PIN'ini okuyucu tuştakımından giriniz%%0A[kalan deneme: "
  "%d]"
  
- #: scd/app-openpgp.c:2086
++#: scd/app-openpgp.c:2099
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
  msgstr "||Lütfen PIN'i giriniz"
  
- #: scd/app-openpgp.c:2107
++#: scd/app-openpgp.c:2120
  msgid "access to admin commands is not configured\n"
  msgstr "yönetici komutlarına erişim yapılandırılmamış\n"
  
- #: scd/app-openpgp.c:2460
++#: scd/app-openpgp.c:2473
  msgid "||Please enter the Reset Code for the card"
  msgstr "||Lütfen kart için Sıfırlama Kodunu giriniz"
  
- #: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
++#: scd/app-openpgp.c:2483 scd/app-openpgp.c:2537
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr "Sıfırlama Kodu çok kısa; asgari uzunluk: %d\n"
@@@ -8000,83 -6442,65 +8040,83 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2493
++#: scd/app-openpgp.c:2506
  msgid "|RN|New Reset Code"
  msgstr "|YSK|Yeni Sıfırlama Kodu"
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|AN|New Admin PIN"
  msgstr "|YYP|Yeni Yönetici PIN'i"
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|N|New PIN"
  msgstr "|N|Yeni PIN"
  
- #: scd/app-openpgp.c:2565
++#: scd/app-openpgp.c:2578
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "||Lütfen PIN'i giriniz"
  
- #: scd/app-openpgp.c:2566
++#: scd/app-openpgp.c:2579
  #, fuzzy
  #| msgid "||Please enter the PIN"
  msgid "||Please enter the PIN and New PIN"
  msgstr "||Lütfen PIN'i giriniz"
  
- #: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
++#: scd/app-openpgp.c:2635 scd/app-openpgp.c:3885
  msgid "error reading application data\n"
  msgstr "uygulama verisi okunurken hata\n"
  
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
++#: scd/app-openpgp.c:2641 scd/app-openpgp.c:3892
  msgid "error reading fingerprint DO\n"
  msgstr "parmakizi DO okunurken hata\n"
  
- #: scd/app-openpgp.c:2638
++#: scd/app-openpgp.c:2651
  msgid "key already exists\n"
  msgstr "anahtar zaten mevcut\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2655
  msgid "existing key will be replaced\n"
  msgstr "mevcut anahtar konulacak\n"
  
- #: scd/app-openpgp.c:2644
++#: scd/app-openpgp.c:2657
  msgid "generating new key\n"
  msgstr "yeni anahtar üretiliyor\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2659
  #, fuzzy
  msgid "writing new key\n"
  msgstr "yeni anahtar üretiliyor\n"
  
- #: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
++#: scd/app-openpgp.c:3201 scd/app-openpgp.c:3553
  msgid "creation timestamp missing\n"
  msgstr "oluşturum zaman damgası kayıp\n"
  
- #: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
++#: scd/app-openpgp.c:3243 scd/app-openpgp.c:3251
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr "RSA asal sayısı %s ya eksik la da %d bitlik değil\n"
  
- #: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
++#: scd/app-openpgp.c:3384 scd/app-openpgp.c:3647
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "anahtarın saklanması başarısız: %s\n"
  
- #: scd/app-openpgp.c:3534
++#: scd/app-openpgp.c:3547
  #, fuzzy
  #| msgid "unsupported algorithm: %s"
  msgid "unsupported curve\n"
  msgstr "desteklenmeyen algoritma: %s"
  
- #: scd/app-openpgp.c:3790
++#: scd/app-openpgp.c:3802
  msgid "please wait while key is being generated ...\n"
  msgstr "anahtar üretilene kadar lütfen bekleyiniz ....\n"
  
- #: scd/app-openpgp.c:3798
++#: scd/app-openpgp.c:3810
  msgid "generating key failed\n"
  msgstr "anahtar üretimi başarısızlığa uğradı\n"
  
- #: scd/app-openpgp.c:3804
++#: scd/app-openpgp.c:3816
  #, fuzzy, c-format
  #| msgid "key generation completed (%d seconds)\n"
  msgid "key generation completed (%d second)\n"
@@@ -8084,30 -6508,24 +8124,30 @@@ msgid_plural "key generation completed 
  msgstr[0] "anahtar üretimi tamamlandı (%d saniye)\n"
  msgstr[1] "anahtar üretimi tamamlandı (%d saniye)\n"
  
- #: scd/app-openpgp.c:3838
++#: scd/app-openpgp.c:3850
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "OpenPGP kartının yapısı geçersiz (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:3900
  msgid "fingerprint on card does not match requested one\n"
  msgstr "karttaki parmak izi istenenle eşleşmiyor\n"
  
- #: scd/app-openpgp.c:4004
++#: scd/app-openpgp.c:4016
  #, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "kart %s özet algoritmasını desteklemiyor\n"
  
- #: scd/app-openpgp.c:4089
++#: scd/app-openpgp.c:4101
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "şu ana kadar oluşturulan imzalar: %lu\n"
  
- #: scd/app-openpgp.c:4551
++#: scd/app-openpgp.c:4570
  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:4854 scd/app-openpgp.c:4865
++#: scd/app-openpgp.c:4871 scd/app-openpgp.c:4882
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "%s erişilebilir değil - OpenPGP kartı geçersiz olabilir mi?\n"
@@@ -8129,7 -6544,6 +8169,7 @@@ msgstr "|N|İlk Yeni PIN
  msgid "run in multi server mode (foreground)"
  msgstr "çoklu sunucu kipinde çalışır (önalanda)"
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|LDÜZEY|hata ayıklama düzeyini DÜZEY yapar"
  
@@@ -8172,13 -6577,11 +8212,13 @@@ msgstr "yönetici kartı komutları kul
  msgid "use variable length input for pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:287
++#: scd/scdaemon.c:286
  #, 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:289
++#: scd/scdaemon.c:288
  #, fuzzy
  #| msgid ""
  #| "Syntax: scdaemon [options] [command [args]]\n"
@@@ -8190,7 -6593,6 +8230,7 @@@ msgstr "
  "Sözdizimi: scdaemon [seçenekler] [komut [arg ...]]\n"
  "GnuPG için akıllı kart artalan süreci\n"
  
- #: scd/scdaemon.c:786
++#: scd/scdaemon.c:784
  #, fuzzy
  #| msgid ""
  #| "please use the option `--daemon' to run the program in the background\n"
@@@ -8199,12 -6601,10 +8239,12 @@@ msgstr "
  "Programı artalanda çalışır bırakmak için lütfen `--daemon' seçeneğini "
  "kullanın\n"
  
- #: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1904
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "fd %d için eylemci başlatıldı\n"
  
- #: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
++#: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1909
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "fd %d için eylemci sonlandı\n"
@@@ -8285,9 -6669,6 +8325,9 @@@ msgstr "eşleşen sertifika sayısı: %
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "dirmngr sadece-önbellek anahtar araması başarısızi: %s\n"
  
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
 +#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  msgid "failed to allocate keyDB handle\n"
  msgstr "anahtar veritabanı eylemcisine yer ayrılması başarısız oldu\n"
  
@@@ -8790,11 -7069,9 +8830,11 @@@ msgstr "Hazır.  Bu isteği şimdi Sert
  msgid "resource problem: out of core\n"
  msgstr "özkaynak sorunu: nüve dışı\n"
  
- #: sm/decrypt.c:330
++#: sm/decrypt.c:332
  msgid "(this is the RC2 algorithm)\n"
  msgstr "(bu, RC2 algoritmasıdır)\n"
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:334
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr "(bu bir şifreli iletiymiş gibi görünmüyor)\n"
  
@@@ -8838,119 -7107,91 +8878,119 @@@ msgstr "harici anahtarları listeler
  msgid "list certificate chain"
  msgstr "sertifika zincirini listeler"
  
- #: sm/gpgsm.c:218
++#: sm/gpgsm.c:219
  msgid "import certificates"
  msgstr "sertifikaları ithal eder"
  
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
  msgid "export certificates"
  msgstr "sertifikaları ihraç eder"
  
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:228
  msgid "register a smartcard"
  msgstr "bir akıllı kartı kayda alır"
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:231
  msgid "pass a command to the dirmngr"
  msgstr "dirmngr'a bir komut aktarır"
  
- #: sm/gpgsm.c:232
++#: sm/gpgsm.c:233
  msgid "invoke gpg-protect-tool"
  msgstr "gpg-protect-tool'u çalıştırır"
  
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:250
  msgid "create base-64 encoded output"
  msgstr "base-64 kodlu çıktı oluşturur"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in PEM format"
  msgstr "girdinin PEM biçiminde olduğu kabul edilir"
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in base-64 format"
  msgstr "girdinin base-64 biçiminde olduğu kabul edilir"
  
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:262
  msgid "assume input is in binary format"
  msgstr "girdinin ikilik biçimde olduğu kabul edilir"
  
- #: sm/gpgsm.c:267
++#: sm/gpgsm.c:269
  msgid "never consult a CRL"
  msgstr "asla bir CRL sormaz"
  
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:279
  msgid "check validity using OCSP"
  msgstr "doğruluğu OCSP kullarak sınar"
  
- #: sm/gpgsm.c:282
++#: sm/gpgsm.c:284
  msgid "|N|number of certificates to include"
  msgstr "|N|içerilecek sertifika sayısı"
  
- #: sm/gpgsm.c:285
++#: sm/gpgsm.c:287
  msgid "|FILE|take policy information from FILE"
  msgstr "|DOSYA|poliçe bilgisi DOSYAdan alınır"
  
- #: sm/gpgsm.c:288
++#: sm/gpgsm.c:290
  msgid "do not check certificate policies"
  msgstr "sertifika poliçeleri sınanmaz"
  
- #: sm/gpgsm.c:292
++#: sm/gpgsm.c:294
  msgid "fetch missing issuer certificates"
  msgstr "kayıp sertifikacı sertifikalarını alır"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "don't use the terminal at all"
  msgstr "terminali hiç kullanma"
  
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:307
  msgid "|FILE|write a server mode log to FILE"
  msgstr "|DOSYA|bir sunucu kipi günlüğü DOSYAya yazar"
  
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:312
  msgid "|FILE|write an audit log to FILE"
  msgstr "|DOSYA|bir denetim günlüğünü DOSYAya yazar"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "batch mode: never ask"
  msgstr "önceden belirlenmiş işlemler kipi: hiç sormaz"
  
- #: sm/gpgsm.c:314
++#: sm/gpgsm.c:316
  msgid "assume yes on most questions"
  msgstr "soruların çoğunda cevap evet farzedilir"
  
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:317
  msgid "assume no on most questions"
  msgstr "soruların çoğunda cevap hayır farzedilir"
  
- #: sm/gpgsm.c:318
++#: sm/gpgsm.c:320
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "|DOSYA|anahtar zincirini anahtar zincirleri listesine ekler"
  
- #: sm/gpgsm.c:321
++#: sm/gpgsm.c:323
  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:331 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
  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:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|İSİM|şifre algoritması olarak İSİM kullanılır"
  
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:352
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|İSİM|özet algoritması olarak İSİM kullanılır"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:559
  #, 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:570
++#: sm/gpgsm.c:562
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpgsm [options] [files]\n"
@@@ -8965,50 -7206,41 +9005,50 @@@ 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:774
++#: sm/gpgsm.c:766
  #, 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:785
++#: sm/gpgsm.c:777
  #, 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:836 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
  #, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "%s:%u: konak adı belirtilmemiş\n"
  
- #: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr "%s:%u: kullanıcısız parola verilmiş\n"
  
- #: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
  #, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr "%s:%u: bu satır atlanıyor\n"
  
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1427
  msgid "could not parse keyserver\n"
  msgstr "anahtar sunucusu çözümlenemedi\n"
  
- #: sm/gpgsm.c:1636
++#: sm/gpgsm.c:1630
  #, 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:1677
++#: sm/gpgsm.c:1671
  #, 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:2033
++#: sm/gpgsm.c:2028
  msgid "invalid command (there is no implicit command)\n"
  msgstr "geçersiz komut (hiç dolaylı komut yok)\n"
  
@@@ -9836,8 -7917,6 +9876,8 @@@ msgstr "
  msgid "CRL access not possible due to disabled %s\n"
  msgstr ""
  
 +#: dirmngr/crlfetch.c:223 dirmngr/ldap-wrapper-ce.c:488
- #: dirmngr/ldap-wrapper.c:742 dirmngr/misc.c:563
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:563
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
@@@ -10040,126 -8083,98 +10080,126 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:160
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:158
++#: dirmngr/dirmngr.c:161
  #, 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:159
++#: dirmngr/dirmngr.c:162
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:163
  #, fuzzy
  #| msgid "pass a command to the dirmngr"
  msgid "shutdown the dirmngr"
  msgstr "dirmngr'a bir komut aktarır"
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:164
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
- #: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
++#: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|DOSYA|sunucu kipi günlükleri DOSYAya yazar"
  
- #: dirmngr/dirmngr.c:177
++#: dirmngr/dirmngr.c:180
  #, 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:178
++#: dirmngr/dirmngr.c:181
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:182
  #, fuzzy
  #| msgid "allow PKA lookups (DNS requests)"
  msgid "allow sending OCSP requests"
  msgstr "PKA aramalarına izin verilir (DNS istekleri)"
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:184
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:185
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:186
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:188
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:192
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:202
  #, fuzzy
  #| msgid "|FILE|read options from FILE"
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|DOSYA|seçenekler DOSYAdan okunur"
  
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
  #, 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:207
++#: dirmngr/dirmngr.c:210
  #, 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:209
++#: dirmngr/dirmngr.c:212
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:218
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:220
++#: dirmngr/dirmngr.c:223
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:225
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:240
++#: dirmngr/dirmngr.c:246
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -10172,13 -8187,11 +10212,13 @@@ msgstr "
  "@\n"
  "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
  
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:361
  #, 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:355
++#: dirmngr/dirmngr.c:363
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -10190,88 -8203,71 +10230,88 @@@ msgstr "
  "Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
  "GnuPG için gizli anahtar yönetimi\n"
  
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:443
  #, 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:488 tools/gpgconf.c:543 tools/gpgconf.c:577
- #: tools/gpgconf.c:648
++#: dirmngr/dirmngr.c:496 tools/gpgconf.c:550 tools/gpgconf.c:585
++#: tools/gpgconf.c:656
  #, fuzzy, c-format
  #| msgid "usage: gpgsm [options] "
  msgid "usage: %s [options] "
  msgstr "kullanımı: gpgsm [seçenekler] "
  
- #: dirmngr/dirmngr.c:1062
++#: dirmngr/dirmngr.c:1074
  #, fuzzy
  #| 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:1301 dirmngr/server.c:1585
++#: dirmngr/dirmngr.c:1300 dirmngr/server.c:1585
  #, 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:1307 dirmngr/server.c:1591
++#: dirmngr/dirmngr.c:1306 dirmngr/server.c:1591
  #, 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:1484
++#: dirmngr/dirmngr.c:1487
  #, 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:1539 dirmngr/dirmngr.c:1623
++#: dirmngr/dirmngr.c:1542 dirmngr/dirmngr.c:1626
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "parmakizi geçersiz"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
++#: dirmngr/dirmngr.c:1578 dirmngr/dirmngr.c:1604 tools/gpgconf-comp.c:4032
  #, 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:1630
++#: dirmngr/dirmngr.c:1633
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1700
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1734
++#: dirmngr/dirmngr.c:1738
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1739
++#: dirmngr/dirmngr.c:1743
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1745
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1746
++#: dirmngr/dirmngr.c:1750
  #, fuzzy
  #| msgid "not forced"
  msgid "shutdown forced\n"
  msgstr "zorlanmadı"
  
- #: dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1758
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1761
++#: dirmngr/dirmngr.c:1765
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10799,36 -8696,30 +10839,36 @@@ msgstr "select başarısız: %s\n
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2463
++#: dirmngr/server.c:2469
  #, 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:2474
++#: dirmngr/server.c:2480
  #, 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:2495
++#: dirmngr/server.c:2501
  #, 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:2503
++#: dirmngr/server.c:2509
  #, 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:2534
++#: dirmngr/server.c:2540
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2553
++#: dirmngr/server.c:2559
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
@@@ -10884,7 -8766,6 +10924,7 @@@ msgstr "
  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:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:167
  msgid "quiet"
  msgstr "sessiz"
  
@@@ -10986,22 -8847,15 +11026,22 @@@ msgstr "satır göndirimi başarısız
  msgid "error sending standard options: %s\n"
  msgstr "standart seçenekler gönderilirken hata: %s\n"
  
 +#: tools/gpgconf-comp.c:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
- #: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
++#: tools/gpgconf-comp.c:766 tools/gpgconf-comp.c:865
  msgid "Options controlling the diagnostic output"
  msgstr "Tanı çıktısını denetleyen seçenekler"
  
 +#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
- #: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
++#: tools/gpgconf-comp.c:779 tools/gpgconf-comp.c:888
  msgid "Options controlling the configuration"
  msgstr "Yapılandırmayı denetleyen seçenekler"
  
- #: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
- #: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
++#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:723
++#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:901
  msgid "Options useful for debugging"
  msgstr "Hata ayıklamaya elverişli seçenekler"
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
  msgid "Options controlling the security"
  msgstr "Güvenliği denetleyen seçenekler"
  
@@@ -11052,11 -8895,9 +11092,11 @@@ msgstr "eski anahtar parolalarının ye
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr "|N|azami PIN önbelleği ömrü N saniyeye ayarlanır"
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
++#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
  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:701 tools/gpgconf-comp.c:778
++#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:784
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|İSİM|İSİM kullanıcısı için de şifreleme yapar"
  
@@@ -11064,188 -8904,162 +11104,206 @@@
  msgid "|SPEC|set up email aliases"
  msgstr "|BELİRTİM|eposta rumuzlarını ayarlar"
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
++#: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
  msgid "Configuration for Keyservers"
  msgstr "Anahtar sunucular için yapılandırma"
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
++#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
  msgid "|URL|use keyserver at URL"
  msgstr "|URL| URL'si veriler anahtar sunucusu kullanılır"
  
- #: tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:741
  msgid "allow PKA lookups (DNS requests)"
  msgstr "PKA aramalarına izin verilir (DNS istekleri)"
  
- #: tools/gpgconf-comp.c:738
++#: tools/gpgconf-comp.c:744
  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:787
++#: tools/gpgconf-comp.c:793
  msgid "disable all access to the dirmngr"
  msgstr "dirmngr'a tüm erişim iptal edilir"
  
- #: tools/gpgconf-comp.c:790
++#: tools/gpgconf-comp.c:796
  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:820
++#: tools/gpgconf-comp.c:829
  msgid "do not check CRLs for root certificates"
  msgstr "kök sertifikalar için CRLler sınanmaz"
  
- #: tools/gpgconf-comp.c:869
++#: tools/gpgconf-comp.c:878
  msgid "Options controlling the format of the output"
  msgstr "Çıktı biçimini denetleyen seçenekler"
  
- #: tools/gpgconf-comp.c:905
++#: tools/gpgconf-comp.c:920
  msgid "Options controlling the interactivity and enforcement"
  msgstr "Etkileşimliliği ve zorlamayı denetleyen seçenekler"
  
- #: tools/gpgconf-comp.c:918
++#: tools/gpgconf-comp.c:933
  #, fuzzy
  #| msgid "Options controlling the security"
  msgid "Options controlling the use of Tor"
  msgstr "Güvenliği denetleyen seçenekler"
  
- #: tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:947
  msgid "Configuration for HTTP servers"
  msgstr "HTTP sunucuları için yapılandırma"
  
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:958
  msgid "use system's HTTP proxy setting"
  msgstr "sistemin HTTP vekil ayarları kullanılır"
  
- #: tools/gpgconf-comp.c:948
++#: tools/gpgconf-comp.c:963
  msgid "Configuration of LDAP servers to use"
  msgstr "Kullanılacak LDAP sunucularının yapılandırması"
  
- #: tools/gpgconf-comp.c:977
++#: tools/gpgconf-comp.c:992
  msgid "LDAP server list"
  msgstr "LDAP sunucu listesi"
  
- #: tools/gpgconf-comp.c:985
++#: tools/gpgconf-comp.c:1000
  msgid "Configuration for OCSP"
  msgstr "OCSP için yapılandırma"
  
- #: tools/gpgconf-comp.c:1066
++#: tools/gpgconf-comp.c:1081
  msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1067
++#: tools/gpgconf-comp.c:1082
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1083
  msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1069
++#: tools/gpgconf-comp.c:1084
  msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1070
++#: tools/gpgconf-comp.c:1085
  msgid "Network"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1071
++#: tools/gpgconf-comp.c:1086
  #, fuzzy
  #| msgid "Bad Passphrase"
  msgid "Passphrase Entry"
  msgstr "Anahtar Parolası hatalı"
  
- #: tools/gpgconf-comp.c:1225
++#: tools/gpgconf-comp.c:1240
  #, fuzzy
  #| msgid "Component not found"
  msgid "Component not suitable for launching"
  msgstr "Bileşen yok"
  
- #: tools/gpgconf-comp.c:3283
++#: tools/gpgconf-comp.c:3311
  #, 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:3434
++#: tools/gpgconf-comp.c:3462
  msgid "Note that group specifications are ignored\n"
  msgstr "Grup belirtimlerinin yoksayıldığına dikkat edin\n"
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf-comp.c:4036
+ #, 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:4038
+ #, fuzzy, c-format
+ #| msgid "error in `%s': %s\n"
+ msgid "error parsing '%s'\n"
+ msgstr "'%s' de hata: %s\n"
+ 
++#: tools/gpgconf.c:73
  msgid "list all components"
  msgstr "tüm bileşenleri listeler"
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "check all programs"
  msgstr "tüm programları sınar"
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|list options"
  msgstr "|BİLEŞEN|seçenekleri listeler"
  
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
  msgid "|COMPONENT|change options"
  msgstr "|BİLEŞEN|seçenekleri değiştirir"
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "|COMPONENT|check options"
  msgstr "|BİLEŞEN|seçenekleri sınar"
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "apply global default values"
  msgstr "öntanımlı küresel değerleri uygular"
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
+ #, 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:83
  #, 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:81
++#: tools/gpgconf.c:85
  msgid "list global configuration file"
  msgstr "küresel yapılandırma dosyasını listeler"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  msgid "check global configuration file"
  msgstr "küresel yapılandırma dosayasını sınar"
  
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:89
  #, fuzzy
  #| msgid "update the trust database"
  msgid "query the software version database"
  msgstr "güvence veritabanını günceller"
  
- #: tools/gpgconf.c:86
++#: tools/gpgconf.c:90
  #, fuzzy
  #| msgid "list all components"
  msgid "reload all or a given component"
  msgstr "tüm bileşenleri listeler"
  
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:91
  #, fuzzy
  #| msgid "list all components"
  msgid "launch a given component"
  msgstr "tüm bileşenleri listeler"
  
- #: tools/gpgconf.c:88
++#: tools/gpgconf.c:92
  #, fuzzy
  #| msgid "list all components"
  msgid "kill a given component"
  msgstr "tüm bileşenleri listeler"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "use as output file"
  msgstr "çıktı dosyası olarak kullanılır"
  
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:102
  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:122
++#: tools/gpgconf.c:127
  #, 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:125
++#: tools/gpgconf.c:130
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpgconf [options]\n"
@@@ -11257,15 -9071,12 +11315,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:545 tools/gpgconf.c:579
++#: tools/gpgconf.c:552 tools/gpgconf.c:587
  msgid "Need one component argument"
  msgstr "Tek bileşenlik değiştirge gerekli"
  
- #: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
++#: tools/gpgconf.c:561 tools/gpgconf.c:599 tools/gpgconf.c:632
  msgid "Component not found"
  msgstr "Bileşen yok"
  
- #: tools/gpgconf.c:650
++#: tools/gpgconf.c:658
  msgid "No argument allowed"
  msgstr "Değiştirgeye izin verilmez"
  
diff --cc po/uk.po
index 4ddc75c,d05706d..6860551
--- a/po/uk.po
+++ b/po/uk.po
@@@ -7,7 -7,6 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: GNU gnupg 2.1.0\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-11-18 16:54+0100\n"
++"POT-Creation-Date: 2016-12-20 11:28+0100\n"
  "PO-Revision-Date: 2016-07-10 15:11+0300\n"
  "Last-Translator: Yuri Chornoivan <yurchor at ukr.net>\n"
  "Language-Team: Ukrainian <kde-i18n-uk at kde.org>\n"
@@@ -156,24 -127,10 +156,24 @@@ msgid "ssh keys greater than %d bits ar
  msgstr ""
  "підтримки ключів ssh, що складаються з понад %d бітів, не передбачено\n"
  
 +#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
- #: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1306 g10/keygen.c:4577
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
++#: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
  #, c-format
  msgid "can't create '%s': %s\n"
  msgstr "не вдалося створити «%s»: %s\n"
  
 +#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
- #: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1307
++#: g10/import.c:305 g10/import.c:448 g10/import.c:621 g10/keygen.c:3681
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
- #: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
- #: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:825 g10/sign.c:1025
++#: g10/sign.c:1130 g10/sign.c:1275 g10/tdbdump.c:143 g10/tdbdump.c:151
++#: g10/tdbio.c:720 g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161
++#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
++#: dirmngr/certcache.c:368 dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1564
  #, c-format
  msgid "can't open '%s': %s\n"
  msgstr "не вдалося відкрити «%s»: %s\n"
@@@ -238,11 -184,9 +238,11 @@@ msgstr "
  msgid "failed to create stream from socket: %s\n"
  msgstr "не вдалося створити потік даних з сокета: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1100
++#: agent/divert-scd.c:92 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr "Будь ласка, вставте картку з серійним номером"
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1101
++#: agent/divert-scd.c:93 g10/call-agent.c:1102
  msgid "Please remove the current card and insert the one with serial number"
  msgstr "Будь ласка, вийміть поточну картку і вставте картку з серійним номером"
  
@@@ -377,47 -295,32 +377,47 @@@ msgstr "
  "@Параметри:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
  msgid "run in daemon mode (background)"
  msgstr "запустити у режимі фонової служби (фоновий)"
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
  msgid "run in server mode (foreground)"
  msgstr "запустити у режимі сервера (основному)"
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
  #, fuzzy
  #| msgid "run in server mode"
  msgid "run in supervised mode"
  msgstr "запустити у режимі сервера"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:170 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "докладний режим"
  
 +#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "дещо зменшити кількість повідомлень"
  
- #: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
  msgid "sh-style command output"
  msgstr "виведення команд у форматі sh"
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
  msgid "csh-style command output"
  msgstr "виведення команд у форматі csh"
  
- #: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
- #: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
++#: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
  msgid "|FILE|read options from FILE"
  msgstr "|FILE|прочитати параметри з вказаного файла"
  
- #: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:177
  msgid "do not detach from the console"
  msgstr "не від’єднувати від консолі"
  
@@@ -492,19 -378,12 +492,19 @@@ 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:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:481 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1025 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:358
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:124 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr "Будь ласка, надсилайте повідомлення про помилки на <@EMAIL@>.\n"
  
- #: agent/gpg-agent.c:491
++#: agent/gpg-agent.c:490
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "Використання: @GPG_AGENT@ [параметри] (-h — довідка)"
  
- #: agent/gpg-agent.c:493
++#: agent/gpg-agent.c:492
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
@@@ -512,137 -391,102 +512,137 @@@ msgstr "
  "Синтаксис: @GPG_AGENT@ [параметри] [команда [аргументи]]\n"
  "Керування закритими ключами у @GNUPG@\n"
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:537 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:442
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr "вказано некоректне значення рівня діагностики «%s»\n"
  
- #: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:793
++#: agent/gpg-agent.c:1082 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:812
  #, c-format
  msgid "Note: no default option file '%s'\n"
  msgstr "ЗАУВАЖЕННЯ: не виявлено файла типових параметрів «%s»\n"
  
- #: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
- #: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1093 agent/gpg-agent.c:1935 g10/gpg.c:2510
++#: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:817
++#: dirmngr/dirmngr.c:1670 tools/symcryptrun.c:932
  #, c-format
  msgid "option file '%s': %s\n"
  msgstr "файл параметрів «%s»: %s\n"
  
- #: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:806
++#: agent/gpg-agent.c:1101 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:825
  #, c-format
  msgid "reading options from '%s'\n"
  msgstr "прочитати параметри з «%s»\n"
  
- #: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
- #: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
++#: agent/gpg-agent.c:1223 g10/gpg.c:3643 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:936 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:527
  #, c-format
  msgid "Note: '%s' is not considered an option\n"
  msgstr "ЗАУВАЖЕННЯ: %s не призначено для звичайного використання!\n"
  
- #: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
++#: agent/gpg-agent.c:2080 scd/scdaemon.c:1073 dirmngr/dirmngr.c:1081
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "не вдалося створити сокет: %s\n"
  
- #: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
++#: agent/gpg-agent.c:2097 scd/scdaemon.c:1086 dirmngr/dirmngr.c:1094
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr "назва сокета «%s» є надто довгою\n"
  
- #: agent/gpg-agent.c:2134
++#: agent/gpg-agent.c:2135
  msgid "a gpg-agent is already running - not starting a new one\n"
  msgstr "gpg-agent вже запущено, потреби у запуску нової копії немає\n"
  
- #: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
++#: agent/gpg-agent.c:2145 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1126
  msgid "error getting nonce for the socket\n"
  msgstr "помилка під час спроби отримання поточного стану сокета\n"
  
- #: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
++#: agent/gpg-agent.c:2150 scd/scdaemon.c:1113 dirmngr/dirmngr.c:1129
  #, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "помилка під час спроби прив’язування сокета до «%s»: %s\n"
  
- #: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
- #: dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2160 agent/gpg-agent.c:2197 scd/scdaemon.c:1121
++#: dirmngr/dirmngr.c:1138
  #, c-format
  msgid "can't set permissions of '%s': %s\n"
  msgstr "не вдалося встановити права доступу до «%s»: %s\n"
  
- #: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:2165 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1143
  #, c-format
  msgid "listen() failed: %s\n"
  msgstr "помилка listen(): %s\n"
  
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
++#: agent/gpg-agent.c:2172 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1149
  #, c-format
  msgid "listening on socket '%s'\n"
  msgstr "очікування даних на сокеті «%s»\n"
  
- #: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: agent/gpg-agent.c:2191 agent/gpg-agent.c:2234 g10/exec.c:199
 +#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, c-format
  msgid "can't create directory '%s': %s\n"
  msgstr "не вдалося створити каталог «%s»: %s\n"
  
- #: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: agent/gpg-agent.c:2194 agent/gpg-agent.c:2239 g10/openfile.c:491
 +#: g10/openfile.c:520 sm/keydb.c:103
  #, c-format
  msgid "directory '%s' created\n"
  msgstr "створено каталог «%s»\n"
  
- #: agent/gpg-agent.c:2244
++#: agent/gpg-agent.c:2245
  #, c-format
  msgid "stat() failed for '%s': %s\n"
  msgstr "помилка stat() щодо «%s»: %s\n"
  
- #: agent/gpg-agent.c:2248
++#: agent/gpg-agent.c:2249
  #, c-format
  msgid "can't use '%s' as home directory\n"
  msgstr "не можна використовувати як домашній каталог «%s»\n"
  
- #: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
++#: agent/gpg-agent.c:2392 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1871
  #, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr ""
  "помилка під час спроби читання поточного стану на файловому дескрипторі %d: "
  "%s\n"
  
- #: agent/gpg-agent.c:2598
++#: agent/gpg-agent.c:2599
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr "запущено обробки 0x%lx для файлового дескриптора %d\n"
  
- #: agent/gpg-agent.c:2603
++#: agent/gpg-agent.c:2604
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr "обробник 0x%lx дескриптора файла %d завершив роботу\n"
  
- #: agent/gpg-agent.c:2678
++#: agent/gpg-agent.c:2679
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr "запущено обробник ssh 0x%lx для дескриптора файла %d\n"
  
- #: agent/gpg-agent.c:2683
++#: agent/gpg-agent.c:2684
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr "обробник ssh 0x%lx дескриптора файла %d завершив роботу\n"
  
- #: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
++#: agent/gpg-agent.c:2881 scd/scdaemon.c:1272 dirmngr/dirmngr.c:2075
  #, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "помилка pth_select: %s — очікування у 1 с\n"
  
- #: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2954 scd/scdaemon.c:1321
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s зупинено\n"
  
- #: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
++#: agent/gpg-agent.c:3092 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  msgid "no gpg-agent running in this session\n"
  msgstr "у цьому сеансі не запущено gpg-agent\n"
  
@@@ -659,8 -501,6 +659,8 @@@ msgstr "
  "Синтаксис: gpg-preset-passphrase [параметри] KEYGRIP\n"
  "Керування кешем паролів\n"
  
- #: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
++#: agent/protect-tool.c:106 g10/gpg.c:424 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:153 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -668,9 -508,6 +668,9 @@@ msgstr "
  "@Команди:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
- #: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:92 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:168 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -724,8 -553,6 +724,8 @@@ msgstr "скасовано\n
  msgid "error while asking for the passphrase: %s\n"
  msgstr "помилка під час спроби запиту пароля: %s\n"
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
- #: tools/gpgconf.c:323
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1472
++#: tools/gpgconf.c:328
  #, c-format
  msgid "error opening '%s': %s\n"
  msgstr "помилка під час відкриття «%s»: %s\n"
@@@ -901,9 -699,6 +901,9 @@@ msgstr "підтримки алгори
  msgid "protection hash algorithm %d (%s) is not supported\n"
  msgstr "підтримки алгоритму захисту хешуванням %d (%s) не передбачено\n"
  
 +#: common/exechelp-posix.c:359 common/exechelp-w32.c:438
 +#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
- #: dirmngr/ldap-wrapper.c:710
++#: dirmngr/ldap-wrapper.c:711
  #, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "помилка під час спроби створення каналу: %s\n"
@@@ -915,8 -707,6 +915,8 @@@
  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:848 dirmngr/dirmngr.c:1155
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1167
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "помилка під час спроби розгалужування процесу: %s\n"
@@@ -962,28 -743,23 +962,28 @@@ msgstr "не вдалося встан�
  msgid "problem setting the gpg-agent options\n"
  msgstr "проблема під час спроби встановлення параметрів gpg-agent\n"
  
- #: common/sysutils.c:144
++#: common/sysutils.c:148
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "не вдалося вимкнути створення дампів образів у пам’яті: %s\n"
  
- #: common/sysutils.c:239
++#: common/sysutils.c:250
  #, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "Увага: визначення власника не є безпечним для %s — «%s»\n"
  
- #: common/sysutils.c:271
++#: common/sysutils.c:282
  #, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "Увага: визначення прав доступу не є безпечним для %s — «%s»\n"
  
- #: common/sysutils.c:659
++#: common/sysutils.c:693
  #, 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:685
++#: common/sysutils.c:719
  #, c-format
  msgid "renaming '%s' to '%s' failed: %s\n"
  msgstr "спроба перейменування «%s» на «%s» зазнала невдачі: %s\n"
@@@ -1059,7 -820,6 +1059,7 @@@ msgstr "%s:%u: застарілий п�
  msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
  msgstr "УВАГА: «%s%s» є застарілим параметром — він не працюватиме\n"
  
- #: common/miscellaneous.c:554
++#: common/miscellaneous.c:556
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr "невідомий прапорець діагностики «%s» проігноровано\n"
@@@ -1163,8 -900,6 +1163,8 @@@ msgstr "Створено ключ се�
  msgid "algorithm: %s"
  msgstr "алгоритм: %s"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3098
++#: scd/app-openpgp.c:3111
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "непідтримуваний алгоритм: %s"
@@@ -1350,7 -1043,6 +1350,7 @@@ msgstr "параметр «%.50s» є �
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr "команда «%.50s» є неоднозначною\n"
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1173
++#: common/argparse.c:401 dirmngr/dirmngr.c:1185
  msgid "out of core\n"
  msgstr "вихід за межі області пам’яті\n"
  
@@@ -1408,8 -1089,6 +1408,8 @@@ msgstr "блокування «%s» н�
  msgid "waiting for lock %s...\n"
  msgstr "очікування на блокування %s…\n"
  
- #: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
- #: dirmngr/dirmngr.c:715
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:725
++#: dirmngr/dirmngr.c:734
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr "%s є занадто застарілою (потрібно %s, маємо %s)\n"
@@@ -1447,7 -1118,6 +1447,7 @@@ msgstr "неочікуваний фор
  msgid "invalid dash escaped line: "
  msgstr "некоректний екранований дефісами рядок: "
  
- #: g10/armor.c:873 g10/armor.c:1490
++#: g10/armor.c:873 g10/armor.c:1493
  #, c-format
  msgid "invalid radix64 character %02X skipped\n"
  msgstr "пропущено некоректний символ radix64 %02X\n"
@@@ -1464,7 -1131,6 +1464,7 @@@ msgstr "завчасний кінец�
  msgid "malformed CRC\n"
  msgstr "помилкове форматування CRC\n"
  
- #: g10/armor.c:962 g10/armor.c:1527
++#: g10/armor.c:962 g10/armor.c:1530
  #, c-format
  msgid "CRC error; %06lX - %06lX\n"
  msgstr "помилка CRC; %06lX - %06lX\n"
@@@ -1477,16 -1141,13 +1477,16 @@@ msgstr "завчасний кінец�
  msgid "error in trailer line\n"
  msgstr "помилка у рядку доповнення\n"
  
- #: g10/armor.c:1303
++#: g10/armor.c:1306
  msgid "no valid OpenPGP data found.\n"
  msgstr "не виявлено коректних даних OpenPGP.\n"
  
- #: g10/armor.c:1308
++#: g10/armor.c:1311
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
  msgstr "некоректний формат ASCII: рядок є довшим за %d символів\n"
  
- #: g10/armor.c:1312
++#: g10/armor.c:1315
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr ""
@@@ -1564,8 -1210,6 +1564,8 @@@ msgstr "Не вдалося отрим�
  msgid "OpenPGP card no. %s detected\n"
  msgstr "Виявлено картку OpenPGP з номером %s\n"
  
- #: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
- #: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2030
++#: g10/keygen.c:4087 g10/revoke.c:215 g10/revoke.c:618
  msgid "can't do this in batch mode\n"
  msgstr "це не можна робити у пакетному режимі\n"
  
@@@ -1573,14 -1216,9 +1573,14 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "Цією командою можна користуватися лише для карток версії 2\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2454
++#: g10/card-util.c:109 scd/app-openpgp.c:2467
  msgid "Reset Code not or not anymore available\n"
  msgstr "Немає коду скидання або код скидання вже недоступний\n"
  
 +#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
- #: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
- #: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1768
++#: g10/keygen.c:1945 g10/keygen.c:2313 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "Ваш вибір? "
  
@@@ -1643,10 -1267,6 +1643,10 @@@ msgstr "Адреса для отрим�
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr "Помилка: адреса є занадто довгою (максимум — %d символів).\n"
  
- #: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
- #: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:334
++#: g10/import.c:592 g10/import.c:640 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
++#: dirmngr/dirmngr.c:1510 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, c-format
  msgid "error reading '%s': %s\n"
  msgstr "помилка під час спроби читання «%s»: %s\n"
@@@ -1714,7 -1319,6 +1714,7 @@@ msgstr "дія над ключем не
  msgid "not an OpenPGP card"
  msgstr "не є карткою OpenPGP"
  
- #: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
++#: g10/card-util.c:1173 g10/keygen.c:4106 g10/keygen.c:5092
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr "помилка під час отримання даних поточного ключа: %s\n"
@@@ -1749,13 -1348,10 +1749,13 @@@ msgstr "Яким має бути роз
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "Якому розміру ключа для розпізнавання ви надаєте перевагу? (%u) "
  
- #: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
++#: g10/card-util.c:1316 g10/keygen.c:2122 g10/keygen.c:2154
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "округлено до %u бітів\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2207 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr "Розміри ключів %s мають перебувати у діапазоні %u—%u\n"
@@@ -1810,9 -1396,6 +1810,9 @@@ msgstr "   (2) Ключ шифрува�
  msgid "   (3) Authentication key\n"
  msgstr "   (3) Ключ розпізнавання\n"
  
- #: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
- #: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
- #: g10/keygen.c:2314 g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1508
++#: g10/keygen.c:1794 g10/keygen.c:1822 g10/keygen.c:1952 g10/keygen.c:2060
++#: g10/keygen.c:2336 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Некоректний вибір.\n"
  
@@@ -1844,7 -1421,6 +1844,7 @@@ msgid "Really do a factory reset? (ente
  msgstr ""
  "Справді хочете скинути усе до типових налаштувань? (введіть «yes» («так»)) "
  
- #: g10/card-util.c:1816 g10/keyedit.c:1867
++#: g10/card-util.c:1816 g10/keyedit.c:1868
  msgid "quit this menu"
  msgstr "вийти з цього меню"
  
@@@ -1852,7 -1427,6 +1852,7 @@@
  msgid "show admin commands"
  msgstr "показати керівні команди"
  
- #: g10/card-util.c:1819 g10/keyedit.c:1870
++#: g10/card-util.c:1819 g10/keyedit.c:1871
  msgid "show this help"
  msgstr "показати цю довідкову інформацію"
  
@@@ -1928,30 -1484,20 +1928,30 @@@ msgstr "Команди адмініст
  msgid "Admin commands are not allowed\n"
  msgstr "Команди адміністрування заборонено\n"
  
- #: g10/card-util.c:2127 g10/keyedit.c:2816
++#: g10/card-util.c:2127 g10/keyedit.c:2817
  msgid "Invalid command  (try \"help\")\n"
  msgstr "Некоректна команда  (скористайтеся командою «help»)\n"
  
- #: g10/decrypt.c:191 g10/encrypt.c:955
++#: g10/decrypt.c:190 g10/encrypt.c:955
  msgid "--output doesn't work for this command\n"
  msgstr "--output не працює з цією командою\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4904 g10/keyring.c:398 g10/keyring.c:771
  #, c-format
  msgid "can't open '%s'\n"
  msgstr "не вдалося відкрити «%s»\n"
  
 +#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
- #: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
- #: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4858 g10/keyedit.c:2051
++#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2163
  #, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "ключ «%s» не знайдено: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
- #: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
- #: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4866 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:645 g10/tofu.c:2171
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "помилка під час спроби читання блокування ключа: %s\n"
@@@ -2009,7 -1543,6 +2009,7 @@@ msgid "use option \"--delete-secret-key
  msgstr ""
  "спершу скористайтеся параметром «--delete-secret-keys» для його вилучення.\n"
  
- #: g10/encrypt.c:232 g10/sign.c:1292
++#: g10/encrypt.c:232 g10/sign.c:1294
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "помилка під час спроби створення пароля: %s\n"
@@@ -2028,7 -1558,6 +2028,7 @@@ msgstr "використано шиф�
  msgid "'%s' already compressed\n"
  msgstr "«%s» вже стиснено\n"
  
- #: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:610
  #, c-format
  msgid "WARNING: '%s' is an empty file\n"
  msgstr "УВАГА: файл «%s» є порожнім\n"
@@@ -2046,7 -1573,6 +2046,7 @@@ msgstr "
  "УВАГА: примусове використання симетричного шифру %s (%d) не відповідає "
  "параметрам отримувача\n"
  
- #: g10/encrypt.c:707 g10/sign.c:984
++#: g10/encrypt.c:707 g10/sign.c:986
  #, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2082,7 -1603,6 +2082,7 @@@ msgstr "Дані, зашифрован�
  msgid "encrypted with unknown algorithm %d\n"
  msgstr "зашифровано за допомогою невідомого алгоритму %d\n"
  
- #: g10/decrypt-data.c:164 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:129
  msgid ""
  "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
  msgstr ""
@@@ -2174,8 -1676,6 +2174,8 @@@ msgstr "вилучити максиму
  msgid " - skipped"
  msgstr " - пропущено"
  
- #: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:845 g10/sign.c:1148
++#: g10/export.c:1251 g10/import.c:1543 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:847 g10/sign.c:1150
  #, c-format
  msgid "writing to '%s'\n"
  msgstr "записуємо до «%s»\n"
@@@ -2198,8 -1694,6 +2198,8 @@@ msgstr "ключ %s: ключ у сти
  msgid "WARNING: nothing exported\n"
  msgstr "УВАГА: нічого не експортовано\n"
  
- #: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
- #: g10/plaintext.c:151 g10/plaintext.c:174
++#: g10/export.c:2283 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/plaintext.c:167 g10/plaintext.c:190
  #, c-format
  msgid "error creating '%s': %s\n"
  msgstr "помилка створення «%s»: %s.\n"
@@@ -2244,8 -1729,6 +2244,8 @@@ msgstr "помилка під час с
  msgid "No fingerprint"
  msgstr "Без відбитка"
  
- #: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
- #: g10/revoke.c:701
++#: g10/getkey.c:1873 g10/keyedit.c:2929 g10/keyedit.c:3016 g10/revoke.c:637
++#: g10/revoke.c:702
  #, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "закритий ключ «%s» не знайдено: %s\n"
@@@ -2277,201 -1755,157 +2277,207 @@@ msgstr "
  msgid "using subkey %s instead of primary key %s\n"
  msgstr "використовуємо підключ %s замість основного ключа %s\n"
  
- #: g10/gpg.c:424 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:200
  msgid "make a signature"
  msgstr "створити підпис"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:427
  msgid "make a clear text signature"
  msgstr "створити текстовий підпис"
  
- #: g10/gpg.c:426 sm/gpgsm.c:202
++#: g10/gpg.c:429 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "створити від’єднаний підпис"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:430 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "зашифрувати дані"
  
- #: g10/gpg.c:429
++#: g10/gpg.c:432
  msgid "encryption only with symmetric cipher"
  msgstr "шифрувати лише за допомогою симетричного шифру"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:434 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "розшифрувати дані (типова дія)"
  
- #: g10/gpg.c:433 sm/gpgsm.c:206
++#: g10/gpg.c:436 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "перевірити підпис"
  
- #: g10/gpg.c:435 sm/gpgsm.c:207
++#: g10/gpg.c:438 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "показати список ключів"
  
- #: g10/gpg.c:437
++#: g10/gpg.c:440
  msgid "list keys and signatures"
  msgstr "показати список ключів і підписів"
  
- #: g10/gpg.c:438
++#: g10/gpg.c:443
  msgid "list and check key signatures"
  msgstr "показати список і перевірити підписи ключів"
  
- #: g10/gpg.c:439 sm/gpgsm.c:212
++#: g10/gpg.c:445 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "показати список ключів і відбитків"
  
- #: g10/gpg.c:440 sm/gpgsm.c:210
++#: g10/gpg.c:446 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "показати список закритих ключів"
  
- #: g10/gpg.c:442 sm/gpgsm.c:213
++#: g10/gpg.c:448 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "створити пару ключів"
  
- #: g10/gpg.c:444
++#: g10/gpg.c:451
  msgid "quickly generate a new key pair"
  msgstr "швидке створення пари ключів"
  
- #: g10/gpg.c:446
++#: g10/gpg.c:454
  msgid "quickly add a new user-id"
  msgstr "швидке додавання нового ідентифікатора користувача"
  
- #: g10/gpg.c:449
++#: g10/gpg.c:459
  msgid "quickly revoke a user-id"
  msgstr "швидке відкликання ідентифікатора користувача"
  
- #: g10/gpg.c:451
++#: g10/gpg.c:462
+ #, fuzzy
+ #| msgid "quickly generate a new key pair"
+ msgid "quickly set a new expiration date"
+ msgstr "швидке створення пари ключів"
+ 
++#: g10/gpg.c:464
  msgid "full featured key pair generation"
  msgstr "повноцінне створення пари ключів"
  
- #: g10/gpg.c:452
++#: g10/gpg.c:467
  msgid "generate a revocation certificate"
  msgstr "створити сертифікат відкликання"
  
- #: g10/gpg.c:454 sm/gpgsm.c:215
++#: g10/gpg.c:470 sm/gpgsm.c:216
  msgid "remove keys from the public keyring"
  msgstr "вилучити ключі з відкритого сховища ключів"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:472
  msgid "remove keys from the secret keyring"
  msgstr "вилучити ключів з закритого сховища ключів"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:474
  msgid "quickly sign a key"
  msgstr "швидко підписати ключ"
  
- #: g10/gpg.c:460
++#: g10/gpg.c:476
  msgid "quickly sign a key locally"
  msgstr "швидко підписати ключ локально"
  
- #: g10/gpg.c:461
++#: g10/gpg.c:477
  msgid "sign a key"
  msgstr "підписати ключ"
  
- #: g10/gpg.c:462
++#: g10/gpg.c:478
  msgid "sign a key locally"
  msgstr "підписати ключ локально"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:479
  msgid "sign or edit a key"
  msgstr "підписати або редагувати ключ"
  
- #: g10/gpg.c:465 sm/gpgsm.c:233
++#: g10/gpg.c:481 sm/gpgsm.c:234
  msgid "change a passphrase"
  msgstr "змінити пароль"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:485
  msgid "export keys"
  msgstr "експортувати ключі"
  
- #: g10/gpg.c:468
++#: g10/gpg.c:486
  msgid "export keys to a keyserver"
  msgstr "експортувати ключі на сервер ключів"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:487
  msgid "import keys from a keyserver"
  msgstr "імпортувати ключі з сервера ключів"
  
- #: g10/gpg.c:471
++#: g10/gpg.c:490
  msgid "search for keys on a keyserver"
  msgstr "шукати ключі на сервері ключів"
  
- #: g10/gpg.c:473
++#: g10/gpg.c:492
  msgid "update all keys from a keyserver"
  msgstr "оновити всі ключів з сервера ключів"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:498
  msgid "import/merge keys"
  msgstr "імпортувати/об’єднати ключі"
  
- #: g10/gpg.c:482
++#: g10/gpg.c:501
  msgid "print the card status"
  msgstr "показати дані про стан картки"
  
- #: g10/gpg.c:483
++#: g10/gpg.c:502
  msgid "change data on a card"
  msgstr "змінити дані на картці"
  
- #: g10/gpg.c:484
++#: g10/gpg.c:504
  msgid "change a card's PIN"
  msgstr "змінити пінкод картки"
  
- #: g10/gpg.c:496
++#: g10/gpg.c:516
  msgid "update the trust database"
  msgstr "оновити базу даних довіри"
  
- #: g10/gpg.c:505
++#: g10/gpg.c:525
  msgid "print message digests"
  msgstr "показати контрольні суми повідомлень"
  
- #: g10/gpg.c:508 sm/gpgsm.c:228
++#: g10/gpg.c:528 sm/gpgsm.c:229
  msgid "run in server mode"
  msgstr "запустити у режимі сервера"
  
- #: g10/gpg.c:510
++#: g10/gpg.c:530
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr "|VALUE|встановити вказане правило TOFU для ключа"
  
- #: g10/gpg.c:514 sm/gpgsm.c:246
++#: g10/gpg.c:534 sm/gpgsm.c:248
  msgid "create ascii armored output"
  msgstr "створити дані у форматі ASCII"
  
- #: g10/gpg.c:517 sm/gpgsm.c:262
++#: g10/gpg.c:537 sm/gpgsm.c:264
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|USER-ID|зашифрувати для вказаного ідентифікатора"
  
- #: g10/gpg.c:533 sm/gpgsm.c:298
++#: g10/gpg.c:553 sm/gpgsm.c:300
  msgid "|USER-ID|use USER-ID to sign or decrypt"
  msgstr ""
  "|USER-ID|використовувати для створення підписів або розшифрування вказаний "
  "ідентифікатор"
  
- #: g10/gpg.c:539
++#: g10/gpg.c:559
  msgid "|N|set compress level to N (0 disables)"
  msgstr "|N|встановити рівень стиснення (0 — вимкнути)"
  
- #: g10/gpg.c:546
++#: g10/gpg.c:566
  msgid "use canonical text mode"
  msgstr "використовувати канонічний текстовий режим"
  
- #: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
++#: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
  msgid "|FILE|write output to FILE"
  msgstr "|FILE|записати дані до вказаного файла"
  
- #: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
++#: g10/gpg.c:598 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
  msgid "do not make any changes"
  msgstr "не вносити змін"
  
- #: g10/gpg.c:579
++#: g10/gpg.c:599
  msgid "prompt before overwriting"
  msgstr "запитувати перед перезаписом"
  
- #: g10/gpg.c:628
++#: g10/gpg.c:648
  msgid "use strict OpenPGP behavior"
  msgstr "строго використовувати стандарт OpenPGP"
  
- #: g10/gpg.c:654 sm/gpgsm.c:355
++#: g10/gpg.c:674 sm/gpgsm.c:357
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2480,7 -1914,16 +2486,17 @@@ msgstr "
  "(Щоб ознайомитися зі списком команд і параметрів, скористайтеся сторінкою "
  "довідника (man))\n"
  
- #: g10/gpg.c:657 sm/gpgsm.c:358
++#: g10/gpg.c:677
+ #, fuzzy
+ #| msgid ""
+ #| "@\n"
+ #| "Examples:\n"
+ #| "\n"
+ #| " -se -r Bob [file]          sign and encrypt for user Bob\n"
+ #| " --clear-sign [file]         make a clear text signature\n"
+ #| " --detach-sign [file]       make a detached signature\n"
+ #| " --list-keys [names]        show keys\n"
+ #| " --fingerprint [names]      show fingerprints\n"
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2501,11 -1944,9 +2517,11 @@@ msgstr "
  " --list-keys [назви]        показати ключі\n"
  " --fingerprint [назви]      показати відбитки\n"
  
- #: g10/gpg.c:1026
++#: g10/gpg.c:1047
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
  msgstr "Використання: @GPG@ [параметри] [файли] (-h — довідка)"
  
- #: g10/gpg.c:1029
++#: g10/gpg.c:1050
  msgid ""
  "Syntax: @GPG@ [options] [files]\n"
  "Sign, check, encrypt or decrypt\n"
@@@ -2515,7 -1956,6 +2531,7 @@@ msgstr "
  "Підписування, перевірка підписів, шифрування або розшифрування\n"
  "Типова дія залежатиме від вхідних даних\n"
  
- #: g10/gpg.c:1040 sm/gpgsm.c:588
++#: g10/gpg.c:1061 sm/gpgsm.c:580
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2523,76 -1963,61 +2539,76 @@@ msgstr "
  "\n"
  "Підтримувані алгоритми:\n"
  
- #: g10/gpg.c:1043
++#: g10/gpg.c:1064
  msgid "Pubkey: "
  msgstr "Відкритий ключ: "
  
- #: g10/gpg.c:1050 g10/keyedit.c:3402
++#: g10/gpg.c:1071 g10/keyedit.c:3483
  msgid "Cipher: "
  msgstr "Шифр: "
  
- #: g10/gpg.c:1057
++#: g10/gpg.c:1078
  msgid "Hash: "
  msgstr "Хеш: "
  
- #: g10/gpg.c:1064 g10/keyedit.c:3451
++#: g10/gpg.c:1085 g10/keyedit.c:3532
  msgid "Compression: "
  msgstr "Стиснення: "
  
- #: g10/gpg.c:1133 sm/gpgsm.c:662
++#: g10/gpg.c:1154 sm/gpgsm.c:654
  #, c-format
  msgid "usage: %s [options] %s\n"
  msgstr "користування: %s [параметри] %s\n"
  
- #: g10/gpg.c:1321 sm/gpgsm.c:751
++#: g10/gpg.c:1342 sm/gpgsm.c:743
  msgid "conflicting commands\n"
  msgstr "несумісні команди\n"
  
- #: g10/gpg.c:1339
++#: g10/gpg.c:1360
  #, c-format
  msgid "no = sign found in group definition '%s'\n"
  msgstr "у визначенні групи «%s» немає знаку «=»\n"
  
- #: g10/gpg.c:1537
++#: g10/gpg.c:1558
  #, c-format
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr "УВАГА: визначення власника домашнього каталогу «%s» не є безпечним\n"
  
- #: g10/gpg.c:1540
++#: g10/gpg.c:1561
  #, c-format
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
  msgstr "УВАГА: визначення власника у файлі налаштувань «%s» не є безпечним\n"
  
- #: g10/gpg.c:1543
++#: g10/gpg.c:1564
  #, c-format
  msgid "WARNING: unsafe ownership on extension '%s'\n"
  msgstr "УВАГА: визначення власника додатка «%s» не є безпечним\n"
  
- #: g10/gpg.c:1549
++#: g10/gpg.c:1570
  #, c-format
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
  msgstr ""
  "УВАГА: визначення прав доступу до домашнього каталогу «%s» не є безпечним\n"
  
- #: g10/gpg.c:1552
++#: g10/gpg.c:1573
  #, c-format
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
  msgstr ""
  "УВАГА: визначення прав доступу до файла налаштувань «%s» не є безпечним\n"
  
- #: g10/gpg.c:1555
++#: g10/gpg.c:1576
  #, c-format
  msgid "WARNING: unsafe permissions on extension '%s'\n"
  msgstr "УВАГА: визначення прав доступу до додатка «%s» не є безпечним\n"
  
- #: g10/gpg.c:1561
++#: g10/gpg.c:1582
  #, c-format
  msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
  msgstr ""
  "УВАГА: визначення власника підлеглого каталогу домашнього каталогу «%s» не є "
  "безпечним\n"
  
- #: g10/gpg.c:1564
++#: g10/gpg.c:1585
  #, c-format
  msgid ""
  "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@@ -2600,21 -2025,18 +2616,21 @@@ msgstr "
  "УВАГА: визначення власника у підлеглому каталозі, визначеному файлом "
  "налаштувань «%s», не є безпечним\n"
  
- #: g10/gpg.c:1567
++#: g10/gpg.c:1588
  #, c-format
  msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
  msgstr ""
  "УВАГА: визначення власника підлеглого каталогу у додатку «%s» не є "
  "безпечним\n"
  
- #: g10/gpg.c:1573
++#: g10/gpg.c:1594
  #, c-format
  msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
  msgstr ""
  "УВАГА: визначення прав доступу до підлеглого каталогу домашнього каталогу "
  "«%s» не є безпечним\n"
  
- #: g10/gpg.c:1576
++#: g10/gpg.c:1597
  #, c-format
  msgid ""
  "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2622,519 -2044,362 +2638,459 @@@ msgstr "
  "УВАГА: визначення прав доступу до підлеглого каталогу, визначеного файлом "
  "налаштувань «%s», не є безпечним\n"
  
- #: g10/gpg.c:1579
++#: g10/gpg.c:1600
  #, c-format
  msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
  msgstr ""
  "УВАГА: визначення прав доступу до підлеглого каталогу у додатку «%s» не є "
  "безпечним\n"
  
- #: g10/gpg.c:1786
++#: g10/gpg.c:1816
  #, c-format
  msgid "unknown configuration item '%s'\n"
  msgstr "невідомий пункт налаштувань «%s»\n"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1925
  msgid "display photo IDs during key listings"
  msgstr "показувати фотоідентифікатори у списках ключів"
  
- #: g10/gpg.c:1895
++#: g10/gpg.c:1927
  msgid "show key usage information during key listings"
  msgstr "показувати дані щодо використання ключа у списках ключів"
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1929
  msgid "show policy URLs during signature listings"
  msgstr "показувати адреси правил у списках підписів"
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1931
  msgid "show all notations during signature listings"
  msgstr "показувати всі примітки у списках підписів"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1933
  msgid "show IETF standard notations during signature listings"
  msgstr "показувати стандартні примітки IETF у списках підписів"
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1937
  msgid "show user-supplied notations during signature listings"
  msgstr "показувати примітки користувача у списках підписів"
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1939
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "показувати адреси основних серверів ключів у списках підписів"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1941
  msgid "show user ID validity during key listings"
  msgstr "показувати чинність ідентифікаторів користувачів у списках ключів"
  
- #: g10/gpg.c:1911
++#: g10/gpg.c:1943
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  "показувати відкликані та застарілі ідентифікатори користувачів у списках "
  "ключів"
  
- #: g10/gpg.c:1913
++#: g10/gpg.c:1945
  msgid "show revoked and expired subkeys in key listings"
  msgstr "показувати відкликані та застарілі підключі у списках ключів"
  
- #: g10/gpg.c:1915
++#: g10/gpg.c:1947
  msgid "show the keyring name in key listings"
  msgstr "показувати назву сховища ключів у списках ключів"
  
- #: g10/gpg.c:1917
++#: g10/gpg.c:1949
  msgid "show expiration dates during signature listings"
  msgstr "показувати дати завершення строків дії у списку підписів"
  
- #: g10/gpg.c:2019 g10/gpg.c:2056
++#: g10/gpg.c:2051 g10/gpg.c:2088
  #, fuzzy, c-format
  #| msgid "invalid argument for option \"%.50s\"\n"
  msgid "valid values for option '%s':\n"
  msgstr "некоректний аргумент параметра «%.50s»\n"
  
- #: g10/gpg.c:2030
++#: g10/gpg.c:2062
  #, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "невідомі правила TOFU «%s»\n"
  
- #: g10/gpg.c:2032 g10/gpg.c:2068
++#: g10/gpg.c:2064 g10/gpg.c:2100
  msgid "(use \"help\" to list choices)\n"
  msgstr "(команда «help» виводить список можливих варіантів)\n"
  
- #: g10/gpg.c:2066
++#: g10/gpg.c:2098 g10/keygen.c:167
  #, fuzzy, c-format
  #| msgid "invalid argument for option \"%.50s\"\n"
  msgid "invalid value for option '%s'\n"
  msgstr "некоректний аргумент параметра «%.50s»\n"
  
- #: g10/gpg.c:2203
++#: g10/gpg.c:2235
  #, c-format
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "ЗАУВАЖЕННЯ: застарілий файл типових параметрів «%s» проігноровано\n"
  
- #: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
++#: g10/gpg.c:2839 g10/gpg.c:3610 g10/gpg.c:3622
  #, c-format
  msgid "Note: %s is not for normal use!\n"
  msgstr "ЗАУВАЖЕННЯ: %s не призначено для звичайного використання!\n"
  
- #: g10/gpg.c:2978 g10/gpg.c:2990
++#: g10/gpg.c:3011 g10/gpg.c:3023
  #, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "«%s» не є коректним записом завершення строку дії підпису\n"
  
- #: g10/gpg.c:3012
++#: g10/gpg.c:3045
  #, 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:3044 sm/gpgsm.c:1166
++#: g10/gpg.c:3077 sm/gpgsm.c:1158
  #, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "некоректний режим pinentry, «%s»\n"
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3130
  #, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "«%s» не є коректним набором символів\n"
  
- #: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
++#: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
  msgid "could not parse keyserver URL\n"
  msgstr "не вдалося обробити адресу сервера ключів\n"
  
- #: g10/gpg.c:3137
++#: g10/gpg.c:3170
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: некоректні параметри сервера ключів\n"
  
- #: g10/gpg.c:3140
++#: g10/gpg.c:3173
  msgid "invalid keyserver options\n"
  msgstr "некоректні параметри сервера ключів\n"
  
- #: g10/gpg.c:3147
++#: g10/gpg.c:3180
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: некоректні параметри імпортування\n"
  
- #: g10/gpg.c:3150
++#: g10/gpg.c:3183
  msgid "invalid import options\n"
  msgstr "некоректні параметри імпортування\n"
  
- #: g10/gpg.c:3156 g10/gpg.c:3171
++#: g10/gpg.c:3189 g10/gpg.c:3204
  #, c-format
  msgid "invalid filter option: %s\n"
  msgstr "некоректний параметр фільтрування: %s\n"
  
- #: g10/gpg.c:3162
++#: g10/gpg.c:3195
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: некоректні параметри експортування\n"
  
- #: g10/gpg.c:3165
++#: g10/gpg.c:3198
  msgid "invalid export options\n"
  msgstr "некоректні параметри експортування\n"
  
- #: g10/gpg.c:3177
++#: g10/gpg.c:3210
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: некоректні параметри побудови списку\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3213
  msgid "invalid list options\n"
  msgstr "некоректні параметри побудови списку\n"
  
- #: g10/gpg.c:3188
++#: g10/gpg.c:3221
  msgid "display photo IDs during signature verification"
  msgstr "показувати фотоідентифікатори під час перевірки підписів"
  
- #: g10/gpg.c:3190
++#: g10/gpg.c:3223
  msgid "show policy URLs during signature verification"
  msgstr "показувати адреси правил під час перевірки підписів"
  
- #: g10/gpg.c:3192
++#: g10/gpg.c:3225
  msgid "show all notations during signature verification"
  msgstr "показувати всі примітки під час перевірки підписів"
  
- #: g10/gpg.c:3194
++#: g10/gpg.c:3227
  msgid "show IETF standard notations during signature verification"
  msgstr "показувати стандартні примітки IETF під час перевірки підписів"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3231
  msgid "show user-supplied notations during signature verification"
  msgstr "показувати вказані користувачем примітки під час перевірки підписів"
  
- #: g10/gpg.c:3200
++#: g10/gpg.c:3233
  msgid "show preferred keyserver URLs during signature verification"
  msgstr ""
  "показувати адреси основних серверів ключів у списках перевірки підписів"
  
- #: g10/gpg.c:3202
++#: g10/gpg.c:3235
  msgid "show user ID validity during signature verification"
  msgstr ""
  "показувати чинність ідентифікаторів користувача під час перевірки підписів"
  
- #: g10/gpg.c:3204
++#: g10/gpg.c:3237
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  "показувати відкликані та застарілі ідентифікатори користувачів у списках "
  "перевірки підписів"
  
- #: g10/gpg.c:3206
++#: g10/gpg.c:3239
  msgid "show only the primary user ID in signature verification"
  msgstr ""
  "показувати лише основний ідентифікатор користувача під час перевірки підписів"
  
- #: g10/gpg.c:3208
++#: g10/gpg.c:3241
  msgid "validate signatures with PKA data"
  msgstr "перевірити підписи за допомогою даних PKA"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3243
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr "підняти рівень довіри до підписів з коректними даними PKA"
  
- #: g10/gpg.c:3217
++#: g10/gpg.c:3250
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: некоректні параметри перевірки\n"
  
- #: g10/gpg.c:3220
++#: g10/gpg.c:3253
  msgid "invalid verify options\n"
  msgstr "некоректні параметри перевірки\n"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3260
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "не вдалося встановити шлях для запуску у значення %s\n"
  
- #: g10/gpg.c:3417
++#: g10/gpg.c:3452
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: некоректний список auto-key-locate\n"
  
- #: g10/gpg.c:3420
++#: g10/gpg.c:3455
  msgid "invalid auto-key-locate list\n"
  msgstr "некоректний список auto-key-locate\n"
  
- #: g10/gpg.c:3553 sm/gpgsm.c:1507
++#: g10/gpg.c:3592 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
  msgstr "УВАГА: можливе створення дампу пам’яті програми!\n"
  
- #: g10/gpg.c:3564
++#: g10/gpg.c:3603
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "УВАГА: %s перевизначає %s\n"
  
- #: g10/gpg.c:3573
++#: g10/gpg.c:3612
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s не можна використовувати разом з %s!\n"
  
- #: g10/gpg.c:3576
++#: g10/gpg.c:3615
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s є зайвим, якщо використано %s!\n"
  
- #: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
++#: g10/gpg.c:3630 sm/gpgsm.c:1518 dirmngr/dirmngr.c:951
  msgid "WARNING: running with faked system time: "
  msgstr "УВАГА: запущено з фіктивним системним часом: "
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3651
  #, c-format
  msgid "will not run with insecure memory due to %s\n"
  msgstr "не буде запущено з помилками у захисті пам’яті через %s\n"
  
- #: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
++#: g10/gpg.c:3686 g10/gpg.c:3710 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "вибраний алгоритм шифрування є некоректним\n"
  
- #: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
++#: g10/gpg.c:3692 g10/gpg.c:3716 sm/gpgsm.c:1591 sm/gpgsm.c:1597
  msgid "selected digest algorithm is invalid\n"
  msgstr "вибраний алгоритм побудови контрольних сум є некоректним\n"
  
- #: g10/gpg.c:3659
++#: g10/gpg.c:3698
  msgid "selected compression algorithm is invalid\n"
  msgstr "вибраний алгоритм стискання є некоректним\n"
  
- #: g10/gpg.c:3665
++#: g10/gpg.c:3704
  msgid "selected certification digest algorithm is invalid\n"
  msgstr ""
  "вибраний алгоритм створення контрольних сум для сертифікації є некоректним\n"
  
- #: g10/gpg.c:3680
++#: g10/gpg.c:3719
  msgid "completes-needed must be greater than 0\n"
  msgstr "значення completes-needed має бути більшим за 0\n"
  
- #: g10/gpg.c:3682
++#: g10/gpg.c:3721
  msgid "marginals-needed must be greater than 1\n"
  msgstr "значення marginals-needed має перевищувати 1\n"
  
- #: g10/gpg.c:3684
++#: g10/gpg.c:3723
  msgid "max-cert-depth must be in the range from 1 to 255\n"
  msgstr "значення max-cert-depth має перебувати у діапазоні від 1 до 255\n"
  
- #: g10/gpg.c:3686
++#: g10/gpg.c:3725
  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:3688
++#: g10/gpg.c:3727
  msgid "invalid min-cert-level; must be 1, 2, or 3\n"
  msgstr "некоректне значення min-cert-level; має бути 1, 2 або 3\n"
  
- #: g10/gpg.c:3691
++#: g10/gpg.c:3730
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
  msgstr ""
  "ЗАУВАЖЕННЯ: наполегливо не рекомендуємо вам користуватися простим режимом "
  "S2K (0)\n"
  
- #: g10/gpg.c:3695
++#: g10/gpg.c:3734
  msgid "invalid S2K mode; must be 0, 1 or 3\n"
  msgstr "некоректний режим S2K; мало бути вказано 0, 1 або 3\n"
  
- #: g10/gpg.c:3702
++#: g10/gpg.c:3741
  msgid "invalid default preferences\n"
  msgstr "некоректні типові параметри\n"
  
- #: g10/gpg.c:3706
++#: g10/gpg.c:3745
  msgid "invalid personal cipher preferences\n"
  msgstr "некоректні особисті параметри шифрування\n"
  
- #: g10/gpg.c:3710
++#: g10/gpg.c:3749
  msgid "invalid personal digest preferences\n"
  msgstr "некоректні особисті параметри контрольної суми\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3753
  msgid "invalid personal compress preferences\n"
  msgstr "некоректні особисті параметри стискання\n"
  
- #: g10/gpg.c:3750
++#: g10/gpg.c:3789
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s ще не може працювати разом з %s\n"
  
- #: g10/gpg.c:3797
++#: g10/gpg.c:3836
  #, c-format
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr "не можна використовувати алгоритм шифрування «%s» у режимі %s\n"
  
- #: g10/gpg.c:3802
++#: g10/gpg.c:3841
  #, c-format
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr ""
  "не можна використовувати алгоритм створення контрольних сум «%s» у режимі "
  "%s\n"
  
- #: g10/gpg.c:3807
++#: g10/gpg.c:3846
  #, c-format
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr "не можна використовувати алгоритм стискання «%s» у режимі %s\n"
  
- #: g10/gpg.c:3906
++#: g10/gpg.c:3945
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "не вдалося ініціалізувати базу даних надійності (TrustDB): %s\n"
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:3957
  msgid "WARNING: recipients (-r) given without using public key encryption\n"
  msgstr ""
  "УВАГА: отримувачів (-r) вказано без використання шифрування відкритим "
  "ключем\n"
  
- #: g10/gpg.c:3975
- msgid "--store [filename]"
- msgstr "--store [назва файла]"
- 
- #: g10/gpg.c:3985
- msgid "--symmetric [filename]"
- msgstr "--symmetric [назва файла]"
- 
- #: g10/gpg.c:3989
++#: g10/gpg.c:4028
  #, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "помилка під час спроби симетричного шифрування «%s»: %s\n"
  
- #: g10/gpg.c:4000
- msgid "--encrypt [filename]"
- msgstr "--encrypt [назва файла]"
- 
- #: g10/gpg.c:4016
- msgid "--symmetric --encrypt [filename]"
- msgstr "--symmetric --encrypt [назва файла]"
- 
- #: g10/gpg.c:4018
++#: g10/gpg.c:4057
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr ""
  "не можна використовувати комбінацію --symmetric --encrypt у режимі --s2k-"
  "mode 0\n"
  
- #: g10/gpg.c:4021
++#: g10/gpg.c:4060
  #, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr ""
  "не можна використовувати комбінацію --symmetric --encrypt у режимі %s\n"
  
- #: g10/gpg.c:4042
- msgid "--sign [filename]"
- msgstr "--sign [назва файла]"
- 
- #: g10/gpg.c:4058
- msgid "--sign --encrypt [filename]"
- msgstr "--sign --encrypt [назва файла]"
- 
- #: g10/gpg.c:4076
- msgid "--symmetric --sign --encrypt [filename]"
- msgstr "--symmetric --sign --encrypt [назва файла]"
- 
- #: g10/gpg.c:4078
++#: g10/gpg.c:4117
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  "не можна використовувати комбінацію --symmetric --sign --encrypt у режимі --"
  "s2k-mode 0\n"
  
- #: g10/gpg.c:4081
++#: g10/gpg.c:4120
  #, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr ""
  "не можна використовувати комбінацію --symmetric --sign --encrypt у режимі "
  "%s\n"
  
- #: g10/gpg.c:4105
- msgid "--sign --symmetric [filename]"
- msgstr "--sign --symmetric [назва файла]"
- 
- #: g10/gpg.c:4117
- msgid "--clearsign [filename]"
- msgstr "--clearsign [назва файла]"
- 
- #: g10/gpg.c:4147
- msgid "--decrypt [filename]"
- msgstr "--decrypt [назва файла]"
- 
- #: g10/gpg.c:4174
- msgid "--sign-key user-id"
- msgstr "--sign-key user-id"
- 
- #: g10/gpg.c:4178
- msgid "--lsign-key user-id"
- msgstr "--lsign-key user-id"
- 
- #: g10/gpg.c:4199
- msgid "--edit-key user-id [commands]"
- msgstr "--edit-key user-id [команди]"
- 
- #: g10/gpg.c:4215
- msgid "--passwd <user-id>"
- msgstr "--passwd <ідентифікатор-користувача>"
- 
- #: g10/gpg.c:4411 g10/keyserver.c:1837
++#: g10/gpg.c:4462 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "помилка під час надсилання даних на сервер ключів: %s\n"
  
- #: g10/gpg.c:4416
++#: g10/gpg.c:4467
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "помилка під час спроби отримання даних з сервера ключів: %s\n"
  
- #: g10/gpg.c:4422
++#: g10/gpg.c:4473
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "помилка під час спроби експортування ключа: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4486
  #, c-format
  msgid "export as ssh key failed: %s\n"
  msgstr "спроба експортування ключа ssh зазнала невдачі: %s\n"
  
- #: g10/gpg.c:4447
++#: g10/gpg.c:4498
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "помилка пошуку на сервері ключів: %s\n"
  
- #: g10/gpg.c:4460
++#: g10/gpg.c:4511
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "помилка оновлення з сервера ключів: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4578
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "помилка перетворення з формату ASCII: %s\n"
  
- #: g10/gpg.c:4538
++#: g10/gpg.c:4589
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "помилка перетворення у формат ASCII: %s\n"
  
- #: g10/gpg.c:4630
++#: g10/gpg.c:4681
  #, c-format
  msgid "invalid hash algorithm '%s'\n"
  msgstr "некоректний алгоритм хешування «%s»\n"
  
- #: g10/gpg.c:4776 g10/tofu.c:2002
++#: g10/gpg.c:4827 g10/tofu.c:2151
  #, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "помилка під час спроби обробки специфікації ключа «%s»: %s\n"
  
- #: g10/gpg.c:4788
++#: g10/gpg.c:4839
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr "«%s» не є коректним ідентифікатором ключа, відбитком або кодом\n"
  
- #: g10/gpg.c:4835
- msgid "[filename]"
- msgstr "[назва файла]"
- 
- #: g10/gpg.c:4841
++#: g10/gpg.c:4894
  msgid "Go ahead and type your message ...\n"
  msgstr "Почніть вводити ваше повідомлення...\n"
  
- #: g10/gpg.c:5179
++#: g10/gpg.c:5232
  msgid "the given certification policy URL is invalid\n"
  msgstr "вказана адреса правил сертифікації є некоректною\n"
  
- #: g10/gpg.c:5181
++#: g10/gpg.c:5234
  msgid "the given signature policy URL is invalid\n"
  msgstr "вказана адреса правил підписування є некоректною\n"
  
- #: g10/gpg.c:5214
++#: g10/gpg.c:5267
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "вказана адреса основного сервера ключів є некоректною\n"
  
@@@ -3146,7 -2409,6 +3102,7 @@@ msgstr "|FILE|визначити клю
  msgid "make timestamp conflicts only a warning"
  msgstr "супроводжувати конфлікти часових позначок лише попередженнями"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:345
++#: g10/gpgv.c:82 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|записувати до дескриптора файла дані щодо стану"
  
@@@ -3175,133 -2432,105 +3131,133 @@@ msgstr "Довідки не перед�
  msgid "No help available for '%s'"
  msgstr "Довідки щодо %s не виявлено"
  
- #: g10/import.c:151
++#: g10/import.c:152
  msgid "import signatures that are marked as local-only"
  msgstr "імпортувати підписи, позначені як лише локальні"
  
- #: g10/import.c:154
++#: g10/import.c:155
  msgid "repair damage from the pks keyserver during import"
  msgstr "відновлювати пошкодження сервером ключів pks під час імпортування"
  
- #: g10/import.c:157
++#: g10/import.c:158
  msgid "do not clear the ownertrust values during import"
  msgstr "не вилучати значень власної довіри під час імпортування"
  
- #: g10/import.c:160
++#: g10/import.c:161
  msgid "do not update the trustdb after import"
  msgstr "не оновлювати базу даних довіри після імпортування"
  
- #: g10/import.c:163
++#: g10/import.c:164
  msgid "show key during import"
  msgstr "показувати ключ під час імпортування"
  
- #: g10/import.c:166
++#: g10/import.c:167
  msgid "only accept updates to existing keys"
  msgstr "приймати оновлення лише вже створених ключів"
  
- #: g10/import.c:169
++#: g10/import.c:170
  msgid "remove unusable parts from key after import"
  msgstr "вилучити невикористані частини ключа після імпортування"
  
- #: g10/import.c:172
++#: g10/import.c:173
  msgid "remove as much as possible from key after import"
  msgstr "вилучити максимум частин з ключа після імпортування"
  
- #: g10/import.c:175
++#: g10/import.c:176
  msgid "run import filters and export key immediately"
  msgstr "запустити фільтри імпортування та експортувати ключ негайно"
  
- #: g10/import.c:326 g10/import.c:568
++#: g10/import.c:327 g10/import.c:569
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "пропускаємо блок типу %d\n"
  
- #: g10/import.c:585
++#: g10/import.c:586
  #, c-format
  msgid "%lu keys processed so far\n"
  msgstr "оброблено %lu ключів\n"
  
- #: g10/import.c:655
++#: g10/import.c:656
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "Загалом оброблено: %lu\n"
  
- #: g10/import.c:658
++#: g10/import.c:659
  #, c-format
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "    пропущено ключів PGP-2: %lu\n"
  
- #: g10/import.c:660
++#: g10/import.c:661
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "пропущено нових ключів: %lu\n"
  
- #: g10/import.c:663
++#: g10/import.c:664
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "   без ід. користувача: %lu\n"
  
- #: g10/import.c:666 sm/import.c:130
++#: g10/import.c:667 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "           імпортовано: %lu"
  
- #: g10/import.c:670 sm/import.c:134
++#: g10/import.c:671 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "              без змін: %lu\n"
  
- #: g10/import.c:672
++#: g10/import.c:673
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "нових ід. користувачів: %lu\n"
  
- #: g10/import.c:674
++#: g10/import.c:675
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "       нових підключів: %lu\n"
  
- #: g10/import.c:676
++#: g10/import.c:677
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "        нових підписів: %lu\n"
  
- #: g10/import.c:678
++#: g10/import.c:679
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "відкликань нових ключів: %lu\n"
  
- #: g10/import.c:680 sm/import.c:136
++#: g10/import.c:681 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "прочитано закритих ключів: %lu\n"
  
- #: g10/import.c:682 sm/import.c:138
++#: g10/import.c:683 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "імпортовано закр. ключів: %lu\n"
  
- #: g10/import.c:684 sm/import.c:140
++#: g10/import.c:685 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr " закр. ключів без змін: %lu\n"
  
- #: g10/import.c:686 sm/import.c:142
++#: g10/import.c:687 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "        не імпортовано: %lu\n"
  
- #: g10/import.c:688
++#: g10/import.c:689
  #, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "    вилучених підписів: %lu\n"
  
- #: g10/import.c:690
++#: g10/import.c:691
  #, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr " вилучених ід. корист.: %lu\n"
  
- #: g10/import.c:1034
++#: g10/import.c:1035
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
@@@ -3310,190 -2539,152 +3266,190 @@@ msgstr "
  "УВАГА: у ключі %s містяться записи надання переваги\n"
  "недоступним алгоритмам для таких ід. користувачів:\n"
  
- #: g10/import.c:1076
++#: g10/import.c:1077
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr "         «%s»: перевага алгоритму шифрування %s\n"
  
- #: g10/import.c:1091
++#: g10/import.c:1092
  #, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "         «%s»: перевага алгоритму контрольних сум %s\n"
  
- #: g10/import.c:1103
++#: g10/import.c:1104
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr "         «%s»: перевага алгоритму стискання %s\n"
  
- #: g10/import.c:1116
++#: g10/import.c:1117
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr "наполегливо рекомендуємо вам оновити записи переваг і\n"
  
- #: g10/import.c:1118
++#: g10/import.c:1119
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  "повторно поширити цей ключ, щоб уникнути потенційних проблем з алгоритмами\n"
  
- #: g10/import.c:1143
++#: g10/import.c:1144
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  "оновити записи перевад можна за допомогою команди: gpg --edit-key %s updpref "
  "save\n"
  
- #: g10/import.c:1379 g10/import.c:2167
++#: g10/import.c:1380 g10/import.c:2168
  #, c-format
  msgid "key %s: no user ID\n"
  msgstr "ключ %s: немає ідентифікатор користувача\n"
  
- #: g10/import.c:1385
++#: g10/import.c:1386
  #, c-format
  msgid "key %s: %s\n"
  msgstr "ключ %s: %s\n"
  
- #: g10/import.c:1386 g10/import.c:2141
++#: g10/import.c:1387 g10/import.c:2142
  msgid "rejected by import screener"
  msgstr "відкинуто екранувальником імпорту"
  
- #: g10/import.c:1416
++#: g10/import.c:1417
  #, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "ключ %s: відновлено пошкоджений підключ PKS\n"
  
- #: g10/import.c:1434
++#: g10/import.c:1435
  #, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "ключ %s: прийнято несамопідписаний ідентифікатор користувача «%s»\n"
  
- #: g10/import.c:1444 g10/import.c:1475
++#: g10/import.c:1445 g10/import.c:1476
  #, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "ключ %s: немає чинних ідентифікаторів користувача\n"
  
- #: g10/import.c:1446
++#: g10/import.c:1447
  msgid "this may be caused by a missing self-signature\n"
  msgstr "причиною цього може бути те, що немає самопідпису\n"
  
- #: g10/import.c:1516 g10/import.c:2318
++#: g10/import.c:1517 g10/import.c:2319
  #, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "ключ %s: не знайдено відкритий ключ: %s\n"
  
- #: g10/import.c:1522
++#: g10/import.c:1523
  #, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "ключ %s: новий ключ — пропущено\n"
  
- #: g10/import.c:1537
++#: g10/import.c:1538
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "не виявлено придатного до запису сховища ключів: %s\n"
  
- #: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
++#: g10/import.c:1547 g10/import.c:1648 g10/import.c:2385
  #, c-format
  msgid "error writing keyring '%s': %s\n"
  msgstr "помилка під час спроби запису сховища ключів «%s»: %s\n"
  
- #: g10/import.c:1566
++#: g10/import.c:1567
  #, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "ключ %s: імпортовано відкритий ключ «%s»\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1591
  #, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "ключ %s: не відповідає нашій копії\n"
  
- #: g10/import.c:1606 g10/import.c:2342
++#: g10/import.c:1607 g10/import.c:2343
  #, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "ключ %s: не вдалося знайти початковий блок ключів: %s\n"
  
- #: g10/import.c:1614 g10/import.c:2349
++#: g10/import.c:1615 g10/import.c:2350
  #, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "ключ %s: не вдалося прочитати початковий блок ключів: %s\n"
  
- #: g10/import.c:1657
++#: g10/import.c:1658
  #, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "ключ %s: «%s» 1 новий ідентифікатор користувача\n"
  
- #: g10/import.c:1660
++#: g10/import.c:1661
  #, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "ключ %s: «%s» %d нових ідентифікаторів користувачів\n"
  
- #: g10/import.c:1663
++#: g10/import.c:1664
  #, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "ключ %s: «%s» 1 новий підпис\n"
  
- #: g10/import.c:1666
++#: g10/import.c:1667
  #, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "ключ %s: «%s» %d нових підписів\n"
  
- #: g10/import.c:1669
++#: g10/import.c:1670
  #, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "ключ %s: «%s» 1 новий підключ\n"
  
- #: g10/import.c:1672
++#: g10/import.c:1673
  #, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "ключ %s: «%s» %d нових підключів\n"
  
- #: g10/import.c:1675
++#: g10/import.c:1676
  #, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "ключ %s: «%s» вилучено %d підпис\n"
  
- #: g10/import.c:1678
++#: g10/import.c:1679
  #, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "ключ %s: «%s» вилучено %d підписів\n"
  
- #: g10/import.c:1681
++#: g10/import.c:1682
  #, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "ключ %s: «%s» спорожнено %d ідентифікатор користувача\n"
  
- #: g10/import.c:1684
++#: g10/import.c:1685
  #, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "ключ %s: «%s» спорожнено %d ідентифікаторів користувачів\n"
  
- #: g10/import.c:1707
++#: g10/import.c:1708
  #, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "ключ %s: «%s» не змінено\n"
  
- #: g10/import.c:2019 g10/import.c:2264
++#: g10/import.c:2020 g10/import.c:2265
  #, c-format
  msgid "key %s: secret key imported\n"
  msgstr "ключ %s: імпортовано закритий ключ\n"
  
- #: g10/import.c:2027
++#: g10/import.c:2028
  #, c-format
  msgid "key %s: secret key already exists\n"
  msgstr "ключ %s: закритий ключ вже існує\n"
  
- #: g10/import.c:2035
++#: g10/import.c:2036
  #, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "ключ %s: помилка під час спроби надсилання агенту: %s\n"
  
- #: g10/import.c:2140
++#: g10/import.c:2141
  #, c-format
  msgid "secret key %s: %s\n"
  msgstr "закритий ключ %s: %s\n"
  
- #: g10/import.c:2160 g10/import.c:2195
++#: g10/import.c:2161 g10/import.c:2196
  msgid "importing secret keys not allowed\n"
  msgstr "імпортування закритих ключів заборонено\n"
  
- #: g10/import.c:2184
++#: g10/import.c:2185
  #, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr "ключ %s: закритий ключ з некоректним шифром %d — пропущено\n"
@@@ -3508,143 -2699,116 +3464,143 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2256
++#: g10/import.c:2257
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  "Для перенесення «%s» на кожній із карток пам’яті слід виконати таку команду: "
  "%s\n"
  
- #: g10/import.c:2311
++#: g10/import.c:2312
  #, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
  "ключ %s: немає відкритого ключа — не можна застосовувати сертифікат "
  "відкликання\n"
  
- #: g10/import.c:2360
++#: g10/import.c:2361
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "ключ %s: некоректний сертифікат відкликання: %s — відкинуто\n"
  
- #: g10/import.c:2393
++#: g10/import.c:2394
  #, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "ключ %s: імпортовано сертифікат відкликання «%s»\n"
  
- #: g10/import.c:2469
++#: g10/import.c:2470
  #, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "ключ %s: немає ідентифікатор користувача для підпису\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2487
  #, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr ""
  "ключ %s: непідтримуваний алгоритм створення відкритого ключа для "
  "ідентифікатора користувача «%s»\n"
  
- #: g10/import.c:2488
++#: g10/import.c:2489
  #, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "ключ %s: некоректний самопідпис для ідентифікатора користувача «%s»\n"
  
- #: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
++#: g10/import.c:2506 g10/import.c:2532 g10/import.c:2583
  #, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "ключ %s: непідтримуваний алгоритм створення відкритого ключа\n"
  
- #: g10/import.c:2506
++#: g10/import.c:2507
  #, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "ключ %s: некоректний безпосередній підпис ключа\n"
  
- #: g10/import.c:2520
++#: g10/import.c:2521
  #, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "ключ %s: немає підключа для зв’язування ключів\n"
  
- #: g10/import.c:2533
++#: g10/import.c:2534
  #, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "ключ %s: некоректне зв’язування підключів\n"
  
- #: g10/import.c:2549
++#: g10/import.c:2550
  #, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "ключ %s: вилучено кратне зв’язування підключів\n"
  
- #: g10/import.c:2571
++#: g10/import.c:2572
  #, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "ключ %s: немає підключа для відкликання ключа\n"
  
- #: g10/import.c:2584
++#: g10/import.c:2585
  #, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "ключ %s: некоректне відкликання підключа\n"
  
- #: g10/import.c:2599
++#: g10/import.c:2600
  #, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "ключ %s: вилучено кратне відкликання підключа\n"
  
- #: g10/import.c:2641
++#: g10/import.c:2642
  #, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "ключ %s: пропущено ідентифікатор користувача «%s»\n"
  
- #: g10/import.c:2665
++#: g10/import.c:2666
  #, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "ключ %s: пропущено підключ\n"
  
- #: g10/import.c:2694
++#: g10/import.c:2695
  #, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "ключ %s: непридатний до експорту підпис (клас 0x%02X) — пропущено\n"
  
- #: g10/import.c:2705
++#: g10/import.c:2706
  #, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "ключ %s: сертифікат відкликання у помилковому місці — пропущено\n"
  
- #: g10/import.c:2723
++#: g10/import.c:2724
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "ключ %s: некоректний сертифікат відкликання: %s — пропущено\n"
  
- #: g10/import.c:2737
++#: g10/import.c:2738
  #, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "ключ %s: підпис підключа у помилковому місці — пропущено\n"
  
- #: g10/import.c:2745
++#: g10/import.c:2746
  #, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "ключ %s: неочікуваний клас підпису (0x%02X) — пропущено\n"
  
- #: g10/import.c:2887
++#: g10/import.c:2888
  #, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "ключ %s: виявлено дублювання ідентифікаторів користувача — об’єднано\n"
  
- #: g10/import.c:2951
++#: g10/import.c:2952
  #, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr "УВАГА: ключ %s могло бути відкликано: отримуємо ключ відкликання %s\n"
  
- #: g10/import.c:2967
++#: g10/import.c:2968
  #, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr "УВАГА: ключ %s могло бути відкликано: ключа відкликання %s немає.\n"
  
- #: g10/import.c:3031
++#: g10/import.c:3032
  #, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "ключ %s: додано сертифікат відкликання «%s»\n"
  
- #: g10/import.c:3069
++#: g10/import.c:3070
  #, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "ключ %s: додано безпосередній підпис ключа\n"
@@@ -3679,33 -2837,26 +3635,33 @@@ msgstr "ресурс блоку клю�
  msgid "error opening key DB: %s\n"
  msgstr "помилка під час спроби відкрити базу даних ключів: %s\n"
  
- #: g10/keydb.c:1782
++#: g10/keydb.c:1786
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "не вдалося перебудувати кеш сховища ключів: %s\n"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[revocation]"
  msgstr "[відкликання]"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[self-signature]"
  msgstr "[самопідпис]"
  
- #: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
++#: g10/keyedit.c:433 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: dirmngr/ldap-wrapper.c:694
  #, c-format
  msgid "error allocating memory: %s\n"
  msgstr "помилка під час спроби отримання області пам’яті: %s\n"
  
- #: g10/keyedit.c:629
++#: g10/keyedit.c:630
  #, c-format
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr ""
  "неможливо перевірити підпис із непідтримуваним алгоритмом створення "
  "відкритого ключа (%d): %s.\n"
  
- #: g10/keyedit.c:638
++#: g10/keyedit.c:639
  #, c-format
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
@@@ -3713,16 -2864,13 +3669,16 @@@ msgstr "
  "неможливо перевірити підпис із непідтримуваним алгоритмом створення "
  "контрольної суми %d: %s.\n"
  
- #: g10/keyedit.c:800
++#: g10/keyedit.c:801
  msgid " (reordered signatures follow)"
  msgstr " (нижче наведено перевпорядковані підписи)"
  
- #: g10/keyedit.c:913
++#: g10/keyedit.c:914
  #, c-format
  msgid "key %s:\n"
  msgstr "ключ %s:\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:917
  #, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
@@@ -3730,7 -2878,6 +3686,7 @@@ msgstr[0] "вилучено %d дубл
  msgstr[1] "вилучено %d дублікати підписів\n"
  msgstr[2] "вилучено %d дублікатів підписів\n"
  
- #: g10/keyedit.c:919 g10/keylist.c:480
++#: g10/keyedit.c:920 g10/keylist.c:480
  #, c-format
  msgid "%d signature not checked due to a missing key\n"
  msgid_plural "%d signatures not checked due to missing keys\n"
@@@ -3738,7 -2885,6 +3694,7 @@@ msgstr[0] "%d підпис не пер�
  msgstr[1] "%d підписи не перевірено через те, що немає ключа\n"
  msgstr[2] "%d підписів не перевірено через те, що немає ключа\n"
  
- #: g10/keyedit.c:923 g10/keylist.c:476
++#: g10/keyedit.c:924 g10/keylist.c:476
  #, c-format
  msgid "%d bad signature\n"
  msgid_plural "%d bad signatures\n"
@@@ -3746,7 -2892,6 +3702,7 @@@ msgstr[0] "%d помилкових пі
  msgstr[1] "%d помилкових підписи\n"
  msgstr[2] "%d помилкових підписів\n"
  
- #: g10/keyedit.c:927
++#: g10/keyedit.c:928
  #, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
@@@ -3754,7 -2899,6 +3710,7 @@@ msgstr[0] "перевпорядкова
  msgstr[1] "перевпорядковано %d підписи\n"
  msgstr[2] "перевпорядковано %d підписів\n"
  
- #: g10/keyedit.c:932
++#: g10/keyedit.c:933
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
@@@ -3763,7 -2907,6 +3719,7 @@@ msgstr "
  "Попередження: виявлено помилки, перевірка виконувалася лише для "
  "самопідписування, віддайте команду «%s», щоб перевірити усі підписи.\n"
  
- #: g10/keyedit.c:992 g10/pkclist.c:274
++#: g10/keyedit.c:993 g10/pkclist.c:274
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
  "keys\n"
@@@ -3774,17 -2917,14 +3730,17 @@@ msgstr "
  "ключів інших\n"
  "користувачів (за паспортами, відбитками з інших джерел тощо)\n"
  
- #: g10/keyedit.c:996 g10/pkclist.c:286
++#: g10/keyedit.c:997 g10/pkclist.c:286
  #, c-format
  msgid "  %d = I trust marginally\n"
  msgstr "  %d = Я довіряю не повністю\n"
  
- #: g10/keyedit.c:997 g10/pkclist.c:288
++#: g10/keyedit.c:998 g10/pkclist.c:288
  #, c-format
  msgid "  %d = I trust fully\n"
  msgstr "  %d = Я довіряю повністю\n"
  
- #: g10/keyedit.c:1015
++#: g10/keyedit.c:1016
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
@@@ -3794,52 -2934,40 +3750,52 @@@ msgstr "
  "Глибина, більша за 1, дозволяє ключу, який ви підписуєте, створювати\n"
  "надійні підписи від вашого імені.\n"
  
- #: g10/keyedit.c:1032
++#: g10/keyedit.c:1033
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  "Будь ласка, вкажіть домен обмеження цього підпису або натисніть Enter, якщо "
  "такого домену немає.\n"
  
- #: g10/keyedit.c:1160
++#: g10/keyedit.c:1161
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr "Пропускаємо ідентифікатор користувача «%s», який не є текстовим.\n"
  
- #: g10/keyedit.c:1168
++#: g10/keyedit.c:1169
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "Ідентифікатор користувача «%s» відкликано."
  
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
- #: g10/keyedit.c:2246
++#: g10/keyedit.c:1178 g10/keyedit.c:1206 g10/keyedit.c:1233 g10/keyedit.c:1417
++#: g10/keyedit.c:2247
  msgid "Are you sure you still want to sign it? (y/N) "
  msgstr "Ви певні, що все ще бажаєте підписати його? (y/N або т/Н) "
  
- #: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
- #: g10/keyedit.c:2251 g10/keyedit.c:3177
++#: g10/keyedit.c:1192 g10/keyedit.c:1220 g10/keyedit.c:1247 g10/keyedit.c:1423
++#: g10/keyedit.c:2252 g10/keyedit.c:3178
  msgid "  Unable to sign.\n"
  msgstr "  Неможливо підписати.\n"
  
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1197
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "Строк дії ідентифікатор користувача «%s» сплив."
  
- #: g10/keyedit.c:1224
++#: g10/keyedit.c:1225
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "Ідентифікатор користувача «%s» не є самопідписаним."
  
- #: g10/keyedit.c:1253
++#: g10/keyedit.c:1254
  #, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "Ідентифікатор користувача «%s» можна підписувати.  "
  
- #: g10/keyedit.c:1255
++#: g10/keyedit.c:1256
  msgid "Sign it? (y/N) "
  msgstr "Підписати його? (y/N або т/Н) "
  
- #: g10/keyedit.c:1282
++#: g10/keyedit.c:1283
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -3848,12 -2976,10 +3804,12 @@@ msgstr "
  "Самопідпис «%s»\n"
  "є підписом у форматі PGP 2.x.\n"
  
- #: g10/keyedit.c:1291
++#: g10/keyedit.c:1292
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr ""
  "Бажаєте розширити сферу використання до самопідпису OpenPGP? (y/N або т/Н) "
  
- #: g10/keyedit.c:1304
++#: g10/keyedit.c:1305
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3862,11 -2988,9 +3818,11 @@@ msgstr "
  "Строк дії вашого поточного підпису «%s»\n"
  "завершено.\n"
  
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:1310
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr "Бажаєте видати новий підпис для заміни застарілого? (y/N або т/Н) "
  
- #: g10/keyedit.c:1330
++#: g10/keyedit.c:1331
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3875,45 -2999,36 +3831,45 @@@ msgstr "
  "Ваш поточний підпис «%s»\n"
  "є локальним підписом.\n"
  
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:1336
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr ""
  "Бажаєте розширити сферу використання до повністю експортованого підпису? (y/"
  "N або т/Н) "
  
- #: g10/keyedit.c:1355
++#: g10/keyedit.c:1356
  #, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "«%s» вже було локально підписано ключем %s\n"
  
- #: g10/keyedit.c:1359
++#: g10/keyedit.c:1360
  #, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "«%s» вже було підписано ключем %s\n"
  
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:1365
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "Бажаєте підписати його попри все? (y/N або т/Н) "
  
- #: g10/keyedit.c:1386
++#: g10/keyedit.c:1387
  #, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "Нічого підписувати ключем %s\n"
  
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1411
  msgid "This key has expired!"
  msgstr "Строк дії цього ключа вичерпано!"
  
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1429
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "Строк дії цього ключа завершиться %s.\n"
  
- #: g10/keyedit.c:1434
++#: g10/keyedit.c:1435
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr "Бажаєте, щоб строк дії вашого підпису був таким самим? (Y/n або Т/н) "
  
- #: g10/keyedit.c:1475
++#: g10/keyedit.c:1476
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -3924,261 -3039,201 +3880,261 @@@ msgstr "
  "справді належить особі, ім’я якої вказано вище? Якщо ви не знаєте відповіді, "
  "введіть «0».\n"
  
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1481
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) Не буду відповідати.%s\n"
  
- #: g10/keyedit.c:1482
++#: g10/keyedit.c:1483
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) Мною не виконувалося ніяких перевірок.%s\n"
  
- #: g10/keyedit.c:1484
++#: g10/keyedit.c:1485
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) Мною виконано часткову перевірку.%s\n"
  
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:1488
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) Мною виконано ретельну перевірку.%s\n"
  
- #: g10/keyedit.c:1494
++#: g10/keyedit.c:1495
  msgid "Your selection? (enter '?' for more information): "
  msgstr "Ваш вибір? (введіть «?», щоб дізнатися більше): "
  
- #: g10/keyedit.c:1521
++#: g10/keyedit.c:1522
  #, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
  "key \"%s\" (%s)\n"
  msgstr "Ви справді бажаєте підписати цей ключ вашим ключем «%s» (%s)\n"
  
- #: g10/keyedit.c:1529
++#: g10/keyedit.c:1530
  msgid "This will be a self-signature.\n"
  msgstr "Це буде самопідпис.\n"
  
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:1535
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr "УВАГА: підпис не буде позначено як непридатний до експортування.\n"
  
- #: g10/keyedit.c:1541
++#: g10/keyedit.c:1542
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr "УВАГА: підпис не буде позначено як непридатний до відкликання.\n"
  
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1552
  msgid "The signature will be marked as non-exportable.\n"
  msgstr "Підпис буде позначено як непридатний до експортування.\n"
  
- #: g10/keyedit.c:1558
++#: g10/keyedit.c:1559
  msgid "The signature will be marked as non-revocable.\n"
  msgstr "Підпис буде позначено як непридатний до відкликання.\n"
  
- #: g10/keyedit.c:1565
++#: g10/keyedit.c:1566
  msgid "I have not checked this key at all.\n"
  msgstr "Цей ключ не перевірявся мною.\n"
  
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:1571
  msgid "I have checked this key casually.\n"
  msgstr "Цей ключ перевірено мною частково.\n"
  
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:1576
  msgid "I have checked this key very carefully.\n"
  msgstr "Цей ключ ретельно перевірено мною.\n"
  
- #: g10/keyedit.c:1587
++#: g10/keyedit.c:1588
  msgid "Really sign? (y/N) "
  msgstr "Підписати? (y/N або т/Н) "
  
- #: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
- #: g10/keyedit.c:6463 g10/sign.c:323
++#: g10/keyedit.c:1639 g10/keyedit.c:6308 g10/keyedit.c:6391 g10/keyedit.c:6500
++#: g10/keyedit.c:6562 g10/sign.c:325
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "помилка під час спроби підписування: %s\n"
  
- #: g10/keyedit.c:1725
++#: g10/keyedit.c:1726
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  "До ключа включено лише типовий заповнювач або записи ключа з картки — ніяких "
  "паролів не потрібно змінювати.\n"
  
- #: g10/keyedit.c:1755
++#: g10/keyedit.c:1756
  #, c-format
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "ключ %s: помилка під час спроби зміни пароля: %s\n"
  
- #: g10/keyedit.c:1869
++#: g10/keyedit.c:1870
  msgid "save and quit"
  msgstr "зберегти і вийти"
  
- #: g10/keyedit.c:1872
++#: g10/keyedit.c:1873
  msgid "show key fingerprint"
  msgstr "показати відбиток ключа"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1874
  msgid "show the keygrip"
  msgstr "показати keygrip"
  
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1875
  msgid "list key and user IDs"
  msgstr "показати список ключів та ідентифікаторів користувача"
  
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1877
  msgid "select user ID N"
  msgstr "вибрати вказаний ідентифікатор користувача"
  
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1878
  msgid "select subkey N"
  msgstr "вибрати вказаний підключ"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1879
  msgid "check signatures"
  msgstr "перевірити підписи"
  
- #: g10/keyedit.c:1884
++#: g10/keyedit.c:1885
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr ""
  "підписати вибрані ідентифікатори користувачів [* нижче наведено відповідні "
  "команди]"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1890
  msgid "sign selected user IDs locally"
  msgstr "підписати вибрані ідентифікатори користувача локально"
  
- #: g10/keyedit.c:1890
++#: g10/keyedit.c:1891
  msgid "sign selected user IDs with a trust signature"
  msgstr "підписати вибрані ідентифікатори користувача підписом надійності"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1893
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr ""
  "підписати вибрані ідентифікатори користувача підписом, який не можна "
  "відкликати"
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1895
  msgid "add a user ID"
  msgstr "додати ідентифікатор користувача"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1897
  msgid "add a photo ID"
  msgstr "додати фотоідентифікатор"
  
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1898
  msgid "delete selected user IDs"
  msgstr "вилучити вибрані ідентифікатори користувача"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1901
  msgid "add a subkey"
  msgstr "додати підключ"
  
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1904
  msgid "add a key to a smartcard"
  msgstr "додати ключ на картку пам’яті"
  
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1906
  msgid "move a key to a smartcard"
  msgstr "пересунути ключ на картку пам’яті"
  
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1908
  msgid "move a backup key to a smartcard"
  msgstr "пересунути резервний ключ на картку пам’яті"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1910
  msgid "delete selected subkeys"
  msgstr "вилучити вибрані підключі"
  
- #: g10/keyedit.c:1911
++#: g10/keyedit.c:1912
  msgid "add a revocation key"
  msgstr "додати ключ відкликання"
  
- #: g10/keyedit.c:1913
++#: g10/keyedit.c:1914
  msgid "delete signatures from the selected user IDs"
  msgstr "вилучити підписи з вибраних ідентифікаторів користувача"
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1916
  msgid "change the expiration date for the key or selected subkeys"
  msgstr "змінити дату завершення строку дії ключа або вибраних ключів"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1918
  msgid "flag the selected user ID as primary"
  msgstr "позначити вибраний ідентифікатор користувача як основний"
  
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1921
  msgid "list preferences (expert)"
  msgstr "список переваг (експертний)"
  
- #: g10/keyedit.c:1921
++#: g10/keyedit.c:1922
  msgid "list preferences (verbose)"
  msgstr "список переваг (докладний)"
  
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:1924
  msgid "set preference list for the selected user IDs"
  msgstr "встановити список параметрів для вибраних ідентифікаторів користувачів"
  
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1927
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr ""
  "встановити адресу основного сервера ключів для вибраних ідентифікаторів "
  "користувачів"
  
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1929
  msgid "set a notation for the selected user IDs"
  msgstr "встановити примітку для вибраного ідентифікатора користувача"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1931
  msgid "change the passphrase"
  msgstr "змінити пароль"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1934
  msgid "change the ownertrust"
  msgstr "змінити рівень довіри до власника"
  
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1937
  msgid "revoke signatures on the selected user IDs"
  msgstr "відкликати підписи для вибраних ідентифікаторів користувачів"
  
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1939
  msgid "revoke selected user IDs"
  msgstr "відкликати вибрані ідентифікатори користувачів"
  
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1942
  msgid "revoke key or selected subkeys"
  msgstr "відкликати ключ або вибрані підключі"
  
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1944
  msgid "enable key"
  msgstr "увімкнути ключ"
  
- #: g10/keyedit.c:1944
++#: g10/keyedit.c:1945
  msgid "disable key"
  msgstr "вимкнути ключ"
  
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1947
  msgid "show selected photo IDs"
  msgstr "показати вибрані фотоідентифікатори"
  
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1949
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  "ущільнити непридатні до використання ідентифікатори користувачів і вилучити "
  "невикористані підписи з ключа"
  
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:1951
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  "ущільнити непридатні до використання ідентифікатори користувачів і вилучити "
  "всі підписи з ключа"
  
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2063
  msgid "Secret key is available.\n"
  msgstr "Доступний закритий ключ.\n"
  
- #: g10/keyedit.c:2162
++#: g10/keyedit.c:2163
  msgid "Need the secret key to do this.\n"
  msgstr "Для цього потрібен закритий ключ.\n"
  
- #: g10/keyedit.c:2183
++#: g10/keyedit.c:2184
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4189,258 -3244,204 +4145,264 @@@ msgstr "
  "  «t» для надійних підписів (tsign), «nr» для підписів без відкликання\n"
  "  (nrsign) або будь-яку комбінацію (ltsign, tnrsign тощо).\n"
  
- #: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
++#: g10/keyedit.c:2240 g10/keyedit.c:3178 g10/keyedit.c:3317 g10/keyedit.c:3379
  msgid "Key is revoked."
  msgstr "Ключ відкликано."
  
- #: g10/keyedit.c:2262
++#: g10/keyedit.c:2263
  msgid "Really sign all user IDs? (y/N) "
  msgstr "Підписати всі ідентифікатори користувача? (y/N або т/Н) "
  
- #: g10/keyedit.c:2266
++#: g10/keyedit.c:2267
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "Підписати всі текстові ідентифікатори користувача? (y/N або т/Н) "
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2275
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Підказка: виберіть ідентифікатори користувача для підписування\n"
  
- #: g10/keyedit.c:2285
++#: g10/keyedit.c:2286
  #, c-format
  msgid "Unknown signature type '%s'\n"
  msgstr "Невідомий тип підпису «%s»\n"
  
- #: g10/keyedit.c:2309
++#: g10/keyedit.c:2310
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
  msgstr "Цією командою не можна користуватися у режимі %s.\n"
  
- #: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
++#: g10/keyedit.c:2332 g10/keyedit.c:2356 g10/keyedit.c:2550
  msgid "You must select at least one user ID.\n"
  msgstr "Вам слід вибрати принаймні один ідентифікатор користувача.\n"
  
- #: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
++#: g10/keyedit.c:2334 g10/keyedit.c:2358 g10/keyedit.c:2512 g10/keyedit.c:2552
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr "(Скористайтеся командою «%s».)\n"
  
- #: g10/keyedit.c:2336
++#: g10/keyedit.c:2337
  msgid "You can't delete the last user ID!\n"
  msgstr "Не можна вилучати останній ідентифікатор користувача!\n"
  
- #: g10/keyedit.c:2339
++#: g10/keyedit.c:2340
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "Вилучити всі вибрані ідентифікатори користувачів? (y/N або т/Н) "
  
- #: g10/keyedit.c:2340
++#: g10/keyedit.c:2341
  msgid "Really remove this user ID? (y/N) "
  msgstr "Вилучити цей ідентифікатор користувача? (y/N або т/Н) "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2397
++#: g10/keyedit.c:2398
  msgid "Really move the primary key? (y/N) "
  msgstr "Вилучити основний ключ? (y/N або т/Н) "
  
- #: g10/keyedit.c:2409 g10/keyedit.c:4866
++#: g10/keyedit.c:2410 g10/keyedit.c:4964
  msgid "You must select exactly one key.\n"
  msgstr "Вам слід вибрати лише один ключ.\n"
  
- #: g10/keyedit.c:2436
++#: g10/keyedit.c:2437
  msgid "Command expects a filename argument\n"
  msgstr "Для команди слід вказати аргумент з назвою файла\n"
  
- #: g10/keyedit.c:2457
++#: g10/keyedit.c:2458
  #, c-format
  msgid "Can't open '%s': %s\n"
  msgstr "Не вдалося відкрити «%s»: %s\n"
  
- #: g10/keyedit.c:2474
++#: g10/keyedit.c:2475
  #, c-format
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "Помилка читання резервного ключа з «%s»: %s\n"
  
- #: g10/keyedit.c:2509
++#: g10/keyedit.c:2510
  msgid "You must select at least one key.\n"
  msgstr "Вам слід вибрати принаймні один ключ.\n"
  
- #: g10/keyedit.c:2515
++#: g10/keyedit.c:2516
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "Справді бажаєте вилучити вибрані ключі? (y/N або т/Н) "
  
- #: g10/keyedit.c:2517
++#: g10/keyedit.c:2518
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "Справді бажаєте вилучити цей ключ? (y/N або т/Н) "
  
- #: g10/keyedit.c:2555
++#: g10/keyedit.c:2556
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr "Відкликати всі вибрані ідентифікатори користувачів? (y/N або т/Н) "
  
- #: g10/keyedit.c:2556
++#: g10/keyedit.c:2557
  msgid "Really revoke this user ID? (y/N) "
  msgstr "Відкликати цей ідентифікатор користувача? (y/N або т/Н) "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2575
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "Ви справді бажаєте відкликати весь ключ? (y/N або т/Н) "
  
- #: g10/keyedit.c:2585
++#: g10/keyedit.c:2586
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "Ви справді бажаєте відкликати позначені підключі? (y/N або т/Н) "
  
- #: g10/keyedit.c:2587
++#: g10/keyedit.c:2588
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "Ви справді бажаєте відкликати цей підключ? (y/N або т/Н) "
  
- #: g10/keyedit.c:2645
++#: g10/keyedit.c:2646
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  "Не можна встановлювати довіру до власника, якщо використовується вказана "
  "користувачем база даних довіри\n"
  
- #: g10/keyedit.c:2690
++#: g10/keyedit.c:2691
  msgid "Set preference list to:\n"
  msgstr "Встановити список переваг:\n"
  
- #: g10/keyedit.c:2697
++#: g10/keyedit.c:2698
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr ""
  "Оновити переваги для вибраних ідентифікаторів користувачів? (y/N або т/Н) "
  
- #: g10/keyedit.c:2699
++#: g10/keyedit.c:2700
  msgid "Really update the preferences? (y/N) "
  msgstr "Оновити параметри? (y/N або т/Н) "
  
- #: g10/keyedit.c:2773
++#: g10/keyedit.c:2774
  msgid "Save changes? (y/N) "
  msgstr "Зберегти зміни? (y/N або т/Н) "
  
- #: g10/keyedit.c:2777
++#: g10/keyedit.c:2778
  msgid "Quit without saving? (y/N) "
  msgstr "Вийти без збереження? (y/N або т/Н) "
  
- #: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
- #: g10/keyedit.c:3267 g10/keyedit.c:3332
++#: g10/keyedit.c:2789 g10/keyedit.c:2799 g10/keyedit.c:2943 g10/keyedit.c:3046
++#: g10/keyedit.c:3268 g10/keyedit.c:3333 g10/keyedit.c:3409
  #, c-format
  msgid "update failed: %s\n"
  msgstr "помилка оновлення: %s\n"
  
- #: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
++#: g10/keyedit.c:2805 g10/keyedit.c:3273 g10/keyedit.c:3338 g10/keyedit.c:3416
  msgid "Key not changed so no update needed.\n"
  msgstr "Ключ не змінено, отже оновлення непотрібне.\n"
  
- #: g10/keyedit.c:3038
++#: g10/keyedit.c:3039
  #, c-format
  msgid "User ID revocation failed: %s\n"
  msgstr "Спроба відкликання ідентифікатор користувача зазнала невдачі: %s\n"
  
- #: g10/keyedit.c:3083
++#: g10/keyedit.c:3084
  #, c-format
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "«%s» не є відбитком\n"
  
- #: g10/keyedit.c:3112
++#: g10/keyedit.c:3113
  #, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "«%s» не є основним відбитком\n"
  
- #: g10/keyedit.c:3248 g10/keyedit.c:3251
++#: g10/keyedit.c:3249 g10/keyedit.c:3252
  #, c-format
  msgid "Invalid user ID '%s': %s\n"
  msgstr "Некоректний ідентифікатор користувача «%s»: %s\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  msgid "No matching user IDs."
  msgstr "Немає відповідних ідентифікаторів користувачів."
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  msgid "Nothing to sign.\n"
  msgstr "Нічого підписувати.\n"
  
- #: g10/keyedit.c:3427
++#: g10/keyedit.c:3388
+ #, 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:3508
  msgid "Digest: "
  msgstr "Контрольна сума: "
  
- #: g10/keyedit.c:3484
++#: g10/keyedit.c:3565
  msgid "Features: "
  msgstr "Можливості: "
  
- #: g10/keyedit.c:3495
++#: g10/keyedit.c:3576
  msgid "Keyserver no-modify"
  msgstr "Сервер ключів без можливості зміни"
  
- #: g10/keyedit.c:3510 g10/keylist.c:377
++#: g10/keyedit.c:3591 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr "Основний сервер ключів: "
  
- #: g10/keyedit.c:3518 g10/keyedit.c:3519
++#: g10/keyedit.c:3599 g10/keyedit.c:3600
  msgid "Notations: "
  msgstr "Примітки: "
  
- #: g10/keyedit.c:3764
++#: g10/keyedit.c:3845
  msgid "There are no preferences on a PGP 2.x-style user ID.\n"
  msgstr ""
  "Переваг для ідентифікаторів користувачів у форматі PGP 2.x не передбачено.\n"
  
- #: g10/keyedit.c:3836
++#: g10/keyedit.c:3917
  #, c-format
  msgid "The following key was revoked on %s by %s key %s\n"
  msgstr "Вказаний нижче ключ було відкликано %s %s ключем %s\n"
  
- #: g10/keyedit.c:3860
++#: g10/keyedit.c:3941
  #, c-format
  msgid "This key may be revoked by %s key %s"
  msgstr "Цей ключ може бути відкликано %s ключем %s"
  
- #: g10/keyedit.c:3866
++#: g10/keyedit.c:3947
  msgid "(sensitive)"
  msgstr "(важливий)"
  
- #: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3989 g10/keyedit.c:4131 g10/keylist.c:262 g10/keyserver.c:538
  #, c-format
  msgid "created: %s"
  msgstr "створено: %s"
  
- #: g10/keyedit.c:3911 g10/keylist.c:1852
++#: g10/keyedit.c:3992 g10/keylist.c:1852
  #, c-format
  msgid "revoked: %s"
  msgstr "відкликано: %s"
  
- #: g10/keyedit.c:3913 g10/keylist.c:1858
++#: g10/keyedit.c:3994 g10/keylist.c:1858
  #, c-format
  msgid "expired: %s"
  msgstr "не діє з: %s"
  
- #: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyedit.c:3996 g10/keyedit.c:4133 g10/keylist.c:264 g10/keylist.c:1864
 +#: g10/keyserver.c:544
  #, c-format
  msgid "expires: %s"
  msgstr "діє до: %s"
  
- #: g10/keyedit.c:3917
++#: g10/keyedit.c:3998
  #, c-format
  msgid "usage: %s"
  msgstr "використання: %s"
  
- #: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
++#: g10/keyedit.c:4006 g10/keyedit.c:4026 g10/keylist.c:267
  msgid "card-no: "
  msgstr "номер картки: "
  
- #: g10/keyedit.c:3984
++#: g10/keyedit.c:4065
  #, c-format
  msgid "trust: %s"
  msgstr "надійність: %s"
  
- #: g10/keyedit.c:3988
++#: g10/keyedit.c:4069
  #, c-format
  msgid "validity: %s"
  msgstr "чинність: %s"
  
- #: g10/keyedit.c:3995
++#: g10/keyedit.c:4076
  msgid "This key has been disabled"
  msgstr "Цей ключ було вимкнено"
  
- #: g10/keyedit.c:4013
++#: g10/keyedit.c:4094
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4448,18 -3449,12 +4410,18 @@@ msgstr "
  "Зауважте, що показані дані щодо чинності ключів не обов’язково є коректними\n"
  "до перезапуску програми.\n"
  
- #: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
- #: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: g10/keyedit.c:4150 g10/keyedit.c:4581 g10/keyserver.c:548
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:712
 +#: dirmngr/ocsp.c:703
  msgid "revoked"
  msgstr "відкликано"
  
- #: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
- #: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4152 g10/keyedit.c:4583 g10/keyserver.c:552
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:714
  msgid "expired"
  msgstr "збіг строк дії"
  
- #: g10/keyedit.c:4188
++#: g10/keyedit.c:4269
  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"
@@@ -4469,15 -3464,12 +4431,15 @@@ msgstr "
  "              цієї команди можна зробити основним інший ідентифікатор "
  "користувача.\n"
  
- #: g10/keyedit.c:4240
++#: g10/keyedit.c:4321
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr "УВАГА: строк дії вашого підключа імпортування невдовзі завершиться.\n"
  
- #: g10/keyedit.c:4241
++#: g10/keyedit.c:4322
  msgid "You may want to change its expiration date too.\n"
  msgstr "Ймовірно, вам варто змінити також і його строк дії.\n"
  
- #: g10/keyedit.c:4300
++#: g10/keyedit.c:4381
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4487,35 -3479,27 +4449,35 @@@ msgstr "
  "до відмови\n"
  "         у використанні цього ключа деякими версіями PGP.\n"
  
- #: g10/keyedit.c:4305 g10/keyedit.c:4595
++#: g10/keyedit.c:4386 g10/keyedit.c:4676
  msgid "Are you sure you still want to add it? (y/N) "
  msgstr "Ви справді бажаєте додати його? (y/N або т/Н) "
  
- #: g10/keyedit.c:4311
++#: g10/keyedit.c:4392
  msgid "You may not add a photo ID to a PGP2-style key.\n"
  msgstr "Не можна додавати фотоідентифікатор до ключа у форматі PGP2.\n"
  
- #: g10/keyedit.c:4326 g10/keygen.c:2697
++#: g10/keyedit.c:4407 g10/keygen.c:2719
  msgid "Such a user ID already exists on this key!\n"
  msgstr "У цьому ключі вже існує такий ідентифікатор користувача!\n"
  
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4509
  msgid "Delete this good signature? (y/N/q)"
  msgstr "Вилучити цей дійсний підпис? (y/N/q або т/Н/в)"
  
- #: g10/keyedit.c:4438
++#: g10/keyedit.c:4519
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "Вилучити цей некоректний підпис? (y/N/q або т/Н/в)"
  
- #: g10/keyedit.c:4442
++#: g10/keyedit.c:4523
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "Вилучити цей невідомий підпис? (y/N/q або т/Н/в)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4530
  msgid "Really delete this self-signature? (y/N)"
  msgstr "Вилучити цей самопідпис? (y/N або т/Н)"
  
- #: g10/keyedit.c:4465
++#: g10/keyedit.c:4546
  #, c-format
  msgid "Deleted %d signature.\n"
  msgid_plural "Deleted %d signatures.\n"
@@@ -4523,20 -3507,16 +4485,20 @@@ msgstr[0] "Вилучено %d підп
  msgstr[1] "Вилучено %d підписи.\n"
  msgstr[2] "Вилучено %d підписів.\n"
  
- #: g10/keyedit.c:4469
++#: g10/keyedit.c:4550
  msgid "Nothing deleted.\n"
  msgstr "Нічого не вилучено.\n"
  
- #: g10/keyedit.c:4504 g10/trust.c:693
++#: g10/keyedit.c:4585 g10/trust.c:716
  msgid "invalid"
  msgstr "некоректний"
  
- #: g10/keyedit.c:4506
++#: g10/keyedit.c:4587
  #, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "Ідентифікатор користувача «%s» ущільнено: %s\n"
  
- #: g10/keyedit.c:4512
++#: g10/keyedit.c:4593
  #, c-format
  msgid "User ID \"%s\": %d signature removed\n"
  msgid_plural "User ID \"%s\": %d signatures removed\n"
@@@ -4544,17 -3524,14 +4506,17 @@@ msgstr[0] "Ідентифікатор �
  msgstr[1] "Ідентифікатор користувача «%s»: вилучено %d підписів\n"
  msgstr[2] "Ідентифікатор користувача «%s»: вилучено %d підписів\n"
  
- #: g10/keyedit.c:4520
++#: g10/keyedit.c:4601
  #, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "Ідентифікатор користувача «%s»: вже мінімізовано\n"
  
- #: g10/keyedit.c:4521
++#: g10/keyedit.c:4602
  #, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "Ідентифікатор користувача «%s»: вже очищено\n"
  
- #: g10/keyedit.c:4590
++#: g10/keyedit.c:4671
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4564,39 -3541,31 +4526,39 @@@ msgstr "
  "призвести до відмови\n"
  "         у використанні цього ключа деякими версіями PGP.\n"
  
- #: g10/keyedit.c:4601
++#: g10/keyedit.c:4682
  msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
  msgstr "Не можна додавати підписане відкликання до ключа у форматі PGP 2.x.\n"
  
- #: g10/keyedit.c:4618
++#: g10/keyedit.c:4699
  msgid "Enter the user ID of the designated revoker: "
  msgstr "Вкажіть ідентифікатор користувача підписаного відкликання: "
  
- #: g10/keyedit.c:4643
++#: g10/keyedit.c:4724
  msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
  msgstr "не можна призначати ключ у форматі PGP 2.x підписаним відкликанням\n"
  
- #: g10/keyedit.c:4658
++#: g10/keyedit.c:4739
  msgid "you cannot appoint a key as its own designated revoker\n"
  msgstr "не можна призначати ключ власним підписаним відкликанням\n"
  
- #: g10/keyedit.c:4680
++#: g10/keyedit.c:4761
  msgid "this key has already been designated as a revoker\n"
  msgstr "цей ключ вже було позначено як призначений для відкликання\n"
  
- #: g10/keyedit.c:4698
++#: g10/keyedit.c:4779
  msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
  msgstr ""
  "УВАГА: призначення ключа як підписаного відкликання не можна скасовувати!\n"
  
- #: g10/keyedit.c:4704
++#: g10/keyedit.c:4785
  msgid ""
  "Are you sure you want to appoint this key as a designated revoker? (y/N) "
  msgstr ""
  "Ви справді бажаєте призначити цей ключ як підписане відкликання? (y/N або т/"
  "Н) "
  
- #: g10/keyedit.c:4755
++#: g10/keyedit.c:4848
  msgid ""
  "Are you sure you want to change the expiration time for multiple subkeys? (y/"
  "N) "
@@@ -4604,233 -3573,182 +4566,233 @@@ msgstr "
  "Ви справді хочете змінити час вичерпання строку дії для декількох підключів? "
  "(y/N або т/Н) "
  
- #: g10/keyedit.c:4760
++#: g10/keyedit.c:4853
  msgid "Changing expiration time for a subkey.\n"
  msgstr "Зміна часу завершення строку дії для підключа.\n"
  
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:4856
  msgid "Changing expiration time for the primary key.\n"
  msgstr "Зміна часу завершення строку дії для основного ключа.\n"
  
- #: g10/keyedit.c:4814
++#: g10/keyedit.c:4910
  msgid "You can't change the expiration date of a v3 key\n"
  msgstr "Не можна змінювати дату завершення строку дії ключа v3\n"
  
- #: g10/keyedit.c:4987
++#: g10/keyedit.c:5085
  #, c-format
  msgid "signing subkey %s is already cross-certified\n"
  msgstr "підписування підключа %s вже перехресно сертифіковано\n"
  
- #: g10/keyedit.c:4993
++#: g10/keyedit.c:5091
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr ""
  "підключ %s не призначено для підписування, отже його не потрібно перехресно "
  "сертифікувати\n"
  
- #: g10/keyedit.c:5108
++#: g10/keyedit.c:5206
  msgid "Please select exactly one user ID.\n"
  msgstr "Будь ласка, виберіть лише один ідентифікатор користувача.\n"
  
- #: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
++#: g10/keyedit.c:5247 g10/keyedit.c:5361 g10/keyedit.c:5474 g10/keyedit.c:5611
  #, c-format
  msgid "skipping v3 self-signature on user ID \"%s\"\n"
  msgstr "пропускаємо самопідпис v3 для ідентифікатора користувача «%s»\n"
  
- #: g10/keyedit.c:5320
++#: g10/keyedit.c:5418
  msgid "Enter your preferred keyserver URL: "
  msgstr "Вкажіть адресу вашого основного сервера ключів: "
  
- #: g10/keyedit.c:5399
++#: g10/keyedit.c:5497
  msgid "Are you sure you want to replace it? (y/N) "
  msgstr "Ви справді бажаєте замінити його? (y/N або т/Н) "
  
- #: g10/keyedit.c:5400
++#: g10/keyedit.c:5498
  msgid "Are you sure you want to delete it? (y/N) "
  msgstr "Ви справді бажаєте вилучити його? (y/N або т/Н) "
  
- #: g10/keyedit.c:5459
++#: g10/keyedit.c:5557
  msgid "Enter the notation: "
  msgstr "Вкажіть примітку: "
  
- #: g10/keyedit.c:5606
++#: g10/keyedit.c:5704
  msgid "Proceed? (y/N) "
  msgstr "Продовжувати? (y/N або т/Н) "
  
- #: g10/keyedit.c:5676
++#: g10/keyedit.c:5774
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "Ідентифікатора користувача з індексом %d не існує\n"
  
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5836
  #, c-format
  msgid "No user ID with hash %s\n"
  msgstr "Ідентифікатора користувача з хешем %s не існує\n"
  
- #: g10/keyedit.c:5839
++#: g10/keyedit.c:5937
  #, c-format
  msgid "No subkey with key ID '%s'.\n"
  msgstr "Піключа із ідентифікатором ключа «%s» не існує.\n"
  
- #: g10/keyedit.c:5861
++#: g10/keyedit.c:5959
  #, c-format
  msgid "No subkey with index %d\n"
  msgstr "Підключа з індексом %d не існує\n"
  
- #: g10/keyedit.c:6002
++#: g10/keyedit.c:6100
  #, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "Ідентифікатор користувача: «%s»\n"
  
- #: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
++#: g10/keyedit.c:6103 g10/keyedit.c:6205 g10/keyedit.c:6253
  #, c-format
  msgid "signed by your key %s on %s%s%s\n"
  msgstr "підписано вашим ключем %s %s%s%s\n"
  
- #: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
++#: g10/keyedit.c:6105 g10/keyedit.c:6207 g10/keyedit.c:6255
  msgid " (non-exportable)"
  msgstr " (неекспортовний)"
  
- #: g10/keyedit.c:6011
++#: g10/keyedit.c:6109
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "Строк дії цього підпису завершується %s.\n"
  
- #: g10/keyedit.c:6016
++#: g10/keyedit.c:6114
  msgid "Are you sure you still want to revoke it? (y/N) "
  msgstr "Ви справді бажаєте відкликати його? (y/N або т/Н) "
  
- #: g10/keyedit.c:6021
++#: g10/keyedit.c:6119
  msgid "Create a revocation certificate for this signature? (y/N) "
  msgstr "Створити сертифікат відкликання для цього підпису? (y/N або т/Н) "
  
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6173
  msgid "Not signed by you.\n"
  msgstr "Не підписано вами.\n"
  
- #: g10/keyedit.c:6081
++#: g10/keyedit.c:6179
  #, c-format
  msgid "You have signed these user IDs on key %s:\n"
  msgstr "Вами підписано ці ідентифікатори користувачів у ключі %s:\n"
  
- #: g10/keyedit.c:6110
++#: g10/keyedit.c:6208
  msgid " (non-revocable)"
  msgstr " (невідкликуваний)"
  
- #: g10/keyedit.c:6117
++#: g10/keyedit.c:6215
  #, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "відкликано вашим ключем %s у %s\n"
  
- #: g10/keyedit.c:6142
++#: g10/keyedit.c:6240
  msgid "You are about to revoke these signatures:\n"
  msgstr "Ви маєте намір відкликати ці підписи:\n"
  
- #: g10/keyedit.c:6165
++#: g10/keyedit.c:6263
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "Справді створити сертифікати відкликання? (y/N або т/Н) "
  
- #: g10/keyedit.c:6198
++#: g10/keyedit.c:6296
  msgid "no secret key\n"
  msgstr "немає закритого ключа\n"
  
- #: g10/keyedit.c:6246
++#: g10/keyedit.c:6344
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr "спроба відкликати ідентифікатор, який не належить користувачеві: %s\n"
  
- #: g10/keyedit.c:6256
++#: g10/keyedit.c:6354
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "ідентифікатор користувача «%s» вже відкликано\n"
  
- #: g10/keyedit.c:6273
++#: g10/keyedit.c:6371
  #, c-format
  msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
  msgstr ""
  "УВАГА: підпис ідентифікатора користувача позначено датою на %d секунд у "
  "майбутньому\n"
  
- #: g10/keyedit.c:6386
++#: g10/keyedit.c:6485
  #, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "Ключ %s вже відкликано.\n"
  
- #: g10/keyedit.c:6448
++#: g10/keyedit.c:6547
  #, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "Підключ %s вже відкликано.\n"
  
- #: g10/keyedit.c:6545
++#: g10/keyedit.c:6644
  #, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr "Показ фотоідентифікатора %s розміру %ld для ключа %s (uid %d)\n"
  
- #: g10/keygen.c:305
++#: g10/keygen.c:316
  #, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "запис переваги «%s» продубльовано\n"
  
- #: g10/keygen.c:312
++#: g10/keygen.c:323
  msgid "too many cipher preferences\n"
  msgstr "занадто багато записів переваг шифрів\n"
  
- #: g10/keygen.c:314
++#: g10/keygen.c:325
  msgid "too many digest preferences\n"
  msgstr "занадто багато записів переваг контрольних сум\n"
  
- #: g10/keygen.c:316
++#: g10/keygen.c:327
  msgid "too many compression preferences\n"
  msgstr "занадто багато записів переваг стискання\n"
  
- #: g10/keygen.c:457
++#: g10/keygen.c:468
  #, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "некоректний запис «%s» у рядку переваг\n"
  
- #: g10/keygen.c:936
++#: g10/keygen.c:947
  msgid "writing direct signature\n"
  msgstr "записування безпосереднього підпису\n"
  
- #: g10/keygen.c:982
++#: g10/keygen.c:993
  msgid "writing self signature\n"
  msgstr "записування самопідпису\n"
  
- #: g10/keygen.c:1038
++#: g10/keygen.c:1049
  msgid "writing key binding signature\n"
  msgstr "записування підпису прив’язування ключа\n"
  
- #: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
- #: g10/keygen.c:1610 g10/keygen.c:1615
++#: g10/keygen.c:1413 g10/keygen.c:1418 g10/keygen.c:1470 g10/keygen.c:1475
++#: g10/keygen.c:1622 g10/keygen.c:1627
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "некоректний розмір ключа; використовуємо %u-бітовий\n"
  
- #: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
++#: g10/keygen.c:1424 g10/keygen.c:1481 g10/keygen.c:1489 g10/keygen.c:1633
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "розмір ключа округлено до %u-бітового\n"
  
- #: g10/keygen.c:1503
++#: g10/keygen.c:1515
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  "УВАГА: деякі з програм OpenPGP не можуть працювати з ключем DSA з таким "
  "розміром контрольної суми\n"
  
- #: g10/keygen.c:1677
++#: g10/keygen.c:1689
  msgid "Sign"
  msgstr "Підписати"
  
- #: g10/keygen.c:1680
++#: g10/keygen.c:1692
  msgid "Certify"
  msgstr "Сертифікувати"
  
- #: g10/keygen.c:1683
++#: g10/keygen.c:1695
  msgid "Encrypt"
  msgstr "Зашифрувати"
  
- #: g10/keygen.c:1686
++#: g10/keygen.c:1698
  msgid "Authenticate"
  msgstr "Пройти розпізнавання"
  
@@@ -4844,151 -3762,120 +4806,151 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1705
++#: g10/keygen.c:1717
  msgid "SsEeAaQq"
  msgstr "SsEeAaQq"
  
- #: g10/keygen.c:1732
++#: g10/keygen.c:1744
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "Можливі дії з ключем %s: "
  
- #: g10/keygen.c:1738
++#: g10/keygen.c:1750
  msgid "Current allowed actions: "
  msgstr "Поточні дозволені дії: "
  
- #: g10/keygen.c:1743
++#: g10/keygen.c:1755
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) увімкнути або вимкнути можливість підписування\n"
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) увімкнути або вимкнути можливість шифрування\n"
  
- #: g10/keygen.c:1749
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr ""
  "   (%c) увімкнути або вимкнути можливість використання для розпізнавання\n"
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) вийти\n"
  
- #: g10/keygen.c:1881 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1893 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Вкажіть потрібний вам тип ключа:\n"
  
- #: g10/keygen.c:1885
++#: g10/keygen.c:1897
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) RSA і RSA (типовий)\n"
  
- #: g10/keygen.c:1889
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA і Elgamal\n"
  
- #: g10/keygen.c:1892
++#: g10/keygen.c:1904
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (лише підписування)\n"
  
- #: g10/keygen.c:1894
++#: g10/keygen.c:1906
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (лише підписування)\n"
  
- #: g10/keygen.c:1900
++#: g10/keygen.c:1912
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) Elgamal (лише шифрування)\n"
  
- #: g10/keygen.c:1902
++#: g10/keygen.c:1914
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (лише шифрування)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1920
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (із визначенням можливостей власноруч)\n"
  
- #: g10/keygen.c:1910
++#: g10/keygen.c:1922
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (із визначенням можливостей власноруч)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1928
  #, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) ECC та ECC\n"
  
- #: g10/keygen.c:1918
++#: g10/keygen.c:1930
  #, c-format
  msgid "  (%d) ECC (sign only)\n"
  msgstr "  (%d) ECC (лише підписування)\n"
  
- #: g10/keygen.c:1920
++#: g10/keygen.c:1932
  #, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "  (%d) ECC (із визначенням можливостей власноруч)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1934
  #, c-format
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "  (%d) ECC (лише шифрування)\n"
  
- #: g10/keygen.c:1926
++#: g10/keygen.c:1938
  #, c-format
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) Вже записаний ключ\n"
  
- #: g10/keygen.c:2022 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:206
  msgid "Enter the keygrip: "
  msgstr "Вкажіть keygrip: "
  
- #: g10/keygen.c:2035 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2047 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr "Некоректний keygrip (мало бути вказано 40 шістнадцяткових цифр)\n"
  
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2049 sm/certreqgen-ui.c:216
  msgid "No key with this keygrip\n"
  msgstr "Немає ключів з таким значенням keygrip\n"
  
- #: g10/keygen.c:2111 g10/keygen.c:2125
++#: g10/keygen.c:2133 g10/keygen.c:2147
  #, c-format
  msgid "rounded to %u bits\n"
  msgstr "округлено до %u бітів\n"
  
- #: g10/keygen.c:2166
++#: g10/keygen.c:2188
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr "ключі %s можуть мати довжину від %u до %u бітів.\n"
  
- #: g10/keygen.c:2174
++#: g10/keygen.c:2196
  #, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Якою має бути довжина підключа? (%u) "
  
- #: g10/keygen.c:2177 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2199 sm/certreqgen-ui.c:183
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Якою має бути довжина ключа? (%u) "
  
- #: g10/keygen.c:2191 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2213 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Запитана довжина ключа — %u бітів\n"
  
- #: g10/keygen.c:2237
++#: g10/keygen.c:2259
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Вкажіть потрібну вам еліптичну криву:\n"
  
- #: g10/keygen.c:2409
++#: g10/keygen.c:2431
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5004,7 -3891,6 +4966,7 @@@ msgstr "
  "      <n>m = строк чинності у n місяців\n"
  "      <n>y = строк чинності у n років\n"
  
- #: g10/keygen.c:2420
++#: g10/keygen.c:2442
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5020,38 -3906,30 +4982,38 @@@ msgstr "
  "      <n>m = строк чинності підпису у n місяців\n"
  "      <n>y = строк чинності підпису у n років\n"
  
- #: g10/keygen.c:2443
++#: g10/keygen.c:2465
  msgid "Key is valid for? (0) "
  msgstr "Яким є строк чинності ключа? (0) "
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2470
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Яким є строк чинності підпису? (%s) "
  
- #: g10/keygen.c:2461 g10/keygen.c:2486
++#: g10/keygen.c:2483 g10/keygen.c:2508
  msgid "invalid value\n"
  msgstr "некоректне значення\n"
  
- #: g10/keygen.c:2468
++#: g10/keygen.c:2490
  msgid "Key does not expire at all\n"
  msgstr "Ключ не має обмеження строку дії\n"
  
- #: g10/keygen.c:2469
++#: g10/keygen.c:2491
  msgid "Signature does not expire at all\n"
  msgstr "Підпис не має обмеження строку дії\n"
  
- #: g10/keygen.c:2474
++#: g10/keygen.c:2496
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "Ключ діє до %s\n"
  
- #: g10/keygen.c:2475
++#: g10/keygen.c:2497
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "Підпис діє до %s\n"
  
- #: g10/keygen.c:2479
++#: g10/keygen.c:2501
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5059,11 -3937,9 +5021,11 @@@ msgstr "
  "У вашій системі неможливий показ дат після 2038 року.\n"
  "Але програма коректно оброблятиме ці дати до 2106 року.\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2514
  msgid "Is this correct? (y/N) "
  msgstr "Все правильно? (y/N або т/Н) "
  
- #: g10/keygen.c:2560
++#: g10/keygen.c:2582
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5078,7 -3954,6 +5040,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2575
++#: g10/keygen.c:2597
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -5095,49 -3970,38 +5057,49 @@@ msgstr "
  "    \"Ivan Ivanenko (farmer) <iivanenko at moyahata.ua>\"\n"
  "\n"
  
- #: g10/keygen.c:2594
++#: g10/keygen.c:2616
  msgid "Real name: "
  msgstr "Справжнє ім’я: "
  
- #: g10/keygen.c:2603
++#: g10/keygen.c:2625
  msgid "Invalid character in name\n"
  msgstr "Некоректний символ у імені\n"
  
- #: g10/keygen.c:2604
++#: g10/keygen.c:2626
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr "Не можна використовувати символи «%s» і «%s» у назві\n"
  
- #: g10/keygen.c:2608
++#: g10/keygen.c:2630
  msgid "Name may not start with a digit\n"
  msgstr "Ім’я не може починатися з цифри\n"
  
- #: g10/keygen.c:2611
++#: g10/keygen.c:2633
  msgid "Name must be at least 5 characters long\n"
  msgstr "Ім’я має бути не коротшим за 5 літер\n"
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2643
  msgid "Email address: "
  msgstr "Адреса ел. пошти: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2649
  msgid "Not a valid email address\n"
  msgstr "Некоректна адреса електронної пошти\n"
  
- #: g10/keygen.c:2636
++#: g10/keygen.c:2658
  msgid "Comment: "
  msgstr "Коментар: "
  
- #: g10/keygen.c:2642
++#: g10/keygen.c:2664
  msgid "Invalid character in comment\n"
  msgstr "Некоректний символ у коментарі\n"
  
- #: g10/keygen.c:2678
++#: g10/keygen.c:2700
  #, c-format
  msgid "You are using the '%s' character set.\n"
  msgstr "Вами використано таблицю символів «%s».\n"
  
- #: g10/keygen.c:2684
++#: g10/keygen.c:2706
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5148,7 -4012,6 +5110,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2689
++#: g10/keygen.c:2711
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr ""
  "Будь ласка, не використовуйте адресу електронної пошти у полях справжнього "
@@@ -5165,32 -4028,25 +5127,32 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2714
++#: g10/keygen.c:2736
  msgid "NnCcEeOoQq"
  msgstr "NnCcEeOoQq"
  
- #: g10/keygen.c:2724
++#: g10/keygen.c:2746
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "Змінити назву (N), коментар (C), ел. пошту (E) або вийти (Q)? "
  
- #: g10/keygen.c:2725
++#: g10/keygen.c:2747
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr ""
  "Змінити назву (N), коментар (C), ел. пошту (E) або гаразд (O) чи вийти (Q)? "
  
- #: g10/keygen.c:2730
++#: g10/keygen.c:2752
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "Змінити назву (N), ел. пошту (E) або вийти (Q)? "
  
- #: g10/keygen.c:2731
++#: g10/keygen.c:2753
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "Змінити назву (N), ел. пошту (E) або гаразд (O) чи вийти (Q)? "
  
- #: g10/keygen.c:2750
++#: g10/keygen.c:2772
  msgid "Please correct the error first\n"
  msgstr "Спочатку виправте помилку\n"
  
- #: g10/keygen.c:2796
++#: g10/keygen.c:2818
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5202,13 -4058,10 +5164,13 @@@ msgstr "
  "під час створення простого числа. Це надасть змогу генератору\n"
  "псевдовипадкових чисел створити краще випадкове число.\n"
  
- #: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
- #: g10/keygen.c:4777 g10/keygen.c:4882
++#: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
++#: g10/keygen.c:4330 g10/keygen.c:4803 g10/keygen.c:5064 g10/keygen.c:5169
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Помилка під час спроби створення ключа: %s\n"
  
- #: g10/keygen.c:3598
++#: g10/keygen.c:3922
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5219,64 -4072,51 +5181,64 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3924
  msgid "Continue? (Y/n) "
  msgstr "Продовжити? (Y (так)/n (ні)) "
  
- #: g10/keygen.c:3621
++#: g10/keygen.c:3945
  #, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "Ключ для «%s» вже існує\n"
  
- #: g10/keygen.c:3626
++#: g10/keygen.c:3950
  msgid "Create anyway? (y/N) "
  msgstr "Створити попри це? (y (так)/N (ні)) "
  
- #: g10/keygen.c:3632
++#: g10/keygen.c:3956
  msgid "creating anyway\n"
  msgstr "створюємо попри усе\n"
  
- #: g10/keygen.c:3981
++#: g10/keygen.c:4315
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  "Зауваження: скористайтеся «%s %s», щоб викликати повноцінне діалогове вікно "
  "створення ключа.\n"
  
- #: g10/keygen.c:4013
++#: g10/keygen.c:4358
  msgid "Key generation canceled.\n"
  msgstr "Створення ключа скасовано.\n"
  
- #: g10/keygen.c:4073
++#: g10/keygen.c:4418
  #, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "не вдалося створити файл резервної копії «%s»: %s\n"
  
- #: g10/keygen.c:4093
++#: g10/keygen.c:4438
  #, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "ЗАУВАЖЕННЯ: резервну копію ключа на картці збережено до «%s»\n"
  
- #: g10/keygen.c:4244 g10/keygen.c:4393
++#: g10/keygen.c:4589 g10/keygen.c:4738
  #, c-format
  msgid "writing public key to '%s'\n"
  msgstr "записуємо відкритий ключ до «%s»\n"
  
- #: g10/keygen.c:4387
++#: g10/keygen.c:4732
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "не знайдено придатного до запису сховища відкритих ключів: %s\n"
  
- #: g10/keygen.c:4401
++#: g10/keygen.c:4746
  #, c-format
  msgid "error writing public keyring '%s': %s\n"
  msgstr "помилка під час спроби запису до сховища відкритих ключів «%s»: %s\n"
  
- #: g10/keygen.c:4433
++#: g10/keygen.c:4778
  msgid "public and secret key created and signed.\n"
  msgstr "відкритий і закритий ключі створено і підписано.\n"
  
- #: g10/keygen.c:4445
++#: g10/keygen.c:4790
  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"
@@@ -5284,7 -4124,6 +5246,7 @@@ msgstr "
  "Зауважте, що цей ключ не може бути використано для шифрування. Ви можете\n"
  "скористатися командою «--edit-key» для створення підключа з цією метою.\n"
  
- #: g10/keygen.c:4649 g10/keygen.c:4833
++#: g10/keygen.c:4936 g10/keygen.c:5120
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5292,7 -4131,6 +5254,7 @@@ msgstr "
  "ключ було створено з позначкою на %lu секунд у майбутньому (часова петля або "
  "проблема з годинником)\n"
  
- #: g10/keygen.c:4651 g10/keygen.c:4835
++#: g10/keygen.c:4938 g10/keygen.c:5122
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5300,19 -4138,15 +5262,19 @@@ msgstr "
  "ключ було створено з позначкою на %lu секунду у майбутньому (часова петля "
  "або проблема з годинником)\n"
  
- #: g10/keygen.c:4662 g10/keygen.c:4846
++#: g10/keygen.c:4949 g10/keygen.c:5133
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgstr "ЗАУВАЖЕННЯ: створення підключів для ключів v3 несумісне з OpenPGP\n"
  
- #: g10/keygen.c:4674 g10/keygen.c:4676
++#: g10/keygen.c:4961 g10/keygen.c:4963
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Закриті частини основного ключа недоступні.\n"
  
- #: g10/keygen.c:4683 g10/keygen.c:4685
++#: g10/keygen.c:4970 g10/keygen.c:4972
  msgid "Secret parts of primary key are stored on-card.\n"
  msgstr "Закриті частини основного ключа зберігаються на картці.\n"
  
- #: g10/keygen.c:4704 g10/keygen.c:4860
++#: g10/keygen.c:4991 g10/keygen.c:5147
  msgid "Really create? (y/N) "
  msgstr "Створити? (y/N або т/Н) "
  
@@@ -5640,123 -4409,97 +5602,123 @@@ msgid "standalone revocation - use \"gp
  msgstr ""
  "окреме відкликання — скористайтеся командою «gpg --import» для застосування\n"
  
- #: g10/mainproc.c:1233 g10/mainproc.c:1276
++#: g10/mainproc.c:1238 g10/mainproc.c:1281
  msgid "no signature found\n"
  msgstr "підпису не знайдено\n"
  
- #: g10/mainproc.c:1607
++#: g10/mainproc.c:1612
  #, c-format
  msgid "BAD signature from \"%s\""
  msgstr "ПОМИЛКОВИЙ підпис від «%s»"
  
- #: g10/mainproc.c:1609
++#: g10/mainproc.c:1614
  #, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Прострочений підпис від «%s»"
  
- #: g10/mainproc.c:1611
++#: g10/mainproc.c:1616
  #, c-format
  msgid "Good signature from \"%s\""
  msgstr "Належний підпис від «%s»"
  
- #: g10/mainproc.c:1630
++#: g10/mainproc.c:1635
  msgid "signature verification suppressed\n"
  msgstr "перевірку підписів придушено\n"
  
- #: g10/mainproc.c:1739
++#: g10/mainproc.c:1744
  msgid "can't handle this ambiguous signature data\n"
  msgstr "не вдалося обробити ці дані з неоднозначним підписом\n"
  
- #: g10/mainproc.c:1753 g10/mainproc.c:1761
++#: g10/mainproc.c:1758 g10/mainproc.c:1766
  #, c-format
  msgid "Signature made %s\n"
  msgstr "Підпис створено %s\n"
  
- #: g10/mainproc.c:1754 g10/mainproc.c:1762
++#: g10/mainproc.c:1759 g10/mainproc.c:1767
  #, c-format
  msgid "               using %s key %s\n"
  msgstr "               за допомогою %s ключа %s\n"
  
- #: g10/mainproc.c:1766
++#: g10/mainproc.c:1771
  #, c-format
  msgid "Signature made %s using %s key ID %s\n"
  msgstr "Підпис створено %s ключем %s з ідентифікатором %s\n"
  
- #: g10/mainproc.c:1772
++#: g10/mainproc.c:1777
  #, fuzzy, c-format
  #| msgid "                aka \"%s\""
  msgid "               issuer \"%s\"\n"
  msgstr "                або «%s»"
  
- #: g10/mainproc.c:1789
++#: g10/mainproc.c:1794
  msgid "Key available at: "
  msgstr "Ключ доступний на: "
  
- #: g10/mainproc.c:2024
++#: g10/mainproc.c:2029
  msgid "[uncertain]"
  msgstr "[непевний]"
  
- #: g10/mainproc.c:2062
++#: g10/mainproc.c:2067
  #, c-format
  msgid "                aka \"%s\""
  msgstr "                або «%s»"
  
- #: g10/mainproc.c:2145
++#: g10/mainproc.c:2150
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "Строк дії підпису вичерпано %s\n"
  
- #: g10/mainproc.c:2149
++#: g10/mainproc.c:2154
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "Підпис діє до %s\n"
  
- #: g10/mainproc.c:2160
++#: g10/mainproc.c:2165
  #, c-format
  msgid "%s signature, digest algorithm %s%s%s\n"
  msgstr "%s підпис, алгоритм контрольної суми %s%s%s\n"
  
- #: g10/mainproc.c:2161
++#: g10/mainproc.c:2166
  msgid "binary"
  msgstr "двійковий"
  
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2167
  msgid "textmode"
  msgstr "текстовий"
  
- #: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "невідомо"
  
- #: g10/mainproc.c:2164
++#: g10/mainproc.c:2169
  msgid ", key algorithm "
  msgstr ", алгоритм ключа "
  
- #: g10/mainproc.c:2199
++#: g10/mainproc.c:2204
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr "УВАГА: не відє’днаний підпис; файл «%s» не було перевірено!\n"
  
- #: g10/mainproc.c:2229
++#: g10/mainproc.c:2234
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "Не вдалося перевірити підпис: %s\n"
  
- #: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
++#: g10/mainproc.c:2327 g10/mainproc.c:2346 g10/mainproc.c:2470
  msgid "not a detached signature\n"
  msgstr "не є від’єднаним підписом\n"
  
- #: g10/mainproc.c:2375
++#: g10/mainproc.c:2380
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
  msgstr "УВАГА: виявлено кратні підписи. Буде перевірено лише перший.\n"
  
- #: g10/mainproc.c:2384
++#: g10/mainproc.c:2389
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "окремий підпис класу 0x%02x\n"
  
- #: g10/mainproc.c:2469
++#: g10/mainproc.c:2474
  msgid "old style (PGP 2.x) signature\n"
  msgstr "підпис у застарілому форматі (PGP 2.x)\n"
  
@@@ -6040,23 -4729,18 +6002,23 @@@ msgstr "Це потрібна вам ф
  msgid "unable to display photo ID!\n"
  msgstr "показ фотоідентифікатора неможливий!\n"
  
- #: g10/pkclist.c:72 g10/revoke.c:757
++#: g10/pkclist.c:72 g10/revoke.c:758
  msgid "No reason specified"
  msgstr "Причину не вказано"
  
- #: g10/pkclist.c:74 g10/revoke.c:759
++#: g10/pkclist.c:74 g10/revoke.c:760
  msgid "Key is superseded"
  msgstr "Ключ замінено"
  
- #: g10/pkclist.c:76 g10/revoke.c:758
++#: g10/pkclist.c:76 g10/revoke.c:759
  msgid "Key has been compromised"
  msgstr "Ключ скомпрометовано"
  
- #: g10/pkclist.c:78 g10/revoke.c:760
++#: g10/pkclist.c:78 g10/revoke.c:761
  msgid "Key is no longer used"
  msgstr "Ключ більше не використовується"
  
- #: g10/pkclist.c:80 g10/revoke.c:761
++#: g10/pkclist.c:80 g10/revoke.c:762
  msgid "User ID is no longer valid"
  msgstr "Ідентифікатор користувача втратив чинність"
  
@@@ -6134,7 -4805,6 +6096,7 @@@ msgstr "
  "Мінімальним рівнем довіри до цього ключа є %s\n"
  "\n"
  
- #: g10/pkclist.c:310 g10/revoke.c:786
++#: g10/pkclist.c:310 g10/revoke.c:787
  msgid "Your decision? "
  msgstr "Ваше рішення? "
  
@@@ -6333,33 -4965,26 +6295,33 @@@ msgstr "
  msgid "No such user ID.\n"
  msgstr "Немає такого ідентифікатора користувача.\n"
  
- #: g10/pkclist.c:1197 g10/pkclist.c:1273
++#: g10/pkclist.c:1197 g10/pkclist.c:1274
  msgid "skipped: public key already set as default recipient\n"
  msgstr "пропущено: відкритий ключ вже встановлено для типового отримувача\n"
  
- #: g10/pkclist.c:1218
++#: g10/pkclist.c:1219
  msgid "Public key is disabled.\n"
  msgstr "Відкритий ключ вимкнено.\n"
  
- #: g10/pkclist.c:1228
++#: g10/pkclist.c:1229
  msgid "skipped: public key already set\n"
  msgstr "пропущено: відкритий ключ вже встановлено\n"
  
- #: g10/pkclist.c:1263
++#: g10/pkclist.c:1264
  #, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "невідомий типовий отримувач «%s»\n"
  
- #: g10/pkclist.c:1312
++#: g10/pkclist.c:1313
  msgid "no valid addressees\n"
  msgstr "немає коректних адрес\n"
  
- #: g10/pkclist.c:1665
++#: g10/pkclist.c:1666
  #, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "Зауваження: у ключі %s не передбачено можливості %s\n"
  
- #: g10/pkclist.c:1690
++#: g10/pkclist.c:1691
  #, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "Зауваження: у ключі %s не передбачено переваг для %s\n"
@@@ -6370,28 -4994,22 +6332,28 @@@ msgstr "
  "дані не збережено; скористайтеся для їхнього збереження параметром «--"
  "output»\n"
  
- #: g10/plaintext.c:598
++#: g10/plaintext.c:614
  msgid "Detached signature.\n"
  msgstr "Від’єднаний підпис.\n"
  
- #: g10/plaintext.c:606
++#: g10/plaintext.c:622
  msgid "Please enter name of data file: "
  msgstr "Будь ласка, вкажіть назву файла даних: "
  
- #: g10/plaintext.c:643
++#: g10/plaintext.c:659
  msgid "reading stdin ...\n"
  msgstr "читаємо дані з stdin...\n"
  
- #: g10/plaintext.c:688
++#: g10/plaintext.c:704
  msgid "no signed data\n"
  msgstr "немає підписаних даних\n"
  
- #: g10/plaintext.c:706
++#: g10/plaintext.c:722
  #, c-format
  msgid "can't open signed data '%s'\n"
  msgstr "не вдалося відкрити підписані дані «%s»\n"
  
- #: g10/plaintext.c:741
++#: g10/plaintext.c:757
  #, c-format
  msgid "can't open signed data fd=%d: %s\n"
  msgstr "не вдалося відкрити підписані дані fd=%d: %s\n"
@@@ -6456,7 -5060,6 +6418,7 @@@ msgid "Create a designated revocation c
  msgstr ""
  "Створити підписаний сертифікат відкликання для цього ключа? (y/N або т/Н) "
  
- #: g10/revoke.c:336 g10/revoke.c:727
++#: g10/revoke.c:336 g10/revoke.c:728
  msgid "ASCII armored output forced.\n"
  msgstr "Призначено виведення у форматі ASCII.\n"
  
@@@ -6502,9 -5099,8 +6464,9 @@@ msgstr "
  "закритого ключа не втрачено, краще створити новий сертифікат\n"
  "відкликання і вказати причину відкликання. Докладніший опис\n"
  "можна знайти у розділах підручника з GnuPG щодо команди\n"
- "gpg «--gen-revoke»."
+ "gpg «--generate-revocation»."
  
- #: g10/revoke.c:575
++#: g10/revoke.c:576
  msgid ""
  "To avoid an accidental use of this file, a colon has been inserted\n"
  "before the 5 dashes below.  Remove this colon with a text editor\n"
@@@ -6515,12 -5111,10 +6477,12 @@@ msgstr "
  "редакторі, перш ніж імпортувати або оприлюднювати цей сертифікат\n"
  "відкликання."
  
- #: g10/revoke.c:590
++#: g10/revoke.c:591
  #, c-format
  msgid "revocation certificate stored as '%s.rev'\n"
  msgstr "сертифікат відкликання збережено як «%s.rev»\n"
  
- #: g10/revoke.c:634
++#: g10/revoke.c:635
  #, c-format
  msgid "secret key \"%s\" not found\n"
  msgstr "закритий ключ «%s» не знайдено\n"
@@@ -6528,21 -5122,17 +6490,21 @@@
  #. TRANSLATORS: The %s prints a key specification which
  #. for example has been given at the command line.  Several lines
  #. lines with secret key infos are printed after this message.
- #: g10/revoke.c:661
++#: g10/revoke.c:662
  #, c-format
  msgid "'%s' matches multiple secret keys:\n"
  msgstr "«%s» відповідає декільком закритим ключам:\n"
  
- #: g10/revoke.c:688
++#: g10/revoke.c:689
  #, c-format
  msgid "error searching the keyring: %s\n"
  msgstr "помилка під час спроби пошуку у сховищі ключів: %s\n"
  
- #: g10/revoke.c:711
++#: g10/revoke.c:712
  msgid "Create a revocation certificate for this key? (y/N) "
  msgstr "Створити сертифікат відкликання для цього ключа? (y/N або т/Н) "
  
- #: g10/revoke.c:735
++#: g10/revoke.c:736
  msgid ""
  "Revocation certificate created.\n"
  "\n"
@@@ -6562,33 -5152,26 +6524,33 @@@ msgstr "
  "може зберігати дані друку, доступ до яких зможуть отримати\n"
  "сторонні люди!\n"
  
- #: g10/revoke.c:769
++#: g10/revoke.c:770
  msgid "Please select the reason for the revocation:\n"
  msgstr "Будь ласка, вкажіть причину відкликання:\n"
  
- #: g10/revoke.c:779
++#: g10/revoke.c:780
  msgid "Cancel"
  msgstr "Скасувати"
  
- #: g10/revoke.c:781
++#: g10/revoke.c:782
  #, c-format
  msgid "(Probably you want to select %d here)\n"
  msgstr "(Ймовірно, вам варто тут вибрати %d)\n"
  
- #: g10/revoke.c:822
++#: g10/revoke.c:823
  msgid "Enter an optional description; end it with an empty line:\n"
  msgstr "Вкажіть необов’язковий опис; завершіть його порожнім рядком:\n"
  
- #: g10/revoke.c:850
++#: g10/revoke.c:851
  #, c-format
  msgid "Reason for revocation: %s\n"
  msgstr "Причина відкликання: %s\n"
  
- #: g10/revoke.c:852
++#: g10/revoke.c:853
  msgid "(No description given)\n"
  msgstr "(Опису не надано)\n"
  
- #: g10/revoke.c:857
++#: g10/revoke.c:858
  msgid "Is this okay? (y/N) "
  msgstr "Все правильно? (y/N або т/Н) "
  
@@@ -6732,12 -5295,10 +6694,12 @@@ msgstr "
  "УВАГА: не вдалося виконати %%-розгортання адреси основного сервера ключів "
  "(занадто велика). Використовуємо нерозгорнутою.\n"
  
- #: g10/sign.c:329
++#: g10/sign.c:331
  #, c-format
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s/%s підпис від: \"%s\"\n"
  
- #: g10/sign.c:878
++#: g10/sign.c:880
  #, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6745,11 -5306,9 +6707,11 @@@ msgstr "
  "УВАГА: примусове використання алгоритму контрольних сум %s (%d) не "
  "відповідає параметрам отримувача\n"
  
- #: g10/sign.c:1009
++#: g10/sign.c:1011
  msgid "signing:"
  msgstr "підписування:"
  
- #: g10/sign.c:1286
++#: g10/sign.c:1288
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "Буде використано шифрування %s\n"
@@@ -6775,7 -5330,6 +6737,7 @@@ msgstr "
  "це ключ Elgamal створений за допомогою PGP, цей ключ недостатньо безпечний "
  "для підписування!"
  
- #: g10/tdbdump.c:57 g10/trustdb.c:362
++#: g10/tdbdump.c:57 g10/trustdb.c:369
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "запис щодо довіри %lu, тип %d: помилка записування: %s\n"
@@@ -6820,7 -5366,6 +6782,7 @@@ msgstr "не вдалося знайт�
  msgid "read error in '%s': %s\n"
  msgstr "помилка читання у «%s»: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "trustdb: помилка синхронізації: %s\n"
@@@ -6964,55 -5480,60 +6926,77 @@@ msgstr "
  msgid "input line longer than %d characters\n"
  msgstr "рядок вхідних даних довший за %d символів\n"
  
- #: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
++#: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
  #, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr ""
  "помилка під час спроби розпочати внесення змін до бази даних TOFU: %s\n"
  
- #: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
++#: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr "помилка під час внесення змін до бази даних TOFU: %s\n"
  
- #: g10/tofu.c:357 g10/tofu.c:699
++#: g10/tofu.c:355 g10/tofu.c:888
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr "помилка під час скасовування змін у базі даних TOFU: %s\n"
  
- #: g10/tofu.c:501
++#: g10/tofu.c:505
  #, c-format
  msgid "unsupported TOFU database version: %s\n"
  msgstr "непідтримувана версія бази даних TOFU: %s\n"
  
- #: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
- #: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
- #: g10/tofu.c:3056
++#: g10/tofu.c:538
+ #, fuzzy, c-format
+ #| msgid "error creating temporary file: %s\n"
+ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
+ msgstr "помилка створення тимчасового файла: %s\n"
+ 
++#: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
+ msgid "TOFU DB error"
+ msgstr ""
+ 
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2340 g10/tofu.c:2359
++#: g10/tofu.c:2372 g10/tofu.c:2384 g10/tofu.c:2399 g10/tofu.c:2411
++#: g10/tofu.c:2980 g10/tofu.c:2997 g10/tofu.c:3033 g10/tofu.c:3050
++#: g10/tofu.c:3353
  #, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "помилка під час спроби читання бази даних TOFU: %s\n"
  
- #: g10/tofu.c:566 g10/tofu.c:574
++#: g10/tofu.c:716 g10/tofu.c:724
  #, c-format
  msgid "error determining TOFU database's version: %s\n"
  msgstr "помилка під час спроби визначення версії бази даних TOFU: %s\n"
  
- #: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
++#: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
  #, c-format
  msgid "error initializing TOFU database: %s\n"
  msgstr "помилка під час спроби ініціалізації бази даних TOFU: %s\n"
  
- #: g10/tofu.c:765
++#: g10/tofu.c:844
+ #, fuzzy, c-format
+ #| msgid "error reading TOFU database: %s\n"
+ msgid "error creating 'encryptions' TOFU table: %s\n"
+ msgstr "помилка під час спроби читання бази даних TOFU: %s\n"
+ 
++#: g10/tofu.c:874
+ #, c-format
+ msgid "adding column effective_policy to bindings DB: %s\n"
+ msgstr ""
+ 
++#: g10/tofu.c:956
  #, c-format
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "помилка під час спроби відкрити бази даних TOFU «%s»: %s\n"
  
- #: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
++#: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
  #, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "помилка під час спроби оновлення бази даних TOFU: %s\n"
  
- #: g10/tofu.c:1239
++#: g10/tofu.c:1328
  #, fuzzy, c-format
  #| msgid "The email address \"%s\" is associated with %d key:\n"
  #| msgid_plural "The email address \"%s\" is associated with %d keys:\n"
@@@ -7020,14 -5541,15 +7004,17 @@@ msgid "
  "This is the first time the email address \"%s\" is being used with key %s."
  msgstr "Адресу електронної пошти «%s» пов’язано із %d ключем:\n"
  
- #: g10/tofu.c:1247
++#: g10/tofu.c:1337
  #, fuzzy, c-format
  #| msgid "The email address \"%s\" is associated with %d key:\n"
  #| msgid_plural "The email address \"%s\" is associated with %d keys:\n"
- msgid "The email address \"%s\" is associated with %d keys!"
- msgstr "Адресу електронної пошти «%s» пов’язано із %d ключем:\n"
+ msgid "The email address \"%s\" is associated with %d key!"
+ msgid_plural "The email address \"%s\" is associated with %d keys!"
+ msgstr[0] "Адресу електронної пошти «%s» пов’язано із %d ключем:\n"
+ msgstr[1] "Адресу електронної пошти «%s» пов’язано із %d ключем:\n"
+ msgstr[2] "Адресу електронної пошти «%s» пов’язано із %d ключем:\n"
  
- #: g10/tofu.c:1251
++#: g10/tofu.c:1343
  #, fuzzy
  #| msgid ""
  #| "The key with fingerprint %s raised a conflict with the binding %s.  Since "
@@@ -7037,36 -5559,30 +7024,36 @@@ msgstr "
  "Ключ із відбитком %s конфліктує із прив’язкою %s. Оскільки правилами цієї "
  "прив’язки визначалося «автоматично», їх змінено на «запитувати»."
  
- #: g10/tofu.c:1257
++#: g10/tofu.c:1349
  #, c-format
  msgid ""
  "Please indicate whether this email address should be associated with key %s "
  "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1513
++#: g10/tofu.c:1605
  #, c-format
  msgid "error gathering other user IDs: %s\n"
  msgstr "помилка під час збирання інших ідентифікаторів користувачів: %s\n"
  
- #: g10/tofu.c:1523
++#: g10/tofu.c:1615
  #, fuzzy
  #| msgid "list key and user IDs"
  msgid "This key's user IDs:\n"
  msgstr "показати список ключів та ідентифікаторів користувача"
  
- #: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
++#: g10/tofu.c:1631 g10/tofu.c:1796
  #, c-format
  msgid "policy: %s"
  msgstr "правило: %s"
  
- #: g10/tofu.c:1630
++#: g10/tofu.c:1722
  #, c-format
  msgid "error gathering signature stats: %s\n"
  msgstr ""
  "помилка під час спроби зібрати статистичні дані щодо підписування: %s\n"
  
- #: g10/tofu.c:1634
++#: g10/tofu.c:1726
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
@@@ -7074,37 -5590,50 +7061,58 @@@ msgstr[0] "Адресу електро�
  msgstr[1] "Адресу електронної пошти «%s» пов’язано із %d ключами:\n"
  msgstr[2] "Адресу електронної пошти «%s» пов’язано із %d ключами:\n"
  
- #: g10/tofu.c:1651
++#: g10/tofu.c:1744
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr "Статистичні дані для ключів із адресою електронної пошти «%s»:\n"
  
- #: g10/tofu.c:1684 g10/tofu.c:1689
++#: g10/tofu.c:1785 g10/tofu.c:1790
  msgid ", "
  msgstr ""
  
- #: g10/tofu.c:1693
++#: g10/tofu.c:1794
  msgid "this key"
  msgstr "цей ключ"
  
- #: g10/tofu.c:1715
++#: g10/tofu.c:1820
  #, fuzzy, c-format
  #| msgid "Verified %ld messages signed by \"%s\"."
- msgid "Verified %d message"
- msgid_plural "Verified %d messages"
+ msgid "Verified %d message."
+ msgid_plural "Verified %d messages."
  msgstr[0] "Перевірено %ld повідомлень, підписаних «%s»."
  msgstr[1] "Перевірено %ld повідомлень, підписаних «%s»."
  msgstr[2] "Перевірено %ld повідомлень, підписаних «%s»."
  
- #: g10/tofu.c:1719
- #, c-format
- msgid "Encrypted %d message"
- msgid_plural "Encrypted %d messages"
- msgstr[0] ""
- msgstr[1] ""
- msgstr[2] ""
++#: g10/tofu.c:1824
+ #, fuzzy, c-format
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid "Encrypted %d message."
+ msgid_plural "Encrypted %d messages."
+ msgstr[0] "зашифровано за допомогою %lu паролів\n"
+ msgstr[1] "зашифровано за допомогою %lu паролів\n"
+ msgstr[2] "зашифровано за допомогою %lu паролів\n"
  
- #: g10/tofu.c:1734
++#: g10/tofu.c:1831
+ #, fuzzy, c-format
+ #| msgid "%ld message signed in the future."
+ #| msgid_plural "%ld messages signed in the future."
+ msgid "Verified %d message in the future."
+ msgid_plural "Verified %d messages in the future."
+ msgstr[0] "%ld повідомлення підписано у майбутньому."
+ msgstr[1] "%ld повідомлення підписано у майбутньому."
+ msgstr[2] "%ld повідомлень підписано у майбутньому."
+ 
++#: g10/tofu.c:1835
+ #, fuzzy, c-format
+ #| msgid "%ld message signed in the future."
+ #| msgid_plural "%ld messages signed in the future."
+ msgid "Encrypted %d message in the future."
+ msgid_plural "Encrypted %d messages in the future."
+ msgstr[0] "%ld повідомлення підписано у майбутньому."
+ msgstr[1] "%ld повідомлення підписано у майбутньому."
+ msgstr[2] "%ld повідомлень підписано у майбутньому."
+ 
++#: g10/tofu.c:1849
  #, fuzzy, c-format
  #| msgid " over the past %ld day."
  #| msgid_plural " over the past %ld days."
@@@ -7114,7 -5643,24 +7122,27 @@@ msgstr[0] " протягом %ld поп
  msgstr[1] " протягом %ld попередніх днів."
  msgstr[2] " протягом %ld попередніх днів."
  
- #: g10/tofu.c:1740
++#: g10/tofu.c:1855
+ #, fuzzy, c-format
+ #| msgid " over the past %ld day."
+ #| msgid_plural " over the past %ld days."
+ msgid "Messages encrypted over the past %d day: %d."
+ msgid_plural "Messages encrypted over the past %d days: %d."
+ msgstr[0] " протягом %ld попереднього дня."
+ msgstr[1] " протягом %ld попередніх днів."
+ msgstr[2] " протягом %ld попередніх днів."
+ 
++#: g10/tofu.c:1865
+ #, fuzzy, c-format
+ #| msgid " over the past %ld month."
+ #| msgid_plural " over the past %ld months."
+ msgid "Messages verified over the past %d month: %d."
+ msgid_plural "Messages verified over the past %d months: %d."
+ msgstr[0] " протягом %ld попереднього місяця."
+ msgstr[1] " протягом %ld попередніх місяців."
+ msgstr[2] " протягом %ld попередніх місяців."
+ 
++#: g10/tofu.c:1871
  #, fuzzy, c-format
  #| msgid " over the past %ld month."
  #| msgid_plural " over the past %ld months."
@@@ -7124,7 -5670,6 +7152,7 @@@ msgstr[0] " протягом %ld поп
  msgstr[1] " протягом %ld попередніх місяців."
  msgstr[2] " протягом %ld попередніх місяців."
  
- #: g10/tofu.c:1746
++#: g10/tofu.c:1881
  #, fuzzy, c-format
  #| msgid " over the past %ld day."
  #| msgid_plural " over the past %ld days."
@@@ -7134,17 -5679,36 +7162,40 @@@ msgstr[0] " протягом %ld поп
  msgstr[1] " протягом %ld попередніх днів."
  msgstr[2] " протягом %ld попередніх днів."
  
- #: g10/tofu.c:1752
- #, fuzzy
++#: g10/tofu.c:1887
+ #, fuzzy, c-format
  #| msgid " over the past %ld day."
  #| msgid_plural " over the past %ld days."
- msgid " in the past."
+ msgid "Messages encrypted over the past %d year: %d."
+ msgid_plural "Messages encrypted over the past %d years: %d."
+ msgstr[0] " протягом %ld попереднього дня."
+ msgstr[1] " протягом %ld попередніх днів."
+ msgstr[2] " протягом %ld попередніх днів."
+ 
++#: g10/tofu.c:1895
+ #, fuzzy, c-format
+ #| msgid " over the past %ld day."
+ #| msgid_plural " over the past %ld days."
+ msgid "Messages verified in the past: %d."
  msgstr " протягом %ld попереднього дня."
  
++#: g10/tofu.c:1899
+ #, fuzzy, c-format
+ #| msgid ""
+ #| "Verified %ld message signed by \"%s\"\n"
+ #| "in the past %s."
+ #| msgid_plural ""
+ #| "Verified %ld messages signed by \"%s\"\n"
+ #| "in the past %s."
+ msgid "Messages encrypted in the past: %d."
+ msgstr ""
+ "Перевірено %ld повідомлення, підписане «%s»,\n"
+ "протягом такого строку: %s."
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1767
++#: g10/tofu.c:1916
  msgid "TOFU detected a binding conflict"
  msgstr ""
  "Зазвичай, з певною адресою електронної пошти пов’язано лише один ключ. Втім, "
@@@ -7157,104 -5721,105 +7208,122 @@@
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1809
++#: g10/tofu.c:1958
  msgid "gGaAuUrRbB"
  msgstr "gGaAuUrRbB"
  
- #: g10/tofu.c:1815
++#: g10/tofu.c:1964
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  "(G)Добрий, (A)Прийняти одноразово, (U)Невідомий, (R)Відкинути одноразово, "
  "(B)Поганий? "
  
- #: g10/tofu.c:1823
++#: g10/tofu.c:1972
  msgid "Defaulting to unknown."
  msgstr ""
  
- #: g10/tofu.c:1938 g10/tofu.c:2074
++#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
- #: g10/tofu.c:1994
++#: g10/tofu.c:2143
  #, fuzzy, c-format
  #| msgid "error writing key: %s\n"
  msgid "resetting keydb: %s\n"
  msgstr "помилка під час спроби запису ключа: %s\n"
  
- #: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
- #: g10/tofu.c:2425
- #, c-format
- msgid "error setting TOFU binding's trust level to %s\n"
++#: g10/tofu.c:2601
+ #, fuzzy, c-format
+ #| msgid "error setting TOFU binding's trust level to %s\n"
+ msgid "error setting TOFU binding's policy to %s\n"
  msgstr ""
  "помилка під час спроби встановлення рівня довіри до прив’язки TOFU до %s\n"
  
- #: g10/tofu.c:2473
++#: g10/tofu.c:2794
  #, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "помилка під час спроби змінити правила TOFU: %s\n"
  
- #. TRANSLATORS: The tilde ('~') is used here to indicate a
- #. * non-breakable space
- #: g10/tofu.c:2574
- #, c-format
- msgid "%d~year"
- msgid_plural "%d~years"
++#: g10/tofu.c:2839
+ #, fuzzy, c-format
+ #| msgid "%d~year"
+ #| msgid_plural "%d~years"
+ msgid "%lld~year"
+ msgid_plural "%lld~years"
  msgstr[0] "%d~рік"
  msgstr[1] "%d~роки"
  msgstr[2] "%d~років"
  
- #: g10/tofu.c:2583
- #, c-format
- msgid "%d~month"
- msgid_plural "%d~months"
++#: g10/tofu.c:2844
+ #, fuzzy, c-format
+ #| msgid "%d~month"
+ #| msgid_plural "%d~months"
+ msgid "%lld~month"
+ msgid_plural "%lld~months"
  msgstr[0] "%d~місяць"
  msgstr[1] "%d~місяці"
  msgstr[2] "%d~місяців"
  
- #: g10/tofu.c:2592
++#: g10/tofu.c:2849
  #, c-format
- msgid "%d~day"
- msgid_plural "%d~days"
+ msgid "%lld~week"
+ msgid_plural "%lld~weeks"
+ msgstr[0] ""
+ msgstr[1] ""
+ msgstr[2] ""
+ 
++#: g10/tofu.c:2854
+ #, fuzzy, c-format
+ #| msgid "%d~day"
+ #| msgid_plural "%d~days"
+ msgid "%lld~day"
+ msgid_plural "%lld~days"
  msgstr[0] "%d~день"
  msgstr[1] "%d~дні"
  msgstr[2] "%d~днів"
  
- #: g10/tofu.c:2601
- #, c-format
- msgid "%d~hour"
- msgid_plural "%d~hours"
++#: g10/tofu.c:2859
+ #, fuzzy, c-format
+ #| msgid "%d~hour"
+ #| msgid_plural "%d~hours"
+ msgid "%lld~hour"
+ msgid_plural "%lld~hours"
  msgstr[0] "%d~година"
  msgstr[1] "%d~години"
  msgstr[2] "%d~годин"
  
- #: g10/tofu.c:2610
- #, c-format
- msgid "%d~minute"
- msgid_plural "%d~minutes"
++#: g10/tofu.c:2864
+ #, fuzzy, c-format
+ #| msgid "%d~minute"
+ #| msgid_plural "%d~minutes"
+ msgid "%lld~minute"
+ msgid_plural "%lld~minutes"
  msgstr[0] "%d~хвилина"
  msgstr[1] "%d~хвилини"
  msgstr[2] "%d~хвилин"
  
- #: g10/tofu.c:2619
- #, c-format
- msgid "%d~second"
- msgid_plural "%d~seconds"
++#: g10/tofu.c:2866
+ #, fuzzy, c-format
+ #| msgid "%d~second"
+ #| msgid_plural "%d~seconds"
+ msgid "%lld~second"
+ msgid_plural "%lld~seconds"
  msgstr[0] "%d~секунда"
  msgstr[1] "%d~секунди"
  msgstr[2] "%d~секунд"
  
- #: g10/tofu.c:2802
++#: g10/tofu.c:3103
  #, c-format
- msgid "%s: "
+ msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:2806
++#: g10/tofu.c:3109
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
- msgid "Verified %ld signatures"
+ msgid "%s: Verified 0 signatures."
  msgstr "Вилучено %d підписів.\n"
  
- #: g10/tofu.c:2816
++#: g10/tofu.c:3117
  #, fuzzy, c-format
  #| msgid ""
  #| "Verified %ld message signed by \"%s\"\n"
@@@ -7274,13 -5839,11 +7343,13 @@@ msgstr[2] "
  "Перевірено %ld повідомлень, підписаних «%s»,\n"
  "протягом такого строку: %s."
  
- #: g10/tofu.c:2826
- #, fuzzy, c-format
++#: g10/tofu.c:3127
+ #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
- msgid ", and encrypted %ld messages"
+ msgid "Encrypted 0 messages."
  msgstr "зашифровано за допомогою %lu паролів\n"
  
- #: g10/tofu.c:2835
++#: g10/tofu.c:3135
  #, fuzzy, c-format
  #| msgid ""
  #| "Verified %ld message signed by \"%s\"\n"
@@@ -7300,33 -5863,33 +7369,39 @@@ msgstr[2] "
  "Перевірено %ld повідомлень, підписаних «%s»,\n"
  "протягом такого строку: %s."
  
- #: g10/tofu.c:2880
++#: g10/tofu.c:3146
+ #, fuzzy, c-format
+ #| msgid "policy: %s"
+ msgid "(policy: %s)"
+ msgstr "правило: %s"
+ 
++#: g10/tofu.c:3177
  #, fuzzy
  #| msgid "Warning: we've have yet to see a message signed by this key!\n"
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr "Попередження: повідомлень, які було б підписано цим ключем, не було!\n"
  
- #: g10/tofu.c:2883
++#: g10/tofu.c:3180
  #, fuzzy
  #| msgid "Warning: we've only seen a single message signed by this key!\n"
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr "Попередження: цим ключем було підписано лише одне повідомлення!\n"
  
- #: g10/tofu.c:2887
++#: g10/tofu.c:3184
  #, fuzzy
  #| msgid "Warning: we've have yet to see a message signed by this key!\n"
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr "Попередження: повідомлень, які було б підписано цим ключем, не було!\n"
  
- #: g10/tofu.c:2890
++#: g10/tofu.c:3187
  #, fuzzy
  #| msgid "Warning: we've only seen a single message signed by this key!\n"
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr "Попередження: цим ключем було підписано лише одне повідомлення!\n"
  
- #: g10/tofu.c:2919
++#: g10/tofu.c:3216
  #, fuzzy, c-format
  #| msgid ""
  #| "Warning: if you think you've seen more than %ld message signed by this "
@@@ -7374,18 -5937,14 +7449,18 @@@ msgstr[2] "
  "  %s\n"
  "для позначення ключа як помилкового.\n"
  
- #: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
- #: g10/tofu.c:3480 g10/tofu.c:3572
++#: g10/tofu.c:3298 g10/tofu.c:3449 g10/tofu.c:3627 g10/tofu.c:3670
++#: g10/tofu.c:3784 g10/tofu.c:3859 g10/tofu.c:3894
  #, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "помилка під час спроби відкрити бази даних TOFU: %s\n"
  
- #: g10/tofu.c:3185
++#: g10/tofu.c:3482
  #, c-format
- msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
  msgstr ""
  
- #: g10/tofu.c:3515
++#: g10/tofu.c:3819
  #, fuzzy, c-format
  #| msgid "error writing public keyring '%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7416,70 -5970,56 +7491,70 @@@ msgstr "ключ %s: немає від�
  msgid "key %s marked as ultimately trusted\n"
  msgstr "ключ %s позначено як ключ з необмеженою довірою\n"
  
- #: g10/trustdb.c:341
++#: g10/trustdb.c:348
  #, c-format
  msgid "trust record %lu, req type %d: read failed: %s\n"
  msgstr "запис довіри %lu, тип запиту %d: помилка читання: %s\n"
  
- #: g10/trustdb.c:347
++#: g10/trustdb.c:354
  #, c-format
  msgid "trust record %lu is not of requested type %d\n"
  msgstr "запис довіри %lu не належить до вказаного типу %d\n"
  
- #: g10/trustdb.c:422
++#: g10/trustdb.c:429
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr "Ви можете спробувати повторно створити trustdb за допомогою команд:\n"
  
- #: g10/trustdb.c:431
++#: g10/trustdb.c:438
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  "Якщо результат буде незадовільним, будь ласка, зверніться до підручника\n"
  
- #: g10/trustdb.c:468
++#: g10/trustdb.c:475
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  "використання невідомої моделі довіри (%d) неможливе — припускаємо модель "
  "довіри %s\n"
  
- #: g10/trustdb.c:474
++#: g10/trustdb.c:481
  #, c-format
  msgid "using %s trust model\n"
  msgstr "використовуємо модель довіри %s\n"
  
- #: g10/trustdb.c:511
++#: g10/trustdb.c:518
  msgid "no need for a trustdb check\n"
  msgstr "потреби у перевірці trustdb немає\n"
  
- #: g10/trustdb.c:517 g10/trustdb.c:2160
++#: g10/trustdb.c:524 g10/trustdb.c:2187
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "наступну перевірку trustdb призначено на %s\n"
  
- #: g10/trustdb.c:526
++#: g10/trustdb.c:533
  #, c-format
  msgid "no need for a trustdb check with '%s' trust model\n"
  msgstr "потреби у перевірці trustdb на основі моделі довіри «%s» немає\n"
  
- #: g10/trustdb.c:542
++#: g10/trustdb.c:549
  #, c-format
  msgid "no need for a trustdb update with '%s' trust model\n"
  msgstr "потреби у оновленні trustdb на основі моделі довіри «%s» немає\n"
  
- #: g10/trustdb.c:749 g10/trustdb.c:1313
++#: g10/trustdb.c:756 g10/trustdb.c:1340
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "відкритий ключ %s не знайдено: %s\n"
  
- #: g10/trustdb.c:966
++#: g10/trustdb.c:973
  msgid "please do a --check-trustdb\n"
  msgstr "будь ласка, скористайтеся параметром --check-trustdb\n"
  
- #: g10/trustdb.c:971
++#: g10/trustdb.c:978
  msgid "checking the trustdb\n"
  msgstr "перевірка trustdb\n"
  
- #: g10/trustdb.c:1883
++#: g10/trustdb.c:1910
  #, c-format
  msgid "%d key processed"
  msgid_plural "%d keys processed"
@@@ -7487,7 -6027,6 +7562,7 @@@ msgstr[0] "оброблено %d клю
  msgstr[1] "оброблено %d ключі"
  msgstr[2] "оброблено %d ключів"
  
- #: g10/trustdb.c:1886
++#: g10/trustdb.c:1913
  #, c-format
  msgid " (%d validity count cleared)\n"
  msgid_plural " (%d validity counts cleared)\n"
@@@ -7495,16 -6034,13 +7570,16 @@@ msgstr[0] " (очищено %d знач
  msgstr[1] " (очищено %d значення чинності)\n"
  msgstr[2] " (очищено %d значень чинності)\n"
  
- #: g10/trustdb.c:1956
++#: g10/trustdb.c:1983
  msgid "no ultimately trusted keys found\n"
  msgstr "не знайдено ключів з необмеженою довірою\n"
  
- #: g10/trustdb.c:1970
++#: g10/trustdb.c:1997
  #, c-format
  msgid "public key of ultimately trusted key %s not found\n"
  msgstr "не знайдено відкритий ключ ключа з необмеженою довірою %s\n"
  
- #: g10/trustdb.c:2087
++#: g10/trustdb.c:2114
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7512,7 -6048,6 +7587,7 @@@ msgstr "
  "глибина: %d  чинність: %3d  підписано: %3d  надійність: %d-, %dq, %dn, %dm, "
  "%df, %du\n"
  
- #: g10/trustdb.c:2167
++#: g10/trustdb.c:2194
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr "не вдалося оновити запис версії trustdb: помилка запису: %s\n"
@@@ -7621,23 -6135,18 +7696,23 @@@ msgstr "
  "Синтаксис: kbxutil [параметри] [файли]\n"
  "Перегляд, експортування, імпортування даних Keybox\n"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3208
++#: scd/app-nks.c:718 scd/app-openpgp.c:3221
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr ""
  "Не знайдено основи числення RSA або основа числення не належить до %d-"
  "бітових\n"
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3220
++#: scd/app-nks.c:726 scd/app-openpgp.c:3233
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr ""
  "Не вистачає відкритого показника RSA або розмірність показника перевищує %d "
  "бітів\n"
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
- #: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
- #: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1965 scd/app-openpgp.c:1984
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2166 scd/app-openpgp.c:2430
++#: scd/app-openpgp.c:2477 scd/app-openpgp.c:2582 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "Зворотний виклик пінкоду повернув повідомлення про помилку: %s\n"
@@@ -7694,85 -6194,67 +7769,85 @@@ msgstr "
  "|P|Будь ласка, вкажіть код розблокування пінкоду (PUK) для створення якісних "
  "підписів."
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2511 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "помилка під час отримання нового пінкоду: %s\n"
  
- #: scd/app-openpgp.c:806
++#: scd/app-openpgp.c:801
  #, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "не вдалося зберегти відбиток: %s\n"
  
- #: scd/app-openpgp.c:819
++#: scd/app-openpgp.c:814
  #, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "не вдалося зберегти дату створення: %s\n"
  
- #: scd/app-openpgp.c:1236
++#: scd/app-openpgp.c:1247
  msgid "response does not contain the RSA modulus\n"
  msgstr "відповідь не містить основи числення RSA\n"
  
- #: scd/app-openpgp.c:1243
++#: scd/app-openpgp.c:1254
  msgid "response does not contain the RSA public exponent\n"
  msgstr "відповідь не містить відкритого показника RSA\n"
  
- #: scd/app-openpgp.c:1353
++#: scd/app-openpgp.c:1364
  #, fuzzy
  #| msgid "response does not contain the EC public point\n"
  msgid "response does not contain the EC public key\n"
  msgstr "відповідь не містить відкритої точки еліптичної кривої\n"
  
- #: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:1464 scd/app-openpgp.c:3825
  msgid "response does not contain the public key data\n"
  msgstr "відповідь не містить даних відкритого ключа\n"
  
- #: scd/app-openpgp.c:1551
++#: scd/app-openpgp.c:1564
  #, c-format
  msgid "reading public key failed: %s\n"
  msgstr "помилка читання відкритого ключа: %s\n"
  
- #: scd/app-openpgp.c:1903
++#: scd/app-openpgp.c:1916
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr "використовуємо типовий пінкод як %s\n"
  
- #: scd/app-openpgp.c:1910
++#: scd/app-openpgp.c:1923
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  "не вдалося використати типовий пінкод як %s: %s — вимикаємо подальше типове "
  "використання\n"
  
- #: scd/app-openpgp.c:1925
++#: scd/app-openpgp.c:1938
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr "||Будь ласка, вкажіть пінкод%%0A[підписів: %lu]"
  
- #: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
++#: scd/app-openpgp.c:1949 scd/app-openpgp.c:2424
  msgid "||Please enter the PIN"
  msgstr "||Вкажіть пінкод"
  
- #: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2173 scd/app-openpgp.c:2437
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr "Пінкод для CHV%d занадто короткий; мінімальна довжина — %d\n"
  
- #: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
- #: scd/app-openpgp.c:4114
++#: scd/app-openpgp.c:2004 scd/app-openpgp.c:2043 scd/app-openpgp.c:2185
++#: scd/app-openpgp.c:4126
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "помилка перевірки CHV%d: %s\n"
  
- #: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
++#: scd/app-openpgp.c:2072 scd/app-openpgp.c:2458 scd/app-openpgp.c:4556
  msgid "error retrieving CHV status from card\n"
  msgstr "помилка отримання стану CHV з картки\n"
  
- #: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
++#: scd/app-openpgp.c:2078 scd/app-openpgp.c:4565
  msgid "card is permanently locked!\n"
  msgstr "картку заблоковано!\n"
  
- #: scd/app-openpgp.c:2072
++#: scd/app-openpgp.c:2085
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7789,25 -6271,20 +7864,25 @@@ msgstr[2] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:2082
++#: scd/app-openpgp.c:2095
  #, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr ""
  "|A|Будь ласка, вкажіть адміністративний пінкод%%0A[залишилося спроб: %d]"
  
- #: scd/app-openpgp.c:2086
++#: scd/app-openpgp.c:2099
  msgid "|A|Please enter the Admin PIN"
  msgstr "|A|Вкажіть адміністративний пінкод"
  
- #: scd/app-openpgp.c:2107
++#: scd/app-openpgp.c:2120
  msgid "access to admin commands is not configured\n"
  msgstr "доступ до адміністративних команд не налаштовано\n"
  
- #: scd/app-openpgp.c:2460
++#: scd/app-openpgp.c:2473
  msgid "||Please enter the Reset Code for the card"
  msgstr "||Вкажіть код скидання коду картки"
  
- #: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
++#: scd/app-openpgp.c:2483 scd/app-openpgp.c:2537
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr "Занадто короткий код скидання; мінімальна довжина — %d\n"
@@@ -7815,78 -6292,60 +7890,78 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2493
++#: scd/app-openpgp.c:2506
  msgid "|RN|New Reset Code"
  msgstr "|RN|Новий код скидання"
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|AN|New Admin PIN"
  msgstr "|AN|Новий адміністративний пінкод"
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|N|New PIN"
  msgstr "|N|Новий пінкод"
  
- #: scd/app-openpgp.c:2565
++#: scd/app-openpgp.c:2578
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "||Вкажіть адміністративний пінкод та новий адміністративний пінкод"
  
- #: scd/app-openpgp.c:2566
++#: scd/app-openpgp.c:2579
  msgid "||Please enter the PIN and New PIN"
  msgstr "||Вкажіть пінкод та новий пінкод"
  
- #: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
++#: scd/app-openpgp.c:2635 scd/app-openpgp.c:3885
  msgid "error reading application data\n"
  msgstr "помилка читання даних програми\n"
  
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
++#: scd/app-openpgp.c:2641 scd/app-openpgp.c:3892
  msgid "error reading fingerprint DO\n"
  msgstr "помилка читання відбитка DO\n"
  
- #: scd/app-openpgp.c:2638
++#: scd/app-openpgp.c:2651
  msgid "key already exists\n"
  msgstr "ключ вже існує\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2655
  msgid "existing key will be replaced\n"
  msgstr "вже створений ключ буде замінено\n"
  
- #: scd/app-openpgp.c:2644
++#: scd/app-openpgp.c:2657
  msgid "generating new key\n"
  msgstr "створення нового ключа\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2659
  msgid "writing new key\n"
  msgstr "записування нового ключа\n"
  
- #: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
++#: scd/app-openpgp.c:3201 scd/app-openpgp.c:3553
  msgid "creation timestamp missing\n"
  msgstr "не вказано часової позначки створення\n"
  
- #: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
++#: scd/app-openpgp.c:3243 scd/app-openpgp.c:3251
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  "Не знайдено простого числа RSA %s або число не належить до %d-бітових\n"
  
- #: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
++#: scd/app-openpgp.c:3384 scd/app-openpgp.c:3647
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "не вдалося зберегти ключ: %s\n"
  
- #: scd/app-openpgp.c:3534
++#: scd/app-openpgp.c:3547
  msgid "unsupported curve\n"
  msgstr "непідтримувана крива\n"
  
- #: scd/app-openpgp.c:3790
++#: scd/app-openpgp.c:3802
  msgid "please wait while key is being generated ...\n"
  msgstr "зачекайте на завершення створення ключа...\n"
  
- #: scd/app-openpgp.c:3798
++#: scd/app-openpgp.c:3810
  msgid "generating key failed\n"
  msgstr "помилка під час створення ключа\n"
  
- #: scd/app-openpgp.c:3804
++#: scd/app-openpgp.c:3816
  #, c-format
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
@@@ -7894,30 -6353,24 +7969,30 @@@ msgstr[0] "створення ключ�
  msgstr[1] "створення ключа завершено (за %d секунди)\n"
  msgstr[2] "створення ключа завершено (за %d секунд)\n"
  
- #: scd/app-openpgp.c:3838
++#: scd/app-openpgp.c:3850
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "некоректна структура картки OpenPGP (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:3900
  msgid "fingerprint on card does not match requested one\n"
  msgstr "відбиток на картці не відповідає запитаному\n"
  
- #: scd/app-openpgp.c:4004
++#: scd/app-openpgp.c:4016
  #, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "карткою не підтримується алгоритм контрольних сум %s\n"
  
- #: scd/app-openpgp.c:4089
++#: scd/app-openpgp.c:4101
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "вже створено підписів: %lu\n"
  
- #: scd/app-openpgp.c:4551
++#: scd/app-openpgp.c:4570
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr "перевірку адміністративного пінкоду заборонено цією командою\n"
  
- #: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
++#: scd/app-openpgp.c:4871 scd/app-openpgp.c:4882
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "не вдалося отримати доступ до %s — некоректна картка OpenPGP?\n"
@@@ -7937,7 -6387,6 +8012,7 @@@ msgstr "|N|Початковий нов�
  msgid "run in multi server mode (foreground)"
  msgstr "запустити у режимі декількох серверів (основному режимі)"
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|LEVEL|встановити вказаний рівень діагностики"
  
@@@ -7977,11 -6417,9 +8052,11 @@@ msgstr "заборонити викор
  msgid "use variable length input for pinpad"
  msgstr "використовувати змінну довжину вхідних даних для зчитувача"
  
- #: scd/scdaemon.c:287
++#: scd/scdaemon.c:286
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Використання: @SCDAEMON@ [параметри] (-h — довідка)"
  
- #: scd/scdaemon.c:289
++#: scd/scdaemon.c:288
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
@@@ -7989,18 -6427,15 +8064,18 @@@ msgstr "
  "Синтаксис: scdaemon [параметри] [команди [аргументи]]\n"
  "Фонова служба карток пам’яті для @GNUPG@\n"
  
- #: scd/scdaemon.c:786
++#: scd/scdaemon.c:784
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  "будь ласка, скористайтеся параметром «--daemon» для запуску програми у "
  "фоновому режимі\n"
  
- #: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1904
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "запущено запуск обробки для дескриптора %d\n"
  
- #: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
++#: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1909
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "роботу обробника для дескриптора %d перервано\n"
@@@ -8076,9 -6495,6 +8151,9 @@@ msgstr "кількість відпов
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "помилка пошуку ключів лише з dirmngr: %s\n"
  
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
 +#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  msgid "failed to allocate keyDB handle\n"
  msgstr "не вдалося розмістити дескриптор keyDB\n"
  
@@@ -8556,11 -6870,9 +8631,11 @@@ msgstr "
  msgid "resource problem: out of core\n"
  msgstr "проблема з ресурсами: вихід за межі пам’яті\n"
  
- #: sm/decrypt.c:330
++#: sm/decrypt.c:332
  msgid "(this is the RC2 algorithm)\n"
  msgstr "(це алгоритм RC2)\n"
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:334
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr "(здається, це не зашифроване повідомлення)\n"
  
@@@ -8601,118 -6905,90 +8676,118 @@@ msgstr "показати ключ зо�
  msgid "list certificate chain"
  msgstr "показати ланцюжок сертифікації"
  
- #: sm/gpgsm.c:218
++#: sm/gpgsm.c:219
  msgid "import certificates"
  msgstr "імпортувати сертифікати"
  
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
  msgid "export certificates"
  msgstr "експортувати сертифікати"
  
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:228
  msgid "register a smartcard"
  msgstr "зареєструвати картку пам’яті"
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:231
  msgid "pass a command to the dirmngr"
  msgstr "передати команду dirmngr"
  
- #: sm/gpgsm.c:232
++#: sm/gpgsm.c:233
  msgid "invoke gpg-protect-tool"
  msgstr "виклик gpg-protect-tool"
  
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:250
  msgid "create base-64 encoded output"
  msgstr "створити дані, закодовані у BASE64"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in PEM format"
  msgstr "вважати вхідні дані даними у форматі PEM"
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in base-64 format"
  msgstr "вважати вхідні дані даними у форматі BASE64"
  
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:262
  msgid "assume input is in binary format"
  msgstr "вважати вхідні дані даними у двійковому форматі"
  
- #: sm/gpgsm.c:267
++#: sm/gpgsm.c:269
  msgid "never consult a CRL"
  msgstr "не використовувати САС"
  
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:279
  msgid "check validity using OCSP"
  msgstr "перевіряти чинність за допомогою OCSP"
  
- #: sm/gpgsm.c:282
++#: sm/gpgsm.c:284
  msgid "|N|number of certificates to include"
  msgstr "кількість сертифікатів, які слід включити"
  
- #: sm/gpgsm.c:285
++#: sm/gpgsm.c:287
  msgid "|FILE|take policy information from FILE"
  msgstr "|FILE|взяти дані щодо правил з вказаного файла"
  
- #: sm/gpgsm.c:288
++#: sm/gpgsm.c:290
  msgid "do not check certificate policies"
  msgstr "не перевіряти правила сертифікатів"
  
- #: sm/gpgsm.c:292
++#: sm/gpgsm.c:294
  msgid "fetch missing issuer certificates"
  msgstr "Надіслати запит щодо незнайдених сертифікатів видавця"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "don't use the terminal at all"
  msgstr "взагалі не використовувати термінал"
  
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:307
  msgid "|FILE|write a server mode log to FILE"
  msgstr "|FILE|записувати журнал режиму сервера до файла"
  
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:312
  msgid "|FILE|write an audit log to FILE"
  msgstr "|FILE|записувати журнал перевірки до файла"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "batch mode: never ask"
  msgstr "пакетний режим: нічого не запитувати"
  
- #: sm/gpgsm.c:314
++#: sm/gpgsm.c:316
  msgid "assume yes on most questions"
  msgstr "вважати відповіддю на більшість питань «так»"
  
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:317
  msgid "assume no on most questions"
  msgstr "вважати відповіддю на більшість питань «ні»"
  
- #: sm/gpgsm.c:318
++#: sm/gpgsm.c:320
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "|FILE|додати сховище ключів до списку сховищ ключів"
  
- #: sm/gpgsm.c:321
++#: sm/gpgsm.c:323
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr ""
  "|USER-ID|використовувати ідентифікатор користувача як типовий закритий ключ"
  
- #: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "використовувати цей сервер ключів для пошуку"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|NAME|використовувати вказаний алгоритм шифрування"
  
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:352
  msgid "|NAME|use message digest algorithm NAME"
  msgstr ""
  "|NAME|використовувати вказаний алгоритм обчислення контрольної суми "
  "повідомлення"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:559
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
  msgstr "Використання: @GPGSM@ [параметри] [файли] (-h — довідка)"
  
- #: sm/gpgsm.c:570
++#: sm/gpgsm.c:562
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
  "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@@ -8723,46 -6999,37 +8798,46 @@@ msgstr "
  "протоколу S/MIME\n"
  "Типова дія залежатиме від вхідних даних\n"
  
- #: sm/gpgsm.c:774
++#: sm/gpgsm.c:766
  #, c-format
  msgid "Note: won't be able to encrypt to '%s': %s\n"
  msgstr "ЗАУВАЖЕННЯ: не вдасться зашифрувати до «%s»: %s\n"
  
- #: sm/gpgsm.c:785
++#: sm/gpgsm.c:777
  #, c-format
  msgid "unknown validation model '%s'\n"
  msgstr "невідома модель перевірки «%s»\n"
  
- #: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
  #, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "%s:%u: не вказано назви вузла\n"
  
- #: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr "%s:%u: вказано пароль, але не вказано користувача\n"
  
- #: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
  #, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr "%s:%u: пропускаємо цей рядок\n"
  
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1427
  msgid "could not parse keyserver\n"
  msgstr "не вдалося обробити сервер ключів\n"
  
- #: sm/gpgsm.c:1636
++#: sm/gpgsm.c:1630
  #, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "імпортуємо загальні сертифікати «%s»\n"
  
- #: sm/gpgsm.c:1677
++#: sm/gpgsm.c:1671
  #, c-format
  msgid "can't sign using '%s': %s\n"
  msgstr "підписування за допомогою «%s» неможливе: %s\n"
  
- #: sm/gpgsm.c:2033
++#: sm/gpgsm.c:2028
  msgid "invalid command (there is no implicit command)\n"
  msgstr "некоректна команда (немає неявної команди)\n"
  
@@@ -9529,8 -7645,6 +9604,8 @@@ msgstr "використовуємо «
  msgid "CRL access not possible due to disabled %s\n"
  msgstr "Доступ до CRL неможливий через вимкнений %s\n"
  
 +#: dirmngr/crlfetch.c:223 dirmngr/ldap-wrapper-ce.c:488
- #: dirmngr/ldap-wrapper.c:742 dirmngr/misc.c:563
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:563
  #, c-format
  msgid "error initializing reader object: %s\n"
  msgstr "помилка під час спроби ініціалізації об’єкта читання: %s\n"
@@@ -9701,112 -7779,84 +9776,112 @@@ msgstr "мало бути вказан�
  msgid "looking up '%s'\n"
  msgstr "пошук «%s»\n"
  
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:160
  msgid "list the contents of the CRL cache"
  msgstr "показати вміст кешу CRL"
  
- #: dirmngr/dirmngr.c:158
++#: dirmngr/dirmngr.c:161
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|FILE|завантажити CRL з вказаного файла до кешу"
  
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:162
  msgid "|URL|fetch a CRL from URL"
  msgstr "|URL|отримати CRL з вказаної адреси"
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:163
  msgid "shutdown the dirmngr"
  msgstr "завершити роботу dirmngr"
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:164
  msgid "flush the cache"
  msgstr "спорожнити кеш"
  
- #: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
- #: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
++#: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|FILE|записувати журнал режиму сервера до файла"
  
- #: dirmngr/dirmngr.c:177
++#: dirmngr/dirmngr.c:180
  msgid "run without asking a user"
  msgstr "запустити без запиту до користувача"
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:181
  msgid "force loading of outdated CRLs"
  msgstr "примусове завантаження застарілих САС"
  
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:182
  msgid "allow sending OCSP requests"
  msgstr "дозволити надсилання запитів OCSP"
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:184
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:185
  msgid "inhibit the use of HTTP"
  msgstr "заборонити використання HTTP"
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:186
  msgid "inhibit the use of LDAP"
  msgstr "заборонити використання LDAP"
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:188
  msgid "ignore HTTP CRL distribution points"
  msgstr "ігнорувати точки поширення САС протоколу HTTP"
  
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
  msgid "ignore LDAP CRL distribution points"
  msgstr "ігнорувати точки поширення САС протоколу LDAP"
  
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:192
  msgid "ignore certificate contained OCSP service URLs"
  msgstr "ігнорувати адреси служб OCSP з сертифікатами"
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr "|URL|переспрямувати всі запити HTTP на вказану адресу"
  
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
  msgid "|HOST|use HOST for LDAP queries"
  msgstr "|HOST|використовувати вказаний вузол для запитів LDAP"
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr "не використовувати резервні вузли з --ldap-proxy"
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:202
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FILE|прочитати список серверів LDAP з вказаного файла"
  
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr "додати виявлені у точках поширення CRL нові сервери до списку серверів"
  
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr "|N|встановити вказаний час очікування даних від LDAP"
  
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:210
  msgid "|URL|use OCSP responder at URL"
  msgstr "|URL|використовувати відповідач OCSP за вказаною адресою"
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:212
  msgid "|FPR|OCSP response signed by FPR"
  msgstr "|FPR|відповідь OCSP підписано FPR"
  
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:218
  msgid "|N|do not return more than N items in one query"
  msgstr "|N|повертати не більше за вказану кількість записів на запит"
  
- #: dirmngr/dirmngr.c:220
++#: dirmngr/dirmngr.c:223
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr "|FILE|використовувати сертифікати CA з файла для HKP крізь TLS"
  
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:225
  msgid "route all network traffic via Tor"
  msgstr "маршрутизувати увесь обмін даними з мережею через Tor"
  
- #: dirmngr/dirmngr.c:240
++#: dirmngr/dirmngr.c:246
  msgid ""
  "@\n"
  "(See the \"info\" manual for a complete listing of all commands and "
@@@ -9816,11 -7866,9 +9891,11 @@@ msgstr "
  "(Щоб ознайомитися зі списком команд і параметрів, скористайтеся сторінкою "
  "довідника (man) «info»)\n"
  
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:361
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Використання: @DIRMNGR@ [параметри] (-h — довідка)"
  
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:363
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9828,78 -7876,61 +9903,78 @@@ msgstr "
  "Синтаксис: @DIRMNGR@ [параметри] [команда [аргументи]]\n"
  "Доступ до сервера ключів, CRL та OCSP для @GNUPG@\n"
  
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:443
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr "коректними рівнями зневаджування є: %s\n"
  
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
- #: tools/gpgconf.c:648
++#: dirmngr/dirmngr.c:496 tools/gpgconf.c:550 tools/gpgconf.c:585
++#: tools/gpgconf.c:656
  #, c-format
  msgid "usage: %s [options] "
  msgstr "використання: %s [параметри]"
  
- #: dirmngr/dirmngr.c:1062
++#: dirmngr/dirmngr.c:1074
  msgid "colons are not allowed in the socket name\n"
  msgstr "не можна використовувати двокрапки у назві сокета\n"
  
- #: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
++#: dirmngr/dirmngr.c:1300 dirmngr/server.c:1585
  #, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "помилка під час спроби отримання CRL з «%s»: %s\n"
  
- #: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
++#: dirmngr/dirmngr.c:1306 dirmngr/server.c:1591
  #, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "помилка під час обробки CRL з «%s»: %s\n"
  
- #: dirmngr/dirmngr.c:1484
++#: dirmngr/dirmngr.c:1487
  #, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "%s:%u: занадто довгий рядок — пропущено\n"
  
- #: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
++#: dirmngr/dirmngr.c:1542 dirmngr/dirmngr.c:1626
  #, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "%s:%u: виявлено некоректний відбиток\n"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
++#: dirmngr/dirmngr.c:1578 dirmngr/dirmngr.c:1604 tools/gpgconf-comp.c:4032
  #, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "%s:%u: помилка під час читання: %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1633
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr "%s:%u: беззмістовні дані наприкінці рядка проігноровано\n"
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1700
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  "отримано сигнал SIGHUP — повторне читання налаштувань та спорожнення кешу\n"
  
- #: dirmngr/dirmngr.c:1734
++#: dirmngr/dirmngr.c:1738
  msgid "SIGUSR2 received - no action defined\n"
  msgstr "отримано сигнал SIGUSR2 — дій не визначено\n"
  
- #: dirmngr/dirmngr.c:1739
++#: dirmngr/dirmngr.c:1743
  msgid "SIGTERM received - shutting down ...\n"
  msgstr "отримано сигнал SIGTERM — завершуємо роботу…\n"
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1745
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr "отримано сигнал SIGTERM — підтримується %d активних з’єднань\n"
  
- #: dirmngr/dirmngr.c:1746
++#: dirmngr/dirmngr.c:1750
  msgid "shutdown forced\n"
  msgstr "примусове завершення роботи\n"
  
- #: dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1758
  msgid "SIGINT received - immediate shutdown\n"
  msgstr "отримано сигнал SIGINT — негайне завершення роботи\n"
  
- #: dirmngr/dirmngr.c:1761
++#: dirmngr/dirmngr.c:1765
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr "отримано сигнал %d — дій не визначено\n"
@@@ -10364,32 -8296,26 +10439,32 @@@ msgstr "помилка fetch_next_cert
  msgid "max_replies %d exceeded\n"
  msgstr "перевищено max_replies у %d\n"
  
- #: dirmngr/server.c:2463
++#: dirmngr/server.c:2469
  #, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "не вдалося розмістити структуру керування: %s\n"
  
- #: dirmngr/server.c:2474
++#: dirmngr/server.c:2480
  #, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "не вдалося розмістити контекст assuan: %s\n"
  
- #: dirmngr/server.c:2495
++#: dirmngr/server.c:2501
  #, c-format
  msgid "failed to initialize the server: %s\n"
  msgstr "не вдалося ініціалізувати сервер: %s\n"
  
- #: dirmngr/server.c:2503
++#: dirmngr/server.c:2509
  #, c-format
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "не вдалося зареєструвати команди за допомогою Assuan: %s\n"
  
- #: dirmngr/server.c:2534
++#: dirmngr/server.c:2540
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr "проблема з прийняттям Assuan: %s\n"
  
- #: dirmngr/server.c:2553
++#: dirmngr/server.c:2559
  #, c-format
  msgid "Assuan processing failed: %s\n"
  msgstr "помилка обробки за допомогою Assuan: %s\n"
@@@ -10432,7 -8349,6 +10507,7 @@@ msgstr "DSA потребує викор
  msgid "certificate should not have been used for CRL signing\n"
  msgstr "сертифікат не мав використовуватися для підписування CRL\n"
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:167
  msgid "quiet"
  msgstr "без повідомлень"
  
@@@ -10525,22 -8421,15 +10600,22 @@@ msgstr "помилка надсилан
  msgid "error sending standard options: %s\n"
  msgstr "помилка під час спроби надсилання стандартних параметрів: %s\n"
  
 +#: tools/gpgconf-comp.c:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
- #: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
++#: tools/gpgconf-comp.c:766 tools/gpgconf-comp.c:865
  msgid "Options controlling the diagnostic output"
  msgstr "Параметри керування діагностичним виводом"
  
 +#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
- #: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
++#: tools/gpgconf-comp.c:779 tools/gpgconf-comp.c:888
  msgid "Options controlling the configuration"
  msgstr "Параметри керування налаштуваннями"
  
- #: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
- #: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
++#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:723
++#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:901
  msgid "Options useful for debugging"
  msgstr "Параметри діагностики"
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
  msgid "Options controlling the security"
  msgstr "Параметри керування захистом"
  
@@@ -10588,11 -8466,9 +10663,11 @@@ msgstr "не дозволяти пов�
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr "|N|встановити вказаний час очікування Pinentry у секундах"
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
++#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
  msgid "|NAME|use NAME as default secret key"
  msgstr "|NAME|використовувати вказаний типовий закритий ключ"
  
- #: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
++#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:784
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NAME|шифрувати також до вказаного ідентифікатора користувача"
  
@@@ -10600,179 -8475,153 +10675,197 @@@
  msgid "|SPEC|set up email aliases"
  msgstr "|SPEC|встановити замінники адреси електронної пошти"
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
++#: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
  msgid "Configuration for Keyservers"
  msgstr "Налаштування для серверів ключів"
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
++#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
  msgid "|URL|use keyserver at URL"
  msgstr "|URL|використовувати сервер ключів за адресою"
  
- #: tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:741
  msgid "allow PKA lookups (DNS requests)"
  msgstr "дозволити пошук PKA (запити до DNS)"
  
- #: tools/gpgconf-comp.c:738
++#: tools/gpgconf-comp.c:744
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr ""
  "|MECHANISMS|використовувати вказаний механізм для пошуку ключів за адресою"
  
- #: tools/gpgconf-comp.c:787
++#: tools/gpgconf-comp.c:793
  msgid "disable all access to the dirmngr"
  msgstr "заборонити доступ до dirmngr"
  
- #: tools/gpgconf-comp.c:790
++#: tools/gpgconf-comp.c:796
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
  msgstr "використовувати вказане кодування для паролів PKCS#12"
  
- #: tools/gpgconf-comp.c:820
++#: tools/gpgconf-comp.c:829
  msgid "do not check CRLs for root certificates"
  msgstr "не шукати у списках відкликаних сертифікатів кореневі сертифікати"
  
- #: tools/gpgconf-comp.c:869
++#: tools/gpgconf-comp.c:878
  msgid "Options controlling the format of the output"
  msgstr "Параметри керування форматом виведення"
  
- #: tools/gpgconf-comp.c:905
++#: tools/gpgconf-comp.c:920
  msgid "Options controlling the interactivity and enforcement"
  msgstr "Параметри керування інтерактивністю та примусом"
  
- #: tools/gpgconf-comp.c:918
++#: tools/gpgconf-comp.c:933
  msgid "Options controlling the use of Tor"
  msgstr "Параметри керування використанням Tor"
  
- #: tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:947
  msgid "Configuration for HTTP servers"
  msgstr "Налаштування для серверів HTTP"
  
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:958
  msgid "use system's HTTP proxy setting"
  msgstr "використовувати загальносистемний проксі-сервер HTTP"
  
- #: tools/gpgconf-comp.c:948
++#: tools/gpgconf-comp.c:963
  msgid "Configuration of LDAP servers to use"
  msgstr "Налаштування використання серверів LDAP"
  
- #: tools/gpgconf-comp.c:977
++#: tools/gpgconf-comp.c:992
  msgid "LDAP server list"
  msgstr "список серверів LDAP"
  
- #: tools/gpgconf-comp.c:985
++#: tools/gpgconf-comp.c:1000
  msgid "Configuration for OCSP"
  msgstr "Налаштування OCSP"
  
- #: tools/gpgconf-comp.c:1066
++#: tools/gpgconf-comp.c:1081
  #, fuzzy
  #| msgid "GPG for OpenPGP"
  msgid "OpenPGP"
  msgstr "GPG для OpenPGP"
  
- #: tools/gpgconf-comp.c:1067
++#: tools/gpgconf-comp.c:1082
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1083
  #, fuzzy
  #| msgid "Smartcard Daemon"
  msgid "Smartcards"
  msgstr "Фонова служба карток пам’яті"
  
- #: tools/gpgconf-comp.c:1069
++#: tools/gpgconf-comp.c:1084
  #, fuzzy
  #| msgid "GPG for S/MIME"
  msgid "S/MIME"
  msgstr "GPG для S/MIME"
  
- #: tools/gpgconf-comp.c:1070
++#: tools/gpgconf-comp.c:1085
  msgid "Network"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1071
++#: tools/gpgconf-comp.c:1086
  #, fuzzy
  #| msgid "PIN and Passphrase Entry"
  msgid "Passphrase Entry"
  msgstr "Введення пінкодів і паролів"
  
- #: tools/gpgconf-comp.c:1225
++#: tools/gpgconf-comp.c:1240
  msgid "Component not suitable for launching"
  msgstr "Компонент не є придатним до запуску"
  
- #: tools/gpgconf-comp.c:3283
++#: tools/gpgconf-comp.c:3311
  #, c-format
  msgid "External verification of component %s failed"
  msgstr "Помилка зовнішньої перевірки компонента %s"
  
- #: tools/gpgconf-comp.c:3434
++#: tools/gpgconf-comp.c:3462
  msgid "Note that group specifications are ignored\n"
  msgstr "Зауважте, що специфікації груп буде проігноровано\n"
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf-comp.c:4036
+ #, fuzzy, c-format
+ #| msgid "error closing '%s': %s\n"
+ msgid "error closing '%s'\n"
+ msgstr "помилка під час спроби закрити «%s»: %s\n"
+ 
++#: tools/gpgconf-comp.c:4038
+ #, fuzzy, c-format
+ #| msgid "error hashing '%s': %s\n"
+ msgid "error parsing '%s'\n"
+ msgstr "помилка під час спроби хешування «%s»: %s\n"
+ 
++#: tools/gpgconf.c:73
  msgid "list all components"
  msgstr "показати список всіх компонентів"
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "check all programs"
  msgstr "перевірити всі програми"
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|list options"
  msgstr "|COMPONENT|показати список параметрів"
  
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
  msgid "|COMPONENT|change options"
  msgstr "|COMPONENT|змінити параметри"
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "|COMPONENT|check options"
  msgstr "|COMPONENT|перевірити параметри"
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "apply global default values"
  msgstr "застосувати загальні типові значення"
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
+ #, fuzzy
+ #| msgid "|FILE|take policy information from FILE"
+ msgid "|FILE|update configuration files using FILE"
+ msgstr "|FILE|взяти дані щодо правил з вказаного файла"
+ 
++#: tools/gpgconf.c:83
  msgid "get the configuration directories for @GPGCONF@"
  msgstr "отримати назви каталогів налаштувань для @GPGCONF@"
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:85
  msgid "list global configuration file"
  msgstr "показати загальний файл налаштувань"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  msgid "check global configuration file"
  msgstr "перевірити загальний файл налаштувань"
  
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:89
  #, fuzzy
  #| msgid "update the trust database"
  msgid "query the software version database"
  msgstr "оновити базу даних довіри"
  
- #: tools/gpgconf.c:86
++#: tools/gpgconf.c:90
  msgid "reload all or a given component"
  msgstr "перезавантажити всі або вказаний компонент"
  
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:91
  msgid "launch a given component"
  msgstr "запустити вказаний компонент"
  
- #: tools/gpgconf.c:88
++#: tools/gpgconf.c:92
  msgid "kill a given component"
  msgstr "завершити роботу вказаного компонента"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "use as output file"
  msgstr "використати файл для виведення даних"
  
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:102
  msgid "activate changes at runtime, if possible"
  msgstr "якщо можна, задіяти зміни у динамічному режимі"
  
- #: tools/gpgconf.c:122
++#: tools/gpgconf.c:127
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "Використання: @GPGCONF@ [параметри] (-h — довідка)"
  
- #: tools/gpgconf.c:125
++#: tools/gpgconf.c:130
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10780,15 -8629,12 +10873,15 @@@ msgstr "
  "Синтаксис: @GPGCONF@ [параметри]\n"
  "Керування параметрами налаштування інструментів системи @GNUPG@\n"
  
- #: tools/gpgconf.c:545 tools/gpgconf.c:579
++#: tools/gpgconf.c:552 tools/gpgconf.c:587
  msgid "Need one component argument"
  msgstr "Слід вказати один аргумент компонента"
  
- #: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
++#: tools/gpgconf.c:561 tools/gpgconf.c:599 tools/gpgconf.c:632
  msgid "Component not found"
  msgstr "Компонент не знайдено"
  
- #: tools/gpgconf.c:650
++#: tools/gpgconf.c:658
  msgid "No argument allowed"
  msgstr "Не можна вказувати аргументів"
  
diff --cc po/zh_CN.po
index fabaf80,1417627..f898a41
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@@ -7,7 -7,6 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg 1.4.4\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-11-18 16:54+0100\n"
++"POT-Creation-Date: 2016-12-20 11:28+0100\n"
  "PO-Revision-Date: 2009-07-09 10:03+0200\n"
  "Last-Translator: Meng Jie <zuxyhere at eastday.com>\n"
  "Language-Team: Chinese (simplified) <i18n-translation at lists.linux.net.cn>\n"
@@@ -162,25 -133,11 +162,25 @@@ msgstr "错误的密码
  msgid "ssh keys greater than %d bits are not supported\n"
  msgstr "不支持保护散列 %d\n"
  
 +#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
- #: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1306 g10/keygen.c:4577
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
++#: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't create '%s': %s\n"
  msgstr "无法建立‘%s’:%s\n"
  
 +#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
- #: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1307
++#: g10/import.c:305 g10/import.c:448 g10/import.c:621 g10/keygen.c:3681
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
- #: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
- #: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:825 g10/sign.c:1025
++#: g10/sign.c:1130 g10/sign.c:1275 g10/tdbdump.c:143 g10/tdbdump.c:151
++#: g10/tdbio.c:720 g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161
++#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
++#: dirmngr/certcache.c:368 dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1564
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
@@@ -243,14 -189,12 +243,14 @@@ msgstr "请输入密码:这是一个�
  msgid "failed to create stream from socket: %s\n"
  msgstr "%s:建立散列表失败:%s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1100
++#: agent/divert-scd.c:92 g10/call-agent.c:1101
  #, fuzzy
  msgid "Please insert the card with serial number"
  msgstr ""
  "请取出当前的卡,并插入有下列序列号的卡:\n"
  "  %.*s\n"
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1101
++#: agent/divert-scd.c:93 g10/call-agent.c:1102
  #, fuzzy
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
@@@ -396,48 -314,33 +396,48 @@@ msgstr "
  "选项:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
  #, fuzzy
  #| msgid "Key is superseded"
  msgid "run in supervised mode"
  msgstr "密钥被替换"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:170 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "详细模式"
  
 +#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "尽量减少提示信息"
  
- #: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
  msgid "csh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
- #: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
++#: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
  #, fuzzy
  msgid "|FILE|read options from FILE"
  msgstr "从‘%s’读取选项\n"
  
- #: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:177
  msgid "do not detach from the console"
  msgstr ""
  
@@@ -521,164 -407,122 +521,164 @@@ 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:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:481 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1025 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:358
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:124 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr ""
  "请向 <@EMAIL@> 报告程序缺陷。\n"
  "请向 <zuxyhere at eastday.com> 反映简体中文翻译的问题。\n"
  
- #: agent/gpg-agent.c:491
++#: agent/gpg-agent.c:490
  #, fuzzy
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
  
- #: agent/gpg-agent.c:493
++#: agent/gpg-agent.c:492
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:537 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:442
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:793
++#: agent/gpg-agent.c:1082 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:812
  #, fuzzy, c-format
  #| msgid "NOTE: no default option file `%s'\n"
  msgid "Note: no default option file '%s'\n"
  msgstr "注意:没有默认配置文件‘%s’\n"
  
- #: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
- #: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1093 agent/gpg-agent.c:1935 g10/gpg.c:2510
++#: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:817
++#: dirmngr/dirmngr.c:1670 tools/symcryptrun.c:932
  #, fuzzy, c-format
  #| msgid "option file `%s': %s\n"
  msgid "option file '%s': %s\n"
  msgstr "配置文件‘%s’:%s\n"
  
- #: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:806
++#: agent/gpg-agent.c:1101 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:825
  #, fuzzy, c-format
  #| msgid "reading options from `%s'\n"
  msgid "reading options from '%s'\n"
  msgstr "从‘%s’读取选项\n"
  
- #: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
- #: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
++#: agent/gpg-agent.c:1223 g10/gpg.c:3643 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:936 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:527
  #, 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:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
++#: agent/gpg-agent.c:2080 scd/scdaemon.c:1073 dirmngr/dirmngr.c:1081
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
  msgstr "无法建立‘%s’:%s\n"
  
- #: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
++#: agent/gpg-agent.c:2097 scd/scdaemon.c:1086 dirmngr/dirmngr.c:1094
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2134
++#: agent/gpg-agent.c:2135
  #, fuzzy
  msgid "a gpg-agent is already running - not starting a new one\n"
  msgstr "gpg-agent 在此次舍话中无法使用\n"
  
- #: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
++#: agent/gpg-agent.c:2145 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1126
  #, fuzzy
  msgid "error getting nonce for the socket\n"
  msgstr "获取新 PIN 时出错:%s\n"
  
- #: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
++#: agent/gpg-agent.c:2150 scd/scdaemon.c:1113 dirmngr/dirmngr.c:1129
  #, fuzzy, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "在‘%s’中寻找信任度记录时出错:%s\n"
  
- #: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
- #: dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2160 agent/gpg-agent.c:2197 scd/scdaemon.c:1121
++#: dirmngr/dirmngr.c:1138
  #, fuzzy, c-format
  msgid "can't set permissions of '%s': %s\n"
  msgstr "警告:扩展模块‘%s’权限不安全\n"
  
- #: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:2165 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1143
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
  msgstr "更新失败:%s\n"
  
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
++#: agent/gpg-agent.c:2172 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1149
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
  msgstr "正在将私钥写至`%s'\n"
  
- #: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: agent/gpg-agent.c:2191 agent/gpg-agent.c:2234 g10/exec.c:199
 +#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, 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:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: agent/gpg-agent.c:2194 agent/gpg-agent.c:2239 g10/openfile.c:491
 +#: g10/openfile.c:520 sm/keydb.c:103
  #, fuzzy, c-format
  #| msgid "directory `%s' created\n"
  msgid "directory '%s' created\n"
  msgstr "已创建目录‘%s’\n"
  
- #: agent/gpg-agent.c:2244
++#: agent/gpg-agent.c:2245
  #, fuzzy, c-format
  msgid "stat() failed for '%s': %s\n"
  msgstr "fstat(%d) 在 %s 中出错:%s\n"
  
- #: agent/gpg-agent.c:2248
++#: agent/gpg-agent.c:2249
  #, fuzzy, c-format
  msgid "can't use '%s' as home directory\n"
  msgstr "无法建立目录‘%s’:%s\n"
  
- #: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
++#: agent/gpg-agent.c:2392 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1871
  #, fuzzy, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "读取‘%s’时出错:%s\n"
  
- #: agent/gpg-agent.c:2598
++#: agent/gpg-agent.c:2599
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2603
++#: agent/gpg-agent.c:2604
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2678
++#: agent/gpg-agent.c:2679
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2683
++#: agent/gpg-agent.c:2684
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
++#: agent/gpg-agent.c:2881 scd/scdaemon.c:1272 dirmngr/dirmngr.c:2075
  #, fuzzy, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "更新私钥失败:%s\n"
  
- #: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2954 scd/scdaemon.c:1321
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
  msgstr "%s:已跳过:%s\n"
  
- #: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
++#: agent/gpg-agent.c:3092 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  #, fuzzy
  msgid "no gpg-agent running in this session\n"
  msgstr "gpg-agent 在此次舍话中无法使用\n"
@@@ -694,8 -536,6 +694,8 @@@ msgid "
  "Password cache maintenance\n"
  msgstr ""
  
- #: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
++#: agent/protect-tool.c:106 g10/gpg.c:424 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:153 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -703,9 -543,6 +703,9 @@@ msgstr "
  "@指令:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
- #: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:92 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:168 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -759,8 -588,6 +759,8 @@@ msgstr "已取消
  msgid "error while asking for the passphrase: %s\n"
  msgstr "生成密码的时候发生错误:%s\n"
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
- #: tools/gpgconf.c:323
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1472
++#: tools/gpgconf.c:328
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
  msgstr "‘%s’中出错:%s\n"
@@@ -932,9 -730,6 +932,9 @@@ 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:438
 +#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
- #: dirmngr/ldap-wrapper.c:710
++#: dirmngr/ldap-wrapper.c:711
  #, fuzzy, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "生成密码的时候发生错误:%s\n"
@@@ -946,8 -738,6 +946,8 @@@
  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:848 dirmngr/dirmngr.c:1155
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1167
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
  msgstr "读取‘%s’时出错:%s\n"
@@@ -993,27 -774,22 +993,27 @@@ msgstr "无法连接至‘%s’:%s\n
  msgid "problem setting the gpg-agent options\n"
  msgstr ""
  
- #: common/sysutils.c:144
++#: common/sysutils.c:148
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "无法禁用核心内存转储:%s\n"
  
- #: common/sysutils.c:239
++#: common/sysutils.c:250
  #, fuzzy, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "警告:扩展模块‘%s’所有权不安全\n"
  
- #: common/sysutils.c:271
++#: common/sysutils.c:282
  #, fuzzy, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "警告:扩展模块‘%s’权限不安全\n"
  
- #: common/sysutils.c:659
++#: common/sysutils.c:693
  #, fuzzy, c-format
  msgid "waiting for file '%s' to become accessible ...\n"
  msgstr "更新失败:%s\n"
  
- #: common/sysutils.c:685
++#: common/sysutils.c:719
  #, fuzzy, c-format
  #| msgid "renaming `%s' to `%s' failed: %s\n"
  msgid "renaming '%s' to '%s' failed: %s\n"
@@@ -1089,7 -850,6 +1089,7 @@@ msgstr "
  msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
  msgstr "警告:“%s”选项已不建议使用\n"
  
- #: common/miscellaneous.c:554
++#: common/miscellaneous.c:556
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
@@@ -1205,8 -942,6 +1205,8 @@@ msgstr "%s:钥匙环已建立\n
  msgid "algorithm: %s"
  msgstr "有效性:%s"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3098
++#: scd/app-openpgp.c:3111
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
@@@ -1419,7 -1112,6 +1419,7 @@@ msgstr "
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr ""
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1173
++#: common/argparse.c:401 dirmngr/dirmngr.c:1185
  #, fuzzy
  msgid "out of core\n"
  msgstr "可选"
@@@ -1478,8 -1159,6 +1478,8 @@@ msgstr "找不到公钥 %s:%s\n
  msgid "waiting for lock %s...\n"
  msgstr "等待‘%s’上的锁\n"
  
- #: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
- #: dirmngr/dirmngr.c:715
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:725
++#: dirmngr/dirmngr.c:734
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
@@@ -1518,7 -1189,6 +1518,7 @@@ msgstr "与预期不符的 ASCII 封装
  msgid "invalid dash escaped line: "
  msgstr "以连字符开头的行格式错误:"
  
- #: g10/armor.c:873 g10/armor.c:1490
++#: g10/armor.c:873 g10/armor.c:1493
  #, c-format
  msgid "invalid radix64 character %02X skipped\n"
  msgstr "跳过无效的 64 进制字符 %02x\n"
@@@ -1535,7 -1202,6 +1535,7 @@@ msgstr "文件先于预期结束(CRC �
  msgid "malformed CRC\n"
  msgstr "异常的 CRC\n"
  
- #: g10/armor.c:962 g10/armor.c:1527
++#: g10/armor.c:962 g10/armor.c:1530
  #, c-format
  msgid "CRC error; %06lX - %06lX\n"
  msgstr "CRC 错误:%06lx - %06lx\n"
@@@ -1548,16 -1212,13 +1548,16 @@@ msgstr "文件先于预期结束(于结
  msgid "error in trailer line\n"
  msgstr "结尾行有问题\n"
  
- #: g10/armor.c:1303
++#: g10/armor.c:1306
  msgid "no valid OpenPGP data found.\n"
  msgstr "找不到有效的 OpenPGP 数据。\n"
  
- #: g10/armor.c:1308
++#: g10/armor.c:1311
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
  msgstr "无效的 ASCII 封装:一行超过 %d 字符\n"
  
- #: g10/armor.c:1312
++#: g10/armor.c:1315
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr "封装里出现括上的可打印字符――可能是有缺陷的信件传输程序造成的\n"
@@@ -1634,8 -1280,6 +1634,8 @@@ msgstr "OpenPGP 卡不可用:%s\n
  msgid "OpenPGP card no. %s detected\n"
  msgstr "检测到 OpenPGP 卡号 %s\n"
  
- #: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
- #: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2030
++#: g10/keygen.c:4087 g10/revoke.c:215 g10/revoke.c:618
  msgid "can't do this in batch mode\n"
  msgstr "在批处理模式中无法完成此操作\n"
  
@@@ -1644,15 -1287,10 +1644,15 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "在 %s 模式中不允许使用这个指令。\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2454
++#: g10/card-util.c:109 scd/app-openpgp.c:2467
  #, fuzzy
  msgid "Reset Code not or not anymore available\n"
  msgstr "私钥部分不可用\n"
  
 +#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
- #: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
- #: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1768
++#: g10/keygen.c:1945 g10/keygen.c:2313 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "您的选择? "
  
@@@ -1714,10 -1338,6 +1714,10 @@@ msgstr "获取公钥的 URL:
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr "错误:URL 太长(至多 %d 个字符)\n"
  
- #: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
- #: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:334
++#: g10/import.c:592 g10/import.c:640 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
++#: dirmngr/dirmngr.c:1510 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
@@@ -1784,7 -1389,6 +1784,7 @@@ msgstr "针对密钥的操作无法实�
  msgid "not an OpenPGP card"
  msgstr "不是一个 OpenPGP 卡"
  
- #: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
++#: g10/card-util.c:1173 g10/keygen.c:4106 g10/keygen.c:5092
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr "取得当前密钥信息时出错:%s\n"
@@@ -1815,13 -1414,10 +1815,13 @@@ msgstr "您想要用多大的密钥尺�
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "您想要用多大的密钥尺寸?(%u)"
  
- #: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
++#: g10/card-util.c:1316 g10/keygen.c:2122 g10/keygen.c:2154
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "舍入到 %u 位\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2207 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr "%s 密钥尺寸必须在 %u 与 %u 间\n"
@@@ -1880,9 -1466,6 +1880,9 @@@ msgstr "  (2) 加密密钥\n
  msgid "   (3) Authentication key\n"
  msgstr "  (3) 认证密钥\n"
  
- #: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
- #: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
- #: g10/keygen.c:2314 g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1508
++#: g10/keygen.c:1794 g10/keygen.c:1822 g10/keygen.c:1952 g10/keygen.c:2060
++#: g10/keygen.c:2336 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "无效的选择。\n"
  
@@@ -1916,7 -1493,6 +1916,7 @@@ msgstr "为其添加签名吗?(y/N)
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1816 g10/keyedit.c:1867
++#: g10/card-util.c:1816 g10/keyedit.c:1868
  msgid "quit this menu"
  msgstr "离开这个菜单"
  
@@@ -1924,7 -1499,6 +1924,7 @@@
  msgid "show admin commands"
  msgstr "显示管理员命令"
  
- #: g10/card-util.c:1819 g10/keyedit.c:1870
++#: g10/card-util.c:1819 g10/keyedit.c:1871
  msgid "show this help"
  msgstr "显示这份在线说明"
  
@@@ -2000,31 -1556,21 +2000,31 @@@ msgstr "允许使用管理员命令\n
  msgid "Admin commands are not allowed\n"
  msgstr "不允许使用管理员命令\n"
  
- #: g10/card-util.c:2127 g10/keyedit.c:2816
++#: g10/card-util.c:2127 g10/keyedit.c:2817
  msgid "Invalid command  (try \"help\")\n"
  msgstr "无效的指令(尝试“help”)\n"
  
- #: g10/decrypt.c:191 g10/encrypt.c:955
++#: g10/decrypt.c:190 g10/encrypt.c:955
  msgid "--output doesn't work for this command\n"
  msgstr "--output 在这个命令中不起作用\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4904 g10/keyring.c:398 g10/keyring.c:771
  #, fuzzy, c-format
  #| msgid "can't open `%s'\n"
  msgid "can't open '%s'\n"
  msgstr "无法打开‘%s’\n"
  
 +#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
- #: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
- #: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4858 g10/keyedit.c:2051
++#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2163
  #, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "密钥‘%s’找不到:%s\n"
  
- #: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
- #: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
- #: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4866 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:645 g10/tofu.c:2171
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "读取密钥区块时发生错误:%s\n"
@@@ -2086,7 -1620,6 +2086,7 @@@ msgstr "公钥“%s”有对应的私�
  msgid "use option \"--delete-secret-keys\" to delete it first.\n"
  msgstr "请先使用“--delete-secret-keys”选项来删除它。\n"
  
- #: g10/encrypt.c:232 g10/sign.c:1292
++#: g10/encrypt.c:232 g10/sign.c:1294
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "生成密码的时候发生错误:%s\n"
@@@ -2106,7 -1636,6 +2106,7 @@@ msgstr "使用对称加密算法 %s\n
  msgid "'%s' already compressed\n"
  msgstr "‘%s’已被压缩\n"
  
- #: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:610
  #, fuzzy, c-format
  #| msgid "WARNING: `%s' is an empty file\n"
  msgid "WARNING: '%s' is an empty file\n"
@@@ -2124,7 -1651,6 +2124,7 @@@ msgid "
  "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
  msgstr "警告:强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
  
- #: g10/encrypt.c:707 g10/sign.c:984
++#: g10/encrypt.c:707 g10/sign.c:986
  #, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2156,7 -1677,6 +2156,7 @@@ msgstr "%s 加密过的数据\n
  msgid "encrypted with unknown algorithm %d\n"
  msgstr "以未知的算法 %d 加密\n"
  
- #: g10/decrypt-data.c:164 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:129
  msgid ""
  "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
  msgstr "警告:报文被使用对称加密算法的弱密钥加密。\n"
@@@ -2246,8 -1748,6 +2246,8 @@@ msgstr "导出时尽可能清除密钥�
  msgid " - skipped"
  msgstr "%s:已跳过:%s\n"
  
- #: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:845 g10/sign.c:1148
++#: g10/export.c:1251 g10/import.c:1543 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:847 g10/sign.c:1150
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
@@@ -2271,8 -1767,6 +2271,8 @@@ msgstr "密钥 %s:PGP 2.x 样式的�
  msgid "WARNING: nothing exported\n"
  msgstr "警告:没有导出任何东西\n"
  
- #: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
- #: g10/plaintext.c:151 g10/plaintext.c:174
++#: g10/export.c:2283 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/plaintext.c:167 g10/plaintext.c:190
  #, fuzzy, c-format
  #| msgid "error creating `%s': %s\n"
  msgid "error creating '%s': %s\n"
@@@ -2320,8 -1805,6 +2320,8 @@@ msgstr "建立‘%s’时发生错误�
  msgid "No fingerprint"
  msgstr "CA 指纹:"
  
- #: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
- #: g10/revoke.c:701
++#: g10/getkey.c:1873 g10/keyedit.c:2929 g10/keyedit.c:3016 g10/revoke.c:637
++#: g10/revoke.c:702
  #, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "找不到私钥“%s”:%s\n"
@@@ -2353,217 -1831,173 +2353,223 @@@ msgstr "--allow-non-selfsigned-uid 使�
  msgid "using subkey %s instead of primary key %s\n"
  msgstr "使用子钥 %s 而非主钥 %s\n"
  
- #: g10/gpg.c:424 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:200
  #, fuzzy
  msgid "make a signature"
  msgstr "|[文件名]|生成一份签名"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:427
  #, fuzzy
  msgid "make a clear text signature"
  msgstr "|[文件名]|生成一份明文签名"
  
- #: g10/gpg.c:426 sm/gpgsm.c:202
++#: g10/gpg.c:429 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "生成一份分离的签名"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:430 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "加密数据"
  
- #: g10/gpg.c:429
++#: g10/gpg.c:432
  msgid "encryption only with symmetric cipher"
  msgstr "仅使用对称加密"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:434 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "解密数据(默认)"
  
- #: g10/gpg.c:433 sm/gpgsm.c:206
++#: g10/gpg.c:436 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "验证签名"
  
- #: g10/gpg.c:435 sm/gpgsm.c:207
++#: g10/gpg.c:438 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "列出密钥"
  
- #: g10/gpg.c:437
++#: g10/gpg.c:440
  msgid "list keys and signatures"
  msgstr "列出密钥和签名"
  
- #: g10/gpg.c:438
++#: g10/gpg.c:443
  msgid "list and check key signatures"
  msgstr "列出并检查密钥签名"
  
- #: g10/gpg.c:439 sm/gpgsm.c:212
++#: g10/gpg.c:445 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "列出密钥和指纹"
  
- #: g10/gpg.c:440 sm/gpgsm.c:210
++#: g10/gpg.c:446 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "列出私钥"
  
- #: g10/gpg.c:442 sm/gpgsm.c:213
++#: g10/gpg.c:448 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "生成一副新的密钥对"
  
- #: g10/gpg.c:444
++#: g10/gpg.c:451
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly generate a new key pair"
  msgstr "生成一副新的密钥对"
  
- #: g10/gpg.c:446
++#: g10/gpg.c:454
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly add a new user-id"
  msgstr "生成一副新的密钥对"
  
- #: g10/gpg.c:449
++#: g10/gpg.c:459
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly revoke a user-id"
  msgstr "生成一副新的密钥对"
  
- #: g10/gpg.c:451
++#: g10/gpg.c:462
+ #, fuzzy
+ #| msgid "generate a new key pair"
+ msgid "quickly set a new expiration date"
+ msgstr "生成一副新的密钥对"
+ 
++#: g10/gpg.c:464
  msgid "full featured key pair generation"
  msgstr ""
  
- #: g10/gpg.c:452
++#: g10/gpg.c:467
  msgid "generate a revocation certificate"
  msgstr "生成一份吊销证书"
  
- #: g10/gpg.c:454 sm/gpgsm.c:215
++#: g10/gpg.c:470 sm/gpgsm.c:216
  msgid "remove keys from the public keyring"
  msgstr "从公钥钥匙环里删除密钥"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:472
  msgid "remove keys from the secret keyring"
  msgstr "从私钥钥匙环里删除密钥"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:474
  #, fuzzy
  #| msgid "sign a key"
  msgid "quickly sign a key"
  msgstr "为某把密钥添加签名"
  
- #: g10/gpg.c:460
++#: g10/gpg.c:476
  #, fuzzy
  #| msgid "sign a key locally"
  msgid "quickly sign a key locally"
  msgstr "为某把密钥添加本地签名"
  
- #: g10/gpg.c:461
++#: g10/gpg.c:477
  msgid "sign a key"
  msgstr "为某把密钥添加签名"
  
- #: g10/gpg.c:462
++#: g10/gpg.c:478
  msgid "sign a key locally"
  msgstr "为某把密钥添加本地签名"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:479
  msgid "sign or edit a key"
  msgstr "编辑某把密钥或为其添加签名"
  
- #: g10/gpg.c:465 sm/gpgsm.c:233
++#: g10/gpg.c:481 sm/gpgsm.c:234
  #, fuzzy
  msgid "change a passphrase"
  msgstr "更改密码"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:485
  msgid "export keys"
  msgstr "导出密钥"
  
- #: g10/gpg.c:468
++#: g10/gpg.c:486
  msgid "export keys to a keyserver"
  msgstr "把密钥导出到某个公钥服务器上"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:487
  msgid "import keys from a keyserver"
  msgstr "从公钥服务器上导入密钥"
  
- #: g10/gpg.c:471
++#: g10/gpg.c:490
  msgid "search for keys on a keyserver"
  msgstr "在公钥服务器上搜寻密钥"
  
- #: g10/gpg.c:473
++#: g10/gpg.c:492
  msgid "update all keys from a keyserver"
  msgstr "从公钥服务器更新所有的本地密钥"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:498
  msgid "import/merge keys"
  msgstr "导入/合并密钥"
  
- #: g10/gpg.c:482
++#: g10/gpg.c:501
  msgid "print the card status"
  msgstr "打印卡状态"
  
- #: g10/gpg.c:483
++#: g10/gpg.c:502
  msgid "change data on a card"
  msgstr "更改卡上的数据"
  
- #: g10/gpg.c:484
++#: g10/gpg.c:504
  msgid "change a card's PIN"
  msgstr "更改卡的 PIN"
  
- #: g10/gpg.c:496
++#: g10/gpg.c:516
  msgid "update the trust database"
  msgstr "更新信任度数据库"
  
- #: g10/gpg.c:505
++#: g10/gpg.c:525
  #, fuzzy
  msgid "print message digests"
  msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
  
- #: g10/gpg.c:508 sm/gpgsm.c:228
++#: g10/gpg.c:528 sm/gpgsm.c:229
  msgid "run in server mode"
  msgstr ""
  
- #: g10/gpg.c:510
++#: g10/gpg.c:530
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:514 sm/gpgsm.c:246
++#: g10/gpg.c:534 sm/gpgsm.c:248
  msgid "create ascii armored output"
  msgstr "输出经 ASCII 封装"
  
- #: g10/gpg.c:517 sm/gpgsm.c:262
++#: g10/gpg.c:537 sm/gpgsm.c:264
  #, fuzzy
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|某甲|为收件者“某甲”加密"
  
- #: g10/gpg.c:533 sm/gpgsm.c:298
++#: g10/gpg.c:553 sm/gpgsm.c:300
  #, fuzzy
  msgid "|USER-ID|use USER-ID to sign or decrypt"
  msgstr "使用这个用户标识来签名或解密"
  
- #: g10/gpg.c:539
++#: g10/gpg.c:559
  #, fuzzy
  msgid "|N|set compress level to N (0 disables)"
  msgstr "|N|设定压缩等级为 N (0 表示不压缩)"
  
- #: g10/gpg.c:546
++#: g10/gpg.c:566
  msgid "use canonical text mode"
  msgstr "使用标准的文本模式"
  
- #: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
++#: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
  #, fuzzy
  msgid "|FILE|write output to FILE"
  msgstr "从‘%s’读取选项\n"
  
- #: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
++#: g10/gpg.c:598 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
  msgid "do not make any changes"
  msgstr "不做任何改变"
  
- #: g10/gpg.c:579
++#: g10/gpg.c:599
  msgid "prompt before overwriting"
  msgstr "覆盖前先询问"
  
- #: g10/gpg.c:628
++#: g10/gpg.c:648
  msgid "use strict OpenPGP behavior"
  msgstr "行为严格遵循 OpenPGP 定义"
  
- #: g10/gpg.c:654 sm/gpgsm.c:355
++#: g10/gpg.c:674 sm/gpgsm.c:357
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2571,7 -2005,16 +2577,17 @@@ msgstr "
  "@\n"
  "(请参考在线说明以获得所有命令和选项的完整清单)\n"
  
- #: g10/gpg.c:657 sm/gpgsm.c:358
++#: g10/gpg.c:677
+ #, fuzzy
+ #| msgid ""
+ #| "@\n"
+ #| "Examples:\n"
+ #| "\n"
+ #| " -se -r Bob [file]          sign and encrypt for user Bob\n"
+ #| " --clear-sign [file]         make a clear text signature\n"
+ #| " --detach-sign [file]       make a detached signature\n"
+ #| " --list-keys [names]        show keys\n"
+ #| " --fingerprint [names]      show fingerprints\n"
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2591,13 -2034,11 +2607,13 @@@ msgstr "
  " --list-keys [某甲]           显示密钥\n"
  " --fingerprint [某甲]         显示指纹\n"
  
- #: g10/gpg.c:1026
++#: g10/gpg.c:1047
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
  msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
  
- #: g10/gpg.c:1029
++#: g10/gpg.c:1050
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg [options] [files]\n"
@@@ -2612,7 -2053,6 +2628,7 @@@ msgstr "
  "签名、检查、加密或解密\n"
  "默认的操作依输入数据而定\n"
  
- #: g10/gpg.c:1040 sm/gpgsm.c:588
++#: g10/gpg.c:1061 sm/gpgsm.c:580
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2620,80 -2060,65 +2636,80 @@@ msgstr "
  "\n"
  "支持的算法:\n"
  
- #: g10/gpg.c:1043
++#: g10/gpg.c:1064
  msgid "Pubkey: "
  msgstr "公钥:"
  
- #: g10/gpg.c:1050 g10/keyedit.c:3402
++#: g10/gpg.c:1071 g10/keyedit.c:3483
  msgid "Cipher: "
  msgstr "对称加密:"
  
- #: g10/gpg.c:1057
++#: g10/gpg.c:1078
  msgid "Hash: "
  msgstr "散列:"
  
- #: g10/gpg.c:1064 g10/keyedit.c:3451
++#: g10/gpg.c:1085 g10/keyedit.c:3532
  msgid "Compression: "
  msgstr "压缩:"
  
- #: g10/gpg.c:1133 sm/gpgsm.c:662
++#: g10/gpg.c:1154 sm/gpgsm.c:654
  #, fuzzy, c-format
  msgid "usage: %s [options] %s\n"
  msgstr "用法:gpg [选项] "
  
- #: g10/gpg.c:1321 sm/gpgsm.c:751
++#: g10/gpg.c:1342 sm/gpgsm.c:743
  msgid "conflicting commands\n"
  msgstr "冲突的指令\n"
  
- #: g10/gpg.c:1339
++#: g10/gpg.c:1360
  #, fuzzy, c-format
  #| msgid "no = sign found in group definition `%s'\n"
  msgid "no = sign found in group definition '%s'\n"
  msgstr "在‘%s’组定义里找不到等号(=)\n"
  
- #: g10/gpg.c:1537
++#: g10/gpg.c:1558
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe ownership on homedir `%s'\n"
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr "警告:用户目录‘%s’所有权不安全\n"
  
- #: g10/gpg.c:1540
++#: g10/gpg.c:1561
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe ownership on configuration file `%s'\n"
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
  msgstr "警告:配置文件‘%s’所有权不安全\n"
  
- #: g10/gpg.c:1543
++#: g10/gpg.c:1564
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe ownership on extension `%s'\n"
  msgid "WARNING: unsafe ownership on extension '%s'\n"
  msgstr "警告:扩展模块‘%s’所有权不安全\n"
  
- #: g10/gpg.c:1549
++#: g10/gpg.c:1570
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe permissions on homedir `%s'\n"
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
  msgstr "警告:用户目录‘%s’权限不安全\n"
  
- #: g10/gpg.c:1552
++#: g10/gpg.c:1573
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe permissions on configuration file `%s'\n"
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
  msgstr "警告:配置文件‘%s’权限不安全\n"
  
- #: g10/gpg.c:1555
++#: g10/gpg.c:1576
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe permissions on extension `%s'\n"
  msgid "WARNING: unsafe permissions on extension '%s'\n"
  msgstr "警告:扩展模块‘%s’权限不安全\n"
  
- #: g10/gpg.c:1561
++#: g10/gpg.c:1582
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
  msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
  msgstr "警告:用户目录‘%s’的关闭目录所有权不安全\n"
  
- #: g10/gpg.c:1564
++#: g10/gpg.c:1585
  #, fuzzy, c-format
  #| msgid ""
  #| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2701,19 -2126,16 +2717,19 @@@ msgid "
  "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
  msgstr "警告:配置文件‘%s’的关闭目录所有权不安全\n"
  
- #: g10/gpg.c:1567
++#: g10/gpg.c:1588
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
  msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
  msgstr "警告:扩展模块‘%s’的关闭目录所有权不安全\n"
  
- #: g10/gpg.c:1573
++#: g10/gpg.c:1594
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
  msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
  msgstr "警告:用户目录‘%s’的关闭目录权限不安全\n"
  
- #: g10/gpg.c:1576
++#: g10/gpg.c:1597
  #, fuzzy, c-format
  #| msgid ""
  #| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2722,513 -2144,355 +2738,452 @@@ msgid "
  "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
  msgstr "警告:配置文件‘%s’的关闭目录权限不安全\n"
  
- #: g10/gpg.c:1579
++#: g10/gpg.c:1600
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
  msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
  msgstr "警告:扩展模块‘%s’的关闭目录权限不安全\n"
  
- #: g10/gpg.c:1786
++#: g10/gpg.c:1816
  #, fuzzy, c-format
  #| msgid "unknown configuration item `%s'\n"
  msgid "unknown configuration item '%s'\n"
  msgstr "未知的配置项‘%s’\n"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1925
  msgid "display photo IDs during key listings"
  msgstr "列出密钥时显示用户标识"
  
- #: g10/gpg.c:1895
++#: g10/gpg.c:1927
  #, fuzzy
  #| msgid "show user ID validity during key listings"
  msgid "show key usage information during key listings"
  msgstr "列出密钥时显示用户标识的有效性"
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1929
  msgid "show policy URLs during signature listings"
  msgstr "列出签名时显示策略 URL"
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1931
  msgid "show all notations during signature listings"
  msgstr "列出签名时显示 IETF 标准注记"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1933
  msgid "show IETF standard notations during signature listings"
  msgstr "列出签名时显示 IETF 标准注记"
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1937
  msgid "show user-supplied notations during signature listings"
  msgstr "列出签名时显示用户提供的注记"
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1939
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "列出密钥时显示首选公钥服务器 URL"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1941
  msgid "show user ID validity during key listings"
  msgstr "列出密钥时显示用户标识的有效性"
  
- #: g10/gpg.c:1911
++#: g10/gpg.c:1943
  msgid "show revoked and expired user IDs in key listings"
  msgstr "列出密钥时显示已吊销或已过期的用户标识"
  
- #: g10/gpg.c:1913
++#: g10/gpg.c:1945
  msgid "show revoked and expired subkeys in key listings"
  msgstr "列出密钥时显示已吊销或已过期的子钥"
  
- #: g10/gpg.c:1915
++#: g10/gpg.c:1947
  msgid "show the keyring name in key listings"
  msgstr "列出密钥时显示钥匙环的名称"
  
- #: g10/gpg.c:1917
++#: g10/gpg.c:1949
  msgid "show expiration dates during signature listings"
  msgstr "列出签名时显示过期日期"
  
- #: g10/gpg.c:2019 g10/gpg.c:2056
++#: g10/gpg.c:2051 g10/gpg.c:2088
  #, fuzzy, c-format
  msgid "valid values for option '%s':\n"
  msgstr "无效的列表选项\n"
  
- #: g10/gpg.c:2030
++#: g10/gpg.c:2062
  #, fuzzy, c-format
  #| msgid "unknown option `%s'\n"
  msgid "unknown TOFU policy '%s'\n"
  msgstr "未知的选项 '%s'\n"
  
- #: g10/gpg.c:2032 g10/gpg.c:2068
++#: g10/gpg.c:2064 g10/gpg.c:2100
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2066
++#: g10/gpg.c:2098 g10/keygen.c:167
  #, fuzzy, c-format
  msgid "invalid value for option '%s'\n"
  msgstr "无效的列表选项\n"
  
- #: g10/gpg.c:2203
++#: g10/gpg.c:2235
  #, fuzzy, c-format
  #| msgid "NOTE: old default options file `%s' ignored\n"
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "注意:旧式的默认配置文件‘%s’已被忽略\n"
  
- #: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
++#: g10/gpg.c:2839 g10/gpg.c:3610 g10/gpg.c:3622
  #, 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:2978 g10/gpg.c:2990
++#: g10/gpg.c:3011 g10/gpg.c:3023
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid signature expiration\n"
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "‘%s’不是一个有效的签名过期日期\n"
  
- #: g10/gpg.c:3012
++#: g10/gpg.c:3045
  #, fuzzy, c-format
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "电子邮件地址无效\n"
  
- #: g10/gpg.c:3044 sm/gpgsm.c:1166
++#: g10/gpg.c:3077 sm/gpgsm.c:1158
  #, fuzzy, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "无效的‘%s’散列算法\n"
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3130
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid character set\n"
  msgid "'%s' is not a valid character set\n"
  msgstr "‘%s’不是一个有效的字符集\n"
  
- #: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
++#: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
  msgid "could not parse keyserver URL\n"
  msgstr "无法解析公钥服务器 URL\n"
  
- #: g10/gpg.c:3137
++#: g10/gpg.c:3170
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d:无效的公钥服务器选项\n"
  
- #: g10/gpg.c:3140
++#: g10/gpg.c:3173
  msgid "invalid keyserver options\n"
  msgstr "无效的公钥服务器选项\n"
  
- #: g10/gpg.c:3147
++#: g10/gpg.c:3180
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d:无效的导入选项\n"
  
- #: g10/gpg.c:3150
++#: g10/gpg.c:3183
  msgid "invalid import options\n"
  msgstr "无效的导入选项\n"
  
- #: g10/gpg.c:3156 g10/gpg.c:3171
++#: g10/gpg.c:3189 g10/gpg.c:3204
  #, fuzzy, c-format
  #| msgid "invalid list options\n"
  msgid "invalid filter option: %s\n"
  msgstr "无效的列表选项\n"
  
- #: g10/gpg.c:3162
++#: g10/gpg.c:3195
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d:无效的导出选项\n"
  
- #: g10/gpg.c:3165
++#: g10/gpg.c:3198
  msgid "invalid export options\n"
  msgstr "无效的导出选项\n"
  
- #: g10/gpg.c:3177
++#: g10/gpg.c:3210
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d:无效的列表选项\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3213
  msgid "invalid list options\n"
  msgstr "无效的列表选项\n"
  
- #: g10/gpg.c:3188
++#: g10/gpg.c:3221
  msgid "display photo IDs during signature verification"
  msgstr "验证签名时显示照片标识"
  
- #: g10/gpg.c:3190
++#: g10/gpg.c:3223
  msgid "show policy URLs during signature verification"
  msgstr "验证签名时显示策略 URL"
  
- #: g10/gpg.c:3192
++#: g10/gpg.c:3225
  msgid "show all notations during signature verification"
  msgstr "验证签名时显示所有注记"
  
- #: g10/gpg.c:3194
++#: g10/gpg.c:3227
  msgid "show IETF standard notations during signature verification"
  msgstr "验证签名时显示 IETF 标准注记"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3231
  msgid "show user-supplied notations during signature verification"
  msgstr "验证签名时显示用户提供的注记"
  
- #: g10/gpg.c:3200
++#: g10/gpg.c:3233
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "验证签名时显示首选公钥服务器 URL"
  
- #: g10/gpg.c:3202
++#: g10/gpg.c:3235
  msgid "show user ID validity during signature verification"
  msgstr "验证签名时显示用户标识的有效性"
  
- #: g10/gpg.c:3204
++#: g10/gpg.c:3237
  msgid "show revoked and expired user IDs in signature verification"
  msgstr "验证密钥时显示已吊销或已过期的子钥"
  
- #: g10/gpg.c:3206
++#: g10/gpg.c:3239
  #, fuzzy
  msgid "show only the primary user ID in signature verification"
  msgstr "验证密钥时显示已吊销或已过期的子钥"
  
- #: g10/gpg.c:3208
++#: g10/gpg.c:3241
  msgid "validate signatures with PKA data"
  msgstr "使用 PKA 数据验证签名的有效性"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3243
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr "提升带有有效 PKA 数据的签名的信任度"
  
- #: g10/gpg.c:3217
++#: g10/gpg.c:3250
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d:无效的校验选项\n"
  
- #: g10/gpg.c:3220
++#: g10/gpg.c:3253
  msgid "invalid verify options\n"
  msgstr "无效的校验选项\n"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3260
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "无法把运行路径设成 %s\n"
  
- #: g10/gpg.c:3417
++#: g10/gpg.c:3452
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d:无效的 auto-key-locate 清单\n"
  
- #: g10/gpg.c:3420
++#: g10/gpg.c:3455
  msgid "invalid auto-key-locate list\n"
  msgstr "无效的 auto-key-locate 清单\n"
  
- #: g10/gpg.c:3553 sm/gpgsm.c:1507
++#: g10/gpg.c:3592 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
  msgstr "警告:程序可能会创建核心内存转储!\n"
  
- #: g10/gpg.c:3564
++#: g10/gpg.c:3603
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "警告:%s 会使得 %s 失效\n"
  
- #: g10/gpg.c:3573
++#: g10/gpg.c:3612
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s 不可与 %s 并用\n"
  
- #: g10/gpg.c:3576
++#: g10/gpg.c:3615
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s 与 %s 并用无意义!\n"
  
- #: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
++#: g10/gpg.c:3630 sm/gpgsm.c:1518 dirmngr/dirmngr.c:951
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3651
  #, c-format
  msgid "will not run with insecure memory due to %s\n"
  msgstr "不会在内存不安全的情况下运行,原因是 %s\n"
  
- #: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
++#: g10/gpg.c:3686 g10/gpg.c:3710 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "所选的对称加密算法无效\n"
  
- #: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
++#: g10/gpg.c:3692 g10/gpg.c:3716 sm/gpgsm.c:1591 sm/gpgsm.c:1597
  msgid "selected digest algorithm is invalid\n"
  msgstr "所选的散列算法无效\n"
  
- #: g10/gpg.c:3659
++#: g10/gpg.c:3698
  msgid "selected compression algorithm is invalid\n"
  msgstr "所选的压缩算法无效\n"
  
- #: g10/gpg.c:3665
++#: g10/gpg.c:3704
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "所选的证书散列算法无效\n"
  
- #: g10/gpg.c:3680
++#: g10/gpg.c:3719
  msgid "completes-needed must be greater than 0\n"
  msgstr "需要的完全可信签名数一定要大于 0\n"
  
- #: g10/gpg.c:3682
++#: g10/gpg.c:3721
  msgid "marginals-needed must be greater than 1\n"
  msgstr "需要的勉强可信签名数一定要大于 1\n"
  
- #: g10/gpg.c:3684
++#: g10/gpg.c:3723
  msgid "max-cert-depth must be in the range from 1 to 255\n"
  msgstr "最大验证深度一定要介于 1 和 255 之间\n"
  
- #: g10/gpg.c:3686
++#: g10/gpg.c:3725
  msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
  msgstr "无效的默认验证级别;一定要是 0,1,2 或 3\n"
  
- #: g10/gpg.c:3688
++#: g10/gpg.c:3727
  msgid "invalid min-cert-level; must be 1, 2, or 3\n"
  msgstr "无效的最小验证级别;一定要是 1,2 或 3\n"
  
- #: g10/gpg.c:3691
++#: g10/gpg.c:3730
  #, fuzzy
  #| 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:3695
++#: g10/gpg.c:3734
  msgid "invalid S2K mode; must be 0, 1 or 3\n"
  msgstr "无效的 S2K 模式;必须是 0,1 或 3\n"
  
- #: g10/gpg.c:3702
++#: g10/gpg.c:3741
  msgid "invalid default preferences\n"
  msgstr "无效的默认首选项\n"
  
- #: g10/gpg.c:3706
++#: g10/gpg.c:3745
  msgid "invalid personal cipher preferences\n"
  msgstr "无效的个人对称加密算法首选项\n"
  
- #: g10/gpg.c:3710
++#: g10/gpg.c:3749
  msgid "invalid personal digest preferences\n"
  msgstr "无效的个人散列算法首选项\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3753
  msgid "invalid personal compress preferences\n"
  msgstr "无效的个人压缩算法首选项\n"
  
- #: g10/gpg.c:3750
++#: g10/gpg.c:3789
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s 尚不能和 %s 并用\n"
  
- #: g10/gpg.c:3797
++#: g10/gpg.c:3836
  #, fuzzy, c-format
  #| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
  
- #: g10/gpg.c:3802
++#: g10/gpg.c:3841
  #, fuzzy, c-format
  #| msgid "you may not use digest algorithm `%s' while in %s mode\n"
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
  
- #: g10/gpg.c:3807
++#: g10/gpg.c:3846
  #, fuzzy, c-format
  #| msgid "you may not use compression algorithm `%s' while in %s mode\n"
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
  
- #: g10/gpg.c:3906
++#: g10/gpg.c:3945
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "初始化信任度数据库失败:%s\n"
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:3957
  msgid "WARNING: recipients (-r) given without using public key encryption\n"
  msgstr "警告:给定了收件人(-r)但并未使用公钥加密\n"
  
- #: g10/gpg.c:3975
- msgid "--store [filename]"
- msgstr "--store [文件名]"
- 
- #: g10/gpg.c:3985
- msgid "--symmetric [filename]"
- msgstr "--symmetric [文件名]"
- 
- #: g10/gpg.c:3989
++#: g10/gpg.c:4028
  #, fuzzy, c-format
  #| msgid "symmetric encryption of `%s' failed: %s\n"
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "对称加密‘%s’失败:%s\n"
  
- #: g10/gpg.c:4000
- msgid "--encrypt [filename]"
- msgstr "--encrypt [文件名]"
- 
- #: g10/gpg.c:4016
- msgid "--symmetric --encrypt [filename]"
- msgstr "--symmetric --encrypt [文件名]"
- 
- #: g10/gpg.c:4018
++#: g10/gpg.c:4057
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
  
- #: g10/gpg.c:4021
++#: g10/gpg.c:4060
  #, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
  
- #: g10/gpg.c:4042
- msgid "--sign [filename]"
- msgstr "--sign [文件名]"
- 
- #: g10/gpg.c:4058
- msgid "--sign --encrypt [filename]"
- msgstr "--sign --encrypt [文件名]"
- 
- #: g10/gpg.c:4076
- msgid "--symmetric --sign --encrypt [filename]"
- msgstr "--symmetric --sign --encrypt [文件名]"
- 
- #: g10/gpg.c:4078
++#: g10/gpg.c:4117
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
  
- #: g10/gpg.c:4081
++#: g10/gpg.c:4120
  #, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
  
- #: g10/gpg.c:4105
- msgid "--sign --symmetric [filename]"
- msgstr "--sign --symmetric [文件名]"
- 
- #: g10/gpg.c:4117
- msgid "--clearsign [filename]"
- msgstr "--clearsign [文件名]"
- 
- #: g10/gpg.c:4147
- msgid "--decrypt [filename]"
- msgstr "--decrypt [文件名]"
- 
- #: g10/gpg.c:4174
- msgid "--sign-key user-id"
- msgstr "--sign-key 用户标识"
- 
- #: g10/gpg.c:4178
- msgid "--lsign-key user-id"
- msgstr "--lsign-key 用户标识"
- 
- #: g10/gpg.c:4199
- msgid "--edit-key user-id [commands]"
- msgstr "--edit-key 用户标识 [指令]"
- 
- #: g10/gpg.c:4215
- #, fuzzy
- msgid "--passwd <user-id>"
- msgstr "--sign-key 用户标识"
- 
- #: g10/gpg.c:4411 g10/keyserver.c:1837
++#: g10/gpg.c:4462 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "上传至公钥服务器失败:%s\n"
  
- #: g10/gpg.c:4416
++#: g10/gpg.c:4467
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "从公钥服务器接收失败:%s\n"
  
- #: g10/gpg.c:4422
++#: g10/gpg.c:4473
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "导出密钥失败:%s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4486
  #, fuzzy, c-format
  #| msgid "key export failed: %s\n"
  msgid "export as ssh key failed: %s\n"
  msgstr "导出密钥失败:%s\n"
  
- #: g10/gpg.c:4447
++#: g10/gpg.c:4498
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "搜寻公钥服务器失败:%s\n"
  
- #: g10/gpg.c:4460
++#: g10/gpg.c:4511
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "从公钥服务器更新失败:%s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4578
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "解开 ASCII 封装失败:%s\n"
  
- #: g10/gpg.c:4538
++#: g10/gpg.c:4589
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "进行 ASCII 封装失败:%s\n"
  
- #: g10/gpg.c:4630
++#: g10/gpg.c:4681
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
  msgstr "无效的‘%s’散列算法\n"
  
- #: g10/gpg.c:4776 g10/tofu.c:2002
++#: g10/gpg.c:4827 g10/tofu.c:2151
  #, fuzzy, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "取得当前密钥信息时出错:%s\n"
  
- #: g10/gpg.c:4788
++#: g10/gpg.c:4839
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4835
- msgid "[filename]"
- msgstr "[文件名]"
- 
- #: g10/gpg.c:4841
++#: g10/gpg.c:4894
  msgid "Go ahead and type your message ...\n"
  msgstr "请开始键入您的报文……\n"
  
- #: g10/gpg.c:5179
++#: g10/gpg.c:5232
  msgid "the given certification policy URL is invalid\n"
  msgstr "给定的的验证策略 URL 无效\n"
  
- #: g10/gpg.c:5181
++#: g10/gpg.c:5234
  msgid "the given signature policy URL is invalid\n"
  msgstr "给定的签名策略 URL 无效\n"
  
- #: g10/gpg.c:5214
++#: g10/gpg.c:5267
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "给定的首选公钥服务器 URL 无效\n"
  
@@@ -3241,7 -2503,6 +3196,7 @@@ msgstr "从这个钥匙环里取用密�
  msgid "make timestamp conflicts only a warning"
  msgstr "把时间戳矛盾仅视为警告"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:345
++#: g10/gpgv.c:82 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|把状态信息写入文件描述符 FD"
  
@@@ -3272,329 -2528,263 +3227,329 @@@ msgstr "没有可用的帮助
  msgid "No help available for '%s'"
  msgstr "‘%s’没有可用的帮助"
  
- #: g10/import.c:151
++#: g10/import.c:152
  msgid "import signatures that are marked as local-only"
  msgstr "导入被标记为局部的签名"
  
- #: g10/import.c:154
++#: g10/import.c:155
  msgid "repair damage from the pks keyserver during import"
  msgstr "导入时修复 PKS 公钥服务器导致的损坏"
  
- #: g10/import.c:157
++#: g10/import.c:158
  #, fuzzy
  #| msgid "do not update the trustdb after import"
  msgid "do not clear the ownertrust values during import"
  msgstr "导入后不更新信任度数据库"
  
- #: g10/import.c:160
++#: g10/import.c:161
  msgid "do not update the trustdb after import"
  msgstr "导入后不更新信任度数据库"
  
- #: g10/import.c:163
++#: g10/import.c:164
  #, fuzzy
  #| msgid "show key fingerprint"
  msgid "show key during import"
  msgstr "显示密钥指纹"
  
- #: g10/import.c:166
++#: g10/import.c:167
  msgid "only accept updates to existing keys"
  msgstr "只接受对已有密钥的更新"
  
- #: g10/import.c:169
++#: g10/import.c:170
  msgid "remove unusable parts from key after import"
  msgstr "导入后清除密钥中无用的部分"
  
- #: g10/import.c:172
++#: g10/import.c:173
  msgid "remove as much as possible from key after import"
  msgstr "导入后尽可能清除密钥中的可选部分"
  
- #: g10/import.c:175
++#: g10/import.c:176
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:326 g10/import.c:568
++#: g10/import.c:327 g10/import.c:569
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "跳过 %d 样式的区块\n"
  
- #: g10/import.c:585
++#: g10/import.c:586
  #, c-format
  msgid "%lu keys processed so far\n"
  msgstr "目前已处理 %lu 把密钥\n"
  
- #: g10/import.c:655
++#: g10/import.c:656
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "合计被处理的数量:%lu\n"
  
- #: g10/import.c:658
++#: g10/import.c:659
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "  已跳过的新密钥:%lu\n"
  
- #: g10/import.c:660
++#: g10/import.c:661
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "  已跳过的新密钥:%lu\n"
  
- #: g10/import.c:663
++#: g10/import.c:664
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "    遗失用户标识:%lu\n"
  
- #: g10/import.c:666 sm/import.c:130
++#: g10/import.c:667 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "          已导入:%lu"
  
- #: g10/import.c:670 sm/import.c:134
++#: g10/import.c:671 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "          未改变:%lu\n"
  
- #: g10/import.c:672
++#: g10/import.c:673
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "      新用户标识:%lu\n"
  
- #: g10/import.c:674
++#: g10/import.c:675
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "        新的子钥:%lu\n"
  
- #: g10/import.c:676
++#: g10/import.c:677
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "        新的签名:%lu\n"
  
- #: g10/import.c:678
++#: g10/import.c:679
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "    新的密钥吊销:%lu\n"
  
- #: g10/import.c:680 sm/import.c:136
++#: g10/import.c:681 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "      读取的私钥:%lu\n"
  
- #: g10/import.c:682 sm/import.c:138
++#: g10/import.c:683 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "      导入的私钥:%lu\n"
  
- #: g10/import.c:684 sm/import.c:140
++#: g10/import.c:685 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr "    未改变的私钥:%lu\n"
  
- #: g10/import.c:686 sm/import.c:142
++#: g10/import.c:687 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "        未被导入:%lu\n"
  
- #: g10/import.c:688
++#: g10/import.c:689
  #, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "      清除的签名:%lu\n"
  
- #: g10/import.c:690
++#: g10/import.c:691
  #, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "  清除的用户标识:%lu\n"
  
- #: g10/import.c:1034
++#: g10/import.c:1035
  #, fuzzy, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
  "algorithms on these user IDs:\n"
  msgstr "警告:密钥 %s 下列用户标识的首选项中包含不可用的算法:\n"
  
- #: g10/import.c:1076
++#: g10/import.c:1077
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr "         “%s”:对称加密算法 %s 对应首选项\n"
  
- #: g10/import.c:1091
++#: g10/import.c:1092
  #, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "         “%s”:散列算法 %s 对应首选项\n"
  
- #: g10/import.c:1103
++#: g10/import.c:1104
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr "         “%s”:压缩算法 %s 对应首选项\n"
  
- #: g10/import.c:1116
++#: g10/import.c:1117
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr "强烈建议您更新您的首选项并重新分发这把密钥,\n"
  
- #: g10/import.c:1118
++#: g10/import.c:1119
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr "以避免可能的算法不匹配问题\n"
  
- #: g10/import.c:1143
++#: g10/import.c:1144
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr "您可以这样更新您的首选项:gpg --edit-key %s updpref save\n"
  
- #: g10/import.c:1379 g10/import.c:2167
++#: g10/import.c:1380 g10/import.c:2168
  #, c-format
  msgid "key %s: no user ID\n"
  msgstr "密钥 %s:没有用户标识\n"
  
- #: g10/import.c:1385
++#: g10/import.c:1386
  #, fuzzy, c-format
  #| msgid "skipped \"%s\": %s\n"
  msgid "key %s: %s\n"
  msgstr "“%s”已跳过:%s\n"
  
- #: g10/import.c:1386 g10/import.c:2141
++#: g10/import.c:1387 g10/import.c:2142
  msgid "rejected by import screener"
  msgstr ""
  
- #: g10/import.c:1416
++#: g10/import.c:1417
  #, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "密钥 %s:PKS 子钥破损已修复\n"
  
- #: g10/import.c:1434
++#: g10/import.c:1435
  #, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "密钥 %s:已接受不含自身签名的用户标识“%s”\n"
  
- #: g10/import.c:1444 g10/import.c:1475
++#: g10/import.c:1445 g10/import.c:1476
  #, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "密钥 %s:没有有效的用户标识\n"
  
- #: g10/import.c:1446
++#: g10/import.c:1447
  msgid "this may be caused by a missing self-signature\n"
  msgstr "这可能由于遗失自身签名所致\n"
  
- #: g10/import.c:1516 g10/import.c:2318
++#: g10/import.c:1517 g10/import.c:2319
  #, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "密钥 %s:找不到公钥:%s\n"
  
- #: g10/import.c:1522
++#: g10/import.c:1523
  #, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "密钥 %s:新密钥――已跳过\n"
  
- #: g10/import.c:1537
++#: g10/import.c:1538
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "找不到可写的钥匙环:%s\n"
  
- #: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
++#: g10/import.c:1547 g10/import.c:1648 g10/import.c:2385
  #, fuzzy, c-format
  #| msgid "error writing keyring `%s': %s\n"
  msgid "error writing keyring '%s': %s\n"
  msgstr "写入钥匙环‘%s’时出错: %s\n"
  
- #: g10/import.c:1566
++#: g10/import.c:1567
  #, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "密钥 %s:公钥“%s”已导入\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1591
  #, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "密钥 %s:与我们的副本不吻合\n"
  
- #: g10/import.c:1606 g10/import.c:2342
++#: g10/import.c:1607 g10/import.c:2343
  #, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "密钥 %s:无法定位原始的密钥区块:%s\n"
  
- #: g10/import.c:1614 g10/import.c:2349
++#: g10/import.c:1615 g10/import.c:2350
  #, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "密钥 %s:无法读取原始的密钥区块: %s\n"
  
- #: g10/import.c:1657
++#: g10/import.c:1658
  #, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "密钥 %s:“%s”一个新的用户标识\n"
  
- #: g10/import.c:1660
++#: g10/import.c:1661
  #, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "密钥 %s:“%s”%d 个新的用户标识\n"
  
- #: g10/import.c:1663
++#: g10/import.c:1664
  #, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "密钥 %s:“%s”1 个新的签名\n"
  
- #: g10/import.c:1666
++#: g10/import.c:1667
  #, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "密钥 %s:“%s”%d 个新的签名\n"
  
- #: g10/import.c:1669
++#: g10/import.c:1670
  #, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "密钥 %s:“%s”1 个新的子钥\n"
  
- #: g10/import.c:1672
++#: g10/import.c:1673
  #, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "密钥 %s:“%s”%d 个新的子钥\n"
  
- #: g10/import.c:1675
++#: g10/import.c:1676
  #, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "密钥 %s:“%s”%d 个签名被清除\n"
  
- #: g10/import.c:1678
++#: g10/import.c:1679
  #, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "密钥 %s:“%s”%d 个签名被清除\n"
  
- #: g10/import.c:1681
++#: g10/import.c:1682
  #, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "密钥 %s:“%s”%d 个用户标识被清除\n"
  
- #: g10/import.c:1684
++#: g10/import.c:1685
  #, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "密钥 %s:“%s”%d 个用户标识被清除\n"
  
- #: g10/import.c:1707
++#: g10/import.c:1708
  #, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "密钥 %s:“%s”未改变\n"
  
- #: g10/import.c:2019 g10/import.c:2264
++#: g10/import.c:2020 g10/import.c:2265
  #, c-format
  msgid "key %s: secret key imported\n"
  msgstr "密钥 %s:私钥已导入\n"
  
- #: g10/import.c:2027
++#: g10/import.c:2028
  #, fuzzy, c-format
  #| msgid "skipped: secret key already present\n"
  msgid "key %s: secret key already exists\n"
  msgstr "已跳过:私钥已存在\n"
  
- #: g10/import.c:2035
++#: g10/import.c:2036
  #, fuzzy, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "读取‘%s’时出错:%s\n"
  
- #: g10/import.c:2140
++#: g10/import.c:2141
  #, fuzzy, c-format
  #| msgid "secret key \"%s\" not found: %s\n"
  msgid "secret key %s: %s\n"
  msgstr "找不到私钥“%s”:%s\n"
  
- #: g10/import.c:2160 g10/import.c:2195
++#: g10/import.c:2161 g10/import.c:2196
  msgid "importing secret keys not allowed\n"
  msgstr "不允许导入私钥\n"
  
- #: g10/import.c:2184
++#: g10/import.c:2185
  #, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr "密钥 %s:私钥使用了无效的加密算法 %d――已跳过\n"
@@@ -3609,87 -2799,70 +3564,87 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2256
++#: g10/import.c:2257
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2311
++#: g10/import.c:2312
  #, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr "密钥 %s:没有公钥――无法应用吊销证书\n"
  
- #: g10/import.c:2360
++#: g10/import.c:2361
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "密钥 %s:无效的吊销证书:%s――已拒绝\n"
  
- #: g10/import.c:2393
++#: g10/import.c:2394
  #, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "密钥 %s:“%s”吊销证书已被导入\n"
  
- #: g10/import.c:2469
++#: g10/import.c:2470
  #, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "密钥 %s:签名没有用户标识\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2487
  #, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr "密钥 %s:用户标识“%s”使用了不支持的公钥算法\n"
  
- #: g10/import.c:2488
++#: g10/import.c:2489
  #, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "密钥 %s:用户标识“%s”自身签名无效\n"
  
- #: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
++#: g10/import.c:2506 g10/import.c:2532 g10/import.c:2583
  #, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "密钥 %s:不支持的公钥算法\n"
  
- #: g10/import.c:2506
++#: g10/import.c:2507
  #, fuzzy, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "密钥 %s:已新增直接密钥签名\n"
  
- #: g10/import.c:2520
++#: g10/import.c:2521
  #, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "密钥 %s:没有可供绑定的子钥\n"
  
- #: g10/import.c:2533
++#: g10/import.c:2534
  #, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "密钥 %s:无效的子钥绑定\n"
  
- #: g10/import.c:2549
++#: g10/import.c:2550
  #, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "密钥 %s:已删除多重子钥绑定\n"
  
- #: g10/import.c:2571
++#: g10/import.c:2572
  #, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "密钥 %s:没有用于密钥吊销的子钥\n"
  
- #: g10/import.c:2584
++#: g10/import.c:2585
  #, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "密钥 %s:无效的子钥吊销\n"
  
- #: g10/import.c:2599
++#: g10/import.c:2600
  #, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "密钥 %s:已删除多重子钥吊销\n"
  
- #: g10/import.c:2641
++#: g10/import.c:2642
  #, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "密钥 %s:已跳过用户标识“%s”\n"
  
- #: g10/import.c:2665
++#: g10/import.c:2666
  #, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "密钥 %s:已跳过子钥\n"
@@@ -3698,52 -2871,42 +3653,52 @@@
  #  * to import non-exportable signature when we have the
  #  * the secret key used to create this signature - it
  #  * seems that this makes sense
- #: g10/import.c:2694
++#: g10/import.c:2695
  #, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "密钥 %s:不可导出的签名(验证级别 0x%02X)――已跳过\n"
  
- #: g10/import.c:2705
++#: g10/import.c:2706
  #, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "密钥 %s:吊销证书位置错误――已跳过\n"
  
- #: g10/import.c:2723
++#: g10/import.c:2724
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "密钥 %s:无效的吊销证书:%s――已跳过\n"
  
- #: g10/import.c:2737
++#: g10/import.c:2738
  #, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "密钥 %s:子钥签名位置错误――已跳过\n"
  
- #: g10/import.c:2745
++#: g10/import.c:2746
  #, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "密钥 %s:与预期不符的签名验证级别(0x%02X)――已跳过\n"
  
- #: g10/import.c:2887
++#: g10/import.c:2888
  #, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "密钥 %s:检测到重复的用户标识――已合并\n"
  
- #: g10/import.c:2951
++#: g10/import.c:2952
  #, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr "警告:密钥 %s 可能已被吊销:正在取回吊销密钥 %s\n"
  
- #: g10/import.c:2967
++#: g10/import.c:2968
  #, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr "警告:密钥 %s 可能已被吊销:吊销密钥 %s 不存在。\n"
  
- #: g10/import.c:3031
++#: g10/import.c:3032
  #, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "密钥 %s:已新增吊销证书“%s”\n"
  
- #: g10/import.c:3069
++#: g10/import.c:3070
  #, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "密钥 %s:已新增直接密钥签名\n"
@@@ -3781,57 -2938,46 +3736,57 @@@ msgstr "密钥块资源‘%s’:%s\n
  msgid "error opening key DB: %s\n"
  msgstr "‘%s’中出错:%s\n"
  
- #: g10/keydb.c:1782
++#: g10/keydb.c:1786
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "重新建立钥匙环缓存失败: %s\n"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[revocation]"
  msgstr "[吊销]"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[self-signature]"
  msgstr "[自身签名]"
  
- #: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
++#: g10/keyedit.c:433 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: dirmngr/ldap-wrapper.c:694
  #, fuzzy, c-format
  msgid "error allocating memory: %s\n"
  msgstr "建立钥匙环‘%s’时发生错误:%s\n"
  
- #: g10/keyedit.c:629
++#: g10/keyedit.c:630
  #, fuzzy, c-format
  #| msgid "key %s: unsupported public key algorithm\n"
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr "密钥 %s:不支持的公钥算法\n"
  
- #: g10/keyedit.c:638
++#: g10/keyedit.c:639
  #, fuzzy, c-format
  #| msgid "card does not support digest algorithm %s\n"
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "卡不支持散列算法 %s\n"
  
- #: g10/keyedit.c:800
++#: g10/keyedit.c:801
  #, fuzzy
  msgid " (reordered signatures follow)"
  msgstr "完好的签名,来自于“%s”"
  
- #: g10/keyedit.c:913
++#: g10/keyedit.c:914
  #, fuzzy, c-format
  #| msgid "skipped \"%s\": %s\n"
  msgid "key %s:\n"
  msgstr "“%s”已跳过:%s\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:917
  #, fuzzy, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
  msgstr[0] "密钥 %s:“%s”%d 个签名被清除\n"
  msgstr[1] "密钥 %s:“%s”%d 个签名被清除\n"
  
- #: g10/keyedit.c:919 g10/keylist.c:480
++#: g10/keyedit.c:920 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
@@@ -3839,7 -2985,6 +3794,7 @@@ msgid_plural "%d signatures not checke
  msgstr[0] "有 1 份签名因为遗失密钥而未被检查\n"
  msgstr[1] "有 1 份签名因为遗失密钥而未被检查\n"
  
- #: g10/keyedit.c:923 g10/keylist.c:476
++#: g10/keyedit.c:924 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
@@@ -3847,21 -2992,18 +3802,21 @@@ msgid_plural "%d bad signatures\n
  msgstr[0] "%d 个损坏的签名\n"
  msgstr[1] "%d 个损坏的签名\n"
  
- #: g10/keyedit.c:927
++#: g10/keyedit.c:928
  #, fuzzy, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
  msgstr[0] "完好的签名,来自于“%s”"
  msgstr[1] "完好的签名,来自于“%s”"
  
- #: g10/keyedit.c:932
++#: g10/keyedit.c:933
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:992 g10/pkclist.c:274
++#: g10/keyedit.c:993 g10/pkclist.c:274
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
  "keys\n"
@@@ -3872,17 -3014,14 +3827,17 @@@ msgstr "
  "查\n"
  "指纹等)?\n"
  
- #: g10/keyedit.c:996 g10/pkclist.c:286
++#: g10/keyedit.c:997 g10/pkclist.c:286
  #, c-format
  msgid "  %d = I trust marginally\n"
  msgstr "  %d = 我勉强相信\n"
  
- #: g10/keyedit.c:997 g10/pkclist.c:288
++#: g10/keyedit.c:998 g10/pkclist.c:288
  #, c-format
  msgid "  %d = I trust fully\n"
  msgstr "  %d = 我完全相信\n"
  
- #: g10/keyedit.c:1015
++#: g10/keyedit.c:1016
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
@@@ -3891,50 -3030,38 +3846,50 @@@ msgstr "
  "请输入这份信任签名的深度。\n"
  "深度若大于 1 则您将签名的这把密钥将可以以您的名义做出信任签名。\n"
  
- #: g10/keyedit.c:1032
++#: g10/keyedit.c:1033
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr "请输入这份签名的限制域,如果没有请按回车。\n"
  
- #: g10/keyedit.c:1160
++#: g10/keyedit.c:1161
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1168
++#: g10/keyedit.c:1169
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "用户标识“%s”已被吊销。"
  
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
- #: g10/keyedit.c:2246
++#: g10/keyedit.c:1178 g10/keyedit.c:1206 g10/keyedit.c:1233 g10/keyedit.c:1417
++#: g10/keyedit.c:2247
  msgid "Are you sure you still want to sign it? (y/N) "
  msgstr "您仍然想要为它签名吗?(y/N)"
  
- #: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
- #: g10/keyedit.c:2251 g10/keyedit.c:3177
++#: g10/keyedit.c:1192 g10/keyedit.c:1220 g10/keyedit.c:1247 g10/keyedit.c:1423
++#: g10/keyedit.c:2252 g10/keyedit.c:3178
  msgid "  Unable to sign.\n"
  msgstr "  无法添加签名。\n"
  
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1197
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "用户标识“%s”已过期。"
  
- #: g10/keyedit.c:1224
++#: g10/keyedit.c:1225
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "警告:用户标识“%s”不含自身签名。"
  
- #: g10/keyedit.c:1253
++#: g10/keyedit.c:1254
  #, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "可以为用户标识“%s”添加签名。"
  
- #: g10/keyedit.c:1255
++#: g10/keyedit.c:1256
  msgid "Sign it? (y/N) "
  msgstr "为其添加签名吗?(y/N)"
  
- #: g10/keyedit.c:1282
++#: g10/keyedit.c:1283
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -3943,65 -3070,52 +3898,65 @@@ msgstr "
  "“%s”的自身签名是 PGP 2.x 样\n"
  "式的签名。\n"
  
- #: g10/keyedit.c:1291
++#: g10/keyedit.c:1292
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr "您是否想要将它升级成 OpenPGP 的自身签名?(y/N)"
  
- #: g10/keyedit.c:1304
++#: g10/keyedit.c:1305
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
  "has expired.\n"
  msgstr "您目前为“%s”的签名已经过期了。\n"
  
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:1310
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr "您想要发布一份新的签名来取代已过期的那一个吗?(y/N)"
  
- #: g10/keyedit.c:1330
++#: g10/keyedit.c:1331
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
  "is a local signature.\n"
  msgstr "您目前为“%s”的签名是一份本地签名。\n"
  
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:1336
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr "您是否想要把它升级成可以完全导出的签名?(y/N)"
  
- #: g10/keyedit.c:1355
++#: g10/keyedit.c:1356
  #, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "“%s”已由密钥 %s 在本地签名\n"
  
- #: g10/keyedit.c:1359
++#: g10/keyedit.c:1360
  #, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "“%s”已由密钥 %s 签名\n"
  
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:1365
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "您仍然想要为它再次签名吗?(y/N)"
  
- #: g10/keyedit.c:1386
++#: g10/keyedit.c:1387
  #, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "没有东西可以让密钥 %s 签名\n"
  
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1411
  msgid "This key has expired!"
  msgstr "这把密钥已经过期!"
  
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1429
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "这把密钥将在 %s 过期。\n"
  
- #: g10/keyedit.c:1434
++#: g10/keyedit.c:1435
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr "您想要让您的签名也同时过期吗? (Y/n) "
  
- #: g10/keyedit.c:1475
++#: g10/keyedit.c:1476
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -4010,33 -3124,27 +3965,33 @@@ msgstr "
  "您是否谨慎地检查过,确认正要签名的密钥的确属于以上它所声称的所有者呢?\n"
  "如果您不知道这个问题的答案,请输入“0”。\n"
  
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1481
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) 我不作答。 %s\n"
  
- #: g10/keyedit.c:1482
++#: g10/keyedit.c:1483
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) 我根本没有检查过。 %s\n"
  
- #: g10/keyedit.c:1484
++#: g10/keyedit.c:1485
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) 我随意检查过。 %s\n"
  
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:1488
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) 我非常小心地检查过。 %s\n"
  
- #: g10/keyedit.c:1494
++#: g10/keyedit.c:1495
  #, fuzzy
  #| msgid "Your selection? (enter `?' for more information): "
  msgid "Your selection? (enter '?' for more information): "
  msgstr "您的选择?(输入‘?’以获得更多的信息):"
  
- #: g10/keyedit.c:1521
++#: g10/keyedit.c:1522
  #, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -4045,220 -3153,166 +4000,220 @@@ msgstr "
  "您真的确定要签名这把密钥,使用您的密钥\n"
  "“%s”(%s)\n"
  
- #: g10/keyedit.c:1529
++#: g10/keyedit.c:1530
  msgid "This will be a self-signature.\n"
  msgstr "这将是一个自身签名。\n"
  
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:1535
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr "警告:这份签名不会被标记为不可导出。\n"
  
- #: g10/keyedit.c:1541
++#: g10/keyedit.c:1542
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr "警告:这份签名不会被标记成不可吊销。\n"
  
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1552
  msgid "The signature will be marked as non-exportable.\n"
  msgstr "这份签名会被标记成不可导出。\n"
  
- #: g10/keyedit.c:1558
++#: g10/keyedit.c:1559
  msgid "The signature will be marked as non-revocable.\n"
  msgstr "这份签名会被标记成不可吊销。\n"
  
- #: g10/keyedit.c:1565
++#: g10/keyedit.c:1566
  msgid "I have not checked this key at all.\n"
  msgstr "我根本没有检查过这把密钥。\n"
  
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:1571
  msgid "I have checked this key casually.\n"
  msgstr "我随意检查过这把密钥。\n"
  
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:1576
  msgid "I have checked this key very carefully.\n"
  msgstr "我非常小心地检查过这把密钥。\n"
  
- #: g10/keyedit.c:1587
++#: g10/keyedit.c:1588
  msgid "Really sign? (y/N) "
  msgstr "真的要签名吗?(y/N)"
  
- #: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
- #: g10/keyedit.c:6463 g10/sign.c:323
++#: g10/keyedit.c:1639 g10/keyedit.c:6308 g10/keyedit.c:6391 g10/keyedit.c:6500
++#: g10/keyedit.c:6562 g10/sign.c:325
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "签名时失败: %s\n"
  
- #: g10/keyedit.c:1725
++#: g10/keyedit.c:1726
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr "只有占位密钥,或者密钥存储在卡上——没有密码可以更改。\n"
  
- #: g10/keyedit.c:1755
++#: g10/keyedit.c:1756
  #, fuzzy, c-format
  #| msgid "error creating passphrase: %s\n"
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "生成密码的时候发生错误:%s\n"
  
- #: g10/keyedit.c:1869
++#: g10/keyedit.c:1870
  msgid "save and quit"
  msgstr "保存并离开"
  
- #: g10/keyedit.c:1872
++#: g10/keyedit.c:1873
  msgid "show key fingerprint"
  msgstr "显示密钥指纹"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1874
  #, fuzzy
  msgid "show the keygrip"
  msgstr "输入注记:"
  
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1875
  msgid "list key and user IDs"
  msgstr "列出密钥和用户标识"
  
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1877
  msgid "select user ID N"
  msgstr "选择用户标识 N"
  
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1878
  msgid "select subkey N"
  msgstr "选择子钥 N"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1879
  msgid "check signatures"
  msgstr "检查签名"
  
- #: g10/keyedit.c:1884
++#: g10/keyedit.c:1885
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr "为所选用户标识添加签名[* 参见下面的相关命令]"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1890
  msgid "sign selected user IDs locally"
  msgstr "为所选用户标识添加本地签名"
  
- #: g10/keyedit.c:1890
++#: g10/keyedit.c:1891
  msgid "sign selected user IDs with a trust signature"
  msgstr "为所选用户标识添加信任签名"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1893
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr "为所选用户标识添加不可吊销签名"
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1895
  msgid "add a user ID"
  msgstr "增加一个用户标识"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1897
  msgid "add a photo ID"
  msgstr "增加一个照片标识"
  
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1898
  msgid "delete selected user IDs"
  msgstr "删除选定的用户标识"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1901
  msgid "add a subkey"
  msgstr "添加一个子钥"
  
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1904
  msgid "add a key to a smartcard"
  msgstr "在智能卡上添加一把密钥"
  
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1906
  msgid "move a key to a smartcard"
  msgstr "将一把密钥移动到智能卡上"
  
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1908
  msgid "move a backup key to a smartcard"
  msgstr "将备份密钥转移到卡上"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1910
  msgid "delete selected subkeys"
  msgstr "删除选定的子钥"
  
- #: g10/keyedit.c:1911
++#: g10/keyedit.c:1912
  msgid "add a revocation key"
  msgstr "增加一把吊销密钥"
  
- #: g10/keyedit.c:1913
++#: g10/keyedit.c:1914
  msgid "delete signatures from the selected user IDs"
  msgstr "删除所选用户标识上的签名"
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1916
  msgid "change the expiration date for the key or selected subkeys"
  msgstr "变更密钥或所选子钥的使用期限"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1918
  msgid "flag the selected user ID as primary"
  msgstr "将所选的用户标识设为首选用户标识"
  
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1921
  msgid "list preferences (expert)"
  msgstr "列出首选项(专家模式)"
  
- #: g10/keyedit.c:1921
++#: g10/keyedit.c:1922
  msgid "list preferences (verbose)"
  msgstr "列出首选项(详细模式)"
  
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:1924
  msgid "set preference list for the selected user IDs"
  msgstr "设定所选用户标识的首选项"
  
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1927
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr "设定所选用户标识的首选公钥服务器的 URL"
  
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1929
  msgid "set a notation for the selected user IDs"
  msgstr "为所选用户标识的设定注记"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1931
  msgid "change the passphrase"
  msgstr "更改密码"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1934
  msgid "change the ownertrust"
  msgstr "更改信任度"
  
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1937
  msgid "revoke signatures on the selected user IDs"
  msgstr "吊销所选用户标识上的签名"
  
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1939
  msgid "revoke selected user IDs"
  msgstr "吊销选定的用户标识"
  
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1942
  msgid "revoke key or selected subkeys"
  msgstr "吊销密钥或选定的子钥"
  
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1944
  msgid "enable key"
  msgstr "启用密钥"
  
- #: g10/keyedit.c:1944
++#: g10/keyedit.c:1945
  msgid "disable key"
  msgstr "禁用密钥"
  
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1947
  msgid "show selected photo IDs"
  msgstr "显示选定的照片标识"
  
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1949
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr "压缩不可用的用户标识并删除不可用的签名"
  
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:1951
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr "压缩不可用的用户标识并删除所有签名"
  
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2063
  msgid "Secret key is available.\n"
  msgstr "私钥可用。\n"
  
- #: g10/keyedit.c:2162
++#: g10/keyedit.c:2163
  msgid "Need the secret key to do this.\n"
  msgstr "要有私钥才能这么做。\n"
  
- #: g10/keyedit.c:2183
++#: g10/keyedit.c:2184
  #, fuzzy
  #| msgid ""
  #| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4276,301 -3330,238 +4231,307 @@@ msgstr "
  "  信任签名,或‘nr’前缀(nrsign)以添加不可吊销签名,或者以上三种前缀的任何组\n"
  "  合(ltsign、tnrsign 等)。\n"
  
- #: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
++#: g10/keyedit.c:2240 g10/keyedit.c:3178 g10/keyedit.c:3317 g10/keyedit.c:3379
  msgid "Key is revoked."
  msgstr "密钥已被吊销。"
  
- #: g10/keyedit.c:2262
++#: g10/keyedit.c:2263
  msgid "Really sign all user IDs? (y/N) "
  msgstr "真的为所有的用户标识签名吗?(y/N)"
  
- #: g10/keyedit.c:2266
++#: g10/keyedit.c:2267
  #, fuzzy
  #| msgid "Really sign all user IDs? (y/N) "
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "真的为所有的用户标识签名吗?(y/N)"
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2275
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "提示:选择要添加签名的用户标识\n"
  
- #: g10/keyedit.c:2285
++#: g10/keyedit.c:2286
  #, fuzzy, c-format
  #| msgid "Unknown signature type `%s'\n"
  msgid "Unknown signature type '%s'\n"
  msgstr "未知的签名类型‘%s’\n"
  
- #: g10/keyedit.c:2309
++#: g10/keyedit.c:2310
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
  msgstr "在 %s 模式中不允许使用这个指令。\n"
  
- #: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
++#: g10/keyedit.c:2332 g10/keyedit.c:2356 g10/keyedit.c:2550
  msgid "You must select at least one user ID.\n"
  msgstr "您至少得选择一个用户标识。\n"
  
- #: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
++#: g10/keyedit.c:2334 g10/keyedit.c:2358 g10/keyedit.c:2512 g10/keyedit.c:2552
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2336
++#: g10/keyedit.c:2337
  msgid "You can't delete the last user ID!\n"
  msgstr "您不能删除最后一个用户标识!\n"
  
- #: g10/keyedit.c:2339
++#: g10/keyedit.c:2340
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "真的要删除所有选定的用户标识吗?(y/N)"
  
- #: g10/keyedit.c:2340
++#: g10/keyedit.c:2341
  msgid "Really remove this user ID? (y/N) "
  msgstr "真的要删除这个用户标识吗?(y/N)"
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2397
++#: g10/keyedit.c:2398
  #, fuzzy
  msgid "Really move the primary key? (y/N) "
  msgstr "真的要删除主钥吗?(y/N)"
  
- #: g10/keyedit.c:2409 g10/keyedit.c:4866
++#: g10/keyedit.c:2410 g10/keyedit.c:4964
  msgid "You must select exactly one key.\n"
  msgstr "您必须指定一把密钥。\n"
  
- #: g10/keyedit.c:2436
++#: g10/keyedit.c:2437
  msgid "Command expects a filename argument\n"
  msgstr "命令需要一个文件名作为参数\n"
  
- #: g10/keyedit.c:2457
++#: g10/keyedit.c:2458
  #, fuzzy, c-format
  #| msgid "Can't open `%s': %s\n"
  msgid "Can't open '%s': %s\n"
  msgstr "无法打开‘%s’:%s\n"
  
- #: g10/keyedit.c:2474
++#: g10/keyedit.c:2475
  #, fuzzy, c-format
  #| msgid "Error reading backup key from `%s': %s\n"
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "从‘%s’读取备份密钥时出错:%s\n"
  
- #: g10/keyedit.c:2509
++#: g10/keyedit.c:2510
  msgid "You must select at least one key.\n"
  msgstr "您必须选择至少一把密钥。\n"
  
- #: g10/keyedit.c:2515
++#: g10/keyedit.c:2516
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "您真的想要删除选定的密钥吗?(y/N)"
  
- #: g10/keyedit.c:2517
++#: g10/keyedit.c:2518
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "您真的要删除这把密钥吗?(y/N)"
  
- #: g10/keyedit.c:2555
++#: g10/keyedit.c:2556
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr "真的要吊销所有选定的用户标识吗?(y/N)"
  
- #: g10/keyedit.c:2556
++#: g10/keyedit.c:2557
  msgid "Really revoke this user ID? (y/N) "
  msgstr "真的要吊销这个用户标识吗?(y/N)"
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2575
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "您真的要吊销整把密钥吗?(y/N)"
  
- #: g10/keyedit.c:2585
++#: g10/keyedit.c:2586
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "您真的要吊销选定的子钥吗?(y/N)"
  
- #: g10/keyedit.c:2587
++#: g10/keyedit.c:2588
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "您真的要吊销这把子钥吗?(y/N)"
  
- #: g10/keyedit.c:2645
++#: g10/keyedit.c:2646
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr "使用用户提供的信任度数据库时信任度可能并未被设定\n"
  
- #: g10/keyedit.c:2690
++#: g10/keyedit.c:2691
  msgid "Set preference list to:\n"
  msgstr "设为首选项列表为:\n"
  
- #: g10/keyedit.c:2697
++#: g10/keyedit.c:2698
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr "真的要更新所选用户标识的首选项吗?(y/N)"
  
- #: g10/keyedit.c:2699
++#: g10/keyedit.c:2700
  msgid "Really update the preferences? (y/N) "
  msgstr "真的要更新首选项吗?(y/N)"
  
- #: g10/keyedit.c:2773
++#: g10/keyedit.c:2774
  msgid "Save changes? (y/N) "
  msgstr "要保存变动吗?(y/N)"
  
- #: g10/keyedit.c:2777
++#: g10/keyedit.c:2778
  msgid "Quit without saving? (y/N) "
  msgstr "要不保存而离开吗?(y/N)"
  
- #: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
- #: g10/keyedit.c:3267 g10/keyedit.c:3332
++#: g10/keyedit.c:2789 g10/keyedit.c:2799 g10/keyedit.c:2943 g10/keyedit.c:3046
++#: g10/keyedit.c:3268 g10/keyedit.c:3333 g10/keyedit.c:3409
  #, c-format
  msgid "update failed: %s\n"
  msgstr "更新失败:%s\n"
  
- #: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
++#: g10/keyedit.c:2805 g10/keyedit.c:3273 g10/keyedit.c:3338 g10/keyedit.c:3416
  msgid "Key not changed so no update needed.\n"
  msgstr "密钥没有变动所以不需要更新。\n"
  
- #: g10/keyedit.c:3038
++#: g10/keyedit.c:3039
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
  msgstr "生成密钥失败:%s\n"
  
- #: g10/keyedit.c:3083
++#: g10/keyedit.c:3084
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "指纹无效"
  
- #: g10/keyedit.c:3112
++#: g10/keyedit.c:3113
  #, fuzzy, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "无法存储指纹:%s\n"
  
- #: g10/keyedit.c:3248 g10/keyedit.c:3251
++#: g10/keyedit.c:3249 g10/keyedit.c:3252
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
  msgstr "无效的数值\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  #, fuzzy
  #| msgid "No such user ID.\n"
  msgid "No matching user IDs."
  msgstr "没有这个用户标识。\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  #, fuzzy
  #| msgid "Nothing to sign with key %s\n"
  msgid "Nothing to sign.\n"
  msgstr "没有东西可以让密钥 %s 签名\n"
  
- #: g10/keyedit.c:3427
++#: g10/keyedit.c:3388
+ #, 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:3508
  msgid "Digest: "
  msgstr "散列:"
  
- #: g10/keyedit.c:3484
++#: g10/keyedit.c:3565
  msgid "Features: "
  msgstr "特点:"
  
- #: g10/keyedit.c:3495
++#: g10/keyedit.c:3576
  msgid "Keyserver no-modify"
  msgstr "公钥服务器不可变造"
  
- #: g10/keyedit.c:3510 g10/keylist.c:377
++#: g10/keyedit.c:3591 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr "首选公钥服务器:"
  
- #: g10/keyedit.c:3518 g10/keyedit.c:3519
++#: g10/keyedit.c:3599 g10/keyedit.c:3600
  msgid "Notations: "
  msgstr "注记:"
  
- #: g10/keyedit.c:3764
++#: g10/keyedit.c:3845
  msgid "There are no preferences on a PGP 2.x-style user ID.\n"
  msgstr "PGP 2.x 样式的用户标识没有首选项。\n"
  
- #: g10/keyedit.c:3836
++#: g10/keyedit.c:3917
  #, fuzzy, c-format
  msgid "The following key was revoked on %s by %s key %s\n"
  msgstr "此密钥已于 %s 被 %s 密钥 %s 所吊销\n"
  
- #: g10/keyedit.c:3860
++#: g10/keyedit.c:3941
  #, c-format
  msgid "This key may be revoked by %s key %s"
  msgstr "这把密钥可被 %s 密钥 %s 吊销"
  
- #: g10/keyedit.c:3866
++#: g10/keyedit.c:3947
  msgid "(sensitive)"
  msgstr " (敏感的)"
  
- #: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3989 g10/keyedit.c:4131 g10/keylist.c:262 g10/keyserver.c:538
  #, c-format
  msgid "created: %s"
  msgstr "创建于:%s"
  
- #: g10/keyedit.c:3911 g10/keylist.c:1852
++#: g10/keyedit.c:3992 g10/keylist.c:1852
  #, c-format
  msgid "revoked: %s"
  msgstr "已吊销:%s"
  
- #: g10/keyedit.c:3913 g10/keylist.c:1858
++#: g10/keyedit.c:3994 g10/keylist.c:1858
  #, c-format
  msgid "expired: %s"
  msgstr "已过期:%s"
  
- #: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyedit.c:3996 g10/keyedit.c:4133 g10/keylist.c:264 g10/keylist.c:1864
 +#: g10/keyserver.c:544
  #, c-format
  msgid "expires: %s"
  msgstr "有效至:%s"
  
- #: g10/keyedit.c:3917
++#: g10/keyedit.c:3998
  #, c-format
  msgid "usage: %s"
  msgstr "可用于:%s"
  
- #: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
++#: g10/keyedit.c:4006 g10/keyedit.c:4026 g10/keylist.c:267
  msgid "card-no: "
  msgstr "卡号:"
  
- #: g10/keyedit.c:3984
++#: g10/keyedit.c:4065
  #, c-format
  msgid "trust: %s"
  msgstr "信任度:%s"
  
- #: g10/keyedit.c:3988
++#: g10/keyedit.c:4069
  #, c-format
  msgid "validity: %s"
  msgstr "有效性:%s"
  
- #: g10/keyedit.c:3995
++#: g10/keyedit.c:4076
  msgid "This key has been disabled"
  msgstr "这把密钥已经被禁用"
  
- #: g10/keyedit.c:4013
++#: g10/keyedit.c:4094
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
  msgstr "请注意,在您重启程序之前,显示的密钥有效性未必正确,\n"
  
- #: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
- #: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: g10/keyedit.c:4150 g10/keyedit.c:4581 g10/keyserver.c:548
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:712
 +#: dirmngr/ocsp.c:703
  msgid "revoked"
  msgstr "已吊销"
  
- #: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
- #: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4152 g10/keyedit.c:4583 g10/keyserver.c:552
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:714
  msgid "expired"
  msgstr "已过期"
  
- #: g10/keyedit.c:4188
++#: g10/keyedit.c:4269
  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 ""
  "警告:没有首选用户标识。此指令可能假定一个不同的用户标识为首选用户标识。\n"
  
- #: g10/keyedit.c:4240
++#: g10/keyedit.c:4321
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr ""
  
- #: g10/keyedit.c:4241
++#: g10/keyedit.c:4322
  #, fuzzy
  #| 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:4300
++#: g10/keyedit.c:4381
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4579,35 -3570,27 +4540,35 @@@ msgstr "
  "警告:这是一把 PGP2 样式的密钥。\n"
  "      增加照片标识可能会导致某些版本的 PGP 不能识别这把密钥。\n"
  
- #: g10/keyedit.c:4305 g10/keyedit.c:4595
++#: g10/keyedit.c:4386 g10/keyedit.c:4676
  msgid "Are you sure you still want to add it? (y/N) "
  msgstr "您确定仍然想要增加吗?(y/N)"
  
- #: g10/keyedit.c:4311
++#: g10/keyedit.c:4392
  msgid "You may not add a photo ID to a PGP2-style key.\n"
  msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n"
  
- #: g10/keyedit.c:4326 g10/keygen.c:2697
++#: g10/keyedit.c:4407 g10/keygen.c:2719
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4509
  msgid "Delete this good signature? (y/N/q)"
  msgstr "删除这个完好的签名吗?(y/N/q)"
  
- #: g10/keyedit.c:4438
++#: g10/keyedit.c:4519
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "删除这个无效的签名吗?(y/N/q)"
  
- #: g10/keyedit.c:4442
++#: g10/keyedit.c:4523
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "删除这个未知的签名吗?(y/N/q)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4530
  msgid "Really delete this self-signature? (y/N)"
  msgstr "真的要删除这个自身签名吗?(y/N)"
  
- #: g10/keyedit.c:4465
++#: g10/keyedit.c:4546
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
@@@ -4615,37 -3598,30 +4576,37 @@@ msgid_plural "Deleted %d signatures.\n
  msgstr[0] "已经删除了 %d 个签名。\n"
  msgstr[1] "已经删除了 %d 个签名。\n"
  
- #: g10/keyedit.c:4469
++#: g10/keyedit.c:4550
  msgid "Nothing deleted.\n"
  msgstr "没有东西被删除。\n"
  
- #: g10/keyedit.c:4504 g10/trust.c:693
++#: g10/keyedit.c:4585 g10/trust.c:716
  msgid "invalid"
  msgstr "无效"
  
- #: g10/keyedit.c:4506
++#: g10/keyedit.c:4587
  #, fuzzy, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "用户标识“%s”:无用部分已清除\n"
  
- #: g10/keyedit.c:4512
++#: g10/keyedit.c:4593
  #, fuzzy, c-format
  msgid "User ID \"%s\": %d signature removed\n"
  msgid_plural "User ID \"%s\": %d signatures removed\n"
  msgstr[0] "密钥 %s:“%s”%d 个签名被清除\n"
  msgstr[1] "密钥 %s:“%s”%d 个签名被清除\n"
  
- #: g10/keyedit.c:4520
++#: g10/keyedit.c:4601
  #, fuzzy, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "用户标识“%s”:无用部分已清除\n"
  
- #: g10/keyedit.c:4521
++#: g10/keyedit.c:4602
  #, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "用户标识“%s”:无用部分已清除\n"
  
- #: g10/keyedit.c:4590
++#: g10/keyedit.c:4671
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4654,42 -3630,34 +4615,42 @@@ msgstr "
  "警告:这是一把 PGP2 样式的密钥。\n"
  "      增加指定吊销者可能会导致某些版本的 PGP 无法识别这把密钥。\n"
  
- #: g10/keyedit.c:4601
++#: g10/keyedit.c:4682
  msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
  msgstr "您不可以为 PGP 2.x 样式的密钥添加指定吊销者。\n"
  
- #: g10/keyedit.c:4618
++#: g10/keyedit.c:4699
  msgid "Enter the user ID of the designated revoker: "
  msgstr "输入指定吊销者的用户标识:"
  
- #: g10/keyedit.c:4643
++#: g10/keyedit.c:4724
  msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
  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:4658
++#: g10/keyedit.c:4739
  msgid "you cannot appoint a key as its own designated revoker\n"
  msgstr "您不能将某把密钥设为它自己的指定吊销者\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:4680
++#: g10/keyedit.c:4761
  msgid "this key has already been designated as a revoker\n"
  msgstr "这把密钥已被指定为一个吊销者\n"
  
- #: g10/keyedit.c:4698
++#: g10/keyedit.c:4779
  msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
  msgstr "警告:将某把密钥指派为指定吊销者的操作无法撤销!\n"
  
- #: g10/keyedit.c:4704
++#: g10/keyedit.c:4785
  msgid ""
  "Are you sure you want to appoint this key as a designated revoker? (y/N) "
  msgstr "您确定要将这把密钥设为指定吊销者吗?(y/N):"
  
- #: g10/keyedit.c:4755
++#: g10/keyedit.c:4848
  #, fuzzy
  #| msgid ""
  #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4698,230 -3666,179 +4659,230 @@@ msgid "
  "N) "
  msgstr "您确定要将这把密钥设为指定吊销者吗?(y/N):"
  
- #: g10/keyedit.c:4760
++#: g10/keyedit.c:4853
  msgid "Changing expiration time for a subkey.\n"
  msgstr "将要变更子钥的使用期限。\n"
  
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:4856
  msgid "Changing expiration time for the primary key.\n"
  msgstr "将要变更主钥的使用期限。\n"
  
- #: g10/keyedit.c:4814
++#: g10/keyedit.c:4910
  msgid "You can't change the expiration date of a v3 key\n"
  msgstr "您不能变更 v3 密钥的使用期限\n"
  
- #: g10/keyedit.c:4987
++#: g10/keyedit.c:5085
  #, c-format
  msgid "signing subkey %s is already cross-certified\n"
  msgstr "签名的子钥 %s 已经交叉验证\n"
  
- #: g10/keyedit.c:4993
++#: g10/keyedit.c:5091
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr "子钥 %s 不签名,因此不需要交叉验证\n"
  
- #: g10/keyedit.c:5108
++#: g10/keyedit.c:5206
  msgid "Please select exactly one user ID.\n"
  msgstr "请精确地选择一个用户标识。\n"
  
- #: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
++#: g10/keyedit.c:5247 g10/keyedit.c:5361 g10/keyedit.c:5474 g10/keyedit.c:5611
  #, c-format
  msgid "skipping v3 self-signature on user ID \"%s\"\n"
  msgstr "跳过用户标识“%s”的 v3 自身签名\n"
  
- #: g10/keyedit.c:5320
++#: g10/keyedit.c:5418
  msgid "Enter your preferred keyserver URL: "
  msgstr "输入您首选的公钥服务器的 URL:"
  
- #: g10/keyedit.c:5399
++#: g10/keyedit.c:5497
  msgid "Are you sure you want to replace it? (y/N) "
  msgstr "您确定要替换它吗?(y/N)"
  
- #: g10/keyedit.c:5400
++#: g10/keyedit.c:5498
  msgid "Are you sure you want to delete it? (y/N) "
  msgstr "您确定要删除它吗?(y/N)"
  
- #: g10/keyedit.c:5459
++#: g10/keyedit.c:5557
  msgid "Enter the notation: "
  msgstr "输入注记:"
  
- #: g10/keyedit.c:5606
++#: g10/keyedit.c:5704
  msgid "Proceed? (y/N) "
  msgstr "继续?(y/N)"
  
- #: g10/keyedit.c:5676
++#: g10/keyedit.c:5774
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "没有索引为 %d 的用户标识\n"
  
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5836
  #, c-format
  msgid "No user ID with hash %s\n"
  msgstr "没有散列值为 %s 的用户标识\n"
  
- #: g10/keyedit.c:5839
++#: g10/keyedit.c:5937
  #, fuzzy, c-format
  #| msgid "No subkey with index %d\n"
  msgid "No subkey with key ID '%s'.\n"
  msgstr "没有索引为 %d 的子钥\n"
  
- #: g10/keyedit.c:5861
++#: g10/keyedit.c:5959
  #, c-format
  msgid "No subkey with index %d\n"
  msgstr "没有索引为 %d 的子钥\n"
  
- #: g10/keyedit.c:6002
++#: g10/keyedit.c:6100
  #, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "用户标识:“%s”\n"
  
- #: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
++#: g10/keyedit.c:6103 g10/keyedit.c:6205 g10/keyedit.c:6253
  #, c-format
  msgid "signed by your key %s on %s%s%s\n"
  msgstr "由您的密钥 %s 于 %s%s%s 签名\n"
  
- #: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
++#: g10/keyedit.c:6105 g10/keyedit.c:6207 g10/keyedit.c:6255
  msgid " (non-exportable)"
  msgstr " (不可导出)"
  
- #: g10/keyedit.c:6011
++#: g10/keyedit.c:6109
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "这份签名已在 %s 过期。\n"
  
- #: g10/keyedit.c:6016
++#: g10/keyedit.c:6114
  msgid "Are you sure you still want to revoke it? (y/N) "
  msgstr "您确定您仍然想要吊销它吗?(y/N)"
  
- #: g10/keyedit.c:6021
++#: g10/keyedit.c:6119
  msgid "Create a revocation certificate for this signature? (y/N) "
  msgstr "要为这份签名生成一份吊销证书吗?(y/N)"
  
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6173
  msgid "Not signed by you.\n"
  msgstr ""
  
- #: g10/keyedit.c:6081
++#: g10/keyedit.c:6179
  #, c-format
  msgid "You have signed these user IDs on key %s:\n"
  msgstr "您已经为这些密钥 %s 上的这些用户标识添加签名:\n"
  
- #: g10/keyedit.c:6110
++#: g10/keyedit.c:6208
  msgid " (non-revocable)"
  msgstr " (不可吊销)"
  
- #: g10/keyedit.c:6117
++#: g10/keyedit.c:6215
  #, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "由您的密钥 %s 于 %s 吊销\n"
  
- #: g10/keyedit.c:6142
++#: g10/keyedit.c:6240
  msgid "You are about to revoke these signatures:\n"
  msgstr "您正在吊销这些签名:\n"
  
- #: g10/keyedit.c:6165
++#: g10/keyedit.c:6263
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "真的要生成吊销证书吗?(y/N)"
  
- #: g10/keyedit.c:6198
++#: g10/keyedit.c:6296
  msgid "no secret key\n"
  msgstr "没有私钥\n"
  
- #: g10/keyedit.c:6246
++#: g10/keyedit.c:6344
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6256
++#: g10/keyedit.c:6354
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "用户标识“%s”已经被吊销。\n"
  
- #: g10/keyedit.c:6273
++#: g10/keyedit.c:6371
  #, c-format
  msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
  msgstr "警告:有一份用户标识签名的日期标记为 %d 秒后的未来\n"
  
- #: g10/keyedit.c:6386
++#: g10/keyedit.c:6485
  #, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "密钥 %s 已被吊销。\n"
  
- #: g10/keyedit.c:6448
++#: g10/keyedit.c:6547
  #, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "子钥 %s 已被吊销。\n"
  
- #: g10/keyedit.c:6545
++#: g10/keyedit.c:6644
  #, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr "正在显示 %s 照片标识(大小为 %ld,属于密钥 %s,用户标识 %d)\n"
  
- #: g10/keygen.c:305
++#: g10/keygen.c:316
  #, fuzzy, c-format
  #| msgid "preference `%s' duplicated\n"
  msgid "preference '%s' duplicated\n"
  msgstr "首选项‘%s’重复\n"
  
- #: g10/keygen.c:312
++#: g10/keygen.c:323
  msgid "too many cipher preferences\n"
  msgstr "太多对称加密算法首选项\n"
  
- #: g10/keygen.c:314
++#: g10/keygen.c:325
  msgid "too many digest preferences\n"
  msgstr "太多散列算法首选项\n"
  
- #: g10/keygen.c:316
++#: g10/keygen.c:327
  msgid "too many compression preferences\n"
  msgstr "太多首选压缩算法\n"
  
- #: g10/keygen.c:457
++#: g10/keygen.c:468
  #, fuzzy, c-format
  #| msgid "invalid item `%s' in preference string\n"
  msgid "invalid item '%s' in preference string\n"
  msgstr "首选项字符串里有无效项‘%s’\n"
  
- #: g10/keygen.c:936
++#: g10/keygen.c:947
  msgid "writing direct signature\n"
  msgstr "正在写入直接签名\n"
  
- #: g10/keygen.c:982
++#: g10/keygen.c:993
  msgid "writing self signature\n"
  msgstr "正在写入自身签名\n"
  
- #: g10/keygen.c:1038
++#: g10/keygen.c:1049
  msgid "writing key binding signature\n"
  msgstr "正在写入密钥绑定签名\n"
  
- #: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
- #: g10/keygen.c:1610 g10/keygen.c:1615
++#: g10/keygen.c:1413 g10/keygen.c:1418 g10/keygen.c:1470 g10/keygen.c:1475
++#: g10/keygen.c:1622 g10/keygen.c:1627
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "密钥尺寸无效:改用 %u 位\n"
  
- #: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
++#: g10/keygen.c:1424 g10/keygen.c:1481 g10/keygen.c:1489 g10/keygen.c:1633
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "密钥尺寸舍入到 %u 位\n"
  
- #: g10/keygen.c:1503
++#: g10/keygen.c:1515
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1677
++#: g10/keygen.c:1689
  msgid "Sign"
  msgstr "签名"
  
- #: g10/keygen.c:1680
++#: g10/keygen.c:1692
  msgid "Certify"
  msgstr "验证"
  
- #: g10/keygen.c:1683
++#: g10/keygen.c:1695
  msgid "Encrypt"
  msgstr "加密"
  
- #: g10/keygen.c:1686
++#: g10/keygen.c:1698
  msgid "Authenticate"
  msgstr "认证"
  
@@@ -4935,158 -3852,127 +4896,158 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1705
++#: g10/keygen.c:1717
  msgid "SsEeAaQq"
  msgstr "SsEeAaQq"
  
- #: g10/keygen.c:1732
++#: g10/keygen.c:1744
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "%s 密钥可能的操作:"
  
- #: g10/keygen.c:1738
++#: g10/keygen.c:1750
  msgid "Current allowed actions: "
  msgstr "目前允许的操作:"
  
- #: g10/keygen.c:1743
++#: g10/keygen.c:1755
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) 选择是否用于签名\n"
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) 选择是否用于加密\n"
  
- #: g10/keygen.c:1749
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) 选择是否用于认证\n"
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) 已完成\n"
  
- #: g10/keygen.c:1881 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1893 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "请选择您要使用的密钥种类:\n"
  
- #: g10/keygen.c:1885
++#: g10/keygen.c:1897
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) DSA 和 ElGamal (默认)\n"
  
- #: g10/keygen.c:1889
++#: g10/keygen.c:1901
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA 和 ElGamal (默认)\n"
  
- #: g10/keygen.c:1892
++#: g10/keygen.c:1904
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (仅用于签名)\n"
  
- #: g10/keygen.c:1894
++#: g10/keygen.c:1906
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (仅用于签名)\n"
  
- #: g10/keygen.c:1900
++#: g10/keygen.c:1912
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) ElGamal (仅用于加密)\n"
  
- #: g10/keygen.c:1902
++#: g10/keygen.c:1914
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (仅用于加密)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1920
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (自定义用途)\n"
  
- #: g10/keygen.c:1910
++#: g10/keygen.c:1922
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (自定义用途)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1928
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA 和 ElGamal (默认)\n"
  
- #: g10/keygen.c:1918
++#: g10/keygen.c:1930
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (仅用于签名)\n"
  
- #: g10/keygen.c:1920
++#: g10/keygen.c:1932
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (set your own capabilities)\n"
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) DSA (自定义用途)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1934
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) RSA (仅用于加密)\n"
  
- #: g10/keygen.c:1926
++#: g10/keygen.c:1938
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
  msgstr "  (2) 加密密钥\n"
  
- #: g10/keygen.c:2022 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:206
  #, fuzzy
  msgid "Enter the keygrip: "
  msgstr "输入注记:"
  
- #: g10/keygen.c:2035 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2047 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2049 sm/certreqgen-ui.c:216
  #, fuzzy
  msgid "No key with this keygrip\n"
  msgstr "没有索引为 %d 的子钥\n"
  
- #: g10/keygen.c:2111 g10/keygen.c:2125
++#: g10/keygen.c:2133 g10/keygen.c:2147
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
  msgstr "舍入到 %u 位\n"
  
- #: g10/keygen.c:2166
++#: g10/keygen.c:2188
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr "%s 密钥长度应在 %u 位与 %u 位之间。\n"
  
- #: g10/keygen.c:2174
++#: g10/keygen.c:2196
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "您想要用多大的密钥尺寸?(%u)"
  
- #: g10/keygen.c:2177 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2199 sm/certreqgen-ui.c:183
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "您想要用多大的密钥尺寸?(%u)"
  
- #: g10/keygen.c:2191 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2213 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "您所要求的密钥尺寸是 %u 位\n"
  
- #: g10/keygen.c:2237
++#: g10/keygen.c:2259
  #, fuzzy
  #| msgid "Please select what kind of key you want:\n"
  msgid "Please select which elliptic curve you want:\n"
  msgstr "请选择您要使用的密钥种类:\n"
  
- #: g10/keygen.c:2409
++#: g10/keygen.c:2431
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5102,7 -3988,6 +5063,7 @@@ msgstr "
  "      <n>m = 密钥在 n 月后过期\n"
  "      <n>y = 密钥在 n 年后过期\n"
  
- #: g10/keygen.c:2420
++#: g10/keygen.c:2442
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5118,38 -4003,30 +5079,38 @@@ msgstr "
  "      <n>m = 签名在 n 月后过期\n"
  "      <n>y = 签名在 n 年后过期\n"
  
- #: g10/keygen.c:2443
++#: g10/keygen.c:2465
  msgid "Key is valid for? (0) "
  msgstr "密钥的有效期限是?(0) "
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2470
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "签名的有效期限是多久?(%s) "
  
- #: g10/keygen.c:2461 g10/keygen.c:2486
++#: g10/keygen.c:2483 g10/keygen.c:2508
  msgid "invalid value\n"
  msgstr "无效的数值\n"
  
- #: g10/keygen.c:2468
++#: g10/keygen.c:2490
  msgid "Key does not expire at all\n"
  msgstr "密钥永远不会过期\n"
  
- #: g10/keygen.c:2469
++#: g10/keygen.c:2491
  msgid "Signature does not expire at all\n"
  msgstr "签名永远不会过期\n"
  
- #: g10/keygen.c:2474
++#: g10/keygen.c:2496
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "密钥于 %s 过期\n"
  
- #: g10/keygen.c:2475
++#: g10/keygen.c:2497
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "签名于 %s 过期\n"
  
- #: g10/keygen.c:2479
++#: g10/keygen.c:2501
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5157,11 -4034,9 +5118,11 @@@ msgstr "
  "您的系统无法显示 2038 年以后的日期。\n"
  "不过,它可以正确处理 2106 年之前的年份。\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2514
  msgid "Is this correct? (y/N) "
  msgstr "以上正确吗?(y/n)"
  
- #: g10/keygen.c:2560
++#: g10/keygen.c:2582
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5172,7 -4047,6 +5133,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2575
++#: g10/keygen.c:2597
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -5188,50 -4062,39 +5149,50 @@@ msgstr "
  "    “Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>”\n"
  "\n"
  
- #: g10/keygen.c:2594
++#: g10/keygen.c:2616
  msgid "Real name: "
  msgstr "真实姓名:"
  
- #: g10/keygen.c:2603
++#: g10/keygen.c:2625
  msgid "Invalid character in name\n"
  msgstr "姓名含有无效的字符\n"
  
- #: g10/keygen.c:2604
++#: g10/keygen.c:2626
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2608
++#: g10/keygen.c:2630
  msgid "Name may not start with a digit\n"
  msgstr "姓名不可以用数字开头\n"
  
- #: g10/keygen.c:2611
++#: g10/keygen.c:2633
  msgid "Name must be at least 5 characters long\n"
  msgstr "姓名至少要有五个字符长\n"
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2643
  msgid "Email address: "
  msgstr "电子邮件地址:"
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2649
  msgid "Not a valid email address\n"
  msgstr "电子邮件地址无效\n"
  
- #: g10/keygen.c:2636
++#: g10/keygen.c:2658
  msgid "Comment: "
  msgstr "注释:"
  
- #: g10/keygen.c:2642
++#: g10/keygen.c:2664
  msgid "Invalid character in comment\n"
  msgstr "注释含有无效的字符\n"
  
- #: g10/keygen.c:2678
++#: g10/keygen.c:2700
  #, fuzzy, c-format
  #| msgid "You are using the `%s' character set.\n"
  msgid "You are using the '%s' character set.\n"
  msgstr "您正在使用‘%s’字符集。\n"
  
- #: g10/keygen.c:2684
++#: g10/keygen.c:2706
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5242,7 -4105,6 +5203,7 @@@ msgstr "
  "    “%s”\n"
  "\n"
  
- #: g10/keygen.c:2689
++#: g10/keygen.c:2711
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
  
@@@ -5257,35 -4119,28 +5218,35 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2714
++#: g10/keygen.c:2736
  msgid "NnCcEeOoQq"
  msgstr "NnCcEeOoQq"
  
- #: g10/keygen.c:2724
++#: g10/keygen.c:2746
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或退出(Q)?"
  
- #: g10/keygen.c:2725
++#: g10/keygen.c:2747
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q)?"
  
- #: g10/keygen.c:2730
++#: g10/keygen.c:2752
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或退出(Q)?"
  
- #: g10/keygen.c:2731
++#: g10/keygen.c:2753
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q)?"
  
- #: g10/keygen.c:2750
++#: g10/keygen.c:2772
  msgid "Please correct the error first\n"
  msgstr "请先改正错误\n"
  
- #: g10/keygen.c:2796
++#: g10/keygen.c:2818
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5295,13 -4150,10 +5256,13 @@@ msgstr "
  "我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n"
  "鼠标、读写硬盘之类的),这会让随机数字发生器有更好的机会获得足够的熵数。\n"
  
- #: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
- #: g10/keygen.c:4777 g10/keygen.c:4882
++#: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
++#: g10/keygen.c:4330 g10/keygen.c:4803 g10/keygen.c:5064 g10/keygen.c:5169
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "生成密钥失败:%s\n"
  
- #: g10/keygen.c:3598
++#: g10/keygen.c:3922
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5309,71 -4161,58 +5270,71 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3924
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3621
++#: g10/keygen.c:3945
  #, fuzzy, c-format
  #| msgid "key already exists\n"
  msgid "A key for \"%s\" already exists\n"
  msgstr "密钥已存在\n"
  
- #: g10/keygen.c:3626
++#: g10/keygen.c:3950
  #, fuzzy
  #| msgid "Use this key anyway? (y/N) "
  msgid "Create anyway? (y/N) "
  msgstr "无论如何还是使用这把密钥吗?(y/N)"
  
- #: g10/keygen.c:3632
++#: g10/keygen.c:3956
  #, fuzzy
  #| msgid "generating new key\n"
  msgid "creating anyway\n"
  msgstr "生成新密钥\n"
  
- #: g10/keygen.c:3981
++#: g10/keygen.c:4315
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:4013
++#: g10/keygen.c:4358
  msgid "Key generation canceled.\n"
  msgstr "密钥生成已取消。\n"
  
- #: g10/keygen.c:4073
++#: g10/keygen.c:4418
  #, fuzzy, c-format
  #| msgid "can't create backup file `%s': %s\n"
  msgid "can't create backup file '%s': %s\n"
  msgstr "不能创建备份文件‘%s’:%s\n"
  
- #: g10/keygen.c:4093
++#: g10/keygen.c:4438
  #, fuzzy, c-format
  #| msgid "NOTE: backup of card key saved to `%s'\n"
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "注意:卡密钥的备份已保存到‘%s’\n"
  
- #: g10/keygen.c:4244 g10/keygen.c:4393
++#: g10/keygen.c:4589 g10/keygen.c:4738
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
  msgstr "正在将公钥写至`%s'\n"
  
- #: g10/keygen.c:4387
++#: g10/keygen.c:4732
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "找不到可写的公钥钥匙环:%s\n"
  
- #: g10/keygen.c:4401
++#: g10/keygen.c:4746
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error writing public keyring '%s': %s\n"
  msgstr "写入公钥钥匙环‘%s’时发生错误: %s\n"
  
- #: g10/keygen.c:4433
++#: g10/keygen.c:4778
  msgid "public and secret key created and signed.\n"
  msgstr "公钥和私钥已经生成并经签名。\n"
  
- #: g10/keygen.c:4445
++#: g10/keygen.c:4790
  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"
@@@ -5381,33 -4220,27 +5342,33 @@@ msgstr "
  "请注意这把密钥还不能用来加密,您必须先用“--edit-key”指令\n"
  "生成用于加密的子钥。\n"
  
- #: g10/keygen.c:4649 g10/keygen.c:4833
++#: g10/keygen.c:4936 g10/keygen.c:5120
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
  msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
  
- #: g10/keygen.c:4651 g10/keygen.c:4835
++#: g10/keygen.c:4938 g10/keygen.c:5122
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
  msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
  
- #: g10/keygen.c:4662 g10/keygen.c:4846
++#: g10/keygen.c:4949 g10/keygen.c:5133
  #, fuzzy
  #| 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 "注意:为 v3 密钥生成子钥会失去 OpenPGP 兼容性\n"
  
- #: g10/keygen.c:4674 g10/keygen.c:4676
++#: g10/keygen.c:4961 g10/keygen.c:4963
  msgid "Secret parts of primary key are not available.\n"
  msgstr "主钥的私钥部分无法取用。\n"
  
- #: g10/keygen.c:4683 g10/keygen.c:4685
++#: g10/keygen.c:4970 g10/keygen.c:4972
  msgid "Secret parts of primary key are stored on-card.\n"
  msgstr "主钥的私钥部分存储在卡上。\n"
  
- #: g10/keygen.c:4704 g10/keygen.c:4860
++#: g10/keygen.c:4991 g10/keygen.c:5147
  msgid "Really create? (y/N) "
  msgstr "真的要建立吗?(y/N)"
  
@@@ -5731,126 -4499,100 +5692,126 @@@ msgstr "
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
  msgstr "独立的吊销证书――请用“gpg --import”来应用\n"
  
- #: g10/mainproc.c:1233 g10/mainproc.c:1276
++#: g10/mainproc.c:1238 g10/mainproc.c:1281
  msgid "no signature found\n"
  msgstr "未找到签名\n"
  
- #: g10/mainproc.c:1607
++#: g10/mainproc.c:1612
  #, c-format
  msgid "BAD signature from \"%s\""
  msgstr "已损坏的签名,来自于“%s”"
  
- #: g10/mainproc.c:1609
++#: g10/mainproc.c:1614
  #, c-format
  msgid "Expired signature from \"%s\""
  msgstr "过期的签名,来自于“%s”"
  
- #: g10/mainproc.c:1611
++#: g10/mainproc.c:1616
  #, c-format
  msgid "Good signature from \"%s\""
  msgstr "完好的签名,来自于“%s”"
  
- #: g10/mainproc.c:1630
++#: g10/mainproc.c:1635
  msgid "signature verification suppressed\n"
  msgstr "签名验证已被抑制\n"
  
- #: g10/mainproc.c:1739
++#: g10/mainproc.c:1744
  msgid "can't handle this ambiguous signature data\n"
  msgstr "无法处理这些有歧义的签名\n"
  
- #: g10/mainproc.c:1753 g10/mainproc.c:1761
++#: g10/mainproc.c:1758 g10/mainproc.c:1766
  #, c-format
  msgid "Signature made %s\n"
  msgstr "签名建立于 %s\n"
  
- #: g10/mainproc.c:1754 g10/mainproc.c:1762
++#: g10/mainproc.c:1759 g10/mainproc.c:1767
  #, c-format
  msgid "               using %s key %s\n"
  msgstr "              使用 %s 密钥 %s\n"
  
- #: g10/mainproc.c:1766
++#: g10/mainproc.c:1771
  #, c-format
  msgid "Signature made %s using %s key ID %s\n"
  msgstr "于 %s 创建的签名,使用 %s,钥匙号 %s\n"
  
- #: g10/mainproc.c:1772
++#: g10/mainproc.c:1777
  #, fuzzy, c-format
  #| msgid "                aka \"%s\""
  msgid "               issuer \"%s\"\n"
  msgstr "              亦即“%s”"
  
- #: g10/mainproc.c:1789
++#: g10/mainproc.c:1794
  msgid "Key available at: "
  msgstr "可用的密钥在:"
  
- #: g10/mainproc.c:2024
++#: g10/mainproc.c:2029
  msgid "[uncertain]"
  msgstr "[不确定]"
  
- #: g10/mainproc.c:2062
++#: g10/mainproc.c:2067
  #, c-format
  msgid "                aka \"%s\""
  msgstr "              亦即“%s”"
  
- #: g10/mainproc.c:2145
++#: g10/mainproc.c:2150
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "这份签名已于 %s 过期。\n"
  
- #: g10/mainproc.c:2149
++#: g10/mainproc.c:2154
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "这份签名在 %s 过期。\n"
  
- #: g10/mainproc.c:2160
++#: g10/mainproc.c:2165
  #, 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:2161
++#: g10/mainproc.c:2166
  msgid "binary"
  msgstr "二进制"
  
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2167
  msgid "textmode"
  msgstr "文本模式"
  
- #: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "未知"
  
- #: g10/mainproc.c:2164
++#: g10/mainproc.c:2169
  #, fuzzy
  #| msgid "unknown pubkey algorithm"
  msgid ", key algorithm "
  msgstr "未知的公钥算法"
  
- #: g10/mainproc.c:2199
++#: g10/mainproc.c:2204
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2229
++#: g10/mainproc.c:2234
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "无法检查签名:%s\n"
  
- #: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
++#: g10/mainproc.c:2327 g10/mainproc.c:2346 g10/mainproc.c:2470
  msgid "not a detached signature\n"
  msgstr "不是一份分离的签名\n"
  
- #: g10/mainproc.c:2375
++#: g10/mainproc.c:2380
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
  msgstr "警告:检测到多重签名。只检查第一个签名。\n"
  
- #: g10/mainproc.c:2384
++#: g10/mainproc.c:2389
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "等级 0x%02x 的独立签名\n"
  
- #: g10/mainproc.c:2469
++#: g10/mainproc.c:2474
  msgid "old style (PGP 2.x) signature\n"
  msgstr "旧式(PGP 2.x)签名\n"
  
@@@ -6143,23 -4831,18 +6104,23 @@@ msgstr "这张照片正确吗?(y/N/q)
  msgid "unable to display photo ID!\n"
  msgstr "无法显示照片标识!\n"
  
- #: g10/pkclist.c:72 g10/revoke.c:757
++#: g10/pkclist.c:72 g10/revoke.c:758
  msgid "No reason specified"
  msgstr "未指定原因"
  
- #: g10/pkclist.c:74 g10/revoke.c:759
++#: g10/pkclist.c:74 g10/revoke.c:760
  msgid "Key is superseded"
  msgstr "密钥被替换"
  
- #: g10/pkclist.c:76 g10/revoke.c:758
++#: g10/pkclist.c:76 g10/revoke.c:759
  msgid "Key has been compromised"
  msgstr "密钥已泄漏"
  
- #: g10/pkclist.c:78 g10/revoke.c:760
++#: g10/pkclist.c:78 g10/revoke.c:761
  msgid "Key is no longer used"
  msgstr "密钥不再使用"
  
- #: g10/pkclist.c:80 g10/revoke.c:761
++#: g10/pkclist.c:80 g10/revoke.c:762
  msgid "User ID is no longer valid"
  msgstr "用户标识不再有效"
  
@@@ -6236,7 -4906,6 +6197,7 @@@ msgstr "
  "这把密钥的最小信任等级为:%s\n"
  "\n"
  
- #: g10/pkclist.c:310 g10/revoke.c:786
++#: g10/pkclist.c:310 g10/revoke.c:787
  msgid "Your decision? "
  msgstr "您的决定是什么?"
  
@@@ -6427,33 -5058,26 +6388,33 @@@ msgstr "
  msgid "No such user ID.\n"
  msgstr "没有这个用户标识。\n"
  
- #: g10/pkclist.c:1197 g10/pkclist.c:1273
++#: g10/pkclist.c:1197 g10/pkclist.c:1274
  msgid "skipped: public key already set as default recipient\n"
  msgstr "已跳过:公钥已被设为默认收件者\n"
  
- #: g10/pkclist.c:1218
++#: g10/pkclist.c:1219
  msgid "Public key is disabled.\n"
  msgstr "公钥被禁用。\n"
  
- #: g10/pkclist.c:1228
++#: g10/pkclist.c:1229
  msgid "skipped: public key already set\n"
  msgstr "已跳过:公钥已被设定\n"
  
- #: g10/pkclist.c:1263
++#: g10/pkclist.c:1264
  #, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "未知的默认收件者“%s”\n"
  
- #: g10/pkclist.c:1312
++#: g10/pkclist.c:1313
  msgid "no valid addressees\n"
  msgstr "没有有效的地址\n"
  
- #: g10/pkclist.c:1665
++#: g10/pkclist.c:1666
  #, fuzzy, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "密钥 %s:没有有效的用户标识\n"
  
- #: g10/pkclist.c:1690
++#: g10/pkclist.c:1691
  #, fuzzy, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "密钥 %s:没有有效的用户标识\n"
@@@ -6462,29 -5085,23 +6423,29 @@@
  msgid "data not saved; use option \"--output\" to save it\n"
  msgstr "数据未被保存;请用“--output”选项来保存它们\n"
  
- #: g10/plaintext.c:598
++#: g10/plaintext.c:614
  msgid "Detached signature.\n"
  msgstr "分离的签名。\n"
  
- #: g10/plaintext.c:606
++#: g10/plaintext.c:622
  msgid "Please enter name of data file: "
  msgstr "请输入数据文件的名称: "
  
- #: g10/plaintext.c:643
++#: g10/plaintext.c:659
  msgid "reading stdin ...\n"
  msgstr "正在从标准输入读取 ...\n"
  
- #: g10/plaintext.c:688
++#: g10/plaintext.c:704
  msgid "no signed data\n"
  msgstr "不含签名的数据\n"
  
- #: g10/plaintext.c:706
++#: g10/plaintext.c:722
  #, fuzzy, c-format
  #| msgid "can't open signed data `%s'\n"
  msgid "can't open signed data '%s'\n"
  msgstr "无法打开有签名的数据‘%s’\n"
  
- #: g10/plaintext.c:741
++#: g10/plaintext.c:757
  #, fuzzy, c-format
  msgid "can't open signed data fd=%d: %s\n"
  msgstr "无法打开有签名的数据‘%s’\n"
@@@ -6553,7 -5156,6 +6514,7 @@@ msgstr "私钥可用。\n
  msgid "Create a designated revocation certificate for this key? (y/N) "
  msgstr "要为这把密钥建立一份指定吊销者证书吗?(y/N)"
  
- #: g10/revoke.c:336 g10/revoke.c:727
++#: g10/revoke.c:336 g10/revoke.c:728
  msgid "ASCII armored output forced.\n"
  msgstr "已强行使用 ASCII 封装过的输出。\n"
  
@@@ -6590,23 -5186,20 +6551,23 @@@ msgid "
  "the secret key.  However, if the secret key is still accessible,\n"
  "it is better to generate a new revocation certificate and give\n"
  "a reason for the revocation.  For details see the description of\n"
- "of the gpg command \"--gen-revoke\" in the GnuPG manual."
+ "of the gpg command \"--generate-revocation\" in the GnuPG manual."
  msgstr ""
  
- #: g10/revoke.c:575
++#: g10/revoke.c:576
  msgid ""
  "To avoid an accidental use of this file, a colon has been inserted\n"
  "before the 5 dashes below.  Remove this colon with a text editor\n"
  "before importing and publishing this revocation certificate."
  msgstr ""
  
- #: g10/revoke.c:590
++#: g10/revoke.c:591
  #, fuzzy, c-format
  #| msgid "Revocation certificate created.\n"
  msgid "revocation certificate stored as '%s.rev'\n"
  msgstr "已建立吊销证书。\n"
  
- #: g10/revoke.c:634
++#: g10/revoke.c:635
  #, fuzzy, c-format
  #| msgid "secret key \"%s\" not found: %s\n"
  msgid "secret key \"%s\" not found\n"
@@@ -6615,22 -5208,18 +6576,22 @@@ msgstr "找不到私钥“%s”:%s\n
  #. TRANSLATORS: The %s prints a key specification which
  #. for example has been given at the command line.  Several lines
  #. lines with secret key infos are printed after this message.
- #: g10/revoke.c:661
++#: g10/revoke.c:662
  #, c-format
  msgid "'%s' matches multiple secret keys:\n"
  msgstr ""
  
- #: g10/revoke.c:688
++#: g10/revoke.c:689
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error searching the keyring: %s\n"
  msgstr "建立钥匙环‘%s’时发生错误:%s\n"
  
- #: g10/revoke.c:711
++#: g10/revoke.c:712
  msgid "Create a revocation certificate for this key? (y/N) "
  msgstr "要为这把密钥建立一份吊销证书吗?(y/N)"
  
- #: g10/revoke.c:735
++#: g10/revoke.c:736
  msgid ""
  "Revocation certificate created.\n"
  "\n"
@@@ -6648,33 -5237,26 +6609,33 @@@ msgstr "
  "小心:您的机器上的打印系统可能会在打印过程中把这些数据临时在某个其他\n"
  "人也能够看得到的地方!\n"
  
- #: g10/revoke.c:769
++#: g10/revoke.c:770
  msgid "Please select the reason for the revocation:\n"
  msgstr "请选择吊销的原因:\n"
  
- #: g10/revoke.c:779
++#: g10/revoke.c:780
  msgid "Cancel"
  msgstr "取消"
  
- #: g10/revoke.c:781
++#: g10/revoke.c:782
  #, c-format
  msgid "(Probably you want to select %d here)\n"
  msgstr "(也许您会想要在这里选择 %d)\n"
  
- #: g10/revoke.c:822
++#: g10/revoke.c:823
  msgid "Enter an optional description; end it with an empty line:\n"
  msgstr "请输入描述(可选);以空白行结束:\n"
  
- #: g10/revoke.c:850
++#: g10/revoke.c:851
  #, c-format
  msgid "Reason for revocation: %s\n"
  msgstr "吊销原因:%s\n"
  
- #: g10/revoke.c:852
++#: g10/revoke.c:853
  msgid "(No description given)\n"
  msgstr "(不给定描述)\n"
  
- #: g10/revoke.c:857
++#: g10/revoke.c:858
  msgid "Is this okay? (y/N) "
  msgstr "这样可以吗? (y/N)"
  
@@@ -6798,22 -5360,18 +6759,22 @@@ msgid "
  "unexpanded.\n"
  msgstr "警告:无法 %%-扩展首选公钥服务器 URL (太大了)。现在使用未扩展的。\n"
  
- #: g10/sign.c:329
++#: g10/sign.c:331
  #, c-format
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s/%s 签名来自:“%s”\n"
  
- #: g10/sign.c:878
++#: g10/sign.c:880
  #, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
  msgstr "警告:强行使用的 %s (%d)散列算法不在收件者的首选项中\n"
  
- #: g10/sign.c:1009
++#: g10/sign.c:1011
  msgid "signing:"
  msgstr "正在签名:"
  
- #: g10/sign.c:1286
++#: g10/sign.c:1288
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "%s 加密将被采用\n"
@@@ -6835,7 -5389,6 +6796,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:362
++#: g10/tdbdump.c:57 g10/trustdb.c:369
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "信任记录 %lu,类别 %d:写入失败:%s\n"
@@@ -6883,7 -5428,6 +6844,7 @@@ msgstr "在‘%s’中寻找信任度�
  msgid "read error in '%s': %s\n"
  msgstr "读取‘%s’错误:%s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "信任度数据库:同步失败:%s\n"
@@@ -7032,299 -5547,307 +6993,373 @@@ msgstr "无法处理长于 %d 字符的
  msgid "input line longer than %d characters\n"
  msgstr "输入行长度超过 %d 字符\n"
  
- #: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
++#: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
  #, fuzzy, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "在‘%s’中寻找信任度记录时出错:%s\n"
  
- #: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
++#: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:357 g10/tofu.c:699
++#: g10/tofu.c:355 g10/tofu.c:888
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:501
++#: g10/tofu.c:505
  #, fuzzy, c-format
  msgid "unsupported TOFU database version: %s\n"
  msgstr ""
  "\n"
  "支持的算法:\n"
  
- #: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
- #: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
- #: g10/tofu.c:3056
++#: g10/tofu.c:538
+ #, fuzzy, c-format
+ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
+ msgstr "生成密码的时候发生错误:%s\n"
+ 
++#: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
+ msgid "TOFU DB error"
+ msgstr ""
+ 
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2340 g10/tofu.c:2359
++#: g10/tofu.c:2372 g10/tofu.c:2384 g10/tofu.c:2399 g10/tofu.c:2411
++#: g10/tofu.c:2980 g10/tofu.c:2997 g10/tofu.c:3033 g10/tofu.c:3050
++#: g10/tofu.c:3353
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "读取‘%s’时出错:%s\n"
  
- #: g10/tofu.c:566 g10/tofu.c:574
++#: g10/tofu.c:716 g10/tofu.c:724
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error determining TOFU database's version: %s\n"
  msgstr "写入私钥钥匙环‘%s’时发生错误: %s\n"
  
- #: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
++#: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing TOFU database: %s\n"
  msgstr "%s:写入目录记录时出错:%s\n"
  
- #: g10/tofu.c:765
++#: g10/tofu.c:844
+ #, fuzzy, c-format
+ msgid "error creating 'encryptions' TOFU table: %s\n"
+ msgstr "读取‘%s’时出错:%s\n"
+ 
++#: g10/tofu.c:874
+ #, c-format
+ msgid "adding column effective_policy to bindings DB: %s\n"
+ msgstr ""
+ 
++#: g10/tofu.c:956
  #, fuzzy, c-format
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "‘%s’中出错:%s\n"
  
- #: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
++#: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "读取‘%s’时出错:%s\n"
  
- #: g10/tofu.c:1239
++#: g10/tofu.c:1328
  #, c-format
  msgid ""
  "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1247
++#: g10/tofu.c:1337
  #, c-format
- msgid "The email address \"%s\" is associated with %d keys!"
- msgstr ""
+ msgid "The email address \"%s\" is associated with %d key!"
+ msgid_plural "The email address \"%s\" is associated with %d keys!"
+ msgstr[0] ""
+ msgstr[1] ""
  
- #: g10/tofu.c:1251
++#: g10/tofu.c:1343
  msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  
- #: g10/tofu.c:1257
++#: g10/tofu.c:1349
  #, c-format
  msgid ""
  "Please indicate whether this email address should be associated with key %s "
  "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1513
++#: g10/tofu.c:1605
  #, fuzzy, c-format
  #| msgid "error getting new PIN: %s\n"
  msgid "error gathering other user IDs: %s\n"
  msgstr "获取新 PIN 时出错:%s\n"
  
- #: g10/tofu.c:1523
++#: g10/tofu.c:1615
  #, fuzzy
  #| msgid "list key and user IDs"
  msgid "This key's user IDs:\n"
  msgstr "列出密钥和用户标识"
  
- #: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
++#: g10/tofu.c:1631 g10/tofu.c:1796
  #, fuzzy, c-format
  #| msgid "validity: %s"
  msgid "policy: %s"
  msgstr "有效性:%s"
  
- #: g10/tofu.c:1630
++#: g10/tofu.c:1722
  #, fuzzy, c-format
  msgid "error gathering signature stats: %s\n"
  msgstr "获取新 PIN 时出错:%s\n"
  
- #: g10/tofu.c:1634
++#: g10/tofu.c:1726
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1651
++#: g10/tofu.c:1744
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1684 g10/tofu.c:1689
++#: g10/tofu.c:1785 g10/tofu.c:1790
  msgid ", "
  msgstr ""
  
- #: g10/tofu.c:1693
++#: g10/tofu.c:1794
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
  msgstr "列出密钥"
  
- #: g10/tofu.c:1715
++#: g10/tofu.c:1820
+ #, fuzzy, c-format
+ msgid "Verified %d message."
+ msgid_plural "Verified %d messages."
+ msgstr[0] "|算法 [文件]|使用指定的散列算法打印报文散列值"
+ msgstr[1] "|算法 [文件]|使用指定的散列算法打印报文散列值"
+ 
++#: g10/tofu.c:1824
  #, fuzzy, c-format
- msgid "Verified %d message"
- msgid_plural "Verified %d messages"
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid "Encrypted %d message."
+ msgid_plural "Encrypted %d messages."
+ msgstr[0] "以 %lu 个密码加密\n"
+ msgstr[1] "以 %lu 个密码加密\n"
+ 
++#: g10/tofu.c:1831
+ #, fuzzy, c-format
+ msgid "Verified %d message in the future."
+ msgid_plural "Verified %d messages in the future."
+ msgstr[0] "|算法 [文件]|使用指定的散列算法打印报文散列值"
+ msgstr[1] "|算法 [文件]|使用指定的散列算法打印报文散列值"
+ 
++#: g10/tofu.c:1835
+ #, fuzzy, c-format
+ msgid "Encrypted %d message in the future."
+ msgid_plural "Encrypted %d messages in the future."
  msgstr[0] "|算法 [文件]|使用指定的散列算法打印报文散列值"
  msgstr[1] "|算法 [文件]|使用指定的散列算法打印报文散列值"
  
- #: g10/tofu.c:1719
++#: g10/tofu.c:1849
+ #, c-format
+ msgid "Messages verified over the past %d day: %d."
+ msgid_plural "Messages verified over the past %d days: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1855
+ #, c-format
+ msgid "Messages encrypted over the past %d day: %d."
+ msgid_plural "Messages encrypted over the past %d days: %d."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1865
  #, c-format
- msgid "Encrypted %d message"
- msgid_plural "Encrypted %d messages"
+ msgid "Messages verified over the past %d month: %d."
+ msgid_plural "Messages verified over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1734
++#: g10/tofu.c:1871
  #, c-format
- msgid " over the past day."
- msgid_plural " over the past %d days."
+ msgid "Messages encrypted over the past %d month: %d."
+ msgid_plural "Messages encrypted over the past %d months: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1740
++#: g10/tofu.c:1881
  #, c-format
- msgid " over the past month."
- msgid_plural " over the past %d months."
+ msgid "Messages verified over the past %d year: %d."
+ msgid_plural "Messages verified over the past %d years: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1746
++#: g10/tofu.c:1887
  #, c-format
- msgid " over the past year."
- msgid_plural " over the past %d years."
+ msgid "Messages encrypted over the past %d year: %d."
+ msgid_plural "Messages encrypted over the past %d years: %d."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1752
- msgid " in the past."
++#: g10/tofu.c:1895
+ #, c-format
+ msgid "Messages verified in the past: %d."
  msgstr ""
  
++#: g10/tofu.c:1899
+ #, fuzzy, c-format
+ msgid "Messages encrypted in the past: %d."
+ msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1767
++#: g10/tofu.c:1916
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1809
++#: g10/tofu.c:1958
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1815
++#: g10/tofu.c:1964
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1823
++#: g10/tofu.c:1972
  msgid "Defaulting to unknown."
  msgstr ""
  
- #: g10/tofu.c:1938 g10/tofu.c:2074
++#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
- #: g10/tofu.c:1994
++#: g10/tofu.c:2143
  #, fuzzy, c-format
  msgid "resetting keydb: %s\n"
  msgstr "写入钥匙环‘%s’时出错: %s\n"
  
- #: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
- #: g10/tofu.c:2425
++#: g10/tofu.c:2601
  #, fuzzy, c-format
- msgid "error setting TOFU binding's trust level to %s\n"
+ msgid "error setting TOFU binding's policy to %s\n"
  msgstr "读取‘%s’时出错:%s\n"
  
- #: g10/tofu.c:2473
++#: g10/tofu.c:2794
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "生成密码的时候发生错误:%s\n"
  
- #. TRANSLATORS: The tilde ('~') is used here to indicate a
- #. * non-breakable space
- #: g10/tofu.c:2574
++#: g10/tofu.c:2839
  #, c-format
- msgid "%d~year"
- msgid_plural "%d~years"
+ msgid "%lld~year"
+ msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2583
++#: g10/tofu.c:2844
  #, c-format
- msgid "%d~month"
- msgid_plural "%d~months"
+ msgid "%lld~month"
+ msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2592
++#: g10/tofu.c:2849
  #, c-format
- msgid "%d~day"
- msgid_plural "%d~days"
+ msgid "%lld~week"
+ msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2854
+ #, c-format
+ msgid "%lld~day"
+ msgid_plural "%lld~days"
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:2859
  #, c-format
- msgid "%d~hour"
- msgid_plural "%d~hours"
+ msgid "%lld~hour"
+ msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2610
++#: g10/tofu.c:2864
  #, c-format
- msgid "%d~minute"
- msgid_plural "%d~minutes"
+ msgid "%lld~minute"
+ msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2619
++#: g10/tofu.c:2866
  #, c-format
- msgid "%d~second"
- msgid_plural "%d~seconds"
+ msgid "%lld~second"
+ msgid_plural "%lld~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2802
++#: g10/tofu.c:3103
  #, c-format
- msgid "%s: "
+ msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:2806
++#: g10/tofu.c:3109
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
- msgid "Verified %ld signatures"
+ msgid "%s: Verified 0 signatures."
  msgstr "已经删除了 %d 个签名。\n"
  
- #: g10/tofu.c:2816
++#: g10/tofu.c:3117
  #, fuzzy, c-format
- msgid "Verified %ld signature in the past %s"
- msgid_plural "Verified %ld signatures in the past %s"
+ msgid "%s: Verified %ld~signature in the past %s."
+ msgid_plural "%s: Verified %ld~signatures in the past %s."
  msgstr[0] "|算法 [文件]|使用指定的散列算法打印报文散列值"
  msgstr[1] "|算法 [文件]|使用指定的散列算法打印报文散列值"
  
- #: g10/tofu.c:2826
- #, fuzzy, c-format
++#: g10/tofu.c:3127
+ #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
- msgid ", and encrypted %ld messages"
+ msgid "Encrypted 0 messages."
  msgstr "以 %lu 个密码加密\n"
  
- #: g10/tofu.c:2835
++#: g10/tofu.c:3135
  #, fuzzy, c-format
- msgid ", and encrypted %ld message in the past %s"
- msgid_plural ", and encrypted %ld messages in the past %s"
+ msgid "Encrypted %ld~message in the past %s."
+ msgid_plural "Encrypted %ld~messages in the past %s."
  msgstr[0] "|算法 [文件]|使用指定的散列算法打印报文散列值"
  msgstr[1] "|算法 [文件]|使用指定的散列算法打印报文散列值"
  
- #: g10/tofu.c:2880
++#: g10/tofu.c:3146
+ #, fuzzy, c-format
+ #| msgid "validity: %s"
+ msgid "(policy: %s)"
+ msgstr "有效性:%s"
+ 
++#: g10/tofu.c:3177
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2883
++#: g10/tofu.c:3180
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2887
++#: g10/tofu.c:3184
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2890
++#: g10/tofu.c:3187
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2919
++#: g10/tofu.c:3216
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7341,18 -5864,14 +7376,18 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
- #: g10/tofu.c:3480 g10/tofu.c:3572
++#: g10/tofu.c:3298 g10/tofu.c:3449 g10/tofu.c:3627 g10/tofu.c:3670
++#: g10/tofu.c:3784 g10/tofu.c:3859 g10/tofu.c:3894
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "读取‘%s’时出错:%s\n"
  
- #: g10/tofu.c:3185
++#: g10/tofu.c:3482
  #, c-format
- msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
  msgstr ""
  
- #: g10/tofu.c:3515
++#: g10/tofu.c:3819
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7384,69 -5898,55 +7419,69 @@@ msgstr "密钥 %s:受信任的密钥�
  msgid "key %s marked as ultimately trusted\n"
  msgstr "密钥 %s 被标记为绝对信任\n"
  
- #: g10/trustdb.c:341
++#: g10/trustdb.c:348
  #, c-format
  msgid "trust record %lu, req type %d: read failed: %s\n"
  msgstr "信任记录 %lu,请求类别 %d:读取失败:%s\n"
  
- #: g10/trustdb.c:347
++#: g10/trustdb.c:354
  #, c-format
  msgid "trust record %lu is not of requested type %d\n"
  msgstr "信任记录 %lu 不属于所请求的类别 %d\n"
  
- #: g10/trustdb.c:422
++#: g10/trustdb.c:429
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr ""
  
- #: g10/trustdb.c:431
++#: g10/trustdb.c:438
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:468
++#: g10/trustdb.c:475
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr "无法使用未知的信任模型(%d)――假定使用 %s 信任模型\n"
  
- #: g10/trustdb.c:474
++#: g10/trustdb.c:481
  #, c-format
  msgid "using %s trust model\n"
  msgstr "使用 %s 信任模型\n"
  
- #: g10/trustdb.c:511
++#: g10/trustdb.c:518
  msgid "no need for a trustdb check\n"
  msgstr "不需要检查信任度数据库\n"
  
- #: g10/trustdb.c:517 g10/trustdb.c:2160
++#: g10/trustdb.c:524 g10/trustdb.c:2187
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "下次信任度数据库检查将于 %s 进行\n"
  
- #: g10/trustdb.c:526
++#: g10/trustdb.c:533
  #, 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’信任模型时不需要检查信任度数据库\n"
  
- #: g10/trustdb.c:542
++#: g10/trustdb.c:549
  #, 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’信任模型时不需要更新信任度数据库\n"
  
- #: g10/trustdb.c:749 g10/trustdb.c:1313
++#: g10/trustdb.c:756 g10/trustdb.c:1340
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "找不到公钥 %s:%s\n"
  
- #: g10/trustdb.c:966
++#: g10/trustdb.c:973
  msgid "please do a --check-trustdb\n"
  msgstr "请执行一次 --check-trustdb\n"
  
- #: g10/trustdb.c:971
++#: g10/trustdb.c:978
  msgid "checking the trustdb\n"
  msgstr "正在检查信任度数据库\n"
  
- #: g10/trustdb.c:1883
++#: g10/trustdb.c:1910
  #, fuzzy, c-format
  #| msgid "%lu keys processed so far\n"
  msgid "%d key processed"
@@@ -7454,7 -5954,6 +7489,7 @@@ msgid_plural "%d keys processed
  msgstr[0] "目前已处理 %lu 把密钥\n"
  msgstr[1] "目前已处理 %lu 把密钥\n"
  
- #: g10/trustdb.c:1886
++#: g10/trustdb.c:1913
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7462,23 -5961,19 +7497,23 @@@ msgid_plural " (%d validity counts clea
  msgstr[0] "已经处理了 %d 把密钥(共计已解决了 %d 份的有效性)\n"
  msgstr[1] "已经处理了 %d 把密钥(共计已解决了 %d 份的有效性)\n"
  
- #: g10/trustdb.c:1956
++#: g10/trustdb.c:1983
  msgid "no ultimately trusted keys found\n"
  msgstr "没有找到任何绝对信任的密钥\n"
  
- #: g10/trustdb.c:1970
++#: g10/trustdb.c:1997
  #, c-format
  msgid "public key of ultimately trusted key %s not found\n"
  msgstr "绝对信任的密钥 %s 的公钥未被找到\n"
  
- #: g10/trustdb.c:2087
++#: g10/trustdb.c:2114
  #, 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:2167
++#: g10/trustdb.c:2194
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr "无法更新信任度数据库版本记录:写入失败:%s\n"
@@@ -7591,19 -6065,14 +7626,19 @@@ msgid "
  "List, export, import Keybox data\n"
  msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3208
++#: scd/app-nks.c:718 scd/app-openpgp.c:3221
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr "RSA 余数缺失或者不是 %d 位长\n"
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3220
++#: scd/app-nks.c:726 scd/app-openpgp.c:3233
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr "RSA 公钥指数缺失或长于 %d 位\n"
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
- #: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
- #: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1965 scd/app-openpgp.c:1984
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2166 scd/app-openpgp.c:2430
++#: scd/app-openpgp.c:2477 scd/app-openpgp.c:2582 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "PIN 回调返回错误:%s\n"
@@@ -7652,84 -6112,66 +7687,84 @@@ msgid "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2511 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "获取新 PIN 时出错:%s\n"
  
- #: scd/app-openpgp.c:806
++#: scd/app-openpgp.c:801
  #, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "无法存储指纹:%s\n"
  
- #: scd/app-openpgp.c:819
++#: scd/app-openpgp.c:814
  #, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "无法存储创建日期:%s\n"
  
- #: scd/app-openpgp.c:1236
++#: scd/app-openpgp.c:1247
  msgid "response does not contain the RSA modulus\n"
  msgstr "响应未包含 RSA 余数\n"
  
- #: scd/app-openpgp.c:1243
++#: scd/app-openpgp.c:1254
  msgid "response does not contain the RSA public exponent\n"
  msgstr "响应未包含 RSA 公钥指数\n"
  
- #: scd/app-openpgp.c:1353
++#: scd/app-openpgp.c:1364
  #, fuzzy
  #| msgid "response does not contain the RSA public exponent\n"
  msgid "response does not contain the EC public key\n"
  msgstr "响应未包含 RSA 公钥指数\n"
  
- #: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:1464 scd/app-openpgp.c:3825
  msgid "response does not contain the public key data\n"
  msgstr "响应未包含公钥数据\n"
  
- #: scd/app-openpgp.c:1551
++#: scd/app-openpgp.c:1564
  #, c-format
  msgid "reading public key failed: %s\n"
  msgstr "无法读出公钥:%s\n"
  
- #: scd/app-openpgp.c:1903
++#: scd/app-openpgp.c:1916
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1910
++#: scd/app-openpgp.c:1923
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1925
++#: scd/app-openpgp.c:1938
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
  
- #: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
++#: scd/app-openpgp.c:1949 scd/app-openpgp.c:2424
  #, fuzzy
  msgid "||Please enter the PIN"
  msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
  
- #: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2173 scd/app-openpgp.c:2437
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr "CHV%d 的 PIN 太短;最小长度为 %d\n"
  
- #: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
- #: scd/app-openpgp.c:4114
++#: scd/app-openpgp.c:2004 scd/app-openpgp.c:2043 scd/app-openpgp.c:2185
++#: scd/app-openpgp.c:4126
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "验证 CHV%d 失败:%s\n"
  
- #: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
++#: scd/app-openpgp.c:2072 scd/app-openpgp.c:2458 scd/app-openpgp.c:4556
  msgid "error retrieving CHV status from card\n"
  msgstr "从卡中获取 CHV 状态时出错\n"
  
- #: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
++#: scd/app-openpgp.c:2078 scd/app-openpgp.c:4565
  msgid "card is permanently locked!\n"
  msgstr "卡被永久锁定!\n"
  
- #: scd/app-openpgp.c:2072
++#: scd/app-openpgp.c:2085
  #, fuzzy, c-format
  #| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@@ -7740,26 -6182,21 +7775,26 @@@ msgstr[1] "尝试管理员 PIN %d 次�
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:2082
++#: scd/app-openpgp.c:2095
  #, fuzzy, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
  
- #: scd/app-openpgp.c:2086
++#: scd/app-openpgp.c:2099
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
  msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
  
- #: scd/app-openpgp.c:2107
++#: scd/app-openpgp.c:2120
  msgid "access to admin commands is not configured\n"
  msgstr "尚未配置管理员命令的权限\n"
  
- #: scd/app-openpgp.c:2460
++#: scd/app-openpgp.c:2473
  #, fuzzy
  msgid "||Please enter the Reset Code for the card"
  msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
  
- #: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
++#: scd/app-openpgp.c:2483 scd/app-openpgp.c:2537
  #, fuzzy, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr "CHV%d 的 PIN 太短;最小长度为 %d\n"
@@@ -7767,82 -6204,64 +7802,82 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2493
++#: scd/app-openpgp.c:2506
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|AN|New Admin PIN"
  msgstr "|AN|新的管理员 PIN"
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|N|New PIN"
  msgstr "新的 PIN"
  
- #: scd/app-openpgp.c:2565
++#: scd/app-openpgp.c:2578
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
  
- #: scd/app-openpgp.c:2566
++#: scd/app-openpgp.c:2579
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
  msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
  
- #: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
++#: scd/app-openpgp.c:2635 scd/app-openpgp.c:3885
  msgid "error reading application data\n"
  msgstr "读取应用程序数据时出错\n"
  
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
++#: scd/app-openpgp.c:2641 scd/app-openpgp.c:3892
  msgid "error reading fingerprint DO\n"
  msgstr "读取指纹 D0 出错\n"
  
- #: scd/app-openpgp.c:2638
++#: scd/app-openpgp.c:2651
  msgid "key already exists\n"
  msgstr "密钥已存在\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2655
  msgid "existing key will be replaced\n"
  msgstr "现有的密钥将被替换\n"
  
- #: scd/app-openpgp.c:2644
++#: scd/app-openpgp.c:2657
  msgid "generating new key\n"
  msgstr "生成新密钥\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2659
  #, fuzzy
  msgid "writing new key\n"
  msgstr "生成新密钥\n"
  
- #: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
++#: scd/app-openpgp.c:3201 scd/app-openpgp.c:3553
  msgid "creation timestamp missing\n"
  msgstr "缺少创建时间戳\n"
  
- #: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
++#: scd/app-openpgp.c:3243 scd/app-openpgp.c:3251
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr "RSA 质数 %s 缺失或者不是 %d 位长\n"
  
- #: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
++#: scd/app-openpgp.c:3384 scd/app-openpgp.c:3647
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "无法存储密钥:%s\n"
  
- #: scd/app-openpgp.c:3534
++#: scd/app-openpgp.c:3547
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "未被支持的 URI"
  
- #: scd/app-openpgp.c:3790
++#: scd/app-openpgp.c:3802
  msgid "please wait while key is being generated ...\n"
  msgstr "请稍候,正在生成密钥……\n"
  
- #: scd/app-openpgp.c:3798
++#: scd/app-openpgp.c:3810
  msgid "generating key failed\n"
  msgstr "生成密钥失败\n"
  
- #: scd/app-openpgp.c:3804
++#: scd/app-openpgp.c:3816
  #, fuzzy, c-format
  #| msgid "key generation completed (%d seconds)\n"
  msgid "key generation completed (%d second)\n"
@@@ -7850,30 -6269,24 +7885,30 @@@ msgid_plural "key generation completed 
  msgstr[0] "密钥已生成(耗时 %d 秒)\n"
  msgstr[1] "密钥已生成(耗时 %d 秒)\n"
  
- #: scd/app-openpgp.c:3838
++#: scd/app-openpgp.c:3850
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "无效的 OpenPGP 卡结构(D0 0x93)\n"
  
- #: scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:3900
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4004
++#: scd/app-openpgp.c:4016
  #, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "卡不支持散列算法 %s\n"
  
- #: scd/app-openpgp.c:4089
++#: scd/app-openpgp.c:4101
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "目前已创建的签名:%lu\n"
  
- #: scd/app-openpgp.c:4551
++#: scd/app-openpgp.c:4570
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr "目前禁止通过此命令验证管理员 PIN\n"
  
- #: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
++#: scd/app-openpgp.c:4871 scd/app-openpgp.c:4882
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "不能存取 %s――无效的 OpenPGP 卡?\n"
@@@ -7895,7 -6305,6 +7930,7 @@@ msgstr "新的 PIN
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
@@@ -7937,27 -6337,22 +7972,27 @@@ msgstr "显示管理员命令
  msgid "use variable length input for pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:287
++#: scd/scdaemon.c:286
  #, fuzzy
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
  
- #: scd/scdaemon.c:289
++#: scd/scdaemon.c:288
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
  msgstr ""
  
- #: scd/scdaemon.c:786
++#: scd/scdaemon.c:784
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1904
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
++#: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1909
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
@@@ -8036,9 -6415,6 +8071,9 @@@ msgstr "生成密码的时候发生错�
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "无法读出公钥:%s\n"
  
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
 +#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  #, fuzzy
  msgid "failed to allocate keyDB handle\n"
  msgstr "无法存储密钥:%s\n"
@@@ -8537,11 -6811,9 +8572,11 @@@ msgstr "
  msgid "resource problem: out of core\n"
  msgstr ""
  
- #: sm/decrypt.c:330
++#: sm/decrypt.c:332
  msgid "(this is the RC2 algorithm)\n"
  msgstr ""
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:334
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr ""
  
@@@ -8585,125 -6849,97 +8620,125 @@@ msgstr "列出私钥
  msgid "list certificate chain"
  msgstr "证书已损坏"
  
- #: sm/gpgsm.c:218
++#: sm/gpgsm.c:219
  #, fuzzy
  msgid "import certificates"
  msgstr "证书已损坏"
  
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
  #, fuzzy
  msgid "export certificates"
  msgstr "证书已损坏"
  
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:228
  #, fuzzy
  msgid "register a smartcard"
  msgstr "在智能卡上添加一把密钥"
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:231
  msgid "pass a command to the dirmngr"
  msgstr ""
  
- #: sm/gpgsm.c:232
++#: sm/gpgsm.c:233
  msgid "invoke gpg-protect-tool"
  msgstr ""
  
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:250
  #, fuzzy
  msgid "create base-64 encoded output"
  msgstr "输出经 ASCII 封装"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in PEM format"
  msgstr ""
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in base-64 format"
  msgstr ""
  
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:262
  msgid "assume input is in binary format"
  msgstr ""
  
- #: sm/gpgsm.c:267
++#: sm/gpgsm.c:269
  msgid "never consult a CRL"
  msgstr ""
  
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:279
  msgid "check validity using OCSP"
  msgstr ""
  
- #: sm/gpgsm.c:282
++#: sm/gpgsm.c:284
  msgid "|N|number of certificates to include"
  msgstr ""
  
- #: sm/gpgsm.c:285
++#: sm/gpgsm.c:287
  msgid "|FILE|take policy information from FILE"
  msgstr ""
  
- #: sm/gpgsm.c:288
++#: sm/gpgsm.c:290
  msgid "do not check certificate policies"
  msgstr ""
  
- #: sm/gpgsm.c:292
++#: sm/gpgsm.c:294
  msgid "fetch missing issuer certificates"
  msgstr ""
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "don't use the terminal at all"
  msgstr ""
  
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:307
  msgid "|FILE|write a server mode log to FILE"
  msgstr ""
  
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:312
  #, fuzzy
  msgid "|FILE|write an audit log to FILE"
  msgstr "从‘%s’读取选项\n"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "batch mode: never ask"
  msgstr ""
  
- #: sm/gpgsm.c:314
++#: sm/gpgsm.c:316
  msgid "assume yes on most questions"
  msgstr ""
  
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:317
  msgid "assume no on most questions"
  msgstr ""
  
- #: sm/gpgsm.c:318
++#: sm/gpgsm.c:320
  #, fuzzy
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "从这个钥匙环里取用密钥"
  
- #: sm/gpgsm.c:321
++#: sm/gpgsm.c:323
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr ""
  
- #: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr ""
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  #, fuzzy
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "未知的对称加密算法"
  
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:352
  #, fuzzy
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "%s 签名,散列算法 %s\n"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:559
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
  msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
  
- #: sm/gpgsm.c:570
++#: sm/gpgsm.c:562
  #, fuzzy
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
@@@ -8714,47 -6950,38 +8749,47 @@@ msgstr "
  "签名、检查、加密或解密\n"
  "默认的操作依输入数据而定\n"
  
- #: sm/gpgsm.c:774
++#: sm/gpgsm.c:766
  #, fuzzy, c-format
  msgid "Note: won't be able to encrypt to '%s': %s\n"
  msgstr "无法连接至‘%s’:%s\n"
  
- #: sm/gpgsm.c:785
++#: sm/gpgsm.c:777
  #, fuzzy, c-format
  msgid "unknown validation model '%s'\n"
  msgstr "未知的选项 '%s'\n"
  
- #: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
  #, fuzzy, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "(不给定描述)\n"
  
- #: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr ""
  
- #: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
  #, fuzzy, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr "  s = 跳过这把密钥\n"
  
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1427
  #, fuzzy
  msgid "could not parse keyserver\n"
  msgstr "无法解析公钥服务器 URL\n"
  
- #: sm/gpgsm.c:1636
++#: sm/gpgsm.c:1630
  #, fuzzy, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "生成密码的时候发生错误:%s\n"
  
- #: sm/gpgsm.c:1677
++#: sm/gpgsm.c:1671
  #, fuzzy, c-format
  msgid "can't sign using '%s': %s\n"
  msgstr "无法存取‘%s’:%s\n"
  
- #: sm/gpgsm.c:2033
++#: sm/gpgsm.c:2028
  msgid "invalid command (there is no implicit command)\n"
  msgstr ""
  
@@@ -9517,8 -7593,6 +9552,8 @@@ msgstr "
  msgid "CRL access not possible due to disabled %s\n"
  msgstr ""
  
 +#: dirmngr/crlfetch.c:223 dirmngr/ldap-wrapper-ce.c:488
- #: dirmngr/ldap-wrapper.c:742 dirmngr/misc.c:563
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:563
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
@@@ -9705,117 -7743,89 +9740,117 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:160
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:158
++#: dirmngr/dirmngr.c:161
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "从‘%s’读取选项\n"
  
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:162
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:163
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:164
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
- #: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
++#: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:177
++#: dirmngr/dirmngr.c:180
  #, fuzzy
  #| msgid "Quit without saving? (y/N) "
  msgid "run without asking a user"
  msgstr "要不保存而离开吗?(y/N)"
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:181
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:182
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:184
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:185
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:186
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:188
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:192
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:202
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "从‘%s’读取选项\n"
  
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:210
  #, fuzzy
  msgid "|URL|use OCSP responder at URL"
  msgstr "无法解析公钥服务器 URL\n"
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:212
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:218
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:220
++#: dirmngr/dirmngr.c:223
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:225
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:240
++#: dirmngr/dirmngr.c:246
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -9828,95 -7838,76 +9863,95 @@@ msgstr "
  "@\n"
  "(请参考在线说明以获得所有命令和选项的完整清单)\n"
  
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:361
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
  
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:363
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:443
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
- #: tools/gpgconf.c:648
++#: dirmngr/dirmngr.c:496 tools/gpgconf.c:550 tools/gpgconf.c:585
++#: tools/gpgconf.c:656
  #, fuzzy, c-format
  msgid "usage: %s [options] "
  msgstr "用法:gpg [选项] "
  
- #: dirmngr/dirmngr.c:1062
++#: dirmngr/dirmngr.c:1074
  #, fuzzy
  #| msgid "%s not allowed with %s!\n"
  msgid "colons are not allowed in the socket name\n"
  msgstr "%s 不可与 %s 并用\n"
  
- #: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
++#: dirmngr/dirmngr.c:1300 dirmngr/server.c:1585
  #, fuzzy, c-format
  #| msgid "renaming `%s' to `%s' failed: %s\n"
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "将‘%s’重命名为‘%s’时失败:%s\n"
  
- #: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
++#: dirmngr/dirmngr.c:1306 dirmngr/server.c:1591
  #, fuzzy, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "将‘%s’重命名为‘%s’时失败:%s\n"
  
- #: dirmngr/dirmngr.c:1484
++#: dirmngr/dirmngr.c:1487
  #, fuzzy, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "列太长"
  
- #: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
++#: dirmngr/dirmngr.c:1542 dirmngr/dirmngr.c:1626
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "指纹无效"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
++#: dirmngr/dirmngr.c:1578 dirmngr/dirmngr.c:1604 tools/gpgconf-comp.c:4032
  #, fuzzy, c-format
  #| msgid "read error in `%s': %s\n"
  msgid "%s:%u: read error: %s\n"
  msgstr "读取‘%s’错误:%s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1633
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1700
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1734
++#: dirmngr/dirmngr.c:1738
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1739
++#: dirmngr/dirmngr.c:1743
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1745
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1746
++#: dirmngr/dirmngr.c:1750
  #, fuzzy
  #| msgid "not forced"
  msgid "shutdown forced\n"
  msgstr "可选"
  
- #: dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1758
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1761
++#: dirmngr/dirmngr.c:1765
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10406,34 -8298,28 +10441,34 @@@ msgstr "删除密钥区块时失败:%
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2463
++#: dirmngr/server.c:2469
  #, fuzzy, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "不能创建备份文件‘%s’:%s\n"
  
- #: dirmngr/server.c:2474
++#: dirmngr/server.c:2480
  #, fuzzy, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "%s:建立散列表失败:%s\n"
  
- #: dirmngr/server.c:2495
++#: dirmngr/server.c:2501
  #, fuzzy, c-format
  #| msgid "failed to initialize the TrustDB: %s\n"
  msgid "failed to initialize the server: %s\n"
  msgstr "初始化信任度数据库失败:%s\n"
  
- #: dirmngr/server.c:2503
++#: dirmngr/server.c:2509
  #, fuzzy, c-format
  #| msgid "failed to store the creation date: %s\n"
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "无法存储创建日期:%s\n"
  
- #: dirmngr/server.c:2534
++#: dirmngr/server.c:2540
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2553
++#: dirmngr/server.c:2559
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
@@@ -10481,7 -8358,6 +10516,7 @@@ msgstr "DSA 要求使用 160 位的散�
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:167
  #, fuzzy
  msgid "quiet"
  msgstr "quit"
@@@ -10574,22 -8430,15 +10609,22 @@@ msgstr "签名时失败: %s\n
  msgid "error sending standard options: %s\n"
  msgstr "在‘%s’中寻找信任度记录时出错:%s\n"
  
 +#: tools/gpgconf-comp.c:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
- #: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
++#: tools/gpgconf-comp.c:766 tools/gpgconf-comp.c:865
  msgid "Options controlling the diagnostic output"
  msgstr ""
  
 +#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
- #: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
++#: tools/gpgconf-comp.c:779 tools/gpgconf-comp.c:888
  msgid "Options controlling the configuration"
  msgstr ""
  
- #: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
- #: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
++#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:723
++#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:901
  msgid "Options useful for debugging"
  msgstr ""
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
  msgid "Options controlling the security"
  msgstr ""
  
@@@ -10639,11 -8477,9 +10674,11 @@@ msgstr "生成密码的时候发生错�
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
++#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
  msgid "|NAME|use NAME as default secret key"
  msgstr ""
  
- #: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
++#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:784
  #, fuzzy
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|某甲|为收件者“某甲”加密"
@@@ -10652,193 -8487,161 +10687,208 @@@
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
++#: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
  msgid "Configuration for Keyservers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
++#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
  #, fuzzy
  msgid "|URL|use keyserver at URL"
  msgstr "无法解析公钥服务器 URL\n"
  
- #: tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:741
  msgid "allow PKA lookups (DNS requests)"
  msgstr ""
  
- #: tools/gpgconf-comp.c:738
++#: tools/gpgconf-comp.c:744
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr ""
  
- #: tools/gpgconf-comp.c:787
++#: tools/gpgconf-comp.c:793
  msgid "disable all access to the dirmngr"
  msgstr ""
  
- #: tools/gpgconf-comp.c:790
++#: tools/gpgconf-comp.c:796
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:820
++#: tools/gpgconf-comp.c:829
  msgid "do not check CRLs for root certificates"
  msgstr ""
  
- #: tools/gpgconf-comp.c:869
++#: tools/gpgconf-comp.c:878
  msgid "Options controlling the format of the output"
  msgstr ""
  
- #: tools/gpgconf-comp.c:905
++#: tools/gpgconf-comp.c:920
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:918
++#: tools/gpgconf-comp.c:933
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:947
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:958
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:948
++#: tools/gpgconf-comp.c:963
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:977
++#: tools/gpgconf-comp.c:992
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:985
++#: tools/gpgconf-comp.c:1000
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1066
++#: tools/gpgconf-comp.c:1081
  msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1067
++#: tools/gpgconf-comp.c:1082
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1083
  msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1069
++#: tools/gpgconf-comp.c:1084
  msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1070
++#: tools/gpgconf-comp.c:1085
  #, fuzzy
  #| msgid "network error"
  msgid "Network"
  msgstr "网络错误"
  
- #: tools/gpgconf-comp.c:1071
++#: tools/gpgconf-comp.c:1086
  #, fuzzy
  msgid "Passphrase Entry"
  msgstr "错误的密码"
  
- #: tools/gpgconf-comp.c:1225
++#: tools/gpgconf-comp.c:1240
  #, fuzzy
  msgid "Component not suitable for launching"
  msgstr "找不到公钥"
  
- #: tools/gpgconf-comp.c:3283
++#: tools/gpgconf-comp.c:3311
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3434
++#: tools/gpgconf-comp.c:3462
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf-comp.c:4036
+ #, fuzzy, c-format
+ msgid "error closing '%s'\n"
+ msgstr "‘%s’中出错:%s\n"
+ 
++#: tools/gpgconf-comp.c:4038
+ #, fuzzy, c-format
+ #| msgid "error in `%s': %s\n"
+ msgid "error parsing '%s'\n"
+ msgstr "‘%s’中出错:%s\n"
+ 
++#: tools/gpgconf.c:73
  msgid "list all components"
  msgstr ""
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "check all programs"
  msgstr ""
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|list options"
  msgstr ""
  
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
  msgid "|COMPONENT|change options"
  msgstr ""
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "|COMPONENT|check options"
  msgstr ""
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "apply global default values"
  msgstr ""
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
+ msgid "|FILE|update configuration files using FILE"
+ msgstr ""
+ 
++#: tools/gpgconf.c:83
  msgid "get the configuration directories for @GPGCONF@"
  msgstr ""
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:85
  #, fuzzy
  msgid "list global configuration file"
  msgstr "未知的配置项‘%s’\n"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  #, fuzzy
  msgid "check global configuration file"
  msgstr "未知的配置项‘%s’\n"
  
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:89
  #, fuzzy
  #| msgid "update the trust database"
  msgid "query the software version database"
  msgstr "更新信任度数据库"
  
- #: tools/gpgconf.c:86
++#: tools/gpgconf.c:90
  msgid "reload all or a given component"
  msgstr ""
  
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:91
  msgid "launch a given component"
  msgstr ""
  
- #: tools/gpgconf.c:88
++#: tools/gpgconf.c:92
  msgid "kill a given component"
  msgstr ""
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "use as output file"
  msgstr "指定输出文件"
  
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:102
  msgid "activate changes at runtime, if possible"
  msgstr ""
  
- #: tools/gpgconf.c:122
++#: tools/gpgconf.c:127
  #, fuzzy
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
  
- #: tools/gpgconf.c:125
++#: tools/gpgconf.c:130
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
  msgstr ""
  
- #: tools/gpgconf.c:545 tools/gpgconf.c:579
++#: tools/gpgconf.c:552 tools/gpgconf.c:587
  msgid "Need one component argument"
  msgstr ""
  
- #: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
++#: tools/gpgconf.c:561 tools/gpgconf.c:599 tools/gpgconf.c:632
  #, fuzzy
  msgid "Component not found"
  msgstr "找不到公钥"
  
- #: tools/gpgconf.c:650
++#: tools/gpgconf.c:658
  #, fuzzy
  msgid "No argument allowed"
  msgstr "不允许使用管理员命令\n"
diff --cc po/zh_TW.po
index 9964289,0151cec..4c37e3f
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@@ -9,7 -9,6 +9,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: GNU gnupg 2.1.0\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-11-18 16:54+0100\n"
++"POT-Creation-Date: 2016-12-20 11:28+0100\n"
  "PO-Revision-Date: 2014-11-22 20:56+0800\n"
  "Last-Translator: Jedi Lin <Jedi at Jedi.org>\n"
  "Language-Team: Chinese (traditional) <zh-l10n at linux.org.tw>\n"
@@@ -163,24 -134,10 +163,24 @@@ msgstr "不良的密語
  msgid "ssh keys greater than %d bits are not supported\n"
  msgstr "未支援大於 %d 位元的 ssh 金鑰\n"
  
 +#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
- #: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1306 g10/keygen.c:4577
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
++#: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
  #, c-format
  msgid "can't create '%s': %s\n"
  msgstr "無法建立 '%s': %s\n"
  
 +#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
- #: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1307
++#: g10/import.c:305 g10/import.c:448 g10/import.c:621 g10/keygen.c:3681
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
- #: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
- #: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:825 g10/sign.c:1025
++#: g10/sign.c:1130 g10/sign.c:1275 g10/tdbdump.c:143 g10/tdbdump.c:151
++#: g10/tdbio.c:720 g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161
++#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
++#: dirmngr/certcache.c:368 dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1564
  #, c-format
  msgid "can't open '%s': %s\n"
  msgstr "無法開啟 '%s': %s\n"
@@@ -243,11 -189,9 +243,11 @@@ msgstr "
  msgid "failed to create stream from socket: %s\n"
  msgstr "從 socket 建立串流失敗: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1100
++#: agent/divert-scd.c:92 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr "請插入下列序號的卡片:"
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1101
++#: agent/divert-scd.c:93 g10/call-agent.c:1102
  msgid "Please remove the current card and insert the one with serial number"
  msgstr "請移除現用中的卡片並插入下列序號的卡片:"
  
@@@ -377,47 -295,32 +377,47 @@@ msgstr "
  "@選項:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
  msgid "run in daemon mode (background)"
  msgstr "以服務模式執行 (背景)"
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
  msgid "run in server mode (foreground)"
  msgstr "以伺服器模式執行 (前景)"
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
  #, fuzzy
  #| msgid "run in server mode"
  msgid "run in supervised mode"
  msgstr "以伺服器模式執行"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:170 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "囉唆模式"
  
 +#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "盡量安靜些"
  
- #: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
  msgid "sh-style command output"
  msgstr "sh 樣式的指令輸出"
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
  msgid "csh-style command output"
  msgstr "csh 樣式的指令輸出"
  
- #: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
- #: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
++#: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
  msgid "|FILE|read options from FILE"
  msgstr "|檔案|從指定檔案中讀取選項"
  
- #: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:177
  msgid "do not detach from the console"
  msgstr "不要從 console 分離"
  
@@@ -496,19 -382,12 +496,19 @@@ msgstr "啟用 putty 支援
  #. 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:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:481 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1025 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:358
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:124 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr "翻譯瑕疵請回報給 <Jedi at Jedi.org>, 程式瑕疵則請回報給 <@EMAIL@>.\n"
  
- #: agent/gpg-agent.c:491
++#: agent/gpg-agent.c:490
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "用法: @GPG_AGENT@ [選項] (或用 -h 求助)"
  
- #: agent/gpg-agent.c:493
++#: agent/gpg-agent.c:492
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
@@@ -516,136 -395,101 +516,136 @@@ msgstr "
  "語法: @GPG_AGENT@ [選項] [指令 [引數]]\n"
  "@GNUPG@ 私鑰管理\n"
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:537 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:442
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr "給定的除錯等級 '%s' 無效\n"
  
- #: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:793
++#: agent/gpg-agent.c:1082 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:812
  #, c-format
  msgid "Note: no default option file '%s'\n"
  msgstr "請注意: 沒有預設選項檔 '%s'\n"
  
- #: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
- #: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1093 agent/gpg-agent.c:1935 g10/gpg.c:2510
++#: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:817
++#: dirmngr/dirmngr.c:1670 tools/symcryptrun.c:932
  #, c-format
  msgid "option file '%s': %s\n"
  msgstr "選項檔 '%s': %s\n"
  
- #: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:806
++#: agent/gpg-agent.c:1101 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:825
  #, c-format
  msgid "reading options from '%s'\n"
  msgstr "從 '%s' 讀取選項中\n"
  
- #: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
- #: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
++#: agent/gpg-agent.c:1223 g10/gpg.c:3643 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:936 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:527
  #, c-format
  msgid "Note: '%s' is not considered an option\n"
  msgstr "請注意: '%s' 並不當成選項\n"
  
- #: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
++#: agent/gpg-agent.c:2080 scd/scdaemon.c:1073 dirmngr/dirmngr.c:1081
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "無法建立 socket: %s\n"
  
- #: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
++#: agent/gpg-agent.c:2097 scd/scdaemon.c:1086 dirmngr/dirmngr.c:1094
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr "socket 名稱 '%s' 太長\n"
  
- #: agent/gpg-agent.c:2134
++#: agent/gpg-agent.c:2135
  msgid "a gpg-agent is already running - not starting a new one\n"
  msgstr "已經有一份 gpg-agent 在執行了 - 不會再啟動一份新的\n"
  
- #: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
++#: agent/gpg-agent.c:2145 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1126
  msgid "error getting nonce for the socket\n"
  msgstr "為 socket 取得 nonce 時出錯\n"
  
- #: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
++#: agent/gpg-agent.c:2150 scd/scdaemon.c:1113 dirmngr/dirmngr.c:1129
  #, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "綁定 socket 至 '%s' 時出錯: %s\n"
  
- #: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
- #: dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2160 agent/gpg-agent.c:2197 scd/scdaemon.c:1121
++#: dirmngr/dirmngr.c:1138
  #, 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:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:2165 scd/scdaemon.c:1126 dirmngr/dirmngr.c:1143
  #, c-format
  msgid "listen() failed: %s\n"
  msgstr "listen() 失敗: %s\n"
  
- #: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
++#: agent/gpg-agent.c:2172 scd/scdaemon.c:1133 dirmngr/dirmngr.c:1149
  #, c-format
  msgid "listening on socket '%s'\n"
  msgstr "正在候聽 socket '%s'\n"
  
- #: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: agent/gpg-agent.c:2191 agent/gpg-agent.c:2234 g10/exec.c:199
 +#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, c-format
  msgid "can't create directory '%s': %s\n"
  msgstr "無法建立目錄 '%s': %s\n"
  
- #: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: agent/gpg-agent.c:2194 agent/gpg-agent.c:2239 g10/openfile.c:491
 +#: g10/openfile.c:520 sm/keydb.c:103
  #, c-format
  msgid "directory '%s' created\n"
  msgstr "目錄 '%s' 已建立\n"
  
- #: agent/gpg-agent.c:2244
++#: agent/gpg-agent.c:2245
  #, c-format
  msgid "stat() failed for '%s': %s\n"
  msgstr "'%s' 的 stat() 失敗: %s\n"
  
- #: agent/gpg-agent.c:2248
++#: agent/gpg-agent.c:2249
  #, c-format
  msgid "can't use '%s' as home directory\n"
  msgstr "無法使用 '%s' 做為家目錄\n"
  
- #: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
++#: agent/gpg-agent.c:2392 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1871
  #, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "於 fd %d 讀取 nonce 時出錯: %s\n"
  
- #: agent/gpg-agent.c:2598
++#: agent/gpg-agent.c:2599
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr "經手程式 0x%lx (用於 fd %d) 已啟動\n"
  
- #: agent/gpg-agent.c:2603
++#: agent/gpg-agent.c:2604
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr "經手程式 0x%lx (用於 fd %d) 已終止\n"
  
- #: agent/gpg-agent.c:2678
++#: agent/gpg-agent.c:2679
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已啟動\n"
  
- #: agent/gpg-agent.c:2683
++#: agent/gpg-agent.c:2684
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已終止\n"
  
- #: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
++#: agent/gpg-agent.c:2881 scd/scdaemon.c:1272 dirmngr/dirmngr.c:2075
  #, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "npth_select 失敗: %s - 等 1 秒鐘\n"
  
- #: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2954 scd/scdaemon.c:1321
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s 已停止\n"
  
- #: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
++#: agent/gpg-agent.c:3092 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  msgid "no gpg-agent running in this session\n"
  msgstr "在此階段中沒有執行中的 gpg-agent\n"
  
@@@ -661,8 -503,6 +661,8 @@@ msgstr "
  "語法: gpg-preset-passphrase [選項] 金鑰鑰柄\n"
  "密碼快取維護\n"
  
- #: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
++#: agent/protect-tool.c:106 g10/gpg.c:424 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:153 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -670,9 -510,6 +670,9 @@@ msgstr "
  "@指令:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
- #: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:92 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:168 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -725,8 -554,6 +725,8 @@@ msgstr "已取消\n
  msgid "error while asking for the passphrase: %s\n"
  msgstr "詢問密語時出錯: %s\n"
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
- #: tools/gpgconf.c:323
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1472
++#: tools/gpgconf.c:328
  #, c-format
  msgid "error opening '%s': %s\n"
  msgstr "開啟 '%s' 時出錯: %s\n"
@@@ -893,9 -691,6 +893,9 @@@ 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:438
 +#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
- #: dirmngr/ldap-wrapper.c:710
++#: dirmngr/ldap-wrapper.c:711
  #, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "建立管道時出錯: %s\n"
@@@ -907,8 -699,6 +907,8 @@@
  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:848 dirmngr/dirmngr.c:1155
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1167
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "衍生執行程序時出錯: %s\n"
@@@ -954,28 -735,23 +954,28 @@@ msgstr "無法連接至 '%s': %s\n
  msgid "problem setting the gpg-agent options\n"
  msgstr "設定 gpg-agent 選項時發生問題\n"
  
- #: common/sysutils.c:144
++#: common/sysutils.c:148
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "無法讓系統停止傾印核心檔: %s\n"
  
- #: common/sysutils.c:239
++#: common/sysutils.c:250
  #, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "警告: %s 的所有權 \"%s\" 並不安全\n"
  
- #: common/sysutils.c:271
++#: common/sysutils.c:282
  #, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "警告: %s 的權限 \"%s\" 並不安全\n"
  
- #: common/sysutils.c:659
++#: common/sysutils.c:693
  #, 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:685
++#: common/sysutils.c:719
  #, c-format
  msgid "renaming '%s' to '%s' failed: %s\n"
  msgstr "把 '%s' 重新新命成 '%s' 時失敗: %s\n"
@@@ -1050,7 -811,6 +1050,7 @@@ msgstr "%s:%u: 廢棄的 \"%s\" 選項 
  msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
  msgstr "警告: \"%s%s\" 是已廢棄的選項 - 沒有效果\n"
  
- #: common/miscellaneous.c:554
++#: common/miscellaneous.c:556
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
@@@ -1156,8 -893,6 +1156,8 @@@ msgstr "階段金鑰已建立
  msgid "algorithm: %s"
  msgstr "演算法: %s"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:3098
++#: scd/app-openpgp.c:3111
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "未支援的演算法: %s"
@@@ -1343,7 -1036,6 +1343,7 @@@ msgstr "\"%.50s\" 選項不明確\n
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr "\"%.50s\" 指令不明確\n"
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1173
++#: common/argparse.c:401 dirmngr/dirmngr.c:1185
  msgid "out of core\n"
  msgstr "超出核心\n"
  
@@@ -1401,8 -1082,6 +1401,8 @@@ msgstr "未鎖定 '%s': %s\n
  msgid "waiting for lock %s...\n"
  msgstr "正在等候 `%s' 鎖定...\n"
  
- #: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
- #: dirmngr/dirmngr.c:715
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:725
++#: dirmngr/dirmngr.c:734
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr "%s 太舊了 (需要 %s, 但是祇有 %s)\n"
@@@ -1440,7 -1111,6 +1440,7 @@@ msgstr "未預期的封裝: 
  msgid "invalid dash escaped line: "
  msgstr "無效的破折號逸出列: "
  
- #: g10/armor.c:873 g10/armor.c:1490
++#: g10/armor.c:873 g10/armor.c:1493
  #, c-format
  msgid "invalid radix64 character %02X skipped\n"
  msgstr "無效的 64 進位字符 %02x 已跳過\n"
@@@ -1457,7 -1124,6 +1457,7 @@@ msgstr "檔案未預期的結束 (CRC �
  msgid "malformed CRC\n"
  msgstr "格式不對的 CRC\n"
  
- #: g10/armor.c:962 g10/armor.c:1527
++#: g10/armor.c:962 g10/armor.c:1530
  #, c-format
  msgid "CRC error; %06lX - %06lX\n"
  msgstr "CRC 錯誤; %06lX - %06lX\n"
@@@ -1470,16 -1134,13 +1470,16 @@@ msgstr "檔案未預期的結束 (於�
  msgid "error in trailer line\n"
  msgstr "結尾列有問題\n"
  
- #: g10/armor.c:1303
++#: g10/armor.c:1306
  msgid "no valid OpenPGP data found.\n"
  msgstr "找不到有效的 OpenPGP 資料.\n"
  
- #: g10/armor.c:1308
++#: g10/armor.c:1311
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
  msgstr "無效的封裝: 列長超出 %d 字符\n"
  
- #: g10/armor.c:1312
++#: g10/armor.c:1315
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr "封裝裡出現被引號括住的可列印字符 - 可能是有瑕疵的送信程式造成的\n"
@@@ -1562,8 -1208,6 +1562,8 @@@ msgstr "沒有可用的 OpenPGP 卡片
  msgid "OpenPGP card no. %s detected\n"
  msgstr "偵測到 OpenPGP 卡片編號 %s\n"
  
- #: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
- #: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2030
++#: g10/keygen.c:4087 g10/revoke.c:215 g10/revoke.c:618
  msgid "can't do this in batch mode\n"
  msgstr "無法在批次模式中這樣做\n"
  
@@@ -1571,14 -1214,9 +1571,14 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "祇有第二版卡片纔能用這個指令\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2454
++#: g10/card-util.c:109 scd/app-openpgp.c:2467
  msgid "Reset Code not or not anymore available\n"
  msgstr "(再也) 沒有重設碼\n"
  
 +#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
- #: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
- #: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1768
++#: g10/keygen.c:1945 g10/keygen.c:2313 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "你要選哪一個? "
  
@@@ -1640,10 -1264,6 +1640,10 @@@ msgstr "取回公鑰的 URL: 
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr "錯誤: URL 太長 (上限是 %d 個字符).\n"
  
- #: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
- #: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:334
++#: g10/import.c:592 g10/import.c:640 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
++#: dirmngr/dirmngr.c:1510 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, c-format
  msgid "error reading '%s': %s\n"
  msgstr "讀取 '%s' 時出錯: %s\n"
@@@ -1709,7 -1314,6 +1709,7 @@@ msgstr "不可能進行金鑰操作: %s
  msgid "not an OpenPGP card"
  msgstr "這不是 OpenPGP 卡片"
  
- #: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
++#: g10/card-util.c:1173 g10/keygen.c:4106 g10/keygen.c:5092
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr "取得現用金鑰資訊時出錯: %s\n"
@@@ -1743,13 -1342,10 +1743,13 @@@ msgstr "你的加密金鑰想要用多�
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "你的認證金鑰想要用多大的金鑰尺寸? (%u) "
  
- #: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
++#: g10/card-util.c:1316 g10/keygen.c:2122 g10/keygen.c:2154
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "加大到 %u 位元\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2207 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr "%s 金鑰尺寸一定要介於 %u 到 %u 之間\n"
@@@ -1803,9 -1389,6 +1803,9 @@@ msgstr "   (2) 加密用金鑰\n
  msgid "   (3) Authentication key\n"
  msgstr "   (3) 憑證用金鑰\n"
  
- #: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
- #: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
- #: g10/keygen.c:2314 g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1508
++#: g10/keygen.c:1794 g10/keygen.c:1822 g10/keygen.c:1952 g10/keygen.c:2060
++#: g10/keygen.c:2336 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "無效的選擇.\n"
  
@@@ -1840,7 -1417,6 +1840,7 @@@ msgstr "是否繼續? (Y/n) 
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1816 g10/keyedit.c:1867
++#: g10/card-util.c:1816 g10/keyedit.c:1868
  msgid "quit this menu"
  msgstr "離開這個選單"
  
@@@ -1848,7 -1423,6 +1848,7 @@@
  msgid "show admin commands"
  msgstr "顯示管理者指令"
  
- #: g10/card-util.c:1819 g10/keyedit.c:1870
++#: g10/card-util.c:1819 g10/keyedit.c:1871
  msgid "show this help"
  msgstr "顯示這份線上說明"
  
@@@ -1924,30 -1480,20 +1924,30 @@@ msgstr "允許使用管理者指令\n
  msgid "Admin commands are not allowed\n"
  msgstr "未允許使用管理者指令\n"
  
- #: g10/card-util.c:2127 g10/keyedit.c:2816
++#: g10/card-util.c:2127 g10/keyedit.c:2817
  msgid "Invalid command  (try \"help\")\n"
  msgstr "無效的指令  (試試看 \"help\")\n"
  
- #: g10/decrypt.c:191 g10/encrypt.c:955
++#: g10/decrypt.c:190 g10/encrypt.c:955
  msgid "--output doesn't work for this command\n"
  msgstr "--output 在這個指令中沒有作用\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4904 g10/keyring.c:398 g10/keyring.c:771
  #, c-format
  msgid "can't open '%s'\n"
  msgstr "無法開啟 '%s'\n"
  
 +#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
- #: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
- #: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4858 g10/keyedit.c:2051
++#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2163
  #, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "找不到金鑰 \"%s\": %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
- #: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
- #: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4866 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:645 g10/tofu.c:2171
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "讀取金鑰區塊時出錯: %s\n"
@@@ -2005,7 -1539,6 +2005,7 @@@ msgstr "公鑰 \"%s\" 有相對應的�
  msgid "use option \"--delete-secret-keys\" to delete it first.\n"
  msgstr "請先以 \"--delete-secret-keys\" 選項來刪除它.\n"
  
- #: g10/encrypt.c:232 g10/sign.c:1292
++#: g10/encrypt.c:232 g10/sign.c:1294
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "建立密語時出錯: %s\n"
@@@ -2024,7 -1554,6 +2024,7 @@@ msgstr "正在使用 %s 編密法\n
  msgid "'%s' already compressed\n"
  msgstr "'%s' 已經被壓縮了\n"
  
- #: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:610
  #, c-format
  msgid "WARNING: '%s' is an empty file\n"
  msgstr "警告: '%s' 是個空檔案\n"
@@@ -2040,7 -1567,6 +2040,7 @@@ msgid "
  "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
  msgstr "警告: 強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
  
- #: g10/encrypt.c:707 g10/sign.c:984
++#: g10/encrypt.c:707 g10/sign.c:986
  #, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2072,7 -1593,6 +2072,7 @@@ msgstr "%s 已加密的資料\n
  msgid "encrypted with unknown algorithm %d\n"
  msgstr "以 %d 未知演算法所加密\n"
  
- #: g10/decrypt-data.c:164 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:129
  msgid ""
  "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
  msgstr "警告: 訊息已用對稱式編密法的弱金鑰加密了.\n"
@@@ -2156,8 -1658,6 +2156,8 @@@ msgstr "匯出時盡可能地從金鑰�
  msgid " - skipped"
  msgstr " - 已跳過"
  
- #: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:845 g10/sign.c:1148
++#: g10/export.c:1251 g10/import.c:1543 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:847 g10/sign.c:1150
  #, c-format
  msgid "writing to '%s'\n"
  msgstr "正在寫入 '%s'\n"
@@@ -2180,8 -1676,6 +2180,8 @@@ msgstr "金鑰 %s: PGP 2.x 型態的金
  msgid "WARNING: nothing exported\n"
  msgstr "警告: 沒有匯出任何東西\n"
  
- #: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
- #: g10/plaintext.c:151 g10/plaintext.c:174
++#: g10/export.c:2283 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/plaintext.c:167 g10/plaintext.c:190
  #, c-format
  msgid "error creating '%s': %s\n"
  msgstr "建立 '%s' 時出錯: %s\n"
@@@ -2228,8 -1713,6 +2228,8 @@@ msgstr "取得 '%s' (經由 %s ) 時出
  msgid "No fingerprint"
  msgstr "沒有指紋"
  
- #: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
- #: g10/revoke.c:701
++#: g10/getkey.c:1873 g10/keyedit.c:2929 g10/keyedit.c:3016 g10/revoke.c:637
++#: g10/revoke.c:702
  #, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "找不到私鑰 \"%s\": %s\n"
@@@ -2261,203 -1739,159 +2261,209 @@@ msgstr "無效的金鑰 %s 可以藉�
  msgid "using subkey %s instead of primary key %s\n"
  msgstr "使用子鑰 %s 來替換主鑰 %s\n"
  
- #: g10/gpg.c:424 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:200
  msgid "make a signature"
  msgstr "建立簽章"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:427
  msgid "make a clear text signature"
  msgstr "建立明文簽章"
  
- #: g10/gpg.c:426 sm/gpgsm.c:202
++#: g10/gpg.c:429 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "建立分離式簽章"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:430 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "加密資料"
  
- #: g10/gpg.c:429
++#: g10/gpg.c:432
  msgid "encryption only with symmetric cipher"
  msgstr "僅使用對稱式編密法來加密"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:434 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "資料解密 (預設)"
  
- #: g10/gpg.c:433 sm/gpgsm.c:206
++#: g10/gpg.c:436 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "驗證簽章"
  
- #: g10/gpg.c:435 sm/gpgsm.c:207
++#: g10/gpg.c:438 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "列出金鑰"
  
- #: g10/gpg.c:437
++#: g10/gpg.c:440
  msgid "list keys and signatures"
  msgstr "列出金鑰和簽章"
  
- #: g10/gpg.c:438
++#: g10/gpg.c:443
  msgid "list and check key signatures"
  msgstr "列出並檢查金鑰簽章"
  
- #: g10/gpg.c:439 sm/gpgsm.c:212
++#: g10/gpg.c:445 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "列出金鑰和指紋"
  
- #: g10/gpg.c:440 sm/gpgsm.c:210
++#: g10/gpg.c:446 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "列出私鑰"
  
- #: g10/gpg.c:442 sm/gpgsm.c:213
++#: g10/gpg.c:448 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "產生新的金鑰對"
  
- #: g10/gpg.c:444
++#: g10/gpg.c:451
  msgid "quickly generate a new key pair"
  msgstr "快速產生新的金鑰對"
  
- #: g10/gpg.c:446
++#: g10/gpg.c:454
  #, fuzzy
  #| msgid "quickly generate a new key pair"
  msgid "quickly add a new user-id"
  msgstr "快速產生新的金鑰對"
  
- #: g10/gpg.c:449
++#: g10/gpg.c:459
  #, fuzzy
  #| msgid "quickly generate a new key pair"
  msgid "quickly revoke a user-id"
  msgstr "快速產生新的金鑰對"
  
- #: g10/gpg.c:451
++#: g10/gpg.c:462
+ #, fuzzy
+ #| msgid "quickly generate a new key pair"
+ msgid "quickly set a new expiration date"
+ msgstr "快速產生新的金鑰對"
+ 
++#: g10/gpg.c:464
  msgid "full featured key pair generation"
  msgstr "全能金鑰對生成"
  
- #: g10/gpg.c:452
++#: g10/gpg.c:467
  msgid "generate a revocation certificate"
  msgstr "產生撤銷憑證"
  
- #: g10/gpg.c:454 sm/gpgsm.c:215
++#: g10/gpg.c:470 sm/gpgsm.c:216
  msgid "remove keys from the public keyring"
  msgstr "從公鑰鑰匙圈裡移除金鑰"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:472
  msgid "remove keys from the secret keyring"
  msgstr "從私鑰鑰匙圈裡移除金鑰"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:474
  msgid "quickly sign a key"
  msgstr "快速簽署金鑰"
  
- #: g10/gpg.c:460
++#: g10/gpg.c:476
  msgid "quickly sign a key locally"
  msgstr "快速在本機簽署金鑰"
  
- #: g10/gpg.c:461
++#: g10/gpg.c:477
  msgid "sign a key"
  msgstr "簽署金鑰"
  
- #: g10/gpg.c:462
++#: g10/gpg.c:478
  msgid "sign a key locally"
  msgstr "僅在本機簽署金鑰"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:479
  msgid "sign or edit a key"
  msgstr "簽署或編輯金鑰"
  
- #: g10/gpg.c:465 sm/gpgsm.c:233
++#: g10/gpg.c:481 sm/gpgsm.c:234
  msgid "change a passphrase"
  msgstr "更改密語"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:485
  msgid "export keys"
  msgstr "匯出金鑰"
  
- #: g10/gpg.c:468
++#: g10/gpg.c:486
  msgid "export keys to a keyserver"
  msgstr "把金鑰匯出至金鑰伺服器"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:487
  msgid "import keys from a keyserver"
  msgstr "從金鑰伺服器匯入金鑰"
  
- #: g10/gpg.c:471
++#: g10/gpg.c:490
  msgid "search for keys on a keyserver"
  msgstr "在金鑰伺服器上搜尋金鑰"
  
- #: g10/gpg.c:473
++#: g10/gpg.c:492
  msgid "update all keys from a keyserver"
  msgstr "從金鑰伺服器更新所有的金鑰"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:498
  msgid "import/merge keys"
  msgstr "匯入/合併金鑰"
  
- #: g10/gpg.c:482
++#: g10/gpg.c:501
  msgid "print the card status"
  msgstr "列印卡片狀態"
  
- #: g10/gpg.c:483
++#: g10/gpg.c:502
  msgid "change data on a card"
  msgstr "變更卡片上的資料"
  
- #: g10/gpg.c:484
++#: g10/gpg.c:504
  msgid "change a card's PIN"
  msgstr "變更卡片的個人識別碼 (PIN)"
  
- #: g10/gpg.c:496
++#: g10/gpg.c:516
  msgid "update the trust database"
  msgstr "更新信任資料庫"
  
- #: g10/gpg.c:505
++#: g10/gpg.c:525
  msgid "print message digests"
  msgstr "印出訊息摘要"
  
- #: g10/gpg.c:508 sm/gpgsm.c:228
++#: g10/gpg.c:528 sm/gpgsm.c:229
  msgid "run in server mode"
  msgstr "以伺服器模式執行"
  
- #: g10/gpg.c:510
++#: g10/gpg.c:530
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:514 sm/gpgsm.c:246
++#: g10/gpg.c:534 sm/gpgsm.c:248
  msgid "create ascii armored output"
  msgstr "建立以 ASCII 封裝過的輸出"
  
- #: g10/gpg.c:517 sm/gpgsm.c:262
++#: g10/gpg.c:537 sm/gpgsm.c:264
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|使用者-ID|以指定使用者 ID 作為加密對象"
  
- #: g10/gpg.c:533 sm/gpgsm.c:298
++#: g10/gpg.c:553 sm/gpgsm.c:300
  msgid "|USER-ID|use USER-ID to sign or decrypt"
  msgstr "|使用者-ID|拿指定使用者 ID 來簽署或解密"
  
- #: g10/gpg.c:539
++#: g10/gpg.c:559
  msgid "|N|set compress level to N (0 disables)"
  msgstr "|N|設定壓縮等級為 N (0 表示不壓縮)"
  
- #: g10/gpg.c:546
++#: g10/gpg.c:566
  msgid "use canonical text mode"
  msgstr "使用標準的文字模式"
  
- #: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
++#: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
  msgid "|FILE|write output to FILE"
  msgstr "|檔案|將輸出寫入至指定檔案"
  
- #: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
++#: g10/gpg.c:598 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
  msgid "do not make any changes"
  msgstr "不要做任何改變"
  
- #: g10/gpg.c:579
++#: g10/gpg.c:599
  msgid "prompt before overwriting"
  msgstr "覆寫前先詢問"
  
- #: g10/gpg.c:628
++#: g10/gpg.c:648
  msgid "use strict OpenPGP behavior"
  msgstr "使用嚴謹的 OpenPGP 行為"
  
- #: g10/gpg.c:654 sm/gpgsm.c:355
++#: g10/gpg.c:674 sm/gpgsm.c:357
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2465,7 -1899,16 +2471,17 @@@ msgstr "
  "@\n"
  "(請參照線上說明頁面來取得所有命令和選項的完整清單)\n"
  
- #: g10/gpg.c:657 sm/gpgsm.c:358
++#: g10/gpg.c:677
+ #, fuzzy
+ #| msgid ""
+ #| "@\n"
+ #| "Examples:\n"
+ #| "\n"
+ #| " -se -r Bob [file]          sign and encrypt for user Bob\n"
+ #| " --clear-sign [file]         make a clear text signature\n"
+ #| " --detach-sign [file]       make a detached signature\n"
+ #| " --list-keys [names]        show keys\n"
+ #| " --fingerprint [names]      show fingerprints\n"
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2485,11 -1928,9 +2501,11 @@@ msgstr "
  " --list-keys [名字]         顯示金鑰\n"
  " --fingerprint [名字]       顯示指紋\n"
  
- #: g10/gpg.c:1026
++#: g10/gpg.c:1047
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
  msgstr "用法: @GPG@ [選項] [檔案] (或用 -h 求助)"
  
- #: g10/gpg.c:1029
++#: g10/gpg.c:1050
  msgid ""
  "Syntax: @GPG@ [options] [files]\n"
  "Sign, check, encrypt or decrypt\n"
@@@ -2499,7 -1940,6 +2515,7 @@@ msgstr "
  "簽署, 檢查, 加密, 解密\n"
  "預設的操作會依輸入資料而定\n"
  
- #: g10/gpg.c:1040 sm/gpgsm.c:588
++#: g10/gpg.c:1061 sm/gpgsm.c:580
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2507,587 -1947,412 +2523,527 @@@ msgstr "
  "\n"
  "已支援的演算法:\n"
  
- #: g10/gpg.c:1043
++#: g10/gpg.c:1064
  msgid "Pubkey: "
  msgstr "公鑰: "
  
- #: g10/gpg.c:1050 g10/keyedit.c:3402
++#: g10/gpg.c:1071 g10/keyedit.c:3483
  msgid "Cipher: "
  msgstr "編密法: "
  
- #: g10/gpg.c:1057
++#: g10/gpg.c:1078
  msgid "Hash: "
  msgstr "雜湊: "
  
- #: g10/gpg.c:1064 g10/keyedit.c:3451
++#: g10/gpg.c:1085 g10/keyedit.c:3532
  msgid "Compression: "
  msgstr "壓縮: "
  
- #: g10/gpg.c:1133 sm/gpgsm.c:662
++#: g10/gpg.c:1154 sm/gpgsm.c:654
  #, c-format
  msgid "usage: %s [options] %s\n"
  msgstr "用法: %s [選項] %s\n"
  
- #: g10/gpg.c:1321 sm/gpgsm.c:751
++#: g10/gpg.c:1342 sm/gpgsm.c:743
  msgid "conflicting commands\n"
  msgstr "指令彼此矛盾\n"
  
- #: g10/gpg.c:1339
++#: g10/gpg.c:1360
  #, c-format
  msgid "no = sign found in group definition '%s'\n"
  msgstr "在群組定義 '%s' 裡找不到 = 記號\n"
  
- #: g10/gpg.c:1537
++#: g10/gpg.c:1558
  #, c-format
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr "警告: 家目錄 '%s' 的所有權並不安全\n"
  
- #: g10/gpg.c:1540
++#: g10/gpg.c:1561
  #, c-format
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
  msgstr "警告: 組態檔案 '%s' 的所有權並不安全\n"
  
- #: g10/gpg.c:1543
++#: g10/gpg.c:1564
  #, c-format
  msgid "WARNING: unsafe ownership on extension '%s'\n"
  msgstr "警告: 延伸模組 '%s' 的所有權並不安全\n"
  
- #: g10/gpg.c:1549
++#: g10/gpg.c:1570
  #, c-format
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
  msgstr "警告: 家目錄 '%s' 的權限並不安全\n"
  
- #: g10/gpg.c:1552
++#: g10/gpg.c:1573
  #, c-format
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
  msgstr "警告: 組態檔案 '%s' 的權限並不安全\n"
  
- #: g10/gpg.c:1555
++#: g10/gpg.c:1576
  #, c-format
  msgid "WARNING: unsafe permissions on extension '%s'\n"
  msgstr "警告: 延伸模組 '%s' 的權限並不安全\n"
  
- #: g10/gpg.c:1561
++#: g10/gpg.c:1582
  #, c-format
  msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
  msgstr "警告: 家目錄 '%s' 的封入目錄所有權並不安全\n"
  
- #: g10/gpg.c:1564
++#: g10/gpg.c:1585
  #, c-format
  msgid ""
  "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
  msgstr "警告: 組態檔案 '%s' 的封入目錄所有權並不安全\n"
  
- #: g10/gpg.c:1567
++#: g10/gpg.c:1588
  #, c-format
  msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
  msgstr "警告: 延伸模組 '%s' 的封入目錄所有權並不安全\n"
  
- #: g10/gpg.c:1573
++#: g10/gpg.c:1594
  #, c-format
  msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
  msgstr "警告: 家目錄 '%s' 的封入目錄權限並不安全\n"
  
- #: g10/gpg.c:1576
++#: g10/gpg.c:1597
  #, c-format
  msgid ""
  "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
  msgstr "警告: 組態檔案 '%s' 的封入目錄權限並不安全\n"
  
- #: g10/gpg.c:1579
++#: g10/gpg.c:1600
  #, c-format
  msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
  msgstr "警告: 延伸模組 '%s' 的封入目錄權限並不安全\n"
  
- #: g10/gpg.c:1786
++#: g10/gpg.c:1816
  #, c-format
  msgid "unknown configuration item '%s'\n"
  msgstr "未知的組態項目 '%s'\n"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1925
  msgid "display photo IDs during key listings"
  msgstr "列出金鑰時顯示照片 ID"
  
- #: g10/gpg.c:1895
++#: g10/gpg.c:1927
  msgid "show key usage information during key listings"
  msgstr "列出金鑰時顯示金鑰用途資訊"
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1929
  msgid "show policy URLs during signature listings"
  msgstr "列出簽章時顯示原則 URL"
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1931
  msgid "show all notations during signature listings"
  msgstr "列出簽章時顯示所有的註記"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1933
  msgid "show IETF standard notations during signature listings"
  msgstr "列出簽章時顯示 IETF 標準註記"
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1937
  msgid "show user-supplied notations during signature listings"
  msgstr "列出簽章時顯示使用者提供的註記"
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1939
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "列出簽章時顯示偏好的金鑰伺服器 URL"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1941
  msgid "show user ID validity during key listings"
  msgstr "列出金鑰時顯示使用者 ID 有效性"
  
- #: g10/gpg.c:1911
++#: g10/gpg.c:1943
  msgid "show revoked and expired user IDs in key listings"
  msgstr "列出金鑰時顯示已撤銷或過期的使用者 ID"
  
- #: g10/gpg.c:1913
++#: g10/gpg.c:1945
  msgid "show revoked and expired subkeys in key listings"
  msgstr "列出金鑰時顯示已撤銷或過期的子鑰"
  
- #: g10/gpg.c:1915
++#: g10/gpg.c:1947
  msgid "show the keyring name in key listings"
  msgstr "在金鑰清單中顯示鑰匙圈名稱"
  
- #: g10/gpg.c:1917
++#: g10/gpg.c:1949
  msgid "show expiration dates during signature listings"
  msgstr "列出簽章時顯示有效期限"
  
- #: g10/gpg.c:2019 g10/gpg.c:2056
++#: g10/gpg.c:2051 g10/gpg.c:2088
  #, fuzzy, c-format
  #| msgid "invalid argument for option \"%.50s\"\n"
  msgid "valid values for option '%s':\n"
  msgstr "選項 \"%.50s\" 的引數無效\n"
  
- #: g10/gpg.c:2030
++#: g10/gpg.c:2062
  #, fuzzy, c-format
  #| msgid "unknown option '%s'\n"
  msgid "unknown TOFU policy '%s'\n"
  msgstr "未知的選項 '%s'\n"
  
- #: g10/gpg.c:2032 g10/gpg.c:2068
++#: g10/gpg.c:2064 g10/gpg.c:2100
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2066
++#: g10/gpg.c:2098 g10/keygen.c:167
  #, fuzzy, c-format
  #| msgid "invalid argument for option \"%.50s\"\n"
  msgid "invalid value for option '%s'\n"
  msgstr "選項 \"%.50s\" 的引數無效\n"
  
- #: g10/gpg.c:2203
++#: g10/gpg.c:2235
  #, c-format
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "請注意: 已忽略舊有的預設選項檔 '%s'\n"
  
- #: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
++#: g10/gpg.c:2839 g10/gpg.c:3610 g10/gpg.c:3622
  #, c-format
  msgid "Note: %s is not for normal use!\n"
  msgstr "請注意: 一般情況下不採用 %s!\n"
  
- #: g10/gpg.c:2978 g10/gpg.c:2990
++#: g10/gpg.c:3011 g10/gpg.c:3023
  #, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "'%s' 不是有效的簽章使用期限\n"
  
- #: g10/gpg.c:3012
++#: g10/gpg.c:3045
  #, 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:3044 sm/gpgsm.c:1166
++#: g10/gpg.c:3077 sm/gpgsm.c:1158
  #, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "無效的個人識別碼項目模式 '%s'\n"
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3130
  #, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "'%s' 不是有效的字元集\n"
  
- #: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
++#: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
  msgid "could not parse keyserver URL\n"
  msgstr "無法剖析金鑰伺服器 URL\n"
  
- #: g10/gpg.c:3137
++#: g10/gpg.c:3170
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: 無效的金鑰伺服器選項\n"
  
- #: g10/gpg.c:3140
++#: g10/gpg.c:3173
  msgid "invalid keyserver options\n"
  msgstr "無效的金鑰伺服器選項\n"
  
- #: g10/gpg.c:3147
++#: g10/gpg.c:3180
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: 無效的匯入選項\n"
  
- #: g10/gpg.c:3150
++#: g10/gpg.c:3183
  msgid "invalid import options\n"
  msgstr "無效的匯入選項\n"
  
- #: g10/gpg.c:3156 g10/gpg.c:3171
++#: g10/gpg.c:3189 g10/gpg.c:3204
  #, fuzzy, c-format
  #| msgid "invalid list options\n"
  msgid "invalid filter option: %s\n"
  msgstr "無效的清單選項\n"
  
- #: g10/gpg.c:3162
++#: g10/gpg.c:3195
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: 無效的匯出選項\n"
  
- #: g10/gpg.c:3165
++#: g10/gpg.c:3198
  msgid "invalid export options\n"
  msgstr "無效的匯出選項\n"
  
- #: g10/gpg.c:3177
++#: g10/gpg.c:3210
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: 無效的清單選項\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3213
  msgid "invalid list options\n"
  msgstr "無效的清單選項\n"
  
- #: g10/gpg.c:3188
++#: g10/gpg.c:3221
  msgid "display photo IDs during signature verification"
  msgstr "驗證簽章時顯示照片 ID"
  
- #: g10/gpg.c:3190
++#: g10/gpg.c:3223
  msgid "show policy URLs during signature verification"
  msgstr "驗證簽章時顯示原則 URL"
  
- #: g10/gpg.c:3192
++#: g10/gpg.c:3225
  msgid "show all notations during signature verification"
  msgstr "驗證簽章時顯示所有的註記"
  
- #: g10/gpg.c:3194
++#: g10/gpg.c:3227
  msgid "show IETF standard notations during signature verification"
  msgstr "驗證簽章時顯示 IETF 標準註記"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3231
  msgid "show user-supplied notations during signature verification"
  msgstr "驗證簽章時顯示使用者提供的註記"
  
- #: g10/gpg.c:3200
++#: g10/gpg.c:3233
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "驗證簽章時顯示偏好的金鑰伺服器 URL"
  
- #: g10/gpg.c:3202
++#: g10/gpg.c:3235
  msgid "show user ID validity during signature verification"
  msgstr "驗證簽章時顯示使用者 ID 有效性"
  
- #: g10/gpg.c:3204
++#: g10/gpg.c:3237
  msgid "show revoked and expired user IDs in signature verification"
  msgstr "驗證簽章時顯示已撤銷或過期的使用者 ID"
  
- #: g10/gpg.c:3206
++#: g10/gpg.c:3239
  msgid "show only the primary user ID in signature verification"
  msgstr "驗證簽章時祇顯示主要的使用者 ID"
  
- #: g10/gpg.c:3208
++#: g10/gpg.c:3241
  msgid "validate signatures with PKA data"
  msgstr "以 PKA 資料驗證簽章"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3243
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr "提高對持有有效 PKA 資料之簽章的信任"
  
- #: g10/gpg.c:3217
++#: g10/gpg.c:3250
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: 無效的驗證選項\n"
  
- #: g10/gpg.c:3220
++#: g10/gpg.c:3253
  msgid "invalid verify options\n"
  msgstr "無效的驗證選項\n"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3260
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "無法把執行檔路徑設成 %s\n"
  
- #: g10/gpg.c:3417
++#: g10/gpg.c:3452
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: 無效的自動金鑰定址清單\n"
  
- #: g10/gpg.c:3420
++#: g10/gpg.c:3455
  msgid "invalid auto-key-locate list\n"
  msgstr "無效的自動金鑰定址清單\n"
  
- #: g10/gpg.c:3553 sm/gpgsm.c:1507
++#: g10/gpg.c:3592 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
  msgstr "警告: 程式可能會傾印出核心檔!\n"
  
- #: g10/gpg.c:3564
++#: g10/gpg.c:3603
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "警告: %s 會推翻 %s\n"
  
- #: g10/gpg.c:3573
++#: g10/gpg.c:3612
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s 不允許跟 %s 併用!\n"
  
- #: g10/gpg.c:3576
++#: g10/gpg.c:3615
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s 跟 %s 放在一起沒有意義!\n"
  
- #: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
++#: g10/gpg.c:3630 sm/gpgsm.c:1518 dirmngr/dirmngr.c:951
  msgid "WARNING: running with faked system time: "
  msgstr "警告: 正在偽造的系統時間中執行: "
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3651
  #, c-format
  msgid "will not run with insecure memory due to %s\n"
  msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
  
- #: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
++#: g10/gpg.c:3686 g10/gpg.c:3710 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "所選的編密演算法無效\n"
  
- #: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
++#: g10/gpg.c:3692 g10/gpg.c:3716 sm/gpgsm.c:1591 sm/gpgsm.c:1597
  msgid "selected digest algorithm is invalid\n"
  msgstr "所選的摘要演算法無效\n"
  
- #: g10/gpg.c:3659
++#: g10/gpg.c:3698
  msgid "selected compression algorithm is invalid\n"
  msgstr "所選的壓縮演算法無效\n"
  
- #: g10/gpg.c:3665
++#: g10/gpg.c:3704
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "所選的憑證摘要演算法無效\n"
  
- #: g10/gpg.c:3680
++#: g10/gpg.c:3719
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed 一定要大於 0\n"
  
- #: g10/gpg.c:3682
++#: g10/gpg.c:3721
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed 一定要大於 1\n"
  
- #: g10/gpg.c:3684
++#: g10/gpg.c:3723
  msgid "max-cert-depth must be in the range from 1 to 255\n"
  msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
  
- #: g10/gpg.c:3686
++#: g10/gpg.c:3725
  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:3688
++#: g10/gpg.c:3727
  msgid "invalid min-cert-level; must be 1, 2, or 3\n"
  msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
  
- #: g10/gpg.c:3691
++#: g10/gpg.c:3730
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
  msgstr "請注意: 強烈不建議使用單純 S2K 模式 (0)\n"
  
- #: g10/gpg.c:3695
++#: g10/gpg.c:3734
  msgid "invalid S2K mode; must be 0, 1 or 3\n"
  msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
  
- #: g10/gpg.c:3702
++#: g10/gpg.c:3741
  msgid "invalid default preferences\n"
  msgstr "無效的預設偏好\n"
  
- #: g10/gpg.c:3706
++#: g10/gpg.c:3745
  msgid "invalid personal cipher preferences\n"
  msgstr "無效的個人編密法偏好\n"
  
- #: g10/gpg.c:3710
++#: g10/gpg.c:3749
  msgid "invalid personal digest preferences\n"
  msgstr "無效的個人摘要偏好\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3753
  msgid "invalid personal compress preferences\n"
  msgstr "無效的個人壓縮偏好\n"
  
- #: g10/gpg.c:3750
++#: g10/gpg.c:3789
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s 還沒辦法跟 %s 一起運作\n"
  
- #: g10/gpg.c:3797
++#: g10/gpg.c:3836
  #, c-format
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr "你不該將 '%s' 編密演算法用於 %s 模式\n"
  
- #: g10/gpg.c:3802
++#: g10/gpg.c:3841
  #, c-format
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr "你不該將 '%s' 摘要演算法用於 %s 模式\n"
  
- #: g10/gpg.c:3807
++#: g10/gpg.c:3846
  #, c-format
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr "你不該將 '%s' 壓縮演算法用於 %s 模式\n"
  
- #: g10/gpg.c:3906
++#: g10/gpg.c:3945
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "信任資料庫啟始失敗: %s\n"
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:3957
  msgid "WARNING: recipients (-r) given without using public key encryption\n"
  msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
  
- #: g10/gpg.c:3975
- msgid "--store [filename]"
- msgstr "--store [檔名]"
- 
- #: g10/gpg.c:3985
- msgid "--symmetric [filename]"
- msgstr "--symmetric [檔名]"
- 
- #: g10/gpg.c:3989
++#: g10/gpg.c:4028
  #, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "'%s' 對稱式加密失敗: %s\n"
  
- #: g10/gpg.c:4000
- msgid "--encrypt [filename]"
- msgstr "--encrypt [檔名]"
- 
- #: g10/gpg.c:4016
- msgid "--symmetric --encrypt [filename]"
- msgstr "--symmetric --encrypt [檔名]"
- 
- #: g10/gpg.c:4018
++#: g10/gpg.c:4057
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
  
- #: g10/gpg.c:4021
++#: g10/gpg.c:4060
  #, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr "你不能在 %s 模式中使用 --symmetric --encrypt\n"
  
- #: g10/gpg.c:4042
- msgid "--sign [filename]"
- msgstr "--sign [檔名]"
- 
- #: g10/gpg.c:4058
- msgid "--sign --encrypt [filename]"
- msgstr "--sign --encrypt [檔名]"
- 
- #: g10/gpg.c:4076
- msgid "--symmetric --sign --encrypt [filename]"
- msgstr "--symmetric --sign --encrypt [檔名]"
- 
- #: g10/gpg.c:4078
++#: g10/gpg.c:4117
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
  
- #: g10/gpg.c:4081
++#: g10/gpg.c:4120
  #, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr "你不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
  
- #: g10/gpg.c:4105
- msgid "--sign --symmetric [filename]"
- msgstr "--sign --symmetric [檔名]"
- 
- #: g10/gpg.c:4117
- msgid "--clearsign [filename]"
- msgstr "--clearsign [檔名]"
- 
- #: g10/gpg.c:4147
- msgid "--decrypt [filename]"
- msgstr "--decrypt [檔名]"
- 
- #: g10/gpg.c:4174
- msgid "--sign-key user-id"
- msgstr "--sign-key 使用者ID"
- 
- #: g10/gpg.c:4178
- msgid "--lsign-key user-id"
- msgstr "--lsign-key 使用者ID"
- 
- #: g10/gpg.c:4199
- msgid "--edit-key user-id [commands]"
- msgstr "--edit-key 使用者ID [指令]"
- 
- #: g10/gpg.c:4215
- msgid "--passwd <user-id>"
- msgstr "--passwd 使用者ID"
- 
- #: g10/gpg.c:4411 g10/keyserver.c:1837
++#: g10/gpg.c:4462 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "送至金鑰伺服器失敗: %s\n"
  
- #: g10/gpg.c:4416
++#: g10/gpg.c:4467
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "從金鑰伺服器接收失敗: %s\n"
  
- #: g10/gpg.c:4422
++#: g10/gpg.c:4473
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "金鑰匯出失敗: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4486
  #, fuzzy, c-format
  #| msgid "key export failed: %s\n"
  msgid "export as ssh key failed: %s\n"
  msgstr "金鑰匯出失敗: %s\n"
  
- #: g10/gpg.c:4447
++#: g10/gpg.c:4498
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "用金鑰伺服器搜尋失敗: %s\n"
  
- #: g10/gpg.c:4460
++#: g10/gpg.c:4511
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "從金鑰伺服器更新失敗: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4578
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "解開封裝失敗: %s\n"
  
- #: g10/gpg.c:4538
++#: g10/gpg.c:4589
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "進行封裝失敗: %s\n"
  
- #: g10/gpg.c:4630
++#: g10/gpg.c:4681
  #, c-format
  msgid "invalid hash algorithm '%s'\n"
  msgstr "無效的雜湊演算法 '%s'\n"
  
- #: g10/gpg.c:4776 g10/tofu.c:2002
++#: g10/gpg.c:4827 g10/tofu.c:2151
  #, 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:4788
++#: g10/gpg.c:4839
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4835
- msgid "[filename]"
- msgstr "[檔名]"
- 
- #: g10/gpg.c:4841
++#: g10/gpg.c:4894
  msgid "Go ahead and type your message ...\n"
  msgstr "請開始輸入你的訊息 ...\n"
  
- #: g10/gpg.c:5179
++#: g10/gpg.c:5232
  msgid "the given certification policy URL is invalid\n"
  msgstr "給定的的憑證原則 URL 無效\n"
  
- #: g10/gpg.c:5181
++#: g10/gpg.c:5234
  msgid "the given signature policy URL is invalid\n"
  msgstr "給定的簽章原則 URL 無效\n"
  
- #: g10/gpg.c:5214
++#: g10/gpg.c:5267
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "給定的偏好金鑰伺服器 URL 無效\n"
  
@@@ -3099,7 -2362,6 +3055,7 @@@ msgstr "|檔案|從指定鑰匙圈檔�
  msgid "make timestamp conflicts only a warning"
  msgstr "僅把時間戳印矛盾視為警告"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:345
++#: g10/gpgv.c:82 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|檔案描述|把狀態資訊寫入此指定檔案描述"
  
@@@ -3128,325 -2385,259 +3084,325 @@@ msgstr "沒有可用的說明
  msgid "No help available for '%s'"
  msgstr "'%s' 沒有可用的說明"
  
- #: g10/import.c:151
++#: g10/import.c:152
  msgid "import signatures that are marked as local-only"
  msgstr "匯入標記為僅限本機使用的簽章"
  
- #: g10/import.c:154
++#: g10/import.c:155
  msgid "repair damage from the pks keyserver during import"
  msgstr "匯入時修復來自 pks 金鑰伺服器的損壞"
  
- #: g10/import.c:157
++#: g10/import.c:158
  #, fuzzy
  #| msgid "do not update the trustdb after import"
  msgid "do not clear the ownertrust values during import"
  msgstr "匯入後不要更新信任資料庫"
  
- #: g10/import.c:160
++#: g10/import.c:161
  msgid "do not update the trustdb after import"
  msgstr "匯入後不要更新信任資料庫"
  
- #: g10/import.c:163
++#: g10/import.c:164
  #, fuzzy
  #| msgid "show key fingerprint"
  msgid "show key during import"
  msgstr "顯示金鑰指紋"
  
- #: g10/import.c:166
++#: g10/import.c:167
  msgid "only accept updates to existing keys"
  msgstr "祇接受既有金鑰的更新"
  
- #: g10/import.c:169
++#: g10/import.c:170
  msgid "remove unusable parts from key after import"
  msgstr "匯入後從金鑰中移除無法使用的部分"
  
- #: g10/import.c:172
++#: g10/import.c:173
  msgid "remove as much as possible from key after import"
  msgstr "匯入後盡可能地從金鑰中移除"
  
- #: g10/import.c:175
++#: g10/import.c:176
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:326 g10/import.c:568
++#: g10/import.c:327 g10/import.c:569
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "正在跳過 %d 型態的區塊\n"
  
- #: g10/import.c:585
++#: g10/import.c:586
  #, c-format
  msgid "%lu keys processed so far\n"
  msgstr "目前已處理 %lu 把金鑰\n"
  
- #: g10/import.c:655
++#: g10/import.c:656
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "處理總量: %lu\n"
  
- #: g10/import.c:658
++#: g10/import.c:659
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "        已跳過的新金鑰: %lu\n"
  
- #: g10/import.c:660
++#: g10/import.c:661
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "        已跳過的新金鑰: %lu\n"
  
- #: g10/import.c:663
++#: g10/import.c:664
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "       沒有使用者的 ID: %lu\n"
  
- #: g10/import.c:666 sm/import.c:130
++#: g10/import.c:667 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "                已匯入: %lu"
  
- #: g10/import.c:670 sm/import.c:134
++#: g10/import.c:671 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "              未改變的: %lu\n"
  
- #: g10/import.c:672
++#: g10/import.c:673
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "         新的使用者 ID: %lu\n"
  
- #: g10/import.c:674
++#: g10/import.c:675
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "              新的子鑰: %lu\n"
  
- #: g10/import.c:676
++#: g10/import.c:677
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "              新的簽章: %lu\n"
  
- #: g10/import.c:678
++#: g10/import.c:679
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "          新的金鑰撤銷: %lu\n"
  
- #: g10/import.c:680 sm/import.c:136
++#: g10/import.c:681 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "          已讀取的私鑰: %lu\n"
  
- #: g10/import.c:682 sm/import.c:138
++#: g10/import.c:683 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "          已匯入的私鑰: %lu\n"
  
- #: g10/import.c:684 sm/import.c:140
++#: g10/import.c:685 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr "          未改變的私鑰: %lu\n"
  
- #: g10/import.c:686 sm/import.c:142
++#: g10/import.c:687 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "              未被匯入: %lu\n"
  
- #: g10/import.c:688
++#: g10/import.c:689
  #, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "      已清除的簽章: %lu\n"
  
- #: g10/import.c:690
++#: g10/import.c:691
  #, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr " 已清除的使用者 ID: %lu\n"
  
- #: g10/import.c:1034
++#: g10/import.c:1035
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
  "algorithms on these user IDs:\n"
  msgstr "警告: 金鑰 %s 的偏好設定含有這些使用者 ID 無法使用的演算法:\n"
  
- #: g10/import.c:1076
++#: g10/import.c:1077
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr "         \"%s\": 編密演算法 %s 的偏好設定\n"
  
- #: g10/import.c:1091
++#: g10/import.c:1092
  #, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "         \"%s\": 摘要演算法 %s 的偏好設定\n"
  
- #: g10/import.c:1103
++#: g10/import.c:1104
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr "         \"%s\": 壓縮演算法 %s 的偏好設定\n"
  
- #: g10/import.c:1116
++#: g10/import.c:1117
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr "我們強烈建議你更新偏好設定, 並重新\n"
  
- #: g10/import.c:1118
++#: g10/import.c:1119
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr "散佈此金鑰, 以避免潛在的演算法不一致問題.\n"
  
- #: g10/import.c:1143
++#: g10/import.c:1144
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr "你可以像這樣來更新偏好設定: gpg --edit-key %s updpref save\n"
  
- #: g10/import.c:1379 g10/import.c:2167
++#: g10/import.c:1380 g10/import.c:2168
  #, c-format
  msgid "key %s: no user ID\n"
  msgstr "金鑰 %s: 沒有使用者 ID\n"
  
- #: g10/import.c:1385
++#: g10/import.c:1386
  #, c-format
  msgid "key %s: %s\n"
  msgstr "金鑰 %s: %s\n"
  
- #: g10/import.c:1386 g10/import.c:2141
++#: g10/import.c:1387 g10/import.c:2142
  msgid "rejected by import screener"
  msgstr "遭到匯入篩選程式駁回"
  
- #: g10/import.c:1416
++#: g10/import.c:1417
  #, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "金鑰 %s: PKS 子鑰的訛誤已被修復\n"
  
- #: g10/import.c:1434
++#: g10/import.c:1435
  #, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "金鑰 %s: 已接受非自我簽署的使用者 ID \"%s\"\n"
  
- #: g10/import.c:1444 g10/import.c:1475
++#: g10/import.c:1445 g10/import.c:1476
  #, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "金鑰 %s: 沒有有效的使用者 ID\n"
  
- #: g10/import.c:1446
++#: g10/import.c:1447
  msgid "this may be caused by a missing self-signature\n"
  msgstr "這可能肇因於遺失自我簽章所致\n"
  
- #: g10/import.c:1516 g10/import.c:2318
++#: g10/import.c:1517 g10/import.c:2319
  #, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "金鑰 %s: 找不到公鑰: %s\n"
  
- #: g10/import.c:1522
++#: g10/import.c:1523
  #, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "金鑰 %s: 新的金鑰 - 已跳過\n"
  
- #: g10/import.c:1537
++#: g10/import.c:1538
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "找不到可寫入的鑰匙圈: %s\n"
  
- #: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
++#: g10/import.c:1547 g10/import.c:1648 g10/import.c:2385
  #, c-format
  msgid "error writing keyring '%s': %s\n"
  msgstr "寫入鑰匙圈 '%s' 時出錯: %s\n"
  
- #: g10/import.c:1566
++#: g10/import.c:1567
  #, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "金鑰 %s: 公鑰 \"%s\" 已匯入\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1591
  #, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "金鑰 %s: 跟我們的副本不吻合\n"
  
- #: g10/import.c:1606 g10/import.c:2342
++#: g10/import.c:1607 g10/import.c:2343
  #, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "金鑰 %s: 無法定址原始的金鑰區塊: %s\n"
  
- #: g10/import.c:1614 g10/import.c:2349
++#: g10/import.c:1615 g10/import.c:2350
  #, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "金鑰 %s: 無法讀取原始的金鑰區塊: %s\n"
  
- #: g10/import.c:1657
++#: g10/import.c:1658
  #, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "金鑰 %s: \"%s\" 1 個新的使用者 ID\n"
  
- #: g10/import.c:1660
++#: g10/import.c:1661
  #, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "金鑰 %s: \"%s\" %d 個新的使用者 ID\n"
  
- #: g10/import.c:1663
++#: g10/import.c:1664
  #, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "金鑰 %s: \"%s\" 1 份新的簽章\n"
  
- #: g10/import.c:1666
++#: g10/import.c:1667
  #, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "金鑰 %s: \"%s\" %d 份新的簽章\n"
  
- #: g10/import.c:1669
++#: g10/import.c:1670
  #, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "金鑰 %s: \"%s\" 1 把新的子鑰\n"
  
- #: g10/import.c:1672
++#: g10/import.c:1673
  #, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "金鑰 %s: \"%s\" %d 把新的子鑰\n"
  
- #: g10/import.c:1675
++#: g10/import.c:1676
  #, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "金鑰 %s: \"%s\" 已清除 %d 份簽章\n"
  
- #: g10/import.c:1678
++#: g10/import.c:1679
  #, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "金鑰 %s: \"%s\" 已清除 %d 份簽章\n"
  
- #: g10/import.c:1681
++#: g10/import.c:1682
  #, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "金鑰 %s: \"%s\" 已清除 %d 個使用者 ID\n"
  
- #: g10/import.c:1684
++#: g10/import.c:1685
  #, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "金鑰 %s: \"%s\" 已清除 %d 個使用者 ID\n"
  
- #: g10/import.c:1707
++#: g10/import.c:1708
  #, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "金鑰 %s: \"%s\" 未改變\n"
  
- #: g10/import.c:2019 g10/import.c:2264
++#: g10/import.c:2020 g10/import.c:2265
  #, c-format
  msgid "key %s: secret key imported\n"
  msgstr "金鑰 %s: 私鑰已匯入\n"
  
- #: g10/import.c:2027
++#: g10/import.c:2028
  #, c-format
  msgid "key %s: secret key already exists\n"
  msgstr "金鑰 %s: 私鑰已存在\n"
  
- #: g10/import.c:2035
++#: g10/import.c:2036
  #, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "金鑰 %s: 送至代理程式時出錯: %s\n"
  
- #: g10/import.c:2140
++#: g10/import.c:2141
  #, c-format
  msgid "secret key %s: %s\n"
  msgstr "私鑰 %s: %s\n"
  
- #: g10/import.c:2160 g10/import.c:2195
++#: g10/import.c:2161 g10/import.c:2196
  msgid "importing secret keys not allowed\n"
  msgstr "未允許匯入私鑰\n"
  
- #: g10/import.c:2184
++#: g10/import.c:2185
  #, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr "金鑰 %s: 私鑰使用了無效的 %d 編密法 - 已跳過\n"
@@@ -3461,87 -2652,70 +3417,87 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2256
++#: g10/import.c:2257
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2311
++#: g10/import.c:2312
  #, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr "金鑰 %s: 沒有公鑰 - 無法套用撤銷憑證\n"
  
- #: g10/import.c:2360
++#: g10/import.c:2361
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已駁回\n"
  
- #: g10/import.c:2393
++#: g10/import.c:2394
  #, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "金鑰 %s: \"%s\" 撤銷憑證已匯入\n"
  
- #: g10/import.c:2469
++#: g10/import.c:2470
  #, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "金鑰 %s: 簽章沒有使用者 ID\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2487
  #, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr "金鑰 %s: 使用者 ID \"%s\" 用了未支援的公鑰演算法\n"
  
- #: g10/import.c:2488
++#: g10/import.c:2489
  #, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "金鑰 %s: 使用者 ID \"%s\" 的自我簽章無效\n"
  
- #: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
++#: g10/import.c:2506 g10/import.c:2532 g10/import.c:2583
  #, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "金鑰 %s: 未支援的公鑰演算法\n"
  
- #: g10/import.c:2506
++#: g10/import.c:2507
  #, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "金鑰 %s: 無效的直接金鑰簽章\n"
  
- #: g10/import.c:2520
++#: g10/import.c:2521
  #, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "金鑰 %s: 沒有可供附帶的子鑰\n"
  
- #: g10/import.c:2533
++#: g10/import.c:2534
  #, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "金鑰 %s: 無效的附帶子鑰\n"
  
- #: g10/import.c:2549
++#: g10/import.c:2550
  #, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "金鑰 %s: 多重附帶子鑰已移除\n"
  
- #: g10/import.c:2571
++#: g10/import.c:2572
  #, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "金鑰 %s: 沒有子鑰可供金鑰撤銷\n"
  
- #: g10/import.c:2584
++#: g10/import.c:2585
  #, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "金鑰 %s: 無效的子鑰撤銷\n"
  
- #: g10/import.c:2599
++#: g10/import.c:2600
  #, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "金鑰 %s: 多重子鑰撤銷已移除\n"
  
- #: g10/import.c:2641
++#: g10/import.c:2642
  #, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "金鑰 %s: 使用者 ID \"%s\" 已跳過\n"
  
- #: g10/import.c:2665
++#: g10/import.c:2666
  #, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "金鑰 %s: 子鑰已跳過\n"
@@@ -3550,52 -2724,42 +3506,52 @@@
  #  * to import non-exportable signature when we have the
  #  * the secret key used to create this signature - it
  #  * seems that this makes sense
- #: g10/import.c:2694
++#: g10/import.c:2695
  #, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "金鑰 %s: 不可匯出的簽章 (等級 0x%02X) - 已跳過\n"
  
- #: g10/import.c:2705
++#: g10/import.c:2706
  #, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "金鑰 %s: 撤銷憑證在錯誤的地方 - 已跳過\n"
  
- #: g10/import.c:2723
++#: g10/import.c:2724
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已跳過\n"
  
- #: g10/import.c:2737
++#: g10/import.c:2738
  #, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "金鑰 %s: 子鑰簽章在錯誤的地方 - 已跳過\n"
  
- #: g10/import.c:2745
++#: g10/import.c:2746
  #, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "金鑰 %s: 非預期的簽章等級 (0x%02X) - 已跳過\n"
  
- #: g10/import.c:2887
++#: g10/import.c:2888
  #, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "金鑰 %s: 偵測到重複的使用者 ID - 已合併\n"
  
- #: g10/import.c:2951
++#: g10/import.c:2952
  #, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr "警告: 金鑰 %s 可能被撤銷了: 正在取回撤銷金鑰 %s\n"
  
- #: g10/import.c:2967
++#: g10/import.c:2968
  #, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr "警告: 金鑰 %s 可能被撤銷了: 撤銷金鑰 %s 未出現.\n"
  
- #: g10/import.c:3031
++#: g10/import.c:3032
  #, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "金鑰 %s: 已新增 \"%s\" 撤銷憑證\n"
  
- #: g10/import.c:3069
++#: g10/import.c:3070
  #, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "金鑰 %s: 已新增直接金鑰簽章\n"
@@@ -3631,86 -2789,71 +3587,86 @@@ msgstr "金鑰區塊資源 '%s': %s\n
  msgid "error opening key DB: %s\n"
  msgstr "開啟 '%s' 時出錯: %s\n"
  
- #: g10/keydb.c:1782
++#: g10/keydb.c:1786
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "重新建立鑰匙圈快取失敗: %s\n"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[revocation]"
  msgstr "[撤銷]"
  
- #: g10/keyedit.c:264
++#: g10/keyedit.c:265
  msgid "[self-signature]"
  msgstr "[自我簽章]"
  
- #: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
++#: g10/keyedit.c:433 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: dirmngr/ldap-wrapper.c:694
  #, c-format
  msgid "error allocating memory: %s\n"
  msgstr "配置記憶體時出錯: %s\n"
  
- #: g10/keyedit.c:629
++#: g10/keyedit.c:630
  #, fuzzy, c-format
  #| msgid "key %s: unsupported public key algorithm\n"
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr "金鑰 %s: 未支援的公鑰演算法\n"
  
- #: g10/keyedit.c:638
++#: g10/keyedit.c:639
  #, fuzzy, c-format
  #| msgid "card does not support digest algorithm %s\n"
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "卡片不支援 %s 摘要演算法\n"
  
- #: g10/keyedit.c:800
++#: g10/keyedit.c:801
  #, fuzzy
  #| msgid "Good signature from"
  msgid " (reordered signatures follow)"
  msgstr "完好的簽章來自於"
  
- #: g10/keyedit.c:913
++#: g10/keyedit.c:914
  #, fuzzy, c-format
  #| msgid "key %s: %s\n"
  msgid "key %s:\n"
  msgstr "金鑰 %s: %s\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:917
  #, fuzzy, c-format
  #| msgid "User ID \"%s\": %d signature removed\n"
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
  msgstr[0] "使用者 ID \"%s\": 已移除 %d 份簽章\n"
  
- #: g10/keyedit.c:919 g10/keylist.c:480
++#: g10/keyedit.c:920 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
  msgid_plural "%d signatures not checked due to missing keys\n"
  msgstr[0] "有 1 份簽章因為遺失金鑰而未被檢查\n"
  
- #: g10/keyedit.c:923 g10/keylist.c:476
++#: g10/keyedit.c:924 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
  msgid_plural "%d bad signatures\n"
  msgstr[0] "%d 份損壞的簽章\n"
  
- #: g10/keyedit.c:927
++#: g10/keyedit.c:928
  #, fuzzy, c-format
  #| msgid "Good signature from"
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
  msgstr[0] "完好的簽章來自於"
  
- #: g10/keyedit.c:932
++#: g10/keyedit.c:933
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:992 g10/pkclist.c:274
++#: g10/keyedit.c:993 g10/pkclist.c:274
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
  "keys\n"
@@@ -3720,17 -2863,14 +3676,17 @@@ msgstr "
  "請判斷你有多信任這位使用者確實驗證其他使用者的金鑰\n"
  "(像是查對身份證, 或從不同的來源檢查指紋等...)的能力\n"
  
- #: g10/keyedit.c:996 g10/pkclist.c:286
++#: g10/keyedit.c:997 g10/pkclist.c:286
  #, c-format
  msgid "  %d = I trust marginally\n"
  msgstr "  %d = 我勉強信任\n"
  
- #: g10/keyedit.c:997 g10/pkclist.c:288
++#: g10/keyedit.c:998 g10/pkclist.c:288
  #, c-format
  msgid "  %d = I trust fully\n"
  msgstr "  %d = 我完全信任\n"
  
- #: g10/keyedit.c:1015
++#: g10/keyedit.c:1016
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
@@@ -3740,50 -2880,38 +3696,50 @@@ msgstr "
  "深度大於 1 的話就表示你信任這把正被簽署的金鑰,\n"
  "同時也信任這把金鑰所簽署的信任簽章.\n"
  
- #: g10/keyedit.c:1032
++#: g10/keyedit.c:1033
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr "請輸入約束此簽章的網域, 若無請直接按下 [Enter].\n"
  
- #: g10/keyedit.c:1160
++#: g10/keyedit.c:1161
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1168
++#: g10/keyedit.c:1169
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "使用者 ID \"%s\" 已撤銷."
  
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
- #: g10/keyedit.c:2246
++#: g10/keyedit.c:1178 g10/keyedit.c:1206 g10/keyedit.c:1233 g10/keyedit.c:1417
++#: g10/keyedit.c:2247
  msgid "Are you sure you still want to sign it? (y/N) "
  msgstr "你仍然想要簽署它嗎? (y/N) "
  
- #: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
- #: g10/keyedit.c:2251 g10/keyedit.c:3177
++#: g10/keyedit.c:1192 g10/keyedit.c:1220 g10/keyedit.c:1247 g10/keyedit.c:1423
++#: g10/keyedit.c:2252 g10/keyedit.c:3178
  msgid "  Unable to sign.\n"
  msgstr "  無法簽署.\n"
  
- #: g10/keyedit.c:1196
++#: g10/keyedit.c:1197
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "使用者 ID \"%s\" 已過期."
  
- #: g10/keyedit.c:1224
++#: g10/keyedit.c:1225
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "使用者 ID \"%s\" 未經自我簽署."
  
- #: g10/keyedit.c:1253
++#: g10/keyedit.c:1254
  #, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "使用者 ID \"%s\" 可被簽署."
  
- #: g10/keyedit.c:1255
++#: g10/keyedit.c:1256
  msgid "Sign it? (y/N) "
  msgstr "是否要簽署? (y/N) "
  
- #: g10/keyedit.c:1282
++#: g10/keyedit.c:1283
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -3792,11 -2920,9 +3748,11 @@@ msgstr "
  "\"%s\" 裡的自我簽章\n"
  "是 PGP 2.x 型態的簽章.\n"
  
- #: g10/keyedit.c:1291
++#: g10/keyedit.c:1292
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr "你是否想要將它升級成 OpenPGP 自我簽章? (y/N) "
  
- #: g10/keyedit.c:1304
++#: g10/keyedit.c:1305
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3805,11 -2931,9 +3761,11 @@@ msgstr "
  "你目前在 \"%s\" 的簽章\n"
  "已經過期了.\n"
  
- #: g10/keyedit.c:1309
++#: g10/keyedit.c:1310
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr "你想要發佈一份新的簽章來取代已過期的那個嗎? (y/N) "
  
- #: g10/keyedit.c:1330
++#: g10/keyedit.c:1331
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3818,43 -2942,34 +3774,43 @@@ msgstr "
  "你目前在 \"%s\" 的簽章\n"
  "是一份本機簽章.\n"
  
- #: g10/keyedit.c:1335
++#: g10/keyedit.c:1336
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr "你是否想要把他升級成可以完全匯出的簽章? (y/N) "
  
- #: g10/keyedit.c:1355
++#: g10/keyedit.c:1356
  #, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "\"%s\" 已經被金鑰 %s 在本機簽署了\n"
  
- #: g10/keyedit.c:1359
++#: g10/keyedit.c:1360
  #, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "\"%s\" 已經被金鑰 %s 簽署了\n"
  
- #: g10/keyedit.c:1364
++#: g10/keyedit.c:1365
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "你仍然想要再次簽署它嗎? (y/N) "
  
- #: g10/keyedit.c:1386
++#: g10/keyedit.c:1387
  #, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "沒有東西可以讓金鑰 %s 簽署\n"
  
- #: g10/keyedit.c:1410
++#: g10/keyedit.c:1411
  msgid "This key has expired!"
  msgstr "這把金鑰已經過期了!"
  
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1429
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "這把金鑰將在 %s 過期.\n"
  
- #: g10/keyedit.c:1434
++#: g10/keyedit.c:1435
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr "你想要讓你的簽章也在同一個時候過期嗎? (Y/n) "
  
- #: g10/keyedit.c:1475
++#: g10/keyedit.c:1476
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -3863,31 -2978,25 +3819,31 @@@ msgstr "
  "你有多謹慎檢查正要簽署的金鑰確實屬於上面那個人的名字呢?\n"
  "如果你不知道這個問題的答案, 請輸入 \"0\".\n"
  
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1481
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) 我不作答.%s\n"
  
- #: g10/keyedit.c:1482
++#: g10/keyedit.c:1483
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) 我根本沒有檢查過.%s\n"
  
- #: g10/keyedit.c:1484
++#: g10/keyedit.c:1485
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) 我隨意檢查過了.%s\n"
  
- #: g10/keyedit.c:1487
++#: g10/keyedit.c:1488
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) 我非常小心地檢查過了.%s\n"
  
- #: g10/keyedit.c:1494
++#: g10/keyedit.c:1495
  msgid "Your selection? (enter '?' for more information): "
  msgstr "你的選擇是? (輸入 '?' 以取得更多資訊): "
  
- #: g10/keyedit.c:1521
++#: g10/keyedit.c:1522
  #, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -3896,220 -3005,166 +3852,220 @@@ msgstr "
  "你真的確定要用你的金鑰 \"%s\" (%s)\n"
  "來簽署這把金鑰嗎\n"
  
- #: g10/keyedit.c:1529
++#: g10/keyedit.c:1530
  msgid "This will be a self-signature.\n"
  msgstr "這將會是一份自我簽章.\n"
  
- #: g10/keyedit.c:1534
++#: g10/keyedit.c:1535
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr "警告: 這份簽章不會被標記為不可匯出.\n"
  
- #: g10/keyedit.c:1541
++#: g10/keyedit.c:1542
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr "警告: 這份簽章不會被標記成不可撤銷.\n"
  
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1552
  msgid "The signature will be marked as non-exportable.\n"
  msgstr "這份簽章會被標記成不可匯出.\n"
  
- #: g10/keyedit.c:1558
++#: g10/keyedit.c:1559
  msgid "The signature will be marked as non-revocable.\n"
  msgstr "這份簽章會被標記成不可撤銷.\n"
  
- #: g10/keyedit.c:1565
++#: g10/keyedit.c:1566
  msgid "I have not checked this key at all.\n"
  msgstr "我根本沒有檢查過這把金鑰.\n"
  
- #: g10/keyedit.c:1570
++#: g10/keyedit.c:1571
  msgid "I have checked this key casually.\n"
  msgstr "我隨意檢查過這把金鑰了.\n"
  
- #: g10/keyedit.c:1575
++#: g10/keyedit.c:1576
  msgid "I have checked this key very carefully.\n"
  msgstr "我非常小心地檢查過這把金鑰了.\n"
  
- #: g10/keyedit.c:1587
++#: g10/keyedit.c:1588
  msgid "Really sign? (y/N) "
  msgstr "真的要簽署嗎? (y/N)"
  
- #: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
- #: g10/keyedit.c:6463 g10/sign.c:323
++#: g10/keyedit.c:1639 g10/keyedit.c:6308 g10/keyedit.c:6391 g10/keyedit.c:6500
++#: g10/keyedit.c:6562 g10/sign.c:325
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "簽署時失敗: %s\n"
  
- #: g10/keyedit.c:1725
++#: g10/keyedit.c:1726
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr "金鑰祇剩下殘骸或者祇含有卡上金鑰項目 - 沒有可變更的密語.\n"
  
- #: g10/keyedit.c:1755
++#: g10/keyedit.c:1756
  #, c-format
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "金鑰 %s: 變更密語時出錯: %s\n"
  
- #: g10/keyedit.c:1869
++#: g10/keyedit.c:1870
  msgid "save and quit"
  msgstr "儲存並離開"
  
- #: g10/keyedit.c:1872
++#: g10/keyedit.c:1873
  msgid "show key fingerprint"
  msgstr "顯示金鑰指紋"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1874
  #, fuzzy
  #| msgid "Enter the keygrip: "
  msgid "show the keygrip"
  msgstr "請輸入金鑰鑰柄: "
  
- #: g10/keyedit.c:1874
++#: g10/keyedit.c:1875
  msgid "list key and user IDs"
  msgstr "列出金鑰和使用者 ID"
  
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1877
  msgid "select user ID N"
  msgstr "選擇使用者 ID N"
  
- #: g10/keyedit.c:1877
++#: g10/keyedit.c:1878
  msgid "select subkey N"
  msgstr "選擇子鑰 N"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1879
  msgid "check signatures"
  msgstr "檢查簽章"
  
- #: g10/keyedit.c:1884
++#: g10/keyedit.c:1885
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr "簽署所選的使用者 ID [* 請參見底下相關的註解]"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1890
  msgid "sign selected user IDs locally"
  msgstr "僅在本機簽署所選的使用者 ID"
  
- #: g10/keyedit.c:1890
++#: g10/keyedit.c:1891
  msgid "sign selected user IDs with a trust signature"
  msgstr "用信任簽章來簽署所選的使用者 ID"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1893
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr "用不可撤銷的簽章來簽署所選的使用者 ID"
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1895
  msgid "add a user ID"
  msgstr "增加使用者 ID"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1897
  msgid "add a photo ID"
  msgstr "增加照片 ID"
  
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1898
  msgid "delete selected user IDs"
  msgstr "刪除所選的使用者 ID"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1901
  msgid "add a subkey"
  msgstr "增加子鑰"
  
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1904
  msgid "add a key to a smartcard"
  msgstr "將金鑰加到智慧卡"
  
- #: g10/keyedit.c:1905
++#: g10/keyedit.c:1906
  msgid "move a key to a smartcard"
  msgstr "將金鑰移動到智慧卡"
  
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1908
  msgid "move a backup key to a smartcard"
  msgstr "將備份金鑰移動到智慧卡"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1910
  msgid "delete selected subkeys"
  msgstr "刪除所選的子鑰"
  
- #: g10/keyedit.c:1911
++#: g10/keyedit.c:1912
  msgid "add a revocation key"
  msgstr "增加撤銷金鑰"
  
- #: g10/keyedit.c:1913
++#: g10/keyedit.c:1914
  msgid "delete signatures from the selected user IDs"
  msgstr "從所選的使用者 ID 中刪除簽章"
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1916
  msgid "change the expiration date for the key or selected subkeys"
  msgstr "變更金鑰或所選子鑰的使用期限"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1918
  msgid "flag the selected user ID as primary"
  msgstr "把所選的使用者 ID 標為主要"
  
- #: g10/keyedit.c:1920
++#: g10/keyedit.c:1921
  msgid "list preferences (expert)"
  msgstr "列出偏好 (專家模式)"
  
- #: g10/keyedit.c:1921
++#: g10/keyedit.c:1922
  msgid "list preferences (verbose)"
  msgstr "列出偏好 (囉唆模式)"
  
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:1924
  msgid "set preference list for the selected user IDs"
  msgstr "設定所選使用者 ID 的偏好清單"
  
- #: g10/keyedit.c:1926
++#: g10/keyedit.c:1927
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr "為所選的使用者 ID 設定偏好的金鑰伺服器 URL"
  
- #: g10/keyedit.c:1928
++#: g10/keyedit.c:1929
  msgid "set a notation for the selected user IDs"
  msgstr "為所選的使用者 ID 設定註記"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1931
  msgid "change the passphrase"
  msgstr "更改密語"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1934
  msgid "change the ownertrust"
  msgstr "更改主觀信任"
  
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1937
  msgid "revoke signatures on the selected user IDs"
  msgstr "撤銷所選使用者 ID 的簽章"
  
- #: g10/keyedit.c:1938
++#: g10/keyedit.c:1939
  msgid "revoke selected user IDs"
  msgstr "撤銷所選的使用者 ID"
  
- #: g10/keyedit.c:1941
++#: g10/keyedit.c:1942
  msgid "revoke key or selected subkeys"
  msgstr "撤銷金鑰或所選的子鑰"
  
- #: g10/keyedit.c:1943
++#: g10/keyedit.c:1944
  msgid "enable key"
  msgstr "啟用金鑰"
  
- #: g10/keyedit.c:1944
++#: g10/keyedit.c:1945
  msgid "disable key"
  msgstr "停用金鑰"
  
- #: g10/keyedit.c:1946
++#: g10/keyedit.c:1947
  msgid "show selected photo IDs"
  msgstr "顯示所選的照片 ID"
  
- #: g10/keyedit.c:1948
++#: g10/keyedit.c:1949
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr "從金鑰中精簡無法使用的使用者 ID 並移除無法使用的簽章"
  
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:1951
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr "從金鑰中精簡無法使用的使用者 ID 並移除所有的簽章"
  
- #: g10/keyedit.c:2062
++#: g10/keyedit.c:2063
  msgid "Secret key is available.\n"
  msgstr "私鑰可用.\n"
  
- #: g10/keyedit.c:2162
++#: g10/keyedit.c:2163
  msgid "Need the secret key to do this.\n"
  msgstr "要有私鑰纔能這麼做.\n"
  
- #: g10/keyedit.c:2183
++#: g10/keyedit.c:2184
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4120,260 -3175,206 +4076,266 @@@ msgstr "
  "  加上 't' 的話就是信任簽章 (tsign), 加上 'nr' 的話就是不可撤銷簽章\n"
  "  (nrsign), 當然也可以任意組合這些選項 (像是 ltsign, tnrsign 等等.).\n"
  
- #: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
++#: g10/keyedit.c:2240 g10/keyedit.c:3178 g10/keyedit.c:3317 g10/keyedit.c:3379
  msgid "Key is revoked."
  msgstr "金鑰已撤銷."
  
- #: g10/keyedit.c:2262
++#: g10/keyedit.c:2263
  msgid "Really sign all user IDs? (y/N) "
  msgstr "真的要簽署所有的使用者 ID 嗎? (y/N) "
  
- #: g10/keyedit.c:2266
++#: g10/keyedit.c:2267
  #, fuzzy
  #| msgid "Really sign all user IDs? (y/N) "
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "真的要簽署所有的使用者 ID 嗎? (y/N) "
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2275
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "提示: 選擇使用者 ID 來加以簽署\n"
  
- #: g10/keyedit.c:2285
++#: g10/keyedit.c:2286
  #, c-format
  msgid "Unknown signature type '%s'\n"
  msgstr "未知的簽章種類 '%s'\n"
  
- #: g10/keyedit.c:2309
++#: g10/keyedit.c:2310
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
  msgstr "在 %s 模式中不允許使用這個指令.\n"
  
- #: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
++#: g10/keyedit.c:2332 g10/keyedit.c:2356 g10/keyedit.c:2550
  msgid "You must select at least one user ID.\n"
  msgstr "你至少得選擇一個使用者 ID.\n"
  
- #: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
++#: g10/keyedit.c:2334 g10/keyedit.c:2358 g10/keyedit.c:2512 g10/keyedit.c:2552
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2336
++#: g10/keyedit.c:2337
  msgid "You can't delete the last user ID!\n"
  msgstr "你不能刪除最後一個使用者 ID!\n"
  
- #: g10/keyedit.c:2339
++#: g10/keyedit.c:2340
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "真的要移除所有被選擇的使用者 ID 嗎? (y/N) "
  
- #: g10/keyedit.c:2340
++#: g10/keyedit.c:2341
  msgid "Really remove this user ID? (y/N) "
  msgstr "真的要移除這個使用者 ID 嗎? (y/N) "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2397
++#: g10/keyedit.c:2398
  msgid "Really move the primary key? (y/N) "
  msgstr "真的要移動主鑰嗎? (y/N) "
  
- #: g10/keyedit.c:2409 g10/keyedit.c:4866
++#: g10/keyedit.c:2410 g10/keyedit.c:4964
  msgid "You must select exactly one key.\n"
  msgstr "你一定祇得選擇一把金鑰.\n"
  
- #: g10/keyedit.c:2436
++#: g10/keyedit.c:2437
  msgid "Command expects a filename argument\n"
  msgstr "這項指令要拿一個檔名來當作引數\n"
  
- #: g10/keyedit.c:2457
++#: g10/keyedit.c:2458
  #, c-format
  msgid "Can't open '%s': %s\n"
  msgstr "無法開啟 '%s': %s\n"
  
- #: g10/keyedit.c:2474
++#: g10/keyedit.c:2475
  #, c-format
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "從 '%s' 讀取備份金鑰時出錯: %s\n"
  
- #: g10/keyedit.c:2509
++#: g10/keyedit.c:2510
  msgid "You must select at least one key.\n"
  msgstr "你至少得選擇一把金鑰.\n"
  
- #: g10/keyedit.c:2515
++#: g10/keyedit.c:2516
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "你真的想要刪除所選的金鑰嗎? (y/N) "
  
- #: g10/keyedit.c:2517
++#: g10/keyedit.c:2518
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "你真的想要刪除這把金鑰嗎? (y/N) "
  
- #: g10/keyedit.c:2555
++#: g10/keyedit.c:2556
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr "真的要撤銷所有所選的使用者 ID 嗎? (y/N) "
  
- #: g10/keyedit.c:2556
++#: g10/keyedit.c:2557
  msgid "Really revoke this user ID? (y/N) "
  msgstr "真的要撤銷這個使用者 ID 嗎? (y/N) "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2575
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "你真的想要撤銷這整把金鑰嗎? (y/N) "
  
- #: g10/keyedit.c:2585
++#: g10/keyedit.c:2586
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "你真的想要撤銷所選的子鑰嗎? (y/N) "
  
- #: g10/keyedit.c:2587
++#: g10/keyedit.c:2588
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "你真的想要撤銷這把子鑰嗎? (y/N) "
  
- #: g10/keyedit.c:2645
++#: g10/keyedit.c:2646
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr "使用使用者所提供的信任資料庫時可能無法設定主觀信任\n"
  
- #: g10/keyedit.c:2690
++#: g10/keyedit.c:2691
  msgid "Set preference list to:\n"
  msgstr "設定偏好清單至:\n"
  
- #: g10/keyedit.c:2697
++#: g10/keyedit.c:2698
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr "真的要更新所選使用者 ID 的偏好設定嗎? (y/N) "
  
- #: g10/keyedit.c:2699
++#: g10/keyedit.c:2700
  msgid "Really update the preferences? (y/N) "
  msgstr "真的要更新偏好設定嗎? (y/N) "
  
- #: g10/keyedit.c:2773
++#: g10/keyedit.c:2774
  msgid "Save changes? (y/N) "
  msgstr "要儲存變更嗎? (y/N) "
  
- #: g10/keyedit.c:2777
++#: g10/keyedit.c:2778
  msgid "Quit without saving? (y/N) "
  msgstr "要不儲存就離開嗎? (y/N) "
  
- #: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
- #: g10/keyedit.c:3267 g10/keyedit.c:3332
++#: g10/keyedit.c:2789 g10/keyedit.c:2799 g10/keyedit.c:2943 g10/keyedit.c:3046
++#: g10/keyedit.c:3268 g10/keyedit.c:3333 g10/keyedit.c:3409
  #, c-format
  msgid "update failed: %s\n"
  msgstr "更新失敗: %s\n"
  
- #: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
++#: g10/keyedit.c:2805 g10/keyedit.c:3273 g10/keyedit.c:3338 g10/keyedit.c:3416
  msgid "Key not changed so no update needed.\n"
  msgstr "金鑰沒有變更所以不需要更新.\n"
  
- #: g10/keyedit.c:3038
++#: g10/keyedit.c:3039
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
  msgstr "產生金鑰失敗: %s\n"
  
- #: g10/keyedit.c:3083
++#: g10/keyedit.c:3084
  #, c-format
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "\"%s\" 不是指紋\n"
  
- #: g10/keyedit.c:3112
++#: g10/keyedit.c:3113
  #, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "\"%s\" 不是主要指紋\n"
  
- #: g10/keyedit.c:3248 g10/keyedit.c:3251
++#: g10/keyedit.c:3249 g10/keyedit.c:3252
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
  msgstr "無效的數值\n"
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  msgid "No matching user IDs."
  msgstr "沒有相符的使用者 ID."
  
- #: g10/keyedit.c:3254
++#: g10/keyedit.c:3255
  msgid "Nothing to sign.\n"
  msgstr "沒有東西可以簽署.\n"
  
- #: g10/keyedit.c:3427
++#: g10/keyedit.c:3388
+ #, 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:3508
  msgid "Digest: "
  msgstr "摘要: "
  
- #: g10/keyedit.c:3484
++#: g10/keyedit.c:3565
  msgid "Features: "
  msgstr "特點: "
  
- #: g10/keyedit.c:3495
++#: g10/keyedit.c:3576
  msgid "Keyserver no-modify"
  msgstr "金鑰伺服器無修改"
  
- #: g10/keyedit.c:3510 g10/keylist.c:377
++#: g10/keyedit.c:3591 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr "偏好的金鑰伺服器: "
  
- #: g10/keyedit.c:3518 g10/keyedit.c:3519
++#: g10/keyedit.c:3599 g10/keyedit.c:3600
  msgid "Notations: "
  msgstr "註記: "
  
- #: g10/keyedit.c:3764
++#: g10/keyedit.c:3845
  msgid "There are no preferences on a PGP 2.x-style user ID.\n"
  msgstr "PGP 2.x 型態的使用者 ID 沒有偏好設定.\n"
  
- #: g10/keyedit.c:3836
++#: g10/keyedit.c:3917
  #, c-format
  msgid "The following key was revoked on %s by %s key %s\n"
  msgstr "下列金鑰已經在 %s 時被 %s 金鑰 %s 所撤銷\n"
  
- #: g10/keyedit.c:3860
++#: g10/keyedit.c:3941
  #, c-format
  msgid "This key may be revoked by %s key %s"
  msgstr "這把金鑰可能被 %s 金鑰 %s 所撤銷"
  
- #: g10/keyedit.c:3866
++#: g10/keyedit.c:3947
  msgid "(sensitive)"
  msgstr "(機密)"
  
- #: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
++#: g10/keyedit.c:3989 g10/keyedit.c:4131 g10/keylist.c:262 g10/keyserver.c:538
  #, c-format
  msgid "created: %s"
  msgstr "建立: %s"
  
- #: g10/keyedit.c:3911 g10/keylist.c:1852
++#: g10/keyedit.c:3992 g10/keylist.c:1852
  #, c-format
  msgid "revoked: %s"
  msgstr "撤銷: %s"
  
  #  of subkey
- #: g10/keyedit.c:3913 g10/keylist.c:1858
++#: g10/keyedit.c:3994 g10/keylist.c:1858
  #, c-format
  msgid "expired: %s"
  msgstr "過期: %s"
  
  #  of subkey
- #: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyedit.c:3996 g10/keyedit.c:4133 g10/keylist.c:264 g10/keylist.c:1864
 +#: g10/keyserver.c:544
  #, c-format
  msgid "expires: %s"
  msgstr "到期: %s"
  
- #: g10/keyedit.c:3917
++#: g10/keyedit.c:3998
  #, c-format
  msgid "usage: %s"
  msgstr "用途: %s"
  
- #: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
++#: g10/keyedit.c:4006 g10/keyedit.c:4026 g10/keylist.c:267
  msgid "card-no: "
  msgstr "卡片編號: "
  
- #: g10/keyedit.c:3984
++#: g10/keyedit.c:4065
  #, c-format
  msgid "trust: %s"
  msgstr "信任: %s"
  
- #: g10/keyedit.c:3988
++#: g10/keyedit.c:4069
  #, c-format
  msgid "validity: %s"
  msgstr "有效性: %s"
  
- #: g10/keyedit.c:3995
++#: g10/keyedit.c:4076
  msgid "This key has been disabled"
  msgstr "這把金鑰已經停用了"
  
- #: g10/keyedit.c:4013
++#: g10/keyedit.c:4094
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4381,18 -3382,12 +4343,18 @@@ msgstr "
  "請注意顯示出來的金鑰有效性不需要更正,\n"
  "除非你重新執行程式.\n"
  
- #: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
- #: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: g10/keyedit.c:4150 g10/keyedit.c:4581 g10/keyserver.c:548
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:712
 +#: dirmngr/ocsp.c:703
  msgid "revoked"
  msgstr "已撤銷"
  
- #: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
- #: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4152 g10/keyedit.c:4583 g10/keyserver.c:552
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:714
  msgid "expired"
  msgstr "已過期"
  
- #: g10/keyedit.c:4188
++#: g10/keyedit.c:4269
  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"
@@@ -4400,15 -3395,12 +4362,15 @@@ msgstr "
  "警告: 沒有任何使用者 ID 被標示為主要 ID. 這項指令可能會\n"
  "      導致不同的使用者 ID 被當成主要 ID.\n"
  
- #: g10/keyedit.c:4240
++#: g10/keyedit.c:4321
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr "警告: 你的加密子鑰很快將到期.\n"
  
- #: g10/keyedit.c:4241
++#: g10/keyedit.c:4322
  msgid "You may want to change its expiration date too.\n"
  msgstr "你可能也會想變更其使用期限.\n"
  
- #: g10/keyedit.c:4300
++#: g10/keyedit.c:4381
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4417,72 -3409,57 +4379,72 @@@ msgstr "
  "警告: 這是一把 PGP2 型態的金鑰.\n"
  "      增加照片 ID 可能會導致某些版本的 PGP 駁回這把金鑰.\n"
  
- #: g10/keyedit.c:4305 g10/keyedit.c:4595
++#: g10/keyedit.c:4386 g10/keyedit.c:4676
  msgid "Are you sure you still want to add it? (y/N) "
  msgstr "你確定仍然想要增加嗎? (y/N) "
  
- #: g10/keyedit.c:4311
++#: g10/keyedit.c:4392
  msgid "You may not add a photo ID to a PGP2-style key.\n"
  msgstr "你不可以把照片 ID 增加到 PGP2 型態的金鑰裡.\n"
  
- #: g10/keyedit.c:4326 g10/keygen.c:2697
++#: g10/keyedit.c:4407 g10/keygen.c:2719
  msgid "Such a user ID already exists on this key!\n"
  msgstr "這把金鑰上已經有這樣子的使用者 ID 了!\n"
  
- #: g10/keyedit.c:4428
++#: g10/keyedit.c:4509
  msgid "Delete this good signature? (y/N/q)"
  msgstr "刪除這份完好的簽章嗎? (y/N/q)"
  
- #: g10/keyedit.c:4438
++#: g10/keyedit.c:4519
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "刪除這份無效的簽章嗎? (y/N/q)"
  
- #: g10/keyedit.c:4442
++#: g10/keyedit.c:4523
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "刪除這份未知的簽章嗎? (y/N/q)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4530
  msgid "Really delete this self-signature? (y/N)"
  msgstr "真的要刪除這份自我簽章嗎? (y/N)"
  
- #: g10/keyedit.c:4465
++#: g10/keyedit.c:4546
  #, 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:4469
++#: g10/keyedit.c:4550
  msgid "Nothing deleted.\n"
  msgstr "沒有刪除任何東西.\n"
  
- #: g10/keyedit.c:4504 g10/trust.c:693
++#: g10/keyedit.c:4585 g10/trust.c:716
  msgid "invalid"
  msgstr "無效"
  
- #: g10/keyedit.c:4506
++#: g10/keyedit.c:4587
  #, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "使用者 ID \"%s\" 已精簡: %s\n"
  
- #: g10/keyedit.c:4512
++#: g10/keyedit.c:4593
  #, 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:4520
++#: g10/keyedit.c:4601
  #, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "使用者 ID \"%s\": 已經最小化了\n"
  
- #: g10/keyedit.c:4521
++#: g10/keyedit.c:4602
  #, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "使用者 ID \"%s\": 已經是乾淨的了\n"
  
- #: g10/keyedit.c:4590
++#: g10/keyedit.c:4671
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4491,39 -3468,31 +4453,39 @@@ msgstr "
  "警告: 這是一把 PGP2 型態的金鑰.\n"
  "      增加指定撤銷者可能會導致某些版本的 PGP 駁回這把金鑰.\n"
  
- #: g10/keyedit.c:4601
++#: g10/keyedit.c:4682
  msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
  msgstr "你不可以把指定撤銷者增加到 PGP2 型態的金鑰裡.\n"
  
- #: g10/keyedit.c:4618
++#: g10/keyedit.c:4699
  msgid "Enter the user ID of the designated revoker: "
  msgstr "輸入指定撤銷者的使用者 ID: "
  
- #: g10/keyedit.c:4643
++#: g10/keyedit.c:4724
  msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
  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:4658
++#: g10/keyedit.c:4739
  msgid "you cannot appoint a key as its own designated revoker\n"
  msgstr "你不能指派某把金鑰為它自己的指定撤銷者\n"
  
- #: g10/keyedit.c:4680
++#: g10/keyedit.c:4761
  msgid "this key has already been designated as a revoker\n"
  msgstr "已指定這把金鑰為撤銷者了\n"
  
- #: g10/keyedit.c:4698
++#: g10/keyedit.c:4779
  msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
  msgstr "警告: 一旦把某把金鑰指派為指定撤銷者後, 就無法反悔了!\n"
  
- #: g10/keyedit.c:4704
++#: g10/keyedit.c:4785
  msgid ""
  "Are you sure you want to appoint this key as a designated revoker? (y/N) "
  msgstr "你確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
  
- #: g10/keyedit.c:4755
++#: g10/keyedit.c:4848
  #, fuzzy
  #| msgid ""
  #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4532,228 -3501,177 +4494,228 @@@ msgid "
  "N) "
  msgstr "你確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
  
- #: g10/keyedit.c:4760
++#: g10/keyedit.c:4853
  msgid "Changing expiration time for a subkey.\n"
  msgstr "正在變更子鑰的使用期限.\n"
  
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:4856
  msgid "Changing expiration time for the primary key.\n"
  msgstr "正在變更主鑰的使用期限.\n"
  
- #: g10/keyedit.c:4814
++#: g10/keyedit.c:4910
  msgid "You can't change the expiration date of a v3 key\n"
  msgstr "你不能變更 v3 金鑰的使用期限\n"
  
- #: g10/keyedit.c:4987
++#: g10/keyedit.c:5085
  #, c-format
  msgid "signing subkey %s is already cross-certified\n"
  msgstr "簽署子鑰 %s 已經交叉認證過了\n"
  
- #: g10/keyedit.c:4993
++#: g10/keyedit.c:5091
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr "子鑰 %s 不做簽署之用, 因此無須交叉驗證\n"
  
- #: g10/keyedit.c:5108
++#: g10/keyedit.c:5206
  msgid "Please select exactly one user ID.\n"
  msgstr "請祇選擇一個使用者 ID.\n"
  
- #: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
++#: g10/keyedit.c:5247 g10/keyedit.c:5361 g10/keyedit.c:5474 g10/keyedit.c:5611
  #, c-format
  msgid "skipping v3 self-signature on user ID \"%s\"\n"
  msgstr "正在跳過使用者 ID \"%s\" 的 v3 自我簽章\n"
  
- #: g10/keyedit.c:5320
++#: g10/keyedit.c:5418
  msgid "Enter your preferred keyserver URL: "
  msgstr "請輸入你的偏好金鑰伺服器 URL: "
  
- #: g10/keyedit.c:5399
++#: g10/keyedit.c:5497
  msgid "Are you sure you want to replace it? (y/N) "
  msgstr "你確定要取代它嗎? (y/N) "
  
- #: g10/keyedit.c:5400
++#: g10/keyedit.c:5498
  msgid "Are you sure you want to delete it? (y/N) "
  msgstr "你確定要刪除它嗎? (y/N) "
  
- #: g10/keyedit.c:5459
++#: g10/keyedit.c:5557
  msgid "Enter the notation: "
  msgstr "請輸入註記: "
  
- #: g10/keyedit.c:5606
++#: g10/keyedit.c:5704
  msgid "Proceed? (y/N) "
  msgstr "是否繼續? (y/N) "
  
- #: g10/keyedit.c:5676
++#: g10/keyedit.c:5774
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "索引 %d 沒有對應到使用者 ID\n"
  
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5836
  #, c-format
  msgid "No user ID with hash %s\n"
  msgstr "雜湊 %s 沒有對應到使用者 ID\n"
  
- #: g10/keyedit.c:5839
++#: g10/keyedit.c:5937
  #, fuzzy, c-format
  #| msgid "No subkey with index %d\n"
  msgid "No subkey with key ID '%s'.\n"
  msgstr "索引 %d 沒有對應到子鑰\n"
  
- #: g10/keyedit.c:5861
++#: g10/keyedit.c:5959
  #, c-format
  msgid "No subkey with index %d\n"
  msgstr "索引 %d 沒有對應到子鑰\n"
  
- #: g10/keyedit.c:6002
++#: g10/keyedit.c:6100
  #, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "使用者 ID: \"%s\"\n"
  
- #: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
++#: g10/keyedit.c:6103 g10/keyedit.c:6205 g10/keyedit.c:6253
  #, c-format
  msgid "signed by your key %s on %s%s%s\n"
  msgstr "已被你的金鑰 %s 於 %s%s%s 所簽署\n"
  
- #: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
++#: g10/keyedit.c:6105 g10/keyedit.c:6207 g10/keyedit.c:6255
  msgid " (non-exportable)"
  msgstr " (不可匯出)"
  
- #: g10/keyedit.c:6011
++#: g10/keyedit.c:6109
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "這份簽章已經在 %s 過期了.\n"
  
- #: g10/keyedit.c:6016
++#: g10/keyedit.c:6114
  msgid "Are you sure you still want to revoke it? (y/N) "
  msgstr "你確定仍然想要撤銷它嗎? (y/N) "
  
- #: g10/keyedit.c:6021
++#: g10/keyedit.c:6119
  msgid "Create a revocation certificate for this signature? (y/N) "
  msgstr "要為這份簽章建立一份撤銷憑證嗎? (y/N) "
  
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6173
  msgid "Not signed by you.\n"
  msgstr "並非由你所簽署.\n"
  
- #: g10/keyedit.c:6081
++#: g10/keyedit.c:6179
  #, c-format
  msgid "You have signed these user IDs on key %s:\n"
  msgstr "你已經簽署了金鑰 %s 上的這些使用者 ID:\n"
  
- #: g10/keyedit.c:6110
++#: g10/keyedit.c:6208
  msgid " (non-revocable)"
  msgstr " (不可撤銷)"
  
- #: g10/keyedit.c:6117
++#: g10/keyedit.c:6215
  #, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "被你的金鑰 %s 於 %s 所撤銷了\n"
  
- #: g10/keyedit.c:6142
++#: g10/keyedit.c:6240
  msgid "You are about to revoke these signatures:\n"
  msgstr "你正要撤銷這些簽章:\n"
  
- #: g10/keyedit.c:6165
++#: g10/keyedit.c:6263
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "真的要建立撤銷憑證嗎? (y/N) "
  
- #: g10/keyedit.c:6198
++#: g10/keyedit.c:6296
  msgid "no secret key\n"
  msgstr "沒有私鑰\n"
  
- #: g10/keyedit.c:6246
++#: g10/keyedit.c:6344
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6256
++#: g10/keyedit.c:6354
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "使用者 ID \"%s\" 已撤銷\n"
  
- #: g10/keyedit.c:6273
++#: g10/keyedit.c:6371
  #, c-format
  msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
  msgstr "警告: 有一份使用者 ID 的簽章日期為 %d 秒後的未來\n"
  
- #: g10/keyedit.c:6386
++#: g10/keyedit.c:6485
  #, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "金鑰 %s 已撤銷.\n"
  
- #: g10/keyedit.c:6448
++#: g10/keyedit.c:6547
  #, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "子鑰 %s 已撤銷.\n"
  
- #: g10/keyedit.c:6545
++#: g10/keyedit.c:6644
  #, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr "正在顯示 %s 照片 ID, 其尺寸為 %ld, 屬於金鑰 %s (uid %d) 的照片\n"
  
- #: g10/keygen.c:305
++#: g10/keygen.c:316
  #, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "偏好設定 '%s' 重複了\n"
  
- #: g10/keygen.c:312
++#: g10/keygen.c:323
  msgid "too many cipher preferences\n"
  msgstr "編密偏好過多\n"
  
- #: g10/keygen.c:314
++#: g10/keygen.c:325
  msgid "too many digest preferences\n"
  msgstr "摘要偏好過多\n"
  
- #: g10/keygen.c:316
++#: g10/keygen.c:327
  msgid "too many compression preferences\n"
  msgstr "壓縮偏好過多\n"
  
- #: g10/keygen.c:457
++#: g10/keygen.c:468
  #, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "偏好字串中含有無效的項目 '%s'\n"
  
- #: g10/keygen.c:936
++#: g10/keygen.c:947
  msgid "writing direct signature\n"
  msgstr "寫入直接簽章中\n"
  
- #: g10/keygen.c:982
++#: g10/keygen.c:993
  msgid "writing self signature\n"
  msgstr "寫入自我簽章中\n"
  
- #: g10/keygen.c:1038
++#: g10/keygen.c:1049
  msgid "writing key binding signature\n"
  msgstr "寫入附鑰簽章中\n"
  
- #: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
- #: g10/keygen.c:1610 g10/keygen.c:1615
++#: g10/keygen.c:1413 g10/keygen.c:1418 g10/keygen.c:1470 g10/keygen.c:1475
++#: g10/keygen.c:1622 g10/keygen.c:1627
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "金鑰尺寸無效; 改用 %u 位元\n"
  
- #: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
++#: g10/keygen.c:1424 g10/keygen.c:1481 g10/keygen.c:1489 g10/keygen.c:1633
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "金鑰尺寸增大到 %u 位元\n"
  
- #: g10/keygen.c:1503
++#: g10/keygen.c:1515
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr "警告: 某些 OpenPGP 程式無法處理具有此摘要尺寸的 DSA 金鑰\n"
  
- #: g10/keygen.c:1677
++#: g10/keygen.c:1689
  msgid "Sign"
  msgstr "簽署"
  
- #: g10/keygen.c:1680
++#: g10/keygen.c:1692
  msgid "Certify"
  msgstr "保證"
  
- #: g10/keygen.c:1683
++#: g10/keygen.c:1695
  msgid "Encrypt"
  msgstr "加密"
  
- #: g10/keygen.c:1686
++#: g10/keygen.c:1698
  msgid "Authenticate"
  msgstr "鑑定"
  
@@@ -4767,150 -3685,119 +4729,150 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1705
++#: g10/keygen.c:1717
  msgid "SsEeAaQq"
  msgstr "SsEeAaQq"
  
- #: g10/keygen.c:1732
++#: g10/keygen.c:1744
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "%s 金鑰可能的動作: "
  
- #: g10/keygen.c:1738
++#: g10/keygen.c:1750
  msgid "Current allowed actions: "
  msgstr "目前可進行的動作: "
  
- #: g10/keygen.c:1743
++#: g10/keygen.c:1755
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) 切換簽署性能\n"
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) 切換加密性能\n"
  
- #: g10/keygen.c:1749
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) 切換鑑定性能\n"
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) 已完成\n"
  
- #: g10/keygen.c:1881 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1893 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "請選擇你要使用的金鑰種類:\n"
  
- #: g10/keygen.c:1885
++#: g10/keygen.c:1897
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) RSA 和 RSA (預設)\n"
  
- #: g10/keygen.c:1889
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA 和 Elgamal\n"
  
- #: g10/keygen.c:1892
++#: g10/keygen.c:1904
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (僅能用於簽署)\n"
  
- #: g10/keygen.c:1894
++#: g10/keygen.c:1906
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (僅能用於簽署)\n"
  
- #: g10/keygen.c:1900
++#: g10/keygen.c:1912
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) Elgamal (僅能用於加密)\n"
  
- #: g10/keygen.c:1902
++#: g10/keygen.c:1914
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (僅能用於加密)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1920
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (你能自己設定性能)\n"
  
- #: g10/keygen.c:1910
++#: g10/keygen.c:1922
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (你能自己設定性能)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1928
  #, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) ECC 和 ECC\n"
  
- #: g10/keygen.c:1918
++#: g10/keygen.c:1930
  #, c-format
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) ECC (僅能用於簽署)\n"
  
- #: g10/keygen.c:1920
++#: g10/keygen.c:1932
  #, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) ECC (你能自己設定性能)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1934
  #, c-format
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) ECC (僅能用於加密)\n"
  
- #: g10/keygen.c:1926
++#: g10/keygen.c:1938
  #, c-format
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) 現有的金鑰\n"
  
- #: g10/keygen.c:2022 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:206
  msgid "Enter the keygrip: "
  msgstr "請輸入金鑰鑰柄: "
  
- #: g10/keygen.c:2035 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2047 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr "不是有效的金鑰鑰柄 (應該要是 40 位十六進制數值)\n"
  
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2049 sm/certreqgen-ui.c:216
  msgid "No key with this keygrip\n"
  msgstr "沒有金鑰有此金鑰鑰柄\n"
  
- #: g10/keygen.c:2111 g10/keygen.c:2125
++#: g10/keygen.c:2133 g10/keygen.c:2147
  #, c-format
  msgid "rounded to %u bits\n"
  msgstr "加大到 %u 位元\n"
  
- #: g10/keygen.c:2166
++#: g10/keygen.c:2188
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr "%s 金鑰的長度可能介於 %u 位元和 %u 位元之間.\n"
  
- #: g10/keygen.c:2174
++#: g10/keygen.c:2196
  #, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "你的子鑰想要用多大的金鑰尺寸? (%u) "
  
- #: g10/keygen.c:2177 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2199 sm/certreqgen-ui.c:183
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "你想要用多大的金鑰尺寸? (%u) "
  
- #: g10/keygen.c:2191 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2213 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "你所要求的金鑰尺寸是 %u 位元\n"
  
- #: g10/keygen.c:2237
++#: g10/keygen.c:2259
  msgid "Please select which elliptic curve you want:\n"
  msgstr "請選擇你要使用的橢圓曲線:\n"
  
- #: g10/keygen.c:2409
++#: g10/keygen.c:2431
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -4926,7 -3813,6 +4888,7 @@@ msgstr "
  "      <n>m = 金鑰在 n 月後會到期\n"
  "      <n>y = 金鑰在 n 年後會到期\n"
  
- #: g10/keygen.c:2420
++#: g10/keygen.c:2442
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -4942,38 -3828,30 +4904,38 @@@ msgstr "
  "      <n>m = 簽章在 n 月後會到期\n"
  "      <n>y = 簽章在 n 年後會到期\n"
  
- #: g10/keygen.c:2443
++#: g10/keygen.c:2465
  msgid "Key is valid for? (0) "
  msgstr "金鑰的有效期限是多久? (0) "
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2470
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "簽章的有效期限是多久? (%s) "
  
- #: g10/keygen.c:2461 g10/keygen.c:2486
++#: g10/keygen.c:2483 g10/keygen.c:2508
  msgid "invalid value\n"
  msgstr "無效的數值\n"
  
- #: g10/keygen.c:2468
++#: g10/keygen.c:2490
  msgid "Key does not expire at all\n"
  msgstr "金鑰完全不會過期\n"
  
- #: g10/keygen.c:2469
++#: g10/keygen.c:2491
  msgid "Signature does not expire at all\n"
  msgstr "簽章完全不會過期\n"
  
- #: g10/keygen.c:2474
++#: g10/keygen.c:2496
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "金鑰將會在 %s 到期\n"
  
- #: g10/keygen.c:2475
++#: g10/keygen.c:2497
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "簽章將會在 %s 到期.\n"
  
- #: g10/keygen.c:2479
++#: g10/keygen.c:2501
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -4981,11 -3859,9 +4943,11 @@@ msgstr "
  "你的系統無法顯示 2038 年以後的日期.\n"
  "不過, 它可以正確處理直到 2106 年之前的年份.\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2514
  msgid "Is this correct? (y/N) "
  msgstr "以上正確嗎? (y/N) "
  
- #: g10/keygen.c:2560
++#: g10/keygen.c:2582
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -4999,7 -3875,6 +4961,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2575
++#: g10/keygen.c:2597
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -5014,49 -3889,38 +4976,49 @@@ msgstr "
  "    \"Ke-Huan Lin (Jedi) <Jedi at Jedi.org>\"\n"
  "\n"
  
- #: g10/keygen.c:2594
++#: g10/keygen.c:2616
  msgid "Real name: "
  msgstr "真實姓名: "
  
- #: g10/keygen.c:2603
++#: g10/keygen.c:2625
  msgid "Invalid character in name\n"
  msgstr "姓名含有無效的字符\n"
  
- #: g10/keygen.c:2604
++#: g10/keygen.c:2626
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2608
++#: g10/keygen.c:2630
  msgid "Name may not start with a digit\n"
  msgstr "姓名不可以用數字開頭\n"
  
- #: g10/keygen.c:2611
++#: g10/keygen.c:2633
  msgid "Name must be at least 5 characters long\n"
  msgstr "姓名至少要有五個字符長\n"
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2643
  msgid "Email address: "
  msgstr "電子郵件地址: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2649
  msgid "Not a valid email address\n"
  msgstr "不是有效的電子郵件地址\n"
  
- #: g10/keygen.c:2636
++#: g10/keygen.c:2658
  msgid "Comment: "
  msgstr "註釋: "
  
- #: g10/keygen.c:2642
++#: g10/keygen.c:2664
  msgid "Invalid character in comment\n"
  msgstr "註釋含有無效的字符\n"
  
- #: g10/keygen.c:2678
++#: g10/keygen.c:2700
  #, c-format
  msgid "You are using the '%s' character set.\n"
  msgstr "你正在使用 '%s' 字元集.\n"
  
- #: g10/keygen.c:2684
++#: g10/keygen.c:2706
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5067,7 -3931,6 +5029,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2689
++#: g10/keygen.c:2711
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr "請不要把電子郵件地址放進你的真實姓名或註釋裡\n"
  
@@@ -5082,31 -3945,24 +5044,31 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2714
++#: g10/keygen.c:2736
  msgid "NnCcEeOoQq"
  msgstr "NnCcEeOoQq"
  
- #: g10/keygen.c:2724
++#: g10/keygen.c:2746
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或退出(Q)? "
  
- #: g10/keygen.c:2725
++#: g10/keygen.c:2747
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或確定(O)/退出(Q)? "
  
- #: g10/keygen.c:2730
++#: g10/keygen.c:2752
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "變更姓名(N), 電子郵件地址(E)或退出(Q)? "
  
- #: g10/keygen.c:2731
++#: g10/keygen.c:2753
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "變更姓名(N), 電子郵件地址(E)或確定(O)/退出(Q)? "
  
- #: g10/keygen.c:2750
++#: g10/keygen.c:2772
  msgid "Please correct the error first\n"
  msgstr "請先訂正錯誤\n"
  
- #: g10/keygen.c:2796
++#: g10/keygen.c:2818
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5117,13 -3973,10 +5079,13 @@@ msgstr "
  "(像是敲打鍵盤, 移動滑鼠, 讀寫硬碟之類的)\n"
  "這會讓隨機數字產生器有更多的機會獲得夠多的亂數.\n"
  
- #: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
- #: g10/keygen.c:4777 g10/keygen.c:4882
++#: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
++#: g10/keygen.c:4330 g10/keygen.c:4803 g10/keygen.c:5064 g10/keygen.c:5169
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "產生金鑰失敗: %s\n"
  
- #: g10/keygen.c:3598
++#: g10/keygen.c:3922
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5134,62 -3987,49 +5096,62 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3924
  msgid "Continue? (Y/n) "
  msgstr "是否繼續? (Y/n) "
  
- #: g10/keygen.c:3621
++#: g10/keygen.c:3945
  #, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "\"%s\" 的金鑰已存在\n"
  
- #: g10/keygen.c:3626
++#: g10/keygen.c:3950
  msgid "Create anyway? (y/N) "
  msgstr "無論如何還是要建立嗎? (y/N) "
  
- #: g10/keygen.c:3632
++#: g10/keygen.c:3956
  msgid "creating anyway\n"
  msgstr "總之還是在建立\n"
  
- #: g10/keygen.c:3981
++#: g10/keygen.c:4315
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr "請注意: 如需全能金鑰產生對話框請用  \"%s %s\".\n"
  
- #: g10/keygen.c:4013
++#: g10/keygen.c:4358
  msgid "Key generation canceled.\n"
  msgstr "金鑰產生已取消.\n"
  
- #: g10/keygen.c:4073
++#: g10/keygen.c:4418
  #, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "無法建立備份檔案 '%s': %s\n"
  
- #: g10/keygen.c:4093
++#: g10/keygen.c:4438
  #, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "請注意: 卡片金鑰的備份已儲存至 '%s'\n"
  
- #: g10/keygen.c:4244 g10/keygen.c:4393
++#: g10/keygen.c:4589 g10/keygen.c:4738
  #, c-format
  msgid "writing public key to '%s'\n"
  msgstr "正在寫入公鑰至 '%s'\n"
  
- #: g10/keygen.c:4387
++#: g10/keygen.c:4732
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "找不到可寫入的公鑰鑰匙圈: %s\n"
  
- #: g10/keygen.c:4401
++#: g10/keygen.c:4746
  #, c-format
  msgid "error writing public keyring '%s': %s\n"
  msgstr "寫入公鑰鑰匙圈 '%s' 時出錯: %s\n"
  
- #: g10/keygen.c:4433
++#: g10/keygen.c:4778
  msgid "public and secret key created and signed.\n"
  msgstr "公鑰和私鑰已建立及簽署.\n"
  
- #: g10/keygen.c:4445
++#: g10/keygen.c:4790
  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"
@@@ -5197,31 -4037,25 +5159,31 @@@ msgstr "
  "請注意這把金鑰不能用於加密.  也許你會想藉由 \"--edit-key\" 指令\n"
  "來產生加密用的子鑰.\n"
  
- #: g10/keygen.c:4649 g10/keygen.c:4833
++#: g10/keygen.c:4936 g10/keygen.c:5120
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
  msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
  
- #: g10/keygen.c:4651 g10/keygen.c:4835
++#: g10/keygen.c:4938 g10/keygen.c:5122
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
  msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
  
- #: g10/keygen.c:4662 g10/keygen.c:4846
++#: g10/keygen.c:4949 g10/keygen.c:5133
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgstr "請注意: 對 v3 金鑰製造子鑰不符合 OpenPGP 規範\n"
  
- #: g10/keygen.c:4674 g10/keygen.c:4676
++#: g10/keygen.c:4961 g10/keygen.c:4963
  msgid "Secret parts of primary key are not available.\n"
  msgstr "主鑰的私鑰部分無法取用.\n"
  
- #: g10/keygen.c:4683 g10/keygen.c:4685
++#: g10/keygen.c:4970 g10/keygen.c:4972
  msgid "Secret parts of primary key are stored on-card.\n"
  msgstr "主鑰的私鑰部分存放於卡上.\n"
  
- #: g10/keygen.c:4704 g10/keygen.c:4860
++#: g10/keygen.c:4991 g10/keygen.c:5147
  msgid "Really create? (y/N) "
  msgstr "真的要建立嗎? (y/N) "
  
@@@ -5536,123 -4305,97 +5498,123 @@@ msgstr "警告: 看到了多份明文\n
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
  msgstr "獨立撤銷 - 請用 \"gpg --import\" 來套用\n"
  
- #: g10/mainproc.c:1233 g10/mainproc.c:1276
++#: g10/mainproc.c:1238 g10/mainproc.c:1281
  msgid "no signature found\n"
  msgstr "找不到簽章\n"
  
- #: g10/mainproc.c:1607
++#: g10/mainproc.c:1612
  #, c-format
  msgid "BAD signature from \"%s\""
  msgstr "*損壞* 的簽章來自於 \"%s\""
  
- #: g10/mainproc.c:1609
++#: g10/mainproc.c:1614
  #, c-format
  msgid "Expired signature from \"%s\""
  msgstr "過期的簽章來自於 \"%s\""
  
- #: g10/mainproc.c:1611
++#: g10/mainproc.c:1616
  #, c-format
  msgid "Good signature from \"%s\""
  msgstr "完好的簽章來自於 \"%s\""
  
- #: g10/mainproc.c:1630
++#: g10/mainproc.c:1635
  msgid "signature verification suppressed\n"
  msgstr "簽章驗證已抑制\n"
  
- #: g10/mainproc.c:1739
++#: g10/mainproc.c:1744
  msgid "can't handle this ambiguous signature data\n"
  msgstr "無法處理這個不明確的簽章資料\n"
  
- #: g10/mainproc.c:1753 g10/mainproc.c:1761
++#: g10/mainproc.c:1758 g10/mainproc.c:1766
  #, c-format
  msgid "Signature made %s\n"
  msgstr "由 %s 建立的簽章\n"
  
- #: g10/mainproc.c:1754 g10/mainproc.c:1762
++#: g10/mainproc.c:1759 g10/mainproc.c:1767
  #, c-format
  msgid "               using %s key %s\n"
  msgstr "               使用 %s 金鑰 %s\n"
  
- #: g10/mainproc.c:1766
++#: g10/mainproc.c:1771
  #, c-format
  msgid "Signature made %s using %s key ID %s\n"
  msgstr "由 %s 建立的簽章, 使用 %s 金鑰 ID %s\n"
  
- #: g10/mainproc.c:1772
++#: g10/mainproc.c:1777
  #, fuzzy, c-format
  #| msgid "                aka \"%s\""
  msgid "               issuer \"%s\"\n"
  msgstr "                亦即 \"%s\""
  
- #: g10/mainproc.c:1789
++#: g10/mainproc.c:1794
  msgid "Key available at: "
  msgstr "可用的金鑰於: "
  
- #: g10/mainproc.c:2024
++#: g10/mainproc.c:2029
  msgid "[uncertain]"
  msgstr "[ 不確定 ]"
  
- #: g10/mainproc.c:2062
++#: g10/mainproc.c:2067
  #, c-format
  msgid "                aka \"%s\""
  msgstr "                亦即 \"%s\""
  
- #: g10/mainproc.c:2145
++#: g10/mainproc.c:2150
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "這份簽署已經在 %s 過期了\n"
  
- #: g10/mainproc.c:2149
++#: g10/mainproc.c:2154
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "這份簽署將在 %s 到期\n"
  
- #: g10/mainproc.c:2160
++#: g10/mainproc.c:2165
  #, c-format
  msgid "%s signature, digest algorithm %s%s%s\n"
  msgstr "%s 簽章, 摘要演算法 %s%s%s\n"
  
- #: g10/mainproc.c:2161
++#: g10/mainproc.c:2166
  msgid "binary"
  msgstr "二進制"
  
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2167
  msgid "textmode"
  msgstr "文字模式"
  
- #: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "未知"
  
- #: g10/mainproc.c:2164
++#: g10/mainproc.c:2169
  msgid ", key algorithm "
  msgstr ", 金鑰演算法 "
  
- #: g10/mainproc.c:2199
++#: g10/mainproc.c:2204
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2229
++#: g10/mainproc.c:2234
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "無法檢查簽章: %s\n"
  
- #: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
++#: g10/mainproc.c:2327 g10/mainproc.c:2346 g10/mainproc.c:2470
  msgid "not a detached signature\n"
  msgstr "不是一份分離的簽章\n"
  
- #: g10/mainproc.c:2375
++#: g10/mainproc.c:2380
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
  msgstr "警告: 偵測到多重簽章. 祇有第一個簽章纔會被核選.\n"
  
- #: g10/mainproc.c:2384
++#: g10/mainproc.c:2389
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "等級 0x%02x 的獨立簽章\n"
  
- #: g10/mainproc.c:2469
++#: g10/mainproc.c:2474
  msgid "old style (PGP 2.x) signature\n"
  msgstr "舊型 (PGP 2.x) 簽章\n"
  
@@@ -5929,23 -4618,18 +5891,23 @@@ msgstr "這張照片正確嗎? (y/N/q) 
  msgid "unable to display photo ID!\n"
  msgstr "無法顯示照片 ID!\n"
  
- #: g10/pkclist.c:72 g10/revoke.c:757
++#: g10/pkclist.c:72 g10/revoke.c:758
  msgid "No reason specified"
  msgstr "未指定原因"
  
- #: g10/pkclist.c:74 g10/revoke.c:759
++#: g10/pkclist.c:74 g10/revoke.c:760
  msgid "Key is superseded"
  msgstr "金鑰被代換了"
  
- #: g10/pkclist.c:76 g10/revoke.c:758
++#: g10/pkclist.c:76 g10/revoke.c:759
  msgid "Key has been compromised"
  msgstr "金鑰已經被洩漏了"
  
- #: g10/pkclist.c:78 g10/revoke.c:760
++#: g10/pkclist.c:78 g10/revoke.c:761
  msgid "Key is no longer used"
  msgstr "金鑰不再被使用了"
  
- #: g10/pkclist.c:80 g10/revoke.c:761
++#: g10/pkclist.c:80 g10/revoke.c:762
  msgid "User ID is no longer valid"
  msgstr "使用者 ID 不再有效了"
  
@@@ -6022,7 -4693,6 +5984,7 @@@ msgstr "
  "這把金鑰的最小信任等級為: %s\n"
  "\n"
  
- #: g10/pkclist.c:310 g10/revoke.c:786
++#: g10/pkclist.c:310 g10/revoke.c:787
  msgid "Your decision? "
  msgstr "你的決定是甚麼? "
  
@@@ -6216,33 -4848,26 +6178,33 @@@ msgstr "
  msgid "No such user ID.\n"
  msgstr "沒有這個使用者 ID.\n"
  
- #: g10/pkclist.c:1197 g10/pkclist.c:1273
++#: g10/pkclist.c:1197 g10/pkclist.c:1274
  msgid "skipped: public key already set as default recipient\n"
  msgstr "已跳過: 公鑰已經被設成預設收件者\n"
  
- #: g10/pkclist.c:1218
++#: g10/pkclist.c:1219
  msgid "Public key is disabled.\n"
  msgstr "公鑰已停用.\n"
  
- #: g10/pkclist.c:1228
++#: g10/pkclist.c:1229
  msgid "skipped: public key already set\n"
  msgstr "已跳過: 公鑰已設過\n"
  
- #: g10/pkclist.c:1263
++#: g10/pkclist.c:1264
  #, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "未知的預設收件者 \"%s\"\n"
  
- #: g10/pkclist.c:1312
++#: g10/pkclist.c:1313
  msgid "no valid addressees\n"
  msgstr "沒有有效的地址\n"
  
- #: g10/pkclist.c:1665
++#: g10/pkclist.c:1666
  #, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "請注意: 金鑰 %s 沒有 %s 功能\n"
  
- #: g10/pkclist.c:1690
++#: g10/pkclist.c:1691
  #, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "警告: 金鑰 %s 沒有 %s 的偏好設定\n"
@@@ -6251,28 -4875,22 +6213,28 @@@
  msgid "data not saved; use option \"--output\" to save it\n"
  msgstr "資料未被儲存; 請用 \"--output\" 選項來儲存\n"
  
- #: g10/plaintext.c:598
++#: g10/plaintext.c:614
  msgid "Detached signature.\n"
  msgstr "分離的簽章.\n"
  
- #: g10/plaintext.c:606
++#: g10/plaintext.c:622
  msgid "Please enter name of data file: "
  msgstr "請輸入資料檔的名稱: "
  
- #: g10/plaintext.c:643
++#: g10/plaintext.c:659
  msgid "reading stdin ...\n"
  msgstr "正在讀取標準輸入中 ...\n"
  
- #: g10/plaintext.c:688
++#: g10/plaintext.c:704
  msgid "no signed data\n"
  msgstr "沒有被簽署過的資料\n"
  
- #: g10/plaintext.c:706
++#: g10/plaintext.c:722
  #, c-format
  msgid "can't open signed data '%s'\n"
  msgstr "無法開啟被簽署過的資料 '%s'\n"
  
- #: g10/plaintext.c:741
++#: g10/plaintext.c:757
  #, c-format
  msgid "can't open signed data fd=%d: %s\n"
  msgstr "無法開啟被簽署過的資料 fd=%d: %s\n"
@@@ -6338,7 -4942,6 +6300,7 @@@ msgstr "私鑰可用.\n
  msgid "Create a designated revocation certificate for this key? (y/N) "
  msgstr "要為這把金鑰建立一份指定撤銷憑證嗎? (y/N) "
  
- #: g10/revoke.c:336 g10/revoke.c:727
++#: g10/revoke.c:336 g10/revoke.c:728
  msgid "ASCII armored output forced.\n"
  msgstr "已強迫使用 ASCII 封裝過的輸出.\n"
  
@@@ -6386,7 -4983,6 +6348,7 @@@ msgstr "
  "辦法是產生一份新的撤銷憑證, 並且指明撤銷\n"
  "的理由."
  
- #: g10/revoke.c:575
++#: g10/revoke.c:576
  #, fuzzy
  #| msgid ""
  #| "To avoid an accidental use of this file, a colon has been inserted\n"
@@@ -6401,13 -4997,11 +6363,13 @@@ msgstr "
  "真的要使用這份撤銷憑證前, 請先用文字編輯器把那個冒號移除,\n"
  "撤銷憑證才能使用."
  
- #: g10/revoke.c:590
++#: g10/revoke.c:591
  #, fuzzy, c-format
  #| msgid "Revocation certificate created.\n"
  msgid "revocation certificate stored as '%s.rev'\n"
  msgstr "已建立撤銷憑證.\n"
  
- #: g10/revoke.c:634
++#: g10/revoke.c:635
  #, fuzzy, c-format
  #| msgid "secret key \"%s\" not found: %s\n"
  msgid "secret key \"%s\" not found\n"
@@@ -6416,22 -5010,18 +6378,22 @@@ msgstr "找不到私鑰 \"%s\": %s\n
  #. TRANSLATORS: The %s prints a key specification which
  #. for example has been given at the command line.  Several lines
  #. lines with secret key infos are printed after this message.
- #: g10/revoke.c:661
++#: g10/revoke.c:662
  #, c-format
  msgid "'%s' matches multiple secret keys:\n"
  msgstr ""
  
- #: g10/revoke.c:688
++#: g10/revoke.c:689
  #, fuzzy, c-format
  #| msgid "error creating keyring '%s': %s\n"
  msgid "error searching the keyring: %s\n"
  msgstr "建立鑰匙圈 '%s' 時出錯: %s\n"
  
- #: g10/revoke.c:711
++#: g10/revoke.c:712
  msgid "Create a revocation certificate for this key? (y/N) "
  msgstr "要為這把金鑰建立一份撤銷憑證嗎? (y/N) "
  
- #: g10/revoke.c:735
++#: g10/revoke.c:736
  msgid ""
  "Revocation certificate created.\n"
  "\n"
@@@ -6450,33 -5040,26 +6412,33 @@@ msgstr "
  "但是千萬小心: 你的機器上的列印系統可能會在列印過\n"
  "程中把這些資料暫存在某個其他人也能夠看得到的地方!\n"
  
- #: g10/revoke.c:769
++#: g10/revoke.c:770
  msgid "Please select the reason for the revocation:\n"
  msgstr "請選擇撤銷的原因:\n"
  
- #: g10/revoke.c:779
++#: g10/revoke.c:780
  msgid "Cancel"
  msgstr "取消"
  
- #: g10/revoke.c:781
++#: g10/revoke.c:782
  #, c-format
  msgid "(Probably you want to select %d here)\n"
  msgstr "(也許你會想要在這裡選擇 %d)\n"
  
- #: g10/revoke.c:822
++#: g10/revoke.c:823
  msgid "Enter an optional description; end it with an empty line:\n"
  msgstr "請輸入選用的描述; 以空白列結束:\n"
  
- #: g10/revoke.c:850
++#: g10/revoke.c:851
  #, c-format
  msgid "Reason for revocation: %s\n"
  msgstr "撤銷原因: %s\n"
  
- #: g10/revoke.c:852
++#: g10/revoke.c:853
  msgid "(No description given)\n"
  msgstr "(沒有給定描述)\n"
  
- #: g10/revoke.c:857
++#: g10/revoke.c:858
  msgid "Is this okay? (y/N) "
  msgstr "這樣可以嗎? (y/N) "
  
@@@ -6596,22 -5159,18 +6558,22 @@@ msgid "
  "unexpanded.\n"
  msgstr "警告: 偏好金鑰伺服器 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
  
- #: g10/sign.c:329
++#: g10/sign.c:331
  #, c-format
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s/%s 簽章來自: \"%s\"\n"
  
- #: g10/sign.c:878
++#: g10/sign.c:880
  #, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
  msgstr "警告: 強迫使用 %s (%d) 摘要演算法會違反收件者偏好設定\n"
  
- #: g10/sign.c:1009
++#: g10/sign.c:1011
  msgid "signing:"
  msgstr "簽署:"
  
- #: g10/sign.c:1286
++#: g10/sign.c:1288
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "%s 加密將被採用\n"
@@@ -6633,7 -5188,6 +6595,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:362
++#: g10/tdbdump.c:57 g10/trustdb.c:369
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "信任記錄 %lu, 類別 %d: 寫入失敗: %s\n"
@@@ -6678,7 -5224,6 +6640,7 @@@ msgstr "在 '%s' 中尋找信任記錄�
  msgid "read error in '%s': %s\n"
  msgstr "'%s' 讀取錯誤: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "信任資料庫: 同步化失敗: %s\n"
@@@ -6821,295 -5337,301 +6783,367 @@@ msgstr "無法處理長於 %d 字符的
  msgid "input line longer than %d characters\n"
  msgstr "輸入列比 %d 字符還長\n"
  
- #: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
++#: g10/tofu.c:232 g10/tofu.c:256 g10/tofu.c:675
  #, fuzzy, c-format
  #| msgid "error sending standard options: %s\n"
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "送出標準選項時出錯: %s\n"
  
- #: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
++#: g10/tofu.c:302 g10/tofu.c:325 g10/tofu.c:899
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:357 g10/tofu.c:699
++#: g10/tofu.c:355 g10/tofu.c:888
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:501
++#: g10/tofu.c:505
  #, fuzzy, c-format
  #| msgid "unsupported algorithm: %s"
  msgid "unsupported TOFU database version: %s\n"
  msgstr "未支援的演算法: %s"
  
- #: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
- #: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
- #: g10/tofu.c:3056
++#: g10/tofu.c:538
+ #, fuzzy, c-format
+ #| msgid "error creating temporary file: %s\n"
+ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
+ msgstr "建立暫存檔時出錯: %s\n"
+ 
++#: g10/tofu.c:587 g10/tofu.c:608 g10/tofu.c:620 g10/tofu.c:632 g10/tofu.c:648
+ msgid "TOFU DB error"
+ msgstr ""
+ 
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2340 g10/tofu.c:2359
++#: g10/tofu.c:2372 g10/tofu.c:2384 g10/tofu.c:2399 g10/tofu.c:2411
++#: g10/tofu.c:2980 g10/tofu.c:2997 g10/tofu.c:3033 g10/tofu.c:3050
++#: g10/tofu.c:3353
  #, fuzzy, c-format
  #| msgid "error sending data: %s\n"
  msgid "error reading TOFU database: %s\n"
  msgstr "送出資料時出錯: %s\n"
  
- #: g10/tofu.c:566 g10/tofu.c:574
++#: g10/tofu.c:716 g10/tofu.c:724
  #, fuzzy, c-format
  #| msgid "error writing base64 encoding: %s\n"
  msgid "error determining TOFU database's version: %s\n"
  msgstr "寫入 base64 編碼時出錯: %s\n"
  
- #: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
++#: g10/tofu.c:737 g10/tofu.c:750 g10/tofu.c:796 g10/tofu.c:824
  #, fuzzy, c-format
  #| msgid "error initializing reader object: %s\n"
  msgid "error initializing TOFU database: %s\n"
  msgstr "啟始讀取程式物件時出錯: %s\n"
  
- #: g10/tofu.c:765
++#: g10/tofu.c:844
+ #, fuzzy, c-format
+ #| msgid "error sending data: %s\n"
+ msgid "error creating 'encryptions' TOFU table: %s\n"
+ msgstr "送出資料時出錯: %s\n"
+ 
++#: g10/tofu.c:874
+ #, c-format
+ msgid "adding column effective_policy to bindings DB: %s\n"
+ msgstr ""
+ 
++#: g10/tofu.c:956
  #, fuzzy, c-format
  #| msgid "error opening '%s': %s\n"
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "開啟 '%s' 時出錯: %s\n"
  
- #: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
++#: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
  #, fuzzy, c-format
  #| msgid "error sending data: %s\n"
  msgid "error updating TOFU database: %s\n"
  msgstr "送出資料時出錯: %s\n"
  
- #: g10/tofu.c:1239
++#: g10/tofu.c:1328
  #, c-format
  msgid ""
  "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1247
++#: g10/tofu.c:1337
  #, c-format
- msgid "The email address \"%s\" is associated with %d keys!"
- msgstr ""
+ msgid "The email address \"%s\" is associated with %d key!"
+ msgid_plural "The email address \"%s\" is associated with %d keys!"
+ msgstr[0] ""
  
- #: g10/tofu.c:1251
++#: g10/tofu.c:1343
  msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  
- #: g10/tofu.c:1257
++#: g10/tofu.c:1349
  #, c-format
  msgid ""
  "Please indicate whether this email address should be associated with key %s "
  "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1513
++#: g10/tofu.c:1605
  #, fuzzy, c-format
  #| msgid "error getting responder ID: %s\n"
  msgid "error gathering other user IDs: %s\n"
  msgstr "取得回應程式 ID 時出錯: %s\n"
  
- #: g10/tofu.c:1523
++#: g10/tofu.c:1615
  #, fuzzy
  #| msgid "list key and user IDs"
  msgid "This key's user IDs:\n"
  msgstr "列出金鑰和使用者 ID"
  
- #: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
++#: g10/tofu.c:1631 g10/tofu.c:1796
  #, fuzzy, c-format
  #| msgid "validity: %s"
  msgid "policy: %s"
  msgstr "有效性: %s"
  
- #: g10/tofu.c:1630
++#: g10/tofu.c:1722
  #, fuzzy, c-format
  #| msgid "error getting stored flags: %s\n"
  msgid "error gathering signature stats: %s\n"
  msgstr "取得已存放的旗標時出錯: %s\n"
  
- #: g10/tofu.c:1634
++#: g10/tofu.c:1726
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  
- #: g10/tofu.c:1651
++#: g10/tofu.c:1744
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1684 g10/tofu.c:1689
++#: g10/tofu.c:1785 g10/tofu.c:1790
  msgid ", "
  msgstr ""
  
- #: g10/tofu.c:1693
++#: g10/tofu.c:1794
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
  msgstr "列出金鑰"
  
- #: g10/tofu.c:1715
++#: g10/tofu.c:1820
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid "Verified %d message"
- msgid_plural "Verified %d messages"
+ msgid "Verified %d message."
+ msgid_plural "Verified %d messages."
  msgstr[0] "印出訊息摘要"
  
- #: g10/tofu.c:1719
++#: g10/tofu.c:1824
+ #, fuzzy, c-format
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid "Encrypted %d message."
+ msgid_plural "Encrypted %d messages."
+ msgstr[0] "已用 %lu 個密語加密了\n"
+ 
++#: g10/tofu.c:1831
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid "Verified %d message in the future."
+ msgid_plural "Verified %d messages in the future."
+ msgstr[0] "印出訊息摘要"
+ 
++#: g10/tofu.c:1835
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid "Encrypted %d message in the future."
+ msgid_plural "Encrypted %d messages in the future."
+ msgstr[0] "印出訊息摘要"
+ 
++#: g10/tofu.c:1849
  #, c-format
- msgid "Encrypted %d message"
- msgid_plural "Encrypted %d messages"
+ msgid "Messages verified over the past %d day: %d."
+ msgid_plural "Messages verified over the past %d days: %d."
  msgstr[0] ""
  
- #: g10/tofu.c:1734
++#: g10/tofu.c:1855
  #, c-format
- msgid " over the past day."
- msgid_plural " over the past %d days."
+ msgid "Messages encrypted over the past %d day: %d."
+ msgid_plural "Messages encrypted over the past %d days: %d."
  msgstr[0] ""
  
- #: g10/tofu.c:1740
++#: g10/tofu.c:1865
  #, c-format
- msgid " over the past month."
- msgid_plural " over the past %d months."
+ msgid "Messages verified over the past %d month: %d."
+ msgid_plural "Messages verified over the past %d months: %d."
  msgstr[0] ""
  
- #: g10/tofu.c:1746
++#: g10/tofu.c:1871
  #, c-format
- msgid " over the past year."
- msgid_plural " over the past %d years."
+ msgid "Messages encrypted over the past %d month: %d."
+ msgid_plural "Messages encrypted over the past %d months: %d."
  msgstr[0] ""
  
- #: g10/tofu.c:1752
- msgid " in the past."
++#: g10/tofu.c:1881
+ #, c-format
+ msgid "Messages verified over the past %d year: %d."
+ msgid_plural "Messages verified over the past %d years: %d."
+ msgstr[0] ""
+ 
++#: g10/tofu.c:1887
+ #, c-format
+ msgid "Messages encrypted over the past %d year: %d."
+ msgid_plural "Messages encrypted over the past %d years: %d."
+ msgstr[0] ""
+ 
++#: g10/tofu.c:1895
+ #, c-format
+ msgid "Messages verified in the past: %d."
  msgstr ""
  
++#: g10/tofu.c:1899
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid "Messages encrypted in the past: %d."
+ msgstr "印出訊息摘要"
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1767
++#: g10/tofu.c:1916
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1809
++#: g10/tofu.c:1958
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1815
++#: g10/tofu.c:1964
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1823
++#: g10/tofu.c:1972
  msgid "Defaulting to unknown."
  msgstr ""
  
- #: g10/tofu.c:1938 g10/tofu.c:2074
++#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
- #: g10/tofu.c:1994
++#: g10/tofu.c:2143
  #, fuzzy, c-format
  #| msgid "error writing key: %s\n"
  msgid "resetting keydb: %s\n"
  msgstr "寫入金鑰時出錯: %s\n"
  
- #: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
- #: g10/tofu.c:2425
++#: g10/tofu.c:2601
  #, fuzzy, c-format
  #| msgid "error setting OCSP target: %s\n"
- msgid "error setting TOFU binding's trust level to %s\n"
+ msgid "error setting TOFU binding's policy to %s\n"
  msgstr "設定 OCSP 目標時出錯: %s\n"
  
- #: g10/tofu.c:2473
++#: g10/tofu.c:2794
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "error changing TOFU policy: %s\n"
  msgstr "建立管道時出錯: %s\n"
  
- #. TRANSLATORS: The tilde ('~') is used here to indicate a
- #. * non-breakable space
- #: g10/tofu.c:2574
++#: g10/tofu.c:2839
  #, c-format
- msgid "%d~year"
- msgid_plural "%d~years"
+ msgid "%lld~year"
+ msgid_plural "%lld~years"
  msgstr[0] ""
  
- #: g10/tofu.c:2583
++#: g10/tofu.c:2844
  #, c-format
- msgid "%d~month"
- msgid_plural "%d~months"
+ msgid "%lld~month"
+ msgid_plural "%lld~months"
  msgstr[0] ""
  
- #: g10/tofu.c:2592
++#: g10/tofu.c:2849
  #, c-format
- msgid "%d~day"
- msgid_plural "%d~days"
+ msgid "%lld~week"
+ msgid_plural "%lld~weeks"
  msgstr[0] ""
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2854
  #, c-format
- msgid "%d~hour"
- msgid_plural "%d~hours"
+ msgid "%lld~day"
+ msgid_plural "%lld~days"
  msgstr[0] ""
  
- #: g10/tofu.c:2610
++#: g10/tofu.c:2859
  #, c-format
- msgid "%d~minute"
- msgid_plural "%d~minutes"
+ msgid "%lld~hour"
+ msgid_plural "%lld~hours"
  msgstr[0] ""
  
- #: g10/tofu.c:2619
++#: g10/tofu.c:2864
  #, c-format
- msgid "%d~second"
- msgid_plural "%d~seconds"
+ msgid "%lld~minute"
+ msgid_plural "%lld~minutes"
  msgstr[0] ""
  
- #: g10/tofu.c:2802
++#: g10/tofu.c:2866
  #, c-format
- msgid "%s: "
+ msgid "%lld~second"
+ msgid_plural "%lld~seconds"
+ msgstr[0] ""
+ 
++#: g10/tofu.c:3103
+ #, c-format
+ msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:2806
++#: g10/tofu.c:3109
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
- msgid "Verified %ld signatures"
+ msgid "%s: Verified 0 signatures."
  msgstr "已經刪除了 %d 份簽章.\n"
  
- #: g10/tofu.c:2816
++#: g10/tofu.c:3117
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid "Verified %ld signature in the past %s"
- msgid_plural "Verified %ld signatures in the past %s"
+ msgid "%s: Verified %ld~signature in the past %s."
+ msgid_plural "%s: Verified %ld~signatures in the past %s."
  msgstr[0] "印出訊息摘要"
  
- #: g10/tofu.c:2826
- #, fuzzy, c-format
++#: g10/tofu.c:3127
+ #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
- msgid ", and encrypted %ld messages"
+ msgid "Encrypted 0 messages."
  msgstr "已用 %lu 個密語加密了\n"
  
- #: g10/tofu.c:2835
++#: g10/tofu.c:3135
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid ", and encrypted %ld message in the past %s"
- msgid_plural ", and encrypted %ld messages in the past %s"
+ msgid "Encrypted %ld~message in the past %s."
+ msgid_plural "Encrypted %ld~messages in the past %s."
  msgstr[0] "印出訊息摘要"
  
- #: g10/tofu.c:2880
++#: g10/tofu.c:3146
+ #, fuzzy, c-format
+ #| msgid "validity: %s"
+ msgid "(policy: %s)"
+ msgstr "有效性: %s"
+ 
++#: g10/tofu.c:3177
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2883
++#: g10/tofu.c:3180
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2887
++#: g10/tofu.c:3184
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2890
++#: g10/tofu.c:3187
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2919
++#: g10/tofu.c:3216
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7125,19 -5647,15 +7159,19 @@@ msgid_plural "
  "to mark it as being bad.\n"
  msgstr[0] ""
  
- #: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
- #: g10/tofu.c:3480 g10/tofu.c:3572
++#: g10/tofu.c:3298 g10/tofu.c:3449 g10/tofu.c:3627 g10/tofu.c:3670
++#: g10/tofu.c:3784 g10/tofu.c:3859 g10/tofu.c:3894
  #, fuzzy, c-format
  #| msgid "error sending data: %s\n"
  msgid "error opening TOFU database: %s\n"
  msgstr "送出資料時出錯: %s\n"
  
- #: g10/tofu.c:3185
++#: g10/tofu.c:3482
  #, c-format
- msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
  msgstr ""
  
- #: g10/tofu.c:3515
++#: g10/tofu.c:3819
  #, fuzzy, c-format
  #| msgid "error writing public keyring '%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7168,96 -5681,77 +7202,96 @@@ msgstr "金鑰 %s: 受信任的金鑰�
  msgid "key %s marked as ultimately trusted\n"
  msgstr "金鑰 %s 已標記成徹底信任了\n"
  
- #: g10/trustdb.c:341
++#: g10/trustdb.c:348
  #, c-format
  msgid "trust record %lu, req type %d: read failed: %s\n"
  msgstr "信任記錄 %lu, 請求類別 %d: 讀取失敗: %s\n"
  
- #: g10/trustdb.c:347
++#: g10/trustdb.c:354
  #, c-format
  msgid "trust record %lu is not of requested type %d\n"
  msgstr "信任記錄 %lu 不是所請求的類別 %d\n"
  
- #: g10/trustdb.c:422
++#: g10/trustdb.c:429
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr "你可以試著用下列指令來重建信任資料庫:\n"
  
- #: g10/trustdb.c:431
++#: g10/trustdb.c:438
  msgid "If that does not work, please consult the manual\n"
  msgstr "如果行不通的話, 請查閱手冊\n"
  
- #: g10/trustdb.c:468
++#: g10/trustdb.c:475
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr "無法使用未知的信任模型 (%d) - 現在採用 %s 信任模型\n"
  
- #: g10/trustdb.c:474
++#: g10/trustdb.c:481
  #, c-format
  msgid "using %s trust model\n"
  msgstr "正在使用 %s 信任模型\n"
  
- #: g10/trustdb.c:511
++#: g10/trustdb.c:518
  msgid "no need for a trustdb check\n"
  msgstr "不需要檢查信任資料庫\n"
  
- #: g10/trustdb.c:517 g10/trustdb.c:2160
++#: g10/trustdb.c:524 g10/trustdb.c:2187
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "下次信任資料庫檢查將於 %s 進行\n"
  
- #: g10/trustdb.c:526
++#: g10/trustdb.c:533
  #, c-format
  msgid "no need for a trustdb check with '%s' trust model\n"
  msgstr "在 '%s' 信任模型中並不需要檢查信任資料庫\n"
  
- #: g10/trustdb.c:542
++#: g10/trustdb.c:549
  #, c-format
  msgid "no need for a trustdb update with '%s' trust model\n"
  msgstr "在 '%s' 信任模型中並不需要更新信任資料庫\n"
  
- #: g10/trustdb.c:749 g10/trustdb.c:1313
++#: g10/trustdb.c:756 g10/trustdb.c:1340
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "找不到公鑰 %s: %s\n"
  
- #: g10/trustdb.c:966
++#: g10/trustdb.c:973
  msgid "please do a --check-trustdb\n"
  msgstr "請做一次 --check-trustdb\n"
  
- #: g10/trustdb.c:971
++#: g10/trustdb.c:978
  msgid "checking the trustdb\n"
  msgstr "正在檢查信任資料庫\n"
  
- #: g10/trustdb.c:1883
++#: g10/trustdb.c:1910
  #, 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:1886
++#: g10/trustdb.c:1913
  #, 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:1956
++#: g10/trustdb.c:1983
  msgid "no ultimately trusted keys found\n"
  msgstr "沒有找到任何徹底信任的金鑰\n"
  
- #: g10/trustdb.c:1970
++#: g10/trustdb.c:1997
  #, c-format
  msgid "public key of ultimately trusted key %s not found\n"
  msgstr "找不到徹底信任金鑰 %s 的公鑰\n"
  
- #: g10/trustdb.c:2087
++#: g10/trustdb.c:2114
  #, 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:2167
++#: g10/trustdb.c:2194
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr "無法更新信任資料庫版本記錄: 寫入失敗: %s\n"
@@@ -7376,19 -5849,14 +7410,19 @@@ msgstr "
  "語法: kbxutil [選項] [檔案]\n"
  "列出, 匯出, 匯入金鑰鑰匙盒資料\n"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3208
++#: scd/app-nks.c:718 scd/app-openpgp.c:3221
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr "RSA 模組缺漏或者並非 %d 位元大\n"
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3220
++#: scd/app-nks.c:726 scd/app-openpgp.c:3233
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr "RSA 公用指數缺漏或者大於 %d 位元\n"
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
- #: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
- #: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1965 scd/app-openpgp.c:1984
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2166 scd/app-openpgp.c:2430
++#: scd/app-openpgp.c:2477 scd/app-openpgp.c:2582 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "收回個人識別碼 (PIN) 時傳回錯誤: %s\n"
@@@ -7433,83 -5892,65 +7467,83 @@@ msgid "
  "qualified signatures."
  msgstr "|P|請輸入金鑰的 PIN 重設碼 (PUK) 以建立完善的簽章."
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2511 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "取得新的個人識別碼 (PIN) 時出錯: %s\n"
  
- #: scd/app-openpgp.c:806
++#: scd/app-openpgp.c:801
  #, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "存放指紋失敗: %s\n"
  
- #: scd/app-openpgp.c:819
++#: scd/app-openpgp.c:814
  #, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "存放創生日期失敗: %s\n"
  
- #: scd/app-openpgp.c:1236
++#: scd/app-openpgp.c:1247
  msgid "response does not contain the RSA modulus\n"
  msgstr "回應中未包含 RSA 系數\n"
  
- #: scd/app-openpgp.c:1243
++#: scd/app-openpgp.c:1254
  msgid "response does not contain the RSA public exponent\n"
  msgstr "回應中未包含 RSA 公用指數\n"
  
- #: scd/app-openpgp.c:1353
++#: scd/app-openpgp.c:1364
  #, fuzzy
  #| msgid "response does not contain the EC public point\n"
  msgid "response does not contain the EC public key\n"
  msgstr "回應中未包含 EC 公用指數\n"
  
- #: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:1464 scd/app-openpgp.c:3825
  msgid "response does not contain the public key data\n"
  msgstr "回應中未包含公鑰資料\n"
  
- #: scd/app-openpgp.c:1551
++#: scd/app-openpgp.c:1564
  #, c-format
  msgid "reading public key failed: %s\n"
  msgstr "讀取公鑰時失敗: %s\n"
  
- #: scd/app-openpgp.c:1903
++#: scd/app-openpgp.c:1916
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr "以 %s 做為預設 PIN\n"
  
- #: scd/app-openpgp.c:1910
++#: scd/app-openpgp.c:1923
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr "使用 %s 做為預設個人識別碼 (PIN) 失敗: %s - 正在停用之後的預設使用\n"
  
- #: scd/app-openpgp.c:1925
++#: scd/app-openpgp.c:1938
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr "||請輸入 PIN%%0A[簽署完成: %lu]"
  
- #: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
++#: scd/app-openpgp.c:1949 scd/app-openpgp.c:2424
  msgid "||Please enter the PIN"
  msgstr "||請輸入個人識別碼 (PIN)"
  
- #: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2173 scd/app-openpgp.c:2437
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr "用於 CHV%d 的個人識別碼 (PIN) 太短; 長度最少要有 %d\n"
  
- #: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
- #: scd/app-openpgp.c:4114
++#: scd/app-openpgp.c:2004 scd/app-openpgp.c:2043 scd/app-openpgp.c:2185
++#: scd/app-openpgp.c:4126
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "驗證 CHV%d 失敗: %s\n"
  
- #: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
++#: scd/app-openpgp.c:2072 scd/app-openpgp.c:2458 scd/app-openpgp.c:4556
  msgid "error retrieving CHV status from card\n"
  msgstr "從卡片取回 CHV 狀態時出錯\n"
  
- #: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
++#: scd/app-openpgp.c:2078 scd/app-openpgp.c:4565
  msgid "card is permanently locked!\n"
  msgstr "卡片永久鎖定了!!\n"
  
- #: scd/app-openpgp.c:2072
++#: scd/app-openpgp.c:2085
  #, fuzzy, c-format
  #| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@@ -7519,24 -5960,19 +7553,24 @@@ msgstr[0] "%d 管理者個人識別碼 
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:2082
++#: scd/app-openpgp.c:2095
  #, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "|A|請在上輸入管理者 PIN%%0A[剩餘嘗試次數: %d]"
  
- #: scd/app-openpgp.c:2086
++#: scd/app-openpgp.c:2099
  msgid "|A|Please enter the Admin PIN"
  msgstr "|A|請輸入管理者 PIN"
  
- #: scd/app-openpgp.c:2107
++#: scd/app-openpgp.c:2120
  msgid "access to admin commands is not configured\n"
  msgstr "管理者指令存取權限尚未組態\n"
  
- #: scd/app-openpgp.c:2460
++#: scd/app-openpgp.c:2473
  msgid "||Please enter the Reset Code for the card"
  msgstr "||請輸入卡片的重設碼"
  
- #: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
++#: scd/app-openpgp.c:2483 scd/app-openpgp.c:2537
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr "重設碼太短; 長度最少要有 %d\n"
@@@ -7544,109 -5980,85 +7578,109 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2493
++#: scd/app-openpgp.c:2506
  msgid "|RN|New Reset Code"
  msgstr "|RN|新增重設碼"
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|AN|New Admin PIN"
  msgstr "|AN|新增管理者個人識別碼 (PIN)"
  
- #: scd/app-openpgp.c:2494
++#: scd/app-openpgp.c:2507
  msgid "|N|New PIN"
  msgstr "|N|新增個人識別碼 (PIN)"
  
- #: scd/app-openpgp.c:2565
++#: scd/app-openpgp.c:2578
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "||請輸入管理者 PIN 及新的管理者 PIN"
  
- #: scd/app-openpgp.c:2566
++#: scd/app-openpgp.c:2579
  msgid "||Please enter the PIN and New PIN"
  msgstr "||請輸入個人識別碼及新的個人識別碼 (PIN)"
  
- #: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
++#: scd/app-openpgp.c:2635 scd/app-openpgp.c:3885
  msgid "error reading application data\n"
  msgstr "讀取應用程式資料時出錯\n"
  
- #: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
++#: scd/app-openpgp.c:2641 scd/app-openpgp.c:3892
  msgid "error reading fingerprint DO\n"
  msgstr "讀取指紋 DO 時出錯\n"
  
- #: scd/app-openpgp.c:2638
++#: scd/app-openpgp.c:2651
  msgid "key already exists\n"
  msgstr "金鑰已存在\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2655
  msgid "existing key will be replaced\n"
  msgstr "既有的金鑰將被取代\n"
  
- #: scd/app-openpgp.c:2644
++#: scd/app-openpgp.c:2657
  msgid "generating new key\n"
  msgstr "正在產生新的金鑰\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2659
  msgid "writing new key\n"
  msgstr "正在寫入新的金鑰\n"
  
- #: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
++#: scd/app-openpgp.c:3201 scd/app-openpgp.c:3553
  msgid "creation timestamp missing\n"
  msgstr "缺漏創生時間戳印\n"
  
- #: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
++#: scd/app-openpgp.c:3243 scd/app-openpgp.c:3251
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr "RSA 質數 %s 缺漏或者並非 %d 位元大\n"
  
- #: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
++#: scd/app-openpgp.c:3384 scd/app-openpgp.c:3647
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "存放金鑰失敗: %s\n"
  
- #: scd/app-openpgp.c:3534
++#: scd/app-openpgp.c:3547
  #, fuzzy
  #| msgid "unsupported inquiry '%s'\n"
  msgid "unsupported curve\n"
  msgstr "未支援的查詢 '%s'\n"
  
- #: scd/app-openpgp.c:3790
++#: scd/app-openpgp.c:3802
  msgid "please wait while key is being generated ...\n"
  msgstr "正在產生金鑰中, 請稍候 ...\n"
  
- #: scd/app-openpgp.c:3798
++#: scd/app-openpgp.c:3810
  msgid "generating key failed\n"
  msgstr "產生金鑰時失敗\n"
  
- #: scd/app-openpgp.c:3804
++#: scd/app-openpgp.c:3816
  #, fuzzy, c-format
  #| msgid "key generation completed (%d seconds)\n"
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
  msgstr[0] "金鑰產生完畢 (%d 秒)\n"
  
- #: scd/app-openpgp.c:3838
++#: scd/app-openpgp.c:3850
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "無效的 OpenPGP 卡片結構 (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:3900
  msgid "fingerprint on card does not match requested one\n"
  msgstr "卡片上的指紋與所要求的那個並不吻合\n"
  
- #: scd/app-openpgp.c:4004
++#: scd/app-openpgp.c:4016
  #, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "卡片不支援 %s 摘要演算法\n"
  
- #: scd/app-openpgp.c:4089
++#: scd/app-openpgp.c:4101
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "目前建立的簽章: %lu\n"
  
- #: scd/app-openpgp.c:4551
++#: scd/app-openpgp.c:4570
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr "目前在此指令中的管理者 PIN 驗證被禁止了\n"
  
- #: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
++#: scd/app-openpgp.c:4871 scd/app-openpgp.c:4882
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\n"
@@@ -7666,7 -6075,6 +7700,7 @@@ msgstr "|N|開始新增個人識別碼 
  msgid "run in multi server mode (foreground)"
  msgstr "以多重伺服器模式執行 (前景)"
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|等級|設定除錯等級為指定等級"
  
@@@ -7706,11 -6105,9 +7740,11 @@@ msgstr "禁用管理者卡片指令
  msgid "use variable length input for pinpad"
  msgstr "輸入 PIN 時在輸入區顯示成變動長度"
  
- #: scd/scdaemon.c:287
++#: scd/scdaemon.c:286
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "用法: @SCDAEMON@ [選項] (或用 -h 求助)"
  
- #: scd/scdaemon.c:289
++#: scd/scdaemon.c:288
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
@@@ -7718,16 -6115,13 +7752,16 @@@ msgstr "
  "語法: scdaemon [選項] [指令 [引數]]\n"
  "@GNUPG@ 智慧卡服務\n"
  
- #: scd/scdaemon.c:786
++#: scd/scdaemon.c:784
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr "請使用 '--daemon' 選項來將此程式執行於背景\n"
  
- #: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1904
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "用於 fd %d 的經手程式已啟動\n"
  
- #: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
++#: scd/scdaemon.c:1170 dirmngr/dirmngr.c:1909
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "用於 fd %d 的經手程式已終止\n"
@@@ -7805,9 -6183,6 +7839,9 @@@ msgstr "吻合的憑證數量: %d\n
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "尋找限於 dirmngr 快取的金鑰時失敗: %s\n"
  
- #: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:264
 +#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  msgid "failed to allocate keyDB handle\n"
  msgstr "配置 keyDB 代號失敗\n"
  
@@@ -8274,11 -6547,9 +8308,11 @@@ msgstr "準備好了.  你現在就該�
  msgid "resource problem: out of core\n"
  msgstr "資源問題: 超出核心\n"
  
- #: sm/decrypt.c:330
++#: sm/decrypt.c:332
  msgid "(this is the RC2 algorithm)\n"
  msgstr "(這是 RC2 演算法)\n"
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:334
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr "(這看起來不像是個加密過的訊息)\n"
  
@@@ -8319,115 -6582,87 +8353,115 @@@ msgstr "列出外部金鑰
  msgid "list certificate chain"
  msgstr "列出憑證鏈"
  
- #: sm/gpgsm.c:218
++#: sm/gpgsm.c:219
  msgid "import certificates"
  msgstr "匯入憑證"
  
- #: sm/gpgsm.c:219
++#: sm/gpgsm.c:220
  msgid "export certificates"
  msgstr "匯出憑證"
  
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:228
  msgid "register a smartcard"
  msgstr "註冊智慧卡"
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:231
  msgid "pass a command to the dirmngr"
  msgstr "將指令遞送給 dirmngr"
  
- #: sm/gpgsm.c:232
++#: sm/gpgsm.c:233
  msgid "invoke gpg-protect-tool"
  msgstr "叫用 gpg-protect-tool"
  
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:250
  msgid "create base-64 encoded output"
  msgstr "建立以 base-64 編碼過的輸出"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in PEM format"
  msgstr "假設輸入的是 PEM 格式"
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in base-64 format"
  msgstr "假設輸入的是 base-64 格式"
  
- #: sm/gpgsm.c:260
++#: sm/gpgsm.c:262
  msgid "assume input is in binary format"
  msgstr "假設輸入的是二進制格式"
  
- #: sm/gpgsm.c:267
++#: sm/gpgsm.c:269
  msgid "never consult a CRL"
  msgstr "永遠不要查閱 CRL"
  
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:279
  msgid "check validity using OCSP"
  msgstr "用 OCSP 檢查有效性"
  
- #: sm/gpgsm.c:282
++#: sm/gpgsm.c:284
  msgid "|N|number of certificates to include"
  msgstr "|N|要包含的憑證數量"
  
- #: sm/gpgsm.c:285
++#: sm/gpgsm.c:287
  msgid "|FILE|take policy information from FILE"
  msgstr "|檔案|從指定檔案中取得原則資訊"
  
- #: sm/gpgsm.c:288
++#: sm/gpgsm.c:290
  msgid "do not check certificate policies"
  msgstr "不要檢查憑證原則"
  
- #: sm/gpgsm.c:292
++#: sm/gpgsm.c:294
  msgid "fetch missing issuer certificates"
  msgstr "取回遺失的發行者憑證"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "don't use the terminal at all"
  msgstr "完全不要使用終端機"
  
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:307
  msgid "|FILE|write a server mode log to FILE"
  msgstr "|檔案|將伺服器模式日誌寫入至指定檔案"
  
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:312
  msgid "|FILE|write an audit log to FILE"
  msgstr "|檔案|將稽核日誌寫入至指定檔案"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "batch mode: never ask"
  msgstr "批次模式: 永遠不詢問"
  
- #: sm/gpgsm.c:314
++#: sm/gpgsm.c:316
  msgid "assume yes on most questions"
  msgstr "假設大部分的問題都回答是"
  
- #: sm/gpgsm.c:315
++#: sm/gpgsm.c:317
  msgid "assume no on most questions"
  msgstr "假設大部分的問題都回答否"
  
- #: sm/gpgsm.c:318
++#: sm/gpgsm.c:320
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "|檔案|將此金鑰鑰匙圈加到指定金鑰鑰匙圈清單檔案中"
  
- #: sm/gpgsm.c:321
++#: sm/gpgsm.c:323
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|使用者-ID|使用指定使用者 ID 做為預設私鑰"
  
- #: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|SPEC|使用此金鑰伺服器來查找金鑰"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|名稱|使用指定名稱的編密演算法"
  
- #: sm/gpgsm.c:350
++#: sm/gpgsm.c:352
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|名稱|使用指定名稱的訊息摘要演算法"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:559
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
  msgstr "用法: @GPGSM@ [選項] [檔案] (或用 -h 求助)"
  
- #: sm/gpgsm.c:570
++#: sm/gpgsm.c:562
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
  "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@@ -8437,46 -6672,37 +8471,46 @@@ msgstr "
  "用 S/MIME 協定來簽署, 檢查, 加密, 解密\n"
  "預設的操作會依輸入資料而定\n"
  
- #: sm/gpgsm.c:774
++#: sm/gpgsm.c:766
  #, c-format
  msgid "Note: won't be able to encrypt to '%s': %s\n"
  msgstr "請注意: 將無法加密為 '%s': %s\n"
  
- #: sm/gpgsm.c:785
++#: sm/gpgsm.c:777
  #, c-format
  msgid "unknown validation model '%s'\n"
  msgstr "未知的驗證模型 '%s'\n"
  
- #: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
  #, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "%s:%u: 沒有給定主機名稱\n"
  
- #: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr "%s:%u: 給定的密碼沒有使用者\n"
  
- #: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
  #, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr "%s:%u: 正在跳過這一列\n"
  
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1427
  msgid "could not parse keyserver\n"
  msgstr "無法剖析金鑰伺服器\n"
  
- #: sm/gpgsm.c:1636
++#: sm/gpgsm.c:1630
  #, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "正在匯入通用憑證 '%s'\n"
  
- #: sm/gpgsm.c:1677
++#: sm/gpgsm.c:1671
  #, c-format
  msgid "can't sign using '%s': %s\n"
  msgstr "無法用 '%s' 來簽署: %s\n"
  
- #: sm/gpgsm.c:2033
++#: sm/gpgsm.c:2028
  msgid "invalid command (there is no implicit command)\n"
  msgstr "無效的指令 (沒有這樣的指令)\n"
  
@@@ -9217,8 -7292,6 +9251,8 @@@ msgstr "正改以 \"http\" 代替 \"htt
  msgid "CRL access not possible due to disabled %s\n"
  msgstr "不可能存取 CRL 因已停用 %s\n"
  
 +#: dirmngr/crlfetch.c:223 dirmngr/ldap-wrapper-ce.c:488
- #: dirmngr/ldap-wrapper.c:742 dirmngr/misc.c:563
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:563
  #, c-format
  msgid "error initializing reader object: %s\n"
  msgstr "啟始讀取程式物件時出錯: %s\n"
@@@ -9389,112 -7426,84 +9423,112 @@@ msgstr "應該要有絕對檔名\n
  msgid "looking up '%s'\n"
  msgstr "正在查找 '%s'\n"
  
- #: dirmngr/dirmngr.c:157
++#: dirmngr/dirmngr.c:160
  msgid "list the contents of the CRL cache"
  msgstr "列出 CRL 快取的內容"
  
- #: dirmngr/dirmngr.c:158
++#: dirmngr/dirmngr.c:161
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|檔案|從指定檔案載入 CRL 至快取"
  
- #: dirmngr/dirmngr.c:159
++#: dirmngr/dirmngr.c:162
  msgid "|URL|fetch a CRL from URL"
  msgstr "|網址|從指定網址取得 CRL"
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:163
  msgid "shutdown the dirmngr"
  msgstr "關閉 dirmngr"
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:164
  msgid "flush the cache"
  msgstr "清除快取"
  
- #: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
- #: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
++#: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|檔案|將伺服器模式日誌寫入至指定檔案"
  
- #: dirmngr/dirmngr.c:177
++#: dirmngr/dirmngr.c:180
  msgid "run without asking a user"
  msgstr "以不詢問使用者的方式執行"
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:181
  msgid "force loading of outdated CRLs"
  msgstr "強迫載入過時的 CRL"
  
- #: dirmngr/dirmngr.c:179
++#: dirmngr/dirmngr.c:182
  msgid "allow sending OCSP requests"
  msgstr "允許送出 OCSP 請求"
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:184
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:185
  msgid "inhibit the use of HTTP"
  msgstr "避免使用 HTTP"
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:186
  msgid "inhibit the use of LDAP"
  msgstr "避免使用 LDAP"
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:188
  msgid "ignore HTTP CRL distribution points"
  msgstr "忽略 HTTP CRL 分布點"
  
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
  msgid "ignore LDAP CRL distribution points"
  msgstr "忽略 LDAP CRL 分布點"
  
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:192
  msgid "ignore certificate contained OCSP service URLs"
  msgstr "忽略含有 OCSP 伺服器網址的憑證"
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr "|網址|重新導向所有對指定網址提出的 HTTP 請求"
  
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
  msgid "|HOST|use HOST for LDAP queries"
  msgstr "|主機|指定 LDAP 查詢主機"
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr "不要將主機備案與 --ldap-proxy 並用"
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:202
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|檔案|從指定檔案讀取 LDAP 伺服器清單"
  
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr "將從 CRL 分布點發現的新伺服器加入至伺服器清單"
  
- #: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr "|N|把 LDAP 逾時設成 N 秒"
  
- #: dirmngr/dirmngr.c:207
++#: dirmngr/dirmngr.c:210
  msgid "|URL|use OCSP responder at URL"
  msgstr "|網址|使用位於指定網址的 OCSP 回應程式"
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:212
  msgid "|FPR|OCSP response signed by FPR"
  msgstr "|FPR|由 FPR 簽署的 OCSP 回應"
  
- #: dirmngr/dirmngr.c:215
++#: dirmngr/dirmngr.c:218
  msgid "|N|do not return more than N items in one query"
  msgstr "|N|單次查詢不要傳回超過 N 筆項目"
  
- #: dirmngr/dirmngr.c:220
++#: dirmngr/dirmngr.c:223
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr "|檔案|在 HKP over TLS 的指定檔案中使用 CA 憑證"
  
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:225
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:240
++#: dirmngr/dirmngr.c:246
  msgid ""
  "@\n"
  "(See the \"info\" manual for a complete listing of all commands and "
@@@ -9503,11 -7512,9 +9537,11 @@@ msgstr "
  "@\n"
  "(請參照「資訊」手冊來取得所有命令和選項的完整清單)\n"
  
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:361
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "用法: @DIRMNGR@ [選項] (或用 -h 求助)"
  
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:363
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9515,77 -7522,60 +9549,77 @@@ msgstr "
  "語法: @DIRMNGR@ [選項] [指令 [引數]]\n"
  "@GNUPG@ 的金鑰伺服器, CRL, OCSP 存取\n"
  
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:443
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr "有效的除錯等級為: %s\n"
  
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
- #: tools/gpgconf.c:648
++#: dirmngr/dirmngr.c:496 tools/gpgconf.c:550 tools/gpgconf.c:585
++#: tools/gpgconf.c:656
  #, c-format
  msgid "usage: %s [options] "
  msgstr "用法: %s [選項] "
  
- #: dirmngr/dirmngr.c:1062
++#: dirmngr/dirmngr.c:1074
  msgid "colons are not allowed in the socket name\n"
  msgstr "socket 名稱內不允許使用冒號\n"
  
- #: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
++#: dirmngr/dirmngr.c:1300 dirmngr/server.c:1585
  #, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "從 '%s' 取回 CRL 時失敗: %s\n"
  
- #: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
++#: dirmngr/dirmngr.c:1306 dirmngr/server.c:1591
  #, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "從 '%s' 處理 CRL 時失敗: %s\n"
  
- #: dirmngr/dirmngr.c:1484
++#: dirmngr/dirmngr.c:1487
  #, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "%s:%u: 列太長 - 已跳過\n"
  
- #: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
++#: dirmngr/dirmngr.c:1542 dirmngr/dirmngr.c:1626
  #, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "%s:%u: 偵測到無效的指紋\n"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
++#: dirmngr/dirmngr.c:1578 dirmngr/dirmngr.c:1604 tools/gpgconf-comp.c:4032
  #, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "%s:%u: 讀取錯誤: %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1633
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr "%s:%u: 列尾的垃圾已忽略\n"
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1700
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr "收到 SIGHUP - 正在重新讀取組態並清除快取\n"
  
- #: dirmngr/dirmngr.c:1734
++#: dirmngr/dirmngr.c:1738
  msgid "SIGUSR2 received - no action defined\n"
  msgstr "收到 SIGUSR2 - 無定義行動\n"
  
- #: dirmngr/dirmngr.c:1739
++#: dirmngr/dirmngr.c:1743
  msgid "SIGTERM received - shutting down ...\n"
  msgstr "收到 SIGTERM - 正在關閉 ...\n"
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1745
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr "收到 SIGTERM - 還有 %d 個使用中的連線\n"
  
- #: dirmngr/dirmngr.c:1746
++#: dirmngr/dirmngr.c:1750
  msgid "shutdown forced\n"
  msgstr "已強迫關閉\n"
  
- #: dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1758
  msgid "SIGINT received - immediate shutdown\n"
  msgstr "收到 SIGINT - 立即關閉\n"
  
- #: dirmngr/dirmngr.c:1761
++#: dirmngr/dirmngr.c:1765
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr "收到訊號 %d - 無定義行動\n"
@@@ -10050,32 -7941,26 +10084,32 @@@ msgstr "fetch_next_cert 失敗: %s\n
  msgid "max_replies %d exceeded\n"
  msgstr "max_replies %d 已超出\n"
  
- #: dirmngr/server.c:2463
++#: dirmngr/server.c:2469
  #, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "無法配置控制結構: %s\n"
  
- #: dirmngr/server.c:2474
++#: dirmngr/server.c:2480
  #, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "配置 assuan 脈絡失敗: %s\n"
  
- #: dirmngr/server.c:2495
++#: dirmngr/server.c:2501
  #, c-format
  msgid "failed to initialize the server: %s\n"
  msgstr "伺服器啟始失敗: %s\n"
  
- #: dirmngr/server.c:2503
++#: dirmngr/server.c:2509
  #, c-format
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "向 Assuan 註冊指令時失敗: %s\n"
  
- #: dirmngr/server.c:2534
++#: dirmngr/server.c:2540
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr "Assuan 接受問題: %s\n"
  
- #: dirmngr/server.c:2553
++#: dirmngr/server.c:2559
  #, c-format
  msgid "Assuan processing failed: %s\n"
  msgstr "Assuan 處理時失敗: %s\n"
@@@ -10117,7 -7993,6 +10151,7 @@@ msgstr "DSA 要求使用 160 位元的�
  msgid "certificate should not have been used for CRL signing\n"
  msgstr "憑證應該還未被用於 CRL 簽署\n"
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:167
  msgid "quiet"
  msgstr "安靜模式"
  
@@@ -10208,22 -8063,15 +10242,22 @@@ msgstr "送出列時失敗: %s\n
  msgid "error sending standard options: %s\n"
  msgstr "送出標準選項時出錯: %s\n"
  
 +#: tools/gpgconf-comp.c:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
- #: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
++#: tools/gpgconf-comp.c:766 tools/gpgconf-comp.c:865
  msgid "Options controlling the diagnostic output"
  msgstr "控制著診斷性輸出的選項"
  
 +#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
- #: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
++#: tools/gpgconf-comp.c:779 tools/gpgconf-comp.c:888
  msgid "Options controlling the configuration"
  msgstr "控制著組態的選項"
  
- #: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
- #: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
++#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:723
++#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:901
  msgid "Options useful for debugging"
  msgstr "對除錯有幫助的選項"
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
  msgid "Options controlling the security"
  msgstr "控制著安全性的選項"
  
@@@ -10273,11 -8110,9 +10307,11 @@@ msgstr "不允許重複使用舊密語
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr "|N|把 LDAP 逾時設成 N 秒"
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
++#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
  msgid "|NAME|use NAME as default secret key"
  msgstr "|名字|使用指定名字做為預設私鑰"
  
- #: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
++#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:784
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|名字|也加密給指定名字的使用者 ID"
  
@@@ -10285,180 -8119,154 +10319,198 @@@
  msgid "|SPEC|set up email aliases"
  msgstr "|SPEC|設定電子郵件別名"
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
++#: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
  msgid "Configuration for Keyservers"
  msgstr "金鑰伺服器組態"
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
++#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
  msgid "|URL|use keyserver at URL"
  msgstr "|URL|使用位於 URL 的金鑰伺服器"
  
- #: tools/gpgconf-comp.c:735
++#: tools/gpgconf-comp.c:741
  msgid "allow PKA lookups (DNS requests)"
  msgstr "允許 PKA 查找 (DNS 請求)"
  
- #: tools/gpgconf-comp.c:738
++#: tools/gpgconf-comp.c:744
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr "|MECHANISMS|使用 MECHANISMS 機制來從郵件地址找出金鑰"
  
- #: tools/gpgconf-comp.c:787
++#: tools/gpgconf-comp.c:793
  msgid "disable all access to the dirmngr"
  msgstr "停用所有的 dirmngr 存取"
  
- #: tools/gpgconf-comp.c:790
++#: tools/gpgconf-comp.c:796
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
  msgstr "|名稱|將指定名稱的編碼用於 PKCS#12 密語"
  
- #: tools/gpgconf-comp.c:820
++#: tools/gpgconf-comp.c:829
  msgid "do not check CRLs for root certificates"
  msgstr "不要為根憑證檢查 CRL"
  
- #: tools/gpgconf-comp.c:869
++#: tools/gpgconf-comp.c:878
  msgid "Options controlling the format of the output"
  msgstr "控制著輸出格式的選項"
  
- #: tools/gpgconf-comp.c:905
++#: tools/gpgconf-comp.c:920
  msgid "Options controlling the interactivity and enforcement"
  msgstr "控制著互動及強制執行的選項"
  
- #: tools/gpgconf-comp.c:918
++#: tools/gpgconf-comp.c:933
  #, fuzzy
  #| msgid "Options controlling the security"
  msgid "Options controlling the use of Tor"
  msgstr "控制著安全性的選項"
  
- #: tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:947
  msgid "Configuration for HTTP servers"
  msgstr "HTTP 伺服器組態"
  
- #: tools/gpgconf-comp.c:943
++#: tools/gpgconf-comp.c:958
  msgid "use system's HTTP proxy setting"
  msgstr "使用系統的 HTTP 代理伺服器設定"
  
- #: tools/gpgconf-comp.c:948
++#: tools/gpgconf-comp.c:963
  msgid "Configuration of LDAP servers to use"
  msgstr "要用的 LDAP 伺服器組態"
  
- #: tools/gpgconf-comp.c:977
++#: tools/gpgconf-comp.c:992
  msgid "LDAP server list"
  msgstr "LDAP 伺服器清單"
  
- #: tools/gpgconf-comp.c:985
++#: tools/gpgconf-comp.c:1000
  msgid "Configuration for OCSP"
  msgstr "OCSP 組態"
  
- #: tools/gpgconf-comp.c:1066
++#: tools/gpgconf-comp.c:1081
  #, fuzzy
  #| msgid "GPG for OpenPGP"
  msgid "OpenPGP"
  msgstr "OpenPGP 版 GPG"
  
- #: tools/gpgconf-comp.c:1067
++#: tools/gpgconf-comp.c:1082
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1083
  #, fuzzy
  #| msgid "Smartcard Daemon"
  msgid "Smartcards"
  msgstr "智慧卡服務"
  
- #: tools/gpgconf-comp.c:1069
++#: tools/gpgconf-comp.c:1084
  #, fuzzy
  #| msgid "GPG for S/MIME"
  msgid "S/MIME"
  msgstr "S/MIME 版 GPG"
  
- #: tools/gpgconf-comp.c:1070
++#: tools/gpgconf-comp.c:1085
  msgid "Network"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1071
++#: tools/gpgconf-comp.c:1086
  #, fuzzy
  #| msgid "PIN and Passphrase Entry"
  msgid "Passphrase Entry"
  msgstr "個人識別碼及密語項目"
  
- #: tools/gpgconf-comp.c:1225
++#: tools/gpgconf-comp.c:1240
  msgid "Component not suitable for launching"
  msgstr "元件不適合啟動"
  
- #: tools/gpgconf-comp.c:3283
++#: tools/gpgconf-comp.c:3311
  #, c-format
  msgid "External verification of component %s failed"
  msgstr "元件 %s 的外部驗證失敗"
  
- #: tools/gpgconf-comp.c:3434
++#: tools/gpgconf-comp.c:3462
  msgid "Note that group specifications are ignored\n"
  msgstr "請注意群組規格已忽略\n"
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf-comp.c:4036
+ #, fuzzy, c-format
+ #| msgid "error closing '%s': %s\n"
+ msgid "error closing '%s'\n"
+ msgstr "關閉 '%s' 時出錯: %s\n"
+ 
++#: tools/gpgconf-comp.c:4038
+ #, fuzzy, c-format
+ #| msgid "error hashing '%s': %s\n"
+ msgid "error parsing '%s'\n"
+ msgstr "計算 '%s' 的雜湊時出錯: %s\n"
+ 
++#: tools/gpgconf.c:73
  msgid "list all components"
  msgstr "列出所有的元件"
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "check all programs"
  msgstr "檢查所有的程式"
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|list options"
  msgstr "|元件|列出選項"
  
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
  msgid "|COMPONENT|change options"
  msgstr "|元件|變更選項"
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "|COMPONENT|check options"
  msgstr "|元件|檢查選項"
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "apply global default values"
  msgstr "套用全域預設值"
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
+ #, fuzzy
+ #| msgid "|FILE|take policy information from FILE"
+ msgid "|FILE|update configuration files using FILE"
+ msgstr "|檔案|從指定檔案中取得原則資訊"
+ 
++#: tools/gpgconf.c:83
  msgid "get the configuration directories for @GPGCONF@"
  msgstr "取得 @GPGCONF@ 的組態目錄"
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:85
  msgid "list global configuration file"
  msgstr "列出全域組態檔"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  msgid "check global configuration file"
  msgstr "檢查全域組態檔案"
  
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:89
  #, fuzzy
  #| msgid "update the trust database"
  msgid "query the software version database"
  msgstr "更新信任資料庫"
  
- #: tools/gpgconf.c:86
++#: tools/gpgconf.c:90
  msgid "reload all or a given component"
  msgstr "重新載入所有或給定的元件"
  
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:91
  msgid "launch a given component"
  msgstr "啟動給定的元件"
  
- #: tools/gpgconf.c:88
++#: tools/gpgconf.c:92
  msgid "kill a given component"
  msgstr "刪除給定的元件"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "use as output file"
  msgstr "當作輸出檔案來使用"
  
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:102
  msgid "activate changes at runtime, if possible"
  msgstr "如果可能的話, 在執行期啟用變更"
  
- #: tools/gpgconf.c:122
++#: tools/gpgconf.c:127
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "用法: @GPGCONF@ [選項] (或用 -h 求助)"
  
- #: tools/gpgconf.c:125
++#: tools/gpgconf.c:130
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10466,15 -8274,12 +10518,15 @@@ msgstr "
  "語法: @GPGCONF@ [選項]\n"
  "管理 @GNUPG@ 系統工具的組態選項\n"
  
- #: tools/gpgconf.c:545 tools/gpgconf.c:579
++#: tools/gpgconf.c:552 tools/gpgconf.c:587
  msgid "Need one component argument"
  msgstr "需要一個元件引數"
  
- #: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
++#: tools/gpgconf.c:561 tools/gpgconf.c:599 tools/gpgconf.c:632
  msgid "Component not found"
  msgstr "找不到元件"
  
- #: tools/gpgconf.c:650
++#: tools/gpgconf.c:658
  msgid "No argument allowed"
  msgstr "未允許使用引數"
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git



More information about the Pkg-gnupg-commit mailing list